[evolution] Update Chinese (China) translation



commit 75cda28e212c807fcee0635706e8461b9583fa10
Author: Luming Zh <lumingzh qq com>
Date:   Mon Aug 1 21:12:16 2022 +0000

    Update Chinese (China) translation

 po/zh_CN.po | 3482 +++++++++++++++++++++++++++++++----------------------------
 1 file changed, 1855 insertions(+), 1627 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 40bf79a30b..7a0c212257 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -27,8 +27,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
-"POT-Creation-Date: 2022-06-17 10:36+0000\n"
-"PO-Revision-Date: 2022-06-21 19:04+0800\n"
+"POT-Creation-Date: 2022-07-22 11:36+0000\n"
+"PO-Revision-Date: 2022-08-01 19:21+0800\n"
 "Last-Translator: lumingzh <lumingzh qq com>\n"
 "Language-Team: Chinese - China <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -533,101 +533,109 @@ msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示类型域"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+msgid "Show toolbar in the event/task/memo editor"
+msgstr "在事件/任务/备忘编辑器中显示工具栏"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+msgid "Whether to show toolbar in the event/task/memo editor"
+msgstr "是否在事件/任务/备忘编辑器中显示工具栏"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
 msgstr "隐藏已完成的任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "是否在任务视图中隐藏已完成的任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task units"
 msgstr "隐藏任务单位"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr "决定何时隐藏任务的单位,可为“分钟”,“小时”或“天”"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
 msgstr "隐藏任务值"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Number of units for determining when to hide tasks"
 msgstr "决定何时隐藏任务的单位数"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Hide cancelled events"
 msgstr "隐藏已取消的事件"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid "Whether to hide cancelled events in the calendar view"
 msgstr "是否在日历视图中隐藏已取消的事件"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Hide cancelled tasks"
 msgstr "隐藏取消的任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Whether to hide cancelled tasks in the tasks view"
 msgstr "是否在“任务”视图中隐藏已取消的任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Horizontal pane position"
 msgstr "水平窗格位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
 msgstr "非月视图中日期导航器日历和任务列表之间水平窗格的位置,以像素计"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Last reminder time"
 msgstr "上次提醒时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
 msgid "Time the last reminder ran, in time_t"
 msgstr "提醒上次运行的时间,time_t 格式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Marcus Bains 线颜色 — 日视图"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "在日视图中绘制 Marcus Bains 线的颜色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Marcus Bains Line Color — Time bar"
 msgstr "Marcus Bains 线颜色 — 时间栏"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
 msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 线"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (horizontal)"
 msgstr "备忘预览窗格的位置(水平)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "当水平时,任务预览窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo layout style"
 msgstr "备忘外观风格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 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 "
@@ -636,86 +644,86 @@ msgstr ""
 "布局样式决定了在哪里放置备忘录的预览窗格。“0”(经典视图)会把预览窗格放置在备忘"
 "录下面。“1”(竖直视图)会把预览窗格放置在备忘录旁边"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Memo preview pane position (vertical)"
 msgstr "备忘预览窗格的位置(竖直)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "当竖直时,备忘预览窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Month view horizontal pane position"
 msgstr "月视图水平窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
 msgstr ""
 "月视图中视图、日期导航器日历及任务列表之间水平窗格的位置,以像素为单位计算"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Scroll Month View by a week, not by a month"
 msgstr "按星期滚动月视图,而不是按照月份滚动"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "是否按星期滚动月视图,而不是按照月份滚动"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Let the Month View start with the current week"
 msgstr "让月视图从当前周开始"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid ""
 "Whether the month view should show weeks starting with the current week "
 "instead of the first week of the month."
 msgstr "月视图是否应显示从当前周开始的周而不是该月的第一周。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Preferred New button item"
 msgstr "首选的“新建”按钮项目"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Name of the preferred New toolbar button item"
 msgstr "首选的“新建”工具栏按钮项目的名称"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary calendar"
 msgstr "首选日历"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
 msgstr "在“日历”视图侧边栏中选定的(或“主”)日历的 UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary memo list"
 msgstr "首选备忘录"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
 msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘录的 UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Primary task list"
 msgstr "首选任务列表"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
 msgstr "在“任务”视图侧边栏中选定的(或“主”)任务列表的 UID"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Free/busy template URL"
 msgstr "忙/闲模板 URL"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -724,107 +732,107 @@ msgstr ""
 "用作忙/闲数据退却的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
 "名"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Recurrent Events in Italic"
 msgstr "以斜体显示重复事件"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr "在底部左侧日历中以斜体显示有重复事件的日期"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Search range for time-based searching in years"
 msgstr "基于时间搜索的年份搜索范围"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
 "years"
 msgstr "基于时间的搜索在查找另一次发生时可向前或向后追溯多少年;默认为10年"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show appointment end times in week and month views"
 msgstr "在周视图和月视图中显示约会结束时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "Whether to display the end time of events in the week and month views"
 msgstr "是否在周视图和月视图中显示事件的结束时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show appointment icons in the month view"
 msgstr "在月视图中显示约会结束时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Whether to show icons of events in the month view"
 msgstr "是否在月视图中显示事件的结束时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the memo preview pane"
 msgstr "显示备忘预览窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "如果“true”,在主窗口中显示备忘预览窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show the task preview pane"
 msgstr "显示任务预览窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "如果“true”,在主窗口中显示任务预览窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "Show week numbers in Day View, Work Week View, Year view and Date Navigator"
 msgstr "在日视图、工作日视图、年视图和日期导航中显示周数"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "是否在日历中显示周数"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid "Vertical position for the tag pane"
 msgstr "标签窗格的竖直位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Show Tasks and Memos pane in the Calendar view"
 msgstr "在日历视图中显示任务和备忘窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to show Tasks and Memos pane in the Calendar view"
 msgstr "是否在日历视图中显示任务和备忘窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Highlight tasks due today"
 msgstr "高亮今天到期的任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr "是否以特殊颜色高亮显示今天到期的任务(task-due-today-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Tasks due today color"
 msgstr "今天到期的任务颜色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 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 一起使用"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Task preview pane position (horizontal)"
 msgstr "任务预览窗格的位置(水平)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Task layout style"
 msgstr "任务外观风格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 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 "
@@ -833,28 +841,28 @@ msgstr ""
 "布局样式决定了在哪里放置任务列表的预览窗格。“0”(经典视图)会把预览窗格放置在任"
 "务列表下面。“1”(竖直视图)会把预览窗格放置在任务列表旁边"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Task preview pane position (vertical)"
 msgstr "任务预览窗格的位置(竖直)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "当竖直时,任务预览窗格的位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Highlight overdue tasks"
 msgstr "高亮延期任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr "是否用特殊颜色高亮显示延期任务(task-overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
@@ -862,19 +870,19 @@ msgstr ""
 "延期任务的背景颜色,以“#rrggbb”格式。与 task-overdue-highlight(任务延期高亮)"
 "一道使用。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Time divisions"
 msgstr "时间分割"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "日视图和工作周视图中显示的间隔,以分钟计"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Timezone"
 msgstr "时区"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -882,127 +890,127 @@ msgstr ""
 "日历中日期和时间所使用的默认时区,以未翻译的 Olson 时区数据库位置表示,"
 "如“Asia/Chongqing”"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Twenty four hour time format"
 msgstr "二十四小时时间格式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "是以 24 小时格式还是以上午/下午格式显示时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Birthday and anniversary reminder"
 msgstr "生日和纪念日提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "是否为生日或周年纪念日设置提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Default appointment reminder"
 msgstr "默认约会提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Whether to set a default reminder for appointments"
 msgstr "是否为约会设置默认提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Use system timezone"
 msgstr "使用系统时区"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系统时区而不是在 Evolution 中选择的时区"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "First day of the week"
 msgstr "本周第一天"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Monday is a work day"
 msgstr "周一为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Tuesday is a work day"
 msgstr "周二为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Wednesday is a work day"
 msgstr "周三为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Thursday is a work day"
 msgstr "周四为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Friday is a work day"
 msgstr "周五为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "Saturday is a work day"
 msgstr "周六为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid "Sunday is a work day"
 msgstr "周日为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "Create events, memos and tasks as Private by default"
 msgstr "默认创建私密事件、备忘录和任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "Draw events as flat, not shaded."
 msgstr "将事件绘制为平面,而不是阴影。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "Whether to order days in the Week View from left to right, rather than from "
 "top to bottom."
 msgstr "是否在周视图中从左到右(而不是从上到下)排序日期。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
 msgid ""
 "Allow direct edit of event Summary when clicking on it in the Day, Work "
 "Week, Week or Month view."
 msgstr ""
 "在“日”、“工作周”、“周”或“月”视图中单击事件摘要时,允许直接编辑事件摘要。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
 msgid "User-defined reminder times, in minutes"
 msgstr "用户定义的提醒时间,以分钟计"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
 msgid ""
 "Whether to use markdown editor for the description in the component editor."
 msgstr "是否在组件编辑器中为描述使用 Markdown 编辑器。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
 msgid "Show week day names in the Year View"
 msgstr "在年视图中显示工作日名称"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
 msgid "Show the preview pane in the Year View"
 msgstr "在年视图中显示预览窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
 msgid "If “true”, show the preview pane in the Year View"
 msgstr "如果“true”,在年视图中显示预览窗格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:166
 msgid "Year view horizontal pane position"
 msgstr "年视图水平窗格位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:167
 msgid ""
 "Position of the horizontal pane, between the year calendar and the list of "
 "events for the selected day in the year view, in pixels"
 msgstr "水平窗格的位置,在年日历和年视图选中日的事件列表之间,以像素单位计算"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:168
 msgid "Layout style for the Year View"
 msgstr "年视图的布局样式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:169
 msgid ""
 "The layout style determines where to place the preview pane. “0” (Horizontal "
 "View) places the preview pane below the calendar. “1” (Vertical View) places "
@@ -1011,56 +1019,69 @@ msgstr ""
 "决定放置预览窗格位置的布局样式。“0”(水平视图)预览窗格位于日历下方。“1”(竖"
 "直视图)预览窗格在日历旁边。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:170
 msgid "Year view horizontal preview position"
 msgstr "年视图水平预览位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:171
 msgid "Position of the horizontal event preview for the year view, in pixels"
 msgstr "年视图水平事件预览的位置,以像素单位计算"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:172
 msgid "Year view vertical preview position"
 msgstr "年视图竖直预览位置"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:173
 msgid "Position of the vertical event preview for the year view, in pixels"
 msgstr "年视图竖直事件预览的位置,以像素单位计算"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:172
-msgid "Shorten event end time by minutes"
-msgstr "按分钟缩短事件结束时间"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:174
+msgid "Shorten event time by minutes"
+msgstr "按分钟缩短事件时间"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:173
-msgid "By how many minutes to shorted new event end time"
-msgstr "按多少分钟来缩短新建事件的结束时间"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:175
+msgid ""
+"By how many minutes to shorted new event time. Whether event end or start is "
+"changed is determined by \"shorten-time-end\" setting"
+msgstr ""
+"缩短新事件时间多少分钟。事件结束或开始是否更改是由“缩短结束时间”设置决定的"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:176
+msgid "Whether to shorten event end time"
+msgstr "是否缩短事件结束时间"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:177
+msgid ""
+"A pair option for \"shorten-time\" setting, to change the end time or the "
+"start time"
+msgstr "用于“缩短时间”设置的一对选项,可以更改结束时间或开始时间"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:178
 msgid "Background color for the 'today' day"
 msgstr "为“今天”设置的背景颜色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:179
 msgid ""
 "Leave empty to use a yellow color derived from the current theme, otherwise "
 "use the color of form `#RRGGBB`"
 msgstr "留空使用从当前主题衍生的黄色,否则使用“#RRGGBB”格式的颜色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:180
 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:177
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:181
 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:178
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:182
 msgid "(Deprecated) Work days"
 msgstr "(已弃用)工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:183
 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-"
@@ -1543,10 +1564,26 @@ msgid ""
 msgstr "当收件人与抄送数目达到这个数值时,是否要询问。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+msgid "Whether to always show main toolbar"
+msgstr "是否总是显示主工具栏"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+msgid "If set to “true”, the main toolbar will be visible."
+msgstr "如设置为“true”,主工具栏将总是可见。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+msgid "Whether to always show edit toolbar"
+msgstr "是否总是显示编辑工具栏"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid "If set to “true”, the edit toolbar will be visible."
+msgstr "如设置为“true”,编辑工具栏将总是可见。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr "是否在工具栏中显示签名与加密按钮"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
 "If set to “true”, the Sign and Encrypt buttons for either PGP or S/MIME are "
 "always shown in the composer’s toolbar. Otherwise they are shown only when "
@@ -1555,19 +1592,19 @@ msgstr ""
 "如果启用,PGP 或 S/MIME 的签名与加密按钮会永远显示在编辑器的工具栏上。否则它"
 "们只会在被使用时才显示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Wrap quoted text in replies"
 msgstr "为回复中引用的文本换行"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr "如设置为”true“,则将为回复中引用的文本换行。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Paste plain text as preformatted"
 msgstr "以预格式化文本形式粘贴纯文本"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid ""
 "When set, paste a plain text into the composer body as Preformatted "
 "paragraph. When not set, paste it as Normal paragraph."
@@ -1575,31 +1612,39 @@ msgstr ""
 "启用设置时,将纯文本以预格式化段落的形式粘贴进编辑器。取消设置时,以正常段落"
 "的形式粘贴。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Convert UTC time in reply credits to local time"
 msgstr "将应答中的 UTC 时间转换为本地时间"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Whether the time in reply credits should be converted to local time when "
 "it’s in UTC in the message."
 msgstr "当信息中的时间是 UTC 时,是否应将应答中的时间转换为本地时间。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+msgid ""
+"Whether the date in reply credits should be shown in the user date format. "
+"If unset, shows the header value from the original message."
+msgstr ""
+"回复名单中的日期是否应以用户日期格式显示。如不设置,将显示来自原始消息的头部"
+"信息。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Mark replied to messages as read"
 msgstr "将已回复的邮件标记为已读"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid ""
 "When replying to a message and marking it as being replied to, then whether "
 "also mark it as read."
 msgstr "回复邮件并将其标记为已答复时,是否也将其标记为已读。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Whether start Plain Text composer with Preformatted paragraph mode"
 msgstr "是否使用预格式化段落模式启动纯文本编辑器"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "When set to true, new Plain Text messages will have preselected Preformatted "
 "paragraph mode. The Normal paragraph mode will be used when set to false."
@@ -1607,29 +1652,29 @@ msgstr ""
 "当设置为 true 时,新的纯文本信息将使用预先选择的预格式化段落模式。当设置为 "
 "false 时,将使用普通段落模式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr "是否遵从 Content-Disposition:inline 信息标头提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
 msgstr "设置为“false”可以屏蔽 Content-Disposition: inline 附件的自动显示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作时保存文件类型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Can be either “mbox” or “pdf”."
 msgstr "可以是“mbox”或“pdf”。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show image animations"
 msgstr "显示图像动画"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1637,83 +1682,83 @@ msgstr ""
 "在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
 "是动态的。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Enable or disable type ahead search feature"
 msgstr "启用或禁用自动前进功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Enable or disable magic space bar"
 msgstr "启用或禁用魔术空格键"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "启用以在所有文件夹中使用相似的信息列表视图设置"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "启用以在所有文件夹中使用相似的信息列表视图设置。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Enable to use the same search settings for all folders"
 msgstr "启用以在所有文件夹中使用相同的搜索设置"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "This is considered only in combination with the 'global-view-setting'."
 msgstr "此项只和“global-view-setting”组合起来考虑。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Mark citations in the message “Preview”"
 msgstr "在信息“预览”中标出引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Mark citations in the message “Preview”."
 msgstr "在信息“预览”中标出引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Citation highlight color"
 msgstr "引用突出颜色"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Citation highlight color."
 msgstr "引用突出颜色。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Enable/disable caret mode"
 msgstr "启用/禁用光标模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Default charset in which to display messages"
 msgstr "显示信息的默认字符集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Default charset in which to display messages."
 msgstr "显示信息的默认字符集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自动在 HTML 信息中载入 HTTP 图像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show notification about missing remote content"
 msgstr "显示关于远程内容缺失的通知"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -1722,27 +1767,27 @@ msgstr ""
 "当信息预览显示了一封需要下载远程内容的邮件而从此用户或站点下载又被禁止时,在"
 "预览面板顶层显示相应通知。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Show animated images as animations."
 msgstr "将动画图像显示为动画。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Show all message headers"
 msgstr "显示全部信头"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Show all the headers when viewing a messages."
 msgstr "查看信息时显示全部信头。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "List of headers to show when viewing a message."
 msgstr "要在查看信息时显示的信头列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -1751,99 +1796,99 @@ msgstr ""
 "每个信头都成对出现:信头名,指示该信头是否启用的布尔值。当查看某个信息时,禁"
 "用的信头将不会显示,但仍然会列在“首选项”中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Show photo of the sender"
 msgstr "显示发件人照片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在信息阅读窗格中显示发件人照片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Search libravatar.org for photo of the sender"
 msgstr "从 libravatar.org 搜索发件人照片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Allow searching also at libravatar.org for photo of the sender."
 msgstr "允许搜索发件人照片并在 libravatar.org 里搜索。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过后标为已看"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过后标为已看。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Mark as Seen always after specified timeout"
 msgstr "在指定的时限过后永远标示成已阅"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
 msgstr "如果启用,选取的邮件会在超时时间或改变文件夹时设置为未读。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Timeout for marking messages as seen"
 msgstr "将信息标为已看的超时时长"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "将信息标为已看的超时时长,单位为毫秒。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Show Attachment Bar"
 msgstr "显示附件栏"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr "当信息含有附件时在信息预览窗格下面显示附件栏。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Sender email-address column in the message list"
 msgstr "在信息列表中显示 email 地址列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Show deleted messages in the message-list"
 msgstr "在信息列表中显示删除了的信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在信息列表中显示删除了的信息(带有删除线)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Show junk messages in the message-list"
 msgstr "在消息列表中显示垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "在信息列表中显示垃圾信息(带有红色删除线)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Enable Unmatched search folder"
 msgstr "启用“无匹配”搜索文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隐藏单文件夹预览并移除选择"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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."
@@ -1851,31 +1896,31 @@ msgstr ""
 "此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Height of the message-list pane"
 msgstr "信息列表窗格的高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Height of the message-list pane."
 msgstr "信息列表窗格的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "是否在用户界面中折叠信息头"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Width of the message-list pane"
 msgstr "信息列表窗格的宽度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Width of the message-list pane."
 msgstr "信息列表窗格的宽度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Layout style"
 msgstr "布局样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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 "
@@ -1885,56 +1930,56 @@ msgstr ""
 "布局样式决定了在哪里放置信息列表的预览窗格。“0”(经典视图)会把预览窗格放置在消"
 "息列表下面。“1”(竖直视图)会把预览窗格放置在信息列表旁边。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的变宽字体。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "压缩 TO/CC/BCC 中地址的显示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "要在 TO/CC/BCC 中显示的地址数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "Show mails in headers part of the message preview when name is available"
 msgstr "名称可用时在邮件预览的头部显示邮件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "When set to false, the mail addresses which contain both the name and the "
 "email parts in headers like To/Cc/Bcc will be shown only with the name part, "
@@ -1943,31 +1988,31 @@ msgstr ""
 "当设置为 false 时,邮件地址中包含名称和邮件头中的电子邮件部分(如/Cc/Bcc)将"
 "只显示名称部分,而不显示实际的电子邮件,名称可点击。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信息列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Default value for thread expand state"
 msgstr "话题的默认展开状态"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否以线索中的最新信息来排序线索"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -1976,11 +2021,11 @@ msgstr ""
 "此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
 "启 Evolution。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Whether sort thread children always ascending"
 msgstr "是否永远递增排序相关邮件子项"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "This setting specifies whether the thread children should be sorted always "
 "ascending, rather than using the same sort order as in the thread root level."
@@ -1988,21 +2033,21 @@ msgstr ""
 "这个设置值指定相关邮件的子项是否永远递增排序,而非依照相关邮件同样的排序顺"
 "序。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Whether to compress thread level"
 msgstr "是否压缩线程级别"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "Set to true to compress thread levels for flat conversations, to make the "
 "level not so deep."
 msgstr "设为 true 则压缩线程级别以平铺显示会话,使其级别不会太深。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在文件夹树中按字母顺序排列帐号"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -2012,29 +2057,29 @@ msgstr ""
 "指出在邮件视图的文件夹树里如何排序帐号。若设为 true,帐号按字母顺序排列,“在"
 "此计算机上”和“搜索”文件夹除外;否则帐号按用户指定的顺序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead "
 "to a file."
 msgstr "如果没有设置,或者设置为“stdout”,则日志将输出至标准输出而非文件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Flush Outbox after filtering"
 msgstr "在过滤之后刷新发件箱"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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 "
@@ -2043,115 +2088,115 @@ msgstr ""
 "在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
 "约一分钟后进行发件箱刷新。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Default forward style"
 msgstr "默认转发方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Default reply style"
 msgstr "默认回复样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid ""
 "Forward and reply attribution language tag, like en_US. Empty string means "
 "to use the same language as the user interface."
 msgstr ""
 "转发和回复语言集合标签,如 en-US。空字符串表示使用与用户界面相同的语言。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "使用 快捷键(Ctrl+Enter) 发送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr "用户试图通过快捷键发送信息时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Prompt on empty subject"
 msgstr "空主题时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Prompt when emptying the trash"
 msgstr "清空废件箱时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "在用户试图清空废件箱时提示他/她。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Prompt when user expunges"
 msgstr "用户销毁时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "用户试图销毁文件夹时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Prompt when user calls Empty Junk"
 msgstr "用户清空垃圾邮件时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Prompt the user when he or she tries to Empty a Junk folder."
 msgstr "用户试图清空垃圾邮件文件夹时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "下列接收者不能被识别为有效的电子邮件地址"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Prompt when user only fills Bcc"
 msgstr "用户只填入密件抄送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "当用户是否发送意外的 HTML 时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "当用户试图一次打开超过十封信时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Prompt while marking multiple messages"
 msgstr "标记多封信息时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "禁用/启用对多条信息标记时的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Prompt when deleting messages in search folder"
 msgstr "删除搜索文件夹中的信息时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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 "
@@ -2159,11 +2204,11 @@ msgid ""
 msgstr ""
 "禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 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 "
@@ -2173,11 +2218,11 @@ msgstr ""
 "可取的值有:“never”- 不允许在文件夹树中拖放&amp;复制文件夹;“always”- 允许拖"
 "放&amp;复制,无须询问;“ask”- (或其他任意值) 询问用户。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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 "
@@ -2187,21 +2232,21 @@ msgstr ""
 "可取的值有:“never”- 不允许在文件夹树中拖放&amp;移动文件夹;“always”- 允许拖"
 "放&amp;移动,无须询问;“ask”- (或其他任意值) 询问用户。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Prompt when replying privately to list messages"
 msgstr "当对邮件列表作私人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "当邮件列表劫持私人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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 "
@@ -2210,34 +2255,34 @@ msgstr ""
 "当您正要发送一个通过邮件列表收到的信息的私人回复,而邮件头的 Reply-To: 重定向"
 "到了列表时,禁用或启用反复的警告提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Prompt when replying to many recipients"
 msgstr "当向多个收件人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
 msgstr "是否在切换编辑器格式会导致内容失去现有格式时先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
 msgstr ""
 "它会停用/启用重复提示警告您正在切换编辑器格式而其中内容会失去先前的格式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "当回复给许多收件人与抄送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2245,56 +2290,56 @@ msgstr ""
 "当寄信给许多收件人与抄送时启用或停用提示。“composer-many-to-cc-recips-num”定"
 "义了这个界限值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "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:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空废件箱"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出 Evolution 时清空废件箱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空废件箱的最少天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "退出时清空废件箱的最少天数。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Last time Empty Trash was run"
 msgstr "上次清空废件箱的时间为"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 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:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 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:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的信息会被记录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Show original “Date” header value."
 msgstr "显示原始的邮件头日期值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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 "
@@ -2303,11 +2348,11 @@ msgstr ""
 "显示原始的邮件头“Date”值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
 "式和本地时区显示邮件头“Date”值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "List of Labels and their associated colors"
 msgstr "标签及其对应颜色的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 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."
@@ -2315,44 +2360,44 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
 "颜色使用了 HTML 十六进制编码方式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Check incoming mail being junk"
 msgstr "检查收到的邮件是否是垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid "Run junk test on incoming mail."
 msgstr "对收到的邮件运行垃圾信息测试。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "Empty Junk folders on exit"
 msgstr "退出时清空垃圾信息文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "退出 Evolution 时清空垃圾信息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "Minimum days between emptying the junk on exit"
 msgstr "退出时清空垃圾信息的最少天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "退出时清空垃圾信息的最少时间,以天计。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾信息的时间为"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 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:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信息钩子插件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 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 "
@@ -2361,11 +2406,11 @@ msgstr ""
 "这是默认的垃圾信息插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
 "缺省到其它可用的插件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "决定是否在地址簿中查找发件人电子邮件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 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 "
@@ -2376,13 +2421,13 @@ msgstr ""
 "为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
 "比较慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 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:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 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 "
@@ -2391,11 +2436,11 @@ msgstr ""
 "此选项与 lookup_addressbook 键值相关,用于决定是否查询本地地址簿以避免您认识"
 "的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "决定是否使用自定义信头检测垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 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 "
@@ -2404,51 +2449,51 @@ msgstr ""
 "决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话,将提高"
 "垃圾信息检测速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Custom headers to use while checking for junk."
 msgstr "自定义用以检查垃圾信息的信头。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 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:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "UID string of the default account."
 msgstr "默认帐号的 UID 字符串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid "Save directory"
 msgstr "保存目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "Directory for saving mail component files."
 msgstr "保存邮件组件文件的目录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid "Composer load/attach directory"
 msgstr "编辑器加载/附件目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 msgid "Directory for loading/attaching files to composer."
 msgstr "用于将文件载入/附加到编写器的目录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid "Check for new messages on start"
 msgstr "启动时检查新信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 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:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 msgid "Check for new messages in all active accounts"
 msgstr "检查所有活动帐号的新信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 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 "
@@ -2457,21 +2502,21 @@ msgstr ""
 "在 Evolution 启动时,是不是检查所有活动帐号的新信息而不管帐号的“每隔 X 分钟自"
 "动检查新信息”选项如何设置。该选项仅与“send_recv_on_start”选项一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid "Server synchronization interval"
 msgstr "服务器同步间隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 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:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 msgid "Allow expunge in virtual folders"
 msgstr "允许在虚拟文件夹中销毁"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder→Expunge will "
 "be callable in virtual folders, while the expunge itself will be done in all "
@@ -2482,96 +2527,96 @@ msgstr ""
 "虚拟文件夹中信息的操作会在所有文件夹中进行,而不仅仅是只删除属于虚拟文件夹中"
 "的信息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 #: ../src/mail/mail-config.ui.h:10
 msgid "Inherit theme colors in HTML format"
 msgstr "继承主题的颜色为 HTML 模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
 msgstr "当启用时,背景、文本与链接的主题颜色会一并送出,产生 HTML 格式的邮件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid "An Archive folder for On This Computer folders."
 msgstr "一个对应于“位于本机”文件夹的归档文件夹。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
 msgstr "在“位于本机”文件夹里使用 信息|分类… 功能的归档文件夹。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 msgid "Whether the To Do bar is visible in the main window"
 msgstr "待办事项栏在主窗口中是否可见"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "Stores whether the To Do bar is visible in the main window."
 msgstr "存储待办事项栏在主窗口中是否可见。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid "Width of the To Do bar in the main window"
 msgstr "主窗口中待办事项栏的宽度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Holds the width of the To Do bar for the main window."
 msgstr "保存主窗口的待办事项栏的宽度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid "Whether the To Do bar is visible in a sub-window"
 msgstr "待办事项栏在子窗口中是否可见"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Stores whether the To Do bar is visible in a sub-window."
 msgstr "存储待办事项栏在子窗口中是否可见。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
 msgid "Width of the To Do bar in a sub-window"
 msgstr "子窗口中待办事项栏的宽度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
 msgid "Holds the width of the To Do bar for a sub-window."
 msgstr "保存子窗口的待办事项栏的宽度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
 msgid "Whether the To Do bar should show also completed tasks"
 msgstr "待办事项栏是否也应显示已完成的任务"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
 msgid "Stores whether the To Do bar should show also completed tasks."
 msgstr "存储待办事项栏是否也应显示已完成的任务。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "待办事项栏是否也应显示没有截止日期的任务"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "存储待办事项栏是否也应显示没有截止日期的任务。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
 msgid "How many days to show in the To Do bar"
 msgstr "在待办事项栏中显示的天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
 msgid "Values out of range are clamped to the boundary."
 msgstr "超出范围的值将截取到边界值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
 msgid "Show start up wizard"
 msgstr "显示启动向导"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
 msgid "Whether show start up wizard when there is no mail account configured."
 msgstr "未配置邮件帐户时是否显示启动向导。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
 msgid "Whether go to the previous message after message deletion"
 msgstr "删除消息后是否转到上一条消息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
 msgid ""
 "If set to true, goes to the previous message when the selected is deleted; "
 "or to the next message, when it’s set to false."
@@ -2579,11 +2624,11 @@ msgstr ""
 "如果设置为 true,则在删除选定内容时转到上一条信息;如果设置为 false,则转到下"
 "一条消息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
 msgid "Show Subject above Sender in Messages column"
 msgstr "在“邮件”列中的发件人上方显示主题"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, "
 "usually shown in the Vertical/Wide view of the message list"
@@ -2591,63 +2636,63 @@ msgstr ""
 "是否在“邮件”列中显示发件人(发件人/收件人)上方的主题,通常显示在邮件列表的垂"
 "直/宽视图中"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
 msgid "Visually wrap long lines in composer"
 msgstr "在编辑器内视觉上对长行折行"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
 #: ../src/composer/e-composer-actions.c:556
 msgid ""
 "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr "是否可视地换行以避免水平滚动"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
 msgid "Alternative reply style"
 msgstr "备选回复样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
 msgid "Composer mode to use."
 msgstr "使用的编写器模式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "Put the cursor at the bottom of alternative replies"
 msgstr "将光标置于备选回复底部"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "This determines whether the cursor is placed at the top of the message or "
 "the bottom when using Alternative Reply."
 msgstr "这决定在使用备选回复时,光标是放在邮件的顶部还是底部。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "Put the signature at the top of the message"
 msgstr "在回复的顶部添加个性签名"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "This determines whether the signature is placed at the top of the message or "
 "the bottom when using Alternative Reply."
 msgstr "这决定在使用备选回复时,签名是放在邮件的顶部还是底部。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 msgid "Apply chosen template when using Alternative Reply"
 msgstr "使用备选答复时应用所选模板"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid "Last chosen template’s folder URI for Alternative Reply"
 msgstr "上一个选择的模板文件夹 URI 作为备选答复"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 msgid "Last chosen template’s message UID for Alternative Reply"
 msgstr "上一个选择的模板的消息 UID 用于备选答复"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "Whether preserve original message subject when applying template for "
 "Alternative Reply"
 msgstr "应用备选回复模板时是否保留原始邮件主题"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid ""
 "Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
 "“false”, then Normal paragraph style will be used."
@@ -2655,25 +2700,25 @@ msgstr ""
 "是否将 mailto:URI 中的“body”设置为预格式化段落样式。如果设置为“false”,则将使"
 "用普通段落样式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "Close the message browser window when the selected message is deleted or "
 "marked as Junk."
 msgstr "当选定的邮件被删除或标记为垃圾邮件时,请关闭“邮件浏览器”窗口。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
 msgid ""
 "Collapse archive folders in Move/Copy message to Folder and Go to Folder "
 "selectors."
 msgstr "在“将邮件移动/复制到文件夹”中折叠存档文件夹并转到文件夹选择器。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
 msgid ""
 "Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
 "messages."
 msgstr "加密邮件时查找收件人 S/MIME 证书或 PGP 密钥的位置。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
 msgid ""
 "The “off” value completely disables certificate lookup; the “autocompleted” "
 "value provides certificates only for auto-completed contacts; the “books” "
@@ -2684,11 +2729,11 @@ msgstr ""
 "书;“books”值使用来自自动完成联系人的证书,并在标记为自动完成的书籍中进行搜"
 "索。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
 msgid "Whether Send/Receive should also download of messages for offline."
 msgstr "发送/接收是否也应下载离线邮件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:309
 msgid ""
 "If enabled, whenever Send/Receive is run it also runs synchronization of "
 "messages for offline use. The option is disabled by default."
@@ -2696,33 +2741,33 @@ msgstr ""
 "如果启用,则无论何时运行发送/接收,它都会运行消息同步以供脱机使用。默认情况"
 "下,该选项处于禁用状态。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:310
 msgid "Whether display delivery notification parts inline."
 msgstr "是否以内联方式显示传递通知部件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:311
 msgid ""
 "If enabled, the message/delivery-status and message/disposition-notification "
 "parts are shown automatically inline."
 msgstr "如果启用,消息/传递状态和消息/处置通知部分将自动内联显示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:312
 msgid "Whether unset colors provided in HTML mails."
 msgstr "是否取消设置 HTML 邮件中提供的颜色。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:313
 msgid ""
 "If enabled, unset colors in HTML messages, forcing use of desktop theme "
 "colors instead."
 msgstr "如果启用,取消设置 HTML 消息中的颜色,强制使用桌面主题颜色。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:314
 msgid ""
 "Whether to preserve expand state of the folders when calling Copy/Move to "
 "Folder."
 msgstr "调用复制/移动到文件夹时是否保持文件夹的展开状态。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:309
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:315
 msgid ""
 "If enabled, the Copy/Move to Folder dialog will preserve the expand state of "
 "the folders in the dialog, otherwise all the folders will be expanded."
@@ -2730,20 +2775,20 @@ msgstr ""
 "如果启用,复制/移动到文件夹对话框将保持对话框中文件夹的展开状态,否则将展开所"
 "有的文件夹。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:310
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:316
 msgid "Whether to print attachments."
 msgstr "是否显示附件内容。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:311
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:317
 msgid ""
 "If enabled, and possible, attachment content is printed with the message."
 msgstr "如果启用,可能的情况下将随消息显示附件的内容。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:312
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:318
 msgid "Size limit for text attachments to show"
 msgstr "显示文本附件的大小限制"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:313
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:319
 msgid ""
 "Defines the size in KB, the limit to show text attachments in the message "
 "preview. Anything above this limit will not be possible to show inline."
@@ -2751,54 +2796,54 @@ msgstr ""
 "在消息预览中显示文本附件内容的大小限制;文件大小按照 KB 计算。任何大小超出该"
 "限制的文件将不会在行内显示其内容。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:314
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:320
 msgid "(Deprecated) Default forward style"
 msgstr "(已弃用)默认转发方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:315
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:321
 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:316
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:322
 msgid "(Deprecated) Default reply style"
 msgstr "(已弃用)默认回复样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:317
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:323
 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:318
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:324
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(已弃用)自定义信头及是否启用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:319
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:325
 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:320
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:326
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已弃用)在 HTML 信息中载入 HTTP 图像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:321
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:327
 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:322
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:328
 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:323
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:329
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -3149,7 +3194,7 @@ msgid ""
 msgstr "使用 autoar 压缩附件的目录时使用的压缩过滤器。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:331
+#: ../src/shell/main.c:425
 msgid "Start in offline mode"
 msgstr "以离线模式启动"
 
@@ -3361,9 +3406,9 @@ msgstr ""
 
 #: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
 #: ../data/org.gnome.Evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1293
+#: ../src/mail/e-mail-browser.c:1347
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:241
+#: ../src/shell/e-shell-window-private.c:265
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -3424,7 +3469,7 @@ msgstr "联系人"
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
 #: ../src/e-util/e-collection-account-wizard.c:867
-#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:532
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:533
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:200
 #: ../src/modules/calendar/e-cal-shell-view.c:635
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
@@ -3436,12 +3481,12 @@ msgstr "日历"
 #: ../src/mail/importers/kmail-importer.c:249
 #: ../src/mail/importers/pine-importer.c:423
 #: ../src/modules/mail/e-mail-shell-view.c:1608
-#: ../src/smime/gui/certificate-manager.c:1664
+#: ../src/smime/gui/certificate-manager.c:1677
 msgid "Mail"
 msgstr "邮件"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:522
+#: ../src/calendar/gui/e-memo-table.c:446 ../src/e-util/e-webdav-browser.c:523
 #: ../src/modules/calendar/e-cal-shell-content.c:1937
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:196
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:211
@@ -3450,11 +3495,11 @@ msgid "Memos"
 msgstr "备忘"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:629 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/gui/e-task-table.c:629 ../src/calendar/gui/print.c:2468
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1151
-#: ../src/e-util/e-webdav-browser.c:523
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/e-util/e-webdav-browser.c:524
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
 #: ../src/modules/calendar/e-cal-shell-content.c:1897
 #: ../src/modules/calendar/e-task-shell-view-actions.c:220
 #: ../src/modules/calendar/e-task-shell-view-actions.c:235
@@ -3767,11 +3812,11 @@ msgstr "对宽屏视图(_W)"
 msgid "As Sent Folder for Wi_de View"
 msgstr "对宽屏视图显示已发文件夹(_D)"
 
-#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2603
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2605
 msgid "_Memos"
 msgstr "备忘(_M)"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2607
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2609
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "任务(_T)"
@@ -3927,15 +3972,16 @@ msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:811
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1497
-#: ../src/e-util/e-accounts-window.c:1563
+#: ../src/e-util/e-accounts-window.c:1573
 #: ../src/e-util/e-mail-signature-manager.c:324
 #: ../src/e-util/e-name-selector-dialog.c:1028 ../src/e-util/filter.ui.h:25
 #: ../src/mail/e-mail-account-manager.c:721
 #: ../src/mail/e-mail-label-manager.c:355
-#: ../src/mail/em-folder-properties.c:1359
+#: ../src/mail/em-folder-properties.c:1360
 #: ../src/mail/em-vfolder-editor-rule.c:405
 #: ../src/mail/em-vfolder-editor-rule.c:634 ../src/mail/mail-config.ui.h:64
 #: ../src/modules/mail/em-composer-prefs.c:420
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1368
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:559
 #: ../src/plugins/email-custom-header/email-custom-header.c:826
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
@@ -4014,10 +4060,10 @@ msgstr "显示联系人时出错"
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
-"report in GNOME Gitlab."
+"report in GNOME GitLab."
 msgstr ""
 "显示联系人时 WebKitWebProcess 崩溃。您可以通过移动到另一个联系人并返回来重"
-"试。如果问题仍然存在,请在 Gnome GitLab 中提交错误报告。"
+"试。如果问题仍然存在,请在 Gnome GitLab 中提交缺陷报告。"
 
 #: ../src/addressbook/addressbook.error.xml.h:49
 msgid "Failed to refresh list of account address books"
@@ -4049,11 +4095,10 @@ msgstr "联系人“{0}”已在地址簿“{1}”中。您想要添加它的副
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/addressbook.error.xml.h:55
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3501
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4338
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4344
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:212
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
@@ -4071,8 +4116,8 @@ msgstr "联系人“{0}”已在地址簿“{1}”中。您想要添加它的副
 #: ../src/e-util/e-attachment-store.c:668
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
-#: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:168
+#: ../src/e-util/e-category-editor.c:252 ../src/e-util/e-charset-combo-box.c:99
 #: ../src/e-util/e-collection-account-wizard.c:240
 #: ../src/e-util/e-collection-account-wizard.c:1930
 #: ../src/e-util/e-collection-account-wizard.c:2177
@@ -4083,11 +4128,11 @@ msgstr "联系人“{0}”已在地址簿“{1}”中。您想要添加它的副
 #: ../src/e-util/e-html-editor-actions.c:542
 #: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:358
-#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:819
+#: ../src/e-util/e-passwords.c:474 ../src/e-util/e-rule-context.c:819
 #: ../src/e-util/e-rule-editor.c:184 ../src/e-util/e-rule-editor.c:295
 #: ../src/e-util/e-rule-editor.c:931 ../src/e-util/e-send-options.ui.h:16
 #: ../src/e-util/e-source-config-dialog.c:356
-#: ../src/e-util/e-source-selector-dialog.c:325
+#: ../src/e-util/e-source-selector-dialog.c:335
 #: ../src/e-util/e-table-config.c:540 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
 #: ../src/e-util/evolution-source-viewer.c:829 ../src/e-util/e-web-view.c:4006
@@ -4109,11 +4154,11 @@ msgstr "联系人“{0}”已在地址簿“{1}”中。您想要添加它的副
 #: ../src/plugins/save-calendar/save-calendar.c:184
 #: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
 #: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:653
-#: ../src/smime/gui/certificate-manager.c:721
-#: ../src/smime/gui/certificate-manager.c:949
-#: ../src/smime/gui/certificate-manager.c:1330
-#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
+#: ../src/smime/gui/certificate-manager.c:656
+#: ../src/smime/gui/certificate-manager.c:724
+#: ../src/smime/gui/certificate-manager.c:952
+#: ../src/smime/gui/certificate-manager.c:1343
+#: ../src/smime/gui/e-cert-selector.c:239 ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "取消(_C)"
 
@@ -4166,285 +4211,277 @@ msgid "Show Certificates"
 msgstr "显示证书"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:721
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:743
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3112
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2497
-#: ../src/em-format/e-mail-formatter-attachment.c:322
-#: ../src/mail/mail-config.ui.h:41
-msgid "Options"
-msgstr "选项"
-
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3501
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:809
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2250
+#: ../src/calendar/gui/e-comp-editor.c:2281
 #: ../src/composer/e-composer-actions.c:242
 #: ../src/composer/e-composer-actions.c:354
 #: ../src/e-util/e-attachment-store.c:848
 #: ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:362
-#: ../src/e-util/e-webdav-browser.c:2631 ../src/e-util/e-web-view.c:4006
+#: ../src/e-util/e-webdav-browser.c:2633 ../src/e-util/e-web-view.c:4006
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:266
+#: ../src/modules/rss/evolution/e-rss-preferences.c:839
 #: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
-#: ../src/smime/gui/certificate-manager.c:653
-#: ../src/smime/gui/certificate-manager.c:722
+#: ../src/smime/gui/certificate-manager.c:656
+#: ../src/smime/gui/certificate-manager.c:725
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2147
-#: ../src/calendar/gui/e-comp-editor.c:2219
-#: ../src/e-util/e-send-options.ui.h:15
-#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell-window-actions.c:1117
-msgid "_Help"
-msgstr "帮助(_H)"
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2488
+#: ../src/em-format/e-mail-formatter-attachment.c:322
+#: ../src/mail/mail-config.ui.h:41
+msgid "Options"
+msgstr "选项"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3629
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../src/e-util/e-misc-utils.c:3725
 msgid "Image"
 msgstr "图像"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "Nic_kname:"
 msgstr "昵称(_K):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_File under:"
 msgstr "存档为(_F):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:18
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
 msgid "_Where:"
 msgstr "何处(_W):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:19
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:21
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:920
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1347
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "电子邮件"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:24
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Wants to receive HTML mail"
 msgstr "愿意接收 HTML 邮件(_W)"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
 msgid "Telephone"
 msgstr "电话"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "SIP Address"
 msgstr "SIP 地址"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:25
 msgid "Instant Messaging"
 msgstr "即时通讯"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:26
 #: ../src/addressbook/importers/evolution-vcard-importer.c:828
 msgid "Contact"
 msgstr "联系人"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Home Page:"
 msgstr "主页(_H):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:28
 #: ../src/calendar/gui/e-comp-editor-event.c:881
 #: ../src/modules/itip-formatter/itip-view.c:2298
 msgid "_Calendar:"
 msgstr "日历(_C):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Free/Busy:"
 msgstr "忙/闲(_F):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
 msgid "_Video Chat:"
 msgstr "视频聊天(_V):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "Home Page:"
 msgstr "主页:"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:32
 #: ../src/modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "日历:"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Free/Busy:"
 msgstr "闲/忙:"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "Video Chat:"
 msgstr "视频聊天:"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_Blog:"
 msgstr "博客(_N):"
 
 #. Translators: an accessibility name
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "Blog:"
 msgstr "博客:"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "Web Addresses"
 msgstr "网络地址"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Profession:"
 msgstr "职业(_P):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgctxt "Job"
 msgid "_Title:"
 msgstr "职位头衔(_T):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Company:"
 msgstr "公司(_C):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Department:"
 msgstr "部门(_D):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_Office:"
 msgstr "办公室(_O):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:44
 msgid "_Manager:"
 msgstr "经理(_M):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:47
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Assistant:"
 msgstr "助手(_A):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "Job"
 msgstr "工作"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Spouse:"
 msgstr "配偶(_S):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:48
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Anniversary:"
 msgstr "周年(_A):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:50
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1052
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:1836
+#: ../src/calendar/gui/e-calendar-view.c:1838
 msgid "Anniversary"
 msgstr "纪念日"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:51
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1051
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:1835
+#: ../src/calendar/gui/e-calendar-view.c:1837
 msgid "Birthday"
 msgstr "生日"
 
 #. Other options
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
 #: ../src/mail/e-mail-config-defaults-page.c:883
 #: ../src/modules/addressbook/autocompletion-config.c:127
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:50
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Miscellaneous"
 msgstr "杂项"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:55
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:56
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
 msgid "_City:"
 msgstr "城市(_C):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:55
 msgid "_Zip/Postal Code:"
 msgstr "邮政编码(_Z):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:56
 msgid "_State/Province:"
 msgstr "州/省(_S):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:57
 msgid "_Country:"
 msgstr "国家/地区(_C):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:58
 msgid "_PO Box:"
 msgstr "邮政邮箱(_P):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:59
 #: ../src/composer/e-composer-from-header.c:122
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:60
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:85
 #: ../src/addressbook/gui/widgets/e-contact-map.c:419
 msgid "Home"
 msgstr "家庭"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:61
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1020
 #: ../src/addressbook/gui/widgets/e-contact-map.c:432
 msgid "Work"
 msgstr "工作"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:62
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:86
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:528
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1086
-#: ../src/calendar/gui/comp-util.c:1945
+#: ../src/calendar/gui/comp-util.c:1954
 msgid "Other"
 msgstr "其它"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:65
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 msgid "Mailing Address"
 msgstr "邮政地址"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:66
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/mail/filtertypes.xml.in.h:50 ../src/mail/searchtypes.xml.in.h:52
 #: ../src/mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "便笺"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:65
 msgid "Add _PGP"
 msgstr "添加 _PGP"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:66
 msgid "Add _X.509"
 msgstr "添加 _X.509"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:67
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1513
 #: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:410
@@ -4453,8 +4490,9 @@ msgstr "添加 _X.509"
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
 #: ../src/mail/e-mail-config-identity-page.c:872
 #: ../src/mail/e-mail-label-manager.c:373 ../src/mail/em-filter-rule.c:679
-#: ../src/mail/em-folder-properties.c:1365
+#: ../src/mail/em-folder-properties.c:1366
 #: ../src/mail/em-vfolder-editor-rule.c:639 ../src/mail/mail-config.ui.h:65
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1387
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:569
 #: ../src/plugins/email-custom-header/email-custom-header.c:836
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -4464,141 +4502,141 @@ msgstr "添加 _X.509"
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:70
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:68
 msgid "Load P_GP"
 msgstr "加载 P_GP"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:71
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 msgid "_Load X.509"
 msgstr "加载 X.509 (_L)"
 
-#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
+#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:70
 #: ../src/modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
 msgstr "证书"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../src/calendar/gui/e-comp-editor.c:2182
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../src/calendar/gui/e-comp-editor.c:2213
 #: ../src/e-util/e-html-editor-actions.c:1161
 msgid "_Undo"
 msgstr "撤消(_U)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../src/calendar/gui/e-comp-editor.c:2184 ../src/e-util/e-focus-tracker.c:147
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../src/calendar/gui/e-comp-editor.c:2215 ../src/e-util/e-focus-tracker.c:147
 #: ../src/e-util/e-focus-tracker.c:150
 msgid "Undo"
 msgstr "撤消"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../src/calendar/gui/e-comp-editor.c:2189
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../src/calendar/gui/e-comp-editor.c:2220
 #: ../src/e-util/e-html-editor-actions.c:1147
 msgid "_Redo"
 msgstr "重做(_R)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../src/calendar/gui/e-comp-editor.c:2191 ../src/e-util/e-focus-tracker.c:163
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:275
+#: ../src/calendar/gui/e-comp-editor.c:2222 ../src/e-util/e-focus-tracker.c:163
 #: ../src/e-util/e-focus-tracker.c:166
 msgid "Redo"
 msgstr "重做"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:299
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "添加联系人出错"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "修改联系人出错"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:339
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "删除联系人出错"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:737
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "联系人编辑器 — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3242
 msgid "X.509 certificates"
 msgstr "X.509 证书"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3247
 msgid "PGP keys"
 msgstr "PGP 密钥"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3253
 #: ../src/e-util/e-html-editor-actions.c:448
 #: ../src/e-util/e-image-chooser-dialog.c:193
-#: ../src/smime/gui/certificate-manager.c:674
-#: ../src/smime/gui/certificate-manager.c:959
+#: ../src/smime/gui/certificate-manager.c:677
+#: ../src/smime/gui/certificate-manager.c:962
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3273
 msgid "Open PGP key"
 msgstr "打开 PGP 密钥"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3273
 msgid "Open X.509 certificate"
 msgstr "打开 X.509 证书"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4338
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4345
-#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3275
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4342
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4349
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:176
 #: ../src/e-util/e-html-editor-actions.c:395
 #: ../src/e-util/e-html-editor-actions.c:439
 #: ../src/e-util/e-html-editor-actions.c:542
 #: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
-#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:949
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:952
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3286
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3514
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3290
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3518
 msgid "Chosen file is not a local file."
 msgstr "已选取的文件不是本地文件。"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3299
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3303
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "无法加载证书:%s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3328
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3332
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3328
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3332
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3499
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3503
 msgid "Save PGP key"
 msgstr "保存 PGP 密钥"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3499
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3503
 msgid "Save X.509 certificate"
 msgstr "保存 X.509 证书"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3526
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3530
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "保存证书失败:%s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4335
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4341
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4339
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4345
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4350
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4710
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4606,28 +4644,28 @@ msgstr ""
 "联系人数据无效:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4716
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4720
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4728
 #, c-format
 msgid "“%s” cannot be a future date"
 msgstr "“%s”不能是未来的日期"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4732
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4736
 #, c-format
 msgid "%s“%s” has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4745
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4759
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4749
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4763
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s“%s”为空"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4774
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4778
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
@@ -4637,16 +4675,16 @@ msgstr "无效的联系人。"
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:306
 #: ../src/e-util/e-attachment-dialog.c:291
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:253
 #: ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126
 #: ../src/e-util/e-filter-datespec.c:301
 #: ../src/e-util/e-html-editor-link-dialog.c:242
-#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:820
+#: ../src/e-util/e-passwords.c:475 ../src/e-util/e-rule-context.c:820
 #: ../src/e-util/e-rule-editor.c:185 ../src/e-util/e-rule-editor.c:296
 #: ../src/e-util/e-rule-editor.c:932 ../src/e-util/e-send-options.ui.h:17
 #: ../src/e-util/e-source-config-dialog.c:357
-#: ../src/e-util/e-source-selector-dialog.c:326
+#: ../src/e-util/e-source-selector-dialog.c:336
 #: ../src/e-util/e-table-config.c:541 ../src/e-util/e-table-config.ui.h:4
 #: ../src/e-util/e-timezone-dialog.ui.h:3
 #: ../src/mail/e-mail-config-window.c:311 ../src/mail/e-mail-tag-editor.c:162
@@ -4656,8 +4694,8 @@ msgstr "无效的联系人。"
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:418
 #: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1331
-#: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
+#: ../src/shell/main.c:271 ../src/smime/gui/certificate-manager.c:1344
+#: ../src/smime/gui/e-cert-selector.c:240 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "确定(_O)"
 
@@ -4875,12 +4913,12 @@ msgid "Send a mail message to this address"
 msgstr "发送一个邮件信息到这个地址"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:318
-#: ../src/e-util/e-misc-utils.c:4659
+#: ../src/e-util/e-misc-utils.c:4755
 #, c-format
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:332
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:333
 #, c-format
 msgid "Click to open map for %s"
 msgstr "单击以为 %s 打开地图"
@@ -5045,7 +5083,7 @@ msgid "Blog"
 msgstr "博客"
 
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:261
-#: ../src/e-util/e-mail-signature-editor.c:618
+#: ../src/e-util/e-mail-signature-editor.c:626
 msgid "Unnamed"
 msgstr "未命名"
 
@@ -5279,18 +5317,18 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您确定要删除联系人(%s)吗?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1438
-#: ../src/calendar/gui/e-comp-editor.c:2140
-#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:816
+#: ../src/calendar/gui/e-comp-editor.c:2171
+#: ../src/e-util/e-accounts-window.c:1763 ../src/e-util/e-focus-tracker.c:816
 #: ../src/e-util/evolution-source-viewer.c:800
-#: ../src/e-util/e-webdav-browser.c:2855
+#: ../src/e-util/e-webdav-browser.c:2857
 #: ../src/mail/e-mail-account-manager.c:739
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1640
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:697
 #: ../src/modules/calendar/e-task-shell-view-actions.c:851
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1622
-#: ../src/shell/e-shell-window-actions.c:961
-#: ../src/smime/gui/certificate-manager.c:1654 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/shell/e-shell-window-actions.c:965
+#: ../src/smime/gui/certificate-manager.c:1667 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -5481,7 +5519,7 @@ msgstr "放大(_I)"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2979
+#: ../src/mail/e-mail-reader.c:2994
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
@@ -5489,7 +5527,7 @@ msgstr "缩小(_O)"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:2308
 #: ../src/e-util/e-html-editor-find-dialog.c:245
-#: ../src/shell/e-shell-window-actions.c:1038
+#: ../src/shell/e-shell-window-actions.c:1042
 msgid "_Find"
 msgstr "查找(_F)"
 
@@ -6331,10 +6369,10 @@ msgstr "显示事件时出错"
 msgid ""
 "A WebKitWebProcess crashed when displaying the event. You can try again by "
 "moving to another event and back. If the issue persists, please file a bug "
-"report in GNOME Gitlab."
+"report in GNOME GitLab."
 msgstr ""
 "显示事件时 WebKitWebProcess 崩溃。您可以通过移动到另一个事件并返回来重试。如"
-"果问题仍然存在,请在 Gnome Gitlab中提交错误报告。"
+"果问题仍然存在,请在 Gnome Gitlab中提交缺陷报告。"
 
 #: ../src/calendar/calendar.error.xml.h:175
 msgid "Something has gone wrong when displaying the memo"
@@ -6344,10 +6382,10 @@ msgstr "显示备忘录时出错"
 msgid ""
 "A WebKitWebProcess crashed when displaying the memo. You can try again by "
 "moving to another memo and back. If the issue persists, please file a bug "
-"report in GNOME Gitlab."
+"report in GNOME GitLab."
 msgstr ""
-"显示备忘录时 WebKitWebProcess 崩溃。你可以通过移动到另一个备忘录并返回来再试"
-"一次。如果问题仍然存在,请在 Gnome GitLab 中提交错误报告。"
+"显示备忘录时 WebKitWebProcess 崩溃。您可以通过移动到另一个备忘录并返回来重"
+"试。如果问题仍然存在,请在 Gnome GitLab 中提交缺陷报告。"
 
 #: ../src/calendar/calendar.error.xml.h:177
 msgid "Something has gone wrong when displaying the task"
@@ -6357,10 +6395,10 @@ msgstr "显示任务时出错"
 msgid ""
 "A WebKitWebProcess crashed when displaying the task. You can try again by "
 "moving to another task and back. If the issue persists, please file a bug "
-"report in GNOME Gitlab."
+"report in GNOME GitLab."
 msgstr ""
 "显示任务时 WebKitWebProcess 崩溃。您可以通过移动到另一个任务并返回来重试。如"
-"果问题仍然存在,请在 Gnome Gitlab 中提交错误报告。"
+"果问题仍然存在,请在 Gnome Gitlab 中提交缺陷报告。"
 
 #: ../src/calendar/calendar.error.xml.h:179
 msgid "Do you want to detach event from the series?"
@@ -6445,7 +6483,7 @@ msgid "Public"
 msgstr "公开"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-component-preview.c:396
+#: ../src/calendar/gui/e-cal-component-preview.c:398
 #: ../src/calendar/gui/e-cal-list-view.c:290
 #: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-task-table.c:450
 #: ../src/calendar/gui/memotypes.xml.in.h:11
@@ -6453,7 +6491,7 @@ msgid "Private"
 msgstr "保密"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../src/calendar/gui/e-cal-component-preview.c:399
+#: ../src/calendar/gui/e-cal-component-preview.c:401
 #: ../src/calendar/gui/e-cal-list-view.c:291
 #: ../src/calendar/gui/e-cal-model.c:305 ../src/calendar/gui/e-task-table.c:451
 #: ../src/calendar/gui/memotypes.xml.in.h:12
@@ -6559,69 +6597,71 @@ msgstr "概要含有"
 msgid "Description Contains"
 msgstr "描述含有"
 
-#: ../src/calendar/gui/comp-util.c:1596
+#: ../src/calendar/gui/comp-util.c:1605
+#: ../src/calendar/gui/e-cal-component-preview.c:528
+#: ../src/calendar/importers/icalendar-importer.c:1574
 #: ../src/modules/itip-formatter/itip-view.c:2709
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
 msgstr[0] "和 %d 位客人"
 
-#: ../src/calendar/gui/comp-util.c:1655
+#: ../src/calendar/gui/comp-util.c:1664
 #, c-format
 msgid "Comments: %s"
 msgstr "注释:%s"
 
-#: ../src/calendar/gui/comp-util.c:1669 ../src/calendar/gui/comp-util.c:1672
+#: ../src/calendar/gui/comp-util.c:1678 ../src/calendar/gui/comp-util.c:1681
 msgctxt "iCalendarStatus"
 msgid "None"
 msgstr "无"
 
-#: ../src/calendar/gui/comp-util.c:1670
+#: ../src/calendar/gui/comp-util.c:1679
 msgctxt "iCalendarStatus"
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../src/calendar/gui/comp-util.c:1671
+#: ../src/calendar/gui/comp-util.c:1680
 msgctxt "iCalendarStatus"
 msgid "Confirmed"
 msgstr "已确认"
 
-#: ../src/calendar/gui/comp-util.c:1673
+#: ../src/calendar/gui/comp-util.c:1682
 msgctxt "iCalendarStatus"
 msgid "Draft"
 msgstr "草稿"
 
-#: ../src/calendar/gui/comp-util.c:1674
+#: ../src/calendar/gui/comp-util.c:1683
 msgctxt "iCalendarStatus"
 msgid "Final"
 msgstr "最终"
 
-#: ../src/calendar/gui/comp-util.c:1675
+#: ../src/calendar/gui/comp-util.c:1684
 msgctxt "iCalendarStatus"
 msgid "Not Started"
 msgstr "未开始"
 
-#: ../src/calendar/gui/comp-util.c:1676
+#: ../src/calendar/gui/comp-util.c:1685
 msgctxt "iCalendarStatus"
 msgid "Needs Action"
 msgstr "需要操作"
 
-#: ../src/calendar/gui/comp-util.c:1677
+#: ../src/calendar/gui/comp-util.c:1686
 msgctxt "iCalendarStatus"
 msgid "In Progress"
 msgstr "进行中"
 
-#: ../src/calendar/gui/comp-util.c:1678
+#: ../src/calendar/gui/comp-util.c:1687
 msgctxt "iCalendarStatus"
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/calendar/gui/comp-util.c:1679
+#: ../src/calendar/gui/comp-util.c:1688
 msgctxt "iCalendarStatus"
 msgid "Cancelled"
 msgstr "已取消"
 
-#: ../src/calendar/gui/comp-util.c:1940
+#: ../src/calendar/gui/comp-util.c:1949
 #: ../src/calendar/gui/e-meeting-list-view.c:205
 #: ../src/calendar/gui/e-meeting-store.c:179
 #: ../src/calendar/gui/e-meeting-store.c:202
@@ -6629,7 +6669,7 @@ msgstr "已取消"
 msgid "Accepted"
 msgstr "接受"
 
-#: ../src/calendar/gui/comp-util.c:1941
+#: ../src/calendar/gui/comp-util.c:1950
 #: ../src/calendar/gui/e-meeting-list-view.c:206
 #: ../src/calendar/gui/e-meeting-store.c:181
 #: ../src/calendar/gui/e-meeting-store.c:204
@@ -6637,7 +6677,7 @@ msgstr "接受"
 msgid "Declined"
 msgstr "拒绝"
 
-#: ../src/calendar/gui/comp-util.c:1942
+#: ../src/calendar/gui/comp-util.c:1951
 #: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:183
 #: ../src/calendar/gui/e-meeting-store.c:206
@@ -6645,7 +6685,7 @@ msgstr "拒绝"
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../src/calendar/gui/comp-util.c:1943
+#: ../src/calendar/gui/comp-util.c:1952
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:185
 #: ../src/calendar/gui/e-meeting-store.c:208
@@ -6653,13 +6693,13 @@ msgstr "暂时的"
 msgid "Delegated"
 msgstr "被委任的"
 
-#: ../src/calendar/gui/comp-util.c:1944
+#: ../src/calendar/gui/comp-util.c:1953
 msgid "Needs action"
 msgstr "需要动作"
 
 #. Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/comp-util.c:2009
+#: ../src/calendar/gui/comp-util.c:2018
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:10
 #: ../src/calendar/gui/e-meeting-list-view.c:689
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
@@ -6672,79 +6712,79 @@ msgid "Status"
 msgstr "状态"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/comp-util.c:2071 ../src/calendar/gui/e-day-view.c:2286
+#: ../src/calendar/gui/comp-util.c:2080 ../src/calendar/gui/e-day-view.c:2286
 #: ../src/calendar/gui/e-to-do-pane.c:249
-#: ../src/calendar/gui/e-week-view.c:1969 ../src/calendar/gui/print.c:1076
-#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
-#: ../src/calendar/gui/print.c:2683
+#: ../src/calendar/gui/e-week-view.c:1969 ../src/calendar/gui/print.c:1102
+#: ../src/calendar/gui/print.c:1121 ../src/calendar/gui/print.c:2689
+#: ../src/calendar/gui/print.c:2709
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/comp-util.c:2075 ../src/calendar/gui/e-day-view.c:2289
+#: ../src/calendar/gui/comp-util.c:2084 ../src/calendar/gui/e-day-view.c:2289
 #: ../src/calendar/gui/e-to-do-pane.c:253
-#: ../src/calendar/gui/e-week-view.c:1972 ../src/calendar/gui/print.c:1081
-#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
-#: ../src/calendar/gui/print.c:2685
+#: ../src/calendar/gui/e-week-view.c:1972 ../src/calendar/gui/print.c:1107
+#: ../src/calendar/gui/print.c:1123 ../src/calendar/gui/print.c:2694
+#: ../src/calendar/gui/print.c:2711
 msgid "pm"
 msgstr "下午"
 
-#: ../src/calendar/gui/comp-util.c:2104 ../src/calendar/gui/comp-util.c:2108
-#: ../src/calendar/gui/comp-util.c:2222
-#: ../src/calendar/gui/e-comp-editor.c:1309
+#: ../src/calendar/gui/comp-util.c:2113 ../src/calendar/gui/comp-util.c:2117
+#: ../src/calendar/gui/comp-util.c:2231
+#: ../src/calendar/gui/e-comp-editor.c:1314
 msgid "No Summary"
 msgstr "没有概要"
 
 #. Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/comp-util.c:2233
+#: ../src/calendar/gui/comp-util.c:2242
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者:%s <%s>"
 
 #. Translators: It will display "Organizer: NameOfTheUser"
-#: ../src/calendar/gui/comp-util.c:2236
+#: ../src/calendar/gui/comp-util.c:2245
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者:%s"
 
 #. Translators: It will display "Location: PlaceOfTheMeeting"
 #. Translators: It will display "Location: LocationOfTheAppointment"
-#: ../src/calendar/gui/comp-util.c:2251
+#: ../src/calendar/gui/comp-util.c:2260
 #: ../src/calendar/gui/e-meeting-time-sel.c:2580
-#: ../src/calendar/gui/e-to-do-pane.c:382 ../src/calendar/gui/print.c:3627
+#: ../src/calendar/gui/e-to-do-pane.c:382 ../src/calendar/gui/print.c:3655
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. Translators: It will display "Start: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../src/calendar/gui/comp-util.c:2306
+#: ../src/calendar/gui/comp-util.c:2315
 #, c-format
 msgid "Start: %s (%s)"
 msgstr "开始:%s(%s)"
 
 #. Translators: It will display "Start: ActualStartDateAndTime"
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/comp-util.c:2310 ../src/calendar/gui/e-to-do-pane.c:411
+#: ../src/calendar/gui/comp-util.c:2319 ../src/calendar/gui/e-to-do-pane.c:411
 #, c-format
 msgid "Start: %s"
 msgstr "开始:%s"
 
 #. Translators: It's for a task due date, it will display "Due: DateAndTime"
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/comp-util.c:2345 ../src/calendar/gui/e-to-do-pane.c:433
+#: ../src/calendar/gui/comp-util.c:2354 ../src/calendar/gui/e-to-do-pane.c:433
 #, c-format
 msgid "Due: %s"
 msgstr "截止:%s"
 
 #. Translators: It's for a task completed date, it will display "Completed: DateAndTime"
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/comp-util.c:2370 ../src/calendar/gui/e-to-do-pane.c:447
+#: ../src/calendar/gui/comp-util.c:2379 ../src/calendar/gui/e-to-do-pane.c:447
 #, c-format
 msgid "Completed: %s"
 msgstr "完成:%s"
 
-#: ../src/calendar/gui/comp-util.c:2407 ../src/calendar/gui/e-to-do-pane.c:596
-#: ../src/e-util/e-misc-utils.c:4742 ../src/e-util/e-text.c:566
+#: ../src/calendar/gui/comp-util.c:2416 ../src/calendar/gui/e-to-do-pane.c:596
+#: ../src/e-util/e-misc-utils.c:4838 ../src/e-util/e-text.c:566
 #: ../src/e-util/e-web-view.c:4187
 msgid "…"
 msgstr "…"
@@ -6851,28 +6891,28 @@ msgstr "单击此处可查找更多事件。"
 
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:387
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2332
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2323
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "播放声音"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:391
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2330
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2321
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "弹出警报"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:395
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2336
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2327
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "发送邮件"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
 #: ../src/calendar/gui/e-alarm-list.c:399
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2334
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2325
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "运行程序"
@@ -6964,62 +7004,62 @@ msgstr "月日历视图"
 msgid "calendar view for one or more weeks"
 msgstr "一周或多周的日历视图"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:239
+#: ../src/calendar/gui/e-cal-component-preview.c:241
 #: ../src/e-util/e-filter-rule.c:1016 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:253
+#: ../src/calendar/gui/e-cal-component-preview.c:255
 #: ../src/modules/itip-formatter/itip-view.c:1928
 #: ../src/modules/itip-formatter/itip-view.c:2146
 msgid "Categories:"
 msgstr "类别:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:291
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:312
+#: ../src/calendar/gui/e-cal-component-preview.c:293
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:258
 #: ../src/modules/itip-formatter/itip-view.c:1919
 #: ../src/modules/itip-formatter/itip-view.c:2119
 msgid "Location:"
 msgstr "位置:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:309
+#: ../src/calendar/gui/e-cal-component-preview.c:311
 msgid "Start Date:"
 msgstr "开始日期:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:318
+#: ../src/calendar/gui/e-cal-component-preview.c:320
 msgid "End Date:"
 msgstr "结束日期:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:332
+#: ../src/calendar/gui/e-cal-component-preview.c:334
 #: ../src/modules/itip-formatter/itip-view.c:1923
 #: ../src/modules/itip-formatter/itip-view.c:2131
 msgid "Recurs:"
 msgstr "重复:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:341
+#: ../src/calendar/gui/e-cal-component-preview.c:343
 msgid "Due Date:"
 msgstr "到期日期:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:358
+#: ../src/calendar/gui/e-cal-component-preview.c:360
 #: ../src/modules/itip-formatter/itip-view.c:1925
 #: ../src/modules/itip-formatter/itip-view.c:2137
 msgid "Estimated duration:"
 msgstr "预计时长:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:374
+#: ../src/calendar/gui/e-cal-component-preview.c:376
 #: ../src/modules/itip-formatter/itip-view.c:1926
 #: ../src/modules/itip-formatter/itip-view.c:2140
 msgid "Status:"
 msgstr "状态:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:383
+#: ../src/calendar/gui/e-cal-component-preview.c:385
 #: ../src/calendar/gui/e-task-table.c:475
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
 #: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:342
 msgid "High"
 msgstr "高"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:385
+#: ../src/calendar/gui/e-cal-component-preview.c:387
 #: ../src/calendar/gui/e-cal-model.c:1888
 #: ../src/calendar/gui/e-task-table.c:476
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
@@ -7027,32 +7067,32 @@ msgstr "高"
 msgid "Normal"
 msgstr "中"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:387
+#: ../src/calendar/gui/e-cal-component-preview.c:389
 #: ../src/calendar/gui/e-task-table.c:477
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
 #: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:340
 msgid "Low"
 msgstr "低"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:389
+#: ../src/calendar/gui/e-cal-component-preview.c:391
 msgid "Priority:"
 msgstr "优先级:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:407
+#: ../src/calendar/gui/e-cal-component-preview.c:409
 msgid "Classification:"
 msgstr "分类:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:420
+#: ../src/calendar/gui/e-cal-component-preview.c:422
 msgid "Organizer:"
 msgstr "组织者:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:461
+#: ../src/calendar/gui/e-cal-component-preview.c:464
 #: ../src/modules/itip-formatter/itip-view.c:1929
 #: ../src/modules/itip-formatter/itip-view.c:2149
 msgid "Attendees:"
 msgstr "出席者:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:525
+#: ../src/calendar/gui/e-cal-component-preview.c:588
 msgid "Web Page:"
 msgstr "网页:"
 
@@ -7071,7 +7111,7 @@ msgstr "正在创建任务列表“%s”视图"
 msgid "Creating view for memo list “%s”"
 msgstr "正在创建备忘录“%s”视图"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:2003
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:2008
 msgid "Destination is read only"
 msgstr "目的只读"
 
@@ -7218,37 +7258,37 @@ msgstr "从剪贴板中粘贴事件"
 msgid "Delete selected events"
 msgstr "删除选中的事件"
 
-#: ../src/calendar/gui/e-calendar-view.c:938
+#: ../src/calendar/gui/e-calendar-view.c:940
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "粘贴文本中没有有效的 iCalendar 数据"
 
-#: ../src/calendar/gui/e-calendar-view.c:949
+#: ../src/calendar/gui/e-calendar-view.c:951
 #: ../src/calendar/gui/e-cal-ops.c:1585
 msgid "Default calendar not found"
 msgstr "默认日历未找到"
 
-#: ../src/calendar/gui/e-calendar-view.c:954
+#: ../src/calendar/gui/e-calendar-view.c:956
 #: ../src/calendar/gui/e-cal-ops.c:1588
 msgid "Default memo list not found"
 msgstr "默认备忘录未找到"
 
-#: ../src/calendar/gui/e-calendar-view.c:959
+#: ../src/calendar/gui/e-calendar-view.c:961
 #: ../src/calendar/gui/e-cal-ops.c:1591
 msgid "Default task list not found"
 msgstr "默认任务列表未找到"
 
-#: ../src/calendar/gui/e-calendar-view.c:1051
+#: ../src/calendar/gui/e-calendar-view.c:1053
 msgid "No suitable component found"
 msgstr "找不到合适的组件"
 
-#: ../src/calendar/gui/e-calendar-view.c:1116
+#: ../src/calendar/gui/e-calendar-view.c:1118
 msgid "Pasting iCalendar data"
 msgstr "粘贴 iCalendar 数据"
 
-#: ../src/calendar/gui/e-calendar-view.c:1173
-#: ../src/calendar/gui/e-calendar-view.c:1176
-#: ../src/calendar/gui/e-calendar-view.c:1179
-#: ../src/calendar/gui/e-calendar-view.c:1180
+#: ../src/calendar/gui/e-calendar-view.c:1175
+#: ../src/calendar/gui/e-calendar-view.c:1178
+#: ../src/calendar/gui/e-calendar-view.c:1181
+#: ../src/calendar/gui/e-calendar-view.c:1182
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -7257,14 +7297,14 @@ 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.
-#: ../src/calendar/gui/e-calendar-view.c:1175
+#: ../src/calendar/gui/e-calendar-view.c:1177
 #: ../src/calendar/gui/e-day-view.c:3222
 #: ../src/calendar/gui/e-day-view-top-item.c:856
 #: ../src/calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%B%-d日"
 
-#: ../src/calendar/gui/e-calendar-view.c:1186
+#: ../src/calendar/gui/e-calendar-view.c:1188
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -7274,16 +7314,16 @@ 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.
-#: ../src/calendar/gui/e-calendar-view.c:1188
+#: ../src/calendar/gui/e-calendar-view.c:1190
 #: ../src/calendar/gui/e-day-view.c:3206
 #: ../src/calendar/gui/e-day-view-top-item.c:852
 #: ../src/calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
-#: ../src/calendar/gui/e-calendar-view.c:1189
 #: ../src/calendar/gui/e-calendar-view.c:1191
-#: ../src/calendar/gui/e-calendar-view.c:1192
+#: ../src/calendar/gui/e-calendar-view.c:1193
+#: ../src/calendar/gui/e-calendar-view.c:1194
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -7291,7 +7331,7 @@ msgstr "%Y年%-m月%-d日%A"
 #. The string is used for Birthday & Anniversary events where the first year is
 #. know, constructing a summary which also shows how many years the birthday or
 #. anniversary is for. Example: "Birthday: John Doe (13)"
-#: ../src/calendar/gui/e-calendar-view.c:1855
+#: ../src/calendar/gui/e-calendar-view.c:1857
 #, c-format
 msgctxt "BirthdaySummary"
 msgid "%s (%d)"
@@ -7344,10 +7384,10 @@ msgstr "来源"
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3
-#: ../src/e-util/e-accounts-window.c:1443
+#: ../src/e-util/e-accounts-window.c:1453
 #: ../src/e-util/e-attachment-tree-view.c:205
 #: ../src/e-util/e-collection-account-wizard.c:2069
-#: ../src/e-util/e-webdav-browser.c:2528
+#: ../src/e-util/e-webdav-browser.c:2530
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "类型"
@@ -7357,8 +7397,8 @@ msgstr "类型"
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:135
 #: ../src/calendar/gui/e-meeting-store.c:170
-#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1265
-#: ../src/calendar/gui/print.c:1282 ../src/e-util/e-charset.c:49
+#: ../src/calendar/gui/e-meeting-store.c:215 ../src/calendar/gui/print.c:1291
+#: ../src/calendar/gui/print.c:1308 ../src/e-util/e-charset.c:49
 #: ../src/modules/itip-formatter/itip-view.c:3825
 #: ../src/modules/itip-formatter/itip-view.c:6828
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
@@ -7367,7 +7407,7 @@ msgstr "未知"
 
 #: ../src/calendar/gui/e-cal-model.c:1374 ../src/calendar/gui/e-cal-ops.c:629
 #: ../src/calendar/gui/e-cal-ops.c:1270
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:391
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:390
 #, c-format
 msgid "Source with UID “%s” not found"
 msgstr "未找到 UID 为 %s 的源"
@@ -7548,37 +7588,37 @@ msgstr "正在清除任务"
 msgid "Expunging completed tasks"
 msgstr "删掉已完成的任务"
 
-#: ../src/calendar/gui/e-cal-ops.c:2096
+#: ../src/calendar/gui/e-cal-ops.c:2101
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
 msgstr[0] "正在移动 %d 件事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:2097
+#: ../src/calendar/gui/e-cal-ops.c:2102
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "正在复制 %d 件事件"
 
-#: ../src/calendar/gui/e-cal-ops.c:2103
+#: ../src/calendar/gui/e-cal-ops.c:2108
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移动 %d 个备忘"
 
-#: ../src/calendar/gui/e-cal-ops.c:2104
+#: ../src/calendar/gui/e-cal-ops.c:2109
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在复制 %d 个备忘"
 
-#: ../src/calendar/gui/e-cal-ops.c:2110
+#: ../src/calendar/gui/e-cal-ops.c:2115
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移动 %d 项任务"
 
-#: ../src/calendar/gui/e-cal-ops.c:2111
+#: ../src/calendar/gui/e-cal-ops.c:2116
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7634,18 +7674,18 @@ msgstr "开始时间无效"
 #: ../src/calendar/gui/e-comp-editor-event.c:516
 #: ../src/calendar/gui/e-comp-editor-event.c:532
 #: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
-#: ../src/calendar/gui/e-comp-editor.c:340
+#: ../src/calendar/gui/e-comp-editor.c:345
 #: ../src/composer/e-composer-actions.c:180
 #: ../src/em-format/e-mail-part-secure-button.c:97
-#: ../src/e-util/e-misc-utils.c:4049 ../src/e-util/e-misc-utils.c:4084
-#: ../src/e-util/e-misc-utils.c:4097 ../src/e-util/e-misc-utils.c:4111
-#: ../src/mail/e-mail-autoconfig.c:1122 ../src/mail/e-mail-display.c:2473
-#: ../src/mail/e-mail-notes.c:929 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/e-util/e-misc-utils.c:4145 ../src/e-util/e-misc-utils.c:4180
+#: ../src/e-util/e-misc-utils.c:4193 ../src/e-util/e-misc-utils.c:4207
+#: ../src/mail/e-mail-autoconfig.c:1129 ../src/mail/e-mail-display.c:2475
+#: ../src/mail/e-mail-notes.c:930 ../src/mail/e-mail-reader-utils.c:805
 #: ../src/mail/em-composer-utils.c:3932 ../src/mail/em-composer-utils.c:3955
 #: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1493
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:172
 #: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1258
-#: ../src/shell/e-shell.c:1283 ../src/smime/gui/certificate-manager.c:360
+#: ../src/shell/e-shell.c:1283 ../src/smime/gui/certificate-manager.c:363
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
@@ -7979,20 +8019,21 @@ msgstr "出席者(_N)…"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1505
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2312
-#: ../src/calendar/gui/e-comp-editor.c:2205
-#: ../src/e-util/e-accounts-window.c:1745
+#: ../src/calendar/gui/e-comp-editor.c:2236
+#: ../src/e-util/e-accounts-window.c:1755
 #: ../src/e-util/e-html-editor-actions.c:1170
 #: ../src/e-util/e-mail-signature-manager.c:354
-#: ../src/e-util/e-webdav-browser.c:2848 ../src/e-util/filter.ui.h:26
+#: ../src/e-util/e-webdav-browser.c:2850 ../src/e-util/filter.ui.h:26
 #: ../src/mail/e-mail-account-manager.c:730 ../src/mail/e-mail-browser.c:217
 #: ../src/mail/e-mail-label-manager.c:364
-#: ../src/mail/em-folder-properties.c:1362 ../src/mail/mail-config.ui.h:69
+#: ../src/mail/em-folder-properties.c:1363 ../src/mail/mail-config.ui.h:69
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1374
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:564
 #: ../src/plugins/email-custom-header/email-custom-header.c:831
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../src/plugins/sender-validation/sender-validation.c:503
 #: ../src/plugins/templates/templates.c:475
-#: ../src/shell/e-shell-window-actions.c:1103 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:1107 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -8254,14 +8295,14 @@ msgid "Exceptions"
 msgstr "例外"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2304
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2286
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2277
 #: ../src/mail/e-mail-config-identity-page.c:854
 #: ../src/mail/mail-config.ui.h:68
 msgid "A_dd"
 msgstr "添加(_D)"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2320
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2294
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2285
 #: ../src/mail/mail-config.ui.h:70
 msgid "Re_move"
 msgstr "删除(_M)"
@@ -8283,7 +8324,7 @@ msgid "Set or unset reminders"
 msgstr "设置或取消提醒"
 
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1819
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1817
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "无"
@@ -8291,162 +8332,162 @@ msgstr "无"
 #. Translators: This constructs predefined reminder's description, for example "15 minutes before",
 #. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
 #. "2 days 13 hours 1 minute before".
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s before"
 msgstr "%s 之前"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1834
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1832
 msgctxt "cal-reminders"
 msgid "at the start"
 msgstr "开始时"
 
 #. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1842
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1840
 msgctxt "cal-reminders"
 msgid "Custom"
 msgstr "自定义"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1844
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1842
 msgid "Add predefined time…"
 msgstr "添加预定义时间…"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1847
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1845
 msgid "Remove predefined times"
 msgstr "删除预定义时间"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1989
 msgid "Set a custom predefined time to"
 msgstr "将自定义预定义时间设置为"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2003
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2002
 msgctxt "cal-reminders"
 msgid "da_ys"
 msgstr "天(_Y)"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2019
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2018
 msgctxt "cal-reminders"
 msgid "_hours"
 msgstr "小时(_H)"
 
 #. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2034
 msgctxt "cal-reminders"
 msgid "_minutes"
 msgstr "分钟(_M)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2041
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2040
 msgid "_Add time"
 msgstr "添加时间(_A)"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2139
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2136
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Reminders"
 msgstr "提醒"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2164
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2161
 msgid "_Reminder"
 msgstr "提醒(_R)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2367
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2358
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "分"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2369
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2360
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "时"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2371
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2362
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "日"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2388
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2379
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "之前"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2390
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2381
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "后"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2406
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2397
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "开始"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2408
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2399
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "结束"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2427
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2418
 msgid "Re_peat the reminder"
 msgstr "重复提醒"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2452
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2443
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "重复一次,每隔"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2489
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2480
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "分"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2491
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2482
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "时"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2493
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2484
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "天"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2530
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2687
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2521
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2678
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "自定义消息"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2574
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2565
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "自定义提醒声音"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2585
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2576
 msgid "Select a sound file"
 msgstr "选择一个音频文件"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2613
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2604
 msgid "_Program:"
 msgstr "程序(_P):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2638
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2629
 msgid "_Arguments:"
 msgstr "参数(_A):"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2670
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2661
 msgid "_Send To:"
 msgstr "发送到:(_S)"
 
@@ -8495,88 +8536,88 @@ msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "网页(_W):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1513
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1749
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "截止日期(_U):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1607
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1843
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "完成日期(_C):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1623
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1859
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "公开"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1624
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1860
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "保密"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1625
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1861
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "机密"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1641
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1877
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "分类(_L):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1704
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1940
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "状态(_S):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1734
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1970
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "未定义"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1735
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1971
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "高"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1736
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1972
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "中"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1737
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1973
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "低"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1746
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1982
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "优先级(_Y):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1800
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2036
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "完成百分比:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1881
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2117
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "时区(_Z):"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1977
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2213
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "将时间显示为忙(_B)"
 
 #. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:2398
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2634
 msgctxt "ECompEditor"
 msgid "None"
 msgstr "无"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:2559
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2795
 msgid "Esti_mated duration:"
 msgstr "预计时长(_M):"
 
@@ -8641,105 +8682,114 @@ msgstr "分配的任务 — %s"
 msgid "Task — %s"
 msgstr "任务 — %s"
 
-#: ../src/calendar/gui/e-comp-editor.c:255
+#: ../src/calendar/gui/e-comp-editor.c:260
 #: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:133
 msgid "attachment"
 msgstr "附件"
 
-#: ../src/calendar/gui/e-comp-editor.c:613
+#: ../src/calendar/gui/e-comp-editor.c:618
 msgid "Sending notifications to attendees…"
 msgstr "正向参与者发送通知……"
 
-#: ../src/calendar/gui/e-comp-editor.c:1038
-#: ../src/e-util/e-webdav-browser.c:1925
+#: ../src/calendar/gui/e-comp-editor.c:1043
+#: ../src/e-util/e-webdav-browser.c:1927
 msgid "Saving changes…"
 msgstr "正在保存更改……"
 
+#: ../src/calendar/gui/e-comp-editor.c:1926
+#: ../src/e-util/e-mail-signature-editor.c:577 ../src/mail/e-mail-notes.c:1186
+msgid "Save"
+msgstr "保存"
+
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:2119
+#: ../src/calendar/gui/e-comp-editor.c:2150
 #: ../src/composer/e-composer-actions.c:333
-#: ../src/e-util/e-accounts-window.c:1778
+#: ../src/e-util/e-accounts-window.c:1788
 #: ../src/e-util/e-html-editor-dialog.c:194
-#: ../src/e-util/e-mail-signature-editor.c:329
+#: ../src/e-util/e-mail-signature-editor.c:328
 #: ../src/e-util/e-name-selector-dialog.c:548
 #: ../src/e-util/e-table-field-chooser-dialog.c:197
-#: ../src/mail/e-mail-browser.c:166
-#: ../src/mail/e-mail-folder-sort-order-dialog.c:752
-#: ../src/mail/e-mail-notes.c:1107 ../src/mail/em-filter-editor.c:45
-#: ../src/mail/em-folder-properties.c:1487
-#: ../src/mail/em-subscription-editor.c:1734
-#: ../src/shell/e-shell-window-actions.c:354
-#: ../src/shell/e-shell-window-actions.c:926
-#: ../src/smime/gui/certificate-manager.c:2176
+#: ../src/mail/e-mail-browser.c:166 ../src/mail/e-mail-notes.c:1104
+#: ../src/mail/em-filter-editor.c:45 ../src/mail/em-folder-properties.c:1488
+#: ../src/shell/e-shell-window-actions.c:930
+#: ../src/smime/gui/certificate-manager.c:2189
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2121
+#: ../src/calendar/gui/e-comp-editor.c:2152
 msgid "Close the current window"
 msgstr "关闭当前窗口"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:2126 ../src/e-util/e-focus-tracker.c:806
+#: ../src/calendar/gui/e-comp-editor.c:2157 ../src/e-util/e-focus-tracker.c:806
 #: ../src/e-util/e-html-editor-actions.c:1126 ../src/e-util/e-text.c:2065
 #: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:173
-#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:947
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:951
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2128 ../src/e-util/e-focus-tracker.c:203
+#: ../src/calendar/gui/e-comp-editor.c:2159 ../src/e-util/e-focus-tracker.c:203
 #: ../src/e-util/e-focus-tracker.c:259 ../src/e-util/e-focus-tracker.c:312
 #: ../src/e-util/e-focus-tracker.c:807 ../src/e-util/e-web-view.c:469
 #: ../src/e-util/e-web-view.c:2056 ../src/mail/e-mail-browser.c:175
-#: ../src/shell/e-shell-window-actions.c:949
+#: ../src/shell/e-shell-window-actions.c:953
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:2133 ../src/e-util/e-focus-tracker.c:801
+#: ../src/calendar/gui/e-comp-editor.c:2164 ../src/e-util/e-focus-tracker.c:801
 #: ../src/e-util/e-html-editor-actions.c:1133 ../src/e-util/e-text.c:2051
-#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:954
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:958
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2135 ../src/e-util/e-focus-tracker.c:196
+#: ../src/calendar/gui/e-comp-editor.c:2166 ../src/e-util/e-focus-tracker.c:196
 #: ../src/e-util/e-focus-tracker.c:252 ../src/e-util/e-focus-tracker.c:306
 #: ../src/e-util/e-focus-tracker.c:802 ../src/e-util/e-web-view.c:2065
-#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:956
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:960
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
-#: ../src/calendar/gui/e-comp-editor.c:2142 ../src/e-util/e-focus-tracker.c:217
+#: ../src/calendar/gui/e-comp-editor.c:2173 ../src/e-util/e-focus-tracker.c:217
 #: ../src/e-util/e-focus-tracker.c:273 ../src/e-util/e-focus-tracker.c:817
-#: ../src/shell/e-shell-window-actions.c:963
+#: ../src/shell/e-shell-window-actions.c:967
 msgid "Delete the selection"
 msgstr "删除选中内容"
 
-#: ../src/calendar/gui/e-comp-editor.c:2149
+#: ../src/calendar/gui/e-comp-editor.c:2178
+#: ../src/calendar/gui/e-comp-editor.c:2250
+#: ../src/e-util/e-send-options.ui.h:15
+#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../src/shell/e-shell-window-actions.c:1121
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/calendar/gui/e-comp-editor.c:2180
 msgid "View help"
 msgstr "查看帮助"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2154 ../src/e-util/e-focus-tracker.c:811
+#: ../src/calendar/gui/e-comp-editor.c:2185 ../src/e-util/e-focus-tracker.c:811
 #: ../src/e-util/e-html-editor-actions.c:1140 ../src/e-util/e-text.c:2077
-#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:982
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:986
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2156 ../src/e-util/e-focus-tracker.c:210
+#: ../src/calendar/gui/e-comp-editor.c:2187 ../src/e-util/e-focus-tracker.c:210
 #: ../src/e-util/e-focus-tracker.c:266 ../src/e-util/e-focus-tracker.c:318
 #: ../src/e-util/e-focus-tracker.c:812 ../src/e-util/e-web-view.c:2074
-#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:984
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:988
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
-#: ../src/calendar/gui/e-comp-editor.c:2161
-#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2860
+#: ../src/calendar/gui/e-comp-editor.c:2192
+#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2868
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
 msgid "_Print…"
 msgstr "打印(_P)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2168 ../src/mail/e-mail-reader.c:2867
+#: ../src/calendar/gui/e-comp-editor.c:2199 ../src/mail/e-mail-reader.c:2875
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1921
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:838
@@ -8747,59 +8797,63 @@ msgstr "打印(_P)…"
 msgid "Pre_view…"
 msgstr "预览(_V)…"
 
-#: ../src/calendar/gui/e-comp-editor.c:2175 ../src/e-util/e-focus-tracker.c:821
+#: ../src/calendar/gui/e-comp-editor.c:2206 ../src/e-util/e-focus-tracker.c:821
 #: ../src/e-util/e-html-editor-actions.c:1154 ../src/e-util/e-web-view.c:484
-#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1059
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1063
 msgid "Select _All"
 msgstr "全选(_A)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2177 ../src/e-util/e-focus-tracker.c:224
+#: ../src/calendar/gui/e-comp-editor.c:2208 ../src/e-util/e-focus-tracker.c:224
 #: ../src/e-util/e-focus-tracker.c:280 ../src/e-util/e-focus-tracker.c:822
-#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1061
+#: ../src/mail/e-mail-browser.c:196 ../src/shell/e-shell-window-actions.c:1065
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../src/calendar/gui/e-comp-editor.c:2198
+#: ../src/calendar/gui/e-comp-editor.c:2229
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2212
+#: ../src/calendar/gui/e-comp-editor.c:2243
 #: ../src/e-util/e-html-editor-actions.c:1177
-#: ../src/e-util/e-mail-signature-editor.c:343 ../src/mail/e-mail-browser.c:210
-#: ../src/mail/e-mail-notes.c:1121 ../src/shell/e-shell-window-actions.c:1110
+#: ../src/e-util/e-mail-signature-editor.c:342 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:1118 ../src/shell/e-shell-window-actions.c:1114
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2226
+#: ../src/calendar/gui/e-comp-editor.c:2257
 #: ../src/e-util/e-html-editor-actions.c:1198
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2233
+#: ../src/calendar/gui/e-comp-editor.c:2264
 #: ../src/composer/e-composer-actions.c:377
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2240
+#: ../src/calendar/gui/e-comp-editor.c:2271
 #: ../src/e-util/e-html-editor-actions.c:1219 ../src/mail/e-mail-browser.c:224
-#: ../src/shell/e-shell-window-actions.c:1153
-#: ../src/smime/gui/certificate-manager.c:1644 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/shell/e-shell-window-actions.c:1157
+#: ../src/smime/gui/certificate-manager.c:1657 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/calendar/gui/e-comp-editor.c:2252
+#: ../src/calendar/gui/e-comp-editor.c:2283
 msgid "Save current changes"
 msgstr "保存当前更改"
 
-#: ../src/calendar/gui/e-comp-editor.c:2257
-#: ../src/e-util/e-mail-signature-editor.c:338 ../src/mail/e-mail-notes.c:1116
+#: ../src/calendar/gui/e-comp-editor.c:2288
+#: ../src/e-util/e-mail-signature-editor.c:337 ../src/mail/e-mail-notes.c:1113
 msgid "Save and Close"
 msgstr "保存并关闭"
 
-#: ../src/calendar/gui/e-comp-editor.c:2259
+#: ../src/calendar/gui/e-comp-editor.c:2290
 msgid "Save current changes and close editor"
 msgstr "保存当前更改并关闭编辑器"
 
+#: ../src/calendar/gui/e-comp-editor.c:2297
+msgid "Show _toolbar"
+msgstr "显示工具栏(_T)"
+
 #. strftime format %A = full weekday name, %d = day of month,
 #. * %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
@@ -8809,7 +8863,7 @@ msgstr "保存当前更改并关闭编辑器"
 #: ../src/calendar/gui/e-day-view.c:3189
 #: ../src/calendar/gui/e-day-view-top-item.c:848
 #: ../src/calendar/gui/e-week-view-main-item.c:207
-#: ../src/calendar/gui/print.c:2117
+#: ../src/calendar/gui/print.c:2143
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
@@ -8836,8 +8890,8 @@ msgstr "显示第二时区"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../src/calendar/gui/e-day-view-time-item.c:859
-#: ../src/modules/calendar/e-calendar-preferences.c:311
-#: ../src/modules/calendar/e-calendar-preferences.c:363
+#: ../src/modules/calendar/e-calendar-preferences.c:337
+#: ../src/modules/calendar/e-calendar-preferences.c:389
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
@@ -8845,7 +8899,7 @@ msgstr "无"
 
 #: ../src/calendar/gui/e-day-view-time-item.c:893
 #: ../src/calendar/gui/e-timezone-entry.c:346
-#: ../src/modules/calendar/e-calendar-preferences.c:394
+#: ../src/modules/calendar/e-calendar-preferences.c:420
 msgid "Select…"
 msgstr "选择…"
 
@@ -8907,51 +8961,51 @@ msgstr "出席者"
 #: ../src/calendar/gui/e-meeting-list-view.c:176
 #: ../src/calendar/gui/e-meeting-store.c:110
 #: ../src/calendar/gui/e-meeting-store.c:127
-#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1287
 msgid "Individual"
 msgstr "个人"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:177
 #: ../src/calendar/gui/e-meeting-store.c:112
-#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1288
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "组"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:178
 #: ../src/calendar/gui/e-meeting-store.c:114
-#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1289
 msgid "Resource"
 msgstr "资源"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:116
-#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1290
 msgid "Room"
 msgstr "房间"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:190
 #: ../src/calendar/gui/e-meeting-store.c:145
-#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1304
 msgid "Chair"
 msgstr "主席"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:191
 #: ../src/calendar/gui/e-meeting-store.c:147
 #: ../src/calendar/gui/e-meeting-store.c:164
-#: ../src/calendar/gui/e-meeting-store.c:1074 ../src/calendar/gui/print.c:1279
+#: ../src/calendar/gui/e-meeting-store.c:1074 ../src/calendar/gui/print.c:1305
 msgid "Required Participant"
 msgstr "必需的出席者"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:192
 #: ../src/calendar/gui/e-meeting-store.c:149
-#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1306
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:151
-#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1307
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -8980,17 +9034,17 @@ msgstr "已完成"
 msgid "In Process"
 msgstr "处理中"
 
-#: ../src/calendar/gui/e-meeting-store.c:2015
+#: ../src/calendar/gui/e-meeting-store.c:2014
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr "输入密码来作为用户 %2$s 访问服务器 %1$s 上的忙/闲信息"
 
-#: ../src/calendar/gui/e-meeting-store.c:2025
+#: ../src/calendar/gui/e-meeting-store.c:2024
 #, c-format
 msgid "Failure reason: %s"
 msgstr "失败原因:%s"
 
-#: ../src/calendar/gui/e-meeting-store.c:2030
+#: ../src/calendar/gui/e-meeting-store.c:2029
 #: ../src/e-util/e-collection-account-wizard.c:501
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
@@ -9071,7 +9125,7 @@ msgstr ""
 "位置:%s"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:2578
-#: ../src/calendar/gui/print.c:3616
+#: ../src/calendar/gui/print.c:3644
 #, c-format
 msgid "Summary: %s"
 msgstr "概要:%s"
@@ -9292,7 +9346,7 @@ msgstr "%s(%s)"
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../src/calendar/gui/e-week-view-main-item.c:224
-#: ../src/calendar/gui/print.c:2096
+#: ../src/calendar/gui/print.c:2122
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
@@ -9472,119 +9526,119 @@ msgstr[0] "%d 秒"
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:756
 msgid "Mo"
 msgstr "一"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:757
 msgid "Tu"
 msgstr "二"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:758
 msgid "We"
 msgstr "三"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:759
 msgid "Th"
 msgstr "四"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:734
+#: ../src/calendar/gui/print.c:760
 msgid "Fr"
 msgstr "五"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:735
+#: ../src/calendar/gui/print.c:761
 msgid "Sa"
 msgstr "六"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:736
+#: ../src/calendar/gui/print.c:762
 msgid "Su"
 msgstr "日"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3408
+#: ../src/calendar/gui/print.c:3434
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3418
+#: ../src/calendar/gui/print.c:3444
 msgid " (Completed "
 msgstr " (完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3424
+#: ../src/calendar/gui/print.c:3450
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3434
+#: ../src/calendar/gui/print.c:3460
 msgid " (Due "
 msgstr " (预定 "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../src/calendar/gui/print.c:3441
+#: ../src/calendar/gui/print.c:3467
 msgid "Due "
 msgstr "预定 "
 
-#: ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/print.c:3614
 msgid "Appointment"
 msgstr "约会"
 
-#: ../src/calendar/gui/print.c:3588 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3616 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "任务"
 
-#: ../src/calendar/gui/print.c:3590
+#: ../src/calendar/gui/print.c:3618
 msgid "Memo"
 msgstr "备忘"
 
-#: ../src/calendar/gui/print.c:3647
+#: ../src/calendar/gui/print.c:3675
 msgid "Attendees: "
 msgstr "出席者:"
 
-#: ../src/calendar/gui/print.c:3686
+#: ../src/calendar/gui/print.c:3714
 #, c-format
 msgid "Estimated duration: %s"
 msgstr "预计时长:%s"
 
-#: ../src/calendar/gui/print.c:3707
+#: ../src/calendar/gui/print.c:3735
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: ../src/calendar/gui/print.c:3723
+#: ../src/calendar/gui/print.c:3751
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级:%s"
 
-#: ../src/calendar/gui/print.c:3738
+#: ../src/calendar/gui/print.c:3766
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率:%i"
 
-#: ../src/calendar/gui/print.c:3753
+#: ../src/calendar/gui/print.c:3781
 #, c-format
 msgid "URL: %s"
 msgstr "URL:%s"
 
-#: ../src/calendar/gui/print.c:3769
+#: ../src/calendar/gui/print.c:3797
 #, c-format
 msgid "Categories: %s"
 msgstr "类别:%s"
 
-#: ../src/calendar/gui/print.c:3781
+#: ../src/calendar/gui/print.c:3809
 msgid "Contacts: "
 msgstr "联系人:"
 
@@ -9648,14 +9702,14 @@ msgstr "约会和会议"
 #: ../src/calendar/importers/icalendar-importer.c:334
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:89
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:279
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:181
 msgid "New Calendar"
 msgstr "新建日历"
 
 #: ../src/calendar/importers/icalendar-importer.c:337
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:287
 #: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "新建任务列表"
@@ -9706,25 +9760,25 @@ msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 日历智能导入器"
 
 #: ../src/calendar/importers/icalendar-importer.c:1354
-#: ../src/calendar/importers/icalendar-importer.c:1691
+#: ../src/calendar/importers/icalendar-importer.c:1743
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会议"
 
 #: ../src/calendar/importers/icalendar-importer.c:1354
-#: ../src/calendar/importers/icalendar-importer.c:1691
+#: ../src/calendar/importers/icalendar-importer.c:1743
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
 #: ../src/calendar/importers/icalendar-importer.c:1357
-#: ../src/calendar/importers/icalendar-importer.c:1692
+#: ../src/calendar/importers/icalendar-importer.c:1744
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "任务"
 
 #: ../src/calendar/importers/icalendar-importer.c:1360
-#: ../src/calendar/importers/icalendar-importer.c:1693
+#: ../src/calendar/importers/icalendar-importer.c:1745
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "备忘"
@@ -9777,7 +9831,7 @@ msgstr "分类"
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
 #: ../src/calendar/importers/icalendar-importer.c:1409
-#: ../src/calendar/importers/icalendar-importer.c:1736
+#: ../src/calendar/importers/icalendar-importer.c:1788
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "概要"
@@ -9791,7 +9845,7 @@ msgstr "位置"
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
 #: ../src/calendar/importers/icalendar-importer.c:1424
-#: ../src/calendar/importers/icalendar-importer.c:1731
+#: ../src/calendar/importers/icalendar-importer.c:1783
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "开始"
@@ -9834,20 +9888,19 @@ msgid "Organizer"
 msgstr "组织者"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1536
-#: ../src/calendar/importers/icalendar-importer.c:1539
+#: ../src/calendar/importers/icalendar-importer.c:1590
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../src/calendar/importers/icalendar-importer.c:1557
-#: ../src/calendar/importers/icalendar-importer.c:1565
+#: ../src/calendar/importers/icalendar-importer.c:1609
+#: ../src/calendar/importers/icalendar-importer.c:1617
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1726
+#: ../src/calendar/importers/icalendar-importer.c:1778
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "类型"
@@ -11416,12 +11469,12 @@ msgid "Open New Message window"
 msgstr "打开新建信息窗口"
 
 #: ../src/composer/e-composer-actions.c:347
-#: ../src/shell/e-shell-window-actions.c:996
+#: ../src/shell/e-shell-window-actions.c:1000
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
 #: ../src/composer/e-composer-actions.c:349
-#: ../src/shell/e-shell-window-actions.c:998
+#: ../src/shell/e-shell-window-actions.c:1002
 msgid "Configure Evolution"
 msgstr "配置 Evolution"
 
@@ -11462,58 +11515,74 @@ msgid "Send this message"
 msgstr "发送这条信息"
 
 #: ../src/composer/e-composer-actions.c:418
+msgid "_Main toolbar"
+msgstr "主工具栏(_M)"
+
+#: ../src/composer/e-composer-actions.c:420
+msgid "Main toolbar"
+msgstr "主工具栏"
+
+#: ../src/composer/e-composer-actions.c:426
+msgid "Edit _toolbar"
+msgstr "编辑工具栏(_T)"
+
+#: ../src/composer/e-composer-actions.c:428
+msgid "Edit toolbar"
+msgstr "编辑工具栏"
+
+#: ../src/composer/e-composer-actions.c:434
 msgid "PGP _Encrypt"
 msgstr "PGP 加密(_E)"
 
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:436
 msgid "Encrypt this message with PGP"
 msgstr "用 PGP 加密该信息"
 
-#: ../src/composer/e-composer-actions.c:426
+#: ../src/composer/e-composer-actions.c:442
 msgid "PGP _Sign"
 msgstr "PGP 签名(_S)"
 
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:444
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 密钥签名该信息"
 
-#: ../src/composer/e-composer-actions.c:434
+#: ../src/composer/e-composer-actions.c:450
 msgid "_Picture Gallery"
 msgstr "图片画廊(_P)"
 
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:452
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "显示一组图片,您可以将它们拖放到您的信息中"
 
-#: ../src/composer/e-composer-actions.c:442
+#: ../src/composer/e-composer-actions.c:458
 msgid "_Prioritize Message"
 msgstr "标为优先(_P)"
 
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:460
 msgid "Set the message priority to high"
 msgstr "将信息设定为高优先级"
 
-#: ../src/composer/e-composer-actions.c:450
+#: ../src/composer/e-composer-actions.c:466
 msgid "Re_quest Read Receipt"
 msgstr "请求已读回执(_Q)"
 
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:468
 msgid "Get delivery notification when your message is read"
 msgstr "当您的信息被阅读时得到投递通知"
 
-#: ../src/composer/e-composer-actions.c:458
+#: ../src/composer/e-composer-actions.c:474
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 加密(_C)"
 
-#: ../src/composer/e-composer-actions.c:460
+#: ../src/composer/e-composer-actions.c:476
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "用您的 S/MIME 加密证书加密该信息"
 
-#: ../src/composer/e-composer-actions.c:466
+#: ../src/composer/e-composer-actions.c:482
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 签名(_N)"
 
-#: ../src/composer/e-composer-actions.c:468
+#: ../src/composer/e-composer-actions.c:484
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 签名认证签名该信息"
 
@@ -11555,22 +11624,23 @@ msgstr "是否显示回复域"
 msgid "Visually _Wrap Long Lines"
 msgstr "对长行视觉上折行(_W)"
 
-#: ../src/composer/e-composer-actions.c:640
+#: ../src/composer/e-composer-actions.c:642
 msgid "Attach"
 msgstr "附件"
 
-#: ../src/composer/e-composer-actions.c:646
+#: ../src/composer/e-composer-actions.c:648
 msgid "Save Draft"
 msgstr "保存草稿"
 
 #: ../src/composer/e-composer-from-header.c:108
 #: ../src/e-util/e-collection-account-wizard.c:2101
 #: ../src/e-util/e-mail-signature-script-dialog.c:408
-#: ../src/e-util/e-webdav-browser.c:2555
+#: ../src/e-util/e-webdav-browser.c:2557
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
 #: ../src/mail/e-mail-config-identity-page.c:551
 #: ../src/mail/e-mail-config-summary-page.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
+#: ../src/modules/rss/evolution/e-rss-preferences.c:805
 msgid "_Name:"
 msgstr "名称(_N):"
 
@@ -11629,34 +11699,38 @@ msgstr "单击此处以使用地址簿"
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../src/composer/e-msg-composer.c:1074
+#: ../src/composer/e-composer-private.c:94
+msgid "Send"
+msgstr "发送"
+
+#: ../src/composer/e-msg-composer.c:1077
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信息签名:未对此帐号设置签名证书"
 
-#: ../src/composer/e-msg-composer.c:1083
+#: ../src/composer/e-msg-composer.c:1086
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
 
-#: ../src/composer/e-msg-composer.c:1884 ../src/composer/e-msg-composer.c:2561
+#: ../src/composer/e-msg-composer.c:1887 ../src/composer/e-msg-composer.c:2564
 msgid "Compose Message"
 msgstr "新建消息"
 
-#: ../src/composer/e-msg-composer.c:4697
+#: ../src/composer/e-msg-composer.c:4700
 #: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
 msgid "Reading text content…"
 msgstr "正在读取文本内容…"
 
-#: ../src/composer/e-msg-composer.c:5507
+#: ../src/composer/e-msg-composer.c:5510
 msgid "Review attachment before sending."
 msgid_plural "Review attachments before sending."
 msgstr[0] "发送前审查附件。"
 
-#: ../src/composer/e-msg-composer.c:5512
+#: ../src/composer/e-msg-composer.c:5515
 #, c-format
 msgid ""
 "There had been added %d attachment. Make sure it does not contain any "
@@ -11666,7 +11740,7 @@ msgid_plural ""
 "sensitive information before sending the message."
 msgstr[0] "已添加 %d 个附件。在发送消息之前,请确保它们不包含任何敏感信息。"
 
-#: ../src/composer/e-msg-composer.c:5645
+#: ../src/composer/e-msg-composer.c:5648
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "编写器含有不可编辑的非文本信体。"
 
@@ -11918,10 +11992,10 @@ msgstr "编辑信息时出错"
 msgid ""
 "A WebKitWebProcess crashed when editing the message. You can try again by "
 "closing the composer window and opening a new one. If the issue persists, "
-"please file a bug report in GNOME Gitlab."
+"please file a bug report in GNOME GitLab."
 msgstr ""
-"编辑信息时 WebKitWebProcess 崩溃。您可以通过关闭“编写器”窗口并打开一个新窗口"
-"来重试。如果问题仍然存在,请在 Gnome GitLab 中提交错误报告。"
+"编辑信息时 WebKitWebProcess 崩溃。您可以通过关闭编写器窗口并打开一个新窗口来"
+"重试。如果问题仍然存在,请在 Gnome GitLab 中提交缺陷报告。"
 
 #: ../src/composer/mail-composer.error.xml.h:58
 msgid "An error occurred while creating message composer."
@@ -11989,10 +12063,11 @@ msgid "Format part as an RFC822 message"
 msgstr "将部分格式化为 RFC822 信息"
 
 #: ../src/em-format/e-mail-formatter-print.c:50
-#: ../src/e-util/e-webdav-browser.c:2499
+#: ../src/e-util/e-webdav-browser.c:2501
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1316
 msgid "Name"
 msgstr "姓名"
 
@@ -12008,7 +12083,7 @@ msgstr "大小"
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
 #: ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:76
-#: ../src/smime/gui/certificate-manager.c:1625
+#: ../src/smime/gui/certificate-manager.c:1638
 msgid "Subject"
 msgstr "主题"
 
@@ -12033,6 +12108,8 @@ msgstr "以富文本显示部分"
 
 #: ../src/em-format/e-mail-formatter-quote-text-html.c:93
 #: ../src/em-format/e-mail-formatter-text-html.c:389
+#: ../src/modules/rss/evolution/e-rss-preferences.c:56
+#: ../src/modules/rss/evolution/e-rss-preferences.c:825
 msgid "HTML"
 msgstr "HTML"
 
@@ -12043,6 +12120,8 @@ msgstr "将部分格式化为 HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:130
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
+#: ../src/modules/rss/evolution/e-rss-preferences.c:51
+#: ../src/modules/rss/evolution/e-rss-preferences.c:826
 msgid "Plain Text"
 msgstr "纯文字"
 
@@ -12221,40 +12300,40 @@ msgstr "抄送"
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: ../src/em-format/e-mail-formatter-utils.c:579
+#: ../src/em-format/e-mail-formatter-utils.c:583
 msgid "GPG signed"
 msgstr "已经 GPG 签名"
 
-#: ../src/em-format/e-mail-formatter-utils.c:579
+#: ../src/em-format/e-mail-formatter-utils.c:583
 msgid "partially GPG signed"
 msgstr "部分 GPG 签名"
 
-#: ../src/em-format/e-mail-formatter-utils.c:580
+#: ../src/em-format/e-mail-formatter-utils.c:584
 msgid "GPG encrypted"
 msgstr "已经 GPG 加密"
 
-#: ../src/em-format/e-mail-formatter-utils.c:580
+#: ../src/em-format/e-mail-formatter-utils.c:584
 msgid "partially GPG encrypted"
 msgstr "部分 GPG 加密"
 
-#: ../src/em-format/e-mail-formatter-utils.c:581
+#: ../src/em-format/e-mail-formatter-utils.c:585
 msgid "S/MIME signed"
 msgstr "已经 S/MIME 签名"
 
-#: ../src/em-format/e-mail-formatter-utils.c:581
+#: ../src/em-format/e-mail-formatter-utils.c:585
 msgid "partially S/MIME signed"
 msgstr "部分 S/MIME 签名"
 
-#: ../src/em-format/e-mail-formatter-utils.c:582
+#: ../src/em-format/e-mail-formatter-utils.c:586
 msgid "S/MIME encrypted"
 msgstr "已经 S/MIME 加密"
 
-#: ../src/em-format/e-mail-formatter-utils.c:582
+#: ../src/em-format/e-mail-formatter-utils.c:586
 msgid "partially S/MIME encrypted"
 msgstr "部分 S/MIME 加密"
 
-#: ../src/em-format/e-mail-formatter-utils.c:695
-#: ../src/mail/e-mail-config-security-page.c:852
+#: ../src/em-format/e-mail-formatter-utils.c:699
+#: ../src/mail/e-mail-config-security-page.c:865
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:217
 msgid "Security"
@@ -12333,8 +12412,8 @@ msgstr "不支持的签名格式"
 msgid "Reply-To"
 msgstr "回复至"
 
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:585
-#: ../src/e-util/e-dateedit.c:608 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:612
+#: ../src/e-util/e-dateedit.c:635 ../src/mail/message-list.etspec.h:7
 #: ../src/modules/mail/em-mailer-prefs.c:77
 msgid "Date"
 msgstr "日期"
@@ -12374,34 +12453,34 @@ msgid "evolution calendar item"
 msgstr "evolution 日历项目"
 
 #: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
-#: ../src/e-util/e-accounts-window.c:894
+#: ../src/e-util/e-accounts-window.c:904
 #: ../src/modules/mail/e-mail-shell-backend.c:1131
 msgid "Mail Accounts"
 msgstr "邮件帐号"
 
-#: ../src/e-util/e-accounts-window.c:564 ../src/e-util/e-accounts-window.c:703
-#: ../src/e-util/e-accounts-window.c:908
+#: ../src/e-util/e-accounts-window.c:564 ../src/e-util/e-accounts-window.c:710
+#: ../src/e-util/e-accounts-window.c:918
 msgid "Address Books"
 msgstr "地址簿"
 
-#: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
-#: ../src/e-util/e-accounts-window.c:909
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:98
+#: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:711
+#: ../src/e-util/e-accounts-window.c:919
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:100
 msgid "Calendars"
 msgstr "日历"
 
-#: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
-#: ../src/e-util/e-accounts-window.c:910
+#: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:712
+#: ../src/e-util/e-accounts-window.c:920
 msgid "Memo Lists"
 msgstr "备忘录"
 
-#: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
-#: ../src/e-util/e-accounts-window.c:911
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:99
+#: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:713
+#: ../src/e-util/e-accounts-window.c:921
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:101
 msgid "Task Lists"
 msgstr "任务列表"
 
-#: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
+#: ../src/e-util/e-accounts-window.c:1409 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-tree-view.c:84
 #: ../src/modules/mail/em-composer-prefs.c:1354
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:405
@@ -12410,51 +12489,51 @@ msgstr "任务列表"
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../src/e-util/e-accounts-window.c:1415
+#: ../src/e-util/e-accounts-window.c:1425
 #: ../src/mail/e-mail-account-tree-view.c:108
 #: ../src/plugins/mail-notification/mail-notification.c:1195
 msgid "Account Name"
 msgstr "帐号名"
 
-#: ../src/e-util/e-accounts-window.c:1482
+#: ../src/e-util/e-accounts-window.c:1492
 msgid "Collection _Account"
 msgstr "收藏帐号(_A)"
 
-#: ../src/e-util/e-accounts-window.c:1483
+#: ../src/e-util/e-accounts-window.c:1493
 msgid "_Mail Account"
 msgstr "邮件帐号(_M)"
 
-#: ../src/e-util/e-accounts-window.c:1484
+#: ../src/e-util/e-accounts-window.c:1494
 msgid "Address _Book"
 msgstr "地址簿(_B)"
 
-#: ../src/e-util/e-accounts-window.c:1485
+#: ../src/e-util/e-accounts-window.c:1495
 msgid "_Calendar"
 msgstr "日历(_C)"
 
-#: ../src/e-util/e-accounts-window.c:1486
+#: ../src/e-util/e-accounts-window.c:1496
 msgid "M_emo List"
 msgstr "备忘列表"
 
-#: ../src/e-util/e-accounts-window.c:1487
+#: ../src/e-util/e-accounts-window.c:1497
 msgid "_Task List"
 msgstr "任务列表(_T)"
 
-#: ../src/e-util/e-accounts-window.c:1684
+#: ../src/e-util/e-accounts-window.c:1694
 msgid "Evolution Accounts"
 msgstr "Evolution 帐号"
 
 #. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
 #. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 #. webdav_browser->priv->permissions_button = widget;
-#: ../src/e-util/e-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2866
-#: ../src/mail/em-subscription-editor.c:1945
+#: ../src/e-util/e-accounts-window.c:1771 ../src/e-util/e-webdav-browser.c:2868
+#: ../src/mail/em-subscription-editor.c:1927
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1594
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
-#: ../src/e-util/e-accounts-window.c:1762
+#: ../src/e-util/e-accounts-window.c:1772
 msgid "Initiates refresh of account sources"
 msgstr "启动帐户源的刷新"
 
@@ -12578,7 +12657,7 @@ msgstr "文件名(_I):"
 #: ../src/e-util/e-attachment-dialog.c:334
 #: ../src/e-util/e-html-editor-image-dialog.c:602
 #: ../src/e-util/e-html-editor-link-dialog.c:228
-#: ../src/e-util/e-webdav-browser.c:2611
+#: ../src/e-util/e-webdav-browser.c:2613
 msgid "_Description:"
 msgstr "描述(_D):"
 
@@ -12779,25 +12858,25 @@ msgstr "将任务列表内容复制到本地以进行离线操作"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "将备忘录内容复制到本地以进行离线操作"
 
-#: ../src/e-util/e-categories-editor.c:269
+#: ../src/e-util/e-categories-editor.c:270
 msgid "Currently _used categories:"
 msgstr "当前使用的分类(_U):"
 
-#: ../src/e-util/e-categories-editor.c:280
+#: ../src/e-util/e-categories-editor.c:281
 msgid "_Available Categories:"
 msgstr "可用类别(_A):"
 
-#: ../src/e-util/e-categories-editor.c:320
+#: ../src/e-util/e-categories-editor.c:321
 msgctxt "category"
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../src/e-util/e-categories-editor.c:324
+#: ../src/e-util/e-categories-editor.c:325
 msgctxt "category"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/e-util/e-categories-editor.c:328
+#: ../src/e-util/e-categories-editor.c:329
 msgctxt "category"
 msgid "_Delete"
 msgstr "删除(_D)"
@@ -12811,31 +12890,31 @@ msgstr "图标"
 msgid "Create category “%s”"
 msgstr "创建分类 \"%s\""
 
-#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
+#: ../src/e-util/e-category-editor.c:166 ../src/e-util/e-category-editor.c:231
 msgid "Category Icon"
 msgstr "类别图标"
 
-#: ../src/e-util/e-category-editor.c:171
+#: ../src/e-util/e-category-editor.c:170
 msgid "_No Image"
 msgstr "无图像(_N)"
 
-#: ../src/e-util/e-category-editor.c:205
+#: ../src/e-util/e-category-editor.c:204
 msgid "Category _Name"
 msgstr "类别名字(_N)"
 
-#: ../src/e-util/e-category-editor.c:218
+#: ../src/e-util/e-category-editor.c:217
 msgid "Category _Icon"
 msgstr "类别图标(_I)"
 
-#: ../src/e-util/e-category-editor.c:234
+#: ../src/e-util/e-category-editor.c:233
 msgid "_Unset icon"
 msgstr "取消设置图标(_U)"
 
-#: ../src/e-util/e-category-editor.c:260
+#: ../src/e-util/e-category-editor.c:255
 msgid "Category Properties"
 msgstr "类别属性"
 
-#: ../src/e-util/e-category-editor.c:321
+#: ../src/e-util/e-category-editor.c:318
 #, c-format
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
@@ -12847,7 +12926,7 @@ msgid "popup list"
 msgstr "弹出列表"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:138
-#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2181
+#: ../src/e-util/e-cell-date.c:158 ../src/mail/message-list.c:2189
 msgid "?"
 msgstr "?"
 
@@ -13049,7 +13128,7 @@ msgstr[0] "找到 %d 个候选项"
 #: ../src/e-util/e-collection-account-wizard.c:667
 #: ../src/modules/book-config-google/evolution-book-config-google.c:101
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1070
-#: ../src/modules/cal-config-google/e-cal-config-google.c:188
+#: ../src/modules/cal-config-google/e-cal-config-google.c:187
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:116
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:445
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:484
@@ -13065,7 +13144,7 @@ msgstr "用户名(_U):"
 
 #: ../src/e-util/e-collection-account-wizard.c:703
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:764
+#: ../src/smime/gui/certificate-manager.c:767
 msgid "_Password:"
 msgstr "密码(_P):"
 
@@ -13075,7 +13154,7 @@ msgid "_Remember password"
 msgstr "记住密码(_R)"
 
 #: ../src/e-util/e-collection-account-wizard.c:863
-#: ../src/e-util/e-webdav-browser.c:536
+#: ../src/e-util/e-webdav-browser.c:537
 msgid "Collection"
 msgstr "收藏"
 
@@ -13098,7 +13177,7 @@ msgid "Memo List"
 msgstr "备忘列表"
 
 #: ../src/e-util/e-collection-account-wizard.c:869
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
 msgid "Task List"
 msgstr "任务列表"
 
@@ -13159,9 +13238,9 @@ msgstr "选择自定义颜色"
 
 #: ../src/e-util/e-color-combo.c:476 ../src/e-util/e-html-editor.c:133
 #: ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:540
-#: ../src/mail/e-mail-config-security-page.c:704
-#: ../src/mail/e-mail-reader.c:5005 ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:541
+#: ../src/mail/e-mail-config-security-page.c:717
+#: ../src/mail/e-mail-reader.c:5020 ../src/mail/mail-config.ui.h:79
 msgid "Default"
 msgstr "默认"
 
@@ -13329,53 +13408,53 @@ msgstr "白色"
 msgid "Running…"
 msgstr "正在运行…"
 
-#: ../src/e-util/e-dateedit.c:550
+#: ../src/e-util/e-dateedit.c:577
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../src/e-util/e-dateedit.c:584
+#: ../src/e-util/e-dateedit.c:611
 msgid "Text entry to input date"
 msgstr "输入日期的文本框"
 
-#: ../src/e-util/e-dateedit.c:607
+#: ../src/e-util/e-dateedit.c:634
 msgid "Click this button to show a calendar"
 msgstr "单击此按钮可显示日历"
 
-#: ../src/e-util/e-dateedit.c:667
+#: ../src/e-util/e-dateedit.c:694
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../src/e-util/e-dateedit.c:668
+#: ../src/e-util/e-dateedit.c:695
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "时间"
 
-#: ../src/e-util/e-dateedit.c:745
+#: ../src/e-util/e-dateedit.c:772
 msgid "No_w"
 msgstr "现在(_W)"
 
-#: ../src/e-util/e-dateedit.c:752
+#: ../src/e-util/e-dateedit.c:779
 msgid "_Today"
 msgstr "今天(_T)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:761 ../src/mail/em-folder-selector.c:334
+#: ../src/e-util/e-dateedit.c:788 ../src/mail/em-folder-selector.c:334
 msgid "_None"
 msgstr "无(_N)"
 
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1928 ../src/e-util/e-dateedit.c:2181
+#: ../src/e-util/e-dateedit.c:1959 ../src/e-util/e-dateedit.c:2212
 msgctxt "date"
 msgid "None"
 msgstr "无"
 
-#: ../src/e-util/e-dateedit.c:2064 ../src/e-util/e-dateedit.c:2535
+#: ../src/e-util/e-dateedit.c:2095 ../src/e-util/e-dateedit.c:2566
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../src/e-util/e-dateedit.c:2104 ../src/e-util/e-dateedit.c:2592
+#: ../src/e-util/e-dateedit.c:2135 ../src/e-util/e-dateedit.c:2623
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
@@ -13744,7 +13823,7 @@ msgstr "查找符合下列条件的项目"
 #: ../src/e-util/e-mail-identity-combo-box.c:798
 #: ../src/e-util/e-mail-signature-combo-box.c:422
 #: ../src/libemail-engine/camel-null-store.c:29
-#: ../src/mail/e-mail-autoconfig.c:856
+#: ../src/mail/e-mail-autoconfig.c:863
 #: ../src/mail/e-mail-config-summary-page.c:143
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
@@ -13775,11 +13854,11 @@ msgid "A_dd Condition"
 msgstr "添加条件(_D)"
 
 #: ../src/e-util/e-filter-rule.c:1515 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-filter-rule.c:982 ../src/mail/em-utils.c:166
+#: ../src/mail/em-filter-rule.c:986 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "接收"
 
-#: ../src/e-util/e-filter-rule.c:1515 ../src/mail/em-filter-rule.c:983
+#: ../src/e-util/e-filter-rule.c:1515 ../src/mail/em-filter-rule.c:987
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "寄出"
@@ -14433,31 +14512,31 @@ msgstr "横线(_R)"
 msgid "_Table"
 msgstr "表格(_T)"
 
-#: ../src/e-util/e-html-editor-actions.c:2439 ../src/e-util/e-html-editor.c:953
+#: ../src/e-util/e-html-editor-actions.c:2439 ../src/e-util/e-html-editor.c:973
 msgid "Editing Mode"
 msgstr "编辑模式"
 
-#: ../src/e-util/e-html-editor.c:939
+#: ../src/e-util/e-html-editor.c:959
 msgid "Paragraph Style"
 msgstr "段落样式"
 
-#: ../src/e-util/e-html-editor.c:966
+#: ../src/e-util/e-html-editor.c:986
 msgid "Font Color"
 msgstr "字体颜色"
 
-#: ../src/e-util/e-html-editor.c:977
+#: ../src/e-util/e-html-editor.c:997
 msgid "Background Color"
 msgstr "背景颜色"
 
-#: ../src/e-util/e-html-editor.c:987
+#: ../src/e-util/e-html-editor.c:1007
 msgid "Font Size"
 msgstr "字体大小"
 
-#: ../src/e-util/e-html-editor.c:996
+#: ../src/e-util/e-html-editor.c:1016
 msgid "Font Name"
 msgstr "字体名称"
 
-#: ../src/e-util/e-html-editor.c:2094
+#: ../src/e-util/e-html-editor.c:2131
 msgid "Failed to obtain content of editor"
 msgstr "获取编辑器内容失败"
 
@@ -14771,7 +14850,7 @@ msgid "Background Image"
 msgstr "背景图像"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:523
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:101
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:103
 msgid "_Template:"
 msgstr "模板(_T):"
 
@@ -14907,7 +14986,7 @@ msgstr "边距(_P):"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:676
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2565
+#: ../src/e-util/e-webdav-browser.c:2567
 msgid "_Color:"
 msgstr "颜色(_C):"
 
@@ -15037,7 +15116,7 @@ msgstr "单击“应用”以便开始将文件导入到 Evolution。"
 
 #. Translators: This is part of
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:627
+#: ../src/mail/e-mail-config-provider-page.c:695
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:21
 msgid "minutes"
 msgstr "分钟"
@@ -15058,19 +15137,19 @@ msgstr "天"
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: ../src/e-util/e-mail-signature-editor.c:331 ../src/mail/e-mail-notes.c:1109
+#: ../src/e-util/e-mail-signature-editor.c:330 ../src/mail/e-mail-notes.c:1106
 msgid "Close"
 msgstr "关闭"
 
-#: ../src/e-util/e-mail-signature-editor.c:336 ../src/mail/e-mail-notes.c:1114
+#: ../src/e-util/e-mail-signature-editor.c:335 ../src/mail/e-mail-notes.c:1111
 msgid "_Save and Close"
 msgstr "保存并关闭(_S)"
 
-#: ../src/e-util/e-mail-signature-editor.c:559
+#: ../src/e-util/e-mail-signature-editor.c:573
 msgid "Edit Signature"
 msgstr "编辑签名"
 
-#: ../src/e-util/e-mail-signature-editor.c:592
+#: ../src/e-util/e-mail-signature-editor.c:600
 msgid "_Signature Name:"
 msgstr "签名(_S):"
 
@@ -15192,33 +15271,33 @@ msgstr "正在打开任务列表“%s”"
 msgid "Opening address book “%s”"
 msgstr "正在打开地址簿“%s”"
 
-#: ../src/e-util/e-misc-utils.c:3392
+#: ../src/e-util/e-misc-utils.c:3488
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "不再显示此信息(_D)"
 
-#: ../src/e-util/e-misc-utils.c:4036
+#: ../src/e-util/e-misc-utils.c:4132
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "此地址簿服务器不可达,或服务器名称拼错,又或者您的网络连接已断。"
 
-#: ../src/e-util/e-misc-utils.c:4048
+#: ../src/e-util/e-misc-utils.c:4144
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "无法将协议版本设置为 LDAPv3(%d):%s"
 
-#: ../src/e-util/e-misc-utils.c:4083
+#: ../src/e-util/e-misc-utils.c:4179
 #, c-format
 msgid "Failed to use STARTTLS (%d): %s"
 msgstr "无法使用 STARTTLS(%d):%s"
 
-#: ../src/e-util/e-misc-utils.c:4096
+#: ../src/e-util/e-misc-utils.c:4192
 #, c-format
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "与 LDAP 服务器认证失败 (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4110
+#: ../src/e-util/e-misc-utils.c:4206
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -15232,7 +15311,7 @@ msgstr ""
 "\n"
 "详细错误(%d):%s"
 
-#: ../src/e-util/e-misc-utils.c:4121
+#: ../src/e-util/e-misc-utils.c:4217
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -15241,12 +15320,12 @@ msgstr ""
 "此 LDAP 服务器可能使用较早版本的 LDAP,所以无法支持此功能,或者是配置错误。请"
 "询问您的管理员有关支持的搜索基础一事。"
 
-#: ../src/e-util/e-misc-utils.c:4154
+#: ../src/e-util/e-misc-utils.c:4250
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolution 编译时未提供 LDAP 支持"
 
 #. Translators: %s is the language ISO code.
-#: ../src/e-util/e-misc-utils.c:4477
+#: ../src/e-util/e-misc-utils.c:4573
 #, c-format
 msgctxt "language"
 msgid "Unknown (%s)"
@@ -15254,31 +15333,31 @@ msgstr "未知 (%s)"
 
 #. Translators: The first %s is the language name, and the
 #. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-misc-utils.c:4486
+#: ../src/e-util/e-misc-utils.c:4582
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../src/e-util/e-misc-utils.c:4664
+#: ../src/e-util/e-misc-utils.c:4760
 #, c-format
 msgid "Click to call %s"
 msgstr "单击以呼叫 %s"
 
-#: ../src/e-util/e-misc-utils.c:4666
+#: ../src/e-util/e-misc-utils.c:4762
 msgid "Click to hide/unhide addresses"
 msgstr "单击可隐藏/显示地址"
 
-#: ../src/e-util/e-misc-utils.c:4679
+#: ../src/e-util/e-misc-utils.c:4775
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "转到信息的 %s 部分"
 
-#: ../src/e-util/e-misc-utils.c:4681
+#: ../src/e-util/e-misc-utils.c:4777
 msgid "Go to the beginning of the message"
 msgstr "转到信息的开头"
 
-#: ../src/e-util/e-misc-utils.c:4687
+#: ../src/e-util/e-misc-utils.c:4783
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
@@ -15362,27 +15441,27 @@ msgstr "Evolution 目前离线。单击该按钮可在线工作。"
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "因为网络不可用,所以 Evolution 目前离线。"
 
-#: ../src/e-util/e-passwords.c:125
+#: ../src/e-util/e-passwords.c:131
 msgid "Keyring key is unusable: no user or host name"
 msgstr "密匙环键不可用:无用户或主机名"
 
-#: ../src/e-util/e-passwords.c:445
+#: ../src/e-util/e-passwords.c:451
 msgid "You have the Caps Lock key on."
 msgstr "您的大写锁定键打开着。"
 
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this passphrase"
 msgstr "记住该密码短语(_R)"
 
-#: ../src/e-util/e-passwords.c:578
+#: ../src/e-util/e-passwords.c:584
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "在该会话内记住该提醒器的密码短语(_R)"
 
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:589
 msgid "_Remember this password"
 msgstr "记住该密码(_R)"
 
-#: ../src/e-util/e-passwords.c:584
+#: ../src/e-util/e-passwords.c:590
 msgid "_Remember this password for the remainder of this session"
 msgstr "在该会话内记住该提醒器的密码(_R)"
 
@@ -15687,7 +15766,7 @@ msgstr "类型:"
 msgid "Name:"
 msgstr "名称:"
 
-#: ../src/e-util/e-source-config.c:815 ../src/e-util/e-webdav-browser.c:1858
+#: ../src/e-util/e-source-config.c:815 ../src/e-util/e-webdav-browser.c:1860
 msgid "Name cannot be empty"
 msgstr "名称不能为空"
 
@@ -15734,7 +15813,7 @@ msgstr "管理群组"
 msgid "Available Groups:"
 msgstr "可用组:"
 
-#: ../src/e-util/e-source-selector-dialog.c:317
+#: ../src/e-util/e-source-selector-dialog.c:327
 msgid "Select destination"
 msgstr "选择目标位置"
 
@@ -15853,10 +15932,10 @@ msgstr "出了一点问题"
 msgid ""
 "A WebKitWebProcess crashed when displaying the content. You can try again by "
 "reopening the window. If the issue persists, please file a bug report in "
-"GNOME Gitlab."
+"GNOME GitLab."
 msgstr ""
-"某个 WebKitWebProcess 进程在显示内容时崩溃了。您可以重新打开窗口再试一次。如"
-"果这个问题一直存在,请在 GNOME GitLab 上提交一个错误报告。"
+"显示内容时 WebKitWebProcess 崩溃。您可以通过重新打开该窗口来重试。如果问题仍"
+"然存在,请在 Gnome GitLab 中提交缺陷报告。"
 
 #: ../src/e-util/e-system.error.xml.h:25
 msgid "Are you sure you want to delete remote collection “{0}”?"
@@ -16066,7 +16145,7 @@ msgid "Format Column_s…"
 msgstr "格式化列(_S)…"
 
 #: ../src/e-util/e-table-header-item.c:1661
-#: ../src/shell/e-shell-window-actions.c:1290
+#: ../src/shell/e-shell-window-actions.c:1294
 msgid "Custo_mize Current View…"
 msgstr "自定义当前视图(_M)…"
 
@@ -16145,136 +16224,136 @@ msgstr "标志"
 msgid "Identity"
 msgstr "标识"
 
-#: ../src/e-util/e-webdav-browser.c:510 ../src/mail/filtertypes.xml.in.h:64
+#: ../src/e-util/e-webdav-browser.c:511 ../src/mail/filtertypes.xml.in.h:64
 #: ../src/mail/searchtypes.xml.in.h:56 ../src/mail/vfoldertypes.xml.in.h:58
 msgid "Address book"
 msgstr "地址簿"
 
-#: ../src/e-util/e-webdav-browser.c:521
+#: ../src/e-util/e-webdav-browser.c:522
 msgid "Events"
 msgstr "事件"
 
-#: ../src/e-util/e-webdav-browser.c:594 ../src/mail/em-folder-tree-model.c:1593
-#: ../src/mail/em-folder-tree-model.c:1981
-#: ../src/modules/cal-config-weather/e-weather-location-entry.c:957
+#: ../src/e-util/e-webdav-browser.c:595 ../src/mail/em-folder-tree-model.c:1630
+#: ../src/mail/em-folder-tree-model.c:2018
+#: ../src/modules/cal-config-weather/e-weather-location-entry.c:893
 msgid "Loading…"
 msgstr "正在载入……"
 
-#: ../src/e-util/e-webdav-browser.c:1447
+#: ../src/e-util/e-webdav-browser.c:1449
 msgid "Searching collection children…"
 msgstr "正在搜索集合子项…"
 
-#: ../src/e-util/e-webdav-browser.c:1449
+#: ../src/e-util/e-webdav-browser.c:1451
 msgid "Failed to search for collection children"
 msgstr "未能搜索集合子集"
 
-#: ../src/e-util/e-webdav-browser.c:1483
+#: ../src/e-util/e-webdav-browser.c:1485
 msgid "Searching for user home, please wait…"
 msgstr "正在搜索用户主页,请稍候…"
 
-#: ../src/e-util/e-webdav-browser.c:1485
+#: ../src/e-util/e-webdav-browser.c:1487
 msgid "Failed to search for user home"
 msgstr "搜索用户主页失败"
 
-#: ../src/e-util/e-webdav-browser.c:1874
+#: ../src/e-util/e-webdav-browser.c:1876
 msgid "At least one component type should be set"
 msgstr "至少应设置一个组件类型"
 
-#: ../src/e-util/e-webdav-browser.c:1893
+#: ../src/e-util/e-webdav-browser.c:1895
 msgid "Failed to get selected collection HREF"
 msgstr "无法获取所选集合 HREF"
 
-#: ../src/e-util/e-webdav-browser.c:1926
+#: ../src/e-util/e-webdav-browser.c:1928
 msgid "Failed to save changes"
 msgstr "保存更改失败"
 
-#: ../src/e-util/e-webdav-browser.c:1928
+#: ../src/e-util/e-webdav-browser.c:1930
 msgid "Creating new book…"
 msgstr "正在创建新地址簿…"
 
-#: ../src/e-util/e-webdav-browser.c:1929
+#: ../src/e-util/e-webdav-browser.c:1931
 msgid "Failed to create new book"
 msgstr "创建新地址簿失败"
 
-#: ../src/e-util/e-webdav-browser.c:1931
+#: ../src/e-util/e-webdav-browser.c:1933
 msgid "Creating new calendar…"
 msgstr "创建新日历…"
 
-#: ../src/e-util/e-webdav-browser.c:1932
+#: ../src/e-util/e-webdav-browser.c:1934
 msgid "Failed to create new calendar"
 msgstr "创建新日历失败"
 
-#: ../src/e-util/e-webdav-browser.c:1934
+#: ../src/e-util/e-webdav-browser.c:1936
 msgid "Creating new collection…"
 msgstr "创建一个新集合…"
 
-#: ../src/e-util/e-webdav-browser.c:1935
+#: ../src/e-util/e-webdav-browser.c:1937
 msgid "Failed to create new collection"
 msgstr "创建新集合失败"
 
-#: ../src/e-util/e-webdav-browser.c:2085
+#: ../src/e-util/e-webdav-browser.c:2087
 msgid "It is not allowed to create book under another book or calendar"
 msgstr "不允许在其他地址簿或日历下创建地址簿"
 
 #. if (button == webdav_browser->priv->create_calendar_button)
-#: ../src/e-util/e-webdav-browser.c:2087
+#: ../src/e-util/e-webdav-browser.c:2089
 msgid "It is not allowed to create calendar under another book or calendar"
 msgstr "不允许在另一地址簿或日历下创建日历"
 
-#: ../src/e-util/e-webdav-browser.c:2334
+#: ../src/e-util/e-webdav-browser.c:2336
 msgid "Deleting book…"
 msgstr "正在删除地址簿…"
 
-#: ../src/e-util/e-webdav-browser.c:2335
+#: ../src/e-util/e-webdav-browser.c:2337
 msgid "Failed to delete book"
 msgstr "删除地址簿失败"
 
-#: ../src/e-util/e-webdav-browser.c:2338
+#: ../src/e-util/e-webdav-browser.c:2340
 msgid "Deleting calendar…"
 msgstr "正在删除日历……"
 
-#: ../src/e-util/e-webdav-browser.c:2339
+#: ../src/e-util/e-webdav-browser.c:2341
 msgid "Failed to delete calendar"
 msgstr "删除日历失败"
 
-#: ../src/e-util/e-webdav-browser.c:2342
+#: ../src/e-util/e-webdav-browser.c:2344
 msgid "Deleting collection…"
 msgstr "删除集合…"
 
-#: ../src/e-util/e-webdav-browser.c:2343
+#: ../src/e-util/e-webdav-browser.c:2345
 msgid "Failed to delete collection"
 msgstr "删除集合失败"
 
 #. Translators: It's 'order' as 'sorting order'
-#: ../src/e-util/e-webdav-browser.c:2577
+#: ../src/e-util/e-webdav-browser.c:2579
 msgid "_Order:"
 msgstr "顺序(_O):"
 
-#: ../src/e-util/e-webdav-browser.c:2587
+#: ../src/e-util/e-webdav-browser.c:2589
 msgid "Use -1 to not set the sort order"
 msgstr "使用 -1 则不设置排列顺序"
 
-#: ../src/e-util/e-webdav-browser.c:2593
+#: ../src/e-util/e-webdav-browser.c:2595
 msgid "For Components:"
 msgstr "对于组件:"
 
-#: ../src/e-util/e-webdav-browser.c:2599
+#: ../src/e-util/e-webdav-browser.c:2601
 msgid "_Events"
 msgstr "事件(_E)"
 
-#: ../src/e-util/e-webdav-browser.c:2792
+#: ../src/e-util/e-webdav-browser.c:2794
 msgid "WebDAV server:"
 msgstr "WebDAV 服务器:"
 
-#: ../src/e-util/e-webdav-browser.c:2827
+#: ../src/e-util/e-webdav-browser.c:2829
 msgid "Create _Book"
 msgstr "创建地址簿(_B)"
 
-#: ../src/e-util/e-webdav-browser.c:2834
+#: ../src/e-util/e-webdav-browser.c:2836
 msgid "Create _Calendar"
 msgstr "创建日历(_C)"
 
-#: ../src/e-util/e-webdav-browser.c:2841
+#: ../src/e-util/e-webdav-browser.c:2843
 msgid "Create Collectio_n"
 msgstr "创建集合(_N)"
 
@@ -16311,12 +16390,12 @@ msgid "Save the image to a file"
 msgstr "保存该图像为文件"
 
 #: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:201
-#: ../src/mail/e-mail-reader.c:2937
+#: ../src/mail/e-mail-reader.c:2952
 msgid "Search _Web…"
 msgstr "搜索互联网(_W)…"
 
 #: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:203
-#: ../src/mail/e-mail-reader.c:2939
+#: ../src/mail/e-mail-reader.c:2954
 msgid "Search the Web with the selected text"
 msgstr "在网上搜索选中的文本"
 
@@ -16644,9 +16723,9 @@ msgstr "无效的文件夹 URI “%s”"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-properties.c:1473
-#: ../src/mail/em-folder-tree-model.c:1509
-#: ../src/mail/em-folder-tree-model.c:1539
+#: ../src/mail/em-folder-properties.c:1474
+#: ../src/mail/em-folder-tree-model.c:1543
+#: ../src/mail/em-folder-tree-model.c:1573
 #: ../src/mail/importers/kmail-libs.c:138
 #: ../src/modules/mail/e-mail-shell-view-private.c:1036
 #: ../src/modules/mail/e-mail-shell-view-private.c:1047
@@ -16655,8 +16734,8 @@ msgstr "收件箱"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1503
-#: ../src/mail/em-folder-tree-model.c:1543
+#: ../src/mail/em-folder-tree-model.c:1537
+#: ../src/mail/em-folder-tree-model.c:1577
 #: ../src/mail/importers/kmail-libs.c:144
 #: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Drafts"
@@ -16664,7 +16743,7 @@ msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1515
+#: ../src/mail/em-folder-tree-model.c:1549
 #: ../src/mail/importers/kmail-libs.c:140
 #: ../src/modules/mail/e-mail-shell-view-private.c:1038
 msgid "Outbox"
@@ -16672,8 +16751,8 @@ msgstr "发件箱"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/em-folder-tree-model.c:1520
-#: ../src/mail/em-folder-tree-model.c:1542
+#: ../src/mail/em-folder-tree-model.c:1554
+#: ../src/mail/em-folder-tree-model.c:1576
 #: ../src/mail/importers/kmail-libs.c:142
 #: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Sent"
@@ -16681,7 +16760,7 @@ msgstr "已发箱"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:125
-#: ../src/mail/em-folder-tree-model.c:1505
+#: ../src/mail/em-folder-tree-model.c:1539
 #: ../src/mail/importers/kmail-libs.c:146
 #: ../src/modules/mail/e-mail-shell-view-private.c:1042
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
@@ -16957,70 +17036,70 @@ msgstr "您可以拖放帐号名来重新排序。"
 msgid "De_fault"
 msgstr "默认(_F)"
 
-#: ../src/mail/e-mail-autoconfig.c:511
+#: ../src/mail/e-mail-autoconfig.c:512
 #, c-format
 msgid "Invalid URI: “%s”"
 msgstr "无效的 URI:“%s”"
 
-#: ../src/mail/e-mail-autoconfig.c:846
+#: ../src/mail/e-mail-autoconfig.c:853
 #, c-format
 msgid "Host: %s:%d"
 msgstr "主机:%s:%d"
 
-#: ../src/mail/e-mail-autoconfig.c:850
+#: ../src/mail/e-mail-autoconfig.c:857
 #, c-format
 msgid "User: %s"
 msgstr "用户:%s"
 
-#: ../src/mail/e-mail-autoconfig.c:854
+#: ../src/mail/e-mail-autoconfig.c:861
 #, c-format
 msgid "Security method: %s"
 msgstr "加密方法:%s"
 
-#: ../src/mail/e-mail-autoconfig.c:855
+#: ../src/mail/e-mail-autoconfig.c:862
 #: ../src/mail/e-mail-config-summary-page.c:146
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:856
+#: ../src/mail/e-mail-autoconfig.c:863
 #: ../src/mail/e-mail-config-summary-page.c:149
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:860
+#: ../src/mail/e-mail-autoconfig.c:867
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "认证机制:%s"
 
-#: ../src/mail/e-mail-autoconfig.c:1043
+#: ../src/mail/e-mail-autoconfig.c:1050
 msgid "No email address provided"
 msgstr "没有提供电子邮件地址"
 
-#: ../src/mail/e-mail-autoconfig.c:1052
+#: ../src/mail/e-mail-autoconfig.c:1059
 msgid "Missing domain in email address"
 msgstr "电子邮件地址中缺少域"
 
-#: ../src/mail/e-mail-autoconfig.c:1412
+#: ../src/mail/e-mail-autoconfig.c:1419
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:87
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:88
 msgid "IMAP server"
 msgstr "IMAP 服务器"
 
-#: ../src/mail/e-mail-autoconfig.c:1419
+#: ../src/mail/e-mail-autoconfig.c:1426
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:89
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:90
 msgid "POP3 server"
 msgstr "POP3 服务器"
 
-#: ../src/mail/e-mail-autoconfig.c:1426
+#: ../src/mail/e-mail-autoconfig.c:1433
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:91
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:92
 msgid "SMTP server"
 msgstr "SMTP 服务器"
 
-#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:921
-#: ../src/shell/e-shell-window-actions.c:928
-#: ../src/shell/e-shell-window-actions.c:935
+#: ../src/mail/e-mail-browser.c:168 ../src/shell/e-shell-window-actions.c:925
+#: ../src/shell/e-shell-window-actions.c:932
+#: ../src/shell/e-shell-window-actions.c:939
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -17028,6 +17107,22 @@ msgstr "关闭此窗口"
 msgid "(No Subject)"
 msgstr "(无主题)"
 
+#: ../src/mail/e-mail-browser.c:532 ../src/mail/mail-dialogs.ui.h:5
+#: ../src/modules/mail/e-mail-shell-view-private.c:1511
+msgid "Forward"
+msgstr "转发"
+
+#: ../src/mail/e-mail-browser.c:543 ../src/mail/e-mail-reader.c:2917
+#: ../src/modules/mail/e-mail-shell-view-private.c:1522
+msgid "Group Reply"
+msgstr "回复全部"
+
+#: ../src/mail/e-mail-browser.c:555 ../src/mail/e-mail-reader.c:5281
+#: ../src/mail/mail-dialogs.ui.h:9
+#: ../src/modules/mail/e-mail-shell-view-private.c:1534
+msgid "Reply"
+msgstr "回复"
+
 #. GtkAssistant's back button label.
 #: ../src/mail/e-mail-config-assistant.c:48
 msgid "Go _Back"
@@ -17322,15 +17417,19 @@ msgstr "账户名称不能为空"
 msgid "Looking up account details…"
 msgstr "正在查找帐号详情……"
 
-#: ../src/mail/e-mail-config-provider-page.c:585
+#: ../src/mail/e-mail-config-provider-page.c:489
+msgid "Advanced Options"
+msgstr "高级选项"
+
+#: ../src/mail/e-mail-config-provider-page.c:653
 msgid "Checking for New Mail"
 msgstr "检查新邮件"
 
-#: ../src/mail/e-mail-config-provider-page.c:601
+#: ../src/mail/e-mail-config-provider-page.c:669
 msgid "Check for _new messages every"
 msgstr "自动检查新信息的间隔(_N)"
 
-#: ../src/mail/e-mail-config-provider-page.c:751
+#: ../src/mail/e-mail-config-provider-page.c:819
 msgid "Receiving Options"
 msgstr "接收选项"
 
@@ -17347,11 +17446,12 @@ msgid "%s — %s"
 msgstr "%s — %s"
 
 #: ../src/mail/e-mail-config-security-page.c:456
-#: ../src/mail/em-folder-properties.c:1396 ../src/mail/mail-config.ui.h:35
+#: ../src/mail/em-folder-properties.c:1397 ../src/mail/mail-config.ui.h:35
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:622
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:53
+#: ../src/modules/calendar/e-calendar-preferences.c:648
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:55
 #: ../src/modules/mail/e-mail-shell-backend.c:1010
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1201
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "常规"
@@ -17360,98 +17460,102 @@ msgstr "常规"
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
-#: ../src/mail/e-mail-config-security-page.c:487
+#: ../src/mail/e-mail-config-security-page.c:488
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "PGP 加密 (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:496
+#: ../src/mail/e-mail-config-security-page.c:497
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP 密钥 ID (_K):"
 
-#: ../src/mail/e-mail-config-security-page.c:527
+#: ../src/mail/e-mail-config-security-page.c:528
 msgid "Si_gning algorithm:"
 msgstr "签名函数(_G):"
 
-#: ../src/mail/e-mail-config-security-page.c:543
-#: ../src/mail/e-mail-config-security-page.c:707
+#: ../src/mail/e-mail-config-security-page.c:544
+#: ../src/mail/e-mail-config-security-page.c:720
 #: ../src/mail/mail-config.ui.h:80
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:546
-#: ../src/mail/e-mail-config-security-page.c:710
+#: ../src/mail/e-mail-config-security-page.c:547
+#: ../src/mail/e-mail-config-security-page.c:723
 #: ../src/mail/mail-config.ui.h:81
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:549
-#: ../src/mail/e-mail-config-security-page.c:713
+#: ../src/mail/e-mail-config-security-page.c:550
+#: ../src/mail/e-mail-config-security-page.c:726
 #: ../src/mail/mail-config.ui.h:82
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:552
-#: ../src/mail/e-mail-config-security-page.c:716
+#: ../src/mail/e-mail-config-security-page.c:553
+#: ../src/mail/e-mail-config-security-page.c:729
 #: ../src/mail/mail-config.ui.h:83
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:568
+#: ../src/mail/e-mail-config-security-page.c:569
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息(_W)"
 
-#: ../src/mail/e-mail-config-security-page.c:580
+#: ../src/mail/e-mail-config-security-page.c:581
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "当使用此帐号时永远加密外发邮件(_R)"
 
-#: ../src/mail/e-mail-config-security-page.c:592
+#: ../src/mail/e-mail-config-security-page.c:593
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "当发送加密邮件时总是对自身加密(_M)"
 
-#: ../src/mail/e-mail-config-security-page.c:604
+#: ../src/mail/e-mail-config-security-page.c:605
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: ../src/mail/e-mail-config-security-page.c:616
+#: ../src/mail/e-mail-config-security-page.c:617
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr "优先为纯文本信息内嵌签名/加密信息(_I)"
 
-#: ../src/mail/e-mail-config-security-page.c:640
+#: ../src/mail/e-mail-config-security-page.c:629
+msgid "_Lookup keys for encryption in Web Key Directory (WKD)"
+msgstr "查询用于在网络密钥目录(WKD)中加密的密钥(_L)"
+
+#: ../src/mail/e-mail-config-security-page.c:653
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:649
+#: ../src/mail/e-mail-config-security-page.c:662
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N):"
 
-#: ../src/mail/e-mail-config-security-page.c:673
-#: ../src/mail/e-mail-config-security-page.c:771
+#: ../src/mail/e-mail-config-security-page.c:686
+#: ../src/mail/e-mail-config-security-page.c:784
 msgid "Select"
 msgstr "选择"
 
-#: ../src/mail/e-mail-config-security-page.c:682
-#: ../src/mail/e-mail-config-security-page.c:780
-#: ../src/shell/e-shell-window-actions.c:1024
+#: ../src/mail/e-mail-config-security-page.c:695
+#: ../src/mail/e-mail-config-security-page.c:793
+#: ../src/shell/e-shell-window-actions.c:1028
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../src/mail/e-mail-config-security-page.c:691
+#: ../src/mail/e-mail-config-security-page.c:704
 msgid "Signing _algorithm:"
 msgstr "签名函数(_A):"
 
-#: ../src/mail/e-mail-config-security-page.c:732
+#: ../src/mail/e-mail-config-security-page.c:745
 msgid "Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../src/mail/e-mail-config-security-page.c:747
+#: ../src/mail/e-mail-config-security-page.c:760
 msgid "Encryption certificate:"
 msgstr "加密证书:"
 
-#: ../src/mail/e-mail-config-security-page.c:789
+#: ../src/mail/e-mail-config-security-page.c:802
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "当使用此帐号时永远加密外发邮件"
 
-#: ../src/mail/e-mail-config-security-page.c:801
+#: ../src/mail/e-mail-config-security-page.c:814
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "当发送加密邮件时总是对自身加密"
 
@@ -17704,13 +17808,13 @@ msgstr "待办(_T)"
 msgid "_Later"
 msgstr "稍候(_L)"
 
-#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:913
-#: ../src/mail/em-folder-properties.c:1170
+#: ../src/mail/e-mail-label-manager.c:153 ../src/mail/e-mail-reader.c:914
+#: ../src/mail/em-folder-properties.c:1171
 msgid "Add Label"
 msgstr "添加标签"
 
 #: ../src/mail/e-mail-label-manager.c:204
-#: ../src/mail/em-folder-properties.c:1197
+#: ../src/mail/em-folder-properties.c:1198
 msgid "Edit Label"
 msgstr "编辑标签"
 
@@ -17724,27 +17828,27 @@ msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
 msgid "Color"
 msgstr "颜色"
 
-#: ../src/mail/e-mail-notes.c:359 ../src/mail/e-mail-notes.c:779
+#: ../src/mail/e-mail-notes.c:360 ../src/mail/e-mail-notes.c:780
 msgid "Message Note"
 msgstr "消息附带的便笺"
 
-#: ../src/mail/e-mail-notes.c:697
+#: ../src/mail/e-mail-notes.c:698
 msgid "Cannot find message in its folder summary"
 msgstr "未在所在文件夹的摘要中找到邮件"
 
-#: ../src/mail/e-mail-notes.c:924
+#: ../src/mail/e-mail-notes.c:925
 msgid "Failed to convert text to message"
 msgstr "无法将文本转换为信息"
 
-#: ../src/mail/e-mail-notes.c:938 ../src/mail/e-mail-notes.c:963
+#: ../src/mail/e-mail-notes.c:939 ../src/mail/e-mail-notes.c:964
 msgid "Storing changes…"
 msgstr "正在存储更改……"
 
-#: ../src/mail/e-mail-notes.c:1144
+#: ../src/mail/e-mail-notes.c:1182
 msgid "Edit Message Note"
 msgstr "编辑消息附带的便笺"
 
-#: ../src/mail/e-mail-notes.c:1291
+#: ../src/mail/e-mail-notes.c:1295
 msgid "Retrieving message…"
 msgstr "正在获取信息……"
 
@@ -17785,715 +17889,703 @@ msgstr "信头"
 msgid "Page %d of %d"
 msgstr "第 %d 页,共 %d 页"
 
-#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:68
+#: ../src/mail/e-mail-reader.c:360 ../src/mail/filtertypes.xml.in.h:68
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../src/mail/e-mail-reader.c:359 ../src/mail/filtertypes.xml.in.h:69
+#: ../src/mail/e-mail-reader.c:360 ../src/mail/filtertypes.xml.in.h:69
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:364 ../src/mail/em-folder-utils.c:568
 #: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../src/mail/e-mail-reader.c:363 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:364 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../src/mail/e-mail-reader.c:618
+#: ../src/mail/e-mail-reader.c:619
 msgid "Deleting message note…"
 msgstr "删除消息附带的便笺…"
 
-#: ../src/mail/e-mail-reader.c:1703 ../src/mail/e-mail-reader.c:1995
-#: ../src/mail/e-mail-reader.c:2035
+#: ../src/mail/e-mail-reader.c:1704 ../src/mail/e-mail-reader.c:1996
+#: ../src/mail/e-mail-reader.c:2036
 msgid "_Do not ask me again."
 msgstr "不再询问(_D)。"
 
-#: ../src/mail/e-mail-reader.c:2041
+#: ../src/mail/e-mail-reader.c:2042
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
 
-#: ../src/mail/e-mail-reader.c:2245
+#: ../src/mail/e-mail-reader.c:2246
 msgid "Failed to retrieve message:"
 msgstr "获取信息失败:"
 
-#: ../src/mail/e-mail-reader.c:2304 ../src/mail/e-mail-reader.c:3818
+#: ../src/mail/e-mail-reader.c:2305 ../src/mail/e-mail-reader.c:3833
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "正在获取信息“%s”"
 
-#: ../src/mail/e-mail-reader.c:2508
+#: ../src/mail/e-mail-reader.c:2509
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
-#: ../src/mail/e-mail-reader.c:2510
+#: ../src/mail/e-mail-reader.c:2511
 msgid "Add sender to address book"
 msgstr "将发件人添加到地址簿"
 
-#: ../src/mail/e-mail-reader.c:2515
+#: ../src/mail/e-mail-reader.c:2516
 msgid "_Archive…"
 msgstr "归档(_A)…"
 
-#: ../src/mail/e-mail-reader.c:2517
+#: ../src/mail/e-mail-reader.c:2518
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "把选中的信息移至账户的归档文件夹"
 
-#: ../src/mail/e-mail-reader.c:2522
+#: ../src/mail/e-mail-reader.c:2523
 msgid "Check for _Junk"
 msgstr "检查垃圾信息(_J)"
 
-#: ../src/mail/e-mail-reader.c:2524
+#: ../src/mail/e-mail-reader.c:2525
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信息标记为垃圾信息"
 
-#: ../src/mail/e-mail-reader.c:2529
+#: ../src/mail/e-mail-reader.c:2530
 msgid "Assign C_olor…"
 msgstr "分配颜色(_O)…"
 
-#: ../src/mail/e-mail-reader.c:2531
+#: ../src/mail/e-mail-reader.c:2532
 msgid "Assign color for the selected messages"
 msgstr "为所选信息指定颜色"
 
-#: ../src/mail/e-mail-reader.c:2536
+#: ../src/mail/e-mail-reader.c:2537
 msgid "Unse_t Color"
 msgstr "重置颜色(_T)"
 
-#: ../src/mail/e-mail-reader.c:2538
+#: ../src/mail/e-mail-reader.c:2539
 msgid "Unset color for the selected messages"
 msgstr "取消设置所选消息的颜色"
 
-#: ../src/mail/e-mail-reader.c:2543
+#: ../src/mail/e-mail-reader.c:2544
 msgid "_Copy to Folder…"
 msgstr "复制到文件夹(_C)…"
 
-#: ../src/mail/e-mail-reader.c:2545
+#: ../src/mail/e-mail-reader.c:2546
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信息复制到其它文件夹"
 
-#: ../src/mail/e-mail-reader.c:2550
+#: ../src/mail/e-mail-reader.c:2551
 msgid "_Delete Message"
 msgstr "删除信息(_D)"
 
-#: ../src/mail/e-mail-reader.c:2552
+#: ../src/mail/e-mail-reader.c:2553
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信息做删除标记"
 
-#: ../src/mail/e-mail-reader.c:2557
+#: ../src/mail/e-mail-reader.c:2558
 msgid "_Add note…"
 msgstr "添加便笺(_A)…"
 
-#: ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2560
 msgid "Add a note for the selected message"
 msgstr "为选中消息添加便笺"
 
-#: ../src/mail/e-mail-reader.c:2564
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Delete no_te"
 msgstr "删除便笺(_T)"
 
-#: ../src/mail/e-mail-reader.c:2566
+#: ../src/mail/e-mail-reader.c:2567
 msgid "Delete the note for the selected message"
 msgstr "为选中消息删除便笺"
 
-#: ../src/mail/e-mail-reader.c:2571
+#: ../src/mail/e-mail-reader.c:2572
 msgid "_Edit note…"
 msgstr "编辑便笺(_E)…"
 
-#: ../src/mail/e-mail-reader.c:2573
+#: ../src/mail/e-mail-reader.c:2574
 msgid "Edit a note for the selected message"
 msgstr "编辑选中消息的便笺"
 
-#: ../src/mail/e-mail-reader.c:2578
+#: ../src/mail/e-mail-reader.c:2579
 msgid "Create a Filter Rule for Mailing _List…"
 msgstr "为邮件列表创建一条过滤规则(_L)…"
 
-#: ../src/mail/e-mail-reader.c:2580
+#: ../src/mail/e-mail-reader.c:2581
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建可过滤寄往此邮件列表的信息的规则"
 
-#: ../src/mail/e-mail-reader.c:2585
+#: ../src/mail/e-mail-reader.c:2586
 msgid "Create a Filter Rule for _Recipients…"
 msgstr "为收件人创建一条过滤规则(_R)…"
 
-#: ../src/mail/e-mail-reader.c:2587
+#: ../src/mail/e-mail-reader.c:2588
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建可过滤寄往这些收件人的信息的规则"
 
-#: ../src/mail/e-mail-reader.c:2592
+#: ../src/mail/e-mail-reader.c:2593
 msgid "Create a Filter Rule for Se_nder…"
 msgstr "为发件人创建一条过滤规则(_N)…"
 
-#: ../src/mail/e-mail-reader.c:2594
+#: ../src/mail/e-mail-reader.c:2595
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建可过滤此人寄来的信息的规则"
 
-#: ../src/mail/e-mail-reader.c:2599
+#: ../src/mail/e-mail-reader.c:2600
 msgid "Create a Filter Rule for _Subject…"
 msgstr "为主题创建一条过滤规则(_S)…"
 
-#: ../src/mail/e-mail-reader.c:2601
+#: ../src/mail/e-mail-reader.c:2602
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建可过滤此主题信息的规则"
 
-#: ../src/mail/e-mail-reader.c:2606
+#: ../src/mail/e-mail-reader.c:2607
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../src/mail/e-mail-reader.c:2608
+#: ../src/mail/e-mail-reader.c:2609
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信息"
 
-#: ../src/mail/e-mail-reader.c:2613
+#: ../src/mail/e-mail-reader.c:2614
 msgid "_Find in Message…"
 msgstr "在信息中查找(_F)…"
 
-#: ../src/mail/e-mail-reader.c:2615
+#: ../src/mail/e-mail-reader.c:2616
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信息的主体中搜索文本"
 
-#: ../src/mail/e-mail-reader.c:2620
+#: ../src/mail/e-mail-reader.c:2621
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../src/mail/e-mail-reader.c:2622
+#: ../src/mail/e-mail-reader.c:2623
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "删除选中信息的跟随标志"
 
-#: ../src/mail/e-mail-reader.c:2627
+#: ../src/mail/e-mail-reader.c:2628
 msgid "_Flag Completed"
 msgstr "标志为已完成(_F)"
 
-#: ../src/mail/e-mail-reader.c:2629
+#: ../src/mail/e-mail-reader.c:2630
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置选中信息的跟随标志为已完成"
 
-#: ../src/mail/e-mail-reader.c:2634
+#: ../src/mail/e-mail-reader.c:2635
 msgid "Follow _Up…"
 msgstr "跟随(_U)…"
 
-#: ../src/mail/e-mail-reader.c:2636
+#: ../src/mail/e-mail-reader.c:2637
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信息添加跟随标志"
 
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:2642
+#: ../src/modules/mail/e-mail-attachment-handler.c:389
+msgid "_Forward"
+msgstr "转发(_F)"
+
+#: ../src/mail/e-mail-reader.c:2644
+#: ../src/modules/mail/e-mail-attachment-handler.c:391
+msgid "Forward the selected message to someone"
+msgstr "把选中信息转发给某人"
+
+#: ../src/mail/e-mail-reader.c:2649
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../src/mail/e-mail-reader.c:2643 ../src/mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:2651 ../src/mail/e-mail-reader.c:2658
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信息作为附件转发给某人"
 
-#: ../src/mail/e-mail-reader.c:2648
+#: ../src/mail/e-mail-reader.c:2656
 msgid "Forward As _Attached"
 msgstr "作为附件转发(_A)"
 
-#: ../src/mail/e-mail-reader.c:2655
+#: ../src/mail/e-mail-reader.c:2663
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../src/mail/e-mail-reader.c:2657 ../src/mail/e-mail-reader.c:2664
+#: ../src/mail/e-mail-reader.c:2665 ../src/mail/e-mail-reader.c:2672
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转发选中信息"
 
-#: ../src/mail/e-mail-reader.c:2662
+#: ../src/mail/e-mail-reader.c:2670
 msgid "Forward As _Inline"
 msgstr "嵌入正文转发(_I)"
 
-#: ../src/mail/e-mail-reader.c:2669
+#: ../src/mail/e-mail-reader.c:2677
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2671 ../src/mail/e-mail-reader.c:2678
+#: ../src/mail/e-mail-reader.c:2679 ../src/mail/e-mail-reader.c:2686
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选中的信息"
 
-#: ../src/mail/e-mail-reader.c:2676
+#: ../src/mail/e-mail-reader.c:2684
 msgid "Forward As _Quoted"
 msgstr "作为引用转发(_Q)"
 
-#: ../src/mail/e-mail-reader.c:2683
+#: ../src/mail/e-mail-reader.c:2691
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/mail/e-mail-reader.c:2692
+#: ../src/mail/e-mail-reader.c:2700
 msgid "N_one"
 msgstr "无(_O)"
 
-#: ../src/mail/e-mail-reader.c:2699
+#: ../src/mail/e-mail-reader.c:2707
 msgid "_Load Images"
 msgstr "载入图像(_L)"
 
-#: ../src/mail/e-mail-reader.c:2701
+#: ../src/mail/e-mail-reader.c:2709
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制载入 HTML 邮件中的图像"
 
-#: ../src/mail/e-mail-reader.c:2706 ../src/mail/e-mail-reader.c:3132
+#: ../src/mail/e-mail-reader.c:2714 ../src/mail/e-mail-reader.c:3147
 msgid "_Ignore Subthread"
 msgstr "忽略子会话(_I)"
 
-#: ../src/mail/e-mail-reader.c:2708
+#: ../src/mail/e-mail-reader.c:2716
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "标记此子会话的新邮件为自动阅读"
 
-#: ../src/mail/e-mail-reader.c:2713 ../src/mail/e-mail-reader.c:3136
+#: ../src/mail/e-mail-reader.c:2721 ../src/mail/e-mail-reader.c:3151
 msgid "_Ignore Thread"
 msgstr "忽略会话(_I)"
 
-#: ../src/mail/e-mail-reader.c:2715
+#: ../src/mail/e-mail-reader.c:2723
 msgid "Mark new mails in this thread as read automatically"
 msgstr "标记此会话的新邮件为自动阅读"
 
-#: ../src/mail/e-mail-reader.c:2720
+#: ../src/mail/e-mail-reader.c:2728
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../src/mail/e-mail-reader.c:2722
+#: ../src/mail/e-mail-reader.c:2730
 msgid "Mark the selected messages as important"
 msgstr "把选中信息标记为重要邮件"
 
-#: ../src/mail/e-mail-reader.c:2727
+#: ../src/mail/e-mail-reader.c:2735
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../src/mail/e-mail-reader.c:2729
+#: ../src/mail/e-mail-reader.c:2737
 msgid "Mark the selected messages as junk"
 msgstr "把选中信息标记为垃圾信息"
 
-#: ../src/mail/e-mail-reader.c:2734
+#: ../src/mail/e-mail-reader.c:2742
 msgid "_Not Junk"
 msgstr "非垃圾(_N)"
 
-#: ../src/mail/e-mail-reader.c:2736
+#: ../src/mail/e-mail-reader.c:2744
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信息标记为非垃圾信息"
 
-#: ../src/mail/e-mail-reader.c:2741
+#: ../src/mail/e-mail-reader.c:2749
 msgid "_Read"
 msgstr "已读(_R)"
 
-#: ../src/mail/e-mail-reader.c:2743
+#: ../src/mail/e-mail-reader.c:2751
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信息标记为已读"
 
-#: ../src/mail/e-mail-reader.c:2748 ../src/mail/e-mail-reader.c:3156
+#: ../src/mail/e-mail-reader.c:2756 ../src/mail/e-mail-reader.c:3171
 msgid "Do not _Ignore Subthread"
 msgstr "不要忽略子会话(_I)"
 
-#: ../src/mail/e-mail-reader.c:2750
+#: ../src/mail/e-mail-reader.c:2758
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "不要标记此子会话的新邮件为自动阅读"
 
-#: ../src/mail/e-mail-reader.c:2755 ../src/mail/e-mail-reader.c:3160
+#: ../src/mail/e-mail-reader.c:2763 ../src/mail/e-mail-reader.c:3175
 msgid "Do not _Ignore Thread"
 msgstr "不要忽略会话(_I)"
 
-#: ../src/mail/e-mail-reader.c:2757
+#: ../src/mail/e-mail-reader.c:2765
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "不要标记此会话中的新邮件为自动阅读"
 
-#: ../src/mail/e-mail-reader.c:2762
+#: ../src/mail/e-mail-reader.c:2770
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../src/mail/e-mail-reader.c:2764
+#: ../src/mail/e-mail-reader.c:2772
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信息标记为不重要"
 
-#: ../src/mail/e-mail-reader.c:2769
+#: ../src/mail/e-mail-reader.c:2777
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../src/mail/e-mail-reader.c:2771
+#: ../src/mail/e-mail-reader.c:2779
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信息标记为未读"
 
-#: ../src/mail/e-mail-reader.c:2776
+#: ../src/mail/e-mail-reader.c:2784
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
 msgid "_Edit as New Message…"
 msgstr "作为新信息进行编辑(_E)…"
 
-#: ../src/mail/e-mail-reader.c:2778
+#: ../src/mail/e-mail-reader.c:2786
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 msgid "Open the selected messages in the composer for editing"
 msgstr "在编辑器中打开选中的信息以便编辑"
 
-#: ../src/mail/e-mail-reader.c:2783
+#: ../src/mail/e-mail-reader.c:2791
 msgid "Compose _New Message"
 msgstr "撰写新信息(_N)"
 
-#: ../src/mail/e-mail-reader.c:2785
+#: ../src/mail/e-mail-reader.c:2793
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以撰写信息"
 
-#: ../src/mail/e-mail-reader.c:2790
+#: ../src/mail/e-mail-reader.c:2798
 msgid "_Open in New Window"
 msgstr "在新窗口中打开(_O)"
 
-#: ../src/mail/e-mail-reader.c:2792
+#: ../src/mail/e-mail-reader.c:2800
 msgid "Open the selected messages in a new window"
 msgstr "在新窗口中打开选中的信息"
 
-#: ../src/mail/e-mail-reader.c:2797
+#: ../src/mail/e-mail-reader.c:2805
 msgid "_Move to Folder…"
 msgstr "移至文件夹(_M)…"
 
-#: ../src/mail/e-mail-reader.c:2799
+#: ../src/mail/e-mail-reader.c:2807
 msgid "Move selected messages to another folder"
 msgstr "把选中的信息移至其它文件夹"
 
-#: ../src/mail/e-mail-reader.c:2804
+#: ../src/mail/e-mail-reader.c:2812
 msgid "_Next Message"
 msgstr "下一封信(_N)"
 
-#: ../src/mail/e-mail-reader.c:2806
+#: ../src/mail/e-mail-reader.c:2814
 msgid "Display the next message"
 msgstr "显示下一封信息"
 
-#: ../src/mail/e-mail-reader.c:2811
+#: ../src/mail/e-mail-reader.c:2819
 msgid "Next _Important Message"
 msgstr "下一封重要信息(_I)"
 
-#: ../src/mail/e-mail-reader.c:2813
+#: ../src/mail/e-mail-reader.c:2821
 msgid "Display the next important message"
 msgstr "显示下一封重要信息"
 
-#: ../src/mail/e-mail-reader.c:2818
+#: ../src/mail/e-mail-reader.c:2826
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ../src/mail/e-mail-reader.c:2820
+#: ../src/mail/e-mail-reader.c:2828
 msgid "Display the next thread"
 msgstr "显示下一条线索"
 
-#: ../src/mail/e-mail-reader.c:2825
+#: ../src/mail/e-mail-reader.c:2833
 msgid "Next _Unread Message"
 msgstr "下一封未读信息(_U)"
 
-#: ../src/mail/e-mail-reader.c:2827
+#: ../src/mail/e-mail-reader.c:2835
 msgid "Display the next unread message"
 msgstr "显示下一封未读信息"
 
-#: ../src/mail/e-mail-reader.c:2832
+#: ../src/mail/e-mail-reader.c:2840
 msgid "_Previous Message"
 msgstr "上一封信(_P)"
 
-#: ../src/mail/e-mail-reader.c:2834
+#: ../src/mail/e-mail-reader.c:2842
 msgid "Display the previous message"
 msgstr "显示上一封信息"
 
-#: ../src/mail/e-mail-reader.c:2839
+#: ../src/mail/e-mail-reader.c:2847
 msgid "Pr_evious Important Message"
 msgstr "上一封重要信息(_E)"
 
-#: ../src/mail/e-mail-reader.c:2841
+#: ../src/mail/e-mail-reader.c:2849
 msgid "Display the previous important message"
 msgstr "显示上一封重要信息"
 
-#: ../src/mail/e-mail-reader.c:2846
+#: ../src/mail/e-mail-reader.c:2854
 msgid "Previous T_hread"
 msgstr "上一条线索(_H)"
 
-#: ../src/mail/e-mail-reader.c:2848
+#: ../src/mail/e-mail-reader.c:2856
 msgid "Display the previous thread"
 msgstr "显示上一条线索"
 
-#: ../src/mail/e-mail-reader.c:2853
+#: ../src/mail/e-mail-reader.c:2861
 msgid "P_revious Unread Message"
 msgstr "上一封未读信息(_R)"
 
-#: ../src/mail/e-mail-reader.c:2855
+#: ../src/mail/e-mail-reader.c:2863
 msgid "Display the previous unread message"
 msgstr "显示上一封未读信息"
 
-#: ../src/mail/e-mail-reader.c:2862
+#: ../src/mail/e-mail-reader.c:2870
 msgid "Print this message"
 msgstr "打印该信息"
 
-#: ../src/mail/e-mail-reader.c:2869
+#: ../src/mail/e-mail-reader.c:2877
 msgid "Preview the message to be printed"
 msgstr "预览要打印的信息"
 
-#: ../src/mail/e-mail-reader.c:2874
+#: ../src/mail/e-mail-reader.c:2882
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "重发(_D)"
 
-#: ../src/mail/e-mail-reader.c:2876
+#: ../src/mail/e-mail-reader.c:2884
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信息重发(退回)给某人"
 
-#: ../src/mail/e-mail-reader.c:2881
+#: ../src/mail/e-mail-reader.c:2889
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../src/mail/e-mail-reader.c:2883
+#: ../src/mail/e-mail-reader.c:2891
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../src/mail/e-mail-reader.c:2888
+#: ../src/mail/e-mail-reader.c:2896
 msgid "Remove Du_plicate Messages"
 msgstr "移除重复的信息(_P)"
 
-#: ../src/mail/e-mail-reader.c:2890
+#: ../src/mail/e-mail-reader.c:2898
 msgid "Checks selected messages for duplicates"
 msgstr "检查所选信息中的重复信息"
 
-#: ../src/mail/e-mail-reader.c:2895 ../src/mail/em-composer-utils.c:4188
+#: ../src/mail/e-mail-reader.c:2903 ../src/mail/em-composer-utils.c:4188
 #: ../src/mail/mail.error.xml.h:28
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../src/mail/e-mail-reader.c:2897
+#: ../src/mail/e-mail-reader.c:2905
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信息的所有收件人撰写回复"
 
-#: ../src/mail/e-mail-reader.c:2902
+#: ../src/mail/e-mail-reader.c:2910
 msgid "Al_ternative Reply…"
 msgstr "备用回复(_T)…"
 
-#: ../src/mail/e-mail-reader.c:2904
+#: ../src/mail/e-mail-reader.c:2912
 msgid "Choose reply options for the selected message"
 msgstr "为所选邮件选择答复选项"
 
-#: ../src/mail/e-mail-reader.c:2909 ../src/mail/em-composer-utils.c:4183
+#: ../src/mail/e-mail-reader.c:2919
+msgid "Reply to the mailing list, or to all recipients"
+msgstr "为选中信息的邮件列表或全部收件人撰写回复"
+
+#: ../src/mail/e-mail-reader.c:2924 ../src/mail/em-composer-utils.c:4183
 #: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: ../src/mail/e-mail-reader.c:2911
+#: ../src/mail/e-mail-reader.c:2926
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信息的邮件列表撰写回复"
 
-#: ../src/mail/e-mail-reader.c:2916
+#: ../src/mail/e-mail-reader.c:2931
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../src/mail/e-mail-reader.c:2918
+#: ../src/mail/e-mail-reader.c:2933
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信息的发件人撰写回复"
 
-#: ../src/mail/e-mail-reader.c:2923
+#: ../src/mail/e-mail-reader.c:2938
 msgid "Repl_y with Template"
 msgstr "应用模板回复(_Y)"
 
-#: ../src/mail/e-mail-reader.c:2930
+#: ../src/mail/e-mail-reader.c:2945
 msgid "_Save as mbox…"
 msgstr "另存为 mbox 格式(_S)…"
 
-#: ../src/mail/e-mail-reader.c:2932
+#: ../src/mail/e-mail-reader.c:2947
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信息另存为 mbox 格式文件"
 
-#: ../src/mail/e-mail-reader.c:2944
+#: ../src/mail/e-mail-reader.c:2959
 msgid "_Message Source"
 msgstr "信息源代码(_M)"
 
-#: ../src/mail/e-mail-reader.c:2946
+#: ../src/mail/e-mail-reader.c:2961
 msgid "Show the raw email source of the message"
 msgstr "显示信息的原始邮件源代码"
 
-#: ../src/mail/e-mail-reader.c:2958
+#: ../src/mail/e-mail-reader.c:2973
 msgid "_Undelete Message"
 msgstr "取消删除信息(_U)"
 
-#: ../src/mail/e-mail-reader.c:2960
+#: ../src/mail/e-mail-reader.c:2975
 msgid "Undelete the selected messages"
 msgstr "取消选中信息的删除"
 
-#: ../src/mail/e-mail-reader.c:2965
+#: ../src/mail/e-mail-reader.c:2980
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: ../src/mail/e-mail-reader.c:2967
+#: ../src/mail/e-mail-reader.c:2982
 msgid "Reset the text to its original size"
 msgstr "把文本重新设置为原来的大小"
 
-#: ../src/mail/e-mail-reader.c:2972
+#: ../src/mail/e-mail-reader.c:2987
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../src/mail/e-mail-reader.c:2974
+#: ../src/mail/e-mail-reader.c:2989
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ../src/mail/e-mail-reader.c:2981
+#: ../src/mail/e-mail-reader.c:2996
 msgid "Decrease the text size"
 msgstr "减少文本大小"
 
-#: ../src/mail/e-mail-reader.c:2988
+#: ../src/mail/e-mail-reader.c:3003
 msgid "Cre_ate"
 msgstr "创建(_A)"
 
-#: ../src/mail/e-mail-reader.c:2995
+#: ../src/mail/e-mail-reader.c:3010
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../src/mail/e-mail-reader.c:3002
+#: ../src/mail/e-mail-reader.c:3017
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "转发为(_O)"
 
-#: ../src/mail/e-mail-reader.c:3009
+#: ../src/mail/e-mail-reader.c:3024
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../src/mail/e-mail-reader.c:3016
+#: ../src/mail/e-mail-reader.c:3031
 msgid "_Group Reply"
 msgstr "回复全部(_G)"
 
-#: ../src/mail/e-mail-reader.c:3023
+#: ../src/mail/e-mail-reader.c:3038
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../src/mail/e-mail-reader.c:3030
+#: ../src/mail/e-mail-reader.c:3045
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../src/mail/e-mail-reader.c:3037
+#: ../src/mail/e-mail-reader.c:3052
 msgid "_Message"
 msgstr "信息(_M)"
 
-#: ../src/mail/e-mail-reader.c:3044
+#: ../src/mail/e-mail-reader.c:3059
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../src/mail/e-mail-reader.c:3054
+#: ../src/mail/e-mail-reader.c:3069
 msgid "Create a Search Folder from Mailing _List…"
 msgstr "从邮件列表创建搜索文件夹(_L)…"
 
-#: ../src/mail/e-mail-reader.c:3056
+#: ../src/mail/e-mail-reader.c:3071
 msgid "Create a search folder for this mailing list"
 msgstr "为此邮件列表创建搜索文件夹"
 
-#: ../src/mail/e-mail-reader.c:3061
+#: ../src/mail/e-mail-reader.c:3076
 msgid "Create a Search Folder from Recipien_ts…"
 msgstr "从收件人创建搜索文件夹(_T)…"
 
-#: ../src/mail/e-mail-reader.c:3063
+#: ../src/mail/e-mail-reader.c:3078
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建搜索文件夹"
 
-#: ../src/mail/e-mail-reader.c:3068
+#: ../src/mail/e-mail-reader.c:3083
 msgid "Create a Search Folder from Sen_der…"
 msgstr "从发件人创建搜索文件夹(_D)…"
 
-#: ../src/mail/e-mail-reader.c:3070
+#: ../src/mail/e-mail-reader.c:3085
 msgid "Create a search folder for this sender"
 msgstr "为该发件人创建搜索文件夹"
 
-#: ../src/mail/e-mail-reader.c:3075
+#: ../src/mail/e-mail-reader.c:3090
 msgid "Create a Search Folder from S_ubject…"
 msgstr "从主题创建搜索文件夹(_U)…"
 
-#: ../src/mail/e-mail-reader.c:3077
+#: ../src/mail/e-mail-reader.c:3092
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建搜索文件夹"
 
-#: ../src/mail/e-mail-reader.c:3124
+#: ../src/mail/e-mail-reader.c:3139
 msgid "Mark for Follo_w Up…"
 msgstr "标记为跟随(_W)…"
 
-#: ../src/mail/e-mail-reader.c:3140
+#: ../src/mail/e-mail-reader.c:3155
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../src/mail/e-mail-reader.c:3144
+#: ../src/mail/e-mail-reader.c:3159
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../src/mail/e-mail-reader.c:3148
+#: ../src/mail/e-mail-reader.c:3163
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../src/mail/e-mail-reader.c:3152
+#: ../src/mail/e-mail-reader.c:3167
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../src/mail/e-mail-reader.c:3164
+#: ../src/mail/e-mail-reader.c:3179
 msgid "Mark as Uni_mportant"
 msgstr "标记为不重要(_M)"
 
-#: ../src/mail/e-mail-reader.c:3168
+#: ../src/mail/e-mail-reader.c:3183
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../src/mail/e-mail-reader.c:3220
+#: ../src/mail/e-mail-reader.c:3235
 msgid "_Caret Mode"
 msgstr "光标模式(_C)"
 
-#: ../src/mail/e-mail-reader.c:3222
+#: ../src/mail/e-mail-reader.c:3237
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信息的信体中显示闪烁光标"
 
-#: ../src/mail/e-mail-reader.c:3228
+#: ../src/mail/e-mail-reader.c:3243
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../src/mail/e-mail-reader.c:3230
+#: ../src/mail/e-mail-reader.c:3245
 msgid "Show messages with all email headers"
 msgstr "显示信息时显示所有信头"
 
-#: ../src/mail/e-mail-reader.c:3824
+#: ../src/mail/e-mail-reader.c:3839
 msgid "Retrieving message"
 msgstr "正在获取信息"
 
-#: ../src/mail/e-mail-reader.c:5197
-#: ../src/modules/mail/e-mail-attachment-handler.c:389
-msgid "_Forward"
-msgstr "转发(_F)"
-
-#: ../src/mail/e-mail-reader.c:5198
-#: ../src/modules/mail/e-mail-attachment-handler.c:391
-msgid "Forward the selected message to someone"
-msgstr "把选中信息转发给某人"
-
-#. For Translators: "Group Reply" will reply either to a mailing list
-#. * (if possible and if that configuration option is enabled), or else
-#. * it will reply to all. The word "Group" was chosen because it covers
-#. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:5217
-msgid "Group Reply"
-msgstr "回复全部"
-
-#: ../src/mail/e-mail-reader.c:5218
-msgid "Reply to the mailing list, or to all recipients"
-msgstr "为选中信息的邮件列表或全部收件人撰写回复"
-
-#: ../src/mail/e-mail-reader.c:5284 ../src/mail/filtertypes.xml.in.h:70
+#: ../src/mail/e-mail-reader.c:5260 ../src/mail/filtertypes.xml.in.h:70
 msgid "Delete"
 msgstr "删除"
 
-#: ../src/mail/e-mail-reader.c:5296
+#: ../src/mail/e-mail-reader.c:5270
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1327
 msgid "Next"
 msgstr "下一项"
 
-#: ../src/mail/e-mail-reader.c:5300
+#: ../src/mail/e-mail-reader.c:5274
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Previous"
 msgstr "上一项"
 
-#: ../src/mail/e-mail-reader.c:5309 ../src/mail/mail-dialogs.ui.h:9
-msgid "Reply"
-msgstr "回复"
-
 #: ../src/mail/e-mail-reader-utils.c:144
 msgid "Do not warn me again"
 msgstr "不要再警告我"
@@ -18790,7 +18882,7 @@ msgid "If any of the following conditions are met"
 msgstr "如果满足下列任一条件"
 
 #. and now for the action area
-#: ../src/mail/em-filter-editor.c:211 ../src/mail/em-filter-rule.c:1007
+#: ../src/mail/em-filter-editor.c:211 ../src/mail/em-filter-rule.c:1011
 msgid "Then"
 msgstr "然后"
 
@@ -18812,15 +18904,15 @@ msgctxt "mail-filter-rule"
 msgid "Any"
 msgstr "任意"
 
-#: ../src/mail/em-filter-rule.c:977
+#: ../src/mail/em-filter-rule.c:981
 msgid "Rul_e type:"
 msgstr "规则类型(_E):"
 
-#: ../src/mail/em-filter-rule.c:995
+#: ../src/mail/em-filter-rule.c:999
 msgid "_For Account:"
 msgstr "对于帐号(_F):"
 
-#: ../src/mail/em-filter-rule.c:1080
+#: ../src/mail/em-filter-rule.c:1084
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
@@ -18836,112 +18928,112 @@ msgstr "使用自定义图标(_U)"
 msgid "Use te_xt color"
 msgstr "使用文本颜色(_X)"
 
-#: ../src/mail/em-folder-properties.c:517
+#: ../src/mail/em-folder-properties.c:518
 msgid "Path:"
 msgstr "路径:"
 
-#: ../src/mail/em-folder-properties.c:526
+#: ../src/mail/em-folder-properties.c:527
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "未读信息数:"
 
-#: ../src/mail/em-folder-properties.c:537
+#: ../src/mail/em-folder-properties.c:538
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "总信息数:"
 
-#: ../src/mail/em-folder-properties.c:558
+#: ../src/mail/em-folder-properties.c:559
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "配额使用(%s):"
 
-#: ../src/mail/em-folder-properties.c:560
+#: ../src/mail/em-folder-properties.c:561
 #, c-format
 msgid "Quota usage"
 msgstr "配额使用"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:701
+#: ../src/mail/em-folder-properties.c:702
 msgid "_Send Account Override:"
 msgstr "发送帐号覆盖(_S):"
 
-#: ../src/mail/em-folder-properties.c:941
+#: ../src/mail/em-folder-properties.c:942
 msgid "Archive this folder using these settings:"
 msgstr "使用这些设置归档这个文件夹:"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:953
+#: ../src/mail/em-folder-properties.c:954
 msgctxt "autoarchive"
 msgid "Auto-_cleanup messages older than"
 msgstr "自动清理早于这段时间的邮件(_C)"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:966
+#: ../src/mail/em-folder-properties.c:967
 msgctxt "autoarchive"
 msgid "days"
 msgstr "天"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:968
+#: ../src/mail/em-folder-properties.c:969
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "周"
 
 #. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:970
+#: ../src/mail/em-folder-properties.c:971
 msgctxt "autoarchive"
 msgid "months"
 msgstr "月"
 
-#: ../src/mail/em-folder-properties.c:976
+#: ../src/mail/em-folder-properties.c:977
 msgid "Move messages to the default archive _folder"
 msgstr "将邮件移至默认的归档文件夹(_F)"
 
-#: ../src/mail/em-folder-properties.c:983
+#: ../src/mail/em-folder-properties.c:984
 msgid "_Move messages to:"
 msgstr "移动邮件到(_M):"
 
-#: ../src/mail/em-folder-properties.c:987
+#: ../src/mail/em-folder-properties.c:988
 msgid "Archive folder"
 msgstr "归档文件夹"
 
-#: ../src/mail/em-folder-properties.c:987
+#: ../src/mail/em-folder-properties.c:988
 msgid "Select folder to use for Archive"
 msgstr "选择要用于存档的文件夹"
 
-#: ../src/mail/em-folder-properties.c:991
+#: ../src/mail/em-folder-properties.c:992
 msgid "_Delete messages"
 msgstr "删除信息(_D)"
 
-#: ../src/mail/em-folder-properties.c:1346
+#: ../src/mail/em-folder-properties.c:1347
 msgid "Server Tag"
 msgstr "服务器标签"
 
-#: ../src/mail/em-folder-properties.c:1350 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1351 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "标签"
 
-#: ../src/mail/em-folder-properties.c:1399
+#: ../src/mail/em-folder-properties.c:1400
 msgid "Appearance"
 msgstr "外观"
 
 #. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
-#: ../src/mail/em-folder-properties.c:1403
+#: ../src/mail/em-folder-properties.c:1404
 msgid "Archive"
 msgstr "归档"
 
-#: ../src/mail/em-folder-properties.c:1406 ../src/mail/mail-config.ui.h:128
+#: ../src/mail/em-folder-properties.c:1407 ../src/mail/mail-config.ui.h:128
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "标签"
 
-#: ../src/mail/em-folder-properties.c:1484
+#: ../src/mail/em-folder-properties.c:1485
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
-#: ../src/mail/em-folder-properties.c:1723
+#: ../src/mail/em-folder-properties.c:1724
 msgid "Gathering folder properties"
 msgstr "正在收集文件夹属性"
 
@@ -18995,12 +19087,12 @@ msgstr "移动文件夹“%s”"
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../src/mail/em-folder-tree.c:2386 ../src/mail/message-list.c:2668
+#: ../src/mail/em-folder-tree.c:2386 ../src/mail/message-list.c:2676
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信息移至文件夹 %s"
 
-#: ../src/mail/em-folder-tree.c:2390 ../src/mail/message-list.c:2670
+#: ../src/mail/em-folder-tree.c:2390 ../src/mail/message-list.c:2678
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信息复制到文件夹 %s"
@@ -19011,18 +19103,18 @@ msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信息放到顶级文件夹存储"
 
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:460
-#: ../src/mail/em-folder-tree-model.c:462
+#: ../src/mail/em-folder-tree-model.c:463
+#: ../src/mail/em-folder-tree-model.c:465
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../src/mail/em-folder-tree-model.c:1540
+#: ../src/mail/em-folder-tree-model.c:1574
 #: ../src/mail/importers/kmail-libs.c:149
 #: ../src/modules/mail/e-mail-shell-view-private.c:1044
 msgid "Trash"
 msgstr "废件箱"
 
-#: ../src/mail/em-folder-tree-model.c:1541 ../src/mail/filtertypes.xml.in.h:41
+#: ../src/mail/em-folder-tree-model.c:1575 ../src/mail/filtertypes.xml.in.h:41
 #: ../src/mail/mail-config.ui.h:146 ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "垃圾"
@@ -19068,7 +19160,7 @@ msgid "Subscribe To _All"
 msgstr "订阅全部(_A)"
 
 #: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1883 ../src/mail/mail.error.xml.h:73
+#: ../src/mail/em-subscription-editor.c:1865 ../src/mail/mail.error.xml.h:73
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
@@ -19097,60 +19189,60 @@ msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../src/mail/em-subscription-editor.c:1724
+#: ../src/mail/em-subscription-editor.c:1714
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../src/mail/em-subscription-editor.c:1759
+#: ../src/mail/em-subscription-editor.c:1745
 msgid "_Account:"
 msgstr "帐号(_A):"
 
-#: ../src/mail/em-subscription-editor.c:1772
+#: ../src/mail/em-subscription-editor.c:1758
 msgid "Clear Search"
 msgstr "清除搜索"
 
-#: ../src/mail/em-subscription-editor.c:1789
+#: ../src/mail/em-subscription-editor.c:1775
 msgid "Sho_w items that contain:"
 msgstr "显示包含以下内容的项目(_W):"
 
-#: ../src/mail/em-subscription-editor.c:1836
+#: ../src/mail/em-subscription-editor.c:1818
 msgid "Subscribe to the selected folder"
 msgstr "订阅选定的文件夹"
 
-#: ../src/mail/em-subscription-editor.c:1837
+#: ../src/mail/em-subscription-editor.c:1819
 msgid "Su_bscribe"
 msgstr "订阅(_B)"
 
-#: ../src/mail/em-subscription-editor.c:1882
+#: ../src/mail/em-subscription-editor.c:1864
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1702
 msgid "Unsubscribe from the selected folder"
 msgstr "取消对选定文件夹的订阅"
 
-#: ../src/mail/em-subscription-editor.c:1922
+#: ../src/mail/em-subscription-editor.c:1904
 msgid "Collapse all folders"
 msgstr "折叠所有文件夹"
 
-#: ../src/mail/em-subscription-editor.c:1923
+#: ../src/mail/em-subscription-editor.c:1905
 msgid "C_ollapse All"
 msgstr "全部折叠(_O)"
 
-#: ../src/mail/em-subscription-editor.c:1933
+#: ../src/mail/em-subscription-editor.c:1915
 msgid "Expand all folders"
 msgstr "展开所有文件夹"
 
-#: ../src/mail/em-subscription-editor.c:1934
+#: ../src/mail/em-subscription-editor.c:1916
 msgid "E_xpand All"
 msgstr "全部展开(_X)"
 
-#: ../src/mail/em-subscription-editor.c:1944
+#: ../src/mail/em-subscription-editor.c:1926
 msgid "Refresh the folder list"
 msgstr "刷新文件夹列表"
 
-#: ../src/mail/em-subscription-editor.c:1956
+#: ../src/mail/em-subscription-editor.c:1938
 msgid "Stop the current operation"
 msgstr "停止当前操作"
 
-#: ../src/mail/em-subscription-editor.c:1957
+#: ../src/mail/em-subscription-editor.c:1939
 #: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "停止(_S)"
@@ -19948,7 +20040,7 @@ msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
 #: ../src/mail/mail-config.ui.h:101
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
@@ -20091,7 +20183,7 @@ msgstr "信息列表用户邮件头表"
 
 #: ../src/mail/mail-config.ui.h:138
 #: ../src/modules/addressbook/autocompletion-config.c:118
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:49
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:51
 msgid "Date/Time Format"
 msgstr "日期/时间格式"
 
@@ -20149,10 +20241,6 @@ msgstr "跟随"
 msgid "For Your Information"
 msgstr "给您的信息"
 
-#: ../src/mail/mail-dialogs.ui.h:5
-msgid "Forward"
-msgstr "转发"
-
 #: ../src/mail/mail-dialogs.ui.h:6
 msgid "No Response Necessary"
 msgstr "不必回复"
@@ -21040,10 +21128,10 @@ msgstr "显示消息时出错"
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
-"report in GNOME Gitlab."
+"report in GNOME GitLab."
 msgstr ""
 "显示消息时 WebKitWebProcess 崩溃。您可以通过移动到另一条消息并返回来重试。如"
-"果问题仍然存在,请在 Gnome GitLab 中提交错误报告。"
+"果问题仍然存在,请在 Gnome GitLab 中提交缺陷报告。"
 
 #: ../src/mail/mail.error.xml.h:211
 msgid "Something has gone wrong when displaying the signature"
@@ -21053,10 +21141,10 @@ msgstr "显示签名时出错"
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again "
 "by moving to another signature and back. If the issue persists, please file "
-"a bug report in GNOME Gitlab."
+"a bug report in GNOME GitLab."
 msgstr ""
 "显示签名时 WebKitWebProcess 崩溃。您可以通过移动到另一个签名并返回来重试。如"
-"果问题仍然存在,请在 Gnome GitLab 中提交错误报告。"
+"果问题仍然存在,请在 Gnome GitLab 中提交缺陷报告。"
 
 #: ../src/mail/mail.error.xml.h:213
 msgid "Are you sure you want to delete all the messages in the Junk folder?"
@@ -21189,57 +21277,57 @@ msgstr "生成信息列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2189
+#: ../src/mail/message-list.c:2197
 #: ../src/modules/itip-formatter/itip-view.c:286
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../src/mail/message-list.c:2198
+#: ../src/mail/message-list.c:2206
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../src/mail/message-list.c:2210
+#: ../src/mail/message-list.c:2218
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../src/mail/message-list.c:2218
+#: ../src/mail/message-list.c:2226
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../src/mail/message-list.c:2220
+#: ../src/mail/message-list.c:2228
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../src/mail/message-list.c:3116 ../src/mail/message-list.etspec.h:24
+#: ../src/mail/message-list.c:3124 ../src/mail/message-list.etspec.h:24
 msgid "User Header 1"
 msgstr "用户邮件头 1"
 
-#: ../src/mail/message-list.c:3117 ../src/mail/message-list.etspec.h:25
+#: ../src/mail/message-list.c:3125 ../src/mail/message-list.etspec.h:25
 msgid "User Header 2"
 msgstr "用户邮件头 2"
 
-#: ../src/mail/message-list.c:3118 ../src/mail/message-list.etspec.h:26
+#: ../src/mail/message-list.c:3126 ../src/mail/message-list.etspec.h:26
 msgid "User Header 3"
 msgstr "用户邮件头 3"
 
-#: ../src/mail/message-list.c:3523
+#: ../src/mail/message-list.c:3531
 msgid "Select all visible messages"
 msgstr "选中所有可见的信息"
 
-#: ../src/mail/message-list.c:4348 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4356 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "信息"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5931
+#: ../src/mail/message-list.c:5939
 msgid "Follow-up"
 msgstr "跟随"
 
-#: ../src/mail/message-list.c:6680 ../src/mail/message-list.c:7126
+#: ../src/mail/message-list.c:6688 ../src/mail/message-list.c:7134
 msgid "Generating message list…"
 msgstr "正在生成信息列表……"
 
-#: ../src/mail/message-list.c:6683
+#: ../src/mail/message-list.c:6691
 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 "
@@ -21250,7 +21338,7 @@ msgstr ""
 "示”信息过滤器;或通过“搜索→清除”菜单项清除搜索条件或更改上方的查询来重新搜"
 "索。"
 
-#: ../src/mail/message-list.c:6690
+#: ../src/mail/message-list.c:6698
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信息。"
 
@@ -21357,7 +21445,7 @@ msgid "New Address Book"
 msgstr "新地址簿"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:283
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "新建备忘录"
@@ -22016,31 +22104,31 @@ msgstr "使用 Bogofilter 过滤垃圾"
 msgid "Choose an Address Book"
 msgstr "选择一个地址簿"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:268
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:281
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:312
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:333
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:144
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:165
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:302
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:323
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:199
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:212
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:249
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:270
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:81
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:102
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:239
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:260
 #: ../src/modules/itip-formatter/itip-view.c:1920
 #: ../src/modules/itip-formatter/itip-view.c:2122
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:292
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:223
 msgid "Find Address Books"
 msgstr "查找地址簿"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:303
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:234
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
 
-#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:356
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:452
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:230
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:434
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:289
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:391
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:169
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:373
 msgid "URL is not a valid http:// nor https:// URL"
 msgstr "URL 不是有效的 http:// 或者 https:// URL"
 
@@ -22054,7 +22142,7 @@ msgstr "地址簿:"
 
 #: ../src/modules/book-config-google/evolution-book-config-google.c:102
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1071
-#: ../src/modules/cal-config-google/e-cal-config-google.c:189
+#: ../src/modules/cal-config-google/e-cal-config-google.c:188
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:117
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:446
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:485
@@ -22230,24 +22318,24 @@ msgstr "选择备忘录"
 msgid "Choose a Task List"
 msgstr "选择一个任务列表"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:348
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:285
 msgid "Find Calendars"
 msgstr "查找日历"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:351
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:288
 msgid "Find Memo Lists"
 msgstr "查找备忘录"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:354
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:291
 msgid "Find Task Lists"
 msgstr "查找任务列表"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:373
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:310
 #: ../src/modules/cal-config-local/evolution-cal-config-local.c:260
 msgid "Email:"
 msgstr "电子邮件:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:379
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Server handles meeting invitations"
 msgstr "服务器处理会议邀请"
 
@@ -22297,8 +22385,8 @@ msgstr "允许 Evolution 更新该文件"
 #. * 'London, United Kingdom'
 #. * You shouldn't need to translate this string unless the language has a different comma.
 #.
-#: ../src/modules/cal-config-weather/e-weather-location-entry.c:631
-#: ../src/modules/cal-config-weather/e-weather-location-entry.c:669
+#: ../src/modules/cal-config-weather/e-weather-location-entry.c:571
+#: ../src/modules/cal-config-weather/e-weather-location-entry.c:609
 #, c-format
 msgid "%s, %s"
 msgstr "%s,%s"
@@ -22309,33 +22397,33 @@ msgstr "%s,%s"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:253
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:199
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:322
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Fahrenheit (°F)"
 msgstr "华氏(°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:327
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:273
 msgid "Centigrade (°C)"
 msgstr "摄氏(°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:331
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:277
 msgid "Kelvin (K)"
 msgstr "开氏(K)"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:333
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:279
 msgid "Units:"
 msgstr "单位:"
 
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:396
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:333
 msgid "Location cannot be empty"
 msgstr "位置不能为空"
 
@@ -22343,11 +22431,11 @@ msgstr "位置不能为空"
 msgid "Choose Notes"
 msgstr "选择便笺"
 
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:337
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:274
 msgid "Find Notes"
 msgstr "查找便笺"
 
-#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:365
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:302
 msgid "File extension for new notes:"
 msgstr "新建便笺的文件扩展名:"
 
@@ -22434,45 +22522,45 @@ msgstr "备忘录选择器"
 msgid "Task List Selector"
 msgstr "任务列表选择器"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:522
+#: ../src/modules/calendar/e-calendar-preferences.c:548
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "选定日历来提醒通知"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:529
+#: ../src/modules/calendar/e-calendar-preferences.c:555
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "选定任务列表来提醒通知"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:613
+#: ../src/modules/calendar/e-calendar-preferences.c:639
 msgid "Meeting Invitations"
 msgstr "会议邀请"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:639
+#: ../src/modules/calendar/e-calendar-preferences.c:665
 msgid "_Delete message after acting"
 msgstr "操作后删除信息(_D)"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:646
+#: ../src/modules/calendar/e-calendar-preferences.c:672
 msgid "_Preserve existing reminder by default"
 msgstr "默认保留已有的提醒(_P)"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:653
+#: ../src/modules/calendar/e-calendar-preferences.c:679
 msgid "_Show invitation description provided by the sender"
 msgstr "显示发送者提供的邀请描述(_S)"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:667
-#: ../src/modules/calendar/e-calendar-preferences.c:698
+#: ../src/modules/calendar/e-calendar-preferences.c:693
+#: ../src/modules/calendar/e-calendar-preferences.c:724
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:682
+#: ../src/modules/calendar/e-calendar-preferences.c:708
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1159
+#: ../src/modules/calendar/e-calendar-preferences.c:1194
 msgid "Ti_me and date:"
 msgstr "时间和日期(_M):"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1160
+#: ../src/modules/calendar/e-calendar-preferences.c:1195
 msgid "_Date only:"
 msgstr "仅日期(_D):"
 
@@ -22538,256 +22626,264 @@ msgstr "_24 小时"
 
 #. Translators: This is part of
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:19
-msgid "Sh_orten event end time by"
-msgstr "缩短事件结束时间(_O)"
+msgid "Sh_orten event time by"
+msgstr "缩短事件时间(_O)"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:22
+msgid "End events earlier"
+msgstr "更早结束事件"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:23
+msgid "Start events later"
+msgstr "更晚开始事件"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:24
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:1801
 msgid "Work Week"
 msgstr "工作日"
 
 #. A weekday like "Monday" follows
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:24
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:26
 msgid "Wee_k starts on:"
 msgstr "一周开始于(_K):"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:25
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:27
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:26
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:28
 msgid "_Day begins:"
 msgstr "一天开始(_D):"
 
 #. Monday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:28
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Mon"
 msgstr "周一(_M)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:29
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Monday"
 msgstr "星期一"
 
 #. Tuesday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:31
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:33
 msgid "_Tue"
 msgstr "周二(_T)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:32
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Tuesday"
 msgstr "星期二"
 
 #. Wednesday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:34
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Wed"
 msgstr "周三(_W)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:35
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Wednesday"
 msgstr "星期三"
 
 #. Thursday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:37
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:39
 msgid "T_hu"
 msgstr "周四(_H)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:38
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Thursday"
 msgstr "星期四"
 
 #. Friday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:40
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:42
 msgid "_Fri"
 msgstr "周五(_F)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:41
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Friday"
 msgstr "星期五"
 
 #. Saturday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:43
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "_Sat"
 msgstr "周六(_S)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:44
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Saturday"
 msgstr "星期六"
 
 #. Sunday
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
 msgid "S_un"
 msgstr "周日(_U)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:47
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:49
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:50
 msgid "Day _ends:"
 msgstr "一天结束(_E):"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:51
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Create events, memos and tasks as _Private by default"
 msgstr "默认创建私密事件、备忘录和任务(_P)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:52
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Use ma_rkdown for Description in the component editor"
 msgstr "在组件编辑器中为描述使用 Ma_rkdown"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:54
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:56
 msgid "View Options"
 msgstr "视图选项"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:55
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
 msgid "_Time divisions:"
 msgstr "时间分割(_T):"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:56
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Show appointment end times in week and month view"
 msgstr "在周视图和月视图中显示约会结束时间(_S)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Show appointment _icons in the month view"
 msgstr "在月视图中显示约会图标(_I)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Show week _numbers"
 msgstr "显示周数(_N)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "在底部左侧的日历中以斜体显示重复发生的事件(_E)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Sc_roll Month View by a week"
 msgstr "通过一个周来滚动月视图(_R)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Start Month View with the c_urrent week"
 msgstr "用当前周开始月视图(_U)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Order days in Week View from _left to right"
 msgstr "在周视图中从左到右排序天数(_L)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Allo_w direct edit of event Summary"
 msgstr "允许直接编辑事件摘要(_W)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Hi_de cancelled events"
 msgstr "隐藏已取消事件(_D)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Alerts"
 msgstr "提醒"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Display"
 msgstr "显示"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Highlight t_asks due today"
 msgstr "高亮今天到期的任务(_A)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Highlight _overdue tasks"
 msgstr "高亮延期任务(_O)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Hid_e cancelled tasks"
 msgstr "隐藏已取消的任务(_E)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
 msgid "To Do bar"
 msgstr "待办栏"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Show Tasks without _Due date"
 msgstr "显示没有截止日期的任务(_D)"
 
 #. Translators: This constructs: Show [spinner] days
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
 msgctxt "to-do-bar-n-days"
 msgid "Show"
 msgstr "显示"
 
 #. Translators: This constructs: Show [spinner] days
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgctxt "to-do-bar-n-days"
 msgid "da_ys"
 msgstr "天(_Y)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "Display Reminders window with _notifications"
 msgstr "显示带有通知的提醒窗口(_N)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 msgid "Keep reminder notification _window always on top"
 msgstr "将提醒通知窗口始终放在最前面(_W)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Enable de_sktop notifications"
 msgstr "启用桌面通知(_S)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Enable _audio notifications"
 msgstr "启用声音通知(_A)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "Display reminders for completed _tasks"
 msgstr "显示已完成工作的提醒(_T)"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
 msgid "Display reminders for _past events"
 msgstr "显示过去事件的提醒(_P)"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
 msgid "Set _default reminder"
 msgstr "设置默认提醒(_D)"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
 msgid "before every new appointment"
 msgstr "在每次新约会前"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:96
 msgid "Show a _reminder"
 msgstr "显示一条提醒(_R)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:96
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:98
 msgid "before every anniversary/birthday"
 msgstr "在每个周年/生日前"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:97
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:99
 msgid "Select the sources for reminder notification:"
 msgstr "选择提醒通知的来源:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:100
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:102
 msgid "Default Free/Busy Server"
 msgstr "默认闲/忙服务器"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:103
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:105
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u 和 %d 将被替换为电子邮件地址中的用户和域名。"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:104
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:106
 msgid ""
 "Specify login user name as part of the URL in case the server requires "
 "authentication, like: https://USER example com/"
@@ -22795,7 +22891,7 @@ msgstr ""
 "如果服务器需要身份验证,请将登录用户名指定为 URL 的一部分,例如:https://";
 "USER example com/"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:105
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:107
 msgid "Publishing Information"
 msgstr "发布信息"
 
@@ -23304,27 +23400,27 @@ msgstr "打开网页(_W)"
 msgid "Print the selected memo"
 msgstr "打印选中的备忘"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1038
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1075
 msgid "Searching next matching event"
 msgstr "正在搜索下一个匹配的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1039
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1076
 msgid "Searching previous matching event"
 msgstr "正在搜索上一个匹配的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1060
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1097
 #, 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 年中找到匹配的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1064
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1101
 #, 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 年中找到匹配的事件"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:1087
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1124
 msgid "Cannot search with no active calendar"
 msgstr "无活动日历,无法搜索"
 
@@ -24214,7 +24310,7 @@ msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
 #: ../src/modules/itip-formatter/itip-view.c:1298
-#: ../src/smime/gui/certificate-manager.c:1659
+#: ../src/smime/gui/certificate-manager.c:1672
 msgid "_Update"
 msgstr "更新(_U)"
 
@@ -24880,7 +24976,7 @@ msgstr "任意"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:853
 msgid "Marking messages as read…"
-msgstr "正在把信息标记为已读……"
+msgstr "正在把信息标记为已读…"
 
 #: ../src/modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Go to Folder"
@@ -25297,7 +25393,7 @@ msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 封未读"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1536
+#: ../src/modules/mail/e-mail-shell-view-private.c:1500
 msgid "Send / Receive"
 msgstr "发送/接收"
 
@@ -25459,19 +25555,19 @@ msgstr "插件"
 msgid "Plugins"
 msgstr "插件"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
 msgid "Display plain text version"
 msgstr "显示纯文字版本"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
 msgid "Display plain text version of multipart/alternative message"
 msgstr "显示多部分/可选信息的纯文字版本"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:146
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
 msgid "Display HTML version"
 msgstr "显示 HTML 版本"
 
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
 msgid "Display HTML version of multipart/alternative message"
 msgstr "显示多部分/可选信息的 HTML 版本"
 
@@ -25540,6 +25636,151 @@ msgstr "纯文字模式"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "作为纯文本来查看邮件信息,甚至在它们包含 HTML 内容时。"
 
+#: ../src/modules/rss/camel/camel-rss-folder.c:133
+#, c-format
+msgid "Cannot add message into News and Blogs folder"
+msgstr "无法添加信息到新闻和博客文件夹"
+
+#: ../src/modules/rss/camel/camel-rss-folder.c:225
+msgid "Message is not available"
+msgstr "信息不可用"
+
+#: ../src/modules/rss/camel/camel-rss-folder.c:274
+#, c-format
+msgid "Invalid Feed URL “%s”."
+msgstr "无效订阅网址“%s”。"
+
+#: ../src/modules/rss/camel/camel-rss-folder.c:408
+#, c-format
+msgid "Invalid Feed URL."
+msgstr "无效订阅网址。"
+
+#: ../src/modules/rss/camel/camel-rss-folder.c:663
+msgid "Apply message _filters to this folder"
+msgstr "对该文件夹应用信息筛选器(_F)"
+
+#: ../src/modules/rss/camel/camel-rss-folder.c:676
+#: ../src/modules/rss/evolution/e-rss-preferences.c:831
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1211
+msgid "_Download complete articles"
+msgstr "下载完整文章(_D)"
+
+#: ../src/modules/rss/camel/camel-rss-folder.c:689
+#: ../src/modules/rss/evolution/e-rss-preferences.c:835
+msgid "Download feed _enclosures"
+msgstr "下载订阅附件(_E)"
+
+#: ../src/modules/rss/camel/camel-rss-folder-summary.c:269
+msgid "Enclosures:"
+msgstr "附件:"
+
+#: ../src/modules/rss/camel/camel-rss-provider.c:17
+#: ../src/modules/rss/camel/camel-rss-store.c:48
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1433
+#: ../src/modules/rss/evolution/e-rss-shell-extension.c:62
+msgid "News and Blogs"
+msgstr "新闻和博客"
+
+#: ../src/modules/rss/camel/camel-rss-provider.c:19
+msgid "This is a provider for reading RSS news and blogs."
+msgstr "这是用于阅读 RSS 新闻和博客的提供者。"
+
+#: ../src/modules/rss/camel/camel-rss-store.c:77
+#: ../src/modules/rss/camel/camel-rss-store.c:123
+#: ../src/modules/rss/camel/camel-rss-store.c:176
+#: ../src/modules/rss/camel/camel-rss-store.c:232
+#, c-format
+msgid "Folder '%s' not found"
+msgstr "文件夹“%s”未找到"
+
+#: ../src/modules/rss/camel/camel-rss-store.c:138
+#, c-format
+msgid "Cannot create a folder in a News and Blogs store."
+msgstr "无法在新闻和博客存储中创建文件夹。"
+
+#: ../src/modules/rss/e-rss-parser.c:289
+msgid "Unknown author"
+msgstr "未知作者"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:53
+#: ../src/modules/rss/evolution/e-rss-preferences.c:827
+msgid "Markdown"
+msgstr "Markdown"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:414
+#, c-format
+msgid "Failed to fetch feed icon: %s"
+msgstr "获取订阅图标失败:%s"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:461
+msgid "Fetching feed icon…"
+msgstr "正在获取订阅图标…"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:475
+msgid "Failed to read feed information."
+msgstr "读取订阅信息失败。"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:494
+#, c-format
+msgid "Failed to fetch feed information: %s"
+msgstr "获取订阅信息失败:%s"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:524
+msgid "Fetching feed information…"
+msgstr "正在获取订阅信息…"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:529
+msgid "Invalid Feed URL"
+msgstr "无效订阅网址"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:572
+msgid "Choose Feed Image"
+msgstr "选择订阅图像"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:788
+msgid "Feed _URL:"
+msgstr "订阅网址(_U):"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:801
+msgid "_Fetch"
+msgstr "获取(_F)"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:817
+msgid "C_ontent:"
+msgstr "目录(_O):"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1224
+msgid "_Download feed enclosures"
+msgstr "下载订阅附件(_D)"
+
+#. Translators: This is part of "Do not download enclosures larger than [ nnn ] KB"
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1243
+msgid "Do not download enclosures larger than"
+msgstr "不要下载附件若大于"
+
+#. Translators: This is part of "Do not download enclosures larger than [ nnn ] KB"
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1266
+msgid "KB"
+msgstr "KB"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1272
+msgid "Feeds"
+msgstr "订阅"
+
+#: ../src/modules/rss/evolution/e-rss-preferences.c:1337
+msgid "Content"
+msgstr "目录"
+
+#: ../src/modules/rss/evolution/e-rss-shell-view-extension.c:210
+msgid "Re_load feed articles"
+msgstr "重载订阅文章(_L)"
+
+#: ../src/modules/rss/evolution/e-rss-shell-view-extension.c:212
+msgid ""
+"Reload all feed articles from the server, updating existing and adding any "
+"missing"
+msgstr "从服务器重新加载所有订阅文章,更新现有的并添加缺失的"
+
 #: ../src/modules/spamassassin/evolution-spamassassin.c:188
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
@@ -25626,7 +25867,7 @@ msgctxt "wizard-ca-note"
 msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
 msgstr "或者,您可以改为 %s(电子邮件、联系人和日历)。"
 
-#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:194
 msgid "Loading accounts…"
 msgstr "正在载入帐号…"
 
@@ -26980,6 +27221,11 @@ msgstr "搜索"
 msgid "Save Search"
 msgstr "保存搜索"
 
+#: ../src/shell/e-shell-headerbar.c:213
+msgctxt "toolbar-button"
+msgid "New"
+msgstr "新建"
+
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
@@ -27036,330 +27282,317 @@ msgstr "网站"
 msgid "Saving user interface state"
 msgstr "保存用户界面状态"
 
-#: ../src/shell/e-shell-window-actions.c:351
+#: ../src/shell/e-shell-window-actions.c:354
 msgid "Categories Editor"
 msgstr "类别编辑器"
 
-#: ../src/shell/e-shell-window-actions.c:654
+#: ../src/shell/e-shell-window-actions.c:658
 msgid "Bug Buddy is not installed."
 msgstr "未安装 Bug Buddy。"
 
-#: ../src/shell/e-shell-window-actions.c:655
+#: ../src/shell/e-shell-window-actions.c:659
 msgid "Bug Buddy could not be run."
 msgstr "无法运行 Bug Buddy。"
 
-#: ../src/shell/e-shell-window-actions.c:895
+#: ../src/shell/e-shell-window-actions.c:899
 msgid "Collect_ion Account"
 msgstr "收藏帐号(_I)"
 
-#: ../src/shell/e-shell-window-actions.c:897
+#: ../src/shell/e-shell-window-actions.c:901
 msgid "Create a new collection account"
 msgstr "新建收藏帐号"
 
-#: ../src/shell/e-shell-window-actions.c:905
+#: ../src/shell/e-shell-window-actions.c:909
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:907
+#: ../src/shell/e-shell-window-actions.c:911
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ../src/shell/e-shell-window-actions.c:912
+#: ../src/shell/e-shell-window-actions.c:916
 msgid "_Accounts"
 msgstr "帐号(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:914
+#: ../src/shell/e-shell-window-actions.c:918
 msgid "Configure Evolution Accounts"
 msgstr "配置 Evolution 帐号"
 
-#: ../src/shell/e-shell-window-actions.c:919
-#: ../src/shell/e-shell-window-actions.c:933
+#: ../src/shell/e-shell-window-actions.c:923
+#: ../src/shell/e-shell-window-actions.c:937
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:940
+#: ../src/shell/e-shell-window-actions.c:944
 msgid "_Contents"
 msgstr "目录(_C)"
 
-#: ../src/shell/e-shell-window-actions.c:942
+#: ../src/shell/e-shell-window-actions.c:946
 msgid "Open the Evolution User Guide"
 msgstr "打开 Evolution 用户指南"
 
-#: ../src/shell/e-shell-window-actions.c:968
+#: ../src/shell/e-shell-window-actions.c:972
 msgid "I_mport…"
 msgstr "导入(_M)…"
 
-#: ../src/shell/e-shell-window-actions.c:970
+#: ../src/shell/e-shell-window-actions.c:974
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../src/shell/e-shell-window-actions.c:975
+#: ../src/shell/e-shell-window-actions.c:979
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:977
+#: ../src/shell/e-shell-window-actions.c:981
 msgid "Create a new window displaying this view"
 msgstr "创建一个新窗口来显示这个视图"
 
-#: ../src/shell/e-shell-window-actions.c:989
+#: ../src/shell/e-shell-window-actions.c:993
 msgid "Available Cate_gories"
 msgstr "可用类别(_G)"
 
-#: ../src/shell/e-shell-window-actions.c:991
+#: ../src/shell/e-shell-window-actions.c:995
 msgid "Manage available categories"
 msgstr "管理可用类别"
 
-#: ../src/shell/e-shell-window-actions.c:1003
+#: ../src/shell/e-shell-window-actions.c:1007
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/shell/e-shell-window-actions.c:1005
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ../src/shell/e-shell-window-actions.c:1010
+#: ../src/shell/e-shell-window-actions.c:1014
 msgid "_Saved Searches"
 msgstr "已保存的搜索(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1017
+#: ../src/shell/e-shell-window-actions.c:1021
 msgid "_Advanced Search…"
 msgstr "高级搜索(_A)…"
 
-#: ../src/shell/e-shell-window-actions.c:1019
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "Construct a more advanced search"
 msgstr "构造一个更高级的搜索"
 
-#: ../src/shell/e-shell-window-actions.c:1026
+#: ../src/shell/e-shell-window-actions.c:1030
 msgid "Clear the current search parameters"
 msgstr "清除当前搜索参数"
 
-#: ../src/shell/e-shell-window-actions.c:1031
+#: ../src/shell/e-shell-window-actions.c:1035
 msgid "_Edit Saved Searches…"
 msgstr "编辑保存的搜索(_E)…"
 
-#: ../src/shell/e-shell-window-actions.c:1033
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "Manage your saved searches"
 msgstr "管理您保存的搜索"
 
-#: ../src/shell/e-shell-window-actions.c:1040
+#: ../src/shell/e-shell-window-actions.c:1044
 msgid "Click here to change the search type"
 msgstr "单击此处更改搜索类型"
 
-#: ../src/shell/e-shell-window-actions.c:1045
+#: ../src/shell/e-shell-window-actions.c:1049
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
-#: ../src/shell/e-shell-window-actions.c:1047
+#: ../src/shell/e-shell-window-actions.c:1051
 msgid "Execute the current search parameters"
 msgstr "执行当前搜索参数"
 
-#: ../src/shell/e-shell-window-actions.c:1052
+#: ../src/shell/e-shell-window-actions.c:1056
 msgid "_Save Search…"
 msgstr "保存搜索(_S)…"
 
-#: ../src/shell/e-shell-window-actions.c:1054
+#: ../src/shell/e-shell-window-actions.c:1058
 msgid "Save the current search parameters"
 msgstr "保存当前搜索参数"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1070
 msgid "_Keyboard Shortcuts"
 msgstr "键盘快捷键(_K)"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1072
 msgid "Show keyboard shortcuts"
 msgstr "显示键盘快捷键"
 
-#: ../src/shell/e-shell-window-actions.c:1073
+#: ../src/shell/e-shell-window-actions.c:1077
 msgid "Show _WebKit GPU information"
 msgstr "显示 _WebKit GPU 信息"
 
-#: ../src/shell/e-shell-window-actions.c:1075
+#: ../src/shell/e-shell-window-actions.c:1079
 msgid "Show WebKit GPU information page in the preview panel"
 msgstr "在预览面板中显示 WebKit GPU 信息页"
 
-#: ../src/shell/e-shell-window-actions.c:1080
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Submit _Bug Report…"
 msgstr "提交错误报告(_B)…"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1086
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../src/shell/e-shell-window-actions.c:1087
+#: ../src/shell/e-shell-window-actions.c:1091
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:1089
+#: ../src/shell/e-shell-window-actions.c:1093
 msgid "Put Evolution into offline mode"
 msgstr "将 Evolution 转入离线模式"
 
-#: ../src/shell/e-shell-window-actions.c:1094
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:1096
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Put Evolution into online mode"
 msgstr "将 Evolution 转入在线模式"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1128
 msgid "Lay_out"
 msgstr "布局(_O)"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1146
+#: ../src/shell/e-shell-window-actions.c:1150
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1160
+#: ../src/shell/e-shell-window-actions.c:1164
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../src/shell/e-shell-window-actions.c:1189
+#: ../src/shell/e-shell-window-actions.c:1193
 msgid "Show _Menu Bar"
 msgstr "显示菜单栏(_M)"
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1195
 msgid "Show the menu bar"
 msgstr "显示菜单栏"
 
-#: ../src/shell/e-shell-window-actions.c:1197
+#: ../src/shell/e-shell-window-actions.c:1201
 msgid "Show Side _Bar"
 msgstr "显示侧边栏(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1199
+#: ../src/shell/e-shell-window-actions.c:1203
 msgid "Show the side bar"
 msgstr "显示侧边栏"
 
-#: ../src/shell/e-shell-window-actions.c:1205
+#: ../src/shell/e-shell-window-actions.c:1209
 msgid "Show _Buttons"
 msgstr "显示按钮(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1207
+#: ../src/shell/e-shell-window-actions.c:1211
 msgid "Show the switcher buttons"
 msgstr "显示切换器按钮"
 
-#: ../src/shell/e-shell-window-actions.c:1213
+#: ../src/shell/e-shell-window-actions.c:1217
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: ../src/shell/e-shell-window-actions.c:1215
+#: ../src/shell/e-shell-window-actions.c:1219
 msgid "Show the status bar"
 msgstr "显示状态栏"
 
-#: ../src/shell/e-shell-window-actions.c:1221
+#: ../src/shell/e-shell-window-actions.c:1225
 msgid "Show _Tool Bar"
 msgstr "显示工具栏(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1223
+#: ../src/shell/e-shell-window-actions.c:1227
 msgid "Show the tool bar"
 msgstr "显示工具栏"
 
-#: ../src/shell/e-shell-window-actions.c:1245
+#: ../src/shell/e-shell-window-actions.c:1249
 msgid "_Icons Only"
 msgstr "只有图标(_I)"
 
-#: ../src/shell/e-shell-window-actions.c:1247
+#: ../src/shell/e-shell-window-actions.c:1251
 msgid "Display window buttons with icons only"
 msgstr "显示只有图标的窗口按钮"
 
-#: ../src/shell/e-shell-window-actions.c:1252
+#: ../src/shell/e-shell-window-actions.c:1256
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../src/shell/e-shell-window-actions.c:1254
+#: ../src/shell/e-shell-window-actions.c:1258
 msgid "Display window buttons with text only"
 msgstr "显示只有文字的窗口按钮"
 
-#: ../src/shell/e-shell-window-actions.c:1259
+#: ../src/shell/e-shell-window-actions.c:1263
 msgid "Icons _and Text"
 msgstr "图标和文字(_A)"
 
-#: ../src/shell/e-shell-window-actions.c:1261
+#: ../src/shell/e-shell-window-actions.c:1265
 msgid "Display window buttons with icons and text"
 msgstr "显示带图标和文字的窗口按钮"
 
-#: ../src/shell/e-shell-window-actions.c:1266
+#: ../src/shell/e-shell-window-actions.c:1270
 msgid "Tool_bar Style"
 msgstr "工具栏样式(_B)"
 
-#: ../src/shell/e-shell-window-actions.c:1268
+#: ../src/shell/e-shell-window-actions.c:1272
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具栏设置显示窗口按钮"
 
-#: ../src/shell/e-shell-window-actions.c:1276
+#: ../src/shell/e-shell-window-actions.c:1280
 msgid "Delete Current View"
 msgstr "保存当前视图"
 
-#: ../src/shell/e-shell-window-actions.c:1283
+#: ../src/shell/e-shell-window-actions.c:1287
 msgid "Save Custom View…"
 msgstr "保存当前视图…"
 
-#: ../src/shell/e-shell-window-actions.c:1285
+#: ../src/shell/e-shell-window-actions.c:1289
 msgid "Save current custom view"
 msgstr "保存当前自定义视图"
 
-#: ../src/shell/e-shell-window-actions.c:1299
+#: ../src/shell/e-shell-window-actions.c:1303
 msgid "C_urrent View"
 msgstr "当前视图(_U)"
 
-#: ../src/shell/e-shell-window-actions.c:1309
+#: ../src/shell/e-shell-window-actions.c:1313
 msgid "Custom View"
 msgstr "当前视图"
 
-#: ../src/shell/e-shell-window-actions.c:1311
+#: ../src/shell/e-shell-window-actions.c:1315
 msgid "Current view is a customized view"
 msgstr "当前视图为自定义视图"
 
-#: ../src/shell/e-shell-window-actions.c:1319
+#: ../src/shell/e-shell-window-actions.c:1323
 msgid "Page Set_up…"
 msgstr "页面设置(_U)…"
 
-#: ../src/shell/e-shell-window-actions.c:1321
+#: ../src/shell/e-shell-window-actions.c:1325
 msgid "Change the page settings for your current printer"
 msgstr "更改当前打印机的页面设置"
 
-#: ../src/shell/e-shell-window-actions.c:1696
+#: ../src/shell/e-shell-window-actions.c:1700
 #, c-format
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../src/shell/e-shell-window-actions.c:1820
+#: ../src/shell/e-shell-window-actions.c:1824
 #, c-format
 msgid "Select view: %s"
 msgstr "选择视图:%s"
 
-#: ../src/shell/e-shell-window-actions.c:1837
+#: ../src/shell/e-shell-window-actions.c:1841
 #, c-format
 msgid "Delete view: %s"
 msgstr "删除视图:%s"
 
-#: ../src/shell/e-shell-window-actions.c:1952
+#: ../src/shell/e-shell-window-actions.c:1956
 msgid "Execute these search parameters"
 msgstr "执行这些搜索参数"
 
-#. Translators: a 'New' toolbar button caption which is context sensitive and
-#. runs one of the actions under File->New menu
-#: ../src/shell/e-shell-window.c:514
-msgctxt "toolbar-button"
-msgid "New"
-msgstr "新建"
-
-#. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:822
-#, c-format
-msgid "%s — Evolution"
-msgstr "%s — Evolution"
-
 #. Preview/Alpha/Beta version warning message
-#: ../src/shell/main.c:192
+#: ../src/shell/main.c:286
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -27393,7 +27626,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
 
-#: ../src/shell/main.c:217
+#: ../src/shell/main.c:311
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -27401,13 +27634,13 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../src/shell/main.c:223
+#: ../src/shell/main.c:317
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:325
+#: ../src/shell/main.c:419
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
@@ -27415,50 +27648,50 @@ msgstr ""
 "启动 Evolution 后显示特定组件。可用的选项"
 "有“mail”、“calendar”、“contacts”、“tasks”和“memos”"
 
-#: ../src/shell/main.c:329
+#: ../src/shell/main.c:423
 msgid "Apply the given geometry to the main window"
 msgstr "应用给定的几何参数到主窗口"
 
-#: ../src/shell/main.c:333
+#: ../src/shell/main.c:427
 msgid "Start in online mode"
 msgstr "以在线模式启动"
 
-#: ../src/shell/main.c:335
+#: ../src/shell/main.c:429
 msgid "Ignore network availability"
 msgstr "忽略网络是否可用"
 
-#: ../src/shell/main.c:338
+#: ../src/shell/main.c:432
 msgid "Forcibly shut down Evolution"
 msgstr "强制关闭所有 Evolution"
 
-#: ../src/shell/main.c:341
+#: ../src/shell/main.c:435
 msgid "Disable loading of any plugins."
 msgstr "禁止载入任何插件。"
 
-#: ../src/shell/main.c:343
+#: ../src/shell/main.c:437
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览窗格。"
 
-#: ../src/shell/main.c:347
+#: ../src/shell/main.c:441
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "导入 URI 或者给定文件名作为剩余参数。"
 
-#: ../src/shell/main.c:349
+#: ../src/shell/main.c:443
 msgid "Request a running Evolution process to quit"
 msgstr "请求正在运行的 Evolution 进程退出"
 
-#: ../src/shell/main.c:431
+#: ../src/shell/main.c:525
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "无法启动 Evolution。也许有另外的 Evolution 实例没有响应。系统错误:%s"
 
-#: ../src/shell/main.c:497 ../src/shell/main.c:502
+#: ../src/shell/main.c:591 ../src/shell/main.c:596
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolution 个人信息管理和邮件客户端"
 
-#: ../src/shell/main.c:558
+#: ../src/shell/main.c:652
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -27467,7 +27700,7 @@ msgstr ""
 "%s:不能同时使用 --online 和 --offline。\n"
 "  运行 %s --help 了解更多信息。\n"
 
-#: ../src/shell/main.c:564
+#: ../src/shell/main.c:658
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -27636,88 +27869,88 @@ msgstr ""
 "\n"
 "编辑信任设置:"
 
-#: ../src/smime/gui/certificate-manager.c:82
-#: ../src/smime/gui/certificate-manager.c:102
-#: ../src/smime/gui/certificate-manager.c:123
+#: ../src/smime/gui/certificate-manager.c:85
+#: ../src/smime/gui/certificate-manager.c:105
+#: ../src/smime/gui/certificate-manager.c:126
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: ../src/smime/gui/certificate-manager.c:83
-#: ../src/smime/gui/certificate-manager.c:104
-msgid "Issued To Organization"
-msgstr "授予组织"
-
-#: ../src/smime/gui/certificate-manager.c:84
-#: ../src/smime/gui/certificate-manager.c:105
-msgid "Issued To Organizational Unit"
-msgstr "授予组织单元"
-
-#: ../src/smime/gui/certificate-manager.c:85
-#: ../src/smime/gui/certificate-manager.c:106
-#: ../src/smime/gui/certificate-manager.c:125
-msgid "Serial Number"
-msgstr "序列号"
-
 #: ../src/smime/gui/certificate-manager.c:86
 #: ../src/smime/gui/certificate-manager.c:107
-#: ../src/smime/gui/certificate-manager.c:126
-msgid "Purposes"
-msgstr "用途"
+msgid "Issued To Organization"
+msgstr "授予组织"
 
 #: ../src/smime/gui/certificate-manager.c:87
 #: ../src/smime/gui/certificate-manager.c:108
-#: ../src/smime/gui/certificate-manager.c:127
-msgid "Issued By"
-msgstr "颁发者"
+msgid "Issued To Organizational Unit"
+msgstr "授予组织单元"
 
 #: ../src/smime/gui/certificate-manager.c:88
 #: ../src/smime/gui/certificate-manager.c:109
 #: ../src/smime/gui/certificate-manager.c:128
-msgid "Issued By Organization"
-msgstr "颁发组织"
+msgid "Serial Number"
+msgstr "序列号"
 
 #: ../src/smime/gui/certificate-manager.c:89
 #: ../src/smime/gui/certificate-manager.c:110
 #: ../src/smime/gui/certificate-manager.c:129
-msgid "Issued By Organizational Unit"
-msgstr "颁发组织单元"
+msgid "Purposes"
+msgstr "用途"
 
 #: ../src/smime/gui/certificate-manager.c:90
 #: ../src/smime/gui/certificate-manager.c:111
 #: ../src/smime/gui/certificate-manager.c:130
-msgid "Issued"
-msgstr "已颁发"
+msgid "Issued By"
+msgstr "颁发者"
 
 #: ../src/smime/gui/certificate-manager.c:91
 #: ../src/smime/gui/certificate-manager.c:112
 #: ../src/smime/gui/certificate-manager.c:131
-msgid "Expires"
-msgstr "到期时间"
+msgid "Issued By Organization"
+msgstr "颁发组织"
 
 #: ../src/smime/gui/certificate-manager.c:92
 #: ../src/smime/gui/certificate-manager.c:113
 #: ../src/smime/gui/certificate-manager.c:132
-msgid "SHA256 Fingerprint"
-msgstr "SHA256 指纹"
+msgid "Issued By Organizational Unit"
+msgstr "颁发组织单元"
 
 #: ../src/smime/gui/certificate-manager.c:93
 #: ../src/smime/gui/certificate-manager.c:114
 #: ../src/smime/gui/certificate-manager.c:133
-msgid "SHA1 Fingerprint"
-msgstr "SHA1 指纹"
+msgid "Issued"
+msgstr "已颁发"
 
 #: ../src/smime/gui/certificate-manager.c:94
 #: ../src/smime/gui/certificate-manager.c:115
 #: ../src/smime/gui/certificate-manager.c:134
+msgid "Expires"
+msgstr "到期时间"
+
+#: ../src/smime/gui/certificate-manager.c:95
+#: ../src/smime/gui/certificate-manager.c:116
+#: ../src/smime/gui/certificate-manager.c:135
+msgid "SHA256 Fingerprint"
+msgstr "SHA256 指纹"
+
+#: ../src/smime/gui/certificate-manager.c:96
+#: ../src/smime/gui/certificate-manager.c:117
+#: ../src/smime/gui/certificate-manager.c:136
+msgid "SHA1 Fingerprint"
+msgstr "SHA1 指纹"
+
+#: ../src/smime/gui/certificate-manager.c:97
+#: ../src/smime/gui/certificate-manager.c:118
+#: ../src/smime/gui/certificate-manager.c:137
 msgid "MD5 Fingerprint"
 msgstr "MD5 指纹"
 
-#: ../src/smime/gui/certificate-manager.c:103
-#: ../src/smime/gui/certificate-manager.c:124
+#: ../src/smime/gui/certificate-manager.c:106
+#: ../src/smime/gui/certificate-manager.c:127
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: ../src/smime/gui/certificate-manager.c:650
+#: ../src/smime/gui/certificate-manager.c:653
 msgid "Select a file to backup your key and certificate…"
 msgstr "选择一个文件来备份您的密钥和证书…"
 
@@ -27726,31 +27959,31 @@ msgstr "选择一个文件来备份您的密钥和证书…"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:660
+#: ../src/smime/gui/certificate-manager.c:663
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-备份.p12"
 
-#: ../src/smime/gui/certificate-manager.c:719
+#: ../src/smime/gui/certificate-manager.c:722
 msgid "Backup Certificate"
 msgstr "备份证书"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:734
+#: ../src/smime/gui/certificate-manager.c:737
 msgid "_File name:"
 msgstr "文件名(_F):"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:739
+#: ../src/smime/gui/certificate-manager.c:742
 msgid "Please select a file…"
 msgstr "请选择一个文件…"
 
-#: ../src/smime/gui/certificate-manager.c:753
+#: ../src/smime/gui/certificate-manager.c:756
 msgid "_Include certificate chain in the backup"
 msgstr "在备份里包含证书链(_I)"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:759
+#: ../src/smime/gui/certificate-manager.c:762
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -27759,16 +27992,16 @@ msgstr ""
 "您在这里设置的证书备份密码保护您将要创建的备份文件。\n"
 "继续进行备份必须要你设置这个密码。"
 
-#: ../src/smime/gui/certificate-manager.c:778
+#: ../src/smime/gui/certificate-manager.c:781
 msgid "_Repeat Password:"
 msgstr "重复密码(_P):"
 
-#: ../src/smime/gui/certificate-manager.c:797
+#: ../src/smime/gui/certificate-manager.c:800
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:805
+#: ../src/smime/gui/certificate-manager.c:808
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -27779,134 +28012,134 @@ msgstr ""
 "如果您忘记您的证书备份密码,你今后就不能还原备份。\n"
 "请将它记录在安全的地方。"
 
-#: ../src/smime/gui/certificate-manager.c:850
+#: ../src/smime/gui/certificate-manager.c:853
 msgid "No file name provided"
 msgstr "没有提供文件名"
 
-#: ../src/smime/gui/certificate-manager.c:854
+#: ../src/smime/gui/certificate-manager.c:857
 msgid "Failed to backup key and certificate"
 msgstr "备份密钥和证书失败"
 
-#: ../src/smime/gui/certificate-manager.c:946
+#: ../src/smime/gui/certificate-manager.c:949
 msgid "Select a certificate to import…"
 msgstr "选择要导入的证书…"
 
-#: ../src/smime/gui/certificate-manager.c:995
+#: ../src/smime/gui/certificate-manager.c:998
 msgid "Failed to import certificate"
 msgstr "导入证书失败"
 
-#: ../src/smime/gui/certificate-manager.c:1112
+#: ../src/smime/gui/certificate-manager.c:1115
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "使用时询问"
 
-#: ../src/smime/gui/certificate-manager.c:1114
+#: ../src/smime/gui/certificate-manager.c:1117
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "从不"
 
-#: ../src/smime/gui/certificate-manager.c:1116
+#: ../src/smime/gui/certificate-manager.c:1119
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "勉强的"
 
-#: ../src/smime/gui/certificate-manager.c:1118
+#: ../src/smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "完整"
 
-#: ../src/smime/gui/certificate-manager.c:1120
+#: ../src/smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "彻底的"
 
-#: ../src/smime/gui/certificate-manager.c:1122
+#: ../src/smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "暂时的"
 
-#: ../src/smime/gui/certificate-manager.c:1328
+#: ../src/smime/gui/certificate-manager.c:1341
 msgid "Change certificate trust"
 msgstr "变更证书信任"
 
-#: ../src/smime/gui/certificate-manager.c:1340
+#: ../src/smime/gui/certificate-manager.c:1353
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr "变更对主机“%s”的信任:"
 
-#: ../src/smime/gui/certificate-manager.c:1364
+#: ../src/smime/gui/certificate-manager.c:1377
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "使用时询问(_A)"
 
-#: ../src/smime/gui/certificate-manager.c:1365
+#: ../src/smime/gui/certificate-manager.c:1378
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "永不信任此证书(_N)"
 
-#: ../src/smime/gui/certificate-manager.c:1366
+#: ../src/smime/gui/certificate-manager.c:1379
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "暂时信任(仅此会话)(_T)"
 
-#: ../src/smime/gui/certificate-manager.c:1367
+#: ../src/smime/gui/certificate-manager.c:1380
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "勉强信任(_M)"
 
-#: ../src/smime/gui/certificate-manager.c:1368
+#: ../src/smime/gui/certificate-manager.c:1381
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "完全信任(_F)"
 
-#: ../src/smime/gui/certificate-manager.c:1369
+#: ../src/smime/gui/certificate-manager.c:1382
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "绝对信任(_U)"
 
-#: ../src/smime/gui/certificate-manager.c:1373
+#: ../src/smime/gui/certificate-manager.c:1386
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr "在信任此网站之前,您应该先检查该证书及其策略和过程(若可用)。"
 
-#: ../src/smime/gui/certificate-manager.c:1388
+#: ../src/smime/gui/certificate-manager.c:1401
 msgid "_Display certificate"
 msgstr "查看证书(_D)"
 
-#: ../src/smime/gui/certificate-manager.c:1593
+#: ../src/smime/gui/certificate-manager.c:1606
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "您拥有证明这些邮件服务器的证书:"
 
-#: ../src/smime/gui/certificate-manager.c:1624
+#: ../src/smime/gui/certificate-manager.c:1637
 msgid "Host name"
 msgstr "主机名称"
 
-#: ../src/smime/gui/certificate-manager.c:1626
+#: ../src/smime/gui/certificate-manager.c:1639
 msgid "Issuer"
 msgstr "发行者"
 
-#: ../src/smime/gui/certificate-manager.c:1627
+#: ../src/smime/gui/certificate-manager.c:1640
 msgid "Fingerprint"
 msgstr "指纹"
 
-#: ../src/smime/gui/certificate-manager.c:1628
+#: ../src/smime/gui/certificate-manager.c:1641
 msgid "Trust"
 msgstr "信任"
 
-#: ../src/smime/gui/certificate-manager.c:1649
+#: ../src/smime/gui/certificate-manager.c:1662
 msgid "_Edit Trust"
 msgstr "编辑信任(_E)"
 
-#: ../src/smime/gui/certificate-manager.c:2085
+#: ../src/smime/gui/certificate-manager.c:2098
 msgid "All PKCS12 files"
 msgstr "全部 PKCS12 文件"
 
-#: ../src/smime/gui/certificate-manager.c:2102
+#: ../src/smime/gui/certificate-manager.c:2115
 msgid "All email certificate files"
 msgstr "所有电子邮件证书文件"
 
-#: ../src/smime/gui/certificate-manager.c:2119
+#: ../src/smime/gui/certificate-manager.c:2132
 msgid "All CA certificate files"
 msgstr "全部颁证机构文件"
 
@@ -27943,7 +28176,7 @@ msgstr "输入证书数据库的新密码"
 msgid "Enter new password"
 msgstr "输入新密码"
 
-#: ../src/smime/gui/e-cert-selector.c:178
+#: ../src/smime/gui/e-cert-selector.c:182
 msgid "Select certificate"
 msgstr "选择证书"
 
@@ -28028,11 +28261,11 @@ msgid "C_ertificate:"
 msgstr "证书(_E):"
 
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:414
+#: ../src/smime/lib/e-cert.c:418
 msgid "Sign"
 msgstr "签名"
 
-#: ../src/smime/lib/e-cert.c:415
+#: ../src/smime/lib/e-cert.c:419
 msgid "Encrypt"
 msgstr "加密"
 
@@ -28078,6 +28311,13 @@ msgstr "无法写存储到磁盘,错误码:%i"
 msgid "Imported Certificate"
 msgstr "导入的证书"
 
+#, c-format
+#~ msgid "%s — Evolution"
+#~ msgstr "%s — Evolution"
+
+#~ msgid "By how many minutes to shorted new event end time"
+#~ msgstr "按多少分钟来缩短新建事件的结束时间"
+
 #~ msgid "true"
 #~ msgstr "为真"
 
@@ -31502,9 +31742,6 @@ msgstr "导入的证书"
 #~ msgid "Invalid object"
 #~ msgstr "无效的对象"
 
-#~ msgid "Edit Alarm"
-#~ msgstr "编辑提醒"
-
 #~ msgid "Add Alarm"
 #~ msgstr "添加提醒"
 
@@ -31736,9 +31973,6 @@ msgstr "导入的证书"
 #~ msgid "Account Already Exists"
 #~ msgstr "帐号已经存在"
 
-#~ msgid "Invalid user"
-#~ msgstr "无效用户"
-
 #~ msgid ""
 #~ "Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
 #~ "address and try again."
@@ -32407,9 +32641,6 @@ msgstr "导入的证书"
 #~ msgid "Fi_xed-width:"
 #~ msgstr "等宽(_X):"
 
-#~ msgid "KB"
-#~ msgstr "KB"
-
 #~ msgid ""
 #~ "Note: you will not be prompted for a password until you connect for the "
 #~ "first time"
@@ -32675,9 +32906,6 @@ msgstr "导入的证书"
 #~ msgid "Show week n_umber in Day and Work Week View"
 #~ msgstr "在日视图和工作日视图中显示周数(_U)"
 
-#~ msgid "Save"
-#~ msgstr "保存"
-
 #~ msgid "The event could not be deleted due to a corba error"
 #~ msgstr "无法删除事件,原因是 corba 错误"
 


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