[evolution] Update Chinese (China) translation
- From: Translations User D-L <translations src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update Chinese (China) translation
- Date: Tue, 23 Jun 2020 19:25:03 +0000 (UTC)
commit cf51acaef9d1136e68a8c251b79295e4af679125
Author: Boyuan Yang <073plan gmail com>
Date: Tue Jun 23 19:24:47 2020 +0000
Update Chinese (China) translation
po/zh_CN.po | 14446 +++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 8661 insertions(+), 5785 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e6fa910e5a..2a363312a1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -21,132 +21,20 @@
# Jeff bai <jeffbai aosc xyz>, 2016.
# Dingzhong Chen <wsxy162 gmail com>, 2015, 2016.
#
-#: ../src/shell/main.c:519
msgid ""
msgstr ""
"Project-Id-Version: evolution master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-07 13:19+0000\n"
-"PO-Revision-Date: 2017-02-15 21:13+0800\n"
-"Last-Translator: Mandy Wang <wangmychn gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
+"POT-Creation-Date: 2020-06-23 06:43+0000\n"
+"PO-Revision-Date: 2020-06-23 15:23-0400\n"
+"Last-Translator: Boyuan Yang <073plan gmail com>\n"
"Language-Team: Chinese (China) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7.1\n"
-
-#: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
-#: ../src/shell/e-shell-window-private.c:240
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../evolution.appdata.xml.in.h:2 ../data/evolution.desktop.in.in.h:4
-msgid "Manage your email, contacts and schedule"
-msgstr "配置您的电子邮件，联系人和日程表"
-
-#: ../evolution.appdata.xml.in.h:3
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr "Evolution 是一款个人信息管理应用，提供集成的邮件、日历和地址簿功能。"
-
-#: ../evolution.appdata.xml.in.h:4
-#, fuzzy
-#| msgid ""
-#| "Evolution supports a wide range of industry standard data formats and "
-#| "network protocols for information exchange, with an emphasis on standards "
-#| "compliance and security. Evolution can also integrate smoothly with "
-#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
-#| "extension."
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
-msgstr ""
-"Evolution 支持众多的工业标准数据格式和信息交换的网络协议，并强化了标准兼容性"
-"和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
-"进行顺利集成。"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Evolution 提醒通知"
-
-#: ../data/evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "日历事件信息"
-
-#: ../data/evolution.desktop.in.in.h:2 ../src/shell/e-shell-utils.c:428
-msgid "Groupware Suite"
-msgstr "Groupwise 套件"
-
-#: ../data/evolution.desktop.in.in.h:3
-msgid "Evolution Mail and Calendar"
-msgstr "Evolution 邮件及日历"
-
-#: ../data/evolution.desktop.in.in.h:5
-msgid "email;calendar;contact;addressbook;task;"
-msgstr "mail;calendar;contact;addressbook;task;邮件;日历;联系人;地址簿;任务;"
-
-#: ../data/evolution.desktop.in.in.h:6
-msgid "New Window"
-msgstr "新建窗口"
-
-#: ../data/evolution.desktop.in.in.h:7
-#, fuzzy
-#| msgid "Compose Message"
-msgid "Compose a Message"
-msgstr "新建消息"
-
-#: ../data/evolution.desktop.in.in.h:8
-#: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:301
-#: ../src/modules/addressbook/e-book-shell-view.c:371
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../data/evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:833
-#: ../src/e-util/e-send-options.c:544
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:577
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "日历"
-
-#: ../data/evolution.desktop.in.in.h:10 ../src/e-util/e-send-options.c:536
-#: ../src/mail/importers/elm-importer.c:330
-#: ../src/mail/importers/kmail-importer.c:251
-#: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1240
-#: ../src/smime/gui/certificate-manager.c:1682
-msgid "Mail"
-msgstr "邮件"
-
-#: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
-#: ../src/modules/calendar/e-cal-shell-content.c:1665
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
-#: ../src/modules/calendar/e-memo-shell-view.c:313
-msgid "Memos"
-msgstr "备忘"
-
-#: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
-#: ../src/calendar/gui/print.c:2408
-#: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1114
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../src/modules/calendar/e-cal-shell-content.c:1625
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
-#: ../src/modules/calendar/e-task-shell-view.c:471
-msgid "Tasks"
-msgstr "任务"
+"X-Generator: Poedit 2.3.1\n"
#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
msgid "Enable address formatting"
@@ -300,6 +188,18 @@ msgstr "是否在编辑器中显示备注"
msgid "Whether to show Certificates tab in the editor"
msgstr "是否在编辑器中显示证书选项卡"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
+#, fuzzy
+#| msgid "Create a new contact list"
+msgid "Where to open contact locations"
+msgstr "创建一个新的联系人列表"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+
#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
msgid "Convert mail messages to Unicode"
msgstr "将邮件信息转换为 Unicode"
@@ -550,82 +450,70 @@ msgid "Default reminder units"
msgstr "默认提醒单位"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#, fuzzy
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
msgid "Units for a default reminder, “minutes”, “hours” or “days”"
-msgstr "默认提醒的单位，可为“分钟“，“小时”或“天”。"
+msgstr "默认提醒的单位，可为“分钟“、“小时”或“天”"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-msgid "Default reminder snooze interval, in minutes"
-msgstr "预览提醒的小睡间隔，以分钟计"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid ""
-"Default reminder snooze interval, in minutes, to be filled in the reminder "
-"notification dialog"
-msgstr "预览提醒的小睡间隔，以分钟计，会用于提醒通知对话盒中"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
msgid "Show categories field in the event/meeting/task editor"
msgstr "在事件/会议/任务编辑器中显示分类域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
msgid "Whether to show categories field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示分类域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
msgid "Show Role field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示角色域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议中显示角色域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示请回复域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
msgid "Show status field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示状态域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示状态域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
msgid "Show timezone field in the event/meeting editor"
msgstr "在事件/会议编辑器中显示时区域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示时区域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
msgid "Show type field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示类型域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示类型域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
msgid "Hide completed tasks"
msgstr "隐藏已完成的任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
msgid "Whether to hide completed tasks in the tasks view"
msgstr "是否在任务视图中隐藏已完成的任务。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
msgid "Hide task units"
msgstr "隐藏任务单位"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
#, fuzzy
#| msgid ""
#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
@@ -633,43 +521,53 @@ msgstr "隐藏任务单位"
msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
msgstr "决定何时隐藏任务的单位，可为“分钟”，“小时”或“天”。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
msgid "Hide task value"
msgstr "隐藏任务值"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
msgid "Number of units for determining when to hide tasks"
msgstr "决定何时隐藏任务的单位数"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid "Hide cancelled events"
+msgstr "隐藏已取消的事件"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#, fuzzy
+#| msgid "Whether to hide completed tasks in the tasks view"
+msgid "Whether to hide cancelled events in the calendar view"
+msgstr "是否在任务视图中隐藏已完成的任务。"
+
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#, fuzzy
+#| msgid "Hide completed tasks"
+msgid "Hide cancelled tasks"
+msgstr "隐藏已完成的任务"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#, fuzzy
+#| msgid "Whether to hide completed tasks in the tasks view"
+msgid "Whether to hide cancelled tasks in the tasks view"
+msgstr "是否在任务视图中隐藏已完成的任务。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
msgid "Horizontal pane position"
msgstr "水平面板位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
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:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
msgid "Last reminder time"
msgstr "上次提醒时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
-msgid "Time the last reminder ran, in time_t"
-msgstr "提醒上次运行的时间，time_t 格式。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#, fuzzy
-#| msgctxt "iCalImp"
-#| msgid "has reminders"
-msgid "Allow past reminders"
-msgstr "有提醒"
-
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid ""
-"Whether can show reminders for events/tasks/memos which already happened"
-msgstr ""
+msgid "Time the last reminder ran, in time_t"
+msgstr "提醒上次运行的时间，time_t 格式"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
#, fuzzy
@@ -755,46 +653,28 @@ 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
-msgid "Reminder programs"
-msgstr "提醒程序"
+msgid "Let the Month View start with the current week"
+msgstr ""
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "Programs that are allowed to be run by reminders"
-msgstr "允许提醒运行的程序。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Show display reminders in notification tray"
-msgstr "在通知托盘中显示提醒"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-msgid "Whether or not to use the notification tray for display reminders"
-msgstr "是否使用通知托盘来显示提醒。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#, fuzzy
-#| msgid "Sh_ow reminder notifications"
-msgid "Show reminder notification dialog always on top"
-msgstr "显示提醒通知(_O)"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
msgid ""
-"Whether or not to show reminder notification dialog always on top. Note this "
-"works only as a hint for the window manager, which may or may not obey it."
+"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:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
msgid "Preferred New button item"
msgstr "首选的“新建”按钮项目"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
msgid "Name of the preferred New toolbar button item"
msgstr "首选的“新建”工具栏按钮项目的名称"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
msgid "Primary calendar"
msgstr "首选日历"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
#, fuzzy
#| msgid ""
#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
@@ -804,11 +684,11 @@ msgid ""
"“Calendar” view"
msgstr "在“日历”视图侧边栏中选定的(或“主”)日历的 UID"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
msgid "Primary memo list"
msgstr "首选备忘录"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
#, fuzzy
#| msgid ""
#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
@@ -818,11 +698,11 @@ msgid ""
"“Memos” view"
msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘录的 UID"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
msgid "Primary task list"
msgstr "首选任务列表"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
#, fuzzy
#| msgid ""
#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
@@ -832,11 +712,11 @@ msgid ""
"“Tasks” view"
msgstr "在“任务”视图侧边栏中选定的(或“主”)任务列表的 UID"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
msgid "Free/busy template URL"
msgstr "忙/闲模板 URL"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -845,87 +725,87 @@ msgstr ""
"用作忙/闲数据退却的 URL 模板，%u 将替换为电子邮件的用户部分，而 %d 将替换为域"
"名。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
msgid "Recurrent Events in Italic"
msgstr "以斜体显示重复事件"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
msgid "Show days with recurrent events in italic font in bottom left calendar"
msgstr "在底部左侧日历中以斜体显示有重复事件的日期。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
msgid "Search range for time-based searching in years"
msgstr "基于时间搜索的年份搜索范围"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
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:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
msgid "Show appointment end times in week and month views"
msgstr "在周视图和月视图中显示约会结束时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
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:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
msgid "Show appointment icons in the month view"
msgstr "在月视图中显示约会结束时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
msgid "Whether to show icons of events in the month view"
msgstr "是否在月视图中显示事件的结束时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
msgid "Show the memo preview pane"
msgstr "显示“备忘预览”面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
#, fuzzy
#| msgid "If \"true\", show the memo preview pane in the main window"
msgid "If “true”, show the memo preview pane in the main window"
msgstr "如果“true”，在主窗口中显示备忘预览面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
msgid "Show the task preview pane"
msgstr "显示“任务预览”面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
#, fuzzy
#| msgid "If \"true\", show the task preview pane in the main window"
msgid "If “true”, show the task preview pane in the main window"
msgstr "如果“true”，在主窗口中显示任务预览面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
msgstr "在日视图、工作日视图和日期导航中显示周数"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
msgid "Whether to show week numbers in various places in the Calendar"
msgstr "是否在日历中显示周数。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
msgid "Vertical position for the tag pane"
msgstr "标签面板的竖直位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
msgid "Highlight tasks due today"
msgstr "高亮今天到期的任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
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:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
msgid "Tasks due today color"
msgstr "今天到期的任务颜色"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
#, fuzzy
#| msgid ""
#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
@@ -936,15 +816,15 @@ msgid ""
msgstr ""
"今天到期任务的背景颜色，“#rrggbb”格式；与 task-due-today-highlight 一起使用"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
msgid "Task preview pane position (horizontal)"
msgstr "任务预览面板的水平位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
msgid "Task layout style"
msgstr "任务外观风格"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
#, fuzzy
#| msgid ""
#| "The layout style determines where to place the preview pane in relation "
@@ -959,38 +839,28 @@ msgstr ""
"布局样式决定了在哪里放置任务列表的预览面板。“0”(经典视图)会把预览面板放置在任"
"务列表下面。“1”(竖直视图)会把预览面板放置在任务列表旁边。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
msgid "Task preview pane position (vertical)"
msgstr "任务预览面板的竖直位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
msgid "Position of the task preview pane when oriented vertically"
msgstr "当竖直时，任务预览面板的位置。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid "Show reminders for completed tasks"
-msgstr "显示已完成工作的提醒"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-msgid ""
-"Whether to show reminders for completed tasks. When set to false, reminders "
-"for completed tasks are suppressed."
-msgstr "是否显示已完成工作的提醒。设置为 false 时，会抑制已完成工作的提醒。"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
msgid "Highlight overdue tasks"
msgstr "高亮延期任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
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:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
msgid "Overdue tasks color"
msgstr "延期任务的颜色"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
#, fuzzy
#| msgid ""
#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
@@ -1002,19 +872,19 @@ msgstr ""
"延期任务的背景颜色，以“#rrggbb”格式。与 task-overdue-highlight(任务延期高亮)"
"一道使用。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
msgid "Time divisions"
msgstr "时间分割"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
msgid "Intervals shown in Day and Work Week views, in minutes"
msgstr "日视图和工作周视图中显示的间隔，以分钟计。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
msgid "Timezone"
msgstr "时区"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
#, fuzzy
#| msgid ""
#| "The default timezone to use for dates and times in the calendar, as an "
@@ -1026,79 +896,99 @@ msgstr ""
"日历中日期和时间所使用的默认时区，以未翻译的 Olson 时区数据库位置表示，"
"如“Asia/Chongqing”。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
msgid "Twenty four hour time format"
msgstr "二十四小时时间格式"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
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:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
msgid "Birthday and anniversary reminder"
msgstr "生日和纪念日提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
msgid "Whether to set a reminder for birthdays and anniversaries"
msgstr "是否为生日或周年纪念日设置提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
msgid "Default appointment reminder"
msgstr "默认约会提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
msgid "Whether to set a default reminder for appointments"
msgstr "是否为约会设置默认提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
msgid "Use system timezone"
msgstr "使用系统时区"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
msgid "Use the system timezone instead of the timezone selected in Evolution"
msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
msgid "First day of the week"
msgstr "本周第一天"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
msgid "Monday is a work day"
msgstr "周一为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
msgid "Tuesday is a work day"
msgstr "周二为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
msgid "Wednesday is a work day"
msgstr "周三为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
msgid "Thursday is a work day"
msgstr "周四为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
msgid "Friday is a work day"
msgstr "周五为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
msgid "Saturday is a work day"
msgstr "周六为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
msgid "Sunday is a work day"
msgstr "周日为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
msgid "Create events, memos and tasks as Private by default"
msgstr "默认创建私密事件、备忘录和任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid "Draw events as flat, not shaded."
+msgstr ""
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+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:156
+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:157
+msgid "User-defined reminder times, in minutes"
+msgstr "用户定义的提醒时间，以分钟计"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
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:161
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
#, fuzzy
#| msgid ""
#| "This key was deprecated in version 3.10 and should no longer be used. Use "
@@ -1109,11 +999,11 @@ msgid ""
msgstr ""
"该键值已在版本 3.10 中弃用，不应当再使用。请使用 \"week-start-day-name\"。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
msgid "(Deprecated) Work days"
msgstr "(已弃用)工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
#, fuzzy
#| msgid ""
#| "Days on which the start and end of work hours should be indicated. (This "
@@ -1154,36 +1044,26 @@ msgid "The list of disabled plugins in Evolution"
msgstr "Evolution 中已禁用插件的列表"
#: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#, fuzzy
-#| msgid "The window's X coordinate"
msgid "The window’s X coordinate"
msgstr "窗口横坐标"
#: ../data/org.gnome.evolution.gschema.xml.in.h:6
-#, fuzzy
-#| msgid "The window's Y coordinate"
msgid "The window’s Y coordinate"
msgstr "窗口纵坐标"
#: ../data/org.gnome.evolution.gschema.xml.in.h:7
-#, fuzzy
-#| msgid "The window's width in pixels"
msgid "The window’s width in pixels"
-msgstr "窗口宽度(像素)"
+msgstr "窗口宽度（像素）"
#: ../data/org.gnome.evolution.gschema.xml.in.h:8
-#, fuzzy
-#| msgid "The window's height in pixels"
msgid "The window’s height in pixels"
-msgstr "窗口高度(像素)"
+msgstr "窗口高度（像素）"
#: ../data/org.gnome.evolution.gschema.xml.in.h:9
msgid "Whether the window is maximized"
msgstr "窗口是否为最大化"
#: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-#, fuzzy
-#| msgid "Gnome Calendar's calendar import done"
msgid "GNOME Calendar’s calendar import done"
msgstr "Gnome 日历的日历导入完成"
@@ -1373,15 +1253,31 @@ msgstr "拼写检查语言"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
msgid "List of dictionary language codes used for spell checking."
-msgstr "列出用来拼写检查的字典语言编码"
+msgstr "列出用来拼写检查的字典语言编码。"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+msgid "List of recently used spell checking languages"
+msgstr "最近使用的拼写检查语言列表"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#, fuzzy
+#| msgid "List of dictionary language codes used for spell checking."
+msgid ""
+"List of dictionary language codes used for spell checking, which had been "
+"used recently."
+msgstr "列出用来拼写检查的字典语言编码"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "How many recently used spell checking languages to remember"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
#, fuzzy
#| msgid "Show \"Bcc\" field when sending a mail message"
msgid "Show “Bcc” field when sending a mail message"
msgstr "在发送邮件信息时显示密件抄送域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
#, fuzzy
#| msgid ""
#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
@@ -1393,13 +1289,13 @@ msgstr ""
"在发送邮件信息时显示密件抄送域。在选定了一个邮件帐号时可以在查看菜单中控制此"
"功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
#, fuzzy
#| msgid "Show \"Cc\" field when sending a mail message"
msgid "Show “Cc” field when sending a mail message"
msgstr "在发送邮件信息时显示抄送域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
#, fuzzy
#| msgid ""
#| "Show the \"Cc\" field when sending a mail message. This is controlled "
@@ -1411,13 +1307,13 @@ msgstr ""
"在发送邮件信息时显示抄送域。在选定了一个邮件帐号时可以在查看菜单中控制此功"
"能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
#, fuzzy
#| msgid "Show \"From\" override field when sending a mail message"
msgid "Show “From” override field when sending a mail message"
msgstr "在发送邮件信息时显示“发件人”覆盖域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
#, fuzzy
#| msgid ""
#| "Show the \"From\" override field when sending a mail message. This is "
@@ -1429,13 +1325,13 @@ msgstr ""
"在发送邮件信息时显示“发件人”覆盖域。在选定了一个邮件帐号时可以在查看菜单中控"
"制此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
#, fuzzy
#| msgid "Show \"Reply To\" field when sending a mail message"
msgid "Show “Reply To” field when sending a mail message"
msgstr "发送邮件时显示“Reply To”(回复至)域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
#, fuzzy
#| msgid ""
#| "Show the \"Reply To\" field when sending a mail message. This is "
@@ -1447,13 +1343,13 @@ msgstr ""
"在发送邮件信息时显示“Reply To”域。在选定了一个邮件帐号时可以在查看菜单中控制"
"此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
#, fuzzy
#| msgid "Show \"From\" field when posting to a newsgroup"
msgid "Show “From” field when posting to a newsgroup"
msgstr "在发送内容到新闻组时显示发件人域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
#, fuzzy
#| msgid ""
#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
@@ -1465,13 +1361,13 @@ msgstr ""
"在发送内容到新闻组时显示发件人域。在选定了一个新闻组帐号时可以在查看菜单中控"
"制此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
#, fuzzy
#| msgid "Show \"Reply To\" field when posting to a newsgroup"
msgid "Show “Reply To” field when posting to a newsgroup"
msgstr "在发送内容到新闻组时显示“Reply To”(回复至)域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
#, fuzzy
#| msgid ""
#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
@@ -1483,21 +1379,21 @@ msgstr ""
"在发送内容到新闻组时显示“Reply To”域。在选定了一个新闻组帐号时可以在查看菜单"
"中控制此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
msgid "Digitally sign replies when the original message is signed"
msgstr "若原信息已签名，回复时添加数字签名"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
msgid ""
"Automatically enable PGP or S/MIME signatures when replying to a message "
"which is also PGP or S/MIME signed."
msgstr "在回复带 PGP 或 S/MIME 签名的信息时，自动启动 PGP 或 S/MIME 签名。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
msgid "Encode filenames in an Outlook/GMail way"
msgstr "使用 Outlook/Gmail 方式编码文件名"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
msgid ""
"Encode filenames in the mail headers same as Outlook or GMail do, to let "
"them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -1508,21 +1404,31 @@ msgstr ""
"发送的邮件带有的 UTF-8 字符的文件名，因为它们不符合 RFC 2231，而是使用了不正"
"确的 RFC 2047 标准。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
msgid "Send messages through Outbox folder"
msgstr "通过发件箱文件夹发送邮件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
msgid ""
"Always save messages to Outbox folder when sending, to let a user choose "
"when the messages should be sent."
msgstr "发送邮件时必须保存到发件箱文件夹，让用户选择信息发送时间。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+msgid "Include signature in new messages only"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
msgid "Put personalized signatures at the top of replies"
msgstr "在回复的顶部添加个性签名"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
msgid ""
"Users get all up in arms over where their signature should go when replying "
"to a message. This determines whether the signature is placed at the top of "
@@ -1531,21 +1437,31 @@ msgstr ""
"用户常为回复信息时签名位置不定而恼火。这个选项决定了回复时签名位于消息顶部还"
"是底部。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
msgid "Do not add signature delimiter"
msgstr "不添加签名分隔符"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
msgid ""
"Set to TRUE in case you do not want to add signature delimiter before your "
"signature when composing a mail."
msgstr "如果您不想在您写邮件时签名以前添加签名分隔符，那么设置为真"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Keep original message signature in replies"
+msgstr "回复时保留原始信息的签名"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"When set to TRUE, keep original message signature in replies, otherwise "
+"strip the signature and everything below it when replying to the message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
msgid "Ignore list Reply-To:"
msgstr "忽略邮件列表“回复至”域："
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
#, fuzzy
#| msgid ""
#| "Some mailing lists set a Reply-To: header to trick users into sending "
@@ -1570,13 +1486,13 @@ msgstr ""
"作，它会进行私人的回复；而如果您使用“回复到列表”行为，它就会回复到列表。如果"
"存在的话，它会比较 Reply-To: 和 List-Post: 来完成该目的。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
#, fuzzy
#| msgid "List of localized 'Re'"
msgid "List of localized “Re”"
msgstr "本地化的“Re”列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
#, fuzzy
#| msgid ""
#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
@@ -1590,13 +1506,13 @@ msgstr ""
"当回复某个信息时，在主题中跳过的本地化的“回复”缩写 列表，以逗号分隔。它们是标"
"准 \"Re\" 前缀的补充。例如 'SV,AV'。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
#, fuzzy
#| msgid "List of localized 'Re'"
msgid "List of localized “Re” separators"
msgstr "本地化的“Re”列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
#, fuzzy
#| msgid ""
#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
@@ -1610,15 +1526,26 @@ msgstr ""
"当回复某个信息时，在主题中跳过的本地化的“回复”缩写 列表，以逗号分隔。它们是标"
"准 \"Re\" 前缀的补充。例如 'SV,AV'。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+msgid "Use localized “Fwd”/“Re” in message Subject"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+msgid ""
+"When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
+"forward as provided by current locale translation, otherwise uses "
+"unlocalized version."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
msgid "Number of characters for wrapping"
msgstr "换行字符数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
msgid "Will autowrap lines after given number of characters."
msgstr "超出给定的字符数后自动换行。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
#, fuzzy
#| msgid ""
#| "Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
@@ -1626,16 +1553,16 @@ msgid ""
"Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
msgstr "询问“prompt-on-many-to-cc-recips”的收件人与抄送数目"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
msgid ""
"When to ask, when the number of To and CC recipients reaches this value."
msgstr "当收件人与抄送数目达到这个数值时，是否要询问。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
msgstr "是否在工具栏中显示签名与加密按钮"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
#, fuzzy
#| msgid ""
#| "If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME "
@@ -1649,21 +1576,53 @@ msgstr ""
"如果启用，PGP 或 S/MIME 的签名与加密按钮会永远显示在编辑器的工具栏上。否则它"
"们只会在被使用时才显示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
msgid "Wrap quoted text in replies"
msgstr "为回复中引用的文本换行"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
#, fuzzy
#| msgid "If set to 'true' quoted text in replies will be wrapped."
msgid "If set to “true” quoted text in replies will be wrapped."
msgstr "如设置为 true，则将为回复中引用的文本换行"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid "Convert UTC time in reply credits to local time"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid ""
+"Whether the time in reply credits should be converted to local time when "
+"it’s in UTC in the message."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#, fuzzy
+#| msgid "Failed to mark messages as read."
+msgid "Mark replied to messages as read"
+msgstr "无法将信息标记为已读。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+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:82
+msgid "Whether start Plain Text composer with Preformatted paragraph mode"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
msgid "Whether to obey Content-Disposition:inline message header hint"
msgstr "是否遵从 Content-Disposition:inline 消息标头提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
#, fuzzy
#| msgid ""
#| "Set to 'false' to block automatic display of attachments with Content-"
@@ -1673,21 +1632,19 @@ msgid ""
"Disposition: inline."
msgstr "设置为“false”可以屏蔽 Content-Disposition: inline 附件的自动显示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
msgid "Save file format for drag-and-drop operation"
msgstr "拖放操作时保存文件类型"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#, fuzzy
-#| msgid "Can be either 'mbox' or 'pdf'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
msgid "Can be either “mbox” or “pdf”."
msgstr "可以是“mbox”或“pdf”。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
msgid "Show image animations"
msgstr "显示图像动画"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
msgid ""
"Enable animated images in HTML mail. Many users find animated images "
"annoying and prefer to see a static image instead."
@@ -1695,79 +1652,79 @@ msgstr ""
"在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
"是动态的。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
msgid "Enable or disable type ahead search feature"
msgstr "启用或禁用自动前进功能"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
msgid ""
"Enable the side bar search feature to allow interactive searching of folder "
"names."
msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
msgid "Enable or disable magic space bar"
msgstr "启用或禁用魔术空格键"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
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:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
msgid "Enable to use a similar message list view settings for all folders"
msgstr "启用以在所有文件夹中使用相似的信息列表视图设置"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
msgid "Enable to use a similar message list view settings for all folders."
msgstr "启用以在所有文件夹中使用相似的信息列表视图设置。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
#, fuzzy
#| msgid "Mark citations in the message \"Preview\""
msgid "Mark citations in the message “Preview”"
msgstr "在信息“预览”中标出引用"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
#, fuzzy
#| msgid "Mark citations in the message \"Preview\"."
msgid "Mark citations in the message “Preview”."
msgstr "在信息“预览”中标出引用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
msgid "Citation highlight color"
msgstr "引用突出颜色"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
msgid "Citation highlight color."
msgstr "引用突出颜色。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "启用光标模式，这样您在读取邮件时就能看到光标了。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
msgid "Default charset in which to display messages"
msgstr "显示信息的默认字符集"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
msgid "Default charset in which to display messages."
msgstr "显示信息的默认字符集。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
msgid "Automatically load images for HTML messages over HTTP"
msgstr "自动在 HTML 信息中载入 HTTP 图像"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
msgid "Show notification about missing remote content"
msgstr "显示关于远程内容缺失的通知"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
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 "
@@ -1776,27 +1733,27 @@ msgstr ""
"当信息预览显示了一封需要下载远程内容的邮件而从此用户或站点下载又被禁止时，在"
"预览面板顶层显示相应通知。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
msgid "Show Animations"
msgstr "显示动画"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
msgid "Show all message headers"
msgstr "显示全部信头"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
msgid "Show all the headers when viewing a messages."
msgstr "查看信息时显示全部信头。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
msgid "List of headers to show when viewing a message."
msgstr "要在查看信息时显示的信头列表。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
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 "
@@ -1805,99 +1762,99 @@ msgstr ""
"每个信头都成对出现：信头名，指示该信头是否启用的布尔值。当查看某个信息时，禁"
"用的信头将不会显示，但仍然会列在“首选项”中。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
msgid "Show photo of the sender"
msgstr "显示发件人照片"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
msgid "Show the photo of the sender in the message reading pane."
msgstr "在信息阅读面板中显示发件人照片。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
-msgid "Search gravatar.com for photo of the sender"
-msgstr "从 gravatar.com 搜索发件人照片"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+msgid "Search libravatar.org for photo of the sender"
+msgstr "从 libravatar.org 搜索发件人照片"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
-msgid "Allow searching also at gravatar.com for photo of the sender."
-msgstr "允许搜索发件人照片并在 gravatar.com 里搜索"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+msgid "Allow searching also at libravatar.org for photo of the sender."
+msgstr "允许搜索发件人照片并在 libravatar.org 里搜索"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
msgid "Mark as Seen always after specified timeout"
msgstr "在指定的时限过后永远标示成已阅"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
msgid "Timeout for marking messages as seen"
msgstr "将信息标为已看的超时时长"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
msgid "Timeout in milliseconds for marking messages as seen."
msgstr "将信息标为已看的超时时长，单位为毫秒。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
msgid "Show Attachment Bar"
msgstr "显示附件栏"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
msgid ""
"Show Attachment Bar below the message preview pane when the message has "
"attachments."
msgstr "当消息含有附件时在信息预览面板下面显示附件栏。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
msgid "Sender email-address column in the message list"
msgstr "在信息列表中显示 email 地址列"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
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:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
msgid "Show deleted messages in the message-list"
msgstr "在信息列表中显示删除了的信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信息列表中显示删除了的信息(带有删除线)。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
msgid "Show junk messages in the message-list"
msgstr "在消息列表中显示垃圾信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
msgid "Show junk messages (with a red strike-through) in the message-list."
msgstr "在信息列表中显示垃圾信息(带有红色删除线)。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
msgid "Enable Unmatched search folder"
msgstr "启用“无匹配”搜索文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
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:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
msgid "Hides the per-folder preview and removes the selection"
msgstr "隐藏单文件夹预览并移除选择"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
#, fuzzy
#| msgid ""
#| "This key is read only once and reset to \"false\" after read. This "
@@ -1909,31 +1866,31 @@ msgstr ""
"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
"件夹的预览。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
msgid "Height of the message-list pane"
msgstr "信息列表面板的高度"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
msgid "Height of the message-list pane."
msgstr "信息列表面板的高度。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
msgid "Whether message headers are collapsed in the user interface"
msgstr "是否在用户界面中折叠信息头"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
msgid "Width of the message-list pane"
msgstr "信息列表面板的高度"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
msgid "Width of the message-list pane."
msgstr "信息列表面板的高度。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
msgid "Layout style"
msgstr "布局样式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
#, fuzzy
#| msgid ""
#| "The layout style determines where to place the preview pane in relation "
@@ -1949,45 +1906,45 @@ msgstr ""
"布局样式决定了在哪里放置信息列表的预览面板。“0”(经典视图)会把预览面板放置在消"
"息列表下面。“1”(竖直视图)会把预览面板放置在信息列表旁边。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
msgid "Variable width font"
msgstr "变宽字体"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
msgid "The variable width font for mail display."
msgstr "用于显示邮件的变宽字体。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
msgid "Terminal font"
msgstr "终端字体"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
msgid "The terminal font for mail display."
msgstr "邮件显示用的终端字体。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
msgid "Use custom fonts for displaying mail."
msgstr "使用自定义字体显示邮件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "压缩 TO/CC/BCC 中地址的显示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
#, fuzzy
#| msgid ""
#| "This sets the number of addresses to show in default message list view, "
@@ -1997,31 +1954,47 @@ msgid ""
"beyond which a “...” is shown."
msgstr "设定默认信息视图中要显示的地址数，超过的部分显示为“...”。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#, fuzzy
+#| msgid ""
+#| "Show Attachment Bar below the message preview pane when the message has "
+#| "attachments"
+msgid ""
+"Show mails in headers part of the message preview when name is available"
+msgstr "当消息含有附件时在信息预览面板下面显示附件栏。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+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, "
+"without the actual email, with the name made clickable."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信息列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
msgid "Default value for thread expand state"
msgstr "话题的默认展开状态"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
msgid "Whether sort threads based on latest message in that thread"
msgstr "是否以线索中的最新信息来排序线索"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
#, fuzzy
#| msgid ""
#| "This setting specifies whether the threads should be sorted based on "
@@ -2035,11 +2008,11 @@ msgstr ""
"此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
"启 Evolution。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
msgid "Whether sort thread children always ascending"
msgstr "是否永远递增排序相关邮件子项"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
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."
@@ -2047,11 +2020,11 @@ msgstr ""
"这个设置值指定相关邮件的子项是否永远递增排序，而非依照相关邮件同样的排序顺"
"序。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
msgid "Sort accounts alphabetically in a folder tree"
msgstr "在文件夹树中按字母顺序排列帐号"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
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 "
@@ -2061,27 +2034,29 @@ msgstr ""
"指出在邮件视图的文件夹树里如何排序帐号。若设为 true，帐号按字母顺序排列，“在"
"此计算机上”和“搜索”文件夹除外；否则帐号按用户指定的顺序排列"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid "Logfile to log filter actions."
-msgstr "记录过滤动作的日志文件。"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
msgid "Flush Outbox after filtering"
msgstr "在过滤之后清空输出窗口"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
#, fuzzy
#| msgid ""
#| "Whether to flush Outbox after filtering is done. Outbox flush will happen "
@@ -2095,100 +2070,114 @@ msgstr ""
"在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
"约一分钟后进行发件箱刷新。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Forward and reply attribution language tag, like en_US. Empty string means "
+"to use the same language as the user interface."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
msgstr "使用 快捷键(Ctrl+Enter) 发送时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
msgid "Prompt when emptying the trash"
msgstr "清空废件箱时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
msgid "Prompt the user when he or she tries to empty the trash."
msgstr "在用户试图清空废件箱时提示他/她。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户试图销毁文件夹时提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+msgid "Prompt when user calls Empty Junk"
+msgstr "用户清空垃圾邮件时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+msgid "Prompt the user when he or she tries to Empty a Junk folder."
+msgstr "用户试图清空垃圾邮件文件夹时提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
msgid "Prompt before sending to recipients not entered as mail addresses"
msgstr "下列接收者不能被识别为有效的电子邮件地址"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入密件抄送时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
msgid "Prompt while marking multiple messages"
msgstr "标记多封信息时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
msgid "Enable or disable the prompt whilst marking multiple messages."
msgstr "禁用/启用对多条信息标记时的提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
msgid "Prompt when deleting messages in search folder"
msgstr "删除搜索文件夹中的信息时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
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 "
@@ -2196,11 +2185,11 @@ msgid ""
msgstr ""
"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
msgid "Asks whether to copy a folder by drag & drop in the folder tree"
msgstr "询问是否通过文件夹树的拖放操作复制文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
#, fuzzy
#| msgid ""
#| "Possible values are: 'never' - do not allow copy with drag & drop of "
@@ -2216,11 +2205,11 @@ msgstr ""
"可取的值有：“never”- 不允许在文件夹树中拖放复制文件夹；“always”- 允许复制，无"
"须询问；“ask”- (或其他任意值) 询问用户。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
msgid "Asks whether to move a folder by drag & drop in the folder tree"
msgstr "询问是否通过文件夹树的拖放操作移动文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
#, fuzzy
#| msgid ""
#| "Possible values are: 'never' - do not allow move with drag & drop of "
@@ -2236,21 +2225,21 @@ msgstr ""
"可取的值有：“never”- 不允许在文件夹树中拖放移动文件夹；“always”- 允许移动，无"
"须询问；“ask”- (或其他任意值) 询问用户。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
msgid "Prompt when replying privately to list messages"
msgstr "当对邮件列表作私人回复时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
msgid "Prompt when mailing list hijacks private replies"
msgstr "当邮件列表劫持私人回复时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
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 "
@@ -2259,17 +2248,17 @@ msgstr ""
"当您正要发送一个通过邮件列表收到的信息的私人回复，而邮件头的 Reply-To: 重定向"
"到了列表时，禁用或启用反复的警告提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
msgid "Prompt when replying to many recipients"
msgstr "当向多个收件人回复时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
#, fuzzy
#| msgid ""
#| "Prompt when switching composer mode and the content needs to lose its "
@@ -2279,7 +2268,7 @@ msgid ""
"formatting"
msgstr "是否在切换编辑器模式会导致内容失去现有格式时先提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
#, fuzzy
#| msgid ""
#| "It disables/enables the repeated prompts to warn that you are switching "
@@ -2290,11 +2279,11 @@ msgid ""
msgstr ""
"它会停用/启用重复提示警告您正在切换编辑器模式而其中内容会失去先前的格式。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
msgid "Prompt when sending to many To and CC recipients"
msgstr "当回复给许多收件人与抄送时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
#, fuzzy
#| msgid ""
#| "Enable or disable the prompt when sending to many To and CC recipients. "
@@ -2306,46 +2295,46 @@ msgstr ""
"当寄信给许多收件人与抄送时启用或停用提示。“composer-many-to-cc-recips-num”定"
"义了这个界限值。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
msgid "Empty Trash folders on exit"
msgstr "退出时清空废件箱"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出 Evolution 时清空废件箱。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空废件箱的最少天数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空废件箱的最少天数。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
msgid "Last time Empty Trash was run"
msgstr "上次清空废件箱的时间为："
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
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:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
msgid "Level beyond which the message should be logged."
msgstr "大于此级别的信息会被记录。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
#, fuzzy
#| msgid ""
#| "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
@@ -2355,13 +2344,13 @@ msgid ""
"for debug messages."
msgstr "此选项有三种可能值：0－错误，1－警告，2－调试信息。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
#, fuzzy
#| msgid "Show original \"Date\" header value."
msgid "Show original “Date” header value."
msgstr "显示原始的邮件头日期值。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
#, fuzzy
#| msgid ""
#| "Show the original \"Date\" header (with a local time only if the time "
@@ -2375,11 +2364,11 @@ msgstr ""
"显示原始的邮件头“Date”值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
"式和本地时区显示邮件头“Date”值。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
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."
@@ -2387,44 +2376,44 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”，其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
msgid "Check incoming mail being junk"
msgstr "检查收到的邮件是否是垃圾信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
msgid "Run junk test on incoming mail."
msgstr "对收到的邮件运行垃圾信息测试。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
msgid "Empty Junk folders on exit"
msgstr "退出时清空垃圾信息文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
msgid "Empty all Junk folders when exiting Evolution."
msgstr "退出 Evolution 时清空垃圾信息。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
msgid "Minimum days between emptying the junk on exit"
msgstr "退出时清空垃圾信息的最少天数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "退出时清空垃圾信息的最少时间，以天计。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
msgid "Last time Empty Junk was run"
msgstr "上次清空垃圾信息的时间为："
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
msgid "The default plugin for Junk hook"
msgstr "默认的垃圾信息钩子插件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
#, fuzzy
#| msgid ""
#| "This is the default junk plugin, even though there are multiple plugins "
@@ -2438,11 +2427,11 @@ msgstr ""
"这是默认的垃圾信息插件，即使启用了多个插件。如果默认列出的插件被禁用，它不会"
"缺省到其它可用的插件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
msgid "Determines whether to lookup in address book for sender email"
msgstr "决定是否在地址簿中查找发件人电子邮件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
#, fuzzy
#| msgid ""
#| "Determines whether to lookup the sender email in address book. If found, "
@@ -2459,13 +2448,13 @@ msgstr ""
"为自动补全的地址簿中查找，如果远程地址簿(如 LDAP)被标记为自动补全的话，可能会"
"比较慢。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
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 "
@@ -2474,11 +2463,11 @@ msgstr ""
"此选项与 lookup_addressbook 键值相关，用于决定是否查询本地地址簿以避免您认识"
"的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
msgid "Determines whether to use custom headers to check for junk"
msgstr "决定是否使用自定义信头检测垃圾信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
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 "
@@ -2487,11 +2476,11 @@ msgstr ""
"决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话，将提高"
"垃圾信息检测速度。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
msgid "Custom headers to use while checking for junk."
msgstr "自定义用以检查垃圾信息的信头。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
#, fuzzy
#| msgid ""
#| "Custom headers to use while checking for junk. The list elements are "
@@ -2501,41 +2490,41 @@ msgid ""
"in the format “headername=value”."
msgstr "自定义用以检查垃圾信息的信头。列表元素的字符串格式为“信头名=值”。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
msgid "UID string of the default account."
msgstr "默认帐号的 UID 字符串。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
msgid "Save directory"
msgstr "保存目录"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
msgid "Directory for saving mail component files."
msgstr "保存邮件组件文件的目录。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
msgid "Composer load/attach directory"
msgstr "编辑器加载/附件目录"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
msgid "Directory for loading/attaching files to composer."
msgstr "邮件写作器用来加载/附加文件的目录"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
msgid "Check for new messages on start"
msgstr "启动时检查新信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
msgid "Check for new messages in all active accounts"
msgstr "检查所有活动帐号的新信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
#, fuzzy
#| msgid ""
#| "Whether to check for new messages in all active accounts regardless of "
@@ -2550,21 +2539,21 @@ msgstr ""
"在 Evolution 启动时，是不是检查所有活动帐号的新信息而不管帐号的“每隔 X 分钟自"
"动检查新信息”选项如何设置。该选项仅与“send_recv_on_start”选项一起使用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
msgid "Server synchronization interval"
msgstr "服务器同步间隔"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
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:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
msgid "Allow expunge in virtual folders"
msgstr "允许在虚拟文件夹中销毁"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
#, fuzzy
#| msgid ""
#| "Enables Expunge in virtual folders, which means that the Folder->Expunge "
@@ -2581,34 +2570,256 @@ msgstr ""
"虚拟文件夹中信息的操作会在所有文件夹中进行，而不仅仅是只删除属于虚拟文件夹中"
"的信息。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
#: ../src/mail/mail-config.ui.h:9
#, fuzzy
#| msgid "Inherit theme colors in HTML mode"
msgid "Inherit theme colors in HTML format"
msgstr "继承主题的颜色为 HTML 模式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
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:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
msgid "An Archive folder for On This Computer folders."
msgstr "一个对应于“位于本机”文件夹的归档文件夹。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
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:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#, fuzzy
+#| msgid "Whether to show icons of events in the month view"
+msgid "Whether the To Do bar is visible in the main window"
+msgstr "是否在月视图中显示事件的结束时间"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#, fuzzy
+#| msgid "If \"true\", show the memo preview pane in the main window."
+msgid "Stores whether the To Do bar is visible in the main window."
+msgstr "如果 “true”，在主窗口中显示备忘预览面板。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
+#, fuzzy
+#| msgid "If \"true\", show the memo preview pane in the main window."
+msgid "Width of the To Do bar in the main window"
+msgstr "如果 “true”，在主窗口中显示备忘预览面板。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#, fuzzy
+#| msgid "The default Y coordinate for the main window."
+msgid "Holds the width of the To Do bar for the main window."
+msgstr "主窗口的默认纵坐标。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#, fuzzy
+#| msgid "Whether the shell window's tool bar is visible"
+msgid "Whether the To Do bar is visible in a sub-window"
+msgstr "切换器是否可见"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+msgid "Width of the To Do bar in a sub-window"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
+#, fuzzy
+#| msgid "Default width of the mail browser window."
+msgid "Holds the width of the To Do bar for a sub-window."
+msgstr "邮件浏览器窗口的默认宽度。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#, fuzzy
+#| msgid "Whether the toolbar should be visible."
+msgid "Whether the To Do bar should show also completed tasks"
+msgstr "工具栏是否可见。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
+msgid "Whether the To Do bar should show also tasks without Due date"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+msgid "Stores whether the To Do bar should show also tasks without Due date."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
+msgid "Show start up wizard"
+msgstr "显示启动向导"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
+msgid "Whether go to the previous message after message deletion"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
+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."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
+msgid "Show Subject above Sender in Messages column"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
+msgid ""
+"Whether to show Subject above Sender (From/To) in the Messages column, "
+"usually shown in the Vertical/Wide view of the message list"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
+msgid "Visually wrap long lines in composer"
+msgstr "在编辑器内视觉上对长行折行"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../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:278
+#, fuzzy
+#| msgid "Default reply style"
+msgid "Alternative reply style"
+msgstr "默认回复样式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+msgid "Format message in HTML"
+msgstr "以 HTML 方式格式化信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+#, fuzzy
+#| msgid "Put the cursor at the bottom of replies"
+msgid "Put the cursor at the bottom of alternative replies"
+msgstr "将光标置于回复底部"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+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:282
+#, fuzzy
+#| msgid "Put personalized signatures at the top of replies"
+msgid "Put the signature at the top of the message"
+msgstr "在回复的顶部添加个性签名"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+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:284
+msgid "Apply chosen template when using Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+msgid "Last chosen template’s folder URI for Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+msgid "Last chosen template’s message UID for Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+msgid ""
+"Whether preserve original message subject when applying template for "
+"Alternative Reply"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+msgid ""
+"Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
+"“false”, then Normal paragraph style will be used."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+#, fuzzy
+#| msgid "The server did not allow the selected message to be retracted."
+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:290
+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:291
+msgid ""
+"Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
+"messages."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+msgid ""
+"The “off” value completely disables certificate lookup; the “autocompleted” "
+"value provides certificates only for auto-completed contacts; the “books” "
+"value uses certificates from auto-completed contacts and searches in books "
+"marked for auto-completion."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+#, fuzzy
+#| msgid "Failed to download messages for offline viewing."
+msgid "Whether Send/Receive should also download of messages for offline."
+msgstr "无法下载信息以离线查看。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+msgid ""
+"If enabled, whenever Send/Receive is run it also runs synchronization of "
+"messages for offline use. The option is disabled by default."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Whether display delivery notification parts inline."
+msgstr "只在通知区域显示提醒(_O)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
+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:297
+#, fuzzy
+#| msgid "Inherit theme colors in HTML mode"
+msgid "Whether unset colors provided in HTML mails."
+msgstr "继承主题的颜色为 HTML 模式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
+msgid ""
+"If enabled, unset colors in HTML messages, forcing use of desktop theme "
+"colors instead."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
msgid "(Deprecated) Default forward style"
msgstr "(已弃用) 默认转发方式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
#, fuzzy
#| msgid ""
#| "This key was deprecated in version 3.10 and should no longer be used. Use "
@@ -2618,11 +2829,11 @@ msgid ""
"“forward-style-name” instead."
msgstr "该键已在 3.10 版本中弃用，不应再使用。请转用 \"forward-style-name\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
msgid "(Deprecated) Default reply style"
msgstr "(已弃用) 默认回复样式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
#, fuzzy
#| msgid ""
#| "This key was deprecated in version 3.10 and should no longer be used. Use "
@@ -2632,11 +2843,11 @@ msgid ""
"“reply-style-name” instead."
msgstr "该键已在 3.10 版本中弃用，不应再使用。请转用 \"reply-style-name\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
msgid "(Deprecated) List of custom headers and whether they are enabled."
msgstr "(已弃用)自定义信头及是否启用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
#, fuzzy
#| msgid ""
#| "This key was deprecated in version 3.10 and should no longer be used. Use "
@@ -2646,11 +2857,11 @@ msgid ""
"“show-headers” instead."
msgstr "该键已在 3.10 版本中弃用，不应再使用。请转用 \"show-headers\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:305
msgid "(Deprecated) Load images for HTML messages over HTTP"
msgstr "(已弃用) 在 HTML 信息中载入 HTTP 图像"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:306
#, fuzzy
#| msgid ""
#| "This key was deprecated in version 3.10 and should no longer be used. Use "
@@ -2661,13 +2872,13 @@ msgid ""
msgstr ""
"该键已在 3.10 版本中弃用，不应再使用。请转用 \"image-loading-policy\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:307
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:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:308
#, fuzzy
#| msgid ""
#| "This key was deprecated in version 3.10 and should no longer be used. Use "
@@ -2679,7 +2890,7 @@ msgstr ""
"该键已在 3.10 版本中弃用，不应再使用。请转用 \"browser-close-on-reply-policy"
"\"。"
-#. Translators: This is the a list of words for the attach reminder plugin to look
+#. Translators: This is a list of words for the attach reminder plugin to look
#. for in a message body. Please use any number of words here in your language that might
#. indicate that an attachment should have been attached to the message.
#: ../data/org.gnome.evolution.plugin.attachment-reminder.gschema.xml.in.h:4
@@ -2728,35 +2939,43 @@ msgid ""
msgstr "是否自动将联系人添加到用户的地址簿中。"
#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Whether to set “File under” field as “First Last”"
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "Set File under as “First Last”, instead of “Last, First”."
+msgstr ""
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
msgid "Pidgin address book source"
msgstr "Pidgin 地址簿来源"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
msgid ""
"Address book to use for storing automatically synced contacts from Pidgin."
msgstr "用于保存从 Pidgin 中自动同步的联系人的地址簿。"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
msgid "Pidgin check interval"
msgstr "Pidgin 检查间隔"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
msgid "Check interval for Pidgin syncing of contacts."
msgstr "Pidgin 同步联系人的检查间隔。"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
msgid "Pidgin last sync MD5"
msgstr "Pidgin 上次同步 MD5"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
msgid "Pidgin last sync MD5."
msgstr "Pidgin 上次同步 MD5。"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:15
msgid "Pidgin last sync time"
msgstr "Pidgin 上次同步时间"
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:16
msgid "Pidgin last sync time."
msgstr "Pidgin 上次同步时间。"
@@ -2815,6 +3034,16 @@ msgstr "删除已处理的对象"
msgid "Whether to delete processed iTip objects"
msgstr "是否删除已处理的 iTip 对象"
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "Preserve existing reminder by default"
+msgstr "保留我的提醒(_P)"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
+msgid "Whether to preset option to preserve existing reminder by default"
+msgstr ""
+
#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
msgid "Notify new messages for Inbox only."
msgstr "只通知收件箱中的新信息。"
@@ -2910,6 +3139,15 @@ msgstr "使用声音主题"
msgid "Play themed sound when new messages arrive, if not in beep mode."
msgstr "不在 beep 模式下时新邮件到达要播放主题的声音文件。"
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:19
+msgid "Do not notify for these accounts"
+msgstr "不要为这些账号提醒"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:20
+msgid ""
+"Contains UIDs of accounts for which the notifications should be avoided."
+msgstr ""
+
#: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
msgid "Mode to use when displaying mails"
msgstr "显示邮件时所用模式"
@@ -3003,7 +3241,7 @@ msgid ""
msgstr "使用 autoar 压缩附件的目录时使用的压缩过滤器。"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:320
+#: ../src/shell/main.c:331
msgid "Start in offline mode"
msgstr "以离线模式启动"
@@ -3071,16 +3309,12 @@ msgstr ""
"具栏)。如果设置为“toolbar”(工具栏)，则工具栏的样式由 GNOME 设置决定。"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#, fuzzy
-#| msgid "Sidebar is visible"
msgid "Menubar is visible"
-msgstr "侧边栏可见"
+msgstr "菜单栏可见"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#, fuzzy
-#| msgid "Whether the sidebar should be visible."
msgid "Whether the menubar should be visible."
-msgstr "侧边栏是否可见。"
+msgstr "菜单栏是否可见。"
#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
msgid "Toolbar is visible"
@@ -3126,6 +3360,38 @@ msgstr "启用特殊 WebKit 开发者特性"
msgid "Any change of this option requires restart of Evolution."
msgstr "此选项的任何变动都需要重启 Evolution。"
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:36
+msgid "The last extension being used when backing up Evolution data."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
+msgid ""
+"It can be either “.gz” or “.xz” and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:38
+msgid "Prefix of the URI to use to search the web with selected text."
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:39
+msgid ""
+"The prefix of a URL to be used for searches on the web. The actual text "
+"selection is escaped and appended to this string. The URI should start with "
+"https://.";
+msgstr ""
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:40
+msgid "Minimum font size to be used by WebKitGTK"
+msgstr "WebKitGTK 所用的最小字体大小"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:41
+msgid ""
+"The minimum font size in pixels used to display text in WebKitGTK. This "
+"setting controls the absolute smallest size. Values other than 0 can "
+"potentially break page layouts. Negative values are treated as 0."
+msgstr ""
+
#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
msgid "Use only local spam tests."
msgstr "只使用本地垃圾信息测试。"
@@ -3160,74 +3426,481 @@ msgstr ""
"运行 sa-learn 命令的完整路径。如果未设置，使用编译时路径，通常是 /usr/bin/sa-"
"learn 。命令不该包含任何其他参数。"
-#: ../data/views/addressbook/galview.xml.h:1
-msgid "_Address Cards"
-msgstr "地址名片(_A)"
-
-#: ../data/views/addressbook/galview.xml.h:2
-#: ../data/views/calendar/galview.xml.h:5
-msgid "_List View"
-msgstr "列表视图(_L)"
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+#, fuzzy
+#| msgid "Whether the plugin is enabled"
+msgid "Whether the text-highlight module is enabled"
+msgstr "插件是否已启用"
-#: ../data/views/addressbook/galview.xml.h:3
-msgid "By _Company"
-msgstr "按公司(_C)"
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid "Theme name to use, defaults to “bclear”"
+msgstr ""
-#: ../data/views/calendar/galview.xml.h:1
-msgid "_Day View"
-msgstr "日视图(_D)"
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:3
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+msgstr ""
-#: ../data/views/calendar/galview.xml.h:2
-msgid "_Work Week View"
-msgstr "工作日视图(_W)"
+#: ../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:1291
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
+#: ../src/shell/e-shell-window-private.c:241
+msgid "Evolution"
+msgstr "Evolution"
-#: ../data/views/calendar/galview.xml.h:3
-msgid "W_eek View"
-msgstr "周视图(_E)"
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:2
+#: ../data/org.gnome.Evolution.desktop.in.in.h:4
+msgid "Manage your email, contacts and schedule"
+msgstr "配置您的电子邮件，联系人和日程表"
-#: ../data/views/calendar/galview.xml.h:4
-msgid "_Month View"
-msgstr "月视图(_M)"
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr "Evolution 是一款个人信息管理应用，提供集成的邮件、日历和地址簿功能。"
-#: ../data/views/mail/galview.xml.h:1
-msgid "_Messages"
-msgstr "信息(_M)"
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:4
+#, fuzzy
+#| msgid ""
+#| "Evolution supports a wide range of industry standard data formats and "
+#| "network protocols for information exchange, with an emphasis on standards "
+#| "compliance and security. Evolution can also integrate smoothly with "
+#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
+#| "extension."
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the “Exchange Web Services” (EWS) extension."
+msgstr ""
+"Evolution 支持众多的工业标准数据格式和信息交换的网络协议，并强化了标准兼容性"
+"和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
+"进行顺利集成。"
-#: ../data/views/mail/galview.xml.h:2
-msgid "As _Sent Folder"
-msgstr "作为已发文件夹(_S)"
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
+msgid "The Evolution Team"
+msgstr "Evolution 团队"
-#: ../data/views/mail/galview.xml.h:3
-msgid "By Su_bject"
-msgstr "按主题(_B)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:2
+#: ../src/shell/e-shell-utils.c:352
+msgid "Groupware Suite"
+msgstr "Groupwise 套件"
-#: ../data/views/mail/galview.xml.h:4
-msgid "By Se_nder"
-msgstr "按发件人(_N)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:3
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution 邮件及日历"
-#: ../data/views/mail/galview.xml.h:5
-msgid "By S_tatus"
-msgstr "按状态(_T)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:5
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "mail;calendar;contact;addressbook;task;邮件;日历;联系人;地址簿;任务;"
-#: ../data/views/mail/galview.xml.h:6
-msgid "By _Follow Up Flag"
-msgstr "按跟随标志(_F)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:6
+msgid "New Window"
+msgstr "新建窗口"
-#: ../data/views/mail/galview.xml.h:7
-msgid "For _Wide View"
-msgstr "对宽屏视图(_W)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:7
+msgid "Compose a Message"
+msgstr "新建消息"
-#: ../data/views/mail/galview.xml.h:8
-msgid "As Sent Folder for Wi_de View"
-msgstr "对宽屏视图显示已发文件夹(_D)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:8
+#: ../src/e-util/e-name-selector-dialog.c:448
+#: ../src/modules/addressbook/e-book-shell-backend.c:314
+#: ../src/modules/addressbook/e-book-shell-view.c:421
+msgid "Contacts"
+msgstr "联系人"
-#: ../data/views/memos/galview.xml.h:1
-msgid "_Memos"
-msgstr "备忘(_M)"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:9
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1009
+#: ../src/e-util/e-collection-account-wizard.c:839
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:199
+#: ../src/modules/calendar/e-cal-shell-view.c:599
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Calendar"
+msgstr "日历"
-#: ../data/views/tasks/galview.xml.h:1
-#: ../src/plugins/pst-import/pst-importer.c:571
-msgid "_Tasks"
+#: ../data/org.gnome.Evolution.desktop.in.in.h:10
+#: ../src/e-util/e-send-options.c:536 ../src/mail/importers/elm-importer.c:330
+#: ../src/mail/importers/kmail-importer.c:251
+#: ../src/mail/importers/pine-importer.c:423
+#: ../src/modules/mail/e-mail-shell-view.c:1624
+#: ../src/smime/gui/certificate-manager.c:1666
+msgid "Mail"
+msgstr "邮件"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:11
+#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-cal-shell-content.c:1773
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:196
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:211
+#: ../src/modules/calendar/e-memo-shell-view.c:335
+msgid "Memos"
+msgstr "备忘"
+
+#: ../data/org.gnome.Evolution.desktop.in.in.h:12
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2442
+#: ../src/calendar/importers/icalendar-importer.c:77
+#: ../src/calendar/importers/icalendar-importer.c:1141
+#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-cal-shell-content.c:1733
+#: ../src/modules/calendar/e-task-shell-view-actions.c:220
+#: ../src/modules/calendar/e-task-shell-view-actions.c:235
+#: ../src/modules/calendar/e-task-shell-view.c:515
+msgid "Tasks"
+msgstr "任务"
+
+#: ../data/ui/evolution-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Keyboard Shortcuts"
+msgstr "键盘快捷键"
+
+#: ../data/ui/evolution-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "General"
+msgstr "常规"
+
+#: ../data/ui/evolution-shortcuts.ui.h:3
+#, fuzzy
+#| msgid "Select all column names"
+msgctxt "shortcut window"
+msgid "Select Mail component"
+msgstr "选中所有栏名"
+
+#: ../data/ui/evolution-shortcuts.ui.h:4
+#, fuzzy
+#| msgid "Select Contacts from Address Book"
+msgctxt "shortcut window"
+msgid "Select Contacts component"
+msgstr "从地址簿选择联系人"
+
+#: ../data/ui/evolution-shortcuts.ui.h:5
+#, fuzzy
+#| msgid "Select a Calendar"
+msgctxt "shortcut window"
+msgid "Select Calendar component"
+msgstr "选择一个日历"
+
+#: ../data/ui/evolution-shortcuts.ui.h:6
+#, fuzzy
+#| msgid "Select a Task List"
+msgctxt "shortcut window"
+msgid "Select Tasks component"
+msgstr "选择一个任务列表"
+
+#: ../data/ui/evolution-shortcuts.ui.h:7
+#, fuzzy
+#| msgid "Select a Memo List"
+msgctxt "shortcut window"
+msgid "Select Memos component"
+msgstr "选择一个备忘录"
+
+#: ../data/ui/evolution-shortcuts.ui.h:8
+#, fuzzy
+#| msgid "Create a new mail account"
+msgctxt "shortcut window"
+msgid "Create a new item in current component"
+msgstr "创建新邮件帐号"
+
+#: ../data/ui/evolution-shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Cycle focus between panes"
+msgstr ""
+
+#: ../data/ui/evolution-shortcuts.ui.h:10
+#, fuzzy
+#| msgid "Open the Evolution User Guide"
+msgctxt "shortcut window"
+msgid "Open the Evolution user guide"
+msgstr "打开 Evolution 用户指南"
+
+#: ../data/ui/evolution-shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Clear search bar"
+msgstr "清除搜索栏"
+
+#: ../data/ui/evolution-shortcuts.ui.h:12
+#, fuzzy
+#| msgid "Move contacts to"
+msgctxt "shortcut window"
+msgid "Move mails or contacts to folder"
+msgstr "将联系人移至"
+
+#: ../data/ui/evolution-shortcuts.ui.h:13
+#, fuzzy
+#| msgid "Copy contacts to"
+msgctxt "shortcut window"
+msgid "Copy mails or contacts to folder"
+msgstr "将联系人复制到"
+
+#: ../data/ui/evolution-shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../data/ui/evolution-shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Open new window"
+msgstr "在新窗口中打开"
+
+#: ../data/ui/evolution-shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "关闭窗口"
+
+#: ../data/ui/evolution-shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Quit Evolution"
+msgstr "退出 Evolution"
+
+#: ../data/ui/evolution-shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Mail"
+msgstr "邮件"
+
+#: ../data/ui/evolution-shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Create a new message"
+msgstr "创建新信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:20
+#, fuzzy
+#| msgid "Sent and Draft Messages"
+msgctxt "shortcut window"
+msgid "Send and receive messages"
+msgstr "发送信息并保存草稿"
+
+#: ../data/ui/evolution-shortcuts.ui.h:21
+#, fuzzy
+#| msgid "Copy the selection"
+msgctxt "shortcut window"
+msgid "Apply filters to selection"
+msgstr "复制选中内容"
+
+#: ../data/ui/evolution-shortcuts.ui.h:22
+#, fuzzy
+#| msgid "Open the selected messages in a new window"
+msgctxt "shortcut window"
+msgid "Open selection in new window"
+msgstr "在新窗口中打开选中的信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Go to folder"
+msgstr "前往文件夹"
+
+#: ../data/ui/evolution-shortcuts.ui.h:24
+#, fuzzy
+#| msgid "Mark the selected messages as junk"
+msgctxt "shortcut window"
+msgid "Mark selected messages as read"
+msgstr "把选中信息标记为垃圾信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:25
+#, fuzzy
+#| msgid "Mark the selected messages as junk"
+msgctxt "shortcut window"
+msgid "Mark selected messages as unread"
+msgstr "把选中信息标记为垃圾信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:26
+#, fuzzy
+#| msgid "Display the next unread message"
+msgctxt "shortcut window"
+msgid "Jump to the next unread message"
+msgstr "显示下一封未读信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:27
+#, fuzzy
+#| msgid "Display the previous unread message"
+msgctxt "shortcut window"
+msgid "Jump to the previous unread message"
+msgstr "显示上一封未读信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:28
+#, fuzzy
+#| msgid "Forwarded messages"
+msgctxt "shortcut window"
+msgid "Forward selected messages"
+msgstr "转发的信息"
+
+#: ../data/ui/evolution-shortcuts.ui.h:29
+#, fuzzy
+#| msgid "_Reply to Sender"
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "回复发件人(_R)"
+
+#: ../data/ui/evolution-shortcuts.ui.h:30
+#, fuzzy
+#| msgid "Reply to _List"
+msgctxt "shortcut window"
+msgid "Reply to list"
+msgstr "回复邮件列表(_L)"
+
+#: ../data/ui/evolution-shortcuts.ui.h:31
+#, fuzzy
+#| msgid "Send reply to all recipients?"
+msgctxt "shortcut window"
+msgid "Reply to all recipients"
+msgstr "发送回复给所有收件人？"
+
+#: ../data/ui/evolution-shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Scroll up"
+msgstr ""
+
+#: ../data/ui/evolution-shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Scroll down"
+msgstr ""
+
+#: ../data/ui/evolution-shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Calendar"
+msgstr "日历"
+
+#: ../data/ui/evolution-shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
+#: ../data/ui/evolution-shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Create a new meeting"
+msgstr "创建一个新的会议"
+
+#: ../data/ui/evolution-shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Create a new task"
+msgstr "创建新任务"
+
+#: ../data/ui/evolution-shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Create a new memo"
+msgstr "创建新备忘"
+
+#: ../data/ui/evolution-shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Go to today"
+msgstr "转到今天"
+
+#: ../data/ui/evolution-shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Go to date"
+msgstr "转到日期"
+
+#: ../data/ui/evolution-shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Day View"
+msgstr "日视图"
+
+#: ../data/ui/evolution-shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Work Week View"
+msgstr "工作日视图"
+
+#: ../data/ui/evolution-shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Week View"
+msgstr "周视图"
+
+#: ../data/ui/evolution-shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Month View"
+msgstr "月视图"
+
+#: ../data/ui/evolution-shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "List View"
+msgstr "列表视图"
+
+#: ../data/ui/evolution-shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../data/ui/evolution-shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Create a new contact"
+msgstr "创建新联系人"
+
+#: ../data/ui/evolution-shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Create a new contact list"
+msgstr "创建新的联系人列表"
+
+#: ../data/views/addressbook/galview.xml.h:1
+msgid "_Address Cards"
+msgstr "地址名片(_A)"
+
+#: ../data/views/addressbook/galview.xml.h:2
+#: ../data/views/calendar/galview.xml.h:5
+msgid "_List View"
+msgstr "列表视图(_L)"
+
+#: ../data/views/addressbook/galview.xml.h:3
+msgid "By _Company"
+msgstr "按公司(_C)"
+
+#: ../data/views/calendar/galview.xml.h:1
+msgid "_Day View"
+msgstr "日视图(_D)"
+
+#: ../data/views/calendar/galview.xml.h:2
+msgid "_Work Week View"
+msgstr "工作日视图(_W)"
+
+#: ../data/views/calendar/galview.xml.h:3
+msgid "W_eek View"
+msgstr "周视图(_E)"
+
+#: ../data/views/calendar/galview.xml.h:4
+msgid "_Month View"
+msgstr "月视图(_M)"
+
+#: ../data/views/mail/galview.xml.h:1
+msgid "_Messages"
+msgstr "信息(_M)"
+
+#: ../data/views/mail/galview.xml.h:2
+msgid "As _Sent Folder"
+msgstr "作为已发文件夹(_S)"
+
+#: ../data/views/mail/galview.xml.h:3
+msgid "By Su_bject"
+msgstr "按主题(_B)"
+
+#: ../data/views/mail/galview.xml.h:4
+msgid "By Se_nder"
+msgstr "按发件人(_N)"
+
+#: ../data/views/mail/galview.xml.h:5
+msgid "By S_tatus"
+msgstr "按状态(_T)"
+
+#: ../data/views/mail/galview.xml.h:6
+msgid "By _Follow Up Flag"
+msgstr "按跟随标志(_F)"
+
+#: ../data/views/mail/galview.xml.h:7
+msgid "For _Wide View"
+msgstr "对宽屏视图(_W)"
+
+#: ../data/views/mail/galview.xml.h:8
+msgid "As Sent Folder for Wi_de View"
+msgstr "对宽屏视图显示已发文件夹(_D)"
+
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2429
+msgid "_Memos"
+msgstr "备忘(_M)"
+
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2433
+#: ../src/plugins/pst-import/pst-importer.c:571
+msgid "_Tasks"
msgstr "任务(_T)"
#: ../data/views/tasks/galview.xml.h:2
@@ -3243,75 +3916,54 @@ msgid "This address book could not be opened."
msgstr "无法打开此地址簿。"
#: ../src/addressbook/addressbook.error.xml.h:2
-msgid ""
-"This address book server might be unreachable or the server name may be "
-"misspelled or your network connection could be down."
-msgstr "此地址簿服务器不可达，或服务器名称拼错，又或者您的网络连接已断。"
-
-#: ../src/addressbook/addressbook.error.xml.h:3
-msgid "Failed to authenticate with LDAP server."
+#, fuzzy
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to communicate with LDAP server."
msgstr "与 LDAP 服务器认证失败。"
-#: ../src/addressbook/addressbook.error.xml.h:4
-msgid ""
-"Check to make sure your password is spelled correctly and that you are using "
-"a supported login method. Remember that many passwords are case sensitive; "
-"your caps lock might be on."
-msgstr ""
-"选中此处以确保您的密码拼写正确，并确保您使用了支持的登录方式。请记住，很多密"
-"码都是区分大小写的；您的 Caps Lock 灯可能为开。"
-
-#: ../src/addressbook/addressbook.error.xml.h:5
+#: ../src/addressbook/addressbook.error.xml.h:3
msgid "This address book server does not have any suggested search bases."
msgstr "此地址簿服务器不支持任何建议的搜索基础。"
-#: ../src/addressbook/addressbook.error.xml.h:6
-msgid ""
-"This LDAP server may use an older version of LDAP, which does not support "
-"this functionality or it may be misconfigured. Ask your administrator for "
-"supported search bases."
-msgstr ""
-"此 LDAP 服务器可能使用较早版本的 LDAP，所以无法支持此功能，或者是配置错误。请"
-"询问您的管理员有关支持的搜索基础一事。"
-
-#: ../src/addressbook/addressbook.error.xml.h:7
+#: ../src/addressbook/addressbook.error.xml.h:4
msgid "This server does not support LDAPv3 schema information."
msgstr "此服务器不支持 LDAPv3 大纲信息。"
-#: ../src/addressbook/addressbook.error.xml.h:8
+#: ../src/addressbook/addressbook.error.xml.h:5
msgid "Could not get schema information for LDAP server."
msgstr "无法从 LDAP 服务器获取大纲信息。"
-#: ../src/addressbook/addressbook.error.xml.h:9
+#: ../src/addressbook/addressbook.error.xml.h:6
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP 服务器无法响应有效的大纲信息。"
-#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/addressbook/addressbook.error.xml.h:7
msgid "Could not remove address book."
msgstr "无法删除地址簿。"
-#: ../src/addressbook/addressbook.error.xml.h:11
+#: ../src/addressbook/addressbook.error.xml.h:8
#, fuzzy
-#| msgid "Delete address book '{0}'?"
-msgid "Delete address book “{0}”?"
-msgstr "删除地址簿“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete address book “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
-#: ../src/addressbook/addressbook.error.xml.h:12
+#: ../src/addressbook/addressbook.error.xml.h:9
msgid "This address book will be removed permanently."
msgstr "此地址簿即将被永久删除。"
-#: ../src/addressbook/addressbook.error.xml.h:13
-#: ../src/calendar/calendar.error.xml.h:7 ../src/mail/mail.error.xml.h:69
+#: ../src/addressbook/addressbook.error.xml.h:10
+#: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
+#: ../src/mail/mail.error.xml.h:69
msgid "Do _Not Delete"
msgstr "不删除(_N)"
-#: ../src/addressbook/addressbook.error.xml.h:14
+#: ../src/addressbook/addressbook.error.xml.h:11
#, fuzzy
#| msgid "Delete remote address book "{0}"?"
msgid "Delete remote address book “{0}”?"
msgstr "删除远程地址簿“{0}”吗？"
-#: ../src/addressbook/addressbook.error.xml.h:15
+#: ../src/addressbook/addressbook.error.xml.h:12
#, fuzzy
#| msgid ""
#| "This will permanently remove the address book "{0}" from the "
@@ -3321,50 +3973,51 @@ msgid ""
"sure you want to proceed?"
msgstr "这将从服务器永久删除地址簿“{0}”。您确定要继续吗？"
-#: ../src/addressbook/addressbook.error.xml.h:16
+#: ../src/addressbook/addressbook.error.xml.h:13
#: ../src/calendar/calendar.error.xml.h:65
+#: ../src/e-util/e-system.error.xml.h:28
msgid "_Delete From Server"
msgstr "从服务器删除(_D)"
-#: ../src/addressbook/addressbook.error.xml.h:17
+#: ../src/addressbook/addressbook.error.xml.h:14
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
-#: ../src/addressbook/addressbook.error.xml.h:18
+#: ../src/addressbook/addressbook.error.xml.h:15
#, fuzzy
#| msgid "Unable to open address book '{0}'"
msgid "Unable to open address book “{0}”"
msgstr "无法打开地址簿“{0}”"
-#: ../src/addressbook/addressbook.error.xml.h:19
+#: ../src/addressbook/addressbook.error.xml.h:16
msgid "Unable to perform search."
msgstr "无法执行搜索。"
-#: ../src/addressbook/addressbook.error.xml.h:20
+#: ../src/addressbook/addressbook.error.xml.h:17
#, fuzzy
#| msgid "Failed to refresh address book '{0}'"
msgid "Failed to refresh address book “{0}”"
msgstr "刷新地址簿“{0}”失败"
-#: ../src/addressbook/addressbook.error.xml.h:21
+#: ../src/addressbook/addressbook.error.xml.h:18
msgid "Would you like to save your changes?"
msgstr "您希望保存更改吗？"
-#: ../src/addressbook/addressbook.error.xml.h:22
+#: ../src/addressbook/addressbook.error.xml.h:19
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "您已对此联系人作出了修改。您想要保存这些更改吗？"
-#: ../src/addressbook/addressbook.error.xml.h:23
+#: ../src/addressbook/addressbook.error.xml.h:20
msgid "_Discard"
msgstr "丢弃(_D)"
-#: ../src/addressbook/addressbook.error.xml.h:24
+#: ../src/addressbook/addressbook.error.xml.h:21
msgid "Cannot move contact."
msgstr "无法移动联系人。"
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:22
msgid ""
"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
@@ -3372,87 +4025,90 @@ msgstr ""
"您即将把联系人从一个地址簿移至另外一个地址簿，但是无法从源地址簿删除该联系"
"人。您想要换作复制联系人吗？"
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:23
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr "您所选择的图像太大。您是否想要缩放并存储？"
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:24
+msgid "An expected image size is up to 96 x 96 pixels."
+msgstr ""
+
+#: ../src/addressbook/addressbook.error.xml.h:25
msgid "_Resize"
msgstr "缩放(_R)"
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:26
msgid "_Use as it is"
msgstr "原样使用(_U)"
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:27
msgid "_Do not save"
msgstr "不保存(_D)"
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:28
msgid "Unable to save {0}."
msgstr "无法保存 {0}。"
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:29
msgid "Error saving {0} to {1}: {2}"
msgstr "将{0}保存到 {1} 出错：{2}"
-#: ../src/addressbook/addressbook.error.xml.h:32
-#, fuzzy
-#| msgid "Address '{0}' already exists."
+#: ../src/addressbook/addressbook.error.xml.h:30
msgid "Address “{0}” already exists."
msgstr "地址“{0}”已经存在。"
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:31
msgid ""
"A contact already exists with this address. Would you like to add a new card "
"with the same address anyway?"
msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添加新名片吗？"
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:32
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1355
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:757
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
+#: ../src/e-util/e-accounts-window.c:1563
#: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
-#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721
#: ../src/mail/e-mail-label-manager.c:371
-#: ../src/mail/em-folder-properties.c:1031
-#: ../src/mail/em-vfolder-editor-rule.c:397
-#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
-#: ../src/modules/mail/em-composer-prefs.c:422
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:543
-#: ../src/plugins/email-custom-header/email-custom-header.c:837
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../src/plugins/templates/templates.c:463
+#: ../src/mail/em-folder-properties.c:1330
+#: ../src/mail/em-vfolder-editor-rule.c:408
+#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:544
+#: ../src/plugins/email-custom-header/email-custom-header.c:839
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../src/plugins/templates/templates.c:464
msgid "_Add"
msgstr "添加(_A)"
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:33
msgid "Some addresses already exist in this contact list."
msgstr "有些地址已经在此联系人列表中。"
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:34
msgid ""
"You are trying to add addresses that are part of this list already. Would "
"you like to add them anyway?"
msgstr "您正在试图添加已经属于此列表的地址。您仍要添加它们吗？"
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:35
msgid "Skip duplicates"
msgstr "跳过重复"
-#: ../src/addressbook/addressbook.error.xml.h:38
+#: ../src/addressbook/addressbook.error.xml.h:36
msgid "Add with duplicates"
msgstr "重复添加"
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:37
#, fuzzy
#| msgid "List '{0}' is already in this contact list."
msgid "List “{0}” is already in this contact list."
msgstr "列表“{0}”已在联系人列表中。"
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:38
#, fuzzy
#| msgid ""
#| "A contact list named '{0}' is already in this contact list. Would you "
@@ -3462,21 +4118,21 @@ msgid ""
"to add it anyway?"
msgstr "一条名为“{0}”的联系人记录已经在此联系人列表中了。您仍要添加它吗？"
-#: ../src/addressbook/addressbook.error.xml.h:41
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1242
msgid "Failed to delete contact"
msgstr "删除联系人失败"
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:40
msgid "You do not have permission to delete contacts in this address book."
msgstr "您没有足够的权限从地址簿中删除联系人。"
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:41
msgid "Cannot add new contact"
msgstr "无法添加新联系人"
#. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:43
#, fuzzy
#| msgid ""
#| "'{0}' is a read-only address book and cannot be modified. Please select a "
@@ -3487,12 +4143,12 @@ msgid ""
msgstr ""
"“{0}”是只读的地址簿，无法修改。请从联系人视图的侧边栏中选择另外一个地址簿。"
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:44
msgid "Cannot save a contact, address book is still opening"
msgstr "无法保存联系人，地址簿仍在打开中"
#. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:48
+#: ../src/addressbook/addressbook.error.xml.h:46
#, fuzzy
#| msgid ""
#| "Cannot save a contact to the address book '{0}', because it is still "
@@ -3504,19 +4160,43 @@ msgstr ""
"无法将联系人保存到地址簿“{0}”，因为它仍在打开。请等待它打开，或选择其他地址"
"簿。"
-#: ../src/addressbook/addressbook.error.xml.h:49
+#: ../src/addressbook/addressbook.error.xml.h:47
#, fuzzy
#| msgid "Search for text in the displayed contact"
msgid "Something has gone wrong when displaying the contact"
msgstr "在显示的联系人中搜索文本"
-#: ../src/addressbook/addressbook.error.xml.h:50
+#: ../src/addressbook/addressbook.error.xml.h:48
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 the GNOME bugzilla."
+"report in GNOME Gitlab."
msgstr ""
+#: ../src/addressbook/addressbook.error.xml.h:49
+#, fuzzy
+#| msgid "Failed to refresh address book '{0}'"
+msgid "Failed to refresh list of account address books"
+msgstr "刷新地址簿“{0}”失败"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+#, fuzzy
+#| msgid "Do you want to resend the meeting?"
+msgid "Do you want to unset contact image?"
+msgstr "您确信您要重新发送该会议吗？"
+
+#: ../src/addressbook/addressbook.error.xml.h:51
+#, fuzzy
+#| msgid "Do _Not Unsubscribe"
+msgid "Do _Not Unset"
+msgstr "不要退订(_N)"
+
+#: ../src/addressbook/addressbook.error.xml.h:52
+#, fuzzy
+#| msgid "_Unsort"
+msgid "_Unset"
+msgstr "未排序(_U)"
+
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
msgid "Show Telephone"
msgstr "显示电话"
@@ -3562,106 +4242,118 @@ msgid "Show Certificates"
msgstr "显示证书"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../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:3108
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
msgid "Contact Editor"
msgstr "联系人编辑器"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2379
+#: ../src/mail/mail-config.ui.h:40
msgid "Options"
msgstr "选项"
#. This is only shown if the EActivity has a GCancellable.
#. no flags
#: ../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:3504
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
#: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
#: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:516
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
#: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
-#: ../src/calendar/gui/e-cal-dialogs.c:694
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-cal-dialogs.c:690
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
+#: ../src/composer/e-composer-actions.c:242 ../src/e-util/e-activity-bar.c:370
#: ../src/e-util/e-attachment-dialog.c:309
-#: ../src/e-util/e-attachment-store.c:664
-#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:137
-#: ../src/e-util/e-category-editor.c:207 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-attachment-store.c:658
+#: ../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-collection-account-wizard.c:238
+#: ../src/e-util/e-collection-account-wizard.c:1868
+#: ../src/e-util/e-collection-account-wizard.c:2109
#: ../src/e-util/e-color-chooser-widget.c:125
-#: ../src/e-util/e-filter-datespec.c:289
-#: ../src/e-util/e-html-editor-actions.c:321
-#: ../src/e-util/e-html-editor-actions.c:415
-#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/e-util/e-filter-datespec.c:300
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
+#: ../src/e-util/e-image-chooser-dialog.c:179
#: ../src/e-util/e-mail-signature-script-dialog.c:366
-#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
-#: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
-#: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
-#: ../src/e-util/e-source-config-dialog.c:377
+#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:816
+#: ../src/e-util/e-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
+#: ../src/e-util/e-rule-editor.c:933 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-source-config-dialog.c:360
#: ../src/e-util/e-source-selector-dialog.c:370
#: ../src/e-util/e-table-config.c:548 ../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:835 ../src/e-util/e-web-view.c:4065
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:3932
#: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:331 ../src/mail/e-mail-label-dialog.c:194
-#: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
-#: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
-#: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
-#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
-#: ../src/modules/backup-restore/evolution-backup-tool.c:932
-#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4050
+#: ../src/mail/em-folder-selector.c:333 ../src/mail/mail-config.ui.h:2
+#: ../src/mail/mail.error.xml.h:16 ../src/mail/mail-send-recv.c:874
+#: ../src/mail/mail-send-recv.c:955 ../src/mail/mail-vfolder-ui.c:149
+#: ../src/mail/mail-vfolder-ui.c:271
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:277
+#: ../src/modules/backup-restore/evolution-backup-tool.c:936
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
+#: ../src/modules/calendar/e-cal-attachment-handler.c:281
#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../src/plugins/face/face.c:295
-#: ../src/plugins/publish-calendar/publish-calendar.c:788
+#: ../src/plugins/face/face.c:298
+#: ../src/plugins/publish-calendar/publish-calendar.c:789
#: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:185
-#: ../src/shell/e-shell-content.c:657 ../src/shell/e-shell-content.c:764
-#: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
-#: ../src/smime/gui/certificate-manager.c:665
-#: ../src/smime/gui/certificate-manager.c:742
-#: ../src/smime/gui/certificate-manager.c:966
-#: ../src/smime/gui/certificate-manager.c:1348
+#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../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:651
+#: ../src/smime/gui/certificate-manager.c:723
+#: ../src/smime/gui/certificate-manager.c:951
+#: ../src/smime/gui/certificate-manager.c:1332
#: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
msgid "_Cancel"
msgstr "取消(_C)"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:755
#: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2107
-#: ../src/composer/e-composer-actions.c:228
-#: ../src/composer/e-composer-actions.c:348
-#: ../src/e-util/e-attachment-store.c:833
+#: ../src/calendar/gui/e-comp-editor.c:2158
+#: ../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:370
-#: ../src/e-util/e-web-view.c:4066
+#: ../src/e-util/e-webdav-browser.c:2457 ../src/e-util/e-web-view.c:3932
#: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:140
-#: ../src/smime/gui/certificate-manager.c:666
-#: ../src/smime/gui/certificate-manager.c:743
+#: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
+#: ../src/smime/gui/certificate-manager.c:651
+#: ../src/smime/gui/certificate-manager.c:724
msgid "_Save"
msgstr "保存(_S)"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2004
-#: ../src/calendar/gui/e-comp-editor.c:2076
-#: ../src/e-util/e-preferences-window.c:380
+#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2127
+#: ../src/e-util/e-preferences-window.c:390
#: ../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.c:1309 ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell-window-actions.c:1059
msgid "_Help"
msgstr "帮助(_H)"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../src/e-util/e-misc-utils.c:3574
msgid "Image"
msgstr "图像"
@@ -3687,8 +4379,8 @@ msgid "Full _Name..."
msgstr "全名(_N)..."
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:750
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1169
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:925
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1345
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
msgid "Email"
msgstr "电子邮件"
@@ -3719,8 +4411,8 @@ msgid "_Home Page:"
msgstr "主页(_H)："
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:727
-#: ../src/modules/itip-formatter/itip-view.c:2045
+#: ../src/calendar/gui/e-comp-editor-event.c:877
+#: ../src/modules/itip-formatter/itip-view.c:1972
msgid "_Calendar:"
msgstr "日历(_C)："
@@ -3808,20 +4500,23 @@ msgid "_Anniversary:"
msgstr "周年(_A)："
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1055
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2045
+#: ../src/calendar/gui/e-calendar-view.c:2098
msgid "Anniversary"
msgstr "纪念日"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1054
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2044
+#: ../src/calendar/gui/e-calendar-view.c:2097
msgid "Birthday"
msgstr "生日"
+#. Other options
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/mail/e-mail-config-defaults-page.c:888
+#: ../src/modules/addressbook/autocompletion-config.c:127
#: ../src/modules/calendar/e-calendar-preferences.ui.h:46
msgid "Miscellaneous"
msgstr "杂项"
@@ -3863,16 +4558,16 @@ msgstr "家庭"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1023
#: ../src/addressbook/gui/widgets/e-contact-map.c:380
msgid "Work"
msgstr "工作"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:513
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:915
-#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1089
+#: ../src/calendar/gui/e-cal-model.c:3792
msgid "Other"
msgstr "其它"
@@ -3896,19 +4591,20 @@ msgstr "添加 _X.509"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1371
-#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:223
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
+#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
#: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037
-#: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
-#: ../src/mail/em-folder-properties.c:1037
-#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:553
-#: ../src/plugins/email-custom-header/email-custom-header.c:847
-#: ../src/plugins/publish-calendar/publish-calendar.c:789
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../src/plugins/templates/templates.c:473
+#: ../src/e-util/e-name-selector-dialog.c:1033
+#: ../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:389 ../src/mail/em-filter-rule.c:678
+#: ../src/mail/em-folder-properties.c:1336
+#: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:554
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
+#: ../src/plugins/publish-calendar/publish-calendar.c:790
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
+#: ../src/plugins/templates/templates.c:474
msgid "_Remove"
msgstr "删除(_R)"
@@ -3921,126 +4617,132 @@ msgid "_Load X.509"
msgstr "加载 X.509 (_L)"
#: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
-#: ../src/modules/addressbook/e-book-shell-backend.c:312
+#: ../src/modules/addressbook/e-book-shell-backend.c:325
msgid "Certificates"
msgstr "证书"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2039
-#: ../src/e-util/e-html-editor-actions.c:913
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/e-util/e-html-editor-actions.c:1107
msgid "_Undo"
msgstr "撤消(_U)"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:120
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../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:267
-#: ../src/calendar/gui/e-comp-editor.c:2046
-#: ../src/e-util/e-html-editor-actions.c:899
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:1093
msgid "_Redo"
msgstr "重做(_R)"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-focus-tracker.c:136
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../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:301
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:302
#: ../src/addressbook/gui/widgets/eab-gui-util.c:501
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:322
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:342
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
-#, fuzzy, c-format
-#| msgid "Contact Editor - %s"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
+#, c-format
msgid "Contact Editor — %s"
-msgstr "联系人编辑器 - %s"
+msgstr "联系人编辑器 — %s"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
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:3250
msgid "PGP keys"
msgstr "PGP 密钥"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
-#: ../src/smime/gui/certificate-manager.c:689
-#: ../src/smime/gui/certificate-manager.c:978
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/e-util/e-html-editor-actions.c:395
+#: ../src/e-util/e-image-chooser-dialog.c:193
+#: ../src/smime/gui/certificate-manager.c:672
+#: ../src/smime/gui/certificate-manager.c:961
msgid "All files"
msgstr "全部文件"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
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:3276
msgid "Open X.509 certificate"
msgstr "打开 X.509 证书"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
-#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:145
-#: ../src/e-util/e-html-editor-actions.c:322
-#: ../src/e-util/e-html-editor-actions.c:416
-#: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
-#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
+#: ../src/e-util/e-html-editor-actions.c:342
+#: ../src/e-util/e-html-editor-actions.c:386
+#: ../src/e-util/e-html-editor-actions.c:489
+#: ../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:951
msgid "_Open"
msgstr "打开(_O)"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
msgid "Chosen file is not a local file."
msgstr "已选取的文件不是本地文件。"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
#, c-format
msgid "Failed to load certificate: %s"
msgstr "无法加载证书：%s"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
msgctxt "cert-kind"
msgid "X.509"
msgstr "X.509"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
msgctxt "cert-kind"
msgid "PGP"
msgstr "PGP"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
msgid "Save PGP key"
msgstr "保存 PGP 密钥"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
msgid "Save X.509 certificate"
msgstr "保存 X.509 证书"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
#, c-format
msgid "Failed to save certificate: %s"
msgstr "保存证书失败：%s"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
msgid "_No image"
msgstr "无图像(_N)"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4711
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -4048,32 +4750,28 @@ msgstr ""
"联系人数据无效：\n"
"\n"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
-#, fuzzy, c-format
-#| msgid "'%s' has an invalid format"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4717
+#, c-format
msgid "“%s” has an invalid format"
msgstr "“%s”的格式无效"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
-#, fuzzy, c-format
-#| msgid "'%s' cannot be a future date"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4725
+#, c-format
msgid "“%s” cannot be a future date"
msgstr "“%s”不能是未来的日期"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
-#, fuzzy, c-format
-#| msgid "%s'%s' has an invalid format"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4733
+#, c-format
msgid "%s“%s” has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
-#, fuzzy, c-format
-#| msgid "%s'%s' is empty"
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4760
+#, c-format
msgid "%s“%s” is empty"
msgstr "%s“%s”为空"
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4775
msgid "Invalid contact."
msgstr "无效的联系人。"
@@ -4081,28 +4779,28 @@ msgstr "无效的联系人。"
#: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
#: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
#: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
#: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:208
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
#: ../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:290
-#: ../src/e-util/e-html-editor-link-dialog.c:255
-#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
-#: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
-#: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
-#: ../src/e-util/e-source-config-dialog.c:378
+#: ../src/e-util/e-filter-datespec.c:301
+#: ../src/e-util/e-html-editor-link-dialog.c:240
+#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:817
+#: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
+#: ../src/e-util/e-rule-editor.c:934 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-source-config-dialog.c:361
#: ../src/e-util/e-source-selector-dialog.c:371
#: ../src/e-util/e-table-config.c:549 ../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:332 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
#: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
-#: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
-#: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/mail/mail-vfolder-ui.c:150 ../src/mail/mail-vfolder-ui.c:272
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:278
#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
#: ../src/plugins/publish-calendar/url-editor-dialog.c:420
-#: ../src/shell/e-shell-content.c:659 ../src/shell/e-shell-content.c:765
-#: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
+#: ../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:1333
#: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
msgid "_OK"
msgstr "确定(_O)"
@@ -4198,7 +4896,7 @@ msgid "_Suffix:"
msgstr "后缀(_S)："
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:822
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
@@ -4235,52 +4933,52 @@ msgid "Insert email addresses from Address Book"
msgstr "从地址簿中插入电子邮件地址"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../src/e-util/filter.ui.h:26
+#: ../src/e-util/filter.ui.h:28
msgid "_Top"
msgstr "顶部(_T)"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:27
+#: ../src/e-util/e-source-selector.c:3492 ../src/e-util/filter.ui.h:29
msgid "_Up"
msgstr "上(_U)"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:28
+#: ../src/e-util/e-source-selector.c:3493 ../src/e-util/filter.ui.h:30
msgid "_Down"
msgstr "下(_D)"
#: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../src/e-util/filter.ui.h:29
+#: ../src/e-util/filter.ui.h:31
msgid "_Bottom"
msgstr "底部(_B)"
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:947
msgid "Contact List Members"
msgstr "联系人列表成员"
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1485
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1506
msgid "_Members"
msgstr "成员(_M)"
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1625
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1645
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1665
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1686
msgid "Error removing list"
msgstr "删除列表出错"
#: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1219
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1309
msgid "Name contains"
msgstr "姓名含有"
#: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1302
msgid "Email begins with"
msgstr "邮件以此开头"
@@ -4288,10 +4986,10 @@ msgstr "邮件以此开头"
#: ../src/calendar/gui/caltypes.xml.in.h:26
#: ../src/calendar/gui/memotypes.xml.in.h:19
#: ../src/calendar/gui/tasktypes.xml.in.h:30
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1662
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:782
-#: ../src/modules/calendar/e-task-shell-view-actions.c:983
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:807
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
msgid "Any field contains"
msgstr "任何域含有"
@@ -4301,208 +4999,201 @@ msgstr "任何域含有"
msgid "evolution address book"
msgstr "evolution 地址簿"
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:185
msgid "Copy _Email Address"
msgstr "复制电子邮件地址(_E)"
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:151
-#: ../src/e-util/e-web-view.c:368
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
+#: ../src/e-util/e-web-view.c:429
msgid "Copy the email address to the clipboard"
msgstr "复制电子邮件地址到剪贴板"
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:156
-#: ../src/e-util/e-web-view.c:380
-msgid "_Send New Message To..."
-msgstr "把新信息发送到(_S)..."
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
+#: ../src/e-util/e-web-view.c:441
+msgid "_Send New Message To…"
+msgstr "把新信息发送到(_S)…"
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:158
-#: ../src/e-util/e-web-view.c:382
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
+#: ../src/e-util/e-web-view.c:443
msgid "Send a mail message to this address"
msgstr "发送一个邮件信息到这个地址"
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:290
-#: ../src/e-util/e-web-view.c:1317
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
+#: ../src/e-util/e-misc-utils.c:4546
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:142
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#, c-format
+msgid "Click to open map for %s"
+msgstr "单击以为 %s 打开地图"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
msgid "Open map"
msgstr "打开地图"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:438
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
msgid "SIP"
msgstr "SIP"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
msgid "List Members:"
msgstr "列出成员："
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:784
+msgid "Fax"
+msgstr "传真"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:786
+msgid "Phone"
+msgstr "电话"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:930
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
msgid "Nickname"
msgstr "昵称"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:931
msgid "AIM"
msgstr "AIM"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:932
msgid "GroupWise"
msgstr "GroupWise"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:933
msgid "ICQ"
msgstr "ICQ"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:934
msgid "Jabber"
msgstr "Jabber"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:935
msgid "MSN"
msgstr "MSN"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:936
msgid "Yahoo"
msgstr "雅虎"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:938
msgid "Skype"
msgstr "Skype"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:939
msgid "Twitter"
msgstr "Twitter"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
msgid "Company"
msgstr "公司"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
msgid "Department"
msgstr "部门"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1003
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
msgid "Office"
msgstr "办公室"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1004
msgid "Profession"
msgstr "职业"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1005
msgid "Position"
msgstr "位置"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1006
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
msgid "Manager"
msgstr "经理"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1007
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
msgid "Assistant"
msgstr "助手"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1008
msgid "Video Chat"
msgstr "视频聊天"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:834
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1010
#: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
msgid "Free/Busy"
msgstr "忙/闲"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
-msgid "Phone"
-msgstr "电话"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:836
-msgid "Fax"
-msgstr "传真"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:905
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1013
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1053
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1079
msgid "Address"
msgstr "地址"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1049
msgid "Home Page"
msgstr "主页"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1050
msgid "Web Log"
msgstr "Web 日志"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
-#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "移动电话"
-
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1056
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
msgid "Spouse"
msgstr "配偶"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1066
msgid "Personal"
msgstr "个人"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1111
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
msgid "Note"
msgstr "注释"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1133
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1307
msgid "List Members"
msgstr "列出成员"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1154
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1330
msgid "Job Title"
msgstr "职称"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1195
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1371
msgid "Home page"
msgstr "主页"
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1205
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1381
msgid "Blog"
msgstr "Blog"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:314
-#: ../src/calendar/gui/e-cal-model-tasks.c:556
-#: ../src/calendar/gui/e-task-table.c:209
-#: ../src/calendar/gui/e-task-table.c:224
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:305
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1143
msgid "Cancelled"
msgstr "已取消"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:495
msgid "Merge Contact"
msgstr "合并联系人"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:517
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:758
msgid "_Merge"
msgstr "合并(_M)"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:747
msgid "Duplicate Contact Detected"
msgstr "复制检测到的联系人"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:805
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to save the changes anyway?"
@@ -4510,7 +5201,7 @@ msgstr ""
"此联系人的姓名或邮箱地址已经在本文件夹中了。\n"
"您仍要保存更改吗？"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:808
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
@@ -4518,19 +5209,19 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您仍然要添加它吗？"
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:823
msgid "Changed Contact:"
msgstr "更改了的联系人："
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:825
msgid "New Contact:"
msgstr "新联系人："
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:864
msgid "Conflicting Contact:"
msgstr "冲突的联系人："
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:866
msgid "Old Contact:"
msgstr "以前联系人："
@@ -4662,69 +5353,71 @@ msgstr "搜索中断了"
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:679
msgid "Cut selected contacts to the clipboard"
msgstr "将选联系人剪切到剪贴板"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:685
msgid "Copy selected contacts to the clipboard"
msgstr "将选中联系人复制到剪贴板"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:691
msgid "Paste contacts from the clipboard"
msgstr "从剪贴板中粘贴联系人"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:697
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
msgid "Delete selected contacts"
msgstr "删除选中的联系人"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:703
msgid "Select all visible contacts"
msgstr "选中全部可见联系人"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1290
msgid "Are you sure you want to delete these contact lists?"
msgstr "您确定要删除这些联系人列表吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1294
msgid "Are you sure you want to delete this contact list?"
msgstr "您确定要删除这些联系人列表吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1298
#, c-format
msgid "Are you sure you want to delete this contact list (%s)?"
msgstr "您确定要删除联系人列表(%s)吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1304
msgid "Are you sure you want to delete these contacts?"
msgstr "您确定要删除这些联系人吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1308
msgid "Are you sure you want to delete this contact?"
msgstr "您确定要删除这些联系人吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1312
#, c-format
msgid "Are you sure you want to delete this contact (%s)?"
msgstr "您确定要删除联系人(%s)吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:1997 ../src/e-util/e-focus-tracker.c:783
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1323
+#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/e-util/e-accounts-window.c:1753 ../src/e-util/e-focus-tracker.c:816
#: ../src/e-util/evolution-source-viewer.c:806
-#: ../src/mail/e-mail-account-manager.c:737
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:676
-#: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
-#: ../src/shell/e-shell-window-actions.c:822
-#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/e-util/e-webdav-browser.c:2678
+#: ../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:1499
+#: ../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:1628
+#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
msgid "_Delete"
msgstr "删除(_D)"
#. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1471
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -4736,13 +5429,11 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗？"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
-#, fuzzy
-#| msgid "_Don't Display"
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
msgid "_Don’t Display"
msgstr "不显示(_D)"
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1480
msgid "Display _All Contacts"
msgstr "显示全部联系人(_A)"
@@ -4810,6 +5501,10 @@ msgstr "家庭传真"
msgid "ISDN Phone"
msgstr "ISDN 电话"
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "移动电话"
+
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
msgid "Other Phone"
msgstr "其它电话"
@@ -4853,7 +5548,7 @@ msgid "Title"
msgstr "头衔"
#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-list-view.c:663
#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
msgid "Role"
msgstr "角色"
@@ -4915,15 +5610,15 @@ msgstr "放大(_I)"
#. Zoom-out button
#: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2861
msgid "Zoom _Out"
msgstr "缩小(_O)"
#. Search button
#: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
-#: ../src/e-util/e-html-editor-actions.c:1872
-#: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/e-util/e-html-editor-actions.c:2206
+#: ../src/e-util/e-html-editor-find-dialog.c:244
+#: ../src/shell/e-shell-window-actions.c:987
msgid "_Find"
msgstr "查找(_F)"
@@ -4931,11 +5626,11 @@ msgstr "查找(_F)"
msgid ""
"\n"
"\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
msgstr ""
"\n"
"\n"
-"正在搜索联系人..."
+"正在搜索联系人……"
#: ../src/addressbook/gui/widgets/e-minicard-view.c:189
msgid ""
@@ -4985,49 +5680,44 @@ msgstr ""
"\n"
"本视图中没有可显示的项。"
-#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../src/addressbook/importers/evolution-csv-importer.c:796
#: ../src/addressbook/importers/evolution-ldif-importer.c:547
#: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:479
-#: ../src/calendar/importers/icalendar-importer.c:976
-#: ../src/calendar/importers/icalendar-importer.c:1016
-#: ../src/shell/shell.error.xml.h:1
-msgid "Importing..."
-msgstr "正在导入..."
+#: ../src/calendar/importers/icalendar-importer.c:499
+#: ../src/calendar/importers/icalendar-importer.c:1003
+#: ../src/calendar/importers/icalendar-importer.c:1043
+msgid "Importing…"
+msgstr "正在导入……"
-#: ../src/addressbook/importers/evolution-csv-importer.c:927
-#, fuzzy
-#| msgid "Can't open .csv file"
+#: ../src/addressbook/importers/evolution-csv-importer.c:978
msgid "Can’t open .csv file"
msgstr "无法打开 .csv 文件"
-#: ../src/addressbook/importers/evolution-csv-importer.c:1096
+#: ../src/addressbook/importers/evolution-csv-importer.c:1151
msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
msgstr "Outlook 联系人 CSV 或 Tab (.csv, .tab)"
-#: ../src/addressbook/importers/evolution-csv-importer.c:1097
+#: ../src/addressbook/importers/evolution-csv-importer.c:1152
msgid "Outlook Contacts CSV and Tab Importer"
msgstr "Outlook 联系人 CSV 和 Tab 导入器"
-#: ../src/addressbook/importers/evolution-csv-importer.c:1105
+#: ../src/addressbook/importers/evolution-csv-importer.c:1160
msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
msgstr "Mozilla 联系人 CSV 或 Tab (.csv, .tab)"
-#: ../src/addressbook/importers/evolution-csv-importer.c:1106
+#: ../src/addressbook/importers/evolution-csv-importer.c:1161
msgid "Mozilla Contacts CSV and Tab Importer"
msgstr "Mozilla 联系人 CSV 和 Tab 导入器"
-#: ../src/addressbook/importers/evolution-csv-importer.c:1114
+#: ../src/addressbook/importers/evolution-csv-importer.c:1169
msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
msgstr "Evolution 联系人 CSV 或 Tab (.csv, .tab)"
-#: ../src/addressbook/importers/evolution-csv-importer.c:1115
+#: ../src/addressbook/importers/evolution-csv-importer.c:1170
msgid "Evolution Contacts CSV and Tab Importer"
msgstr "Evolution 联系人 CSV 和 Tab 导入器"
#: ../src/addressbook/importers/evolution-ldif-importer.c:717
-#, fuzzy
-#| msgid "Can't open .ldif file"
msgid "Can’t open .ldif file"
msgstr "无法打开 .ldif 文件"
@@ -5172,208 +5862,20 @@ msgctxt "addressbook-label"
msgid "Phone"
msgstr "电话"
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:103
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "分钟"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:116
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "小时"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:129
-msgid "day"
-msgid_plural "days"
-msgstr[0] "天"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:357
-msgid "Start time"
-msgstr "开始时间"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../src/calendar/alarm-notify/alarm-queue.c:1988
-msgid "Appointments"
-msgstr "约会"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "全部错过(_A)"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
-msgid "_Snooze"
-msgstr "小睡(_S)"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1363
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor.c:2062
-#: ../src/e-util/e-html-editor-actions.c:922
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
-#: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:65
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:548
-#: ../src/plugins/email-custom-header/email-custom-header.c:842
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:468
-#: ../src/shell/e-shell-window-actions.c:950 ../src/smime/gui/smime-ui.ui.h:11
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
-msgid "_Print"
-msgstr "打印(_P)"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
-#: ../src/e-util/e-alert-dialog.c:162
-msgid "_Dismiss"
-msgstr "错过(_D)"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../src/calendar/alarm-notify/alarm-queue.c:1955
-#: ../src/calendar/alarm-notify/alarm-queue.c:1965
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1678
-#: ../src/modules/itip-formatter/itip-view.c:1789
-msgid "Location:"
-msgstr "位置："
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "约会位置"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:9
-msgid "Snooze _time:"
-msgstr "小睡时间(_T)："
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
-msgid "days"
-msgstr "天"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
-msgid "hours"
-msgstr "小时"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:571
-msgid "minutes"
-msgstr "分钟"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1756
-#: ../src/calendar/alarm-notify/alarm-queue.c:1936
-msgid "No summary available."
-msgstr "没有可用的摘要。"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1765
-#: ../src/calendar/alarm-notify/alarm-queue.c:1767
-msgid "No description available."
-msgstr "没有描述。"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1775
-msgid "No location information available."
-msgstr "没有可用的位置信息。"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1780
-#: ../src/calendar/alarm-notify/alarm-queue.c:1927
-#: ../src/calendar/alarm-notify/alarm-queue.c:2278
-msgid "Evolution Reminders"
-msgstr "Evolution 提醒器"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1823
-#, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "您有 %d 条提醒"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2096
-msgid "Warning"
-msgstr "警告"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2097
-#: ../src/mail/mail-dialogs.ui.h:20
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
-msgid "_No"
-msgstr "否(_N)"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
-msgid "_Yes"
-msgstr "是(_Y)"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2102
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-" %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-"Evolution 日历提醒将要触发。该提醒被配置为运行以下程序：\n"
-"\n"
-" %s\n"
-"\n"
-"您确信您要运行该程序吗？"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2117
-msgid "Do not ask me about this program again."
-msgstr "不要再次询问此问题。"
-
-#: ../src/calendar/alarm-notify/util.c:65
-msgid "invalid time"
-msgstr "无效时间"
-
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/alarm-notify/util.c:91
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d 天"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/alarm-notify/util.c:97
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d 小时"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/alarm-notify/util.c:103
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d 分钟"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/alarm-notify/util.c:107
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-
#: ../src/calendar/calendar.error.xml.h:1
-msgid "Would you like to send all the participants a cancelation notice?"
+#, fuzzy
+#| msgid "Would you like to send all the participants a cancelation notice?"
+msgid "Would you like to send all the participants a cancellation notice?"
msgstr "您是否想要给全部出席者发送取消通知？"
#: ../src/calendar/calendar.error.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the meeting is canceled."
msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
+"If you do not send a cancellation notice, the other participants may not "
+"know the meeting is canceled."
msgstr "如果您不发送取消通知，其他出席者也许不知道会议已经取消。"
#: ../src/calendar/calendar.error.xml.h:3
@@ -5385,7 +5887,7 @@ msgid "_Send Notice"
msgstr "发送通知(_S)"
#: ../src/calendar/calendar.error.xml.h:5
-#: ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/gui/e-cal-dialogs.c:504
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗？"
@@ -5396,13 +5898,17 @@ msgid ""
msgstr "此会议的全部信息将被删除，且无法恢复。"
#: ../src/calendar/calendar.error.xml.h:8
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the task has been deleted."
msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the task has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the task has been deleted."
msgstr "如果您不发送取消通知，其他出席者可能不知道任务已经删除。"
#: ../src/calendar/calendar.error.xml.h:9
-#: ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/gui/e-cal-dialogs.c:507
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗？"
@@ -5412,17 +5918,23 @@ msgid "All information on this task will be deleted and can not be restored."
msgstr "此任务的全部信息将被删除，且无法恢复。"
#: ../src/calendar/calendar.error.xml.h:11
-msgid "Would you like to send a cancelation notice for this memo?"
+#, fuzzy
+#| msgid "Would you like to send a cancelation notice for this memo?"
+msgid "Would you like to send a cancellation notice for this memo?"
msgstr "您是否想要为此备忘发送取消通知？"
#: ../src/calendar/calendar.error.xml.h:12
+#, fuzzy
+#| msgid ""
+#| "If you do not send a cancelation notice, the other participants may not "
+#| "know the memo has been deleted."
msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the memo has been deleted."
+"If you do not send a cancellation notice, the other participants may not "
+"know the memo has been deleted."
msgstr "如果您不发送取消通知，其他出席者可能不知道备忘已经删除。"
#: ../src/calendar/calendar.error.xml.h:13
-#: ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/gui/e-cal-dialogs.c:510
#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "您确信您要删除该备忘吗？"
@@ -5507,7 +6019,7 @@ msgid "_Save Changes"
msgstr "保存更改(_S)"
#: ../src/calendar/calendar.error.xml.h:31
-#: ../src/composer/mail-composer.error.xml.h:13
+#: ../src/composer/mail-composer.error.xml.h:15
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
@@ -5545,7 +6057,7 @@ msgid ""
msgstr "将会向全部出席者发送电子邮件邀请，并允许他们答复。"
#: ../src/calendar/calendar.error.xml.h:40
-#: ../src/composer/mail-composer.error.xml.h:38 ../src/mail/mail.error.xml.h:8
+#: ../src/composer/mail-composer.error.xml.h:40 ../src/mail/mail.error.xml.h:8
#: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "发送(_S)"
@@ -5626,9 +6138,9 @@ msgstr "无法载入编辑器。"
#: ../src/calendar/calendar.error.xml.h:57
#, fuzzy
-#| msgid "Delete calendar '{0}'?"
-msgid "Delete calendar “{0}”?"
-msgstr "删除日历“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete calendar “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/calendar/calendar.error.xml.h:58
msgid "This calendar will be removed permanently."
@@ -5636,9 +6148,9 @@ msgstr "此日历将被永久删除。"
#: ../src/calendar/calendar.error.xml.h:59
#, fuzzy
-#| msgid "Delete task list '{0}'?"
-msgid "Delete task list “{0}”?"
-msgstr "删除任务列表“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete task list “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/calendar/calendar.error.xml.h:60
msgid "This task list will be removed permanently."
@@ -5646,9 +6158,9 @@ msgstr "此任务列表将被永久删除。"
#: ../src/calendar/calendar.error.xml.h:61
#, fuzzy
-#| msgid "Delete memo list '{0}'?"
-msgid "Delete memo list “{0}”?"
-msgstr "删除备忘录“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete memo list “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/calendar/calendar.error.xml.h:62
msgid "This memo list will be removed permanently."
@@ -5656,9 +6168,9 @@ msgstr "此备忘录将被永久删除。"
#: ../src/calendar/calendar.error.xml.h:63
#, fuzzy
-#| msgid "Delete remote calendar '{0}'?"
-msgid "Delete remote calendar “{0}”?"
-msgstr "删除远端日历“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote calendar “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/calendar/calendar.error.xml.h:64
#, fuzzy
@@ -5672,9 +6184,9 @@ msgstr "这将从服务器永久删除日历“{0}”。您确定要继续吗？
#: ../src/calendar/calendar.error.xml.h:66
#, fuzzy
-#| msgid "Delete remote task list '{0}'?"
-msgid "Delete remote task list “{0}”?"
-msgstr "删除远端任务列表“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote task list “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/calendar/calendar.error.xml.h:67
#, fuzzy
@@ -5688,9 +6200,9 @@ msgstr "这将从服务器永久删除任务列表“{0}”。您确定要继续
#: ../src/calendar/calendar.error.xml.h:68
#, fuzzy
-#| msgid "Delete remote memo list '{0}'?"
-msgid "Delete remote memo list “{0}”?"
-msgstr "删除远端备忘录“{0}”吗？"
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote memo list “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/calendar/calendar.error.xml.h:69
#, fuzzy
@@ -6087,7 +6599,7 @@ 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 the GNOME bugzilla."
+"report in GNOME Gitlab."
msgstr ""
#: ../src/calendar/calendar.error.xml.h:175
@@ -6100,7 +6612,7 @@ 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 the GNOME bugzilla."
+"report in GNOME Gitlab."
msgstr ""
#: ../src/calendar/calendar.error.xml.h:177
@@ -6113,7 +6625,7 @@ 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 the GNOME bugzilla."
+"report in GNOME Gitlab."
msgstr ""
#: ../src/calendar/gui/caltypes.xml.in.h:1
@@ -6122,7 +6634,7 @@ msgstr ""
#: ../src/calendar/gui/e-task-table.etspec.h:4
#: ../src/calendar/gui/memotypes.xml.in.h:1
#: ../src/calendar/gui/tasktypes.xml.in.h:1
-#: ../src/plugins/save-calendar/csv-format.c:373
+#: ../src/plugins/save-calendar/csv-format.c:362
msgid "Summary"
msgstr "概要"
@@ -6145,6 +6657,7 @@ msgstr "不含有"
#: ../src/calendar/gui/memotypes.xml.in.h:4
#: ../src/calendar/gui/tasktypes.xml.in.h:4
#: ../src/e-util/e-attachment-tree-view.c:147
+#: ../src/e-util/e-collection-account-wizard.c:1960
#: ../src/e-util/e-table-config.ui.h:20
#: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
msgid "Description"
@@ -6176,25 +6689,25 @@ msgid "is not"
msgstr "不是"
#: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:238
-#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:522
+#: ../src/calendar/gui/e-cal-list-view.c:263
+#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
+#: ../src/calendar/gui/e-task-table.c:445
#: ../src/calendar/gui/memotypes.xml.in.h:10
msgid "Public"
msgstr "公开"
#: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:239
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/e-cal-list-view.c:264
+#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
#: ../src/calendar/gui/memotypes.xml.in.h:11
msgid "Private"
msgstr "保密"
#: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../src/calendar/gui/e-cal-list-view.c:240
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/e-cal-list-view.c:265
+#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
#: ../src/calendar/gui/memotypes.xml.in.h:12
-#: ../src/e-util/e-html-editor-page-dialog.c:113
+#: ../src/e-util/e-html-editor-page-dialog.c:116
#: ../src/e-util/e-send-options.ui.h:7
msgid "Confidential"
msgstr "机密"
@@ -6206,6 +6719,7 @@ msgid "Organizer"
msgstr "组织者"
#: ../src/calendar/gui/caltypes.xml.in.h:13
+#: ../src/calendar/gui/e-meeting-list-view.c:623
#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:2
#: ../src/calendar/gui/tasktypes.xml.in.h:6
msgid "Attendee"
@@ -6213,10 +6727,11 @@ msgstr "出席者"
#: ../src/calendar/gui/caltypes.xml.in.h:14
#: ../src/calendar/gui/e-cal-list-view.etspec.h:5
+#: ../src/calendar/gui/e-task-table.etspec.h:13
#: ../src/mail/message-list.etspec.h:14
-#: ../src/plugins/publish-calendar/publish-calendar.c:860
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../src/plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/publish-calendar/publish-calendar.c:861
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/save-calendar/csv-format.c:376
msgid "Location"
msgstr "位置"
@@ -6230,8 +6745,8 @@ msgstr "类别"
#: ../src/calendar/gui/caltypes.xml.in.h:16
#: ../src/calendar/gui/memotypes.xml.in.h:14
#: ../src/calendar/gui/tasktypes.xml.in.h:15
-#: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/em-format/e-mail-formatter-print.c:50
+#: ../src/em-format/e-mail-formatter-print-headers.c:161
#: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
#: ../src/mail/vfoldertypes.xml.in.h:50
msgid "Attachments"
@@ -6254,7 +6769,7 @@ msgid "Do Not Exist"
msgstr "不存在"
#: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2003
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2101
msgid "Recurrence"
msgstr "重复"
@@ -6286,24 +6801,106 @@ msgstr "概要含有"
msgid "Description Contains"
msgstr "描述含有"
-#: ../src/calendar/gui/ea-cal-view.c:281
-msgid "New Appointment"
-msgstr "新建约会"
+#: ../src/calendar/gui/comp-util.c:1546
+#: ../src/modules/itip-formatter/itip-view.c:2294
+#, c-format
+msgid "with one guest"
+msgid_plural "with %d guests"
+msgstr[0] ""
-#: ../src/calendar/gui/ea-cal-view.c:282
-msgid "New All Day Event"
-msgstr "新建全天事件"
+#: ../src/calendar/gui/comp-util.c:1605
+#, fuzzy, c-format
+#| msgid "Comment:"
+msgid "Comments: %s"
+msgstr "注释："
-#: ../src/calendar/gui/ea-cal-view.c:283
-msgid "New Meeting"
-msgstr "新会议"
+#: ../src/calendar/gui/comp-util.c:1619 ../src/calendar/gui/comp-util.c:1622
+#, fuzzy
+#| msgid "None"
+msgctxt "iCalendarStatus"
+msgid "None"
+msgstr "无"
-#: ../src/calendar/gui/ea-cal-view.c:284
-msgid "Go to Today"
-msgstr "转到今天"
+#: ../src/calendar/gui/comp-util.c:1620
+#, fuzzy
+#| msgid "Tentative"
+msgctxt "iCalendarStatus"
+msgid "Tentative"
+msgstr "暂时的"
-#: ../src/calendar/gui/ea-cal-view.c:285
-msgid "Go to Date"
+#: ../src/calendar/gui/comp-util.c:1621
+#, fuzzy
+#| msgid "Confirm expunge"
+msgctxt "iCalendarStatus"
+msgid "Confirmed"
+msgstr "确认销毁"
+
+#: ../src/calendar/gui/comp-util.c:1623
+#, fuzzy
+#| msgid "Draft"
+msgctxt "iCalendarStatus"
+msgid "Draft"
+msgstr "草稿"
+
+#: ../src/calendar/gui/comp-util.c:1624
+#, fuzzy
+msgctxt "iCalendarStatus"
+msgid "Final"
+msgstr "轻微"
+
+#: ../src/calendar/gui/comp-util.c:1625
+#, fuzzy
+#| msgid "Not Started"
+msgctxt "iCalendarStatus"
+msgid "Not Started"
+msgstr "未开始"
+
+#: ../src/calendar/gui/comp-util.c:1626
+#, fuzzy
+#| msgid "Needs Action"
+msgctxt "iCalendarStatus"
+msgid "Needs Action"
+msgstr "需要动作"
+
+#: ../src/calendar/gui/comp-util.c:1627
+#, fuzzy
+#| msgid "In Progress"
+msgctxt "iCalendarStatus"
+msgid "In Progress"
+msgstr "进行中"
+
+#: ../src/calendar/gui/comp-util.c:1628
+#, fuzzy
+#| msgid "Completed"
+msgctxt "iCalendarStatus"
+msgid "Completed"
+msgstr "已完成"
+
+#: ../src/calendar/gui/comp-util.c:1629
+#, fuzzy
+#| msgid "Cancelled"
+msgctxt "iCalendarStatus"
+msgid "Cancelled"
+msgstr "已取消"
+
+#: ../src/calendar/gui/ea-cal-view.c:281
+msgid "New Appointment"
+msgstr "新建约会"
+
+#: ../src/calendar/gui/ea-cal-view.c:282
+msgid "New All Day Event"
+msgstr "新建全天事件"
+
+#: ../src/calendar/gui/ea-cal-view.c:283
+msgid "New Meeting"
+msgstr "新会议"
+
+#: ../src/calendar/gui/ea-cal-view.c:284
+msgid "Go to Today"
+msgstr "转到今天"
+
+#: ../src/calendar/gui/ea-cal-view.c:285
+msgid "Go to Date"
msgstr "转到日期"
#: ../src/calendar/gui/ea-cal-view-event.c:232
@@ -6318,20 +6915,20 @@ msgstr "有再现。"
msgid "It is a meeting."
msgstr "为会议。"
-#: ../src/calendar/gui/ea-cal-view-event.c:245
+#: ../src/calendar/gui/ea-cal-view-event.c:242
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "日历事件：摘要为 %s。"
-#: ../src/calendar/gui/ea-cal-view-event.c:248
+#: ../src/calendar/gui/ea-cal-view-event.c:246
msgid "Calendar Event: It has no summary."
msgstr "日历事件：无摘要。"
-#: ../src/calendar/gui/ea-cal-view-event.c:271
+#: ../src/calendar/gui/ea-cal-view-event.c:269
msgid "calendar view event"
msgstr "日历视图事件"
-#: ../src/calendar/gui/ea-cal-view-event.c:503
+#: ../src/calendar/gui/ea-cal-view-event.c:501
msgid "Grab Focus"
msgstr "获得焦点"
@@ -6386,49 +6983,42 @@ msgstr "跳转按钮"
msgid "Click here, you can find more events."
msgstr "单击此处可查找更多事件。"
-#. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../src/calendar/gui/e-alarm-list.c:374
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d 周"
-
#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1827
+#: ../src/calendar/gui/e-alarm-list.c:387
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2214
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:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1825
+#: ../src/calendar/gui/e-alarm-list.c:391
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2212
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:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1831
+#: ../src/calendar/gui/e-alarm-list.c:395
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2218
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:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1829
+#: ../src/calendar/gui/e-alarm-list.c:399
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2216
msgctxt "cal-reminders"
msgid "Run a program"
msgstr "运行程序"
-#: ../src/calendar/gui/e-alarm-list.c:437
+#: ../src/calendar/gui/e-alarm-list.c:405
msgctxt "cal-reminders"
msgid "Unknown action to be performed"
msgstr "即将进行一项未知的操作"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:452
+#: ../src/calendar/gui/e-alarm-list.c:421
#, c-format
msgctxt "cal-reminders"
msgid "%s %s before the start"
@@ -6436,7 +7026,7 @@ msgstr "开始前 %s%s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:458
+#: ../src/calendar/gui/e-alarm-list.c:427
#, c-format
msgctxt "cal-reminders"
msgid "%s %s after the start"
@@ -6444,7 +7034,7 @@ msgstr "开始后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:465
+#: ../src/calendar/gui/e-alarm-list.c:434
#, c-format
msgctxt "cal-reminders"
msgid "%s at the start"
@@ -6452,7 +7042,7 @@ msgstr "开始时 %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:477
+#: ../src/calendar/gui/e-alarm-list.c:447
#, c-format
msgctxt "cal-reminders"
msgid "%s %s before the end"
@@ -6460,7 +7050,7 @@ msgstr "结束前 %s%s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:483
+#: ../src/calendar/gui/e-alarm-list.c:453
#, c-format
msgctxt "cal-reminders"
msgid "%s %s after the end"
@@ -6468,7 +7058,7 @@ msgstr "结束后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:490
+#: ../src/calendar/gui/e-alarm-list.c:460
#, c-format
msgctxt "cal-reminders"
msgid "%s at the end"
@@ -6476,7 +7066,7 @@ msgstr "结束时 %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../src/calendar/gui/e-alarm-list.c:514
+#: ../src/calendar/gui/e-alarm-list.c:484
#, c-format
msgctxt "cal-reminders"
msgid "%s at %s"
@@ -6484,7 +7074,7 @@ msgstr "%s 在 %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../src/calendar/gui/e-alarm-list.c:522
+#: ../src/calendar/gui/e-alarm-list.c:492
#, c-format
msgctxt "cal-reminders"
msgid "%s for an unknown trigger type"
@@ -6508,301 +7098,285 @@ msgstr "月日历视图"
msgid "calendar view for one or more weeks"
msgstr "一周或多周的日历视图"
-#: ../src/calendar/gui/e-cal-component-preview.c:214
-#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:127
+#: ../src/calendar/gui/e-cal-component-preview.c:237
+#: ../src/e-util/e-filter-rule.c:1068 ../src/mail/e-mail-config-page.c:124
msgid "Untitled"
msgstr "无标题"
-#: ../src/calendar/gui/e-cal-component-preview.c:222
+#: ../src/calendar/gui/e-cal-component-preview.c:251
msgid "Categories:"
msgstr "类别："
-#: ../src/calendar/gui/e-cal-component-preview.c:256
-msgid "Summary:"
-msgstr "概要："
+#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1700
+#: ../src/modules/itip-formatter/itip-view.c:1811
+msgid "Location:"
+msgstr "位置："
-#: ../src/calendar/gui/e-cal-component-preview.c:264
+#: ../src/calendar/gui/e-cal-component-preview.c:295
msgid "Start Date:"
msgstr "开始日期："
-#: ../src/calendar/gui/e-cal-component-preview.c:275
+#: ../src/calendar/gui/e-cal-component-preview.c:304
msgid "End Date:"
msgstr "结束日期："
-#: ../src/calendar/gui/e-cal-component-preview.c:286
+#: ../src/calendar/gui/e-cal-component-preview.c:313
msgid "Due Date:"
msgstr "到期日期："
-#: ../src/calendar/gui/e-cal-component-preview.c:298
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1798
+#: ../src/calendar/gui/e-cal-component-preview.c:326
+msgid "Recurs:"
+msgstr "重复："
+
+#: ../src/calendar/gui/e-cal-component-preview.c:338
+#: ../src/modules/itip-formatter/itip-view.c:1703
+#: ../src/modules/itip-formatter/itip-view.c:1820
msgid "Status:"
msgstr "状态："
-#: ../src/calendar/gui/e-cal-component-preview.c:302
-#: ../src/calendar/gui/e-cal-model-tasks.c:310
-#: ../src/calendar/gui/e-cal-model-tasks.c:552
-#: ../src/calendar/gui/e-cal-model-tasks.c:633
-#: ../src/calendar/gui/e-task-table.c:205
-#: ../src/calendar/gui/e-task-table.c:220
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
-msgid "In Progress"
-msgstr "进行中"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:305
-#: ../src/calendar/gui/e-cal-model-tasks.c:312
-#: ../src/calendar/gui/e-cal-model-tasks.c:554
-#: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/calendar/gui/e-meeting-store.c:225
-#: ../src/calendar/gui/e-task-table.c:207
-#: ../src/calendar/gui/e-task-table.c:222
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
-#: ../src/calendar/gui/tasktypes.xml.in.h:13
-#: ../src/plugins/save-calendar/csv-format.c:377
-msgid "Completed"
-msgstr "已完成"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/calendar/gui/e-cal-model-tasks.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:550
-#: ../src/calendar/gui/e-task-table.c:203
-#: ../src/calendar/gui/e-task-table.c:218
-#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
-#: ../src/calendar/gui/tasktypes.xml.in.h:11
-msgid "Not Started"
-msgstr "未开始"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:325
-msgid "Priority:"
-msgstr "优先级："
-
-#: ../src/calendar/gui/e-cal-component-preview.c:327
-#: ../src/calendar/gui/e-task-table.c:548
+#: ../src/calendar/gui/e-cal-component-preview.c:347
+#: ../src/calendar/gui/e-task-table.c:471
#: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:322
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:334
msgid "High"
msgstr "高"
-#: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1888
-#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-cal-model.c:1872
+#: ../src/calendar/gui/e-task-table.c:472
#: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:333
msgid "Normal"
msgstr "中"
-#: ../src/calendar/gui/e-cal-component-preview.c:331
-#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:351
+#: ../src/calendar/gui/e-task-table.c:473
#: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:320
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:332
msgid "Low"
msgstr "低"
-#: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/mail/e-mail-config-service-page.c:671
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+msgid "Priority:"
+msgstr "优先级："
+
+#: ../src/calendar/gui/e-cal-component-preview.c:365
+msgid "Organizer:"
+msgstr "组织者："
+
+#: ../src/calendar/gui/e-cal-component-preview.c:406
+#, fuzzy
+#| msgid "Attendees: "
+msgid "Attendees:"
+msgstr "出席者："
+
+#: ../src/calendar/gui/e-cal-component-preview.c:453
+#: ../src/mail/e-mail-config-service-page.c:533
msgid "Description:"
msgstr "描述："
-#: ../src/calendar/gui/e-cal-component-preview.c:381
+#: ../src/calendar/gui/e-cal-component-preview.c:507
msgid "Web Page:"
msgstr "网页："
-#: ../src/calendar/gui/e-cal-data-model.c:1631
+#: ../src/calendar/gui/e-cal-data-model.c:1753
#, fuzzy, c-format
#| msgid "Creating view for calendar '%s'"
msgid "Creating view for calendar “%s”"
msgstr "正在创建日历“%s”视图"
-#: ../src/calendar/gui/e-cal-data-model.c:1635
+#: ../src/calendar/gui/e-cal-data-model.c:1757
#, fuzzy, c-format
#| msgid "Creating view for task list '%s'"
msgid "Creating view for task list “%s”"
msgstr "正在创建任务列表“%s”视图"
-#: ../src/calendar/gui/e-cal-data-model.c:1639
+#: ../src/calendar/gui/e-cal-data-model.c:1761
#, fuzzy, c-format
#| msgid "Creating view for memo list '%s'"
msgid "Creating view for memo list “%s”"
msgstr "正在创建备忘录“%s”视图"
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1955
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1991
msgid "Destination is read only"
msgstr "目的只读"
-#: ../src/calendar/gui/e-cal-dialogs.c:299
+#: ../src/calendar/gui/e-cal-dialogs.c:297
#, fuzzy, c-format
#| msgid "Copying events to the calendar '%s'"
msgid "Copying events to the calendar “%s”"
msgstr "正在将事件复制到日历“%s”"
-#: ../src/calendar/gui/e-cal-dialogs.c:305
+#: ../src/calendar/gui/e-cal-dialogs.c:303
#, fuzzy, c-format
#| msgid "Copying memos to the memo list '%s'"
msgid "Copying memos to the memo list “%s”"
msgstr "正在将备忘复制到备忘录“%s”"
-#: ../src/calendar/gui/e-cal-dialogs.c:311
+#: ../src/calendar/gui/e-cal-dialogs.c:309
#, fuzzy, c-format
#| msgid "Copying tasks to the task list '%s'"
msgid "Copying tasks to the task list “%s”"
msgstr "正在将任务复制到任务列表“%s”"
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:528
#, fuzzy
#| msgid "_Delete this item from all other recipient's mailboxes?"
msgid "_Delete this item from all other recipient’s mailboxes?"
msgstr "从全部其它收件人的邮箱中删除此项吗？(_D)"
-#: ../src/calendar/gui/e-cal-dialogs.c:533
+#: ../src/calendar/gui/e-cal-dialogs.c:531
msgid "_Retract comment"
-msgstr "撤销评论(_R)："
+msgstr "撤销评论(_R)"
-#: ../src/calendar/gui/e-cal-dialogs.c:692
+#: ../src/calendar/gui/e-cal-dialogs.c:688
msgid "Select Date"
msgstr "选择日期"
-#: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1248
+#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:708
msgid "January"
msgstr "一月"
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:709
msgid "February"
msgstr "二月"
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:710
msgid "March"
msgstr "三月"
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:711
msgid "April"
msgstr "四月"
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:712
msgid "May"
msgstr "五月"
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:713
msgid "June"
msgstr "六月"
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:714
msgid "July"
msgstr "七月"
-#: ../src/calendar/gui/e-cal-dialogs.c:719
+#: ../src/calendar/gui/e-cal-dialogs.c:715
msgid "August"
msgstr "八月"
-#: ../src/calendar/gui/e-cal-dialogs.c:720
+#: ../src/calendar/gui/e-cal-dialogs.c:716
msgid "September"
msgstr "九月"
-#: ../src/calendar/gui/e-cal-dialogs.c:721
+#: ../src/calendar/gui/e-cal-dialogs.c:717
msgid "October"
msgstr "十月"
-#: ../src/calendar/gui/e-cal-dialogs.c:722
+#: ../src/calendar/gui/e-cal-dialogs.c:718
msgid "November"
msgstr "十一月"
-#: ../src/calendar/gui/e-cal-dialogs.c:723
+#: ../src/calendar/gui/e-cal-dialogs.c:719
msgid "December"
msgstr "十二月"
-#: ../src/calendar/gui/e-cal-dialogs.c:873
+#: ../src/calendar/gui/e-cal-dialogs.c:871
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "您即将修改重复事件。您想要修改何内容？"
-#: ../src/calendar/gui/e-cal-dialogs.c:875
+#: ../src/calendar/gui/e-cal-dialogs.c:873
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "您即将代理重复事件。您想要代理何内容？"
-#: ../src/calendar/gui/e-cal-dialogs.c:879
+#: ../src/calendar/gui/e-cal-dialogs.c:877
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "您即将修改重复任务。您想要修改何内容？"
-#: ../src/calendar/gui/e-cal-dialogs.c:883
+#: ../src/calendar/gui/e-cal-dialogs.c:881
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "您即将修改重复备忘。您想要修改何内容？"
-#: ../src/calendar/gui/e-cal-dialogs.c:909
+#: ../src/calendar/gui/e-cal-dialogs.c:908
msgid "This Instance Only"
msgstr "只是本次"
-#: ../src/calendar/gui/e-cal-dialogs.c:913
+#: ../src/calendar/gui/e-cal-dialogs.c:912
msgid "This and Prior Instances"
msgstr "本次和以前各次"
-#: ../src/calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:918
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: ../src/calendar/gui/e-cal-dialogs.c:924
+#: ../src/calendar/gui/e-cal-dialogs.c:923
msgid "All Instances"
msgstr "所有各次"
-#: ../src/calendar/gui/e-cal-dialogs.c:1174
-#: ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1171
+#: ../src/calendar/gui/e-cal-dialogs.c:1253
msgid "Send my reminders with this event"
msgstr "发送我有关此事件的提醒"
# #####
-#: ../src/calendar/gui/e-cal-dialogs.c:1176
-#: ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
msgid "Notify new attendees _only"
msgstr "只通知新的出席者(_O)"
-#: ../src/calendar/gui/e-calendar-view.c:451
+#: ../src/calendar/gui/e-calendar-view.c:478
msgid "Cut selected events to the clipboard"
msgstr "将选中事件剪切到剪贴板"
-#: ../src/calendar/gui/e-calendar-view.c:457
+#: ../src/calendar/gui/e-calendar-view.c:484
msgid "Copy selected events to the clipboard"
msgstr "将选中事件复制到剪贴板"
-#: ../src/calendar/gui/e-calendar-view.c:463
+#: ../src/calendar/gui/e-calendar-view.c:490
msgid "Paste events from the clipboard"
msgstr "从剪贴板中粘贴事件"
-#: ../src/calendar/gui/e-calendar-view.c:469
+#: ../src/calendar/gui/e-calendar-view.c:496
msgid "Delete selected events"
msgstr "删除选中的事件"
-#: ../src/calendar/gui/e-calendar-view.c:853
+#: ../src/calendar/gui/e-calendar-view.c:906
#, fuzzy
#| msgid "Pasted text doesn't contain valid iCalendar data"
msgid "Pasted text doesn’t contain valid iCalendar data"
msgstr "粘贴文本中没有有效的 iCalendar 数据"
-#: ../src/calendar/gui/e-calendar-view.c:864
-#: ../src/calendar/gui/e-cal-ops.c:1552
+#: ../src/calendar/gui/e-calendar-view.c:917
+#: ../src/calendar/gui/e-cal-ops.c:1582
msgid "Default calendar not found"
msgstr "默认日历未找到"
-#: ../src/calendar/gui/e-calendar-view.c:869
-#: ../src/calendar/gui/e-cal-ops.c:1555
+#: ../src/calendar/gui/e-calendar-view.c:922
+#: ../src/calendar/gui/e-cal-ops.c:1585
msgid "Default memo list not found"
msgstr "默认备忘录未找到"
-#: ../src/calendar/gui/e-calendar-view.c:874
-#: ../src/calendar/gui/e-cal-ops.c:1558
+#: ../src/calendar/gui/e-calendar-view.c:927
+#: ../src/calendar/gui/e-cal-ops.c:1588
msgid "Default task list not found"
msgstr "默认任务列表未找到"
-#: ../src/calendar/gui/e-calendar-view.c:963
+#: ../src/calendar/gui/e-calendar-view.c:1019
msgid "No suitable component found"
msgstr "找不到合适的组件"
-#: ../src/calendar/gui/e-calendar-view.c:1033
+#: ../src/calendar/gui/e-calendar-view.c:1089
msgid "Pasting iCalendar data"
msgstr "粘贴 iCalendar 数据"
@@ -6811,41 +7385,57 @@ msgstr "粘贴 iCalendar 数据"
#. * "Organizer: NameOfTheUser <email ofuser com>"
#. To Translators: It will display
#. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1831
-#: ../src/calendar/gui/e-memo-table.c:493
-#: ../src/calendar/gui/e-task-table.c:818
+#: ../src/calendar/gui/e-calendar-view.c:1889
+#: ../src/calendar/gui/e-memo-table.c:572
+#: ../src/calendar/gui/e-task-table.c:736
#, c-format
msgid "Organizer: %s <%s>"
msgstr "组织者：%s <%s>"
-#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
#. With SunOne accounts, there may be no ':' in
#. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1835
-#: ../src/calendar/gui/e-memo-table.c:498
-#: ../src/calendar/gui/e-task-table.c:822
+#: ../src/calendar/gui/e-calendar-view.c:1892
+#: ../src/calendar/gui/e-memo-table.c:577
+#: ../src/calendar/gui/e-task-table.c:740
#, c-format
msgid "Organizer: %s"
msgstr "组织者：%s"
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../src/calendar/gui/e-calendar-view.c:1851
-#: ../src/calendar/gui/e-meeting-time-sel.c:2725
-#: ../src/calendar/gui/print.c:3531
+#. Translators: It will display "Location: PlaceOfTheMeeting"
+#. Translators: It will display "Location: LocationOfTheAppointment"
+#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-meeting-time-sel.c:2580
+#: ../src/calendar/gui/e-task-table.c:758
+#: ../src/calendar/gui/e-to-do-pane.c:377 ../src/calendar/gui/print.c:3627
#, c-format
msgid "Location: %s"
msgstr "位置：%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../src/calendar/gui/e-calendar-view.c:1891
+#. Translators: It will display "Time: StartDateAndTime (Duration)"
+#: ../src/calendar/gui/e-calendar-view.c:1970
+#: ../src/calendar/gui/e-to-do-pane.c:480
#, c-format
msgid "Time: %s %s"
msgstr "时间：%s %s"
-#: ../src/calendar/gui/e-calendar-view.c:2277
-#: ../src/calendar/gui/e-calendar-view.c:2284
-#: ../src/calendar/gui/e-calendar-view.c:2291
-#: ../src/calendar/gui/e-calendar-view.c:2294
+#. Translators: the '%s' stands for a component summary, the '%d' for the years.
+#. 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:2117
+#, fuzzy, c-format
+#| msgctxt "language"
+#| msgid "%s (%s)"
+msgctxt "BirthdaySummary"
+msgid "%s (%d)"
+msgstr "%s (%s)"
+
+#: ../src/calendar/gui/e-calendar-view.c:2318
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2325
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -6854,14 +7444,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:2282
-#: ../src/calendar/gui/e-day-view.c:3078
-#: ../src/calendar/gui/e-day-view-top-item.c:849
+#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-day-view.c:3079
+#: ../src/calendar/gui/e-day-view-top-item.c:858
#: ../src/calendar/gui/e-week-view-main-item.c:228
msgid "%d %b"
msgstr "%B%-d日"
-#: ../src/calendar/gui/e-calendar-view.c:2304
+#: ../src/calendar/gui/e-calendar-view.c:2331
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -6871,16 +7461,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:2308
-#: ../src/calendar/gui/e-day-view.c:3062
-#: ../src/calendar/gui/e-day-view-top-item.c:845
+#: ../src/calendar/gui/e-calendar-view.c:2333
+#: ../src/calendar/gui/e-day-view.c:3063
+#: ../src/calendar/gui/e-day-view-top-item.c:854
#: ../src/calendar/gui/e-week-view-main-item.c:214
msgid "%a %d %b"
msgstr "%-m月%-d日%A"
-#: ../src/calendar/gui/e-calendar-view.c:2311
-#: ../src/calendar/gui/e-calendar-view.c:2317
-#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-calendar-view.c:2334
+#: ../src/calendar/gui/e-calendar-view.c:2336
+#: ../src/calendar/gui/e-calendar-view.c:2337
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -6895,144 +7485,153 @@ msgstr "结束日期"
#: ../src/calendar/gui/e-cal-list-view.etspec.h:7
#: ../src/calendar/gui/e-memo-table.etspec.h:6
-#: ../src/calendar/gui/e-task-table.etspec.h:13
-#: ../src/plugins/save-calendar/csv-format.c:378
+#: ../src/calendar/gui/e-task-table.etspec.h:14
+#: ../src/plugins/save-calendar/csv-format.c:367
msgid "Created"
msgstr "创建时间"
#: ../src/calendar/gui/e-cal-list-view.etspec.h:8
#: ../src/calendar/gui/e-memo-table.etspec.h:7
-#: ../src/calendar/gui/e-task-table.etspec.h:14
+#: ../src/calendar/gui/e-task-table.etspec.h:15
msgid "Last modified"
msgstr "上次修改"
#: ../src/calendar/gui/e-cal-list-view.etspec.h:9
#: ../src/calendar/gui/e-memo-table.etspec.h:8
-#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/calendar/gui/e-task-table.etspec.h:16
#: ../src/em-format/e-mail-formatter-source.c:118
msgid "Source"
msgstr "来源"
-#: ../src/calendar/gui/e-cal-model.c:316
+#. To 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/e-cal-list-view.etspec.h:10
+#: ../src/calendar/gui/e-cal-model.c:3846
+#: ../src/calendar/gui/e-meeting-list-view.c:692
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "状态"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:11
+#: ../src/calendar/gui/e-meeting-list-view.c:649
+#: ../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-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:2001
+#: ../src/e-util/e-webdav-browser.c:2371
+#: ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "类型"
+
+#: ../src/calendar/gui/e-cal-model.c:310
#: ../src/calendar/gui/e-meeting-list-view.c:183
#: ../src/calendar/gui/e-meeting-list-view.c:197
-#: ../src/calendar/gui/e-meeting-store.c:132
-#: ../src/calendar/gui/e-meeting-store.c:167
-#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
-#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
-#: ../src/modules/itip-formatter/itip-view.c:3412
-#: ../src/modules/itip-formatter/itip-view.c:6022
+#: ../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/modules/itip-formatter/itip-view.c:3460
+#: ../src/modules/itip-formatter/itip-view.c:6505
#: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
msgid "Unknown"
msgstr "未知"
-#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:613
-#: ../src/calendar/gui/e-cal-ops.c:1249
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:289
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:626
+#: ../src/calendar/gui/e-cal-ops.c:1267
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:391
#, fuzzy, c-format
#| msgid "Source with UID '%s' not found"
msgid "Source with UID “%s” not found"
msgstr "未找到 UID 为 %s 的源"
-#: ../src/calendar/gui/e-cal-model.c:1505 ../src/calendar/gui/e-cal-ops.c:185
-#: ../src/calendar/gui/e-cal-ops.c:1366
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:191
+#: ../src/calendar/gui/e-cal-ops.c:1384
msgid "Creating an event"
msgstr "正在创建事件"
-#: ../src/calendar/gui/e-cal-model.c:1509 ../src/calendar/gui/e-cal-ops.c:189
-#: ../src/calendar/gui/e-cal-ops.c:1370
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:195
+#: ../src/calendar/gui/e-cal-ops.c:1388
msgid "Creating a memo"
msgstr "正在创建备忘"
-#: ../src/calendar/gui/e-cal-model.c:1513 ../src/calendar/gui/e-cal-ops.c:193
-#: ../src/calendar/gui/e-cal-ops.c:1374
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:199
+#: ../src/calendar/gui/e-cal-ops.c:1392
msgid "Creating a task"
msgstr "正在创建任务"
-#: ../src/calendar/gui/e-cal-model.c:1890
+#: ../src/calendar/gui/e-cal-model.c:1874
msgid "Recurring"
msgstr "重复"
-#: ../src/calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1876
msgid "Assigned"
msgstr "已分配"
-#: ../src/calendar/gui/e-cal-model.c:1894
-#: ../src/calendar/gui/e-cal-model-tasks.c:1136
-#: ../src/calendar/gui/e-meeting-list-view.c:207
-#: ../src/calendar/gui/e-meeting-store.c:174
-#: ../src/calendar/gui/e-meeting-store.c:184
-#: ../src/calendar/gui/e-meeting-store.c:1021
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
msgid "Yes"
msgstr "是"
-#: ../src/calendar/gui/e-cal-model.c:1894
-#: ../src/calendar/gui/e-cal-model-tasks.c:1136
-#: ../src/calendar/gui/e-meeting-list-view.c:208
-#: ../src/calendar/gui/e-meeting-store.c:186
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1097
msgid "No"
msgstr "否"
-#: ../src/calendar/gui/e-cal-model.c:3818
-#: ../src/calendar/gui/e-meeting-list-view.c:219
-#: ../src/calendar/gui/e-meeting-store.c:194
-#: ../src/calendar/gui/e-meeting-store.c:217
-#: ../src/modules/itip-formatter/itip-view.c:6010
+#: ../src/calendar/gui/e-cal-model.c:3787
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:179
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/modules/itip-formatter/itip-view.c:6493
msgid "Accepted"
msgstr "接受"
-#: ../src/calendar/gui/e-cal-model.c:3819
-#: ../src/calendar/gui/e-meeting-list-view.c:220
-#: ../src/calendar/gui/e-meeting-store.c:196
-#: ../src/calendar/gui/e-meeting-store.c:219
-#: ../src/modules/itip-formatter/itip-view.c:6016
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-meeting-store.c:181
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/modules/itip-formatter/itip-view.c:6499
msgid "Declined"
msgstr "拒绝"
-#: ../src/calendar/gui/e-cal-model.c:3820
-#: ../src/calendar/gui/e-meeting-list-view.c:221
-#: ../src/calendar/gui/e-meeting-store.c:198
-#: ../src/calendar/gui/e-meeting-store.c:221
-#: ../src/calendar/gui/e-meeting-time-sel.c:533
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-meeting-store.c:183
+#: ../src/calendar/gui/e-meeting-store.c:206
+#: ../src/calendar/gui/e-meeting-time-sel.c:523
msgid "Tentative"
msgstr "暂时的"
-#: ../src/calendar/gui/e-cal-model.c:3821
-#: ../src/calendar/gui/e-meeting-list-view.c:222
-#: ../src/calendar/gui/e-meeting-store.c:200
-#: ../src/calendar/gui/e-meeting-store.c:223
-#: ../src/modules/itip-formatter/itip-view.c:6019
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-meeting-store.c:185
+#: ../src/calendar/gui/e-meeting-store.c:208
+#: ../src/modules/itip-formatter/itip-view.c:6502
msgid "Delegated"
msgstr "被委任的"
-#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-cal-model.c:3791
msgid "Needs action"
msgstr "需要动作"
-#. To 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/e-cal-model.c:3877
-#: ../src/calendar/gui/e-meeting-list-view.c:687
-#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../src/calendar/gui/e-task-table.etspec.h:11
-#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
-#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
-#: ../src/mail/vfoldertypes.xml.in.h:38
-msgid "Status"
-msgstr "状态"
-
-#: ../src/calendar/gui/e-cal-model-calendar.c:148
-#: ../src/calendar/gui/e-task-table.c:606
+#: ../src/calendar/gui/e-cal-model-calendar.c:91
+#: ../src/calendar/gui/e-task-table.c:529
msgid "Free"
msgstr "空闲"
-#: ../src/calendar/gui/e-cal-model-calendar.c:151
-#: ../src/calendar/gui/e-meeting-time-sel.c:534
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-cal-model-calendar.c:94
+#: ../src/calendar/gui/e-meeting-time-sel.c:524
+#: ../src/calendar/gui/e-task-table.c:530
msgid "Busy"
msgstr "繁忙"
-#: ../src/calendar/gui/e-cal-model-tasks.c:496
+#: ../src/calendar/gui/e-cal-model-tasks.c:458
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -7042,183 +7641,181 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:548
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "无"
+#: ../src/calendar/gui/e-cal-model-tasks.c:555
+msgid "In Progress"
+msgstr "进行中"
-#: ../src/calendar/gui/e-cal-ops.c:304
+#: ../src/calendar/gui/e-cal-ops.c:314
msgid "Modifying an event"
msgstr "修改一个事件"
-#: ../src/calendar/gui/e-cal-ops.c:308
+#: ../src/calendar/gui/e-cal-ops.c:318
msgid "Modifying a memo"
msgstr "修改备忘"
-#: ../src/calendar/gui/e-cal-ops.c:312
+#: ../src/calendar/gui/e-cal-ops.c:322
msgid "Modifying a task"
msgstr "修改任务"
-#: ../src/calendar/gui/e-cal-ops.c:411
+#: ../src/calendar/gui/e-cal-ops.c:423 ../src/calendar/gui/e-to-do-pane.c:2074
msgid "Removing an event"
msgstr "正在移除事件"
-#: ../src/calendar/gui/e-cal-ops.c:415
+#: ../src/calendar/gui/e-cal-ops.c:427 ../src/calendar/gui/e-to-do-pane.c:2078
msgid "Removing a memo"
msgstr "正在移除备忘"
-#: ../src/calendar/gui/e-cal-ops.c:419
+#: ../src/calendar/gui/e-cal-ops.c:431 ../src/calendar/gui/e-to-do-pane.c:2082
msgid "Removing a task"
msgstr "正在移除任务"
-#: ../src/calendar/gui/e-cal-ops.c:510
+#: ../src/calendar/gui/e-cal-ops.c:519
#, c-format
msgid "Deleting an event"
msgid_plural "Deleting %d events"
msgstr[0] "正在删除 %d 件事件"
-#: ../src/calendar/gui/e-cal-ops.c:514
+#: ../src/calendar/gui/e-cal-ops.c:523
#, c-format
msgid "Deleting a memo"
msgid_plural "Deleting %d memos"
msgstr[0] "正在删除 %d 个备忘"
-#: ../src/calendar/gui/e-cal-ops.c:518
+#: ../src/calendar/gui/e-cal-ops.c:527
#, c-format
msgid "Deleting a task"
msgid_plural "Deleting %d tasks"
msgstr[0] "正在删除 %d 项任务"
-#: ../src/calendar/gui/e-cal-ops.c:721
+#: ../src/calendar/gui/e-cal-ops.c:738
#, c-format
msgid "Pasting an event"
msgid_plural "Pasting %d events"
msgstr[0] "正在粘贴 %d 件事件"
-#: ../src/calendar/gui/e-cal-ops.c:736
+#: ../src/calendar/gui/e-cal-ops.c:753
#, c-format
msgid "Pasting a memo"
msgid_plural "Pasting %d memos"
msgstr[0] "正在粘贴 %d 个备忘"
-#: ../src/calendar/gui/e-cal-ops.c:751
+#: ../src/calendar/gui/e-cal-ops.c:768
#, c-format
msgid "Pasting a task"
msgid_plural "Pasting %d tasks"
msgstr[0] "正在粘贴 %d 项任务"
-#: ../src/calendar/gui/e-cal-ops.c:850
+#: ../src/calendar/gui/e-cal-ops.c:868
msgid "Updating an event"
msgstr "更新事件"
-#: ../src/calendar/gui/e-cal-ops.c:854
+#: ../src/calendar/gui/e-cal-ops.c:872
msgid "Updating a memo"
msgstr "更新备忘"
-#: ../src/calendar/gui/e-cal-ops.c:858
+#: ../src/calendar/gui/e-cal-ops.c:876
msgid "Updating a task"
msgstr "更新任务"
-#: ../src/calendar/gui/e-cal-ops.c:966
+#: ../src/calendar/gui/e-cal-ops.c:989
#, fuzzy, c-format
#| msgid "Getting events to purge in the calendar '%s'"
msgid "Getting events to purge in the calendar “%s”"
msgstr "正在获取日历“%s”里要清除的事件"
-#: ../src/calendar/gui/e-cal-ops.c:970
+#: ../src/calendar/gui/e-cal-ops.c:993
#, fuzzy, c-format
#| msgid "Getting memos to purge in the memo list '%s'"
msgid "Getting memos to purge in the memo list “%s”"
msgstr "正在获取备忘录“%s”里要清除的备忘"
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:997
#, fuzzy, c-format
#| msgid "Getting tasks to purge in the task list '%s'"
msgid "Getting tasks to purge in the task list “%s”"
msgstr "正在获取任务列表“%s”里要清除的任务"
-#: ../src/calendar/gui/e-cal-ops.c:1000
+#: ../src/calendar/gui/e-cal-ops.c:1023
#, fuzzy, c-format
#| msgid "Purging events in the calendar '%s'"
msgid "Purging events in the calendar “%s”"
msgstr "正在清除日历“%s”里的事件"
-#: ../src/calendar/gui/e-cal-ops.c:1004
+#: ../src/calendar/gui/e-cal-ops.c:1027
#, fuzzy, c-format
#| msgid "Purging memos in the memo list '%s'"
msgid "Purging memos in the memo list “%s”"
msgstr "正在清除备忘录“%s”里的备忘"
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1031
#, fuzzy, c-format
#| msgid "Purging tasks in the task list '%s'"
msgid "Purging tasks in the task list “%s”"
msgstr "正在清除任务列表“%s”里的任务"
-#: ../src/calendar/gui/e-cal-ops.c:1108
+#: ../src/calendar/gui/e-cal-ops.c:1126
msgid "Purging events"
msgstr "正在清除事件"
-#: ../src/calendar/gui/e-cal-ops.c:1112
+#: ../src/calendar/gui/e-cal-ops.c:1130
msgid "Purging memos"
msgstr "正在清除备忘"
-#: ../src/calendar/gui/e-cal-ops.c:1116
+#: ../src/calendar/gui/e-cal-ops.c:1134
msgid "Purging tasks"
msgstr "正在清除任务"
-#: ../src/calendar/gui/e-cal-ops.c:1218
+#: ../src/calendar/gui/e-cal-ops.c:1236
msgid "Expunging completed tasks"
msgstr "删掉已完成的任务"
-#: ../src/calendar/gui/e-cal-ops.c:2049
+#: ../src/calendar/gui/e-cal-ops.c:2084
#, c-format
msgid "Moving an event"
msgid_plural "Moving %d events"
msgstr[0] "正在移动 %d 件事件"
-#: ../src/calendar/gui/e-cal-ops.c:2050
+#: ../src/calendar/gui/e-cal-ops.c:2085
#, c-format
msgid "Copying an event"
msgid_plural "Copying %d events"
msgstr[0] "正在复制 %d 件事件"
-#: ../src/calendar/gui/e-cal-ops.c:2056
+#: ../src/calendar/gui/e-cal-ops.c:2091
#, c-format
msgid "Moving a memo"
msgid_plural "Moving %d memos"
msgstr[0] "正在移动 %d 个备忘"
-#: ../src/calendar/gui/e-cal-ops.c:2057
+#: ../src/calendar/gui/e-cal-ops.c:2092
#, c-format
msgid "Copying a memo"
msgid_plural "Copying %d memos"
msgstr[0] "正在复制 %d 个备忘"
-#: ../src/calendar/gui/e-cal-ops.c:2063
+#: ../src/calendar/gui/e-cal-ops.c:2098
#, c-format
msgid "Moving a task"
msgid_plural "Moving %d tasks"
msgstr[0] "正在移动 %d 项任务"
-#: ../src/calendar/gui/e-cal-ops.c:2064
+#: ../src/calendar/gui/e-cal-ops.c:2099
#, c-format
msgid "Copying a task"
msgid_plural "Copying %d tasks"
msgstr[0] "正在复制 %d 项任务"
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+#: ../src/calendar/gui/e-cell-date-edit-text.c:177
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+#: ../src/calendar/gui/e-cell-date-edit-text.c:180
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A %p%I:%M:%S"
-#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#: ../src/calendar/gui/e-cell-date-edit-text.c:188
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -7227,203 +7824,216 @@ msgstr ""
"日期必须按照以下格式输入：\n"
"%s"
-#: ../src/calendar/gui/e-comp-editor-event.c:99
-#, fuzzy
-#| msgid "Event's time is in the past"
+#: ../src/calendar/gui/e-comp-editor-event.c:100
msgid "Event’s time is in the past"
-msgstr "事件来自过去的时间点"
+msgstr "事件的时间是在过去"
-#: ../src/calendar/gui/e-comp-editor-event.c:200
+#: ../src/calendar/gui/e-comp-editor-event.c:210
msgid ""
"Event cannot be edited, because the selected calendar could not be opened"
msgstr "任务不能被编辑，因为选择的日历无法被打开"
-#: ../src/calendar/gui/e-comp-editor-event.c:202
+#: ../src/calendar/gui/e-comp-editor-event.c:212
msgid "Event cannot be edited, because the selected calendar is read only"
msgstr "因所选的日程为只读，您无法编辑该事件。"
-#: ../src/calendar/gui/e-comp-editor-event.c:204
+#: ../src/calendar/gui/e-comp-editor-event.c:214
msgid "Event cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者，因此无法编辑全部事件。"
-#: ../src/calendar/gui/e-comp-editor-event.c:436
-#: ../src/calendar/gui/e-comp-editor-task.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:506
+#: ../src/calendar/gui/e-comp-editor-task.c:591
msgid "Start date is not a valid date"
msgstr "起始日期无效"
-#: ../src/calendar/gui/e-comp-editor-event.c:438
+#: ../src/calendar/gui/e-comp-editor-event.c:508
msgid "Start time is not a valid time"
msgstr "起始时间无效"
-#: ../src/calendar/gui/e-comp-editor-event.c:442
-#: ../src/calendar/gui/e-comp-editor-event.c:458
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:199
-#: ../src/calendar/gui/e-comp-editor.c:338 ../src/mail/e-mail-display.c:2116
-#: ../src/mail/e-mail-reader-utils.c:646 ../src/mail/mail-send-recv.c:490
-#: ../src/mail/mail-send-recv.c:1288 ../src/plugins/face/face.c:174
-#: ../src/shell/e-shell.c:1073 ../src/shell/e-shell.c:1097
-#: ../src/smime/gui/certificate-manager.c:357
+#: ../src/calendar/gui/e-comp-editor-event.c:512
+#: ../src/calendar/gui/e-comp-editor-event.c:528
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/composer/e-composer-actions.c:180
+#: ../src/em-format/e-mail-part-secure-button.c:97
+#: ../src/e-util/e-misc-utils.c:3992 ../src/e-util/e-misc-utils.c:4004
+#: ../src/e-util/e-misc-utils.c:4018 ../src/mail/e-mail-autoconfig.c:1041
+#: ../src/mail/e-mail-display.c:2444 ../src/mail/e-mail-notes.c:875
+#: ../src/mail/e-mail-reader-utils.c:805 ../src/mail/em-composer-utils.c:3843
+#: ../src/mail/em-composer-utils.c:3874 ../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:1235
+#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
+#, c-format
msgid "Unknown error"
msgstr "未知错误"
-#: ../src/calendar/gui/e-comp-editor-event.c:452
+#: ../src/calendar/gui/e-comp-editor-event.c:522
msgid "End date is not a valid date"
msgstr "结束日期无效"
-#: ../src/calendar/gui/e-comp-editor-event.c:454
+#: ../src/calendar/gui/e-comp-editor-event.c:524
msgid "End time is not a valid time"
msgstr "结束时间无效"
-#: ../src/calendar/gui/e-comp-editor-event.c:586
-#: ../src/calendar/gui/e-comp-editor-memo.c:126
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:719
+#: ../src/calendar/gui/e-comp-editor-memo.c:256
+#: ../src/calendar/gui/e-comp-editor-task.c:704
msgid "_Categories"
msgstr "类别(_C)"
-#: ../src/calendar/gui/e-comp-editor-event.c:588
-#: ../src/calendar/gui/e-comp-editor-memo.c:128
-#: ../src/calendar/gui/e-comp-editor-task.c:593
+#: ../src/calendar/gui/e-comp-editor-event.c:721
+#: ../src/calendar/gui/e-comp-editor-memo.c:258
+#: ../src/calendar/gui/e-comp-editor-task.c:706
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../src/calendar/gui/e-comp-editor-event.c:594
-#: ../src/calendar/gui/e-comp-editor-task.c:599
+#: ../src/calendar/gui/e-comp-editor-event.c:727
+#: ../src/calendar/gui/e-comp-editor-task.c:712
msgid "Time _Zone"
msgstr "时区(_Z)"
-#: ../src/calendar/gui/e-comp-editor-event.c:596
-#: ../src/calendar/gui/e-comp-editor-task.c:601
+#: ../src/calendar/gui/e-comp-editor-event.c:729
+#: ../src/calendar/gui/e-comp-editor-task.c:714
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../src/calendar/gui/e-comp-editor-event.c:602
+#: ../src/calendar/gui/e-comp-editor-event.c:735
msgid "All _Day Event"
msgstr "全天事件(_D)"
-#: ../src/calendar/gui/e-comp-editor-event.c:604
+#: ../src/calendar/gui/e-comp-editor-event.c:737
msgid "Toggles whether to have All Day Event"
msgstr "切换是否有全天事件"
-#: ../src/calendar/gui/e-comp-editor-event.c:610
+#: ../src/calendar/gui/e-comp-editor-event.c:743
msgid "Show Time as _Busy"
msgstr "将时间显示为忙(_B)"
-#: ../src/calendar/gui/e-comp-editor-event.c:612
+#: ../src/calendar/gui/e-comp-editor-event.c:745
msgid "Toggles whether to show time as busy"
msgstr "切换是否将时间显示为忙"
-#: ../src/calendar/gui/e-comp-editor-event.c:621
+#: ../src/calendar/gui/e-comp-editor-event.c:754
msgid "Pu_blic"
msgstr "公开(_B)"
-#: ../src/calendar/gui/e-comp-editor-event.c:623
+#: ../src/calendar/gui/e-comp-editor-event.c:756
msgid "Classify as public"
msgstr "分类为公开"
-#: ../src/calendar/gui/e-comp-editor-event.c:628
+#: ../src/calendar/gui/e-comp-editor-event.c:761
msgid "_Private"
msgstr "私人(_P)"
-#: ../src/calendar/gui/e-comp-editor-event.c:630
+#: ../src/calendar/gui/e-comp-editor-event.c:763
msgid "Classify as private"
msgstr "分类为私人"
-#: ../src/calendar/gui/e-comp-editor-event.c:635
+#: ../src/calendar/gui/e-comp-editor-event.c:768
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../src/calendar/gui/e-comp-editor-event.c:637
+#: ../src/calendar/gui/e-comp-editor-event.c:770
msgid "Classify as confidential"
msgstr "分类为机密"
-#: ../src/calendar/gui/e-comp-editor-event.c:738
+#: ../src/calendar/gui/e-comp-editor-event.c:888
msgctxt "ECompEditor"
msgid "_Start time:"
msgstr "开始时间(_S)："
-#: ../src/calendar/gui/e-comp-editor-event.c:743
+#: ../src/calendar/gui/e-comp-editor-event.c:893
msgctxt "ECompEditor"
msgid "_End time:"
msgstr "结束时间(_E)："
-#: ../src/calendar/gui/e-comp-editor-event.c:753
+#: ../src/calendar/gui/e-comp-editor-event.c:903
msgctxt "ECompEditor"
msgid "All da_y event"
msgstr "所有当日事件"
-#: ../src/calendar/gui/e-comp-editor-event.c:806
-#: ../src/calendar/gui/e-comp-editor-memo.c:213
-#: ../src/calendar/gui/e-comp-editor-task.c:765
+#: ../src/calendar/gui/e-comp-editor-event.c:971
+#: ../src/calendar/gui/e-comp-editor-memo.c:357
+#: ../src/calendar/gui/e-comp-editor-task.c:882
msgctxt "ECompEditorPage"
msgid "General"
msgstr "常规"
-#: ../src/calendar/gui/e-comp-editor-event.c:809
-#: ../src/calendar/gui/e-comp-editor-task.c:782
+#: ../src/calendar/gui/e-comp-editor-event.c:974
+#: ../src/calendar/gui/e-comp-editor-task.c:905
msgctxt "ECompEditorPage"
msgid "Reminders"
msgstr "提醒"
-#: ../src/calendar/gui/e-comp-editor-event.c:812
+#: ../src/calendar/gui/e-comp-editor-event.c:977
+#: ../src/calendar/gui/e-comp-editor-task.c:909
msgctxt "ECompEditorPage"
msgid "Recurrence"
msgstr "再现"
-#: ../src/calendar/gui/e-comp-editor-event.c:815
-#: ../src/calendar/gui/e-comp-editor-memo.c:216
-#: ../src/calendar/gui/e-comp-editor-task.c:785
+#: ../src/calendar/gui/e-comp-editor-event.c:980
+#: ../src/calendar/gui/e-comp-editor-memo.c:360
+#: ../src/calendar/gui/e-comp-editor-task.c:913
msgctxt "ECompEditorPage"
msgid "Attachments"
msgstr "附件"
-#: ../src/calendar/gui/e-comp-editor-event.c:825
+#: ../src/calendar/gui/e-comp-editor-event.c:990
msgctxt "ECompEditorPage"
msgid "Schedule"
msgstr "日程"
-#: ../src/calendar/gui/e-comp-editor-event.c:857
-#, fuzzy, c-format
-#| msgid "Meeting - %s"
+#: ../src/calendar/gui/e-comp-editor-event.c:1025
+#, c-format
msgid "Meeting — %s"
-msgstr "会议 - %s"
+msgstr "会议 — %s"
-#: ../src/calendar/gui/e-comp-editor-event.c:858
+#: ../src/calendar/gui/e-comp-editor-event.c:1026
#, fuzzy, c-format
#| msgid "Appointment - %s"
msgid "Appointment — %s"
msgstr "约会 - %s"
+#: ../src/calendar/gui/e-comp-editor-memo.c:59
#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#, fuzzy
+#| msgid "New Window"
+msgid "New note"
+msgstr "新建窗口"
+
+#: ../src/calendar/gui/e-comp-editor-memo.c:218
msgid ""
"Memo cannot be edited, because the selected memo list could not be opened"
msgstr "备忘录不能被编辑，因为选择的备忘录列表无法被打开"
-#: ../src/calendar/gui/e-comp-editor-memo.c:90
+#: ../src/calendar/gui/e-comp-editor-memo.c:220
msgid "Memo cannot be edited, because the selected memo list is read only"
msgstr "因所选的备忘列表为只读，您无法编辑该备忘。"
-#: ../src/calendar/gui/e-comp-editor-memo.c:92
+#: ../src/calendar/gui/e-comp-editor-memo.c:222
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者，因此无法编辑全部备忘。"
-#: ../src/calendar/gui/e-comp-editor-memo.c:188
-#: ../src/calendar/gui/e-comp-editor-task.c:700
+#: ../src/calendar/gui/e-comp-editor-memo.c:318
+#: ../src/calendar/gui/e-comp-editor-task.c:813
msgid "_List:"
msgstr "列表(_L)："
-#: ../src/calendar/gui/e-comp-editor-memo.c:195
-#: ../src/calendar/gui/e-comp-editor-task.c:707
+#: ../src/calendar/gui/e-comp-editor-memo.c:325
+#: ../src/calendar/gui/e-comp-editor-task.c:823
msgctxt "ECompEditor"
msgid "Sta_rt date:"
msgstr "起始日期："
-#: ../src/calendar/gui/e-comp-editor-memo.c:247
+#: ../src/calendar/gui/e-comp-editor-memo.c:392
#, fuzzy, c-format
#| msgid "Assigned Memo - %s"
msgid "Assigned Memo — %s"
msgstr "已分配留言 - %s"
-#: ../src/calendar/gui/e-comp-editor-memo.c:248
+#: ../src/calendar/gui/e-comp-editor-memo.c:393
#, fuzzy, c-format
#| msgid "Memo - %s"
msgid "Memo — %s"
@@ -7431,7 +8041,7 @@ msgstr "备忘 - %s"
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:123
#: ../src/calendar/gui/e-comp-editor-page-attachments.c:128
-#: ../src/em-format/e-mail-formatter-attachment.c:333
+#: ../src/em-format/e-mail-formatter-attachment.c:334
#: ../src/e-util/e-attachment-bar.c:101 ../src/e-util/e-attachment-bar.c:106
#: ../src/e-util/e-attachment-paned.c:175
#: ../src/e-util/e-attachment-paned.c:180 ../src/mail/message-list.etspec.h:4
@@ -7439,153 +8049,192 @@ msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "附件"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:194
-#: ../src/e-util/e-attachment.c:2419
-#, fuzzy, c-format
-#| msgid "Could not load '%s'"
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../src/e-util/e-attachment.c:2469
+#, c-format
msgid "Could not load “%s”"
msgstr "不能加载“%s”"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:196
-#: ../src/e-util/e-attachment.c:2422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
+#: ../src/e-util/e-attachment.c:2472
#, c-format
msgid "Could not load the attachment"
msgstr "不能加载附件"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:401
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
msgid ""
"Some attachments are still being downloaded. Please wait until the download "
"is finished."
msgstr "仍在下载一部分附件。请等待下载完成。"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:428
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
#, fuzzy, c-format
#| msgid "Attachment '%s' cannot be found, remove it from the list, please"
msgid "Attachment “%s” cannot be found, remove it from the list, please"
msgstr "找不到附件“%s”，请将其从列表移除"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:445
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
#, fuzzy, c-format
#| msgid ""
#| "Attachment '%s' doesn't have valid URI, remove it from the list, please"
msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
msgstr "附件“%s”不具有有效的 URI，请将其从列表移除"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:606
-#: ../src/composer/e-composer-actions.c:320
-msgid "_Attachment..."
-msgstr "附件(_A)..."
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
+#: ../src/composer/e-composer-actions.c:326
+msgid "_Attachment…"
+msgstr "附件(_A)…"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:608
-#: ../src/composer/e-composer-actions.c:322
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
+#: ../src/composer/e-composer-actions.c:328
#: ../src/e-util/e-attachment-view.c:343
msgid "Attach a file"
msgstr "添加附件"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:615
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
msgid "_Attachments"
msgstr "附件(_A)"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:617
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
msgid "Show attachments"
msgstr "显示附件"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:770
-#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:812
+#: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
msgid "Icon View"
msgstr "图标视图"
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:772
-#: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:814
+#: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
msgid "List View"
msgstr "列表视图"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:311
+#: ../src/calendar/gui/e-comp-editor-page-general.c:392
#, fuzzy, c-format
#| msgid "Cannot find attendee '%s' in the list of attendees"
msgid "Cannot find attendee “%s” in the list of attendees"
msgstr "无法从参与者列表中找到参与者 '%s'"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:318
+#: ../src/calendar/gui/e-comp-editor-page-general.c:399
#, fuzzy, c-format
#| msgid "Not enough rights to delete attendee '%s'"
msgid "Not enough rights to delete attendee “%s”"
msgstr "没有足够权力来删除参与者 '%s'"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:348
+#: ../src/calendar/gui/e-comp-editor-page-general.c:429
msgid "Failed to delete selected attendee"
msgid_plural "Failed to delete selected attendees"
msgstr[0] "删除选中参与者失败"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:581
+#: ../src/calendar/gui/e-comp-editor-page-general.c:543
+#, fuzzy
+#| msgid "Email Address is not a valid email"
+msgid "Organizer address is not a valid user mail address"
+msgstr "邮件地址不是有效的邮箱"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
msgid "A_ttendees"
msgstr "参与者(_T)"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:583
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
msgid "Toggles whether the Attendees are displayed"
msgstr "切换是否显示与会者"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:592
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:594
+#: ../src/calendar/gui/e-comp-editor-page-general.c:725
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:600
+#: ../src/calendar/gui/e-comp-editor-page-general.c:731
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:602
+#: ../src/calendar/gui/e-comp-editor-page-general.c:733
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:608
+#: ../src/calendar/gui/e-comp-editor-page-general.c:739
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:610
+#: ../src/calendar/gui/e-comp-editor-page-general.c:741
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:616
+#: ../src/calendar/gui/e-comp-editor-page-general.c:747
msgid "_Type Field"
msgstr "类型域(_T)"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:618
+#: ../src/calendar/gui/e-comp-editor-page-general.c:749
msgid "Toggles whether the Attendee Type is displayed"
msgstr "切换是否显示出席者类型域"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:943
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:953
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1084
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1207
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
msgid "Or_ganizer:"
msgstr "组织者(_G)："
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1286
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
+msgid ""
+"Override color of the event. If not set, then color of the calendar is used."
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
+msgid ""
+"Override color of the memo. If not set, then color of the memo list is used."
+msgstr ""
+
+#. E_SOURCE_EXTENSION_TASK_LIST
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
+msgid ""
+"Override color of the task. If not set, then color of the task list is used."
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
msgctxt "ECompEditor"
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
+msgid "Atte_ndees…"
+msgstr "出席者(_N)…"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2321
+#: ../src/calendar/gui/e-comp-editor.c:2113
+#: ../src/e-util/e-accounts-window.c:1745
+#: ../src/e-util/e-html-editor-actions.c:1116
+#: ../src/e-util/e-mail-signature-manager.c:358
+#: ../src/e-util/e-webdav-browser.c:2671 ../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:380
+#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:549
+#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:469
+#: ../src/shell/e-shell-window-actions.c:1045 ../src/smime/gui/smime-ui.ui.h:11
+msgid "_Edit"
+msgstr "编辑(_E)"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
msgid "Add exception"
msgstr "添加例外"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
msgid "Modify exception"
msgstr "修改例外"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday]
[forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
msgid "on"
msgstr "在"
@@ -7593,7 +8242,7 @@ msgstr "在"
#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
msgctxt "ECompEditorPageRecur"
msgid "first"
msgstr "第一"
@@ -7603,7 +8252,7 @@ msgstr "第一"
#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
msgctxt "ECompEditorPageRecur"
msgid "second"
msgstr "第二"
@@ -7612,7 +8261,7 @@ msgstr "第二"
#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
msgctxt "ECompEditorPageRecur"
msgid "third"
msgstr "第三"
@@ -7621,7 +8270,7 @@ msgstr "第三"
#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
msgctxt "ECompEditorPageRecur"
msgid "fourth"
msgstr "第四"
@@ -7630,7 +8279,7 @@ msgstr "第四"
#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
msgctxt "ECompEditorPageRecur"
msgid "fifth"
msgstr "第五"
@@ -7639,14 +8288,14 @@ msgstr "第五"
#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day'
or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
msgctxt "ECompEditorPageRecur"
msgid "last"
msgstr "最后"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date]
[11th to 20th] [17th] [forever]'
#. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
msgctxt "ECompEditorPageRecur"
msgid "Other Date"
msgstr "其他日期"
@@ -7655,7 +8304,7 @@ msgstr "其他日期"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment
recurs/Every [x] month(s)
#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
msgctxt "ECompEditorPageRecur"
msgid "1st to 10th"
msgstr "上旬"
@@ -7664,7 +8313,7 @@ msgstr "上旬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment
recurs/Every [x] month(s)
#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
msgctxt "ECompEditorPageRecur"
msgid "11th to 20th"
msgstr "中旬"
@@ -7673,7 +8322,7 @@ msgstr "中旬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment
recurs/Every [x] month(s)
#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
msgctxt "ECompEditorPageRecur"
msgid "21st to 31st"
msgstr "下旬"
@@ -7682,42 +8331,42 @@ msgstr "下旬"
#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the
[first] [day] [forever]'
#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day'
or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
msgctxt "ECompEditorPageRecur"
msgid "day"
msgstr "天"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
msgctxt "ECompEditorPageRecur"
msgid "Monday"
msgstr "星期一"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
msgctxt "ECompEditorPageRecur"
msgid "Tuesday"
msgstr "星期二"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
msgctxt "ECompEditorPageRecur"
msgid "Wednesday"
msgstr "星期三"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
msgctxt "ECompEditorPageRecur"
msgid "Thursday"
msgstr "星期四"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
msgctxt "ECompEditorPageRecur"
msgid "Friday"
msgstr "星期五"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
msgctxt "ECompEditorPageRecur"
msgid "Saturday"
msgstr "星期六"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
msgctxt "ECompEditorPageRecur"
msgid "Sunday"
msgstr "星期日"
@@ -7725,126 +8374,127 @@ msgstr "星期日"
#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second]
[Tuesday] [forever]'
#. * (dropdown menu options are in [square brackets])."
#.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
msgctxt "ECompEditorPageRecur"
msgid "on the"
msgstr "在"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1091
msgctxt "ECompEditorPageRecur"
msgid "occurrences"
msgstr "发生"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1485
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2015
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2113
msgctxt "ECompEditorPageRecur"
msgid "This appointment rec_urs"
msgstr "会议再现周期(_U)"
#. Translators: Entire string is for example: 'This task recurs/Every[x][day(s)][for][1]occurrences'
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1490
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1561
msgctxt "ECompEditorPageRecur"
msgid "This task rec_urs"
msgstr "任务再现周期(_U)"
#. Translators: Entire string is for example: 'This memo recurs/Every[x][day(s)][for][1]occurrences'
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1495
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1566
msgctxt "ECompEditorPageRecur"
msgid "This memo rec_urs"
msgstr "备忘再现周期(_U)"
#. Translators: Entire string is for example: 'This component
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1500
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1571
msgctxt "ECompEditorPageRecur"
msgid "This component rec_urs"
msgstr "组件再现周期(_U)"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1861
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1942
msgid "Recurrence exception date is invalid"
msgstr "重复例外日期无效"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1909
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1998
msgid "End time of the recurrence is before the start"
msgstr "再现的结束时间早于开始时间"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1952
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2041
msgid "R_ecurrence"
msgstr "重复"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1954
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2043
msgid "Set or unset recurrence"
msgstr "设置或取消事件重复"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2055
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
msgctxt "ECompEditorPageRecur"
msgid "Every"
msgstr "每"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2090
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2180
msgctxt "ECompEditorPageRecur"
msgid "day(s)"
msgstr "日"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2182
msgctxt "ECompEditorPageRecur"
msgid "week(s)"
msgstr "周"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2094
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2184
msgctxt "ECompEditorPageRecur"
msgid "month(s)"
msgstr "月"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2096
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2186
msgctxt "ECompEditorPageRecur"
msgid "year(s)"
msgstr "年"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2125
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2215
msgctxt "ECompEditorPageRecur"
msgid "for"
msgstr "共"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2127
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2217
msgctxt "ECompEditorPageRecur"
msgid "until"
msgstr "直到"
#. Translators: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2129
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2219
msgctxt "ECompEditorPageRecur"
msgid "forever"
msgstr "永远"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2145
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2235
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的再现。"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2162
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2248
msgid "Exceptions"
msgstr "例外"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2313
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2168
+#: ../src/mail/e-mail-config-identity-page.c:854
+#: ../src/mail/mail-config.ui.h:67
msgid "A_dd"
msgstr "添加(_D)"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
-#: ../src/mail/mail-config.ui.h:66
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2329
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2176
+#: ../src/mail/mail-config.ui.h:69
msgid "Re_move"
msgstr "删除(_M)"
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2255
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2337
msgid "Preview"
msgstr "预览"
@@ -7852,531 +8502,541 @@ msgstr "预览"
msgid "Send To"
msgstr "发送到"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1554
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1592
msgid "_Reminders"
msgstr "提醒(_R)"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1556
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1594
msgid "Set or unset reminders"
msgstr "设置或取消提醒"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1609
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
-msgid "Reminders"
-msgstr "提醒"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1638
-msgid "_Reminder"
-msgstr "提醒(_R)"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1671
-#, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d 天前"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1678
-#, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d 时前"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
-#, c-format
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d 分前"
-
#. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1693
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1706
msgctxt "cal-reminders"
msgid "None"
msgstr "无"
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
-msgctxt "cal-reminders"
-msgid "15 minutes before"
-msgstr "一刻钟前"
-
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1697
+#. 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:1716
+#, fuzzy, c-format
+#| msgid "is before"
msgctxt "cal-reminders"
-msgid "1 hour before"
-msgstr "一小时前"
+msgid "%s before"
+msgstr "之前"
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1699
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1721
+#, fuzzy
+#| msgctxt "cal-reminders"
+#| msgid "%s at the start"
msgctxt "cal-reminders"
-msgid "1 day before"
-msgstr "一天前"
+msgid "at the start"
+msgstr "开始时 %s"
#. Translators: "Custom" for "Custom reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1711
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1729
msgctxt "cal-reminders"
msgid "Custom"
msgstr "自定义"
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1875
+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:1888
+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:1904
+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:1920
+msgctxt "cal-reminders"
+msgid "_minutes"
+msgstr "分钟(_M)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1926
+msgid "_Add time"
+msgstr "添加时间(_A)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2006
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Reminders"
+msgstr "提醒"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2031
+msgid "_Reminder"
+msgstr "提醒(_R)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2056
+msgid "Add custom predefined time"
+msgstr ""
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
+msgid "Remove custom predefined times"
+msgstr ""
+
#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2249
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:1864
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2251
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:1866
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2253
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:1883
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2270
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:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2272
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:1901
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2288
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:1903
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2290
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:1926
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2309
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:1951
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2334
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:1988
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2371
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:1990
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2373
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:1992
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2375
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:2033
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2412
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2569
msgctxt "cal-reminders"
msgid "Custom _message"
msgstr "自定义消息"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2077
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2456
msgctxt "cal-reminders"
msgid "Custom reminder _sound"
msgstr "自定义提醒声音"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2088
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2467
msgid "Select a sound file"
msgstr "选择一个音频文件"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2116
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2495
msgid "_Program:"
msgstr "程序(_P)："
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2141
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2520
msgid "_Arguments:"
msgstr "参数(_A)："
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2173
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2552
msgid "_Send To:"
msgstr "发送到：(_S)"
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:484
msgid "_Schedule"
msgstr "日程(_S)"
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:486
msgid "Query free / busy information for the attendees"
msgstr "查询出席者的忙闲信息"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:92
msgctxt "ECompEditor"
msgid "_Summary:"
msgstr "概要：(_S)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:341
msgctxt "ECompEditor"
msgid "_Location:"
msgstr "位置(_L)："
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:474
msgctxt "ECompEditor"
-msgid "_Categories..."
-msgstr "类别...(_C)"
+msgid "_Categories…"
+msgstr "类别(_C)…"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+msgid "Edit as text"
+msgstr "作为文本编辑"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:573
+msgid "View as HTML"
+msgstr "作为 HTML 查看"
+
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:656
msgctxt "ECompEditor"
msgid "_Description:"
msgstr "描述(_D)："
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:686
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:892
msgctxt "ECompEditor"
msgid "_Web page:"
msgstr "网页：(_W)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1057
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1263
msgctxt "ECompEditor"
msgid "D_ue date:"
msgstr "截止日期：(_U)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1117
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1357
msgctxt "ECompEditor"
msgid "Date _completed:"
msgstr "完成日期：(_C)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1133
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1373
msgctxt "ECompEditor"
msgid "Public"
msgstr "公开"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1134
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1374
msgctxt "ECompEditor"
msgid "Private"
msgstr "保密"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1135
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1375
msgctxt "ECompEditor"
msgid "Confidential"
msgstr "机密"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1151
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1391
msgctxt "ECompEditor"
msgid "C_lassification:"
msgstr "分类：(_L)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1170
-msgctxt "ECompEditor"
-msgid "Not Started"
-msgstr "未开始"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1171
-msgctxt "ECompEditor"
-msgid "In Progress"
-msgstr "进行中"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1172
-msgctxt "ECompEditor"
-msgid "Completed"
-msgstr "已完成"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1173
-msgctxt "ECompEditor"
-msgid "Cancelled"
-msgstr "已取消"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1454
msgctxt "ECompEditor"
msgid "_Status:"
msgstr "状态：(_S)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1212
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
msgctxt "ECompEditor"
msgid "Undefined"
msgstr "未定义"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1485
msgctxt "ECompEditor"
msgid "High"
msgstr "高"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1214
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1486
msgctxt "ECompEditor"
msgid "Normal"
msgstr "中"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1215
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1487
msgctxt "ECompEditor"
msgid "Low"
msgstr "低"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1224
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1496
msgctxt "ECompEditor"
msgid "Priorit_y:"
msgstr "优先级：(_Y)"
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1278
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1550
msgctxt "ECompEditor"
msgid "Percent complete:"
msgstr "完成百分比："
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1359
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1631
msgctxt "ECompEditor"
msgid "Time _zone:"
msgstr "时区(_Z)："
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1484
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1727
msgctxt "ECompEditor"
msgid "Show time as _busy"
msgstr "将时间显示为忙(_B)"
-#: ../src/calendar/gui/e-comp-editor-task.c:224
-#, fuzzy
-#| msgid "Task's start date is in the past"
+#. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:2148
+msgctxt "ECompEditor"
+msgid "None"
+msgstr "无"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:281
msgid "Task’s start date is in the past"
msgstr "任务的开始日期是在过去"
-#: ../src/calendar/gui/e-comp-editor-task.c:232
-#, fuzzy
-#| msgid "Task's due date is in the past"
+#: ../src/calendar/gui/e-comp-editor-task.c:289
msgid "Task’s due date is in the past"
msgstr "任务的到期时间是在过去"
-#: ../src/calendar/gui/e-comp-editor-task.c:461
+#: ../src/calendar/gui/e-comp-editor-task.c:530
msgid ""
"Task cannot be edited, because the selected task list could not be opened"
msgstr "任务不能被编辑，因为选择的任务列表无法被打开"
-#: ../src/calendar/gui/e-comp-editor-task.c:463
+#: ../src/calendar/gui/e-comp-editor-task.c:532
msgid "Task cannot be edited, because the selected task list is read only"
msgstr "任务不能被编辑，因为选择的任务列表是只读的"
-#: ../src/calendar/gui/e-comp-editor-task.c:465
+#: ../src/calendar/gui/e-comp-editor-task.c:534
msgid "Task cannot be fully edited, because you are not the organizer"
msgstr "无法完全编辑任务，因为您不是组织者"
-#: ../src/calendar/gui/e-comp-editor-task.c:533
+#: ../src/calendar/gui/e-comp-editor-task.c:605
+msgid "Start date is required for recurring tasks"
+msgstr "周期性任务需要指定起始日期"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:621
msgid "Due date is not a valid date"
msgstr "截止日期无效"
-#: ../src/calendar/gui/e-comp-editor-task.c:544
+#: ../src/calendar/gui/e-comp-editor-task.c:632
msgid "Completed date is not a valid date"
msgstr "完成日期无效"
-#: ../src/calendar/gui/e-comp-editor-task.c:555
+#: ../src/calendar/gui/e-comp-editor-task.c:643
msgid "Completed date cannot be in the future"
msgstr "完成日期不能在将来"
-#: ../src/calendar/gui/e-comp-editor-task.c:607
-#, fuzzy
-#| msgid "All _Day Event"
+#: ../src/calendar/gui/e-comp-editor-task.c:720
msgid "All _Day Task"
msgstr "全天事件(_D)"
-#: ../src/calendar/gui/e-comp-editor-task.c:609
-#, fuzzy
-#| msgid "Toggles whether to have All Day Event"
+#: ../src/calendar/gui/e-comp-editor-task.c:722
msgid "Toggles whether to have All Day Task"
msgstr "切换是否有全天事件"
-#: ../src/calendar/gui/e-comp-editor-task.c:818
-#, fuzzy, c-format
-#| msgid "Assigned Task - %s"
+#: ../src/calendar/gui/e-comp-editor-task.c:946
+#, c-format
msgid "Assigned Task — %s"
-msgstr "分配的任务 - %s"
+msgstr "分配的任务 — %s"
-#: ../src/calendar/gui/e-comp-editor-task.c:819
-#, fuzzy, c-format
-#| msgid "Task - %s"
+#: ../src/calendar/gui/e-comp-editor-task.c:947
+#, c-format
msgid "Task — %s"
-msgstr "任务 - %s"
+msgstr "任务 — %s"
#: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
msgid "attachment"
msgstr "附件"
-#: ../src/calendar/gui/e-comp-editor.c:608
-msgid "Sending notifications to attendees..."
-msgstr "正向参与者发送通知…"
+#: ../src/calendar/gui/e-comp-editor.c:610
+msgid "Sending notifications to attendees…"
+msgstr "正向参与者发送通知……"
-#: ../src/calendar/gui/e-comp-editor.c:993
-msgid "Saving changes..."
-msgstr "正保存更改…"
+#: ../src/calendar/gui/e-comp-editor.c:985
+#: ../src/e-util/e-webdav-browser.c:1799
+msgid "Saving changes…"
+msgstr "正在保存更改……"
-#: ../src/calendar/gui/e-comp-editor.c:1249
+#: ../src/calendar/gui/e-comp-editor.c:1245
msgid "No Summary"
msgstr "没有概要"
#. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1976
-#: ../src/composer/e-composer-actions.c:327
+#: ../src/calendar/gui/e-comp-editor.c:2027
+#: ../src/composer/e-composer-actions.c:333
+#: ../src/e-util/e-accounts-window.c:1778
#: ../src/e-util/e-html-editor-dialog.c:194
-#: ../src/e-util/e-mail-signature-editor.c:309
+#: ../src/e-util/e-mail-signature-editor.c:319
#: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:389
+#: ../src/e-util/e-preferences-window.c:399
#: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
-#: ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1765
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
-#: ../src/shell/e-shell-window-actions.c:278
-#: ../src/shell/e-shell-window-actions.c:787
-#: ../src/smime/gui/certificate-manager.c:2212
+#: ../src/mail/e-mail-browser.c:166
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:758
+#: ../src/mail/e-mail-notes.c:1015 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/em-folder-properties.c:1458
+#: ../src/mail/em-subscription-editor.c:1741
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
+#: ../src/shell/e-shell-window-actions.c:354
+#: ../src/shell/e-shell-window-actions.c:882
+#: ../src/smime/gui/certificate-manager.c:2196
msgid "_Close"
msgstr "关闭(_C)"
-#: ../src/calendar/gui/e-comp-editor.c:1978
+#: ../src/calendar/gui/e-comp-editor.c:2029
msgid "Close the current window"
msgstr "关闭当前窗口"
#. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1983 ../src/e-util/e-focus-tracker.c:773
-#: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
-#: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:806
+#: ../src/e-util/e-html-editor-actions.c:1072 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:468 ../src/mail/e-mail-browser.c:173
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:903
msgid "_Copy"
msgstr "复制(_C)"
-#: ../src/calendar/gui/e-comp-editor.c:1985 ../src/e-util/e-focus-tracker.c:173
-#: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
-#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
-#: ../src/e-util/e-web-view.c:1942 ../src/mail/e-mail-browser.c:136
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../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:470
+#: ../src/e-util/e-web-view.c:1994 ../src/mail/e-mail-browser.c:175
+#: ../src/shell/e-shell-window-actions.c:905
msgid "Copy the selection"
msgstr "复制选中内容"
#. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1990 ../src/e-util/e-focus-tracker.c:768
-#: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
-#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:801
+#: ../src/e-util/e-html-editor-actions.c:1079 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:180 ../src/shell/e-shell-window-actions.c:910
msgid "Cu_t"
msgstr "剪切(_T)"
-#: ../src/calendar/gui/e-comp-editor.c:1992 ../src/e-util/e-focus-tracker.c:166
-#: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1951
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:817
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../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:2003
+#: ../src/mail/e-mail-browser.c:182 ../src/shell/e-shell-window-actions.c:912
msgid "Cut the selection"
msgstr "剪切选中内容"
-#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:187
-#: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../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:919
msgid "Delete the selection"
msgstr "删除选中内容"
-#: ../src/calendar/gui/e-comp-editor.c:2006
+#: ../src/calendar/gui/e-comp-editor.c:2057
msgid "View help"
msgstr "查看帮助"
#. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2011 ../src/e-util/e-focus-tracker.c:778
-#: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
-#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:811
+#: ../src/e-util/e-html-editor-actions.c:1086 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:187 ../src/shell/e-shell-window-actions.c:938
msgid "_Paste"
msgstr "粘贴(_P)"
-#: ../src/calendar/gui/e-comp-editor.c:2013 ../src/e-util/e-focus-tracker.c:180
-#: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1960
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:845
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../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:2012
+#: ../src/mail/e-mail-browser.c:189 ../src/shell/e-shell-window-actions.c:940
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
-#: ../src/calendar/gui/e-comp-editor.c:2018
-#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2323
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1229
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1243
-msgid "_Print..."
-msgstr "打印(_P)..."
-
-#: ../src/calendar/gui/e-comp-editor.c:2025 ../src/mail/e-mail-reader.c:2330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1236
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1693
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:813
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1014
-msgid "Pre_view..."
-msgstr "预览(_V)..."
-
-#: ../src/calendar/gui/e-comp-editor.c:2032 ../src/e-util/e-focus-tracker.c:788
-#: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
+#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/composer/e-composer-actions.c:387 ../src/mail/e-mail-reader.c:2749
+#: ../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:2076 ../src/mail/e-mail-reader.c:2756
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:838
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+msgid "Pre_view…"
+msgstr "预览(_V)…"
+
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:821
+#: ../src/e-util/e-html-editor-actions.c:1100 ../src/e-util/e-web-view.c:485
+#: ../src/mail/e-mail-browser.c:194 ../src/shell/e-shell-window-actions.c:1008
msgid "Select _All"
msgstr "全选(_A)"
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:194
-#: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:922
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../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:1010
msgid "Select all text"
msgstr "选中所有文字"
-#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2106
msgid "_Classification"
msgstr "分类(_C)"
-#: ../src/calendar/gui/e-comp-editor.c:2069
-#: ../src/e-util/e-html-editor-actions.c:929
-#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
-#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:957
+#: ../src/calendar/gui/e-comp-editor.c:2120
+#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-mail-signature-editor.c:333 ../src/mail/e-mail-browser.c:210
+#: ../src/mail/e-mail-notes.c:1029 ../src/shell/e-shell-window-actions.c:1052
msgid "_File"
msgstr "文件(_F)"
-#: ../src/calendar/gui/e-comp-editor.c:2083
-#: ../src/e-util/e-html-editor-actions.c:950
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/e-util/e-html-editor-actions.c:1144
msgid "_Insert"
msgstr "插入(_I)"
-#: ../src/calendar/gui/e-comp-editor.c:2090
-#: ../src/composer/e-composer-actions.c:371
+#: ../src/calendar/gui/e-comp-editor.c:2141
+#: ../src/composer/e-composer-actions.c:377
msgid "_Options"
msgstr "选项(_O)"
-#: ../src/calendar/gui/e-comp-editor.c:2097
-#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
-#: ../src/shell/e-shell-window-actions.c:1000
-#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/e-util/e-html-editor-actions.c:1165 ../src/mail/e-mail-browser.c:224
+#: ../src/shell/e-shell-window-actions.c:1095
+#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
msgid "_View"
msgstr "查看(_V)"
-#: ../src/calendar/gui/e-comp-editor.c:2109
+#: ../src/calendar/gui/e-comp-editor.c:2160
msgid "Save current changes"
msgstr "保存当前更改"
-#: ../src/calendar/gui/e-comp-editor.c:2114
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
+#: ../src/calendar/gui/e-comp-editor.c:2165
+#: ../src/e-util/e-mail-signature-editor.c:328 ../src/mail/e-mail-notes.c:1024
msgid "Save and Close"
msgstr "保存并关闭"
-#: ../src/calendar/gui/e-comp-editor.c:2116
+#: ../src/calendar/gui/e-comp-editor.c:2167
msgid "Save current changes and close editor"
msgstr "保存当前更改并关闭编辑器"
#. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-week-view.c:1726
-#: ../src/calendar/gui/print.c:1070 ../src/calendar/gui/print.c:1089
-#: ../src/calendar/gui/print.c:2626 ../src/calendar/gui/print.c:2646
+#: ../src/calendar/gui/e-day-view.c:2152 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2663
+#: ../src/calendar/gui/print.c:2683
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-week-view.c:1729
-#: ../src/calendar/gui/print.c:1075 ../src/calendar/gui/print.c:1091
-#: ../src/calendar/gui/print.c:2631 ../src/calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2155 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2668
+#: ../src/calendar/gui/print.c:2685
msgid "pm"
msgstr "下午"
@@ -8386,15 +9046,15 @@ msgstr "下午"
#. * month, %B = full month name. You can change the
#. * order but don't change the specifiers or add
#. * anything.
-#: ../src/calendar/gui/e-day-view.c:3045
-#: ../src/calendar/gui/e-day-view-top-item.c:841
+#: ../src/calendar/gui/e-day-view.c:3046
+#: ../src/calendar/gui/e-day-view-top-item.c:850
#: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2093
+#: ../src/calendar/gui/print.c:2117
msgid "%A %d %B"
msgstr "%B%d日%A"
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3770
+#: ../src/calendar/gui/e-day-view.c:3787
#, c-format
msgid "Week %d"
msgstr "第%d周"
@@ -8405,29 +9065,29 @@ msgstr "第%d周"
#. * day view, e.g. a day is displayed in
#. * 24 "60 minute divisions" or
#. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:804
+#: ../src/calendar/gui/e-day-view-time-item.c:811
#, c-format
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
-#: ../src/calendar/gui/e-day-view-time-item.c:829
+#: ../src/calendar/gui/e-day-view-time-item.c:836
msgid "Show the second time zone"
msgstr "显示第二时区"
#. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:846
-#: ../src/modules/calendar/e-calendar-preferences.c:313
-#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/modules/calendar/e-calendar-preferences.c:310
+#: ../src/modules/calendar/e-calendar-preferences.c:362
#: ../src/modules/calendar/e-calendar-preferences.ui.h:11
msgctxt "cal-second-zone"
msgid "None"
msgstr "无"
-#: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:322
-#: ../src/modules/calendar/e-calendar-preferences.c:396
-msgid "Select..."
-msgstr "选择..."
+#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-timezone-entry.c:346
+#: ../src/modules/calendar/e-calendar-preferences.c:393
+msgid "Select…"
+msgstr "选择…"
#: ../src/calendar/gui/e-meeting-list-view.c:62
msgid "Chair Persons"
@@ -8450,168 +9110,163 @@ msgid "Attendees"
msgstr "出席者"
#: ../src/calendar/gui/e-meeting-list-view.c:179
-#: ../src/calendar/gui/e-meeting-store.c:107
-#: ../src/calendar/gui/e-meeting-store.c:124
-#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
+#: ../src/calendar/gui/e-meeting-store.c:110
+#: ../src/calendar/gui/e-meeting-store.c:127
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../src/calendar/gui/print.c:1261
msgid "Individual"
msgstr "个人"
#: ../src/calendar/gui/e-meeting-list-view.c:180
-#: ../src/calendar/gui/e-meeting-store.c:109
-#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/calendar/gui/e-meeting-store.c:112
+#: ../src/calendar/gui/e-meeting-store.c:129 ../src/calendar/gui/print.c:1262
#: ../src/e-util/e-table-config.ui.h:1
msgid "Group"
msgstr "组"
#: ../src/calendar/gui/e-meeting-list-view.c:181
-#: ../src/calendar/gui/e-meeting-store.c:111
-#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
+#: ../src/calendar/gui/e-meeting-store.c:114
+#: ../src/calendar/gui/e-meeting-store.c:131 ../src/calendar/gui/print.c:1263
msgid "Resource"
msgstr "资源"
#: ../src/calendar/gui/e-meeting-list-view.c:182
-#: ../src/calendar/gui/e-meeting-store.c:113
-#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
+#: ../src/calendar/gui/e-meeting-store.c:116
+#: ../src/calendar/gui/e-meeting-store.c:133 ../src/calendar/gui/print.c:1264
msgid "Room"
msgstr "房间"
#: ../src/calendar/gui/e-meeting-list-view.c:193
-#: ../src/calendar/gui/e-meeting-store.c:142
-#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
+#: ../src/calendar/gui/e-meeting-store.c:145
+#: ../src/calendar/gui/e-meeting-store.c:162 ../src/calendar/gui/print.c:1278
msgid "Chair"
msgstr "主席"
#: ../src/calendar/gui/e-meeting-list-view.c:194
-#: ../src/calendar/gui/e-meeting-store.c:144
-#: ../src/calendar/gui/e-meeting-store.c:161
-#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:147
+#: ../src/calendar/gui/e-meeting-store.c:164
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../src/calendar/gui/print.c:1279
msgid "Required Participant"
msgstr "必需的出席者"
#: ../src/calendar/gui/e-meeting-list-view.c:195
-#: ../src/calendar/gui/e-meeting-store.c:146
-#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-store.c:149
+#: ../src/calendar/gui/e-meeting-store.c:166 ../src/calendar/gui/print.c:1280
msgid "Optional Participant"
msgstr "可选的出席者"
#: ../src/calendar/gui/e-meeting-list-view.c:196
-#: ../src/calendar/gui/e-meeting-store.c:148
-#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-store.c:151
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1281
msgid "Non-Participant"
msgstr "不参加"
-#: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:192
-#: ../src/calendar/gui/e-meeting-store.c:215
-#: ../src/calendar/gui/e-meeting-store.c:1028
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:1079
msgid "Needs Action"
msgstr "需要动作"
-#: ../src/calendar/gui/e-meeting-list-view.c:618
-msgid "Attendee "
-msgstr "出席者 "
-
-#: ../src/calendar/gui/e-meeting-list-view.c:644
-#: ../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-attachment-tree-view.c:205
-#: ../src/mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "类型"
-
#. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-list-view.c:678
#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
msgid "RSVP"
msgstr "请回复"
-#: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/calendar/gui/e-meeting-store.c:227
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:210
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "已完成"
+
+#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-meeting-store.c:212
msgid "In Process"
msgstr "处理中"
-#: ../src/calendar/gui/e-meeting-store.c:1899
+#: ../src/calendar/gui/e-meeting-store.c:2003
#, 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:1909
+#: ../src/calendar/gui/e-meeting-store.c:2013
#, c-format
msgid "Failure reason: %s"
msgstr "失败原因：%s"
-#: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/plugins/publish-calendar/publish-calendar.c:349
+#: ../src/calendar/gui/e-meeting-store.c:2018
+#: ../src/e-util/e-collection-account-wizard.c:493
+#: ../src/plugins/publish-calendar/publish-calendar.c:350
#: ../src/smime/gui/component.c:61
msgid "Enter password"
msgstr "输入密码"
-#: ../src/calendar/gui/e-meeting-time-sel.c:535
+#: ../src/calendar/gui/e-meeting-time-sel.c:525
msgid "Out of Office"
msgstr "办公室以外"
-#: ../src/calendar/gui/e-meeting-time-sel.c:537
+#: ../src/calendar/gui/e-meeting-time-sel.c:527
msgid "No Information"
msgstr "没有信息"
-#: ../src/calendar/gui/e-meeting-time-sel.c:553
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
+#: ../src/calendar/gui/e-meeting-time-sel.c:543
+msgid "Atte_ndees…"
+msgstr "出席者(_N)…"
-#: ../src/calendar/gui/e-meeting-time-sel.c:572
+#: ../src/calendar/gui/e-meeting-time-sel.c:562
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:593
+#: ../src/calendar/gui/e-meeting-time-sel.c:583
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:606
+#: ../src/calendar/gui/e-meeting-time-sel.c:596
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:624
+#: ../src/calendar/gui/e-meeting-time-sel.c:614
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:641
+#: ../src/calendar/gui/e-meeting-time-sel.c:631
msgid "_<<"
msgstr "_<<"
-#: ../src/calendar/gui/e-meeting-time-sel.c:661
+#: ../src/calendar/gui/e-meeting-time-sel.c:651
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:678
+#: ../src/calendar/gui/e-meeting-time-sel.c:668
msgid ">_>"
msgstr ">_>"
-#: ../src/calendar/gui/e-meeting-time-sel.c:700
+#: ../src/calendar/gui/e-meeting-time-sel.c:690
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:711
+#: ../src/calendar/gui/e-meeting-time-sel.c:701
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:722
+#: ../src/calendar/gui/e-meeting-time-sel.c:712
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:732
+#: ../src/calendar/gui/e-meeting-time-sel.c:722
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../src/calendar/gui/e-meeting-time-sel.c:771
+#: ../src/calendar/gui/e-meeting-time-sel.c:761
msgid "_Start time:"
msgstr "开始时间(_S)："
-#: ../src/calendar/gui/e-meeting-time-sel.c:800
+#: ../src/calendar/gui/e-meeting-time-sel.c:790
msgid "_End time:"
msgstr "结束时间(_E)："
-#: ../src/calendar/gui/e-meeting-time-sel.c:2721
+#: ../src/calendar/gui/e-meeting-time-sel.c:2576
#, c-format
msgid ""
"Summary: %s\n"
@@ -8620,8 +9275,8 @@ msgstr ""
"简要：%s\n"
"位置：%s"
-#: ../src/calendar/gui/e-meeting-time-sel.c:2723
-#: ../src/calendar/gui/print.c:3520
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578
+#: ../src/calendar/gui/print.c:3616
#, c-format
msgid "Summary: %s"
msgstr "概要：%s"
@@ -8650,41 +9305,41 @@ msgstr "通用名"
msgid "Language"
msgstr "语言"
-#: ../src/calendar/gui/e-memo-table.c:455
-#: ../src/calendar/gui/e-task-table.c:781
+#: ../src/calendar/gui/e-memo-table.c:535
+#: ../src/calendar/gui/e-task-table.c:700
msgid "* No Summary *"
msgstr "* 没有概要 *"
#. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:540
-#: ../src/calendar/gui/e-task-table.c:863
+#: ../src/calendar/gui/e-memo-table.c:622
+#: ../src/calendar/gui/e-task-table.c:801
msgid "Start: "
msgstr "开始："
#. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:560
-#: ../src/calendar/gui/e-task-table.c:882
+#: ../src/calendar/gui/e-memo-table.c:642
+#: ../src/calendar/gui/e-task-table.c:834
msgid "Due: "
msgstr "到期："
-#: ../src/calendar/gui/e-memo-table.c:745
+#: ../src/calendar/gui/e-memo-table.c:850
msgid "Cut selected memos to the clipboard"
msgstr "将选中备忘剪切到剪贴板"
-#: ../src/calendar/gui/e-memo-table.c:751
+#: ../src/calendar/gui/e-memo-table.c:856
msgid "Copy selected memos to the clipboard"
msgstr "将选中备忘复制到剪贴板"
-#: ../src/calendar/gui/e-memo-table.c:757
+#: ../src/calendar/gui/e-memo-table.c:862
msgid "Paste memos from the clipboard"
msgstr "从剪贴板中粘贴备忘"
-#: ../src/calendar/gui/e-memo-table.c:763
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
+#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
msgid "Delete selected memos"
msgstr "删除选中的备忘"
-#: ../src/calendar/gui/e-memo-table.c:769
+#: ../src/calendar/gui/e-memo-table.c:874
msgid "Select all visible memos"
msgstr "选中所有可见的备忘"
@@ -8692,7 +9347,7 @@ msgstr "选中所有可见的备忘"
msgid "Click to add a memo"
msgstr "单击以添加备忘"
-#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/e-task-table.c:474
#: ../src/calendar/gui/tasktypes.xml.in.h:22
#: ../src/e-util/e-send-options.ui.h:1
msgid "Undefined"
@@ -8702,29 +9357,29 @@ msgstr "未定义"
#. * %d is the actual value, %% is replaced with a percent sign.
#. * Result values will be 0%, 10%, 20%, ... 100%
#.
-#: ../src/calendar/gui/e-task-table.c:579
+#: ../src/calendar/gui/e-task-table.c:502
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: ../src/calendar/gui/e-task-table.c:1084
+#: ../src/calendar/gui/e-task-table.c:1072
msgid "Cut selected tasks to the clipboard"
msgstr "将选中任务剪切到剪贴板"
-#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/calendar/gui/e-task-table.c:1078
msgid "Copy selected tasks to the clipboard"
msgstr "将选中任务复制到剪贴板"
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1084
msgid "Paste tasks from the clipboard"
msgstr "从剪贴板中粘贴任务"
-#: ../src/calendar/gui/e-task-table.c:1102
-#: ../src/modules/calendar/e-task-shell-view-actions.c:684
+#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/modules/calendar/e-task-shell-view-actions.c:698
msgid "Delete selected tasks"
msgstr "删除选中的任务"
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1096
msgid "Select all visible tasks"
msgstr "选中所有可见的任务"
@@ -8740,7 +9395,8 @@ msgstr "开始日期"
msgid "Completion date"
msgstr "完成日期"
-#: ../src/calendar/gui/e-task-table.etspec.h:6 ../src/mail/mail-send-recv.c:968
+#: ../src/calendar/gui/e-task-table.etspec.h:6
+#: ../src/mail/mail-send-recv.c:1145
msgid "Complete"
msgstr "完成"
@@ -8755,48 +9411,143 @@ msgstr "% 完成"
#: ../src/calendar/gui/e-task-table.etspec.h:10
#: ../src/calendar/gui/tasktypes.xml.in.h:18
-#: ../src/plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:373
msgid "Priority"
msgstr "优先级"
-#: ../src/calendar/gui/e-timezone-entry.c:333
+#. Translators: 'None' for a time zone, like 'No time zone being set'
+#: ../src/calendar/gui/e-timezone-entry.c:92
+#: ../src/e-util/e-timezone-dialog.c:55
+msgctxt "timezone"
+msgid "None"
+msgstr "无"
+
+#: ../src/calendar/gui/e-timezone-entry.c:357
msgid "Select Timezone"
msgstr "选择时区"
+#. Translators: It will display "Start: StartDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:406
+#, c-format
+msgid "Start: %s"
+msgstr "开始：%s"
+
+#. Translators: It will display "Due: DueDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:428
+#, c-format
+msgid "Due: %s"
+msgstr "截止：%s"
+
+#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
+#: ../src/calendar/gui/e-to-do-pane.c:442
+#, c-format
+msgid "Completed: %s"
+msgstr "完成：%s"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:207
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
+#: ../src/modules/itip-formatter/itip-view.c:259
+msgid "Today"
+msgstr "今天"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1578
+#: ../src/e-util/e-datetime-format.c:218
+#: ../src/modules/itip-formatter/itip-view.c:287
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1588
+msgid "Tasks without Due date"
+msgstr "无到期日期的任务"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+msgid "New _Appointment…"
+msgstr "新建约会(_A)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2173
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+msgid "New _Meeting…"
+msgstr "新会议(_M)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2181
+msgid "New _Task…"
+msgstr "新建任务(_T)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2189
+msgid "_New Assigned Task…"
+msgstr "新分配的任务(_N)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2202
+msgid "_Open…"
+msgstr "打开(_O)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2216
+msgid "_Delete This Instance…"
+msgstr "删除此实例(_D)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2224
+msgid "D_elete All Instances…"
+msgstr "删除所有实例(_E)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2232
+msgid "_Delete…"
+msgstr "删除(_D)…"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2249
+msgid "_Show Tasks without Due date"
+msgstr "显示无到期日期的人物(_S)"
+
+#: ../src/calendar/gui/e-to-do-pane.c:2515
+msgid "To Do"
+msgstr "待办"
+
+#. Translators: the first '%s' is replaced with a component summary;
+#. the second '%s' is replaced with an event location.
+#. Example: "Meet John Doe (Central Park)"
+#: ../src/calendar/gui/e-week-view.c:3703
+#, c-format
+msgctxt "SummaryWithLocation"
+msgid "%s (%s)"
+msgstr "%s（%s）"
+
#. strftime format %d = day of month, %B = full
#. * 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:222
-#: ../src/calendar/gui/print.c:2072
+#: ../src/calendar/gui/print.c:2096
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../src/calendar/gui/itip-utils.c:789 ../src/calendar/gui/itip-utils.c:851
-#: ../src/calendar/gui/itip-utils.c:985
+#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
+#: ../src/calendar/gui/itip-utils.c:1010
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../src/calendar/gui/itip-utils.c:842
+#: ../src/calendar/gui/itip-utils.c:851
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
msgid "Event information"
msgstr "事件信息"
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
msgid "Task information"
msgstr "任务信息"
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1240
+#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
msgid "Memo information"
msgstr "备忘信息"
-#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1258
+#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../src/calendar/gui/itip-utils.c:1085
+#: ../src/calendar/gui/itip-utils.c:1120
msgid "Calendar information"
msgstr "日历信息"
@@ -8804,7 +9555,7 @@ msgstr "日历信息"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1122
+#: ../src/calendar/gui/itip-utils.c:1160
msgctxt "Meeting"
msgid "Accepted"
msgstr "接受"
@@ -8813,7 +9564,7 @@ msgstr "接受"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1129
+#: ../src/calendar/gui/itip-utils.c:1167
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -8825,7 +9576,7 @@ msgstr "暂时接受"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1136 ../src/calendar/gui/itip-utils.c:1184
+#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
msgctxt "Meeting"
msgid "Declined"
msgstr "拒绝"
@@ -8834,7 +9585,7 @@ msgstr "拒绝"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1143
+#: ../src/calendar/gui/itip-utils.c:1181
msgctxt "Meeting"
msgid "Delegated"
msgstr "被委任的"
@@ -8842,7 +9593,7 @@ msgstr "被委任的"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1156
+#: ../src/calendar/gui/itip-utils.c:1194
msgctxt "Meeting"
msgid "Updated"
msgstr "更新"
@@ -8850,7 +9601,7 @@ msgstr "更新"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1163
+#: ../src/calendar/gui/itip-utils.c:1201
msgctxt "Meeting"
msgid "Cancel"
msgstr "取消"
@@ -8858,7 +9609,7 @@ msgstr "取消"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1170
+#: ../src/calendar/gui/itip-utils.c:1208
msgctxt "Meeting"
msgid "Refresh"
msgstr "刷新"
@@ -8866,284 +9617,195 @@ msgstr "刷新"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1177
+#: ../src/calendar/gui/itip-utils.c:1215
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1295
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../src/calendar/gui/itip-utils.c:1263
+#: ../src/calendar/gui/itip-utils.c:1303
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../src/calendar/gui/itip-utils.c:1292
+#: ../src/calendar/gui/itip-utils.c:1332
#, c-format
msgid "Unable to book a resource, the new event collides with some other."
msgstr "无法预约资源，新事件与其它事件冲突。"
-#: ../src/calendar/gui/itip-utils.c:1297
+#: ../src/calendar/gui/itip-utils.c:1337
msgid "Unable to book a resource, error: "
msgstr "无法预约资源，错误："
-#: ../src/calendar/gui/itip-utils.c:1468
+#: ../src/calendar/gui/itip-utils.c:1530
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../src/calendar/gui/itip-utils.c:2149
+#: ../src/calendar/gui/itip-utils.c:2312
msgid "Sending an event"
msgstr "正在发送事件"
-#: ../src/calendar/gui/itip-utils.c:2153
+#: ../src/calendar/gui/itip-utils.c:2316
msgid "Sending a memo"
msgstr "正在发送备忘"
-#: ../src/calendar/gui/itip-utils.c:2157
+#: ../src/calendar/gui/itip-utils.c:2320
msgid "Sending a task"
msgstr "正在发送任务"
-#: ../src/calendar/gui/print.c:661
-msgid "1st"
-msgstr "1日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "2nd"
-msgstr "2日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "3rd"
-msgstr "3日"
-
-#: ../src/calendar/gui/print.c:661
-msgid "4th"
-msgstr "4日"
+#. Translator: This is used as a placeholder when an event doesn't have set a location
+#: ../src/calendar/gui/itip-utils.c:2572
+msgctxt "Location"
+msgid "Unspecified"
+msgstr "未指定"
-#: ../src/calendar/gui/print.c:661
-msgid "5th"
-msgstr "5日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "6th"
-msgstr "6日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "7th"
-msgstr "7日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "8th"
-msgstr "8日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "9th"
-msgstr "9日"
-
-#: ../src/calendar/gui/print.c:662
-msgid "10th"
-msgstr "10日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "11th"
-msgstr "11日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "12th"
-msgstr "12日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "13th"
-msgstr "13日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "14th"
-msgstr "14日"
-
-#: ../src/calendar/gui/print.c:663
-msgid "15th"
-msgstr "15日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "16th"
-msgstr "16日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "17th"
-msgstr "17日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "18th"
-msgstr "18日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "19th"
-msgstr "19日"
-
-#: ../src/calendar/gui/print.c:664
-msgid "20th"
-msgstr "20日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "21st"
-msgstr "21日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "22nd"
-msgstr "22日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "23rd"
-msgstr "23日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "24th"
-msgstr "24日"
-
-#: ../src/calendar/gui/print.c:665
-msgid "25th"
-msgstr "25日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "26th"
-msgstr "26日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "27th"
-msgstr "27日"
-
-#: ../src/calendar/gui/print.c:666
-msgid "28th"
-msgstr "28日"
+#: ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d 天"
-#: ../src/calendar/gui/print.c:666
-msgid "29th"
-msgstr "29日"
+#: ../src/calendar/gui/misc.c:101
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d 小时"
-#: ../src/calendar/gui/print.c:666
-msgid "30th"
-msgstr "30日"
+#: ../src/calendar/gui/misc.c:107
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d 分钟"
-#: ../src/calendar/gui/print.c:667
-msgid "31st"
-msgstr "31日"
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/gui/misc.c:111
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d 秒"
#. G_DATE_BAD_WEEKDAY
#. Translators: These are workday abbreviations,
#. * e.g. Su=Sunday and Th=thursday
#. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:730
msgid "Mo"
msgstr "一"
#. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:728
+#: ../src/calendar/gui/print.c:731
msgid "Tu"
msgstr "二"
#. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:732
msgid "We"
msgstr "三"
#. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:733
msgid "Th"
msgstr "四"
#. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:734
msgid "Fr"
msgstr "五"
#. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:735
msgid "Sa"
msgstr "六"
#. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:736
msgid "Su"
msgstr "日"
#. Translators: This is part of "START to END" text,
#. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3313
+#: ../src/calendar/gui/print.c:3408
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:3323
+#: ../src/calendar/gui/print.c:3418
msgid " (Completed "
msgstr " (完成 "
#. Translators: This is part of "Completed COMPLETED",
#. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3329
+#: ../src/calendar/gui/print.c:3424
msgid "Completed "
msgstr "已完成 "
#. Translators: This is part of "START (Due DUE)",
#. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3339
+#: ../src/calendar/gui/print.c:3434
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:3346
+#: ../src/calendar/gui/print.c:3441
msgid "Due "
msgstr "预定 "
-#: ../src/calendar/gui/print.c:3490
+#: ../src/calendar/gui/print.c:3586
msgid "Appointment"
msgstr "约会"
-#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3588 ../src/e-util/e-send-options.c:551
msgid "Task"
msgstr "任务"
-#: ../src/calendar/gui/print.c:3494
+#: ../src/calendar/gui/print.c:3590
msgid "Memo"
msgstr "备忘"
-#: ../src/calendar/gui/print.c:3550
+#: ../src/calendar/gui/print.c:3647
msgid "Attendees: "
msgstr "出席者："
-#: ../src/calendar/gui/print.c:3594
+#: ../src/calendar/gui/print.c:3676
#, c-format
msgid "Status: %s"
msgstr "状态：%s"
-#: ../src/calendar/gui/print.c:3610
+#: ../src/calendar/gui/print.c:3692
#, c-format
msgid "Priority: %s"
msgstr "优先级：%s"
-#: ../src/calendar/gui/print.c:3628
+#: ../src/calendar/gui/print.c:3707
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率：%i"
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3722
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3738
#, c-format
msgid "Categories: %s"
msgstr "类别：%s"
-#: ../src/calendar/gui/print.c:3667
+#: ../src/calendar/gui/print.c:3750
msgid "Contacts: "
msgstr "联系人："
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "未开始"
+
#: ../src/calendar/gui/tasktypes.xml.in.h:12
msgid "In progress"
msgstr "进行中"
@@ -9169,204 +9831,208 @@ msgstr "小于"
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: ../src/calendar/importers/icalendar-importer.c:306
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
+#: ../src/calendar/importers/icalendar-importer.c:327
+#: ../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-shell-view-actions.c:180
msgid "New Calendar"
msgstr "新建日历"
-#: ../src/calendar/importers/icalendar-importer.c:309
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:189
-#: ../src/modules/calendar/e-task-shell-view-actions.c:202
+#: ../src/calendar/importers/icalendar-importer.c:330
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
+#: ../src/modules/calendar/e-task-shell-view-actions.c:204
msgid "New Task List"
msgstr "新建任务列表"
-#: ../src/calendar/importers/icalendar-importer.c:351
+#: ../src/calendar/importers/icalendar-importer.c:372
msgid "Cre_ate new calendar"
msgstr "创建新日历(_A)"
-#: ../src/calendar/importers/icalendar-importer.c:355
+#: ../src/calendar/importers/icalendar-importer.c:376
msgid "Cre_ate new task list"
msgstr "创建新任务列表(_A)"
-#: ../src/calendar/importers/icalendar-importer.c:501
-#: ../src/calendar/importers/icalendar-importer.c:944
+#: ../src/calendar/importers/icalendar-importer.c:521
+#: ../src/calendar/importers/icalendar-importer.c:971
msgid "Opening calendar"
msgstr "打开日历"
-#: ../src/calendar/importers/icalendar-importer.c:652
+#: ../src/calendar/importers/icalendar-importer.c:668
msgid "iCalendar files (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../src/calendar/importers/icalendar-importer.c:653
+#: ../src/calendar/importers/icalendar-importer.c:669
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
-#: ../src/calendar/importers/icalendar-importer.c:745
+#: ../src/calendar/importers/icalendar-importer.c:764
msgid "Reminder!"
-msgstr "提醒!!"
+msgstr "提醒！"
-#: ../src/calendar/importers/icalendar-importer.c:830
+#: ../src/calendar/importers/icalendar-importer.c:859
msgid "vCalendar files (.vcs)"
msgstr "vCalendar 文件(.vcs)"
-#: ../src/calendar/importers/icalendar-importer.c:831
+#: ../src/calendar/importers/icalendar-importer.c:860
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导入器"
-#: ../src/calendar/importers/icalendar-importer.c:1107
+#: ../src/calendar/importers/icalendar-importer.c:1134
msgid "Calendar Events"
msgstr "日历事件"
-#: ../src/calendar/importers/icalendar-importer.c:1150
+#: ../src/calendar/importers/icalendar-importer.c:1177
msgid "GNOME Calendar"
msgstr "GNOME 日历"
-#: ../src/calendar/importers/icalendar-importer.c:1151
+#: ../src/calendar/importers/icalendar-importer.c:1178
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution 日历智能导入器"
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
msgctxt "iCalImp"
msgid "Meeting"
msgstr "会议"
-#: ../src/calendar/importers/icalendar-importer.c:1222
-#: ../src/calendar/importers/icalendar-importer.c:1536
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
msgctxt "iCalImp"
msgid "Event"
msgstr "事件"
-#: ../src/calendar/importers/icalendar-importer.c:1225
-#: ../src/calendar/importers/icalendar-importer.c:1537
+#: ../src/calendar/importers/icalendar-importer.c:1257
+#: ../src/calendar/importers/icalendar-importer.c:1583
msgctxt "iCalImp"
msgid "Task"
msgstr "任务"
-#: ../src/calendar/importers/icalendar-importer.c:1228
-#: ../src/calendar/importers/icalendar-importer.c:1538
+#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1584
msgctxt "iCalImp"
msgid "Memo"
msgstr "备忘"
-#: ../src/calendar/importers/icalendar-importer.c:1237
+#. have ? NULL :
+#: ../src/calendar/importers/icalendar-importer.c:1269
msgctxt "iCalImp"
msgid "has recurrences"
msgstr "有再现"
-#: ../src/calendar/importers/icalendar-importer.c:1242
+#: ../src/calendar/importers/icalendar-importer.c:1274
msgctxt "iCalImp"
msgid "is an instance"
msgstr "本次和以前各次"
-#: ../src/calendar/importers/icalendar-importer.c:1247
+#: ../src/calendar/importers/icalendar-importer.c:1279
msgctxt "iCalImp"
msgid "has reminders"
msgstr "有提醒"
-#: ../src/calendar/importers/icalendar-importer.c:1252
+#: ../src/calendar/importers/icalendar-importer.c:1284
msgctxt "iCalImp"
msgid "has attachments"
msgstr "有附件"
#. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1265
+#: ../src/calendar/importers/icalendar-importer.c:1296
msgctxt "iCalImp"
msgid "Public"
msgstr "公开"
#. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1268
+#: ../src/calendar/importers/icalendar-importer.c:1299
msgctxt "iCalImp"
msgid "Private"
msgstr "保密"
#. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1271
+#: ../src/calendar/importers/icalendar-importer.c:1302
msgctxt "iCalImp"
msgid "Confidential"
msgstr "机密"
#. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1275
+#: ../src/calendar/importers/icalendar-importer.c:1306
msgctxt "iCalImp"
msgid "Classification"
msgstr "分类"
#. Translators: Appointment's summary
#. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1280
-#: ../src/calendar/importers/icalendar-importer.c:1580
+#: ../src/calendar/importers/icalendar-importer.c:1311
+#: ../src/calendar/importers/icalendar-importer.c:1627
msgctxt "iCalImp"
msgid "Summary"
msgstr "概要"
#. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1286
+#: ../src/calendar/importers/icalendar-importer.c:1318
msgctxt "iCalImp"
msgid "Location"
msgstr "位置"
#. Translators: Appointment's start time
#. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1294
-#: ../src/calendar/importers/icalendar-importer.c:1575
+#: ../src/calendar/importers/icalendar-importer.c:1326
+#: ../src/calendar/importers/icalendar-importer.c:1622
msgctxt "iCalImp"
msgid "Start"
msgstr "开始"
#. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1305
+#: ../src/calendar/importers/icalendar-importer.c:1336
msgctxt "iCalImp"
msgid "Due"
msgstr "到期"
#. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1317
+#: ../src/calendar/importers/icalendar-importer.c:1347
msgctxt "iCalImp"
msgid "End"
msgstr "结束"
#. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1327
+#: ../src/calendar/importers/icalendar-importer.c:1356
msgctxt "iCalImp"
msgid "Categories"
msgstr "类别"
#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1351
+#: ../src/calendar/importers/icalendar-importer.c:1381
msgctxt "iCalImp"
msgid "Completed"
msgstr "已完成"
#. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1359
+#: ../src/calendar/importers/icalendar-importer.c:1388
msgctxt "iCalImp"
msgid "URL"
msgstr "URL"
#. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1370
-#: ../src/calendar/importers/icalendar-importer.c:1373
+#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1408
msgctxt "iCalImp"
msgid "Organizer"
msgstr "组织者"
#. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1393
-#: ../src/calendar/importers/icalendar-importer.c:1396
+#: ../src/calendar/importers/icalendar-importer.c:1437
+#: ../src/calendar/importers/icalendar-importer.c:1440
msgctxt "iCalImp"
msgid "Attendees"
msgstr "出席者"
-#: ../src/calendar/importers/icalendar-importer.c:1410
+#: ../src/calendar/importers/icalendar-importer.c:1456
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:1570
+#: ../src/calendar/importers/icalendar-importer.c:1617
msgctxt "iCalImp"
msgid "Type"
msgstr "类型"
@@ -9636,7 +10302,7 @@ msgstr "美洲/巴巴多斯"
#: ../src/calendar/zones.h:85
msgid "America/Belem"
-msgstr "美洲/Belem"
+msgstr "美洲/贝伦"
#: ../src/calendar/zones.h:86
msgid "America/Belize"
@@ -9672,7 +10338,7 @@ msgstr "美洲/加拉加斯"
#: ../src/calendar/zones.h:94
msgid "America/Catamarca"
-msgstr "美洲/Catamarca"
+msgstr "美洲/卡塔马卡"
#: ../src/calendar/zones.h:95
msgid "America/Cayenne"
@@ -10424,7 +11090,7 @@ msgstr "亚洲/雅库茨克"
#: ../src/calendar/zones.h:282
msgid "Asia/Yekaterinburg"
-msgstr "亚洲/Yekaterinburg"
+msgstr "亚洲/叶卡捷琳堡"
#: ../src/calendar/zones.h:283
msgid "Asia/Yerevan"
@@ -10712,7 +11378,7 @@ msgstr "欧洲/萨格勒布"
#: ../src/calendar/zones.h:354
msgid "Europe/Zaporozhye"
-msgstr "欧洲/Zaporozhye"
+msgstr "欧洲/扎波罗热"
#: ../src/calendar/zones.h:355
msgid "Europe/Zurich"
@@ -10864,7 +11530,7 @@ msgstr "太平洋/努美阿"
#: ../src/calendar/zones.h:392
msgid "Pacific/Pago_Pago"
-msgstr "太平洋/帕果_帕果"
+msgstr "太平洋/帕果帕果"
#: ../src/calendar/zones.h:393
msgid "Pacific/Palau"
@@ -10918,171 +11584,178 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../src/composer/e-composer-actions.c:225
-msgid "Save as..."
-msgstr "另存为..."
+#: ../src/composer/e-composer-actions.c:240
+msgid "Save as…"
+msgstr "另存为…"
-#: ../src/composer/e-composer-actions.c:329
+#: ../src/composer/e-composer-actions.c:335
msgid "Close the current file"
msgstr "关闭当前文件"
-#: ../src/composer/e-composer-actions.c:334
+#: ../src/composer/e-composer-actions.c:340
msgid "New _Message"
msgstr "新建信息(_M)"
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:342
msgid "Open New Message window"
msgstr "打开新建信息窗口"
-#: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/composer/e-composer-actions.c:347
+#: ../src/shell/e-shell-window-actions.c:952
msgid "_Preferences"
msgstr "首选项(_P)"
-#: ../src/composer/e-composer-actions.c:343
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/composer/e-composer-actions.c:349
+#: ../src/shell/e-shell-window-actions.c:954
msgid "Configure Evolution"
msgstr "配置 Evolution"
-#: ../src/composer/e-composer-actions.c:350
+#: ../src/composer/e-composer-actions.c:356
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../src/composer/e-composer-actions.c:355
-msgid "Save _As..."
-msgstr "另存为(_A)..."
+#: ../src/composer/e-composer-actions.c:361
+msgid "Save _As…"
+msgstr "另存为(_A)…"
-#: ../src/composer/e-composer-actions.c:357
+#: ../src/composer/e-composer-actions.c:363
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
-#: ../src/composer/e-composer-actions.c:364
+#: ../src/composer/e-composer-actions.c:370
msgid "Character _Encoding"
msgstr "字符编码(_E)"
-#: ../src/composer/e-composer-actions.c:388
+#: ../src/composer/e-composer-actions.c:394
msgid "Print Pre_view"
msgstr "打印预览(_V)"
-#: ../src/composer/e-composer-actions.c:395
+#: ../src/composer/e-composer-actions.c:401
msgid "Save as _Draft"
msgstr "另存为草稿(_D)"
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:403
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../src/composer/e-composer-actions.c:402
+#: ../src/composer/e-composer-actions.c:408
msgid "S_end"
msgstr "发送(_E)"
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:410
msgid "Send this message"
msgstr "发送这条信息"
-#: ../src/composer/e-composer-actions.c:412
+#: ../src/composer/e-composer-actions.c:418
msgid "PGP _Encrypt"
msgstr "PGP 加密(_E)"
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:420
msgid "Encrypt this message with PGP"
msgstr "用 PGP 加密该信息"
-#: ../src/composer/e-composer-actions.c:420
+#: ../src/composer/e-composer-actions.c:426
msgid "PGP _Sign"
msgstr "PGP 签名(_S)"
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:428
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该信息"
-#: ../src/composer/e-composer-actions.c:428
+#: ../src/composer/e-composer-actions.c:434
msgid "_Picture Gallery"
msgstr "图片画廊(_P)"
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:436
msgid "Show a collection of pictures that you can drag to your message"
msgstr "显示一组图片，您可以将它们拖放到您的信息中"
-#: ../src/composer/e-composer-actions.c:436
+#: ../src/composer/e-composer-actions.c:442
msgid "_Prioritize Message"
msgstr "标为优先(_P)"
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:444
msgid "Set the message priority to high"
msgstr "将信息设定为高优先级"
-#: ../src/composer/e-composer-actions.c:444
+#: ../src/composer/e-composer-actions.c:450
msgid "Re_quest Read Receipt"
msgstr "请求已读回执(_Q)"
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:452
msgid "Get delivery notification when your message is read"
msgstr "当您的信息被阅读时得到投递通知"
-#: ../src/composer/e-composer-actions.c:452
+#: ../src/composer/e-composer-actions.c:458
msgid "S/MIME En_crypt"
msgstr "S/MIME 加密(_C)"
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:460
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "用您的 S/MIME 加密证书加密该信息"
-#: ../src/composer/e-composer-actions.c:460
+#: ../src/composer/e-composer-actions.c:466
msgid "S/MIME Sig_n"
msgstr "S/MIME 签名(_N)"
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:468
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该信息"
-#: ../src/composer/e-composer-actions.c:516
+#: ../src/composer/e-composer-actions.c:522
msgid "_Bcc Field"
msgstr "密件抄送域(_B)"
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:524
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示密件抄送域"
-#: ../src/composer/e-composer-actions.c:524
+#: ../src/composer/e-composer-actions.c:530
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:532
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示抄送域"
-#: ../src/composer/e-composer-actions.c:532
+#: ../src/composer/e-composer-actions.c:538
msgid "_From Override Field"
msgstr "发件人覆盖字段(_F)"
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:540
msgid ""
"Toggles whether the From override field to change name or email address is "
"displayed"
msgstr "切换发件人覆盖字段是否改变姓名或电子邮件的显示"
-#: ../src/composer/e-composer-actions.c:540
+#: ../src/composer/e-composer-actions.c:546
msgid "_Reply-To Field"
msgstr "回复至域(_R)"
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:548
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../src/composer/e-composer-actions.c:597
+#: ../src/composer/e-composer-actions.c:554
+msgid "Visually _Wrap Long Lines"
+msgstr "对长行视觉上折行(_W)"
+
+#: ../src/composer/e-composer-actions.c:611
msgid "Attach"
msgstr "附件"
-#: ../src/composer/e-composer-actions.c:603
+#: ../src/composer/e-composer-actions.c:617
msgid "Save Draft"
msgstr "保存草稿"
#: ../src/composer/e-composer-from-header.c:108
+#: ../src/e-util/e-collection-account-wizard.c:2033
#: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/e-webdav-browser.c:2398
#: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:553
-#: ../src/mail/e-mail-config-summary-page.c:333
+#: ../src/mail/e-mail-config-identity-page.c:551
+#: ../src/mail/e-mail-config-summary-page.c:334
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:297
msgid "_Name:"
msgstr "名称(_N)："
@@ -11129,11 +11802,11 @@ msgid "S_ubject:"
msgstr "主题(_U)："
#: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:746
+#: ../src/mail/e-mail-config-identity-page.c:744
msgid "Si_gnature:"
msgstr "签名(_G)："
-#: ../src/composer/e-composer-name-header.c:231
+#: ../src/composer/e-composer-name-header.c:237
msgid "Click here for the address book"
msgstr "单击此处以使用地址簿"
@@ -11141,24 +11814,48 @@ msgstr "单击此处以使用地址簿"
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../src/composer/e-msg-composer.c:859
+#: ../src/composer/e-msg-composer.c:1036
#, c-format
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信息签名：未对此帐号设置签名证书"
-#: ../src/composer/e-msg-composer.c:868
+#: ../src/composer/e-msg-composer.c:1045
#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信息加密：未对此帐号设置加密证书"
-#: ../src/composer/e-msg-composer.c:1606 ../src/composer/e-msg-composer.c:2412
+#: ../src/composer/e-msg-composer.c:1818 ../src/composer/e-msg-composer.c:2492
msgid "Compose Message"
msgstr "新建消息"
-#: ../src/composer/e-msg-composer.c:4767
+#: ../src/composer/e-msg-composer.c:4362
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:352
+#, fuzzy
+#| msgid "Loading Remote Content"
+msgid "Reading text content…"
+msgstr "加载远程内容"
+
+#: ../src/composer/e-msg-composer.c:5172
+#, fuzzy
+#| msgid "Remove attachments"
+msgid "Review attachment before sending."
+msgid_plural "Review attachments before sending."
+msgstr[0] "移除附件"
+
+#: ../src/composer/e-msg-composer.c:5177
+#, c-format
+msgid ""
+"There had been added %d attachment. Make sure it does not contain any "
+"sensitive information before sending the message."
+msgid_plural ""
+"There had been added %d attachments. Make sure they do not contain any "
+"sensitive information before sending the message."
+msgstr[0] ""
+
+#: ../src/composer/e-msg-composer.c:5310
msgid "The composer contains a non-text message body, which cannot be edited."
msgstr "编写器含有不可编辑的非文本信体。"
@@ -11205,18 +11902,24 @@ msgid "_Recover"
msgstr "恢复(_R)"
#: ../src/composer/mail-composer.error.xml.h:9
-#, fuzzy
-#| msgid "Could not save to autosave file "{0}"."
+msgid "Do you want to recover last saved version of the message?"
+msgstr "您是否想要恢复该信息的上一个已保存的版本？"
+
+#: ../src/composer/mail-composer.error.xml.h:10
+msgid ""
+"Recovering the message will allow you to continue where it had been saved "
+"the last time."
+msgstr ""
+
+#: ../src/composer/mail-composer.error.xml.h:11
msgid "Could not save to autosave file “{0}”."
msgstr "无法保存到自动保存文件“{0}”。"
-#: ../src/composer/mail-composer.error.xml.h:10
-#, fuzzy
-#| msgid "Error saving to autosave because "{1}"."
+#: ../src/composer/mail-composer.error.xml.h:12
msgid "Error saving to autosave because “{1}”."
-msgstr "保存到自动保存出错，原因是“{1}”。"
+msgstr "保存到自动保存出错，原因为“{1}”。"
-#: ../src/composer/mail-composer.error.xml.h:11
+#: ../src/composer/mail-composer.error.xml.h:13
#, fuzzy
#| msgid ""
#| "Are you sure you want to discard the message, titled '{0}', you are "
@@ -11226,7 +11929,7 @@ msgid ""
"composing?"
msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信息吗？"
-#: ../src/composer/mail-composer.error.xml.h:12
+#: ../src/composer/mail-composer.error.xml.h:14
msgid ""
"Closing this composer window will discard the message permanently, unless "
"you choose to save the message in your Drafts folder. This will allow you to "
@@ -11236,23 +11939,23 @@ msgstr ""
"您在稍后继续编写信息。"
#. Response codes were chosen somewhat arbitrarily.
-#: ../src/composer/mail-composer.error.xml.h:15
+#: ../src/composer/mail-composer.error.xml.h:17
msgid "_Continue Editing"
msgstr "继续编辑(_C)"
-#: ../src/composer/mail-composer.error.xml.h:16
+#: ../src/composer/mail-composer.error.xml.h:18
msgid "_Save Draft"
msgstr "保存草稿(_S)"
-#: ../src/composer/mail-composer.error.xml.h:17
+#: ../src/composer/mail-composer.error.xml.h:19
msgid "Are you sure you want to discard the message you are composing?"
msgstr "您确定想要丢弃您正在编写的信息吗？"
-#: ../src/composer/mail-composer.error.xml.h:18
+#: ../src/composer/mail-composer.error.xml.h:20
msgid "Could not create message."
msgstr "无法创建信息。"
-#: ../src/composer/mail-composer.error.xml.h:19
+#: ../src/composer/mail-composer.error.xml.h:21
#, fuzzy
#| msgid ""
#| "Because "{0}", you may need to select different mail options."
@@ -11262,36 +11965,36 @@ msgid ""
"Detailed error: {0}"
msgstr "由于“{0}”，您可能要选择不同的邮件选项。"
-#: ../src/composer/mail-composer.error.xml.h:22
+#: ../src/composer/mail-composer.error.xml.h:24
#, fuzzy
#| msgid "Could not read signature file "{0}"."
msgid "Could not read signature file “{0}”."
msgstr "无法读取签名文件“{0}”。"
-#: ../src/composer/mail-composer.error.xml.h:23
+#: ../src/composer/mail-composer.error.xml.h:25
msgid "All accounts have been removed."
msgstr "已经删除了全部帐号。"
-#: ../src/composer/mail-composer.error.xml.h:24
+#: ../src/composer/mail-composer.error.xml.h:26
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐号。"
-#: ../src/composer/mail-composer.error.xml.h:25
+#: ../src/composer/mail-composer.error.xml.h:27
msgid "An error occurred while saving to your Outbox folder."
msgstr "在保存到您的发件箱文件夹时出现了一个错误。"
-#: ../src/composer/mail-composer.error.xml.h:26
+#: ../src/composer/mail-composer.error.xml.h:28
#, fuzzy
#| msgid ""
#| "The reported error was "{0}". The message has not been sent."
msgid "The reported error was “{0}”. The message has not been sent."
msgstr "报告的错误为“{0}”。信息很可能没有发送。"
-#: ../src/composer/mail-composer.error.xml.h:27
+#: ../src/composer/mail-composer.error.xml.h:29
msgid "An error occurred while saving to your Drafts folder."
msgstr "在保存到您的草稿文件夹时出现了一个错误。"
-#: ../src/composer/mail-composer.error.xml.h:28
+#: ../src/composer/mail-composer.error.xml.h:30
#, fuzzy
#| msgid ""
#| "The reported error was "{0}". The message has most likely not "
@@ -11300,34 +12003,35 @@ msgid ""
"The reported error was “{0}”. The message has most likely not been saved."
msgstr "报告的错误为“{0}”。信息很可能没有保存。"
-#: ../src/composer/mail-composer.error.xml.h:29
+#: ../src/composer/mail-composer.error.xml.h:31
msgid "An error occurred while sending. How do you want to proceed?"
msgstr "在发送时出错了错误。您想继续吗？"
-#: ../src/composer/mail-composer.error.xml.h:30
-#: ../src/mail/mail.error.xml.h:175
+#: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/mail/mail.error.xml.h:178
#, fuzzy
#| msgid "The reported error was "{0}"."
msgid "The reported error was “{0}”."
msgstr "报告的错误为“{0}”。"
-#: ../src/composer/mail-composer.error.xml.h:31
+#: ../src/composer/mail-composer.error.xml.h:33
msgid "_Save to Outbox"
msgstr "保存到发件箱(_S)"
-#: ../src/composer/mail-composer.error.xml.h:32
+#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/e-util/e-collection-account-wizard.c:694
msgid "_Try Again"
msgstr "重试(_T)"
-#: ../src/composer/mail-composer.error.xml.h:33
+#: ../src/composer/mail-composer.error.xml.h:35
msgid "Your message was sent, but an error occurred during post-processing."
msgstr "您的消息已发送，但在处理时出现了一个错误。"
-#: ../src/composer/mail-composer.error.xml.h:34
+#: ../src/composer/mail-composer.error.xml.h:36
msgid "Saving message to Outbox."
msgstr "把信息保存到发件箱中。"
-#: ../src/composer/mail-composer.error.xml.h:35
+#: ../src/composer/mail-composer.error.xml.h:37
#, fuzzy
#| msgid ""
#| "The message will be saved to your local Outbox folder, because the "
@@ -11341,25 +12045,24 @@ msgstr ""
"由于目标服务当前不可用，信息将保存到您的本地发件箱文件夹。在上线后，您可以通"
"过点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
-#: ../src/composer/mail-composer.error.xml.h:36
+#: ../src/composer/mail-composer.error.xml.h:38
msgid "Are you sure you want to send the message?"
msgstr "您确定要发送信息吗？"
-#: ../src/composer/mail-composer.error.xml.h:37
+#: ../src/composer/mail-composer.error.xml.h:39
msgid ""
"A keyboard accelerator to send the message has been pressed. Either cancel "
"sending the message, if it was done by an accident, or send the message."
msgstr ""
-"发送信息的快捷键已经被按下。要么取消发送信息(如果是误操作)，要么是发送"
-"信息。"
+"发送信息的快捷键已经被按下。要么取消发送信息(如果是误操作)，要么是发送信息。"
-#: ../src/composer/mail-composer.error.xml.h:39
+#: ../src/composer/mail-composer.error.xml.h:41
#, fuzzy
#| msgid "Are you sure you want to change the composer mode?"
msgid "Are you sure you want to change the composer format?"
msgstr "您确定要改变编辑器模式？"
-#: ../src/composer/mail-composer.error.xml.h:40
+#: ../src/composer/mail-composer.error.xml.h:42
#, fuzzy
#| msgid ""
#| "Turning HTML mode off will cause the text to lose all formatting. Do you "
@@ -11369,165 +12072,178 @@ msgid ""
"formatting. Do you want to continue?"
msgstr "关闭 HTML 模式会使文本丢弃所有格式。您想继续吗？"
-#: ../src/composer/mail-composer.error.xml.h:41
+#: ../src/composer/mail-composer.error.xml.h:43
#, fuzzy
#| msgid "_Don't lose formatting"
msgid "_Don’t lose formatting"
msgstr "不要丢弃格式(_D)"
-#: ../src/composer/mail-composer.error.xml.h:42
+#: ../src/composer/mail-composer.error.xml.h:44
msgid "Lose _formatting"
msgstr "丢失格式(_F)"
-#: ../src/composer/mail-composer.error.xml.h:43
+#: ../src/composer/mail-composer.error.xml.h:45
msgid "An error occurred while saving to your Templates folder."
msgstr "保存到您的模板文件夹时出现了一个错误。"
-#: ../src/composer/mail-composer.error.xml.h:44
+#: ../src/composer/mail-composer.error.xml.h:46
#, fuzzy
#| msgid "Are you sure you want to discard the message you are composing?"
msgid "Are you sure you want to convert the message into a meeting?"
msgstr "您确定想要丢弃您正在编写的信息吗？"
-#: ../src/composer/mail-composer.error.xml.h:45
+#: ../src/composer/mail-composer.error.xml.h:47
msgid ""
"By converting the message into the meeting the composed message will be "
"closed and the changes being done discarded."
msgstr ""
-#: ../src/composer/mail-composer.error.xml.h:46
-#, fuzzy
-#| msgid "Create a _Meeting"
+#: ../src/composer/mail-composer.error.xml.h:48
msgid "Convert to _Meeting"
-msgstr "创建一个会议(_M)"
+msgstr "转换为会议(_M)"
-#: ../src/composer/mail-composer.error.xml.h:47
+#: ../src/composer/mail-composer.error.xml.h:49
#, fuzzy
#| msgid "Are you sure you want to send the message?"
msgid "Are you sure you want to convert the event into a message?"
msgstr "您确定要发送信息吗？"
-#: ../src/composer/mail-composer.error.xml.h:48
+#: ../src/composer/mail-composer.error.xml.h:50
msgid ""
"By converting the event into the message the editing window will be closed "
"and the changes being done discarded."
msgstr ""
-#: ../src/composer/mail-composer.error.xml.h:49
+#: ../src/composer/mail-composer.error.xml.h:51
#, fuzzy
#| msgid "Compose Message"
msgid "Convert to _Message"
msgstr "新建消息"
-#: ../src/composer/mail-composer.error.xml.h:50
+#: ../src/composer/mail-composer.error.xml.h:52
#, fuzzy
#| msgid "Are you sure you want to save the memo without a summary?"
msgid "Are you sure you want to convert the memo into a message?"
msgstr "您确定想要保存没有摘要的备忘吗？"
-#: ../src/composer/mail-composer.error.xml.h:51
+#: ../src/composer/mail-composer.error.xml.h:53
msgid ""
"By converting the memo into the message the editing window will be closed "
"and the changes being done discarded."
msgstr ""
-#: ../src/composer/mail-composer.error.xml.h:52
+#: ../src/composer/mail-composer.error.xml.h:54
#, fuzzy
#| msgid "Are you sure you want to save the task without a summary?"
msgid "Are you sure you want to convert the task into a message?"
msgstr "您确定想要发送没有摘要的任务吗？"
-#: ../src/composer/mail-composer.error.xml.h:53
+#: ../src/composer/mail-composer.error.xml.h:55
msgid ""
"By converting the task into the message the editing window will be closed "
"and the changes being done discarded."
msgstr ""
-#: ../src/composer/mail-composer.error.xml.h:54
+#: ../src/composer/mail-composer.error.xml.h:56
msgid "Something has gone wrong when editing the message"
msgstr ""
-#: ../src/composer/mail-composer.error.xml.h:55
+#: ../src/composer/mail-composer.error.xml.h:57
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 the GNOME bugzilla."
+"please file a bug report in GNOME Gitlab."
msgstr ""
-#: ../src/em-format/e-mail-formatter-attachment.c:334
+#: ../src/composer/mail-composer.error.xml.h:58
+#, fuzzy
+#| msgid "An error occurred while printing"
+msgid "An error occurred while creating message composer."
+msgstr "打印时发生了错误"
+
+#: ../src/em-format/e-mail-formatter-attachment.c:335
msgid "Display as attachment"
msgstr "以附件显示"
-#: ../src/em-format/e-mail-formatter-audio.c:150
+#: ../src/em-format/e-mail-formatter-audio.c:151
msgid "Audio Player"
msgstr "音乐播放器"
-#: ../src/em-format/e-mail-formatter-audio.c:151
+#: ../src/em-format/e-mail-formatter-audio.c:152
msgid "Play the attachment in embedded audio player"
msgstr "在嵌入式音乐播放器中播放附件"
-#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-formatter-headers.c:109
#: ../src/em-format/e-mail-part-headers.c:46
-#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
+#: ../src/mail/e-mail-tag-editor.c:196 ../src/mail/message-list.etspec.h:5
#: ../src/modules/mail/em-mailer-prefs.c:60
msgid "From"
msgstr "发件人"
-#: ../src/em-format/e-mail-formatter-headers.c:132
+#: ../src/em-format/e-mail-formatter-headers.c:134
msgid "(no subject)"
msgstr "(无主题)"
-#. Translators: This message suggests to the receipients
+#: ../src/em-format/e-mail-formatter-headers.c:150
+#: ../src/em-format/e-mail-formatter-headers.c:514
+#: ../src/mail/e-mail-remote-content-popover.c:381
+msgid "Remote content download had been blocked for this message."
+msgstr "已阻挡这封邮件的远程内容下载。"
+
+#. Translators: This message suggests to the recipients
#. * that the sender of the mail is different from the one
#. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:339
+#: ../src/em-format/e-mail-formatter-headers.c:359
#, c-format
msgid "This message was sent by %s on behalf of %s"
msgstr "此信息由 %s 代表 %s 的身份发送"
-#: ../src/em-format/e-mail-formatter-image.c:168
+#: ../src/em-format/e-mail-formatter-image.c:158
msgid "Regular Image"
msgstr "常规图像"
-#: ../src/em-format/e-mail-formatter-image.c:169
+#: ../src/em-format/e-mail-formatter-image.c:159
msgid "Display part as an image"
msgstr "以图像显示部分"
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:253
msgid "RFC822 message"
msgstr "RFC822 信息"
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:254
msgid "Format part as an RFC822 message"
msgstr "将部分格式化为 RFC822 信息"
-#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print.c:50
+#: ../src/e-util/e-webdav-browser.c:2342
#: ../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
msgid "Name"
msgstr "姓名"
-#: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/em-format/e-mail-formatter-print.c:50
#: ../src/e-util/e-attachment-tree-view.c:193
#: ../src/mail/message-list.etspec.h:10
msgid "Size"
msgstr "大小"
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:181
#: ../src/em-format/e-mail-part-headers.c:51
-#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
+#: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
#: ../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:65
-#: ../src/smime/gui/certificate-manager.c:1643
+#: ../src/smime/gui/certificate-manager.c:1627
msgid "Subject"
msgstr "主题"
#. pseudo-header
-#: ../src/em-format/e-mail-formatter-quote-headers.c:197
-#: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1488
+#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:360
+#: ../src/modules/mail/em-mailer-prefs.c:686
+#: ../src/modules/mail/em-mailer-prefs.c:1620
+#: ../src/modules/mail/em-mailer-prefs.c:1669
msgid "Mailer"
msgstr "邮件程序"
@@ -11542,18 +12258,17 @@ msgid "Display part as enriched text"
msgstr "以富文本显示部分"
#: ../src/em-format/e-mail-formatter-quote-text-html.c:93
-#: ../src/em-format/e-mail-formatter-text-html.c:385
+#: ../src/em-format/e-mail-formatter-text-html.c:389
msgid "HTML"
msgstr "HTML"
#: ../src/em-format/e-mail-formatter-quote-text-html.c:94
-#: ../src/em-format/e-mail-formatter-text-html.c:386
+#: ../src/em-format/e-mail-formatter-text-html.c:390
msgid "Format part as HTML"
msgstr "将部分格式化为 HTML"
#: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
#: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1314
msgid "Plain Text"
msgstr "纯文字"
@@ -11562,51 +12277,55 @@ msgstr "纯文字"
msgid "Format part as plain text"
msgstr "将部分格式化为纯文字"
-#: ../src/em-format/e-mail-formatter-secure-button.c:44
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
msgid "Unsigned"
msgstr "未签名"
-#: ../src/em-format/e-mail-formatter-secure-button.c:44
+#: ../src/em-format/e-mail-formatter-secure-button.c:52
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信息未签名。无法保证这封信是可信的。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:54
msgid "Valid signature"
msgstr "有效签名"
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
+msgid "Valid signature, but sender address and signer address do not match"
+msgstr ""
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:56
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr "此信息已签名，而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:58
msgid "Invalid signature"
msgstr "无效签名"
-#: ../src/em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:60
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:62
msgid "Valid signature, but cannot verify sender"
msgstr "签名有效，但是无法校验发送者"
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:64
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr "这封信的签名有效，但是无法校验邮件的发送者。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:66
msgid "This message is signed, but the public key is not in your keyring"
msgstr "这封信已签名，但是没有相应的公钥。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:68
msgid ""
"This message was digitally signed, but the corresponding public key is not "
"present in your keyring. If you want to be able to verify the authenticity "
@@ -11618,21 +12337,21 @@ msgstr ""
"发送者，您需要通过可信的渠道获取此公钥并加入到您的密钥环中。在此之前，无法保"
"证此消息是真的从这个发送者发送并在传输过程中没有更改。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
msgid "Unencrypted"
msgstr "未加密"
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:77
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:58
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../src/em-format/e-mail-formatter-secure-button.c:58
+#: ../src/em-format/e-mail-formatter-secure-button.c:78
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would be "
"difficult, but not impossible for an outsider to view the content of this "
@@ -11641,21 +12360,21 @@ msgstr ""
"这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
"定时间进行暴力破解，这很困难但并不是不可能。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
msgid "Encrypted"
msgstr "加密"
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:79
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
-#: ../src/em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../src/em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:80
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -11664,73 +12383,118 @@ msgstr ""
"这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
"量时间进行暴力破解，这十分困难。"
-#: ../src/em-format/e-mail-formatter-source.c:119
-msgid "Display source of a MIME part"
-msgstr "显示 MIME 部分的源内容"
+#: ../src/em-format/e-mail-formatter-secure-button.c:271
+msgid "View Certificate"
+msgstr "查看证书"
-#: ../src/em-format/e-mail-formatter-utils.c:200
-#: ../src/em-format/e-mail-formatter-utils.c:217
-#: ../src/em-format/e-mail-part-headers.c:48
-#: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
-#: ../src/mail/vfoldertypes.xml.in.h:11
-#: ../src/modules/mail/em-mailer-prefs.c:62
-msgid "To"
-msgstr "收件人"
+#: ../src/em-format/e-mail-formatter-secure-button.c:278
+msgid "Import Certificate"
+msgstr "导入证书"
-#: ../src/em-format/e-mail-formatter-utils.c:201
-#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-formatter-secure-button.c:320
+msgid "Details"
+msgstr "细节"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:412
+msgid "Digital Signature"
+msgstr "数字签名"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:418
+msgid "Signer:"
+msgid_plural "Signers:"
+msgstr[0] "签名人："
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:429
+msgid "Encryption"
+msgstr "加密"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:434
+msgid "Encrypted by:"
+msgstr "加密者："
+
+#: ../src/em-format/e-mail-formatter-source.c:119
+msgid "Display source of a MIME part"
+msgstr "显示 MIME 部分的源内容"
+
+#: ../src/em-format/e-mail-formatter-utils.c:212
+#: ../src/em-format/e-mail-formatter-utils.c:237
+#: ../src/em-format/e-mail-part-headers.c:48
+#: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
+#: ../src/mail/vfoldertypes.xml.in.h:11
+#: ../src/modules/mail/em-mailer-prefs.c:62
+msgid "To"
+msgstr "收件人"
+
+#: ../src/em-format/e-mail-formatter-utils.c:213
+#: ../src/em-format/e-mail-formatter-utils.c:238
#: ../src/em-format/e-mail-part-headers.c:49
#: ../src/modules/mail/em-mailer-prefs.c:63
msgid "Cc"
msgstr "抄送"
-#: ../src/em-format/e-mail-formatter-utils.c:202
-#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-formatter-utils.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:239
#: ../src/em-format/e-mail-part-headers.c:50
#: ../src/modules/mail/em-mailer-prefs.c:64
msgid "Bcc"
msgstr "密件抄送"
-#: ../src/em-format/e-mail-formatter-utils.c:582
+#: ../src/em-format/e-mail-formatter-utils.c:577
msgid "GPG signed"
msgstr "已经 GPG 签名"
-#: ../src/em-format/e-mail-formatter-utils.c:588
+#: ../src/em-format/e-mail-formatter-utils.c:577
+msgid "partially GPG signed"
+msgstr "部分 GPG 签名"
+
+#: ../src/em-format/e-mail-formatter-utils.c:578
msgid "GPG encrypted"
msgstr "已经 GPG 加密"
-#: ../src/em-format/e-mail-formatter-utils.c:594
+#: ../src/em-format/e-mail-formatter-utils.c:578
+msgid "partially GPG encrypted"
+msgstr "部分 GPG 加密"
+
+#: ../src/em-format/e-mail-formatter-utils.c:579
msgid "S/MIME signed"
msgstr "已经 S/MIME 签名"
-#: ../src/em-format/e-mail-formatter-utils.c:600
+#: ../src/em-format/e-mail-formatter-utils.c:579
+msgid "partially S/MIME signed"
+msgstr "部分 S/MIME 签名"
+
+#: ../src/em-format/e-mail-formatter-utils.c:580
msgid "S/MIME encrypted"
msgstr "已经 S/MIME 加密"
-#: ../src/em-format/e-mail-formatter-utils.c:609
-#: ../src/mail/e-mail-config-security-page.c:716
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
+#: ../src/em-format/e-mail-formatter-utils.c:580
+msgid "partially S/MIME encrypted"
+msgstr "部分 S/MIME 加密"
+
+#: ../src/em-format/e-mail-formatter-utils.c:693
+#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
msgid "Security"
msgstr "安全"
-#: ../src/em-format/e-mail-parser-application-mbox.c:85
+#: ../src/em-format/e-mail-parser-application-mbox.c:125
#, c-format
msgid "Error parsing MBOX part: %s"
msgstr "解析 MBOX 部分出错：%s"
-#: ../src/em-format/e-mail-parser-application-smime.c:81
+#: ../src/em-format/e-mail-parser-application-smime.c:113
#, c-format
msgid "Could not parse S/MIME message: %s"
msgstr "无法解析 S/MIME 信息：%s"
-#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:76
#, c-format
msgid "Could not parse PGP message: %s"
msgstr "无法解析 PGP 信息：%s"
-#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
-#: ../src/em-format/e-mail-parser-multipart-signed.c:133
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
+#: ../src/em-format/e-mail-parser-multipart-signed.c:163
#, c-format
msgid "Error verifying signature: %s"
msgstr "校验签名出错：%s"
@@ -11766,21 +12530,21 @@ msgstr "指向远程数据 (%s)"
msgid "Pointer to unknown external data (“%s” type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
-#: ../src/em-format/e-mail-parser-multipart-signed.c:81
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:74
+#: ../src/em-format/e-mail-parser-multipart-signed.c:109
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信息。显示源文本。"
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:79
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:89
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:108
#, c-format
msgid "Could not parse PGP/MIME message: %s"
msgstr "无法解析 PGP/MIME 信息：%s"
-#: ../src/em-format/e-mail-parser-multipart-signed.c:119
+#: ../src/em-format/e-mail-parser-multipart-signed.c:149
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
@@ -11789,8 +12553,8 @@ msgstr "不支持的签名格式"
msgid "Reply-To"
msgstr "回复至"
-#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
-#: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
+#: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:559
+#: ../src/e-util/e-dateedit.c:582 ../src/mail/message-list.etspec.h:7
#: ../src/modules/mail/em-mailer-prefs.c:66
msgid "Date"
msgstr "日期"
@@ -11806,16 +12570,12 @@ msgstr "新闻组"
msgid "Face"
msgstr "头像"
-#: ../src/em-format/e-mail-part-secure-button.c:116
-#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
-msgid "_View Certificate"
-msgstr "查看证书(_V)"
-
-#: ../src/em-format/e-mail-part-secure-button.c:131
-msgid "This certificate is not viewable"
-msgstr "此证书不可查看"
+#: ../src/em-format/e-mail-part-secure-button.c:96
+#, c-format
+msgid "Failed to import certificate: %s"
+msgstr "导入证书失败：%s"
-#: ../src/em-format/e-mail-part-utils.c:551
+#: ../src/em-format/e-mail-part-utils.c:634
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -11833,30 +12593,117 @@ msgstr "日历：从 %s 到 %s"
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/modules/mail/e-mail-shell-backend.c:914
+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
+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:87
+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
+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:88
+msgid "Task Lists"
+msgstr "任务列表"
+
+#: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1306
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
+#: ../src/plugins/mail-notification/mail-notification.c:1124
+#: ../src/plugins/publish-calendar/publish-calendar.c:854
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../src/e-util/e-accounts-window.c:1415
+#: ../src/mail/e-mail-account-tree-view.c:108
+#: ../src/plugins/mail-notification/mail-notification.c:1140
+msgid "Account Name"
+msgstr "帐号名"
+
+#: ../src/e-util/e-accounts-window.c:1482
+#, fuzzy
+#| msgid "Collection"
+msgid "Collection _Account"
+msgstr "收藏"
+
+#: ../src/e-util/e-accounts-window.c:1483
+msgid "_Mail Account"
+msgstr "邮件帐号(_M)"
+
+#: ../src/e-util/e-accounts-window.c:1484
+msgid "Address _Book"
+msgstr "地址簿(_B)"
+
+#: ../src/e-util/e-accounts-window.c:1485
+msgid "_Calendar"
+msgstr "日历(_C)"
+
+#: ../src/e-util/e-accounts-window.c:1486
+msgid "M_emo List"
+msgstr "备忘列表"
+
+#: ../src/e-util/e-accounts-window.c:1487
+msgid "_Task List"
+msgstr "任务列表(_T)"
+
+#: ../src/e-util/e-accounts-window.c:1684
+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:2689
+#: ../src/mail/em-subscription-editor.c:1952
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+msgid "_Refresh"
+msgstr "刷新(_R)"
+
+#: ../src/e-util/e-accounts-window.c:1762
+msgid "Initiates refresh of account sources"
+msgstr ""
+
#. Translators: This is a cancelled activity.
#: ../src/e-util/e-activity.c:256
#, c-format
msgid "%s (cancelled)"
-msgstr "%s(取消的)"
+msgstr "%s（已取消）"
#. Translators: This is a completed activity.
#: ../src/e-util/e-activity.c:259
#, c-format
msgid "%s (completed)"
-msgstr "%s(完成的)"
+msgstr "%s（已完成）"
#. Translators: This is an activity waiting to run.
#: ../src/e-util/e-activity.c:262
#, c-format
msgid "%s (waiting)"
-msgstr "%s (等待中)"
+msgstr "%s（等待中）"
#. Translators: This is a running activity which
#. * the user has requested to cancel.
#: ../src/e-util/e-activity.c:266
#, c-format
msgid "%s (cancelling)"
-msgstr "%s (正在取消)"
+msgstr "%s（正在取消）"
#: ../src/e-util/e-activity.c:268
#, c-format
@@ -11867,21 +12714,26 @@ msgstr "%s"
#. * percent complete is known.
#. Translators: This is a running activity whose percent complete is known.
#: ../src/e-util/e-activity.c:273
-#: ../src/modules/calendar/e-cal-base-shell-content.c:142
+#: ../src/modules/addressbook/e-book-shell-view-private.c:334
+#: ../src/modules/calendar/e-cal-base-shell-content.c:143
#, c-format
msgid "%s (%d%% complete)"
-msgstr "%s (%d%% 完成)"
+msgstr "%s（%d%% 完成）"
#: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
msgid "Cancel"
msgstr "取消"
#. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:124
+#: ../src/e-util/e-alert-bar.c:204
msgid "Close this message (Escape)"
msgstr "关闭该信息 (Escape 键)"
+#: ../src/e-util/e-alert-dialog.c:162
+msgid "_Dismiss"
+msgstr "消除(_D)"
+
#: ../src/e-util/e-alert-sink.c:244
msgid "Failed to create a thread: "
msgstr "创建会话失败："
@@ -11894,46 +12746,44 @@ msgstr "创建会话失败："
msgid "Attached message"
msgstr "附加的信息"
-#: ../src/e-util/e-attachment.c:2040 ../src/e-util/e-attachment.c:3093
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
msgid "Operation was cancelled"
msgstr "操作已取消"
#. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2224 ../src/e-util/e-attachment.c:2940
-#: ../src/e-util/e-attachment.c:3383 ../src/e-util/e-attachment-store.c:886
+#: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
+#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
msgid "attachment.dat"
msgstr "attachment.dat"
-#: ../src/e-util/e-attachment.c:2302 ../src/e-util/e-attachment.c:3443
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
msgid "A load operation is already in progress"
msgstr "一个已经加载的操作正在进行"
-#: ../src/e-util/e-attachment.c:2310 ../src/e-util/e-attachment.c:3451
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
msgid "A save operation is already in progress"
msgstr "个已经保存的操作正在进行"
-#: ../src/e-util/e-attachment.c:2707
-#, fuzzy, c-format
-#| msgid "Could not open %s:"
+#: ../src/e-util/e-attachment.c:2757
+#, c-format
msgid "Could not open “%s”"
-msgstr "无法打开 %s："
+msgstr "无法打开“%s”"
-#: ../src/e-util/e-attachment.c:2710
+#: ../src/e-util/e-attachment.c:2760
#, c-format
msgid "Could not open the attachment"
msgstr "不能打开附件"
-#: ../src/e-util/e-attachment.c:3460
+#: ../src/e-util/e-attachment.c:3519
msgid "Attachment contents not loaded"
msgstr "附件内容未载入"
-#: ../src/e-util/e-attachment.c:3551
-#, fuzzy, c-format
-#| msgid "Could not save '%s'"
+#: ../src/e-util/e-attachment.c:3610
+#, c-format
msgid "Could not save “%s”"
-msgstr "不能保存“%s”"
+msgstr "无法保存“%s”"
-#: ../src/e-util/e-attachment.c:3554
+#: ../src/e-util/e-attachment.c:3613
#, c-format
msgid "Could not save the attachment"
msgstr "无法保存附件"
@@ -11943,13 +12793,14 @@ msgid "Attachment Properties"
msgstr "附件属性"
#: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-import-assistant.c:277
msgid "F_ilename:"
msgstr "文件名(_I)："
#: ../src/e-util/e-attachment-dialog.c:354
-#: ../src/e-util/e-html-editor-image-dialog.c:508
-#: ../src/e-util/e-html-editor-link-dialog.c:241
+#: ../src/e-util/e-html-editor-image-dialog.c:513
+#: ../src/e-util/e-html-editor-link-dialog.c:226
+#: ../src/e-util/e-webdav-browser.c:2437
msgid "_Description:"
msgstr "描述(_D)："
@@ -11958,7 +12809,7 @@ msgid "MIME Type:"
msgstr "MIME 类型："
#: ../src/e-util/e-attachment-dialog.c:380
-#: ../src/e-util/e-attachment-store.c:694
+#: ../src/e-util/e-attachment-store.c:700
msgid "_Suggest automatic display of attachment"
msgstr "建议自动显示附件(_S)"
@@ -11989,39 +12840,41 @@ msgstr "隐藏附件栏(_B)"
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../src/e-util/e-attachment-store.c:659
+#: ../src/e-util/e-attachment-store.c:656
+#: ../src/e-util/e-attachment-store.c:663
msgid "Add Attachment"
msgstr "添加附件"
-#: ../src/e-util/e-attachment-store.c:666
-#: ../src/e-util/e-attachment-store.c:668
+#: ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-store.c:670
+#: ../src/e-util/e-attachment-store.c:672
msgid "A_ttach"
msgstr "附件(_T)"
-#: ../src/e-util/e-attachment-store.c:715
+#: ../src/e-util/e-attachment-store.c:721
msgid "Archive selected directories using this format:"
msgstr "归档选定文件夹格式："
-#: ../src/e-util/e-attachment-store.c:823
+#: ../src/e-util/e-attachment-store.c:838
msgid "Save Attachment"
msgid_plural "Save Attachments"
msgstr[0] "保存附件"
-#: ../src/e-util/e-attachment-store.c:850
+#: ../src/e-util/e-attachment-store.c:876
msgid "Do _not extract files from the attachment"
msgstr "不要从附件里提取文件(_N)"
-#: ../src/e-util/e-attachment-store.c:855
+#: ../src/e-util/e-attachment-store.c:881
msgid "Save extracted files _only"
msgstr "只保存提取文件(_O)"
-#: ../src/e-util/e-attachment-store.c:860
+#: ../src/e-util/e-attachment-store.c:886
msgid "Save extracted files and the original _archive"
msgstr "保存提取文件和原始存档(_A)"
#: ../src/e-util/e-attachment-view.c:308
-msgid "Open With Other Application..."
-msgstr "用其他应用程序打开..."
+msgid "Open With Other Application…"
+msgstr "用其他应用程序打开…"
#: ../src/e-util/e-attachment-view.c:315
msgid "S_ave All"
@@ -12032,37 +12885,44 @@ msgid "Sa_ve As"
msgstr "另存为(_V)"
#: ../src/e-util/e-attachment-view.c:331
-#: ../src/plugins/save-calendar/save-calendar.c:351
-#: ../src/plugins/save-calendar/save-calendar.c:382
-#: ../src/plugins/save-calendar/save-calendar.c:413
+#: ../src/plugins/save-calendar/save-calendar.c:348
+#: ../src/plugins/save-calendar/save-calendar.c:387
+#: ../src/plugins/save-calendar/save-calendar.c:426
msgid "Save _As"
msgstr "另存为(_A)"
#: ../src/e-util/e-attachment-view.c:341
-msgid "A_dd Attachment..."
-msgstr "添加附件(_D)..."
+msgid "A_dd Attachment…"
+msgstr "添加附件(_D)…"
#: ../src/e-util/e-attachment-view.c:348
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
-#: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
+#: ../src/modules/calendar/e-task-shell-view-actions.c:745
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
msgid "_Properties"
msgstr "属性(_P)"
-#: ../src/e-util/e-attachment-view.c:658
-#, fuzzy, c-format
-#| msgid "Open With \"%s\""
+#: ../src/e-util/e-attachment-view.c:786
+#, c-format
msgid "Open With “%s”"
msgstr "使用“%s”打开"
-#: ../src/e-util/e-attachment-view.c:661
+#: ../src/e-util/e-attachment-view.c:787
#, c-format
msgid "Open this attachment in %s"
msgstr "在 %s 中打开附件"
+#: ../src/e-util/e-attachment-view.c:789
+msgid "Open With Default Application"
+msgstr "用默认应用程序打开"
+
+#: ../src/e-util/e-attachment-view.c:790
+msgid "Open this attachment in default application"
+msgstr "使用默认应用程序打开附件"
+
#: ../src/e-util/e-book-source-config.c:98
msgid "Mark as default address book"
msgstr "标记为默认地址簿"
@@ -12075,45 +12935,40 @@ msgstr "用此地址簿自动完成"
msgid "Copy book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行离线操作"
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../src/e-util/e-buffer-tagger.c:410
-msgid "Ctrl-click to open a link"
-msgstr "Ctrl 加单击来打开一个链接"
-
-#: ../src/e-util/e-calendar.c:272
+#: ../src/e-util/e-calendar.c:310
msgid "Previous month"
msgstr "上个月"
-#: ../src/e-util/e-calendar.c:291
+#: ../src/e-util/e-calendar.c:329
msgid "Next month"
msgstr "下个月"
-#: ../src/e-util/e-calendar.c:311
+#: ../src/e-util/e-calendar.c:349
msgid "Previous year"
msgstr "上一年"
-#: ../src/e-util/e-calendar.c:330
+#: ../src/e-util/e-calendar.c:368
msgid "Next year"
msgstr "下一年"
-#: ../src/e-util/e-calendar.c:354
+#: ../src/e-util/e-calendar.c:392
msgid "Month Calendar"
msgstr "月历"
#. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1338 ../src/e-util/e-calendar-item.c:2218
+#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
msgctxt "CalItem"
msgid "%B"
msgstr "%B"
#. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1340
+#: ../src/e-util/e-calendar-item.c:1359
msgctxt "CalItem"
msgid "%Y"
msgstr "%Y"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1377
+#: ../src/e-util/e-calendar-item.c:1396
msgctxt "CalItem"
msgid "%B %Y"
msgstr "%Y %B"
@@ -12146,25 +13001,25 @@ msgstr "将任务列表内容复制到本地以进行离线操作"
msgid "Copy memo list contents locally for offline operation"
msgstr "将备忘录内容复制到本地以进行离线操作"
-#: ../src/e-util/e-categories-editor.c:224
+#: ../src/e-util/e-categories-editor.c:251
msgid "Currently _used categories:"
msgstr "当前使用的分类(_U)："
-#: ../src/e-util/e-categories-editor.c:235
+#: ../src/e-util/e-categories-editor.c:262
msgid "_Available Categories:"
msgstr "可用类别(_A)："
-#: ../src/e-util/e-categories-editor.c:275
+#: ../src/e-util/e-categories-editor.c:302
msgctxt "category"
msgid "_New"
msgstr "新建(_N)"
-#: ../src/e-util/e-categories-editor.c:279
+#: ../src/e-util/e-categories-editor.c:306
msgctxt "category"
msgid "_Edit"
msgstr "编辑(_E)"
-#: ../src/e-util/e-categories-editor.c:283
+#: ../src/e-util/e-categories-editor.c:310
msgctxt "category"
msgid "_Delete"
msgstr "删除(_D)"
@@ -12174,32 +13029,37 @@ msgid "Icon"
msgstr "图标"
#: ../src/e-util/e-category-completion.c:304
-#, fuzzy, c-format
-#| msgid "Create category \"%s\""
+#, c-format
msgid "Create category “%s”"
msgstr "创建分类 \"%s\""
-#: ../src/e-util/e-category-editor.c:135
+#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
msgid "Category Icon"
msgstr "类别图标"
-#: ../src/e-util/e-category-editor.c:139
+#: ../src/e-util/e-category-editor.c:171
msgid "_No Image"
msgstr "无图像(_N)"
-#: ../src/e-util/e-category-editor.c:172
+#: ../src/e-util/e-category-editor.c:205
msgid "Category _Name"
msgstr "类别名字(_N)"
-#: ../src/e-util/e-category-editor.c:184
+#: ../src/e-util/e-category-editor.c:218
msgid "Category _Icon"
msgstr "类别图标(_I)"
-#: ../src/e-util/e-category-editor.c:210
+#: ../src/e-util/e-category-editor.c:234
+#, fuzzy
+#| msgid "Insert Emoticon"
+msgid "_Unset icon"
+msgstr "插入表情"
+
+#: ../src/e-util/e-category-editor.c:260
msgid "Category Properties"
msgstr "类别属性"
-#: ../src/e-util/e-category-editor.c:271
+#: ../src/e-util/e-category-editor.c:321
#, fuzzy, c-format
#| msgid ""
#| "There is already a category '%s' in the configuration. Please use another "
@@ -12214,7 +13074,7 @@ msgid "popup list"
msgstr "弹出列表"
#: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2066
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2146
msgid "?"
msgstr "?"
@@ -12222,13 +13082,6 @@ msgstr "?"
msgid "Now"
msgstr "现在"
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-cell-date-edit.c:328 ../src/e-util/e-datetime-format.c:206
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../src/modules/itip-formatter/itip-view.c:253
-msgid "Today"
-msgstr "今天"
-
#. Translators: "None" as a label of a button to unset date in a
#. * date table cell.
#: ../src/e-util/e-cell-date-edit.c:338
@@ -12240,7 +13093,7 @@ msgstr "无"
msgid "OK"
msgstr "确定"
-#: ../src/e-util/e-cell-date-edit.c:897
+#: ../src/e-util/e-cell-date-edit.c:901
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必须采用格式：%s"
@@ -12335,9 +13188,9 @@ msgstr "字符编码"
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: ../src/e-util/e-charset-combo-box.c:363
-msgid "Other..."
-msgstr "其它..."
+#: ../src/e-util/e-charset-combo-box.c:364
+msgid "Other…"
+msgstr "其它…"
#: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
#, fuzzy, c-format
@@ -12345,241 +13198,404 @@ msgstr "其它..."
msgid "Cannot create a client object from extension name “%s”"
msgstr "无法从名为 '%s' 的扩展创建客户端对象"
+#: ../src/e-util/e-collection-account-wizard.c:107
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:83
+msgid "_Finish"
+msgstr "完成(_F)"
+
+#: ../src/e-util/e-collection-account-wizard.c:110
+#, fuzzy
+#| msgid "_Skip Lookup"
+msgid "_Look Up"
+msgstr "跳过查找(_S)"
+
+#: ../src/e-util/e-collection-account-wizard.c:112
+#: ../src/e-util/e-collection-account-wizard.c:273
+#: ../src/e-util/e-search-bar.c:680
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:85
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:244
+msgid "_Next"
+msgstr "下一项(_N)"
+
+#: ../src/e-util/e-collection-account-wizard.c:184
+#, fuzzy
+#| msgid "Collection"
+msgid "New Collection Account"
+msgstr "收藏"
+
+#: ../src/e-util/e-collection-account-wizard.c:258
+#: ../src/e-util/e-search-bar.c:668
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+msgid "_Previous"
+msgstr "上一项(_P)"
+
+#: ../src/e-util/e-collection-account-wizard.c:439
+msgid "Looking up details, please wait…"
+msgstr ""
+
+#. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password
to continue. Enter password." at the end.
+#: ../src/e-util/e-collection-account-wizard.c:496
+#, fuzzy, c-format
+#| msgid "Enter Google password for user '%s'."
+msgid "Requires password to continue. %s."
+msgstr "输入“%s”的 Google 密码。"
+
+#: ../src/e-util/e-collection-account-wizard.c:509
+msgid "View certificate"
+msgstr "查看证书"
+
+#: ../src/e-util/e-collection-account-wizard.c:550
+msgid ""
+"Found no candidates. It can also mean that the server doesn’t provide any "
+"information about its configuration using the selected lookup methods. Enter "
+"the account manually instead or change above settings."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:552
+#, c-format
+msgid "Found one candidate"
+msgid_plural "Found %d candidates"
+msgstr[0] ""
+
+#: ../src/e-util/e-collection-account-wizard.c:663
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
+msgid "_Username:"
+msgstr "用户名(_U)："
+
+#: ../src/e-util/e-collection-account-wizard.c:675
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../src/smime/gui/certificate-manager.c:766
+msgid "_Password:"
+msgstr "密码(_P)："
+
+#: ../src/e-util/e-collection-account-wizard.c:688
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "_Remember password"
+msgstr "记住密码(_R)"
+
+#: ../src/e-util/e-collection-account-wizard.c:835
+#: ../src/e-util/e-webdav-browser.c:474
+msgid "Collection"
+msgstr "收藏"
+
+#: ../src/e-util/e-collection-account-wizard.c:836
+#, fuzzy
+#| msgid "Mail Receipt"
+msgid "Mail Receive"
+msgstr "已读回执"
+
+#: ../src/e-util/e-collection-account-wizard.c:837
+#, fuzzy
+#| msgid "Mailer"
+msgid "Mail Send"
+msgstr "邮件程序"
+
+#: ../src/e-util/e-collection-account-wizard.c:838
+#: ../src/e-util/e-name-selector-dialog.c:445
+#: ../src/mail/importers/pine-importer.c:430
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../src/e-util/e-collection-account-wizard.c:840
+msgid "Memo List"
+msgstr "备忘列表"
+
+#: ../src/e-util/e-collection-account-wizard.c:841
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+msgid "Task List"
+msgstr "任务列表"
+
+#: ../src/e-util/e-collection-account-wizard.c:1177
+msgid "Looking up LDAP server’s search base…"
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1310
+#, fuzzy
+#| msgid "Failed to create a thread: "
+msgid "Failed to store password: "
+msgstr "创建会话失败："
+
+#: ../src/e-util/e-collection-account-wizard.c:1320
+#, fuzzy
+#| msgid "Failed to create a thread: "
+msgid "Failed to create sources: "
+msgstr "创建会话失败："
+
+#: ../src/e-util/e-collection-account-wizard.c:1487
+msgid "Saving account settings, please wait…"
+msgstr "正在保存账号设置，请稍候……"
+
+#: ../src/e-util/e-collection-account-wizard.c:1639
+msgid "User details"
+msgstr "用户详情"
+
+#: ../src/e-util/e-collection-account-wizard.c:1652
+msgid "_Email Address or User name:"
+msgstr "电子邮件地址或用户名(_E)："
+
+#: ../src/e-util/e-collection-account-wizard.c:1683
+msgid "_Advanced Options"
+msgstr "高级选项(_A)"
+
+#: ../src/e-util/e-collection-account-wizard.c:1688
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+msgid "_Server:"
+msgstr "服务器(_S)："
+
+#: ../src/e-util/e-collection-account-wizard.c:1707
+msgid ""
+"Semicolon (“;”) separated list of servers to look up information for, in "
+"addition to the domain of the e-mail address."
+msgstr ""
+
+#: ../src/e-util/e-collection-account-wizard.c:1900
+#, fuzzy
+#| msgid "Level beyond which the message should be logged."
+msgid "Select which parts should be configured:"
+msgstr "大于此级别的信息会被记录。"
+
+#: ../src/e-util/e-collection-account-wizard.c:2024
+#: ../src/mail/e-mail-config-identity-page.c:542
+#: ../src/mail/e-mail-config-summary-page.c:325
+msgid "Account Information"
+msgstr "帐号信息"
+
#: ../src/e-util/e-color-chooser-widget.c:122
msgid "Choose custom color"
msgstr "选择自定义颜色"
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:488 ../src/e-util/e-html-editor.c:127
+#: ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:544
+#: ../src/mail/e-mail-config-security-page.c:708
+#: ../src/mail/e-mail-reader.c:4870 ../src/mail/mail-config.ui.h:78
+msgid "Default"
+msgstr "默认"
+
+#: ../src/e-util/e-color-combo.c:576
msgid "black"
msgstr "黑色"
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:577
msgid "light brown"
msgstr "浅棕"
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:578
msgid "brown gold"
msgstr "金棕"
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:579
msgid "dark green #2"
msgstr "深绿 #2"
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:580
msgid "navy"
msgstr "深蓝"
-#: ../src/e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:581
msgid "dark blue"
msgstr "深蓝"
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:582
msgid "purple #2"
msgstr "紫色 #2"
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:583
msgid "very dark gray"
msgstr "非常深的灰"
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:585
msgid "dark red"
msgstr "深红"
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:586
msgid "red-orange"
msgstr "橙红"
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:587
msgid "gold"
msgstr "金色"
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:588
msgid "dark green"
msgstr "深绿"
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:589
msgid "dull blue"
msgstr "淡蓝"
-#: ../src/e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:590
msgid "blue"
msgstr "蓝色"
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:591
msgid "dull purple"
msgstr "淡紫"
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:592
msgid "dark grey"
msgstr "深灰"
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:594
msgid "red"
msgstr "红色"
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:595
msgid "orange"
msgstr "橙色"
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:596
msgid "lime"
msgstr "灰色"
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:597
msgid "dull green"
msgstr "淡绿"
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:598
msgid "dull blue #2"
msgstr "淡蓝 #2"
-#: ../src/e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:599
msgid "sky blue #2"
msgstr "天蓝 #2"
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:600
msgid "purple"
msgstr "紫色"
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:601
msgid "gray"
msgstr "灰色"
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:603
msgid "magenta"
msgstr "品红"
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:604
msgid "bright orange"
msgstr "亮橙"
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:605
msgid "yellow"
msgstr "黄"
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:606
msgid "green"
msgstr "绿"
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:607
msgid "cyan"
msgstr "青色"
-#: ../src/e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:608
msgid "bright blue"
msgstr "亮蓝"
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:609
msgid "red purple"
msgstr "紫红"
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:610
msgid "light grey"
msgstr "亮灰"
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:612
msgid "pink"
msgstr "粉色"
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:613
msgid "light orange"
msgstr "亮橙"
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:614
msgid "light yellow"
msgstr "亮黄色"
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:615
msgid "light green"
msgstr "亮绿色"
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:616
msgid "light cyan"
msgstr "亮青色"
-#: ../src/e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:617
msgid "light blue"
msgstr "亮蓝色"
-#: ../src/e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:618
msgid "light purple"
msgstr "亮紫色"
-#: ../src/e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:619
msgid "white"
msgstr "白色"
-#: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:406
-#: ../src/mail/e-mail-config-security-page.c:570
-#: ../src/mail/e-mail-reader.c:4049 ../src/mail/mail-config.ui.h:75
-msgid "Default"
-msgstr "默认"
+#: ../src/e-util/e-config-lookup.c:819
+msgid "Running…"
+msgstr ""
-#: ../src/e-util/e-dateedit.c:524
+#: ../src/e-util/e-dateedit.c:526
msgid "Date and Time"
msgstr "日期和时间"
-#: ../src/e-util/e-dateedit.c:549
+#: ../src/e-util/e-dateedit.c:558
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../src/e-util/e-dateedit.c:572
+#: ../src/e-util/e-dateedit.c:581
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../src/e-util/e-dateedit.c:626
+#: ../src/e-util/e-dateedit.c:636
msgid "Drop-down combination box to select time"
msgstr "选择时间的组合框"
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:637
#: ../src/modules/calendar/e-calendar-preferences.ui.h:9
msgid "Time"
msgstr "时间"
-#: ../src/e-util/e-dateedit.c:701
+#: ../src/e-util/e-dateedit.c:714
msgid "No_w"
msgstr "现在(_W)"
-#: ../src/e-util/e-dateedit.c:708
+#: ../src/e-util/e-dateedit.c:721
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:717
+#: ../src/e-util/e-dateedit.c:730 ../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:1839 ../src/e-util/e-dateedit.c:2087
+#: ../src/e-util/e-dateedit.c:1889 ../src/e-util/e-dateedit.c:2140
msgctxt "date"
msgid "None"
msgstr "无"
-#: ../src/e-util/e-dateedit.c:1979
+#: ../src/e-util/e-dateedit.c:2025 ../src/e-util/e-dateedit.c:2494
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../src/e-util/e-dateedit.c:2024
+#: ../src/e-util/e-dateedit.c:2063 ../src/e-util/e-dateedit.c:2551
msgid "Invalid Time Value"
msgstr "无效的时间值"
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:281
-msgid "Tomorrow"
-msgstr "明天"
-
-#: ../src/e-util/e-datetime-format.c:219
+#: ../src/e-util/e-datetime-format.c:220
msgid "Yesterday"
msgstr "昨天"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:227
+#: ../src/e-util/e-datetime-format.c:228
msgctxt "DateFmt"
msgid "Next Mon"
msgstr "下周一"
@@ -12587,7 +13603,7 @@ msgstr "下周一"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:233
+#: ../src/e-util/e-datetime-format.c:234
msgctxt "DateFmt"
msgid "Next Tue"
msgstr "下周二"
@@ -12595,7 +13611,7 @@ msgstr "下周二"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:239
+#: ../src/e-util/e-datetime-format.c:240
msgctxt "DateFmt"
msgid "Next Wed"
msgstr "下周三"
@@ -12603,7 +13619,7 @@ msgstr "下周三"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:245
+#: ../src/e-util/e-datetime-format.c:246
msgctxt "DateFmt"
msgid "Next Thu"
msgstr "下周四"
@@ -12611,7 +13627,7 @@ msgstr "下周四"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:251
+#: ../src/e-util/e-datetime-format.c:252
msgctxt "DateFmt"
msgid "Next Fri"
msgstr "下周五"
@@ -12619,7 +13635,7 @@ msgstr "下周五"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:257
+#: ../src/e-util/e-datetime-format.c:258
msgctxt "DateFmt"
msgid "Next Sat"
msgstr "下周六"
@@ -12627,48 +13643,40 @@ msgstr "下周六"
#. Translators: This is used for abbreviated days in the future.
#. * You can use strftime modifiers here too, like "Next %a", to avoid
#. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:263
+#: ../src/e-util/e-datetime-format.c:264
msgctxt "DateFmt"
msgid "Next Sun"
msgstr "下周日"
-#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
-#: ../src/e-util/e-datetime-format.c:368
+#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
+#: ../src/e-util/e-datetime-format.c:386
msgid "Use locale default"
msgstr "使用本地默认值"
-#: ../src/e-util/e-datetime-format.c:573
+#: ../src/e-util/e-datetime-format.c:610
msgid "Format:"
msgstr "格式："
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
#: ../src/e-util/e-dialog-widgets.c:181
-#, fuzzy
-#| msgid "days"
msgctxt "time-unit"
msgid "days"
msgstr "天"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
#: ../src/e-util/e-dialog-widgets.c:183
-#, fuzzy
-#| msgid "weeks"
msgctxt "time-unit"
msgid "weeks"
msgstr "周"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
#: ../src/e-util/e-dialog-widgets.c:185
-#, fuzzy
-#| msgid "months"
msgctxt "time-unit"
msgid "months"
msgstr "月"
#. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
#: ../src/e-util/e-dialog-widgets.c:187
-#, fuzzy
-#| msgid "years"
msgctxt "time-unit"
msgid "years"
msgstr "年"
@@ -12678,6 +13686,12 @@ msgstr "年"
msgid "Do not synchronize locally mails older than"
msgstr ""
+#. Translators: The %s is replaced with a spin button; always keep it in the string at the right position
+#: ../src/e-util/e-dialog-widgets.c:437
+#, c-format
+msgid "Mark messages as read after %s seconds"
+msgstr "等待 %s 秒后将信息标记为已读"
+
#. Translators: :-)
#: ../src/e-util/e-emoticon-chooser.c:38
msgid "_Smile"
@@ -12789,18 +13803,16 @@ msgstr "(未知文件名)"
#. Translators: The string value is the basename of a file.
#: ../src/e-util/e-file-utils.c:125
-#, fuzzy, c-format
-#| msgid "Writing \"%s\""
+#, c-format
msgid "Writing “%s”"
msgstr "正在写入“%s”"
#. Translators: The first string value is the basename of a
#. * remote file, the second string value is the hostname.
#: ../src/e-util/e-file-utils.c:130
-#, fuzzy, c-format
-#| msgid "Writing \"%s\" to %s"
+#, c-format
msgid "Writing “%s” to %s"
-msgstr "把“%s”写入到 %s"
+msgstr "正在将“%s”写入到 %s"
#. Don't delete this code, since it is needed so that xgettext can extract the translations.
#. * Please, keep these strings in sync with the strings in the timespans array
@@ -12889,20 +13901,22 @@ msgid_plural "%d years in the future"
msgstr[0] "%d 年内"
#: ../src/e-util/e-filter-datespec.c:127
+#, c-format
msgid "<click here to select a date>"
msgstr "<单击此处以选择日期>"
-#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
-#: ../src/e-util/e-filter-datespec.c:152
+#: ../src/e-util/e-filter-datespec.c:132 ../src/e-util/e-filter-datespec.c:143
+#: ../src/e-util/e-filter-datespec.c:154
+#, c-format
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../src/e-util/e-filter-datespec.c:137
+#: ../src/e-util/e-filter-datespec.c:139
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../src/e-util/e-filter-datespec.c:286
+#: ../src/e-util/e-filter-datespec.c:297
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
@@ -12910,23 +13924,23 @@ msgstr "选择用于比较的时间"
msgid "Choose a File"
msgstr "选择文件"
-#: ../src/e-util/e-filter-rule.c:763
+#: ../src/e-util/e-filter-rule.c:1061
msgid "R_ule name:"
msgstr "规则名(_U)："
-#: ../src/e-util/e-filter-rule.c:813
+#: ../src/e-util/e-filter-rule.c:1117
msgid "all the following conditions"
msgstr "下列所有条件"
-#: ../src/e-util/e-filter-rule.c:814
+#: ../src/e-util/e-filter-rule.c:1118
msgid "any of the following conditions"
msgstr "下列条件之一"
-#: ../src/e-util/e-filter-rule.c:820
+#: ../src/e-util/e-filter-rule.c:1124
msgid "_Find items which match:"
msgstr "查找匹配的项目(_F)："
-#: ../src/e-util/e-filter-rule.c:843
+#: ../src/e-util/e-filter-rule.c:1147
msgid "Find items that meet the following conditions"
msgstr "查找符合下列条件的项目"
@@ -12934,574 +13948,716 @@ msgstr "查找符合下列条件的项目"
#. * part of "Include threads: None"
#. protocol:
#. name:
-#: ../src/e-util/e-filter-rule.c:858
-#: ../src/e-util/e-html-editor-page-dialog.c:59
-#: ../src/e-util/e-mail-identity-combo-box.c:597
+#: ../src/e-util/e-filter-rule.c:1162
+#: ../src/e-util/e-html-editor-page-dialog.c:62
+#: ../src/e-util/e-mail-identity-combo-box.c:694
#: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:28
-#: ../src/mail/e-mail-config-summary-page.c:140
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../src/libemail-engine/camel-null-store.c:29
+#: ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:143
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
msgid "None"
msgstr "无"
-#: ../src/e-util/e-filter-rule.c:859
+#: ../src/e-util/e-filter-rule.c:1163
msgid "All related"
msgstr "相关的全部"
-#: ../src/e-util/e-filter-rule.c:860 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1164 ../src/e-util/e-send-options.ui.h:24
msgid "Replies"
msgstr "回复"
-#: ../src/e-util/e-filter-rule.c:861
+#: ../src/e-util/e-filter-rule.c:1165
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../src/e-util/e-filter-rule.c:862
+#: ../src/e-util/e-filter-rule.c:1166
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../src/e-util/e-filter-rule.c:865
+#: ../src/e-util/e-filter-rule.c:1169
msgid "I_nclude threads:"
msgstr "包含线索(_N)："
-#: ../src/e-util/e-filter-rule.c:944
+#: ../src/e-util/e-filter-rule.c:1247
msgid "A_dd Condition"
msgstr "添加动作(_D)"
-#: ../src/e-util/e-filter-rule.c:1258 ../src/e-util/filter.ui.h:1
-#: ../src/mail/em-utils.c:166
+#: ../src/e-util/e-filter-rule.c:1567 ../src/e-util/filter.ui.h:1
+#: ../src/mail/em-filter-rule.c:1042 ../src/mail/em-utils.c:166
msgid "Incoming"
msgstr "接收"
-#: ../src/e-util/e-filter-rule.c:1258 ../src/mail/em-utils.c:167
+#: ../src/e-util/e-filter-rule.c:1567 ../src/mail/em-filter-rule.c:1043
+#: ../src/mail/em-utils.c:167
msgid "Outgoing"
msgstr "寄出"
-#: ../src/e-util/e-html-editor-actions.c:80
+#: ../src/e-util/e-gtkemojichooser.c:753
+msgctxt "EmojiChooser"
+msgid "Recent"
+msgstr "最近"
+
+#: ../src/e-util/e-gtkemojichooser.c:757
+msgctxt "EmojiChooser"
+msgid "Smileys & People"
+msgstr ""
+
+#: ../src/e-util/e-gtkemojichooser.c:758
+#, fuzzy
+#| msgid "Body contains"
+msgctxt "EmojiChooser"
+msgid "Body & Clothing"
+msgstr "邮件体含有"
+
+#: ../src/e-util/e-gtkemojichooser.c:759
+msgctxt "EmojiChooser"
+msgid "Animals & Nature"
+msgstr "动物和自然"
+
+#: ../src/e-util/e-gtkemojichooser.c:760
+msgctxt "EmojiChooser"
+msgid "Food & Drink"
+msgstr "食物和饮品"
+
+#: ../src/e-util/e-gtkemojichooser.c:761
+msgctxt "EmojiChooser"
+msgid "Travel & Places"
+msgstr "旅游和地点"
+
+#: ../src/e-util/e-gtkemojichooser.c:762
+msgctxt "EmojiChooser"
+msgid "Activities"
+msgstr "活动"
+
+#: ../src/e-util/e-gtkemojichooser.c:763
+#, fuzzy
+#| msgid "Subject"
+msgctxt "EmojiChooser"
+msgid "Objects"
+msgstr "主题"
+
+#: ../src/e-util/e-gtkemojichooser.c:764
+msgctxt "EmojiChooser"
+msgid "Symbols"
+msgstr ""
+
+#: ../src/e-util/e-gtkemojichooser.c:765
+msgctxt "EmojiChooser"
+msgid "Flags"
+msgstr "旗帜"
+
+#: ../src/e-util/e-gtkemojichooser.c:789
+msgctxt "EmojiChooser"
+msgid "No Results Found"
+msgstr "未找到结果"
+
+#: ../src/e-util/e-gtkemojichooser.c:797
+msgctxt "EmojiChooser"
+msgid "Try a different search"
+msgstr ""
+
+#: ../src/e-util/e-html-editor-actions.c:81
msgid "Failed to insert HTML file."
msgstr "插入 HTML 文件失败。"
-#: ../src/e-util/e-html-editor-actions.c:118
+#: ../src/e-util/e-html-editor-actions.c:119
msgid "Failed to insert text file."
msgstr "插入文本文件失败。"
-#: ../src/e-util/e-html-editor-actions.c:319
+#: ../src/e-util/e-html-editor-actions.c:340
msgid "Insert HTML File"
msgstr "插入 HTML 文件"
-#: ../src/e-util/e-html-editor-actions.c:325
+#: ../src/e-util/e-html-editor-actions.c:345
msgid "HTML file"
msgstr "HTML 文件"
-#: ../src/e-util/e-html-editor-actions.c:355
+#: ../src/e-util/e-html-editor-actions.c:383
+#: ../src/e-util/e-html-editor-actions.c:401
msgctxt "dialog-title"
msgid "Insert Image"
msgstr "插入图像"
-#: ../src/e-util/e-html-editor-actions.c:413
+#: ../src/e-util/e-html-editor-actions.c:390
+#: ../src/e-util/e-html-editor-actions.c:408
+#: ../src/e-util/e-image-chooser-dialog.c:188 ../src/plugins/face/face.c:301
+msgid "Image files"
+msgstr "图像文件"
+
+#: ../src/e-util/e-html-editor-actions.c:487
msgid "Insert text file"
msgstr "插入文本文件"
-#: ../src/e-util/e-html-editor-actions.c:419
+#: ../src/e-util/e-html-editor-actions.c:492
msgid "Text file"
msgstr "文本文件"
-#: ../src/e-util/e-html-editor-actions.c:880
+#: ../src/e-util/e-html-editor-actions.c:1074
msgid "Copy selected text to the clipboard"
msgstr "将选中文本复制到剪贴板"
-#: ../src/e-util/e-html-editor-actions.c:887
+#: ../src/e-util/e-html-editor-actions.c:1081
msgid "Cut selected text to the clipboard"
msgstr "将选中文本剪切到剪贴板"
-#. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:894
+#: ../src/e-util/e-html-editor-actions.c:1088
msgid "Paste text from the clipboard"
msgstr "从剪贴板中粘贴文本"
-#: ../src/e-util/e-html-editor-actions.c:901
+#: ../src/e-util/e-html-editor-actions.c:1095
msgid "Redo the last undone action"
msgstr "重做上次操作"
-#: ../src/e-util/e-html-editor-actions.c:915
+#: ../src/e-util/e-html-editor-actions.c:1109
msgid "Undo the last action"
msgstr "撤消上次操作"
-#: ../src/e-util/e-html-editor-actions.c:936
+#: ../src/e-util/e-html-editor-actions.c:1130
msgid "For_mat"
msgstr "格式(_M)"
-#: ../src/e-util/e-html-editor-actions.c:943
+#: ../src/e-util/e-html-editor-actions.c:1137
msgid "_Paragraph Style"
msgstr "段落样式(_P)"
-#: ../src/e-util/e-html-editor-actions.c:957
-#: ../src/e-util/e-html-editor-image-dialog.c:585
+#: ../src/e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-image-dialog.c:590
msgid "_Alignment"
msgstr "对齐(_A)"
-#: ../src/e-util/e-html-editor-actions.c:964
+#: ../src/e-util/e-html-editor-actions.c:1158
msgid "Current _Languages"
msgstr "当前语言(_L)"
-#: ../src/e-util/e-html-editor-actions.c:981
+#: ../src/e-util/e-html-editor-actions.c:1175
msgid "_Increase Indent"
msgstr "增加缩进(_I)"
-#: ../src/e-util/e-html-editor-actions.c:983
+#: ../src/e-util/e-html-editor-actions.c:1177
msgid "Increase Indent"
msgstr "增加缩进"
-#: ../src/e-util/e-html-editor-actions.c:988
-msgid "_HTML File..."
-msgstr "HTML 文件(_H)..."
+#: ../src/e-util/e-html-editor-actions.c:1182
+#: ../src/e-util/e-html-editor-actions.c:2212
+msgid "E_moji"
+msgstr "表情符号"
+
+#: ../src/e-util/e-html-editor-actions.c:1184
+#: ../src/e-util/e-html-editor-actions.c:1191
+msgid "Insert Emoji"
+msgstr "插入表情符号"
+
+#: ../src/e-util/e-html-editor-actions.c:1189
+msgid "Insert E_moji"
+msgstr "插入表情符号(_M)"
-#: ../src/e-util/e-html-editor-actions.c:995
-msgid "Te_xt File..."
-msgstr "文本文件(_X)..."
+#: ../src/e-util/e-html-editor-actions.c:1196
+msgid "_HTML File…"
+msgstr "HTML 文件(_H)…"
-#: ../src/e-util/e-html-editor-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1203
+msgid "Te_xt File…"
+msgstr "文本文件(_X)…"
+
+#: ../src/e-util/e-html-editor-actions.c:1210
msgid "Paste _Quotation"
msgstr "粘贴引用(_Q)"
-#: ../src/e-util/e-html-editor-actions.c:1009
-msgid "_Find..."
-msgstr "查找(_F)..."
+#: ../src/e-util/e-html-editor-actions.c:1217
+msgid "_Find…"
+msgstr "查找(_F)…"
-#: ../src/e-util/e-html-editor-actions.c:1011
+#: ../src/e-util/e-html-editor-actions.c:1219
msgid "Search for text"
msgstr "搜索文本"
-#: ../src/e-util/e-html-editor-actions.c:1016
+#: ../src/e-util/e-html-editor-actions.c:1224
msgid "Find A_gain"
msgstr "再查找一遍(_G)"
-#: ../src/e-util/e-html-editor-actions.c:1023
-msgid "Re_place..."
-msgstr "替换(_R)..."
+#: ../src/e-util/e-html-editor-actions.c:1231
+msgid "Re_place…"
+msgstr "替换(_P)…"
-#: ../src/e-util/e-html-editor-actions.c:1025
+#: ../src/e-util/e-html-editor-actions.c:1233
msgid "Search for and replace text"
msgstr "搜索和替换文本"
-#: ../src/e-util/e-html-editor-actions.c:1030
-msgid "Check _Spelling..."
-msgstr "检查拼写(_S)..."
+#: ../src/e-util/e-html-editor-actions.c:1238
+msgid "Check _Spelling…"
+msgstr "检查拼写(_S)…"
-#: ../src/e-util/e-html-editor-actions.c:1037
+#: ../src/e-util/e-html-editor-actions.c:1245
msgid "_Decrease Indent"
msgstr "减小缩进(_D)"
-#: ../src/e-util/e-html-editor-actions.c:1039
+#: ../src/e-util/e-html-editor-actions.c:1247
msgid "Decrease Indent"
msgstr "减小缩进"
-#: ../src/e-util/e-html-editor-actions.c:1044
+#: ../src/e-util/e-html-editor-actions.c:1252
msgid "_Wrap Lines"
msgstr "换行(_W)"
#. Center
-#: ../src/e-util/e-html-editor-actions.c:1054
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:108
+#: ../src/e-util/e-html-editor-actions.c:1262
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:109
msgid "_Center"
msgstr "中间(_C)"
-#: ../src/e-util/e-html-editor-actions.c:1056
+#: ../src/e-util/e-html-editor-actions.c:1264
msgid "Center Alignment"
msgstr "中间对齐"
+#. Justified
+#: ../src/e-util/e-html-editor-actions.c:1269
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:127
+#, fuzzy
+#| msgid "Justification"
+msgid "_Justified"
+msgstr "两端对齐"
+
+#: ../src/e-util/e-html-editor-actions.c:1271
+msgid "Align Justified"
+msgstr ""
+
#. Left
-#: ../src/e-util/e-html-editor-actions.c:1061
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:99
+#: ../src/e-util/e-html-editor-actions.c:1276
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:100
msgid "_Left"
msgstr "左(_L)"
-#: ../src/e-util/e-html-editor-actions.c:1063
+#: ../src/e-util/e-html-editor-actions.c:1278
msgid "Left Alignment"
msgstr "左对齐"
#. Right
-#: ../src/e-util/e-html-editor-actions.c:1068
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:117
+#: ../src/e-util/e-html-editor-actions.c:1283
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:118
msgid "_Right"
msgstr "右(_R)"
-#: ../src/e-util/e-html-editor-actions.c:1070
+#: ../src/e-util/e-html-editor-actions.c:1285
msgid "Right Alignment"
msgstr "右对齐"
-#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/e-util/e-html-editor-actions.c:1293
#: ../src/modules/text-highlight/languages.c:70
msgid "_HTML"
msgstr "_HTML"
-#: ../src/e-util/e-html-editor-actions.c:1080
+#: ../src/e-util/e-html-editor-actions.c:1295
msgid "HTML editing mode"
msgstr "编辑 HTML 模式"
-#: ../src/e-util/e-html-editor-actions.c:1085
+#: ../src/e-util/e-html-editor-actions.c:1300
msgid "Plain _Text"
msgstr "纯文字(_T)"
-#: ../src/e-util/e-html-editor-actions.c:1087
+#: ../src/e-util/e-html-editor-actions.c:1302
msgid "Plain text editing mode"
msgstr "纯文字编辑模式"
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1310
msgid "_Normal"
msgstr "中(_N)"
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1317
#, fuzzy
#| msgid "Header _1"
msgid "Heading _1"
msgstr "标题 _1"
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1324
#, fuzzy
#| msgid "Header _2"
msgid "Heading _2"
msgstr "标题 _2"
-#: ../src/e-util/e-html-editor-actions.c:1116
+#: ../src/e-util/e-html-editor-actions.c:1331
#, fuzzy
#| msgid "Header _3"
msgid "Heading _3"
msgstr "标题 _3"
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1338
#, fuzzy
#| msgid "Header _4"
msgid "Heading _4"
msgstr "标题 _4"
-#: ../src/e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1345
#, fuzzy
#| msgid "Header _5"
msgid "Heading _5"
msgstr "标题 _5"
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1352
#, fuzzy
#| msgid "Header _6"
msgid "Heading _6"
msgstr "标题 _6"
-#: ../src/e-util/e-html-editor-actions.c:1144
+#: ../src/e-util/e-html-editor-actions.c:1359
msgid "_Preformatted"
msgstr "预格式化(_P)"
-#: ../src/e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-actions.c:1366
msgid "A_ddress"
msgstr "地址(_D)"
-#: ../src/e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1373
msgid "_Bulleted List"
msgstr "项目符号列表(_B)"
-#: ../src/e-util/e-html-editor-actions.c:1165
+#: ../src/e-util/e-html-editor-actions.c:1380
msgid "_Roman Numeral List"
msgstr "罗马数字列表(_R)"
-#: ../src/e-util/e-html-editor-actions.c:1172
+#: ../src/e-util/e-html-editor-actions.c:1387
msgid "Numbered _List"
msgstr "编号列表(_L)"
-#: ../src/e-util/e-html-editor-actions.c:1179
+#: ../src/e-util/e-html-editor-actions.c:1394
msgid "_Alphabetical List"
msgstr "字母列表(_A)"
-#: ../src/e-util/e-html-editor-actions.c:1195
-#: ../src/e-util/e-html-editor-actions.c:1233
-msgid "_Image..."
-msgstr "图像(_I)..."
+#: ../src/e-util/e-html-editor-actions.c:1410
+#: ../src/e-util/e-html-editor-actions.c:1448
+msgid "_Image…"
+msgstr "图像(_I)…"
#. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1198
+#: ../src/e-util/e-html-editor-actions.c:1413
msgid "Insert Image"
msgstr "插入图像"
-#: ../src/e-util/e-html-editor-actions.c:1203
-#: ../src/e-util/e-html-editor-actions.c:1240
-msgid "_Link..."
+#: ../src/e-util/e-html-editor-actions.c:1418
+#: ../src/e-util/e-html-editor-actions.c:1455
+msgid "_Link…"
msgstr "链接(_L)…"
-#: ../src/e-util/e-html-editor-actions.c:1205
+#: ../src/e-util/e-html-editor-actions.c:1420
msgid "Insert Link"
msgstr "插入链接"
#. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1211
-#: ../src/e-util/e-html-editor-actions.c:1255
-msgid "_Rule..."
-msgstr "横线(_R)..."
+#: ../src/e-util/e-html-editor-actions.c:1426
+#: ../src/e-util/e-html-editor-actions.c:1470
+#, fuzzy
+#| msgid "_Rule"
+msgid "_Rule…"
+msgstr "横线(_R)"
#. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1429
msgid "Insert Rule"
msgstr "插入横线"
-#: ../src/e-util/e-html-editor-actions.c:1219
-#: ../src/e-util/e-html-editor-actions.c:1262
-msgid "_Table..."
-msgstr "表格(_T)"
+#: ../src/e-util/e-html-editor-actions.c:1434
+#: ../src/e-util/e-html-editor-actions.c:1477
+msgid "_Table…"
+msgstr "表格(_T)…"
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1436
msgid "Insert Table"
msgstr "插入表格"
-#: ../src/e-util/e-html-editor-actions.c:1226
-msgid "_Cell..."
+#: ../src/e-util/e-html-editor-actions.c:1441
+#, fuzzy
+#| msgid "_Cell..."
+msgid "_Cell…"
msgstr "单元格(_C)…"
-#: ../src/e-util/e-html-editor-actions.c:1247
-msgid "Pa_ge..."
-msgstr "页面(_G)..."
+#: ../src/e-util/e-html-editor-actions.c:1462
+msgid "Pa_ge…"
+msgstr "页面(_G)…"
-#: ../src/e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1486
msgid "Font _Size"
msgstr "字体大小(_S)"
-#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-actions.c:1493
msgid "_Font Style"
msgstr "字体样式(_F)"
-#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-actions.c:1500
msgid "Paste As _Text"
msgstr "以文本粘贴(_T)"
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1511
#: ../src/e-util/e-html-editor-text-dialog.c:201
msgid "_Bold"
msgstr "粗体(_B)"
-#: ../src/e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1513
msgid "Bold"
msgstr "粗体"
-#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-actions.c:1519
#: ../src/e-util/e-html-editor-text-dialog.c:212
msgid "_Italic"
msgstr "斜体(_I)"
-#: ../src/e-util/e-html-editor-actions.c:1306
+#: ../src/e-util/e-html-editor-actions.c:1521
msgid "Italic"
msgstr "斜体"
-#: ../src/e-util/e-html-editor-actions.c:1312
-msgid "_Plain Text"
-msgstr "纯文字(_P)"
-
-#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-actions.c:1527
#: ../src/e-util/e-html-editor-text-dialog.c:233
msgid "_Strikethrough"
msgstr "删除线(_S)"
-#: ../src/e-util/e-html-editor-actions.c:1322
+#: ../src/e-util/e-html-editor-actions.c:1529
msgid "Strikethrough"
msgstr "删除线"
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1535
+#, fuzzy
+#| msgid "S_cript:"
+msgid "Subs_cript"
+msgstr "脚本(_C)："
+
+#: ../src/e-util/e-html-editor-actions.c:1537
+#, fuzzy
+#| msgid "_Subscribe"
+msgid "Subscript"
+msgstr "订阅(_S)"
+
+#: ../src/e-util/e-html-editor-actions.c:1543
+#, fuzzy
+#| msgid "S_cript:"
+msgid "Su_perscript"
+msgstr "脚本(_C)："
+
+#: ../src/e-util/e-html-editor-actions.c:1545
+#, fuzzy
+#| msgid "Description"
+msgid "Superscript"
+msgstr "描述"
+
+#: ../src/e-util/e-html-editor-actions.c:1551
#: ../src/e-util/e-html-editor-text-dialog.c:223
msgid "_Underline"
msgstr "下划线(_U)"
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1553
msgid "Underline"
msgstr "下划线"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1340
+#: ../src/e-util/e-html-editor-actions.c:1563
msgid "-2"
msgstr "-2"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1348
+#: ../src/e-util/e-html-editor-actions.c:1571
msgid "-1"
msgstr "-1"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1356
+#: ../src/e-util/e-html-editor-actions.c:1579
msgid "+0"
msgstr "+0"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1364
+#: ../src/e-util/e-html-editor-actions.c:1587
msgid "+1"
msgstr "+1"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1372
+#: ../src/e-util/e-html-editor-actions.c:1595
msgid "+2"
msgstr "+2"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1380
+#: ../src/e-util/e-html-editor-actions.c:1603
msgid "+3"
msgstr "+3"
#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1388
+#: ../src/e-util/e-html-editor-actions.c:1611
msgid "+4"
msgstr "+4"
-#: ../src/e-util/e-html-editor-actions.c:1407
+#: ../src/e-util/e-html-editor-actions.c:1630
msgid "Cell Contents"
msgstr "单元格内容"
-#: ../src/e-util/e-html-editor-actions.c:1414
+#: ../src/e-util/e-html-editor-actions.c:1637
msgid "Column"
msgstr "列"
-#: ../src/e-util/e-html-editor-actions.c:1421
+#: ../src/e-util/e-html-editor-actions.c:1644
msgid "Row"
msgstr "行"
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1651
msgid "Table"
msgstr "表格"
#. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1438
+#: ../src/e-util/e-html-editor-actions.c:1661
msgid "Table Delete"
msgstr "表格删除"
#. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1669
msgid "Table Insert"
msgstr "表格插入"
-#: ../src/e-util/e-html-editor-actions.c:1453
+#: ../src/e-util/e-html-editor-actions.c:1676
msgid "Properties"
msgstr "属性"
-#: ../src/e-util/e-html-editor-actions.c:1471
+#: ../src/e-util/e-html-editor-actions.c:1694
msgid "Column After"
msgstr "列后"
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1701
msgid "Column Before"
msgstr "列前"
-#: ../src/e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1708
msgid "Insert _Link"
msgstr "插入链接(_L)"
-#: ../src/e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1715
msgid "Row Above"
msgstr "行上"
-#: ../src/e-util/e-html-editor-actions.c:1499
+#: ../src/e-util/e-html-editor-actions.c:1722
msgid "Row Below"
msgstr "行下"
-#: ../src/e-util/e-html-editor-actions.c:1506
-msgid "Cell..."
-msgstr "单元格…"
+#: ../src/e-util/e-html-editor-actions.c:1729
+msgid "Cell…"
+msgstr ""
-#: ../src/e-util/e-html-editor-actions.c:1513
-msgid "Image..."
-msgstr "图像…"
+#: ../src/e-util/e-html-editor-actions.c:1736
+#, fuzzy
+#| msgid "Image"
+msgid "Image…"
+msgstr "图像"
-#: ../src/e-util/e-html-editor-actions.c:1520
-msgid "Link..."
+#: ../src/e-util/e-html-editor-actions.c:1743
+msgid "Link…"
msgstr "链接…"
-#: ../src/e-util/e-html-editor-actions.c:1527
-msgid "Page..."
+#: ../src/e-util/e-html-editor-actions.c:1750
+msgid "Page…"
msgstr "页面…"
-#: ../src/e-util/e-html-editor-actions.c:1534
-msgid "Paragraph..."
+#: ../src/e-util/e-html-editor-actions.c:1757
+msgid "Paragraph…"
msgstr "段落…"
#. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1542
-msgid "Rule..."
-msgstr "横线..."
+#: ../src/e-util/e-html-editor-actions.c:1765
+#, fuzzy
+#| msgid "_Rule"
+msgid "Rule…"
+msgstr "横线(_R)"
-#: ../src/e-util/e-html-editor-actions.c:1549
-msgid "Table..."
+#: ../src/e-util/e-html-editor-actions.c:1772
+msgid "Table…"
msgstr "表格…"
-#: ../src/e-util/e-html-editor-actions.c:1556
-msgid "Text..."
-msgstr "文字…"
+#: ../src/e-util/e-html-editor-actions.c:1779
+#, fuzzy
+#| msgid "_Text:"
+msgid "Text…"
+msgstr "文字(_T)："
-#: ../src/e-util/e-html-editor-actions.c:1563
+#: ../src/e-util/e-html-editor-actions.c:1786
msgid "Remove Link"
msgstr "删除链接"
-#: ../src/e-util/e-html-editor-actions.c:1580
+#: ../src/e-util/e-html-editor-actions.c:1803
msgid "Add Word to Dictionary"
msgstr "添加词语到字典"
-#: ../src/e-util/e-html-editor-actions.c:1587
+#: ../src/e-util/e-html-editor-actions.c:1810
msgid "Ignore Misspelled Word"
msgstr "忽略拼错词语"
-#: ../src/e-util/e-html-editor-actions.c:1594
+#: ../src/e-util/e-html-editor-actions.c:1817
msgid "Add Word To"
msgstr "添加词语到"
-#: ../src/e-util/e-html-editor-actions.c:1603
+#: ../src/e-util/e-html-editor-actions.c:1826
msgid "More Suggestions"
msgstr "更多建议"
#. Translators: %s will be replaced with the actual dictionary
#. * name, where a user can add a word to. This is part of an
#. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1727
+#: ../src/e-util/e-html-editor-actions.c:2061
#, c-format
msgid "%s Dictionary"
msgstr "%s 字典"
-#: ../src/e-util/e-html-editor-actions.c:1806
+#: ../src/e-util/e-html-editor-actions.c:2140
msgid "_Emoticon"
msgstr "表情(_E)"
-#: ../src/e-util/e-html-editor-actions.c:1807
+#: ../src/e-util/e-html-editor-actions.c:2141
msgid "Insert Emoticon"
msgstr "插入表情"
-#: ../src/e-util/e-html-editor-actions.c:1875
+#: ../src/e-util/e-html-editor-actions.c:2209
msgid "Re_place"
msgstr "替换(_P)"
-#: ../src/e-util/e-html-editor-actions.c:1878
+#: ../src/e-util/e-html-editor-actions.c:2215
msgid "_Image"
msgstr "图像(_I)"
-#: ../src/e-util/e-html-editor-actions.c:1881
+#: ../src/e-util/e-html-editor-actions.c:2218
msgid "_Link"
msgstr "链接(_L)"
#. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1885
+#: ../src/e-util/e-html-editor-actions.c:2222
msgid "_Rule"
msgstr "横线(_R)"
-#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-actions.c:2225
#: ../src/e-util/e-html-editor-cell-dialog.c:448
msgid "_Table"
msgstr "表格(_T)"
-#: ../src/e-util/e-html-editor.c:689
+#: ../src/e-util/e-html-editor.c:863
msgid "Paragraph Style"
msgstr "段落样式"
-#: ../src/e-util/e-html-editor.c:703
+#: ../src/e-util/e-html-editor.c:877
msgid "Editing Mode"
msgstr "编辑模式"
-#: ../src/e-util/e-html-editor.c:715
+#: ../src/e-util/e-html-editor.c:889
msgid "Font Color"
msgstr "字体颜色"
-#: ../src/e-util/e-html-editor.c:725
+#: ../src/e-util/e-html-editor.c:900
+msgid "Background Color"
+msgstr "背景颜色"
+
+#: ../src/e-util/e-html-editor.c:910
msgid "Font Size"
msgstr "字体大小"
+#: ../src/e-util/e-html-editor.c:919
+msgid "Font Name"
+msgstr "字体名称"
+
+#: ../src/e-util/e-html-editor.c:1523
+#, fuzzy
+#| msgid "Failed to insert text file."
+msgid "Failed to obtain content of editor"
+msgstr "插入文本文件失败。"
+
#: ../src/e-util/e-html-editor-cell-dialog.c:408
msgid "<b>Scope</b>"
msgstr "<b>范围</b>"
@@ -13523,20 +14679,20 @@ msgid "<b>Alignment & Behavior</b>"
msgstr "<b>对齐 & 行为</b>"
#: ../src/e-util/e-html-editor-cell-dialog.c:484
-#: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-hrule-dialog.c:306
+#: ../src/e-util/e-html-editor-table-dialog.c:639
msgid "Left"
msgstr "左对齐"
#: ../src/e-util/e-html-editor-cell-dialog.c:485
-#: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-table-dialog.c:640
msgid "Center"
msgstr "居中"
#: ../src/e-util/e-html-editor-cell-dialog.c:486
-#: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:651
+#: ../src/e-util/e-html-editor-hrule-dialog.c:310
+#: ../src/e-util/e-html-editor-table-dialog.c:641
msgid "Right"
msgstr "高度右对齐"
@@ -13545,17 +14701,17 @@ msgid "_Horizontal:"
msgstr "水平(_H)"
#: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:575
+#: ../src/e-util/e-html-editor-image-dialog.c:580
msgid "Top"
msgstr "顶部"
#: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:576
+#: ../src/e-util/e-html-editor-image-dialog.c:581
msgid "Middle"
msgstr "中间"
#: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:577
+#: ../src/e-util/e-html-editor-image-dialog.c:582
msgid "Bottom"
msgstr "底部"
@@ -13574,8 +14730,8 @@ msgid "_Header Style"
msgstr "报头样式(_H)"
#: ../src/e-util/e-html-editor-cell-dialog.c:540
-#: ../src/e-util/e-html-editor-image-dialog.c:515
-#: ../src/e-util/e-html-editor-table-dialog.c:561
+#: ../src/e-util/e-html-editor-image-dialog.c:520
+#: ../src/e-util/e-html-editor-table-dialog.c:551
msgid "<b>Layout</b>"
msgstr "<b>版面</b>"
@@ -13593,12 +14749,12 @@ msgid "Co_lumn Span:"
msgstr "列宽(_L)"
#: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:665
+#: ../src/e-util/e-html-editor-table-dialog.c:655
msgid "<b>Background</b>"
msgstr "<b>背景</b>"
#: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:678
+#: ../src/e-util/e-html-editor-table-dialog.c:668
msgid "Transparent"
msgstr "透明"
@@ -13606,29 +14762,32 @@ msgstr "透明"
msgid "C_olor:"
msgstr "颜色(_O)："
-#: ../src/e-util/e-html-editor-cell-dialog.c:641
-#: ../src/e-util/e-html-editor-image-dialog.c:477
-#: ../src/e-util/e-html-editor-table-dialog.c:694
-msgid "Choose Background Image"
-msgstr "选择背景图像"
-
-#: ../src/e-util/e-html-editor-cell-dialog.c:646
-#: ../src/e-util/e-html-editor-image-dialog.c:483
-#: ../src/e-util/e-html-editor-table-dialog.c:699
+#: ../src/e-util/e-html-editor-cell-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:476
+#: ../src/e-util/e-html-editor-table-dialog.c:683
msgid "Images"
msgstr "图像"
-#: ../src/e-util/e-html-editor-cell-dialog.c:659
+#: ../src/e-util/e-html-editor-cell-dialog.c:645
+#: ../src/e-util/e-html-editor-cell-dialog.c:648
+#: ../src/e-util/e-html-editor-image-dialog.c:481
+#: ../src/e-util/e-html-editor-image-dialog.c:484
+#: ../src/e-util/e-html-editor-table-dialog.c:688
+#: ../src/e-util/e-html-editor-table-dialog.c:693
+msgid "Choose Background Image"
+msgstr "选择背景图像"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:662
msgid "_Image:"
msgstr "图像(_I)"
-#: ../src/e-util/e-html-editor-cell-dialog.c:666
-#: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:719
+#: ../src/e-util/e-html-editor-cell-dialog.c:669
+#: ../src/e-util/e-html-editor-page-dialog.c:545
+#: ../src/e-util/e-html-editor-table-dialog.c:714
msgid "_Remove image"
msgstr "删除图像(_R)"
-#: ../src/e-util/e-html-editor-cell-dialog.c:686
+#: ../src/e-util/e-html-editor-cell-dialog.c:689
msgid "Cell Properties"
msgstr "单元格属性"
@@ -13650,177 +14809,189 @@ msgstr "区分大小写(_S)"
msgid "_Wrap Search"
msgstr "循环搜索(_W)"
-#: ../src/e-util/e-html-editor-find-dialog.c:268
+#: ../src/e-util/e-html-editor-find-dialog.c:262
msgid "Find"
msgstr "查找"
-#: ../src/e-util/e-html-editor-hrule-dialog.c:263
+#: ../src/e-util/e-html-editor-hrule-dialog.c:241
msgid "<b>Size</b>"
msgstr "<b>大小</b>"
#. Width
-#: ../src/e-util/e-html-editor-hrule-dialog.c:283
-#: ../src/e-util/e-html-editor-image-dialog.c:533
-#: ../src/e-util/e-html-editor-table-dialog.c:572
+#: ../src/e-util/e-html-editor-hrule-dialog.c:261
+#: ../src/e-util/e-html-editor-image-dialog.c:538
+#: ../src/e-util/e-html-editor-table-dialog.c:562
msgid "_Width:"
msgstr "宽度(_W)"
-#: ../src/e-util/e-html-editor-hrule-dialog.c:308
+#: ../src/e-util/e-html-editor-hrule-dialog.c:286
msgid "_Size:"
msgstr "大小(_S)"
-#: ../src/e-util/e-html-editor-hrule-dialog.c:315
+#: ../src/e-util/e-html-editor-hrule-dialog.c:293
msgid "<b>Style</b>"
msgstr "<b>样式</b>"
-#: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:658
+#: ../src/e-util/e-html-editor-hrule-dialog.c:318
+#: ../src/e-util/e-html-editor-table-dialog.c:648
msgid "_Alignment:"
msgstr "对齐(_A)："
#. Shaded
-#: ../src/e-util/e-html-editor-hrule-dialog.c:346
+#: ../src/e-util/e-html-editor-hrule-dialog.c:324
msgid "S_haded"
msgstr "阴影(_H)"
-#: ../src/e-util/e-html-editor-hrule-dialog.c:363
+#: ../src/e-util/e-html-editor-hrule-dialog.c:341
msgid "Rule properties"
msgstr "横线属性"
#: ../src/e-util/e-html-editor-image-dialog.c:465
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:515
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:65
+#: ../src/e-util/e-html-editor-table-dialog.c:505
msgid "<b>General</b>"
msgstr "<b>常规</b>"
-#: ../src/e-util/e-html-editor-image-dialog.c:494
+#: ../src/e-util/e-html-editor-image-dialog.c:499
msgid "_Source:"
msgstr "来源(_S)："
-#: ../src/e-util/e-html-editor-image-dialog.c:557
+#: ../src/e-util/e-html-editor-image-dialog.c:562
msgid "_Height:"
msgstr "高度(_H)："
-#: ../src/e-util/e-html-editor-image-dialog.c:598
+#: ../src/e-util/e-html-editor-image-dialog.c:603
msgid "_X-Padding:"
msgstr "X-边距(_X)："
-#: ../src/e-util/e-html-editor-image-dialog.c:614
+#: ../src/e-util/e-html-editor-image-dialog.c:619
msgid "_Y-Padding:"
msgstr "Y-边距(_Y)："
-#: ../src/e-util/e-html-editor-image-dialog.c:630
-#: ../src/e-util/e-html-editor-table-dialog.c:639
+#: ../src/e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-table-dialog.c:629
msgid "_Border:"
msgstr "边框(_B)："
-#: ../src/e-util/e-html-editor-image-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:645
msgid "<b>Link</b>"
msgstr "<b>链接</b>"
-#: ../src/e-util/e-html-editor-image-dialog.c:658
-#: ../src/e-util/e-html-editor-link-dialog.c:219
+#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-link-dialog.c:210
msgid "_URL:"
msgstr "_URL："
-#: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:224
-msgid "_Test URL..."
-msgstr "测试 URL(_T):"
+#: ../src/e-util/e-html-editor-image-dialog.c:668
+msgid "_Test URL…"
+msgstr "测试 URL(_T)…"
-#: ../src/e-util/e-html-editor-image-dialog.c:680
+#: ../src/e-util/e-html-editor-image-dialog.c:685
msgid "Image Properties"
msgstr "图像属性"
-#: ../src/e-util/e-html-editor-link-dialog.c:248
+#: ../src/e-util/e-html-editor-link-dialog.c:233
msgid "_Remove Link"
msgstr "删除链接(_R)"
-#: ../src/e-util/e-html-editor-link-dialog.c:273
+#: ../src/e-util/e-html-editor-link-dialog.c:258
msgid "Link Properties"
msgstr "链接属性"
-#: ../src/e-util/e-html-editor-page-dialog.c:68
+#: ../src/e-util/e-html-editor-page-dialog.c:71
msgid "Perforated Paper"
msgstr "穿孔纸"
-#: ../src/e-util/e-html-editor-page-dialog.c:77
+#: ../src/e-util/e-html-editor-page-dialog.c:80
msgid "Blue Ink"
msgstr "蓝墨水"
-#: ../src/e-util/e-html-editor-page-dialog.c:86
+#: ../src/e-util/e-html-editor-page-dialog.c:89
msgid "Paper"
msgstr "纸张"
-#: ../src/e-util/e-html-editor-page-dialog.c:95
+#: ../src/e-util/e-html-editor-page-dialog.c:98
msgid "Ribbon"
msgstr "功能区"
-#: ../src/e-util/e-html-editor-page-dialog.c:104
+#: ../src/e-util/e-html-editor-page-dialog.c:107
msgid "Midnight"
msgstr "午夜"
-#: ../src/e-util/e-html-editor-page-dialog.c:122
+#: ../src/e-util/e-html-editor-page-dialog.c:125
#: ../src/mail/filtertypes.xml.in.h:38 ../src/mail/searchtypes.xml.in.h:41
#: ../src/mail/vfoldertypes.xml.in.h:41
msgid "Draft"
msgstr "草稿"
-#: ../src/e-util/e-html-editor-page-dialog.c:131
+#: ../src/e-util/e-html-editor-page-dialog.c:134
msgid "Graph Paper"
msgstr "方格纸"
-#: ../src/e-util/e-html-editor-page-dialog.c:379
-msgid "<b>Colors</b>"
-msgstr "<b>颜色</b>"
+#. == Colors ==
+#: ../src/e-util/e-html-editor-page-dialog.c:402
+msgid "Colors"
+msgstr "颜色"
-#: ../src/e-util/e-html-editor-page-dialog.c:398
+#: ../src/e-util/e-html-editor-page-dialog.c:422
msgid "_Text:"
msgstr "文字(_T)："
-#: ../src/e-util/e-html-editor-page-dialog.c:413
+#: ../src/e-util/e-html-editor-page-dialog.c:437
msgid "_Link:"
msgstr "链接(_L)："
-#: ../src/e-util/e-html-editor-page-dialog.c:428
+#: ../src/e-util/e-html-editor-page-dialog.c:452
msgid "_Visited Link:"
msgstr "已浏览链接(_V)："
-#: ../src/e-util/e-html-editor-page-dialog.c:443
+#: ../src/e-util/e-html-editor-page-dialog.c:467
msgid "_Background:"
msgstr "背景(_B)："
-#: ../src/e-util/e-html-editor-page-dialog.c:451
-msgid "<b>Background Image</b>"
-msgstr "<b>背景图像</b>"
+#. == Text ==
+#: ../src/e-util/e-html-editor-page-dialog.c:475
+#, fuzzy
+#| msgid "_Text:"
+msgid "Text"
+msgstr "文字(_T)："
-#: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/e-util/e-html-editor-page-dialog.c:493
+msgid "_Font Name:"
+msgstr "字体名称(_F)："
+
+#. == Background Image ==
+#: ../src/e-util/e-html-editor-page-dialog.c:500
+msgid "Background Image"
+msgstr "背景图像"
+
+#: ../src/e-util/e-html-editor-page-dialog.c:523
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
msgid "_Template:"
msgstr "模板(_T)："
-#: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:286
+#: ../src/e-util/e-html-editor-page-dialog.c:531
+#: ../src/e-util/e-import-assistant.c:287
msgid "Select a file"
msgstr "选择一个文件"
-#: ../src/e-util/e-html-editor-page-dialog.c:488
+#: ../src/e-util/e-html-editor-page-dialog.c:538
msgid "_Custom:"
msgstr "自定义(_C)："
-#: ../src/e-util/e-html-editor-page-dialog.c:515
+#: ../src/e-util/e-html-editor-page-dialog.c:567
msgid "Page Properties"
msgstr "页面属性"
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:81
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:82
msgid "_Style:"
msgstr "样式(_S)："
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:88
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:89
msgid "<b>Alignment</b>"
msgstr "<b>对齐</b>"
-#: ../src/e-util/e-html-editor-paragraph-dialog.c:153
+#: ../src/e-util/e-html-editor-paragraph-dialog.c:163
msgid "Paragraph Properties"
msgstr "段落属性"
@@ -13870,76 +15041,77 @@ msgstr "替换"
msgid "<b>Suggestions for “%s”</b>"
msgstr "<b>“%s”建议</b>"
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:387
msgid "<b>Suggestions</b>"
msgstr "<b>建议</b>"
#. Replace
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:422
msgid "Replace"
msgstr "替换"
#. Replace All
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:431
msgid "Replace All"
msgstr "替换全部"
#. Ignore
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:440
#: ../src/mail/mail.error.xml.h:116
msgid "Ignore"
msgstr "忽略"
#. Skip
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:449
msgid "Skip"
msgstr "跳过"
#. Back
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:458
msgid "Back"
msgstr "后退"
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:467
msgid "<b>Dictionary</b>"
msgstr "<b>字典</b>"
#. Add Word button
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:487
msgid "Add word"
msgstr "添加词语"
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:39
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:504
+#: ../src/mail/mail-config.ui.h:42
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../src/e-util/e-html-editor-table-dialog.c:537
+#: ../src/e-util/e-html-editor-table-dialog.c:527
msgid "_Rows:"
msgstr "行(_R)："
-#: ../src/e-util/e-html-editor-table-dialog.c:554
+#: ../src/e-util/e-html-editor-table-dialog.c:544
msgid "C_olumns:"
msgstr "列(_O)："
-#: ../src/e-util/e-html-editor-table-dialog.c:605
+#: ../src/e-util/e-html-editor-table-dialog.c:595
msgid "_Spacing:"
msgstr "间距(_S)："
-#: ../src/e-util/e-html-editor-table-dialog.c:622
+#: ../src/e-util/e-html-editor-table-dialog.c:612
msgid "_Padding:"
msgstr "边距(_P)："
-#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../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:2408
msgid "_Color:"
msgstr "颜色(_C)："
-#: ../src/e-util/e-html-editor-table-dialog.c:712
+#: ../src/e-util/e-html-editor-table-dialog.c:707
msgid "Image:"
msgstr "图像："
-#: ../src/e-util/e-html-editor-table-dialog.c:739
+#: ../src/e-util/e-html-editor-table-dialog.c:734
msgid "Table Properties"
msgstr "表格属性"
@@ -13957,34 +15129,34 @@ msgid ""
"of file it is from the list."
msgstr "选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。"
-#: ../src/e-util/e-import-assistant.c:300
-#: ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:301
+#: ../src/e-util/e-import-assistant.c:480
msgid "File _type:"
msgstr "文件类型(_T)："
-#: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:923
+#: ../src/e-util/e-import-assistant.c:344
+#: ../src/e-util/e-import-assistant.c:962
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../src/e-util/e-import-assistant.c:368
+#: ../src/e-util/e-import-assistant.c:370
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型："
-#: ../src/e-util/e-import-assistant.c:376
+#: ../src/e-util/e-import-assistant.c:379
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../src/e-util/e-import-assistant.c:384
+#: ../src/e-util/e-import-assistant.c:387
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: ../src/e-util/e-import-assistant.c:406
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:211
+#: ../src/e-util/e-import-assistant.c:409
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息："
-#: ../src/e-util/e-import-assistant.c:536
+#: ../src/e-util/e-import-assistant.c:541
#, fuzzy
#| msgid ""
#| "Evolution checked for settings to import from the following applications: "
@@ -13998,44 +15170,44 @@ msgstr ""
"Evolution 检查了可从以下程序导入的设置：Pine、Netscape、Elm、iCalendar、"
"Kmail，并未发现可导入的设置。如果您想要再试一次，请单击“上一步”按钮。"
-#: ../src/e-util/e-import-assistant.c:562
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:240
+#: ../src/e-util/e-import-assistant.c:568
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
#, c-format
msgid "From %s:"
msgstr "从 %s："
#. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:781
+#: ../src/e-util/e-import-assistant.c:814
msgid "_Cancel Import"
msgstr "取消导入(_C)"
-#: ../src/e-util/e-import-assistant.c:922
+#: ../src/e-util/e-import-assistant.c:961
msgid "Preview data to be imported"
msgstr "预览要导入的信息"
-#: ../src/e-util/e-import-assistant.c:928
-#: ../src/e-util/e-import-assistant.c:941
-#: ../src/e-util/e-import-assistant.c:1294
-#: ../src/e-util/e-import-assistant.c:1370
-#: ../src/e-util/e-import-assistant.c:1379
+#: ../src/e-util/e-import-assistant.c:967
+#: ../src/e-util/e-import-assistant.c:980
+#: ../src/e-util/e-import-assistant.c:1333
+#: ../src/e-util/e-import-assistant.c:1410
+#: ../src/e-util/e-import-assistant.c:1419
msgid "Import Data"
msgstr "导入数据"
-#: ../src/e-util/e-import-assistant.c:936
+#: ../src/e-util/e-import-assistant.c:975
msgid "Select what type of file you want to import from the list."
msgstr "选择您想从列表导入的类型"
-#: ../src/e-util/e-import-assistant.c:1284
-#: ../src/e-util/e-import-assistant.c:1319
+#: ../src/e-util/e-import-assistant.c:1323
+#: ../src/e-util/e-import-assistant.c:1359
msgid "Evolution Import Assistant"
msgstr "Evolution 导入助手"
-#: ../src/e-util/e-import-assistant.c:1301
-#: ../src/e-util/e-import-assistant.c:1357
+#: ../src/e-util/e-import-assistant.c:1340
+#: ../src/e-util/e-import-assistant.c:1397
msgid "Import Location"
msgstr "导入位置"
-#: ../src/e-util/e-import-assistant.c:1312
+#: ../src/e-util/e-import-assistant.c:1352
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of importing "
@@ -14044,45 +15216,60 @@ msgstr ""
"欢迎使用 Evolution 导入助手。\n"
"本助手将全程指导您将外部文件导入 Evolution。"
-#: ../src/e-util/e-import-assistant.c:1329
+#: ../src/e-util/e-import-assistant.c:1369
msgid "Importer Type"
msgstr "导入器类型"
-#: ../src/e-util/e-import-assistant.c:1339
+#: ../src/e-util/e-import-assistant.c:1379
msgid "Select Information to Import"
msgstr "选择要导入的信息"
-#: ../src/e-util/e-import-assistant.c:1348
+#: ../src/e-util/e-import-assistant.c:1388
msgid "Select a File"
msgstr "选择一个文件"
-#: ../src/e-util/e-import-assistant.c:1365
-#, fuzzy
-#| msgid "Click \"Apply\" to begin importing the file into Evolution."
+#: ../src/e-util/e-import-assistant.c:1405
msgid "Click “Apply” to begin importing the file into Evolution."
msgstr "单击“应用”以便开始将文件导入到 Evolution。"
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:583
+msgid "minutes"
+msgstr "分钟"
+
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
+msgid "hours"
+msgstr "小时"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:344
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "days"
+msgstr "天"
+
#: ../src/e-util/e-mail-signature-combo-box.c:431
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
+#: ../src/e-util/e-mail-signature-editor.c:321 ../src/mail/e-mail-notes.c:1017
msgid "Close"
msgstr "关闭"
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
+#: ../src/e-util/e-mail-signature-editor.c:326 ../src/mail/e-mail-notes.c:1022
msgid "_Save and Close"
msgstr "保存并关闭(_S)"
-#: ../src/e-util/e-mail-signature-editor.c:559
+#: ../src/e-util/e-mail-signature-editor.c:568
msgid "Edit Signature"
msgstr "编辑签名"
-#: ../src/e-util/e-mail-signature-editor.c:592
+#: ../src/e-util/e-mail-signature-editor.c:601
msgid "_Signature Name:"
msgstr "签名(_S)："
-#: ../src/e-util/e-mail-signature-editor.c:628
+#: ../src/e-util/e-mail-signature-editor.c:637
msgid "Unnamed"
msgstr "未命名"
@@ -14127,43 +15314,127 @@ msgstr ""
"基于鼠标交互的地图部件，可用来选择时区。键盘用户可以从下方的组合框中选择时"
"区。"
-#: ../src/e-util/e-misc-utils.c:253
+#: ../src/e-util/e-misc-utils.c:279
msgid "Could not open the link."
msgstr "无法打开链接。"
-#: ../src/e-util/e-misc-utils.c:336
+#: ../src/e-util/e-misc-utils.c:363
msgid "Could not display help for Evolution."
msgstr "无法显示 Evolution 的帮助。"
-#: ../src/e-util/e-misc-utils.c:2501
+#: ../src/e-util/e-misc-utils.c:2562
#, fuzzy, c-format
#| msgid "Opening calendar '%s'"
msgid "Opening calendar “%s”"
msgstr "打开日历“%s”"
-#: ../src/e-util/e-misc-utils.c:2504
+#: ../src/e-util/e-misc-utils.c:2565
#, fuzzy, c-format
#| msgid "Opening memo list '%s'"
msgid "Opening memo list “%s”"
msgstr "打开备忘录“%s”"
-#: ../src/e-util/e-misc-utils.c:2507
+#: ../src/e-util/e-misc-utils.c:2568
#, fuzzy, c-format
#| msgid "Opening task list '%s'"
msgid "Opening task list “%s”"
msgstr "正在打开任务列表“%s”"
-#: ../src/e-util/e-misc-utils.c:2510
+#: ../src/e-util/e-misc-utils.c:2571
#, fuzzy, c-format
#| msgid "Opening address book '%s'"
msgid "Opening address book “%s”"
msgstr "正在打开地址簿“%s”"
-#: ../src/e-util/e-misc-utils.c:3290
+#: ../src/e-util/e-misc-utils.c:3351
#: ../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:3979
+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:3991
+#, c-format
+msgid "Failed to set protocol version to LDAPv3 (%d): %s"
+msgstr ""
+
+#: ../src/e-util/e-misc-utils.c:4003
+#, fuzzy, c-format
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to authenticate with LDAP server (%d): %s"
+msgstr "与 LDAP 服务器认证失败。"
+
+#: ../src/e-util/e-misc-utils.c:4017
+#, fuzzy, c-format
+#| msgid ""
+#| "This LDAP server may use an older version of LDAP, which does not support "
+#| "this functionality or it may be misconfigured. Ask your administrator for "
+#| "supported search bases."
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases.\n"
+"\n"
+"Detailed error (%d): %s"
+msgstr ""
+"此 LDAP 服务器可能使用较早版本的 LDAP，所以无法支持此功能，或者是配置错误。请"
+"询问您的管理员有关支持的搜索基础一事。"
+
+#: ../src/e-util/e-misc-utils.c:4028
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"此 LDAP 服务器可能使用较早版本的 LDAP，所以无法支持此功能，或者是配置错误。请"
+"询问您的管理员有关支持的搜索基础一事。"
+
+#: ../src/e-util/e-misc-utils.c:4061
+msgid "Evolution had not been compiled with LDAP support"
+msgstr ""
+
+#. Translators: %s is the language ISO code.
+#: ../src/e-util/e-misc-utils.c:4384
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+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:4393
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/e-util/e-misc-utils.c:4551
+#, c-format
+msgid "Click to call %s"
+msgstr "单击以呼叫 %s"
+
+#: ../src/e-util/e-misc-utils.c:4553
+msgid "Click to hide/unhide addresses"
+msgstr "单击可隐藏/显示地址"
+
+#: ../src/e-util/e-misc-utils.c:4566
+#, c-format
+msgid "Go to the section %s of the message"
+msgstr "转到信息的 %s 部分"
+
+#: ../src/e-util/e-misc-utils.c:4568
+msgid "Go to the beginning of the message"
+msgstr "转到信息的开头"
+
+#: ../src/e-util/e-misc-utils.c:4574
+#, c-format
+msgid "Click to open %s"
+msgstr "单击以打开 %s"
+
#: ../src/e-util/e-name-selector-dialog.c:274
msgid "Show Contacts"
msgstr "显示联系人"
@@ -14181,15 +15452,16 @@ msgid "_Search:"
msgstr "搜索(_S)："
#: ../src/e-util/e-name-selector-dialog.c:363
-#: ../src/e-util/e-name-selector-dialog.c:1330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1624
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:758
-#: ../src/modules/calendar/e-task-shell-view-actions.c:931
+#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:783
+#: ../src/modules/calendar/e-task-shell-view-actions.c:956
msgid "Any Category"
msgstr "任何类别"
#: ../src/e-util/e-name-selector-dialog.c:365
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:338
msgid "Co_ntacts"
msgstr "联系人(_N)"
@@ -14197,40 +15469,35 @@ msgstr "联系人(_N)"
msgid "Search"
msgstr "搜索"
-#: ../src/e-util/e-name-selector-dialog.c:445
-#: ../src/mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "地址簿"
-
#: ../src/e-util/e-name-selector-dialog.c:573
msgid "Select Contacts from Address Book"
msgstr "从地址簿选择联系人"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3207
+#: ../src/e-util/e-name-selector-entry.c:3234
#, c-format
msgid "E_xpand %s Inline"
msgstr "在行内展开 %s (_X)"
#. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3223
+#: ../src/e-util/e-name-selector-entry.c:3250
#, c-format
msgid "Cop_y %s"
msgstr "复制 %s (_Y)"
#. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3234
+#: ../src/e-util/e-name-selector-entry.c:3261
#, c-format
msgid "C_ut %s"
msgstr "剪切 %s (_U)"
#. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3279
#, c-format
msgid "_Edit %s"
msgstr "编辑 %s(_E)"
-#: ../src/e-util/e-name-selector-list.c:585
+#: ../src/e-util/e-name-selector-list.c:587
#, c-format
msgid "_Delete %s"
msgstr "删除 %s(_D)"
@@ -14255,35 +15522,35 @@ msgstr "密匙环键不可用：无用户或主机名"
msgid "You have the Caps Lock key on."
msgstr "您的大写锁定键打开着。"
-#: ../src/e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:577
msgid "_Remember this passphrase"
msgstr "记住该密码短语(_R)"
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:578
msgid "_Remember this passphrase for the remainder of this session"
msgstr "在该会话内记住该提醒器的密码短语(_R)"
-#: ../src/e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:583
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:584
msgid "_Remember this password for the remainder of this session"
msgstr "在该会话内记住该提醒器的密码(_R)"
-#: ../src/e-util/e-preferences-window.c:319
+#: ../src/e-util/e-preferences-window.c:329
msgid "Evolution Preferences"
msgstr "Evolution 首选项"
-#: ../src/e-util/e-print.c:158
+#: ../src/e-util/e-print.c:164
msgid "An error occurred while printing"
msgstr "打印时发生了错误"
-#: ../src/e-util/e-print.c:165
+#: ../src/e-util/e-print.c:171
msgid "The printing system reported the following details about the error:"
msgstr "打印系统报告了下列错误细节："
-#: ../src/e-util/e-print.c:171
+#: ../src/e-util/e-print.c:177
msgid ""
"The printing system did not report any additional details about the error."
msgstr "打印系统未报告关于错误的任何额外细节。"
@@ -14346,13 +15613,13 @@ msgstr "切换到高级代理首选项"
#: ../src/e-util/e-proxy-preferences.c:527
msgid "Apply custom proxy settings to these accounts:"
-msgstr "将自定义代理设置应用到这些帐户："
+msgstr "将自定义代理设置应用到这些账号："
#: ../src/e-util/e-proxy-preferences.c:562
msgid ""
"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
"and apply them to specific accounts"
-msgstr "<b>高级代理设置</b>可以用来定义备选的网络代理并将它们应用到特定的帐户"
+msgstr "<b>高级代理设置</b>可以用来定义备选的网络代理并将它们应用到特定的账号"
#: ../src/e-util/e-proxy-selector.c:86
msgid "Custom Proxy"
@@ -14366,11 +15633,11 @@ msgstr "创建新的代理配置"
msgid "Delete the selected proxy profile"
msgstr "重命名选中的代理配置"
-#: ../src/e-util/e-rule-editor.c:182
+#: ../src/e-util/e-rule-editor.c:191
msgid "Add Rule"
msgstr "添加规则"
-#: ../src/e-util/e-rule-editor.c:284
+#: ../src/e-util/e-rule-editor.c:302
msgid "Edit Rule"
msgstr "编辑规则"
@@ -14379,43 +15646,35 @@ msgstr "编辑规则"
msgid "Matches: %u"
msgstr "匹配：%u"
-#: ../src/e-util/e-search-bar.c:609
+#: ../src/e-util/e-search-bar.c:624
msgid "Close the find bar"
msgstr "关闭查找栏"
-#: ../src/e-util/e-search-bar.c:617
+#: ../src/e-util/e-search-bar.c:632
msgid "Fin_d:"
msgstr "查找(_D)："
-#: ../src/e-util/e-search-bar.c:629
+#: ../src/e-util/e-search-bar.c:644
msgid "Clear the search"
msgstr "清除搜索"
-#: ../src/e-util/e-search-bar.c:653
-msgid "_Previous"
-msgstr "上一项(_P)"
-
-#: ../src/e-util/e-search-bar.c:656
+#: ../src/e-util/e-search-bar.c:671
msgid "Find the previous occurrence of the phrase"
msgstr "寻找该词句出现的前一个位置"
-#: ../src/e-util/e-search-bar.c:665
-msgid "_Next"
-msgstr "下一项(_N)"
-
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-search-bar.c:683
msgid "Find the next occurrence of the phrase"
msgstr "寻找该词句出现的下一个位置"
-#: ../src/e-util/e-search-bar.c:677
+#: ../src/e-util/e-search-bar.c:692
msgid "Mat_ch case"
msgstr "大小写匹配(_C)"
-#: ../src/e-util/e-search-bar.c:705
+#: ../src/e-util/e-search-bar.c:720
msgid "Reached bottom of page, continued from top"
msgstr "到达页面底部，移到顶部继续"
-#: ../src/e-util/e-search-bar.c:727
+#: ../src/e-util/e-search-bar.c:742
msgid "Reached top of page, continued from bottom"
msgstr "到达页面顶部，移到底部继续"
@@ -14461,13 +15720,13 @@ msgstr "发送选项"
msgid "R_eply requested"
msgstr "请求回复(_E)"
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
#: ../src/e-util/e-send-options.ui.h:20
msgctxt "ESendOptionsWithin"
msgid "Wi_thin"
msgstr "少于(_T)"
-#. Translators: This is part of
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
#: ../src/e-util/e-send-options.ui.h:22
msgctxt "ESendOptionsWithin"
msgid "days"
@@ -14482,13 +15741,13 @@ msgstr "方便时(_W)"
msgid "_Delay message delivery"
msgstr "推迟信息投递(_D)"
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
#: ../src/e-util/e-send-options.ui.h:28
msgctxt "ESendOptionsAfter"
msgid "_After"
msgstr "经过(_A)"
-#. Translators: This is part of
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
#: ../src/e-util/e-send-options.ui.h:30
msgctxt "ESendOptionsAfter"
msgid "days"
@@ -14498,7 +15757,7 @@ msgstr "天"
msgid "_Set expiration date"
msgstr "设置过期时间(_S)"
-#. Translators: This is part of
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
#: ../src/e-util/e-send-options.ui.h:33
msgctxt "ESendOptions"
msgid "_Until"
@@ -14568,58 +15827,58 @@ msgstr "返回通知"
msgid "Sta_tus Tracking"
msgstr "状态跟踪(_T)"
-#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
+#: ../src/e-util/e-source-config.c:725 ../src/e-util/e-source-config.c:729
msgid "Type:"
msgstr "类型："
-#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
+#: ../src/e-util/e-source-config.c:739 ../src/e-util/e-source-config.c:743
msgid "Name:"
msgstr "名称："
-#: ../src/e-util/e-source-config.c:814
+#: ../src/e-util/e-source-config.c:850 ../src/e-util/e-webdav-browser.c:1733
msgid "Name cannot be empty"
msgstr "名称不能为空"
#. Translators: This is the first of a sequence of widgets:
#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1314
+#: ../src/e-util/e-source-config.c:1417
msgid "Refresh every"
msgstr "刷新间隔"
-#: ../src/e-util/e-source-config.c:1344 ../src/e-util/e-source-config.c:1414
+#: ../src/e-util/e-source-config.c:1447 ../src/e-util/e-source-config.c:1521
msgid "Use a secure connection"
msgstr "使用安全连接"
-#: ../src/e-util/e-source-config.c:1440
+#: ../src/e-util/e-source-config.c:1548
msgid "Unset _trust for SSL/TLS certificate"
msgstr "不再信任 SSL/TLS 证书(_T)"
-#: ../src/e-util/e-source-config.c:1476
-msgid "User"
-msgstr "用户"
+#: ../src/e-util/e-source-config.c:1584
+msgid "User:"
+msgstr "用户："
-#: ../src/e-util/e-source-selector.c:3212
+#: ../src/e-util/e-source-selector.c:3236
msgid "Show"
msgstr "显示"
-#: ../src/e-util/e-source-selector.c:3219
+#: ../src/e-util/e-source-selector.c:3242
msgid "Group name"
msgstr "组名"
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:796
+#: ../src/e-util/e-source-selector.c:3397 ../src/mail/e-mail-display.c:717
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../src/e-util/e-source-selector.c:3374
-#: ../src/e-util/e-source-selector.c:3473
+#: ../src/e-util/e-source-selector.c:3397
+#: ../src/e-util/e-source-selector.c:3495
msgid "_Show"
msgstr "显示(_S)"
-#: ../src/e-util/e-source-selector.c:3426
+#: ../src/e-util/e-source-selector.c:3449
msgid "Manage Groups"
msgstr "管理群组"
-#: ../src/e-util/e-source-selector.c:3438
+#: ../src/e-util/e-source-selector.c:3461
msgid "Available Groups:"
msgstr "可用组："
@@ -14631,30 +15890,14 @@ msgstr "目标位置(_D)"
msgid "Select destination"
msgstr "选择目标位置"
-#. Translators: %s is the language ISO code.
-#: ../src/e-util/e-spell-dictionary.c:264
-#, c-format
-msgctxt "language"
-msgid "Unknown (%s)"
-msgstr "未知 (%s)"
-
-#. Translators: The first %s is the language name, and the
-#. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-spell-dictionary.c:279
-#: ../src/e-util/e-spell-dictionary.c:284
-#, c-format
-msgctxt "language"
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
#. no suggestions. Put something in the menu anyway...
#: ../src/e-util/e-spell-entry.c:479
msgid "(no suggestions)"
msgstr "(无建议)"
#: ../src/e-util/e-spell-entry.c:503
-msgid "More..."
-msgstr "更多..."
+msgid "More…"
+msgstr "更多…"
#. + Add to Dictionary
#: ../src/e-util/e-spell-entry.c:588
@@ -14798,16 +16041,38 @@ msgstr "任务列表后端服务 "{0}" 遇到一个错误。"
#: ../src/e-util/e-system.error.xml.h:23
msgid "Something has gone wrong"
-msgstr ""
+msgstr "出了一点问题"
#: ../src/e-util/e-system.error.xml.h:24
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 the "
-"GNOME bugzilla."
+"reopening the window. If the issue persists, please file a bug report in "
+"GNOME Gitlab."
+msgstr ""
+"某个 WebKitWebProcess 进程在显示内容时崩溃了。您可以重新打开窗口再试一次。如"
+"果这个问题一直存在，请在 GNOME GitLab 上提交一个错误报告。"
+
+#: ../src/e-util/e-system.error.xml.h:25
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete remote collection “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
+
+#: ../src/e-util/e-system.error.xml.h:26
+#, fuzzy
+#| msgid ""
+#| "This will permanently remove the calendar '{0}' from the server. Are you "
+#| "sure you want to proceed?"
+msgid ""
+"This will permanently remove the collection “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr "这将从服务器永久删除日历“{0}”。您确定要继续吗？"
+
+#: ../src/e-util/e-system.error.xml.h:29
+msgid "Failed to refresh list of account sources"
msgstr ""
-#: ../src/e-util/e-table-click-to-add.c:687
+#: ../src/e-util/e-table-click-to-add.c:688
#: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
#: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
msgid "click to add"
@@ -14865,11 +16130,11 @@ msgstr "全部清除(_A)"
msgid "_Show field in View"
msgstr "在视图中显示域(_S)"
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1792
msgid "Ascending"
msgstr "升序"
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1783
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1792
msgid "Descending"
msgstr "降序"
@@ -14956,75 +16221,82 @@ msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
-#: ../src/e-util/e-table-header-item.c:1606
+#: ../src/e-util/e-table-header-item.c:1610
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../src/e-util/e-table-header-item.c:1629
+#: ../src/e-util/e-table-header-item.c:1642
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../src/e-util/e-table-header-item.c:1632
+#: ../src/e-util/e-table-header-item.c:1645
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../src/e-util/e-table-header-item.c:1635
+#: ../src/e-util/e-table-header-item.c:1648
msgid "_Reset sort"
msgstr "重置顺序(_R)"
-#: ../src/e-util/e-table-header-item.c:1638
+#: ../src/e-util/e-table-header-item.c:1651
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../src/e-util/e-table-header-item.c:1641
+#: ../src/e-util/e-table-header-item.c:1654
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1658
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../src/e-util/e-table-header-item.c:1648
-msgid "Add a C_olumn..."
-msgstr "添加一列(_O)..."
+#: ../src/e-util/e-table-header-item.c:1661
+#, fuzzy
+#| msgid "Add a Column"
+msgid "Add a C_olumn…"
+msgstr "添加一列"
-#: ../src/e-util/e-table-header-item.c:1652
+#: ../src/e-util/e-table-header-item.c:1665
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../src/e-util/e-table-header-item.c:1655
+#: ../src/e-util/e-table-header-item.c:1668
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../src/e-util/e-table-header-item.c:1658
-msgid "Format Column_s..."
+#: ../src/e-util/e-table-header-item.c:1671
+#, fuzzy
+#| msgid "Format Column_s..."
+msgid "Format Column_s…"
msgstr "格式化列(_S)..."
-#: ../src/e-util/e-table-header-item.c:1662
-msgid "Custo_mize Current View..."
-msgstr "自定义当前视图(_M)..."
+#: ../src/e-util/e-table-header-item.c:1675
+#: ../src/shell/e-shell-window-actions.c:1232
+#, fuzzy
+#| msgid "Customize Current View"
+msgid "Custo_mize Current View…"
+msgstr "自定义当前视图"
-#: ../src/e-util/e-table-header-item.c:1733
+#: ../src/e-util/e-table-header-item.c:1742
msgid "_Sort By"
msgstr "排序方式(_S)"
#. Custom
-#: ../src/e-util/e-table-header-item.c:1756
+#: ../src/e-util/e-table-header-item.c:1765
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../src/e-util/e-text.c:2135
+#: ../src/e-util/e-text.c:2105
msgid "Select All"
msgstr "全选"
-#: ../src/e-util/e-text.c:2148
+#: ../src/e-util/e-text.c:2118
msgid "Input Methods"
msgstr "输入法"
#. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
-#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
-#: ../src/e-util/e-timezone-dialog.c:899
+#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
+#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
+#: ../src/e-util/e-timezone-dialog.c:1015
msgid "UTC"
msgstr "UTC"
@@ -15053,11 +16325,11 @@ msgstr "选择(_S)"
msgid "Timezone drop-down combination box"
msgstr "时区下拉组合框"
-#: ../src/e-util/e-url-entry.c:106
+#: ../src/e-util/e-url-entry.c:102
msgid "Click here to open the URL"
msgstr "单击此处打开该 URL 地址"
-#: ../src/e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:104
msgid "Enter a URL here"
msgstr "在此输入 URL 地址"
@@ -15075,96 +16347,257 @@ msgid "Flags"
msgstr "标志"
#: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1148
+#: ../src/mail/e-mail-config-identity-page.c:1231
msgid "Identity"
msgstr "标识"
-#: ../src/e-util/e-web-view.c:346
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
+#: ../src/e-util/e-webdav-browser.c:448
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address book"
+msgstr "地址簿"
-#: ../src/e-util/e-web-view.c:348
-msgid "Copy the link to the clipboard"
-msgstr "将链接复制到剪贴板"
+#: ../src/e-util/e-webdav-browser.c:459
+msgid "Events"
+msgstr "事件"
-#: ../src/e-util/e-web-view.c:356
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1555
+#: ../src/mail/em-folder-tree-model.c:1936
+#, fuzzy
+#| msgid "Loading"
+msgid "Loading…"
+msgstr "载入"
-#: ../src/e-util/e-web-view.c:358
-msgid "Open the link in a web browser"
-msgstr "在浏览器中打开链接"
+#: ../src/e-util/e-webdav-browser.c:1368
+#, fuzzy
+#| msgid "Searching folder content..."
+msgid "Searching collection children…"
+msgstr "搜索文件夹内容..."
-#: ../src/e-util/e-web-view.c:366
-msgid "_Copy Email Address"
-msgstr "复制电子邮件地址(_C)"
+#: ../src/e-util/e-webdav-browser.c:1370
+msgid "Failed to search for collection children"
+msgstr ""
-#: ../src/e-util/e-web-view.c:373
-msgid "Copy _Raw Email Address"
-msgstr "复制原始电子邮件地址(_R)"
+#: ../src/e-util/e-webdav-browser.c:1404
+#, fuzzy
+#| msgid "Searching for user's calendars..."
+msgid "Searching for user home, please wait…"
+msgstr "搜索用户的日历..."
-#: ../src/e-util/e-web-view.c:375
-msgid "Copy the raw email address to the clipboard"
-msgstr "复制原始电子邮件地址到剪贴板"
+#: ../src/e-util/e-webdav-browser.c:1406
+#, fuzzy
+#| msgid "Unable to perform search."
+msgid "Failed to search for user home"
+msgstr "无法执行搜索。"
-#: ../src/e-util/e-web-view.c:390
-msgid "_Copy Image"
-msgstr "复制图像(_C)"
+#: ../src/e-util/e-webdav-browser.c:1749
+msgid "At least one component type should be set"
+msgstr ""
-#: ../src/e-util/e-web-view.c:392
-msgid "Copy the image to the clipboard"
-msgstr "将图像复制到剪贴板"
+#: ../src/e-util/e-webdav-browser.c:1768
+#, fuzzy
+#| msgid "Failed to delete selected attendee"
+#| msgid_plural "Failed to delete selected attendees"
+msgid "Failed to get selected collection HREF"
+msgstr "删除选中参与者失败"
-#: ../src/e-util/e-web-view.c:397
-msgid "Save _Image..."
-msgstr "保存图像(_I)..."
+#: ../src/e-util/e-webdav-browser.c:1800
+#, fuzzy
+#| msgid "Failed to save attachments"
+msgid "Failed to save changes"
+msgstr "保存附件失败"
-#: ../src/e-util/e-web-view.c:399
-msgid "Save the image to a file"
-msgstr "保存该图像为文件"
+#: ../src/e-util/e-webdav-browser.c:1802
+#, fuzzy
+#| msgid "Creating a memo"
+msgid "Creating new book…"
+msgstr "正在创建备忘"
-#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1964
-msgid "Select all text and images"
-msgstr "选中全部文本和图像"
+#: ../src/e-util/e-webdav-browser.c:1803
+#, fuzzy
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create new book"
+msgstr "创建管道失败：%s"
-#: ../src/e-util/e-web-view.c:1322
-#, c-format
-msgid "Click to call %s"
-msgstr "单击以呼叫 %s"
+#: ../src/e-util/e-webdav-browser.c:1805
+#, fuzzy
+#| msgid "Cre_ate new calendar"
+msgid "Creating new calendar…"
+msgstr "创建新日历(_A)"
-#: ../src/e-util/e-web-view.c:1324
-msgid "Click to hide/unhide addresses"
-msgstr "单击可隐藏/显示地址"
+#: ../src/e-util/e-webdav-browser.c:1806
+#, fuzzy
+#| msgid "Cre_ate new calendar"
+msgid "Failed to create new calendar"
+msgstr "创建新日历(_A)"
-#: ../src/e-util/e-web-view.c:1335
-#, c-format
-msgid "Go to the section %s of the message"
-msgstr "转到信息的 %s 部分"
+#: ../src/e-util/e-webdav-browser.c:1808
+#, fuzzy
+#| msgid "Create a new contact"
+msgid "Creating new collection…"
+msgstr "创建一个新联系人"
-#: ../src/e-util/e-web-view.c:1337
-msgid "Go to the beginning of the message"
-msgstr "转到信息的开头"
+#: ../src/e-util/e-webdav-browser.c:1809
+#, fuzzy
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create new collection"
+msgstr "创建管道失败：%s"
-#: ../src/e-util/e-web-view.c:1341
-#, c-format
-msgid "Click to open %s"
-msgstr "单击以打开 %s"
+#: ../src/e-util/e-webdav-browser.c:1948
+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:1950
+msgid "It is not allowed to create calendar under another book or calendar"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2179
+#, fuzzy
+#| msgid "Deleting a memo"
+#| msgid_plural "Deleting %d memos"
+msgid "Deleting book…"
+msgstr "正在删除 %d 个备忘"
+
+#: ../src/e-util/e-webdav-browser.c:2180
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete book"
+msgstr "删除联系人失败"
+
+#: ../src/e-util/e-webdav-browser.c:2183
+#, fuzzy
+#| msgid "Opening calendar"
+msgid "Deleting calendar…"
+msgstr "打开日历"
+
+#: ../src/e-util/e-webdav-browser.c:2184
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete calendar"
+msgstr "删除联系人失败"
+
+#: ../src/e-util/e-webdav-browser.c:2187
+#, fuzzy
+#| msgid "Meeting Cancelation"
+msgid "Deleting collection…"
+msgstr "会议取消"
+
+#: ../src/e-util/e-webdav-browser.c:2188
+#, fuzzy
+#| msgid "Failed to delete contact"
+msgid "Failed to delete collection"
+msgstr "删除联系人失败"
+
+#: ../src/e-util/e-webdav-browser.c:2419
+msgid "For Components:"
+msgstr ""
+
+#: ../src/e-util/e-webdav-browser.c:2425
+msgid "_Events"
+msgstr "事件(_E)"
+
+#: ../src/e-util/e-webdav-browser.c:2615
+#, fuzzy
+#| msgid "LDAP Servers"
+msgid "WebDAV server:"
+msgstr "LDAP 服务器"
+
+#: ../src/e-util/e-webdav-browser.c:2650
+#, fuzzy
+#| msgid "Target Book"
+msgid "Create _Book"
+msgstr "目标地址簿"
+
+#: ../src/e-util/e-webdav-browser.c:2657
+#, fuzzy
+#| msgid "Weather Calendars"
+msgid "Create _Calendar"
+msgstr "天气月历"
+
+#: ../src/e-util/e-webdav-browser.c:2664
+#, fuzzy
+#| msgid "Collection"
+msgid "Create Collectio_n"
+msgstr "收藏"
+
+#: ../src/e-util/e-web-view.c:407
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
+
+#: ../src/e-util/e-web-view.c:409
+msgid "Copy the link to the clipboard"
+msgstr "将链接复制到剪贴板"
+
+#: ../src/e-util/e-web-view.c:417
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
+
+#: ../src/e-util/e-web-view.c:419
+msgid "Open the link in a web browser"
+msgstr "在浏览器中打开链接"
+
+#: ../src/e-util/e-web-view.c:427
+msgid "_Copy Email Address"
+msgstr "复制电子邮件地址(_C)"
+
+#: ../src/e-util/e-web-view.c:434
+msgid "Copy _Raw Email Address"
+msgstr "复制原始电子邮件地址(_R)"
+
+#: ../src/e-util/e-web-view.c:436
+msgid "Copy the raw email address to the clipboard"
+msgstr "复制原始电子邮件地址到剪贴板"
+
+#: ../src/e-util/e-web-view.c:451
+msgid "_Copy Image"
+msgstr "复制图像(_C)"
+
+#: ../src/e-util/e-web-view.c:453
+msgid "Copy the image to the clipboard"
+msgstr "将图像复制到剪贴板"
+
+#: ../src/e-util/e-web-view.c:458
+msgid "Save _Image…"
+msgstr "保存图像(_I)…"
+
+#: ../src/e-util/e-web-view.c:460
+msgid "Save the image to a file"
+msgstr "保存该图像为文件"
+
+#: ../src/e-util/e-web-view.c:475 ../src/mail/e-mail-browser.c:201
+#: ../src/mail/e-mail-reader.c:2819
+#, fuzzy
+#| msgid "Search Rule"
+msgid "Search _Web…"
+msgstr "搜索过滤器"
+
+#: ../src/e-util/e-web-view.c:477 ../src/mail/e-mail-browser.c:203
+#: ../src/mail/e-mail-reader.c:2821
+#, fuzzy
+#| msgid "Send a message to the selected contacts"
+msgid "Search the Web with the selected text"
+msgstr "给选中的联系人发送信息"
+
+#: ../src/e-util/e-web-view.c:487 ../src/e-util/e-web-view.c:2016
+msgid "Select all text and images"
+msgstr "选中全部文本和图像"
-#: ../src/e-util/e-web-view.c:3875
+#: ../src/e-util/e-web-view.c:3742
msgid "Copying image to clipboard"
msgstr "正在将图像复制到剪贴板"
-#: ../src/e-util/e-web-view.c:4063
+#: ../src/e-util/e-web-view.c:3930
msgid "Save Image"
msgstr "保存图像"
-#: ../src/e-util/e-web-view.c:4104
+#: ../src/e-util/e-web-view.c:3967
#, fuzzy, c-format
#| msgid "Saving image to '%s'"
msgid "Saving image to “%s”"
msgstr "正在保存图像至 %s"
-#: ../src/e-util/e-web-view.c:4199
+#: ../src/e-util/e-web-view.c:4114
#, fuzzy, c-format
#| msgid "Cannot get URI '%s', do not know how to download it."
msgid "Cannot get URI “%s”, do not know how to download it."
@@ -15284,17 +16717,17 @@ msgstr "您指定的时间"
msgid "a time relative to the current time"
msgstr "相对于当前时间的时间"
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:98
msgid "seconds"
msgstr "秒"
#: ../src/e-util/filter.ui.h:9
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
msgid "weeks"
msgstr "周"
#: ../src/e-util/filter.ui.h:10
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
msgid "months"
msgstr "月"
@@ -15331,7 +16764,7 @@ msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
#| "12:00am of the date specified."
msgid ""
"The message’s date will be compared against\n"
-"12:00am of the date specified."
+"the beginning of the specified day."
msgstr "信息的日期将会与指定日期的午夜12:00进行比较。"
#: ../src/e-util/filter.ui.h:19
@@ -15348,10 +16781,14 @@ msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
msgid "Show filters for mail:"
msgstr "显示邮件过滤器："
-#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:401
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
+#: ../src/e-util/filter.ui.h:24
+msgid "Rule Name"
+msgstr "规则名称"
+
#: ../src/e-util/gal-a11y-e-cell.c:128
msgid "Table Cell"
msgstr "表格单元格"
@@ -15385,7 +16822,7 @@ msgstr "在包含此单元格的 ETree 中折叠行"
msgid "click"
msgstr "单击"
-#: ../src/e-util/gal-a11y-e-table-column-header.c:160
+#: ../src/e-util/gal-a11y-e-table-column-header.c:161
msgid "sort"
msgstr "排序"
@@ -15401,7 +16838,7 @@ msgstr "创建新视图(_C)"
msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:201
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:202
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗？"
@@ -15409,7 +16846,7 @@ msgstr "您希望保存更改吗？"
msgid "This signature has been changed, but has not been saved."
msgstr "签名已经更改，但尚未保存。"
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:204
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
@@ -15437,23 +16874,11 @@ msgstr "无法加载签名。"
msgid "Could not save signature."
msgstr "无法保存签名。"
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:27
-msgid "OAuth2 Google"
-msgstr "OAuth2 Google"
-
-#: ../src/libemail-engine/camel-sasl-oauth2-google.c:28
-msgid ""
-"This option will use an OAuth 2.0 access token to connect to the Google "
-"server"
-msgstr "该选项将使用 OAuth 2.0 访问令牌连接到谷歌服务器。"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:27
-msgid "OAuth2"
-msgstr "OAuth2"
-
-#: ../src/libemail-engine/camel-sasl-xoauth2.c:28
-msgid "This option will use an OAuth 2.0 access token to connect to the server"
-msgstr "该选项将使用 OAuth 2.0 访问令牌连接到服务器。"
+#: ../src/e-util/widgets.error.xml.h:10
+#, fuzzy
+#| msgid "Could not get a selection to delete."
+msgid "Could not get selected text."
+msgstr "无法获得要删除的选中项。"
#: ../src/libemail-engine/e-mail-folder-utils.c:106
#, fuzzy, c-format
@@ -15461,147 +16886,160 @@ msgstr "该选项将使用 OAuth 2.0 访问令牌连接到服务器。"
msgid "Saving message to folder “%s”"
msgstr "把信息保存到文件夹 %s 中"
-#: ../src/libemail-engine/e-mail-folder-utils.c:565
+#: ../src/libemail-engine/e-mail-folder-utils.c:567
msgid "Forwarded messages"
msgstr "转发的信息"
-#: ../src/libemail-engine/e-mail-folder-utils.c:675
-#: ../src/libemail-engine/e-mail-folder-utils.c:937
+#: ../src/libemail-engine/e-mail-folder-utils.c:677
+#: ../src/libemail-engine/e-mail-folder-utils.c:939
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../src/libemail-engine/e-mail-folder-utils.c:777
+#: ../src/libemail-engine/e-mail-folder-utils.c:779
msgid "Scanning messages for duplicates"
msgstr "扫描信息中的重复信息？"
-#: ../src/libemail-engine/e-mail-folder-utils.c:1150
+#: ../src/libemail-engine/e-mail-folder-utils.c:1152
#, fuzzy, c-format
#| msgid "Removing folder '%s'"
msgid "Removing folder “%s”"
msgstr "删除文件夹 %s"
-#: ../src/libemail-engine/e-mail-folder-utils.c:1331
+#: ../src/libemail-engine/e-mail-folder-utils.c:1333
#, fuzzy, c-format
#| msgid "File \"%s\" has been removed."
msgid "File “%s” has been removed."
msgstr "已经删除了“%s”文件。"
-#: ../src/libemail-engine/e-mail-folder-utils.c:1335
+#: ../src/libemail-engine/e-mail-folder-utils.c:1337
msgid "File has been removed."
msgstr "文件已移除。"
-#: ../src/libemail-engine/e-mail-folder-utils.c:1411
+#: ../src/libemail-engine/e-mail-folder-utils.c:1413
msgid "Removing attachments"
msgstr "正在移除附件"
-#: ../src/libemail-engine/e-mail-folder-utils.c:1583
+#: ../src/libemail-engine/e-mail-folder-utils.c:1585
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "保存 %d 封信"
-#: ../src/libemail-engine/e-mail-folder-utils.c:1961
+#: ../src/libemail-engine/e-mail-folder-utils.c:1963
#, fuzzy, c-format
#| msgid "Invalid folder URI '%s'"
msgid "Invalid folder URI “%s”"
msgstr "无效的文件夹 URI：“%s”"
#. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:125
-#: ../src/mail/em-folder-properties.c:1150
-#: ../src/mail/em-folder-tree-model.c:1236
-#: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1026
-#: ../src/modules/mail/e-mail-shell-view-private.c:1037
+#: ../src/libemail-engine/e-mail-session.c:120
+#: ../src/mail/em-folder-properties.c:1444
+#: ../src/mail/em-folder-tree-model.c:1503
+#: ../src/mail/importers/kmail-libs.c:138
+#: ../src/modules/mail/e-mail-shell-view-private.c:1011
+#: ../src/modules/mail/e-mail-shell-view-private.c:1022
msgid "Inbox"
msgstr "收件箱"
#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:126
-#: ../src/mail/em-folder-tree-model.c:1229
-#: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1024
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/importers/kmail-libs.c:144
+#: ../src/modules/mail/e-mail-shell-view-private.c:1009
msgid "Drafts"
msgstr "草稿"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:127
-#: ../src/mail/em-folder-tree-model.c:1240
-#: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1028
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1507
+#: ../src/mail/importers/kmail-libs.c:140
+#: ../src/modules/mail/e-mail-shell-view-private.c:1013
msgid "Outbox"
msgstr "发件箱"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:128
-#: ../src/mail/em-folder-tree-model.c:1244
-#: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1030
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1511
+#: ../src/mail/importers/kmail-libs.c:142
+#: ../src/modules/mail/e-mail-shell-view-private.c:1015
msgid "Sent"
msgstr "已发箱"
#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:129
-#: ../src/mail/em-folder-tree-model.c:1232
-#: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1032
-#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/mail/e-mail-templates-store.c:2211
+#: ../src/mail/em-folder-tree-model.c:1499
+#: ../src/mail/importers/kmail-libs.c:146
+#: ../src/modules/mail/e-mail-shell-view-private.c:1017
#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
msgid "Templates"
msgstr "模板"
-#: ../src/libemail-engine/e-mail-session.c:1332
+#: ../src/libemail-engine/e-mail-session.c:1514
#, c-format
msgid "User cancelled operation"
msgstr "用户己取消操作"
-#: ../src/libemail-engine/e-mail-session.c:1389
+#: ../src/libemail-engine/e-mail-session.c:1575
#, c-format
msgid ""
"No destination address provided, forwarding of the message has been "
"cancelled."
msgstr "缺少发送目标地址，信息转发被取消。"
-#: ../src/libemail-engine/e-mail-session.c:1402
+#: ../src/libemail-engine/e-mail-session.c:1588
#, c-format
msgid "No identity found to use, forwarding of the message has been cancelled."
msgstr "无可用身份，信息转发被取消。"
-#: ../src/libemail-engine/e-mail-session.c:2444
+#: ../src/libemail-engine/e-mail-session.c:1789
#, fuzzy, c-format
-#| msgid "Waiting for '%s'"
+#| msgid "Source with UID '%s' not found"
+msgid "Corresponding source for service with UID “%s” not found"
+msgstr "未找到 UID 为 %s 的源"
+
+#: ../src/libemail-engine/e-mail-session.c:1909
+msgid "Looking up recipient S/MIME certificates in address books…"
+msgstr ""
+
+#: ../src/libemail-engine/e-mail-session.c:1911
+msgid "Looking up recipient PGP keys in address books…"
+msgstr ""
+
+#: ../src/libemail-engine/e-mail-session.c:2958
+#, c-format
msgid "Waiting for “%s”"
msgstr "正在等待“%s”"
-#: ../src/libemail-engine/e-mail-session-utils.c:524
+#: ../src/libemail-engine/e-mail-session-utils.c:526
msgid "No mail transport service available"
msgstr "没有可用的邮件传送服务"
-#: ../src/libemail-engine/e-mail-session-utils.c:614
-#: ../src/libemail-engine/mail-ops.c:706
+#: ../src/libemail-engine/e-mail-session-utils.c:613
+#: ../src/libemail-engine/mail-ops.c:708
#, fuzzy, c-format
#| msgid "Posting message to '%s'"
msgid "Posting message to “%s”"
msgstr "正在发送信息到“%s”"
-#: ../src/libemail-engine/e-mail-session-utils.c:651
-#: ../src/libemail-engine/mail-ops.c:742
+#: ../src/libemail-engine/e-mail-session-utils.c:650
+#: ../src/libemail-engine/mail-ops.c:744
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败：%s"
-#: ../src/libemail-engine/e-mail-session-utils.c:681
-#: ../src/libemail-engine/e-mail-session-utils.c:716
-#: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
+#: ../src/libemail-engine/e-mail-session-utils.c:683
+#: ../src/libemail-engine/e-mail-session-utils.c:718
+#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
#, fuzzy, c-format
#| msgid "Storing sent message to '%s'"
msgid "Storing sent message to “%s”"
msgstr "正在保存发送信息到“%s”"
-#: ../src/libemail-engine/e-mail-session-utils.c:705
-#: ../src/libemail-engine/mail-ops.c:790
+#: ../src/libemail-engine/e-mail-session-utils.c:707
+#: ../src/libemail-engine/mail-ops.c:796
#, fuzzy, c-format
#| msgid ""
#| "Failed to append to %s: %s\n"
@@ -15613,15 +17051,16 @@ msgstr ""
"追加到 %s：%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../src/libemail-engine/e-mail-session-utils.c:735
-#: ../src/libemail-engine/mail-ops.c:818
+#: ../src/libemail-engine/e-mail-session-utils.c:737
+#: ../src/libemail-engine/mail-ops.c:824
#, fuzzy, c-format
#| msgid "Failed to append to local 'Sent' folder: %s"
msgid "Failed to append to local “Sent” folder: %s"
msgstr "追加到本地“已发”文件夹失败：%s"
-#: ../src/libemail-engine/e-mail-session-utils.c:923
-#: ../src/libemail-engine/mail-ops.c:978 ../src/libemail-engine/mail-ops.c:1080
+#: ../src/libemail-engine/e-mail-session-utils.c:930
+#: ../src/libemail-engine/mail-ops.c:1020
+#: ../src/libemail-engine/mail-ops.c:1135 ../src/mail/mail-send-recv.c:665
msgid "Sending message"
msgstr "发送信息"
@@ -15632,52 +17071,64 @@ msgid "Disconnecting from “%s”"
msgstr "断开与 %s 的连接"
#: ../src/libemail-engine/e-mail-store-utils.c:264
+#: ../src/mail/e-mail-backend.c:1048
#, fuzzy, c-format
#| msgid "Reconnecting to '%s'"
msgid "Reconnecting to “%s”"
msgstr "重新连接到 %s"
#: ../src/libemail-engine/e-mail-store-utils.c:349
+#: ../src/mail/mail-send-recv.c:1086
#, fuzzy, c-format
#| msgid "Preparing account '%s' for offline"
msgid "Preparing account “%s” for offline"
msgstr "正在准备离线使用帐号“%s”"
-#: ../src/libemail-engine/mail-ops.c:88
+#: ../src/libemail-engine/mail-ops.c:87
msgid "Filtering Selected Messages"
msgstr "过滤选中的信息"
-#: ../src/libemail-engine/mail-ops.c:146
-#, c-format
+#: ../src/libemail-engine/mail-ops.c:145
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to filter selected messages. One reason can be that folder "
+#| "location set in one or more filters is invalid. Please check your filters "
+#| "in Edit->Message Filters.\n"
+#| "Original error was: %s"
msgid ""
"Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
"Original error was: %s"
msgstr ""
"无法过滤选定的信息。一个原因可能是一个或多个过滤器的文件夹位置设定无效。请通"
"过“编辑”->“信息过滤器”检查您的过滤器。\n"
"原错误为：%s"
-#: ../src/libemail-engine/mail-ops.c:226
+#: ../src/libemail-engine/mail-ops.c:225
#, fuzzy, c-format
#| msgid "Fetching mail from '%s'"
msgid "Fetching mail from “%s”"
msgstr "正在从 '%s' 收取邮件"
-#: ../src/libemail-engine/mail-ops.c:736
-#, c-format
+#: ../src/libemail-engine/mail-ops.c:738
+#, fuzzy, c-format
+#| msgid ""
+#| "Failed to apply outgoing filters. One reason can be that folder location "
+#| "set in one or more filters is invalid. Please check your filters in Edit-"
+#| ">Message Filters.\n"
+#| "Original error was: %s"
msgid ""
"Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
"Original error was: %s"
msgstr ""
"无法应用发送过滤器。一个原因可能是一个或多个过滤器的文件夹位置设定无效。请通"
"过“编辑”->“信息过滤器”检查您的过滤器。\n"
"原错误为：%s"
-#: ../src/libemail-engine/mail-ops.c:989
+#: ../src/libemail-engine/mail-ops.c:1031
#, c-format
msgid "Sending message %d of %d"
msgstr "正在发送第 %d 封信，共 %d 封"
@@ -15685,81 +17136,92 @@ msgstr "正在发送第 %d 封信，共 %d 封"
#. Translators: The string is distinguished by total
#. * count of messages to be sent. Failed messages is
#. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1041
+#: ../src/libemail-engine/mail-ops.c:1089
#, c-format
msgid "Failed to send a message"
msgid_plural "Failed to send %d of %d messages"
msgstr[0] "无法发送 %d/%d 条信息"
-#: ../src/libemail-engine/mail-ops.c:1047
+#: ../src/libemail-engine/mail-ops.c:1095
msgid "Cancelled."
-msgstr "已取消"
+msgstr "已取消。"
-#: ../src/libemail-engine/mail-ops.c:1049
+#: ../src/libemail-engine/mail-ops.c:1097
msgid "Complete."
msgstr "完成。"
-#: ../src/libemail-engine/mail-ops.c:1164
+#: ../src/libemail-engine/mail-ops.c:1221
#, fuzzy, c-format
#| msgid "Moving messages to '%s'"
msgid "Moving messages to “%s”"
msgstr "正在移动信息至 %s"
-#: ../src/libemail-engine/mail-ops.c:1165
+#: ../src/libemail-engine/mail-ops.c:1222
#, fuzzy, c-format
#| msgid "Copying messages to '%s'"
msgid "Copying messages to “%s”"
msgstr "把信息复制到 %s"
-#: ../src/libemail-engine/mail-ops.c:1284
+#: ../src/libemail-engine/mail-ops.c:1341
#, fuzzy, c-format
#| msgid "Storing folder '%s'"
msgid "Storing folder “%s”"
msgstr "存储文件夹“%s”"
-#: ../src/libemail-engine/mail-ops.c:1412
+#: ../src/libemail-engine/mail-ops.c:1469
#, fuzzy, c-format
#| msgid "Expunging and storing account '%s'"
msgid "Expunging and storing account “%s”"
msgstr "销毁并存储帐号“%s”"
-#: ../src/libemail-engine/mail-ops.c:1413
+#: ../src/libemail-engine/mail-ops.c:1470
#, fuzzy, c-format
#| msgid "Storing account '%s'"
msgid "Storing account “%s”"
msgstr "存储帐号“%s”"
-#: ../src/libemail-engine/mail-ops.c:1488
+#: ../src/libemail-engine/mail-ops.c:1545
#, fuzzy, c-format
#| msgid "Emptying trash in '%s'"
msgid "Emptying trash in “%s”"
msgstr "清空“%s”中的废件箱"
-#: ../src/libemail-engine/mail-ops.c:1580
+#: ../src/libemail-engine/mail-ops.c:1644
#, fuzzy, c-format
#| msgid "Processing folder changes in '%s'"
msgid "Processing folder changes in “%s”"
msgstr "正在处理在“%s”的文件夹变更"
-#: ../src/libemail-engine/mail-tools.c:68
+#: ../src/libemail-engine/mail-tools.c:69
#, fuzzy, c-format
#| msgid "Could not create spool directory '%s': %s"
msgid "Could not create spool directory “%s”: %s"
msgstr "无法创建离线目录“%s”：%s"
-#: ../src/libemail-engine/mail-tools.c:108
+#: ../src/libemail-engine/mail-tools.c:109
#, fuzzy, c-format
#| msgid "Trying to movemail a non-mbox source '%s'"
msgid "Trying to movemail a non-mbox source “%s”"
msgstr "试图将邮件移至非 mbox 源 %s"
-#: ../src/libemail-engine/mail-tools.c:257
-#, fuzzy, c-format
-#| msgid "Forwarded message - %s"
+#. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the
original message.
+#: ../src/libemail-engine/mail-tools.c:198
+#, c-format
+msgid "Fwd: %s"
+msgstr "Fwd: %s"
+
+#. Translators: This is a subject attribution for forwarded messages, used when there could not be used any
subject.
+#. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
+#: ../src/libemail-engine/mail-tools.c:208
+msgid "No Subject"
+msgstr "（无主题）"
+
+#: ../src/libemail-engine/mail-tools.c:283
+#, c-format
msgid "Forwarded message — %s"
-msgstr "转发的信息 - %s"
+msgstr "转发的信息 — %s"
-#: ../src/libemail-engine/mail-tools.c:259
+#: ../src/libemail-engine/mail-tools.c:285
msgid "Forwarded message"
msgstr "转发的信息"
@@ -15768,7 +17230,7 @@ msgstr "转发的信息"
msgid "Setting up Search Folder: %s"
msgstr "设置搜索文件夹：%s"
-#: ../src/libemail-engine/mail-vfolder.c:302
+#: ../src/libemail-engine/mail-vfolder.c:303
#, fuzzy, c-format
#| msgid "Updating Search Folders for '%s' - %s"
msgid "Updating Search Folders for “%s : %s”"
@@ -15779,7 +17241,7 @@ msgstr "更新搜索文件夹：“%s”- %s"
#. * removed folder. For more than one search folder is
#. * each of them on a separate line, with four spaces
#. * in front of its name, without quotes.
-#: ../src/libemail-engine/mail-vfolder.c:666
+#: ../src/libemail-engine/mail-vfolder.c:667
#, fuzzy, c-format
#| msgid ""
#| "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -15802,83 +17264,219 @@ msgstr[0] ""
"“%s”。"
#: ../src/mail/e-mail-account-manager.c:118
-#: ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:206
msgid "Open _Online Accounts"
msgstr "打开在线帐号(_O)"
#: ../src/mail/e-mail-account-manager.c:144
-#: ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:232
msgid "This account was created through the Online Accounts service."
msgstr "该帐号通过在线帐号服务创建"
-#: ../src/mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:692
msgid "_Reset Order"
msgstr "重置顺序(_R)"
-#: ../src/mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:705
msgid "You can drag and drop account names to reorder them."
msgstr "您可以拖放帐号名来重新排序。"
-#: ../src/mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:748
msgid "De_fault"
msgstr "默认(_F)"
-#: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1299
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
-#: ../src/plugins/publish-calendar/publish-calendar.c:853
-msgid "Enabled"
-msgstr "已启用"
+#: ../src/mail/e-mail-autoconfig.c:436
+#, c-format
+msgid "Invalid URI: “%s”"
+msgstr "无效的 URI：“%s”"
-#: ../src/mail/e-mail-account-tree-view.c:108
-msgid "Account Name"
-msgstr "帐号名"
+#: ../src/mail/e-mail-autoconfig.c:768
+#, c-format
+msgid "Host: %s:%d"
+msgstr "主机：%s:%d"
+
+#: ../src/mail/e-mail-autoconfig.c:772
+#, c-format
+msgid "User: %s"
+msgstr "用户：%s"
+
+#: ../src/mail/e-mail-autoconfig.c:776
+#, c-format
+msgid "Security method: %s"
+msgstr "加密方法：%s"
+
+#: ../src/mail/e-mail-autoconfig.c:777
+#: ../src/mail/e-mail-config-summary-page.c:146
+msgid "TLS"
+msgstr "TLS"
+
+#: ../src/mail/e-mail-autoconfig.c:778
+#: ../src/mail/e-mail-config-summary-page.c:149
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../src/mail/e-mail-autoconfig.c:782
+#, c-format
+msgid "Authentication mechanism: %s"
+msgstr "认证机制：%s"
-#: ../src/mail/e-mail-autoconfig.c:620
+#: ../src/mail/e-mail-autoconfig.c:962
msgid "No email address provided"
msgstr "没有提供电子邮件地址"
-#: ../src/mail/e-mail-autoconfig.c:629
+#: ../src/mail/e-mail-autoconfig.c:971
msgid "Missing domain in email address"
msgstr "电子邮件地址中缺少域"
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:782
-#: ../src/shell/e-shell-window-actions.c:789
-#: ../src/shell/e-shell-window-actions.c:796
+#: ../src/mail/e-mail-autoconfig.c:1321
+#: ../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:1328
+#: ../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:1335
+#: ../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:877
+#: ../src/shell/e-shell-window-actions.c:884
+#: ../src/shell/e-shell-window-actions.c:891
msgid "Close this window"
msgstr "关闭此窗口"
-#: ../src/mail/e-mail-browser.c:287
+#: ../src/mail/e-mail-browser.c:353
msgid "(No Subject)"
msgstr "(无主题)"
#. GtkAssistant's back button label.
-#: ../src/mail/e-mail-config-assistant.c:47
+#: ../src/mail/e-mail-config-assistant.c:48
msgid "Go _Back"
msgstr "后退(_B)"
#. GtkAssistant sinks the floating button reference.
-#: ../src/mail/e-mail-config-assistant.c:116
+#: ../src/mail/e-mail-config-assistant.c:130
msgid "_Skip Lookup"
msgstr "跳过查找(_S)"
-#: ../src/mail/e-mail-config-assistant.c:661
+#: ../src/mail/e-mail-config-assistant.c:725
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
-#: ../src/mail/e-mail-config-assistant.c:955
+#: ../src/mail/e-mail-config-assistant.c:1032
msgid "_Revise Details"
msgstr "核实详细信息(_R)"
-#: ../src/mail/e-mail-config-auth-check.c:178
-msgid "Querying authentication types..."
-msgstr "正在查询认证类型"
+#: ../src/mail/e-mail-config-auth-check.c:217
+msgid "Querying authentication types…"
+msgstr "正在查询认证类型……"
-#: ../src/mail/e-mail-config-auth-check.c:341
+#: ../src/mail/e-mail-config-auth-check.c:430
msgid "Check for Supported Types"
msgstr "检查支持的类型"
-#: ../src/mail/e-mail-config-confirm-page.c:156
+#: ../src/mail/e-mail-config-composing-page.c:117
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "使用全局设置"
+
+#: ../src/mail/e-mail-config-composing-page.c:119
+#: ../src/mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
+
+#: ../src/mail/e-mail-config-composing-page.c:121
+#: ../src/mail/mail-config.ui.h:30
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "内嵌(Outlook 风格)"
+
+#: ../src/mail/e-mail-config-composing-page.c:123
+#: ../src/mail/mail-config.ui.h:31
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引用"
+
+#: ../src/mail/e-mail-config-composing-page.c:125
+#: ../src/mail/mail-config.ui.h:32
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "不引用"
+
+#: ../src/mail/e-mail-config-composing-page.c:157
+msgid "Use global setting"
+msgstr "使用全局设置"
+
+#: ../src/mail/e-mail-config-composing-page.c:408
+#: ../src/mail/e-mail-config-composing-page.c:642
+msgid "Composing Messages"
+msgstr "撰写信息"
+
+#: ../src/mail/e-mail-config-composing-page.c:417
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "总是抄送到(_S)："
+
+#: ../src/mail/e-mail-config-composing-page.c:442
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "总是密件抄送到(_B)："
+
+#: ../src/mail/e-mail-config-composing-page.c:467
+msgid "Re_ply style:"
+msgstr "回复风格：(_P)"
+
+#: ../src/mail/e-mail-config-composing-page.c:495
+msgid "Lang_uage:"
+msgstr "语言(_U)："
+
+#: ../src/mail/e-mail-config-composing-page.c:498
+#: ../src/mail/e-mail-config-composing-page.c:508
+#: ../src/mail/mail-config.ui.h:21
+msgid "Language for Reply and Forward attribution text"
+msgstr ""
+
+#: ../src/mail/e-mail-config-composing-page.c:524
+#: ../src/mail/em-composer-utils.c:4148 ../src/mail/mail-config.ui.h:22
+#, fuzzy
+#| msgid "Start _typing at the bottom on replying"
+msgid "Start _typing at the bottom"
+msgstr "回复时在底部开始打字(_T)"
+
+#: ../src/mail/e-mail-config-composing-page.c:531
+#: ../src/mail/em-composer-utils.c:4151 ../src/mail/mail-config.ui.h:23
+#, fuzzy
+#| msgid "_Keep signature above the original message on replying"
+msgid "_Keep signature above the original message"
+msgstr "回复时保留原始信息的签名(_K)"
+
+#: ../src/mail/e-mail-config-composing-page.c:548
+msgid "Message Receipts"
+msgstr "已读回执"
+
+#: ../src/mail/e-mail-config-composing-page.c:557
+msgid "S_end message receipts:"
+msgstr "发送信息收条(_E)："
+
+#: ../src/mail/e-mail-config-composing-page.c:582
+msgid "Never"
+msgstr "从不"
+
+#: ../src/mail/e-mail-config-composing-page.c:588
+msgid "Always"
+msgstr "总是"
+
+#: ../src/mail/e-mail-config-composing-page.c:594
+msgid "Ask for each message"
+msgstr "每条信息都询问"
+
+#: ../src/mail/e-mail-config-confirm-page.c:155
#, fuzzy
#| msgid ""
#| "Congratulations, your mail configuration is complete.\n"
@@ -15899,149 +17497,86 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: ../src/mail/e-mail-config-confirm-page.c:168
+#: ../src/mail/e-mail-config-confirm-page.c:167
msgid "Done"
msgstr "完成"
-#: ../src/mail/e-mail-config-defaults-page.c:378
-msgid "Checking server settings..."
+#: ../src/mail/e-mail-config-defaults-page.c:314
+#, fuzzy
+#| msgid "Checking server settings..."
+msgid "Checking server settings…"
msgstr "正在检查服务器设置…"
-#: ../src/mail/e-mail-config-defaults-page.c:496
-msgctxt "ReplyForward"
-msgid "Use global setting"
-msgstr "使用全局设置"
-
-#: ../src/mail/e-mail-config-defaults-page.c:498
-#: ../src/mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "附件"
-
-#: ../src/mail/e-mail-config-defaults-page.c:500
-#: ../src/mail/mail-config.ui.h:27
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "内嵌(Outlook 风格)"
-
-#: ../src/mail/e-mail-config-defaults-page.c:502
-#: ../src/mail/mail-config.ui.h:28
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引用"
-
-#: ../src/mail/e-mail-config-defaults-page.c:504
-#: ../src/mail/mail-config.ui.h:29
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "不引用"
-
-#: ../src/mail/e-mail-config-defaults-page.c:830
+#: ../src/mail/e-mail-config-defaults-page.c:663
msgid "Special Folders"
msgstr "特殊文件夹"
-#: ../src/mail/e-mail-config-defaults-page.c:839
+#: ../src/mail/e-mail-config-defaults-page.c:672
msgid "Draft Messages _Folder:"
msgstr "草稿信息文件夹(_F)："
-#: ../src/mail/e-mail-config-defaults-page.c:849
+#: ../src/mail/e-mail-config-defaults-page.c:682
msgid "Choose a folder for saving draft messages."
msgstr "选择保存草稿信息的文件夹。"
-#: ../src/mail/e-mail-config-defaults-page.c:863
+#: ../src/mail/e-mail-config-defaults-page.c:698
msgid "Sent _Messages Folder:"
msgstr "已发送信息文件夹(_M)："
-#: ../src/mail/e-mail-config-defaults-page.c:873
+#: ../src/mail/e-mail-config-defaults-page.c:726
msgid "Choose a folder for saving sent messages."
msgstr "选择保存已发送信息的文件夹。"
-#: ../src/mail/e-mail-config-defaults-page.c:892
+#: ../src/mail/e-mail-config-defaults-page.c:752
msgid "S_ave replies in the folder of the message being replied to"
msgstr "将回复邮件保存在被回复信息所在的文件夹"
-#: ../src/mail/e-mail-config-defaults-page.c:909
+#: ../src/mail/e-mail-config-defaults-page.c:775
msgid "Archi_ve Folder:"
msgstr "归档文件夹(_V)："
-#: ../src/mail/e-mail-config-defaults-page.c:919
-#: ../src/modules/mail/em-mailer-prefs.c:1401
+#: ../src/mail/e-mail-config-defaults-page.c:785
+#: ../src/modules/mail/em-mailer-prefs.c:1517
msgid "Choose a folder to archive messages to."
msgstr "选择要将信息归档到哪个文件夹。"
-#: ../src/mail/e-mail-config-defaults-page.c:933
+#: ../src/mail/e-mail-config-defaults-page.c:800
msgid "_Templates Folder:"
msgstr "模板文件夹(_T)："
-#: ../src/mail/e-mail-config-defaults-page.c:943
+#: ../src/mail/e-mail-config-defaults-page.c:810
msgid "Choose a folder to use for template messages."
msgstr "选择消息模板的文件夹。"
-#: ../src/mail/e-mail-config-defaults-page.c:965
+#: ../src/mail/e-mail-config-defaults-page.c:832
msgid "_Restore Defaults"
msgstr "恢复默认值(_R)"
-#: ../src/mail/e-mail-config-defaults-page.c:982
+#: ../src/mail/e-mail-config-defaults-page.c:849
msgid "_Lookup Folders"
msgstr "查找文件夹(_L)"
-#: ../src/mail/e-mail-config-defaults-page.c:1000
+#: ../src/mail/e-mail-config-defaults-page.c:867
msgid "Use a Real Folder for _Trash:"
msgstr "使用真实文件夹作为废件箱(_T)："
-#: ../src/mail/e-mail-config-defaults-page.c:1001
+#: ../src/mail/e-mail-config-defaults-page.c:868
msgid "Choose a folder for deleted messages."
msgstr "选择已删除信息的文件夹。"
-#: ../src/mail/e-mail-config-defaults-page.c:1010
+#: ../src/mail/e-mail-config-defaults-page.c:877
msgid "Use a Real Folder for _Junk:"
msgstr "使用真实文件夹存放垃圾信息(_J)："
-#: ../src/mail/e-mail-config-defaults-page.c:1011
+#: ../src/mail/e-mail-config-defaults-page.c:878
msgid "Choose a folder for junk messages."
msgstr "选择垃圾信息的文件夹。"
-#: ../src/mail/e-mail-config-defaults-page.c:1028
-msgid "Composing Messages"
-msgstr "撰写信息"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1037
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "总是抄送到(_S)："
-
-#: ../src/mail/e-mail-config-defaults-page.c:1062
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "总是密件抄送到(_B)："
-
-#: ../src/mail/e-mail-config-defaults-page.c:1093
-msgid "Re_ply style:"
-msgstr "回复风格：(_P)"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1129
-msgid "Message Receipts"
-msgstr "已读回执"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1138
-msgid "S_end message receipts:"
-msgstr "发送信息收条(_E)："
-
-#: ../src/mail/e-mail-config-defaults-page.c:1163
-msgid "Never"
-msgstr "从不"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1169
-msgid "Always"
-msgstr "总是"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1175
-msgid "Ask for each message"
-msgstr "每条信息都询问"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1282
+#: ../src/mail/e-mail-config-defaults-page.c:996
msgid "Defaults"
msgstr "默认值"
-#: ../src/mail/e-mail-config-identity-page.c:516
+#: ../src/mail/e-mail-config-identity-page.c:513
#, fuzzy
#| msgid ""
#| "Please enter your name and email address below. The \"optional\" fields "
@@ -16055,13 +17590,8 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../src/mail/e-mail-config-identity-page.c:544
-#: ../src/mail/e-mail-config-summary-page.c:324
-msgid "Account Information"
-msgstr "帐号信息"
-
-#: ../src/mail/e-mail-config-identity-page.c:582
-#: ../src/mail/e-mail-config-summary-page.c:354
+#: ../src/mail/e-mail-config-identity-page.c:580
+#: ../src/mail/e-mail-config-summary-page.c:355
#, fuzzy
#| msgid ""
#| "The above name will be used to identify this account.\n"
@@ -16073,93 +17603,83 @@ msgstr ""
"上述名称用来代表这个帐号。\n"
"例如：“工作”或“个人”。"
-#: ../src/mail/e-mail-config-identity-page.c:599
+#: ../src/mail/e-mail-config-identity-page.c:597
msgid "Required Information"
msgstr "需要的信息"
-#: ../src/mail/e-mail-config-identity-page.c:608
+#: ../src/mail/e-mail-config-identity-page.c:606
msgid "Full Nam_e:"
msgstr "全名(_E)："
-#: ../src/mail/e-mail-config-identity-page.c:637
+#: ../src/mail/e-mail-config-identity-page.c:635
msgid "Email _Address:"
msgstr "电子邮件地址(_A)："
-#: ../src/mail/e-mail-config-identity-page.c:686
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
+#: ../src/mail/e-mail-config-identity-page.c:684
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
msgid "Optional Information"
msgstr "可选信息"
-#: ../src/mail/e-mail-config-identity-page.c:695
+#: ../src/mail/e-mail-config-identity-page.c:693
msgid "Re_ply-To:"
msgstr "回复到(_P)："
-#: ../src/mail/e-mail-config-identity-page.c:724
+#: ../src/mail/e-mail-config-identity-page.c:722
msgid "Or_ganization:"
msgstr "组织(_G)："
-#: ../src/mail/e-mail-config-identity-page.c:779
-msgid "Add Ne_w Signature..."
-msgstr "添加新签名(_W)..."
+#: ../src/mail/e-mail-config-identity-page.c:777
+msgid "Add Ne_w Signature…"
+msgstr "添加新签名(_W)……"
-#: ../src/mail/e-mail-config-identity-page.c:793
+#: ../src/mail/e-mail-config-identity-page.c:791
msgid "A_liases:"
-msgstr ""
+msgstr "别名(_L)："
-#: ../src/mail/e-mail-config-identity-page.c:855
-#: ../src/mail/mail-config.ui.h:113
-msgid "Add"
-msgstr "添加"
-
-#: ../src/mail/e-mail-config-identity-page.c:864
-msgid "Edit"
-msgstr "编辑"
-
-#: ../src/mail/e-mail-config-identity-page.c:873
-#: ../src/mail/mail-config.ui.h:114
-msgid "Remove"
-msgstr "移除"
+#: ../src/mail/e-mail-config-identity-page.c:863
+msgid "Edi_t"
+msgstr "编辑(_T)"
-#: ../src/mail/e-mail-config-identity-page.c:887
+#: ../src/mail/e-mail-config-identity-page.c:886
msgid "_Look up mail server details based on the entered e-mail address"
msgstr "根据输入的电子邮件地址搜寻邮件服务器详情"
#. This is only a warning, not a blocker
#. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:935
msgid "Full Name should not be empty"
msgstr "全名不能为空"
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:942
msgid "Email Address cannot be empty"
msgstr "邮件地址不能为空"
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:947
msgid "Email Address is not a valid email"
msgstr "邮件地址不是有效的邮箱"
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:959
msgid "Reply To is not a valid email"
msgstr "回复到 不是有效的邮箱"
-#: ../src/mail/e-mail-config-identity-page.c:969
-#: ../src/mail/e-mail-config-summary-page.c:633
+#: ../src/mail/e-mail-config-identity-page.c:970
+#: ../src/mail/e-mail-config-summary-page.c:637
msgid "Account Name cannot be empty"
msgstr "账户名称不能为空"
-#: ../src/mail/e-mail-config-lookup-page.c:69
-msgid "Looking up account details..."
-msgstr "正在查找帐号详情..."
+#: ../src/mail/e-mail-config-lookup-page.c:65
+msgid "Looking up account details…"
+msgstr "正在查找帐号详情……"
-#: ../src/mail/e-mail-config-provider-page.c:529
+#: ../src/mail/e-mail-config-provider-page.c:541
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../src/mail/e-mail-config-provider-page.c:545
+#: ../src/mail/e-mail-config-provider-page.c:557
msgid "Check for _new messages every"
msgstr "自动检查新信息的间隔(_N)"
-#: ../src/mail/e-mail-config-provider-page.c:753
+#: ../src/mail/e-mail-config-provider-page.c:767
msgid "Receiving Options"
msgstr "接收选项"
@@ -16169,118 +17689,118 @@ msgstr "接收电子邮件"
#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
#. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:231
+#: ../src/mail/e-mail-config-security-page.c:379
#, c-format
msgctxt "PGPKeyDescription"
msgid "%s — %s"
-msgstr ""
+msgstr "%s — %s"
-#: ../src/mail/e-mail-config-security-page.c:320
-#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:31
-#: ../src/modules/addressbook/autocompletion-config.c:114
-#: ../src/modules/calendar/e-calendar-preferences.c:644
+#: ../src/mail/e-mail-config-security-page.c:460
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
+#: ../src/modules/addressbook/autocompletion-config.c:115
+#: ../src/modules/calendar/e-calendar-preferences.c:621
#: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:729
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
+#: ../src/modules/mail/e-mail-shell-backend.c:806
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
msgid "General"
msgstr "常规"
-#: ../src/mail/e-mail-config-security-page.c:329
+#: ../src/mail/e-mail-config-security-page.c:469
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../src/mail/e-mail-config-security-page.c:351
+#: ../src/mail/e-mail-config-security-page.c:491
msgid "Pretty Good Privacy (OpenPGP)"
msgstr "PGP 加密 (OpenPGP)"
-#: ../src/mail/e-mail-config-security-page.c:360
+#: ../src/mail/e-mail-config-security-page.c:500
msgid "OpenPGP _Key ID:"
msgstr "OpenPGP 密钥 ID (_K)："
-#: ../src/mail/e-mail-config-security-page.c:393
+#: ../src/mail/e-mail-config-security-page.c:531
msgid "Si_gning algorithm:"
msgstr "签名函数(_G)："
-#: ../src/mail/e-mail-config-security-page.c:409
-#: ../src/mail/e-mail-config-security-page.c:573
-#: ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:547
+#: ../src/mail/e-mail-config-security-page.c:711
+#: ../src/mail/mail-config.ui.h:79
msgid "SHA1"
msgstr "SHA1"
-#: ../src/mail/e-mail-config-security-page.c:412
-#: ../src/mail/e-mail-config-security-page.c:576
-#: ../src/mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:550
+#: ../src/mail/e-mail-config-security-page.c:714
+#: ../src/mail/mail-config.ui.h:80
msgid "SHA256"
msgstr "SHA256"
-#: ../src/mail/e-mail-config-security-page.c:415
-#: ../src/mail/e-mail-config-security-page.c:579
-#: ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-config-security-page.c:553
+#: ../src/mail/e-mail-config-security-page.c:717
+#: ../src/mail/mail-config.ui.h:81
msgid "SHA384"
msgstr "SHA384"
-#: ../src/mail/e-mail-config-security-page.c:418
-#: ../src/mail/e-mail-config-security-page.c:582
-#: ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:556
+#: ../src/mail/e-mail-config-security-page.c:720
+#: ../src/mail/mail-config.ui.h:82
msgid "SHA512"
msgstr "SHA512"
-#: ../src/mail/e-mail-config-security-page.c:434
+#: ../src/mail/e-mail-config-security-page.c:572
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息(_W)"
-#: ../src/mail/e-mail-config-security-page.c:446
+#: ../src/mail/e-mail-config-security-page.c:584
msgid "Always enc_rypt outgoing messages when using this account"
msgstr "使用此帐号时永远加密外发邮件(_R)"
-#: ../src/mail/e-mail-config-security-page.c:458
+#: ../src/mail/e-mail-config-security-page.c:596
msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../src/mail/e-mail-config-security-page.c:470
+#: ../src/mail/e-mail-config-security-page.c:608
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../src/mail/e-mail-config-security-page.c:482
+#: ../src/mail/e-mail-config-security-page.c:620
msgid "Prefer _inline sign/encrypt for plain text messages"
msgstr "优先为纯文本信息内嵌签名/加密信息(_I)"
-#: ../src/mail/e-mail-config-security-page.c:506
+#: ../src/mail/e-mail-config-security-page.c:644
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME (S/MIME)"
-#: ../src/mail/e-mail-config-security-page.c:515
+#: ../src/mail/e-mail-config-security-page.c:653
msgid "Sig_ning certificate:"
msgstr "签名证书(_N)："
-#: ../src/mail/e-mail-config-security-page.c:539
-#: ../src/mail/e-mail-config-security-page.c:637
+#: ../src/mail/e-mail-config-security-page.c:677
+#: ../src/mail/e-mail-config-security-page.c:775
msgid "Select"
msgstr "选择"
-#: ../src/mail/e-mail-config-security-page.c:548
-#: ../src/mail/e-mail-config-security-page.c:646
-#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/e-mail-config-security-page.c:686
+#: ../src/mail/e-mail-config-security-page.c:784
+#: ../src/shell/e-shell-window-actions.c:973
msgid "_Clear"
msgstr "清除(_C)"
-#: ../src/mail/e-mail-config-security-page.c:557
+#: ../src/mail/e-mail-config-security-page.c:695
msgid "Signing _algorithm:"
msgstr "签名函数(_A)："
-#: ../src/mail/e-mail-config-security-page.c:598
+#: ../src/mail/e-mail-config-security-page.c:736
msgid "Always sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息"
-#: ../src/mail/e-mail-config-security-page.c:613
+#: ../src/mail/e-mail-config-security-page.c:751
msgid "Encryption certificate:"
msgstr "加密证书："
-#: ../src/mail/e-mail-config-security-page.c:655
+#: ../src/mail/e-mail-config-security-page.c:793
msgid "Always encrypt outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息"
-#: ../src/mail/e-mail-config-security-page.c:667
+#: ../src/mail/e-mail-config-security-page.c:805
msgid "Always encrypt to myself when sending encrypted messages"
msgstr "当发送加密信息时总是对自身加密"
@@ -16288,66 +17808,62 @@ msgstr "当发送加密信息时总是对自身加密"
msgid "Sending Email"
msgstr "发送电子邮件中"
-#: ../src/mail/e-mail-config-service-page.c:639
+#: ../src/mail/e-mail-config-service-page.c:501
msgid "Server _Type:"
msgstr "服务器类型(_T)："
-#: ../src/mail/e-mail-config-summary-page.c:143
-msgid "TLS"
-msgstr "TLS"
-
-#: ../src/mail/e-mail-config-summary-page.c:146
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../src/mail/e-mail-config-summary-page.c:307
+#: ../src/mail/e-mail-config-summary-page.c:308
msgid ""
"This is a summary of the settings which will be used to access your mail."
msgstr "这是将用于访问您邮件的设置汇总。"
-#: ../src/mail/e-mail-config-summary-page.c:371
+#: ../src/mail/e-mail-config-summary-page.c:372
msgid "Personal Details"
msgstr "个人详细信息"
-#: ../src/mail/e-mail-config-summary-page.c:380
+#: ../src/mail/e-mail-config-summary-page.c:381
msgid "Full Name:"
msgstr "全名："
-#: ../src/mail/e-mail-config-summary-page.c:394
+#: ../src/mail/e-mail-config-summary-page.c:395
msgid "Email Address:"
msgstr "电子邮件地址："
-#: ../src/mail/e-mail-config-summary-page.c:408
+#: ../src/mail/e-mail-config-summary-page.c:409
msgid "Receiving"
msgstr "接收"
-#: ../src/mail/e-mail-config-summary-page.c:420
+#: ../src/mail/e-mail-config-summary-page.c:421
msgid "Sending"
msgstr "发送"
-#: ../src/mail/e-mail-config-summary-page.c:432
+#: ../src/mail/e-mail-config-summary-page.c:433
msgid "Server Type:"
msgstr "服务器类型："
-#: ../src/mail/e-mail-config-summary-page.c:453
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
+#: ../src/mail/e-mail-config-summary-page.c:454
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
msgid "Server:"
msgstr "服务器："
-#: ../src/mail/e-mail-config-summary-page.c:474
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../src/mail/e-mail-config-summary-page.c:475
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
msgid "Username:"
msgstr "用户名："
-#: ../src/mail/e-mail-config-summary-page.c:495
+#: ../src/mail/e-mail-config-summary-page.c:496
msgid "Security:"
msgstr "安全："
-#: ../src/mail/e-mail-config-summary-page.c:788
+#: ../src/mail/e-mail-config-summary-page.c:650
+msgid "Cannot have both receiving and sending parts set to None"
+msgstr ""
+
+#: ../src/mail/e-mail-config-summary-page.c:806
msgid "Account Summary"
msgstr "帐号摘要"
-#: ../src/mail/e-mail-config-welcome-page.c:157
+#: ../src/mail/e-mail-config-welcome-page.c:162
#, fuzzy
#| msgid ""
#| "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -16362,64 +17878,68 @@ msgstr ""
"\n"
"单击“下一步”开始。"
-#: ../src/mail/e-mail-config-welcome-page.c:167
-#: ../src/modules/startup-wizard/e-startup-assistant.c:152
+#: ../src/mail/e-mail-config-welcome-page.c:172
+#: ../src/modules/startup-wizard/e-startup-assistant.c:182
msgid "Welcome"
msgstr "欢迎"
-#: ../src/mail/e-mail-config-window.c:326
+#: ../src/mail/e-mail-config-window.c:329
msgid "Account Editor"
msgstr "帐号编辑器"
-#: ../src/mail/e-mail-display.c:128
-msgid "_Add to Address Book..."
+#: ../src/mail/e-mail-display.c:141
+#, fuzzy
+#| msgid "_Add to Address Book..."
+msgid "_Add to Address Book…"
msgstr "添加到地址簿(_A)..."
-#: ../src/mail/e-mail-display.c:135
+#: ../src/mail/e-mail-display.c:148
msgid "_To This Address"
msgstr "到此地址(_T)"
-#: ../src/mail/e-mail-display.c:142
+#: ../src/mail/e-mail-display.c:155
msgid "_From This Address"
msgstr "自此地址(_F)"
-#: ../src/mail/e-mail-display.c:149
-msgid "Send _Reply To..."
+#: ../src/mail/e-mail-display.c:162
+#, fuzzy
+#| msgid "Send _Reply To..."
+msgid "Send _Reply To…"
msgstr "发送回复给(_R)..."
-#: ../src/mail/e-mail-display.c:151
+#: ../src/mail/e-mail-display.c:164
msgid "Send a reply message to this address"
msgstr "发送一条回复信息到这个地址"
-#: ../src/mail/e-mail-display.c:158
+#: ../src/mail/e-mail-display.c:171
msgid "Create Search _Folder"
msgstr "创建搜索文件夹(_F)"
-#: ../src/mail/e-mail-display.c:803
+#: ../src/mail/e-mail-display.c:724
msgid "Hid_e All"
msgstr "全部隐藏(_E)"
-#: ../src/mail/e-mail-display.c:810
+#: ../src/mail/e-mail-display.c:731
msgid "_View Inline"
msgstr "嵌入查看(_V)"
-#: ../src/mail/e-mail-display.c:817
+#: ../src/mail/e-mail-display.c:738
msgid "Vie_w All Inline"
msgstr "嵌入查看(_W)"
-#: ../src/mail/e-mail-display.c:824
+#: ../src/mail/e-mail-display.c:745
msgid "_Zoom to 100%"
msgstr "放到到 100% (_Z)"
-#: ../src/mail/e-mail-display.c:826
+#: ../src/mail/e-mail-display.c:747
msgid "Zoom the image to its natural size"
msgstr "缩放图像到原始尺寸"
-#: ../src/mail/e-mail-display.c:831
+#: ../src/mail/e-mail-display.c:752
msgid "_Zoom to window"
msgstr "缩放到窗口(_Z)"
-#: ../src/mail/e-mail-display.c:833
+#: ../src/mail/e-mail-display.c:754
msgid "Zoom large images to not be wider than the window width"
msgstr "缩小较大图像以免宽于窗口宽度"
@@ -16439,44 +17959,70 @@ msgstr "创建(_R)"
msgid "Folder _name:"
msgstr "文件夹名称(_N)："
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+#, fuzzy
+#| msgid "Folder Properties"
+msgid "Folder Sort Order"
+msgstr "文件夹属性"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+#, fuzzy
+#| msgid "Close the current file"
+msgid "Reset c_urrent level"
+msgstr "关闭当前文件"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+msgid "Reset sort order in the current level to the defaults"
+msgstr ""
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+#, fuzzy
+#| msgid "Select all headers"
+msgid "Reset _all levels"
+msgstr "选中所有信头"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+msgid "Reset sort order in all levels to their defaults"
+msgstr ""
+
#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
#. The translated value should not contain spaces.
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:231
msgctxt "ffe"
msgid "Answered"
msgstr "已答复"
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:232
msgctxt "ffe"
msgid "Deleted"
msgstr "已删除"
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:233
msgctxt "ffe"
msgid "Draft"
msgstr "草稿"
-#: ../src/mail/e-mail-free-form-exp.c:237
+#: ../src/mail/e-mail-free-form-exp.c:234
msgctxt "ffe"
msgid "Flagged"
msgstr "已标志"
-#: ../src/mail/e-mail-free-form-exp.c:238
+#: ../src/mail/e-mail-free-form-exp.c:235
msgctxt "ffe"
msgid "Seen"
msgstr "已读"
-#: ../src/mail/e-mail-free-form-exp.c:239
+#: ../src/mail/e-mail-free-form-exp.c:236
msgctxt "ffe"
msgid "Attachment"
msgstr "附件"
-#: ../src/mail/e-mail-free-form-exp.c:487
+#: ../src/mail/e-mail-free-form-exp.c:489
msgctxt "ffe"
msgid "no"
msgstr "no"
-#: ../src/mail/e-mail-free-form-exp.c:488
+#: ../src/mail/e-mail-free-form-exp.c:490
msgctxt "ffe"
msgid "false"
msgstr "false"
@@ -16513,14 +18059,13 @@ msgstr "待办(_T)"
msgid "_Later"
msgstr "稍候(_L)"
-#: ../src/mail/e-mail-label-manager.c:169
-#: ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1198
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:905
+#: ../src/mail/em-folder-properties.c:1141
msgid "Add Label"
msgstr "添加标签"
#: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:869
+#: ../src/mail/em-folder-properties.c:1168
msgid "Edit Label"
msgstr "编辑标签"
@@ -16534,25 +18079,31 @@ msgstr "注意：标签名中的下划线被用作菜单中的助记符。"
msgid "Color"
msgstr "颜色"
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
+#: ../src/mail/e-mail-notes.c:322 ../src/mail/e-mail-notes.c:725
msgid "Message Note"
msgstr "消息附带的便笺"
-#: ../src/mail/e-mail-notes.c:639
+#: ../src/mail/e-mail-notes.c:645
msgid "Cannot find message in its folder summary"
msgstr "未在所在文件夹的摘要中找到邮件"
-#: ../src/mail/e-mail-notes.c:842
-msgid "Storing changes..."
-msgstr "存储更改..."
+#: ../src/mail/e-mail-notes.c:870
+#, fuzzy
+#| msgid "Failed to remove attachments from messages."
+msgid "Failed to convert text to message"
+msgstr "移除信息里的附件失败。"
+
+#: ../src/mail/e-mail-notes.c:884 ../src/mail/e-mail-notes.c:909
+msgid "Storing changes…"
+msgstr "正在存储更改……"
-#: ../src/mail/e-mail-notes.c:968
+#: ../src/mail/e-mail-notes.c:1052
msgid "Edit Message Note"
msgstr "编辑消息附带的便笺"
-#: ../src/mail/e-mail-notes.c:1122
-msgid "Retrieving message..."
-msgstr "正在收取信息..."
+#: ../src/mail/e-mail-notes.c:1207
+msgid "Retrieving message…"
+msgstr "正在获取信息……"
#: ../src/mail/e-mail-print-config-headers.c:166
msgid "Move selected headers to top"
@@ -16582,648 +18133,727 @@ msgstr "信头名称"
msgid "Header Value"
msgstr "信头值"
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:135
msgid "Headers"
msgstr "信头"
-#: ../src/mail/e-mail-printer.c:142
+#: ../src/mail/e-mail-printer.c:145
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页，共 %d 页"
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:65
msgid "Move to Folder"
msgstr "移至文件夹"
-#: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:357 ../src/mail/filtertypes.xml.in.h:66
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
-#: ../src/mail/mail.error.xml.h:152
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/mail.error.xml.h:153
msgid "_Move"
msgstr "移动(_M)"
-#: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
+#: ../src/mail/e-mail-reader.c:361 ../src/mail/em-folder-utils.c:568
msgid "C_opy"
msgstr "复制(_O)"
-#: ../src/mail/e-mail-reader.c:485
-msgid "Deleting message note..."
+#: ../src/mail/e-mail-reader.c:609
+#, fuzzy
+#| msgid "Deleting message note..."
+msgid "Deleting message note…"
msgstr "删除消息附带的便笺"
-#: ../src/mail/e-mail-reader.c:1307 ../src/mail/e-mail-reader.c:1519
-#: ../src/mail/e-mail-reader.c:1559
+#: ../src/mail/e-mail-reader.c:1609 ../src/mail/e-mail-reader.c:1900
+#: ../src/mail/e-mail-reader.c:1940
msgid "_Do not ask me again."
msgstr "不再询问(_D)。"
-#: ../src/mail/e-mail-reader.c:1565
+#: ../src/mail/e-mail-reader.c:1946
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
-#: ../src/mail/e-mail-reader.c:1768
+#: ../src/mail/e-mail-reader.c:2150
msgid "Failed to retrieve message:"
msgstr "获取信息失败："
-#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3172
-#, fuzzy, c-format
-#| msgid "Retrieving message '%s'"
+#: ../src/mail/e-mail-reader.c:2196 ../src/mail/e-mail-reader.c:3686
+#, c-format
msgid "Retrieving message “%s”"
-msgstr "收取信息 %s"
+msgstr "正在获取信息“%s”"
-#: ../src/mail/e-mail-reader.c:2001
+#: ../src/mail/e-mail-reader.c:2397
msgid "A_dd Sender to Address Book"
msgstr "将发件人添加到地址簿(_D)"
-#: ../src/mail/e-mail-reader.c:2003
+#: ../src/mail/e-mail-reader.c:2399
msgid "Add sender to address book"
msgstr "将发件人添加到地址簿"
-#: ../src/mail/e-mail-reader.c:2008
-msgid "_Archive..."
+#: ../src/mail/e-mail-reader.c:2404
+msgid "_Archive…"
msgstr "归档(_A)…"
-#: ../src/mail/e-mail-reader.c:2010
+#: ../src/mail/e-mail-reader.c:2406
msgid "Move selected messages to the Archive folder for the account"
msgstr "把选中的信息移至账户的归档文件夹"
-#: ../src/mail/e-mail-reader.c:2015
+#: ../src/mail/e-mail-reader.c:2411
msgid "Check for _Junk"
msgstr "检查垃圾信息(_J)"
-#: ../src/mail/e-mail-reader.c:2017
+#: ../src/mail/e-mail-reader.c:2413
msgid "Filter the selected messages for junk status"
msgstr "把选中的信息标记为垃圾信息"
-#: ../src/mail/e-mail-reader.c:2022
-msgid "_Copy to Folder..."
-msgstr "复制到文件夹(_C)..."
+#: ../src/mail/e-mail-reader.c:2418
+#, fuzzy
+#| msgid "Assign Color"
+msgid "Assign C_olor…"
+msgstr "分配颜色"
+
+#: ../src/mail/e-mail-reader.c:2420
+#, fuzzy
+#| msgid "Add a note for the selected message"
+msgid "Assign color for the selected messages"
+msgstr "为选中消息添加便笺"
+
+#: ../src/mail/e-mail-reader.c:2425
+#, fuzzy
+#| msgid "Unset Color"
+msgid "Unse_t Color"
+msgstr "取消颜色"
+
+#: ../src/mail/e-mail-reader.c:2427
+#, fuzzy
+#| msgid "Undelete the selected messages"
+msgid "Unset color for the selected messages"
+msgstr "取消选中信息的删除"
+
+#: ../src/mail/e-mail-reader.c:2432
+#, fuzzy
+#| msgid "Copy to Folder"
+msgid "_Copy to Folder…"
+msgstr "复制到文件夹"
-#: ../src/mail/e-mail-reader.c:2024
+#: ../src/mail/e-mail-reader.c:2434
msgid "Copy selected messages to another folder"
msgstr "把选中的信息复制到其它文件夹"
-#: ../src/mail/e-mail-reader.c:2029
+#: ../src/mail/e-mail-reader.c:2439
msgid "_Delete Message"
msgstr "删除信息(_D)"
-#: ../src/mail/e-mail-reader.c:2031
+#: ../src/mail/e-mail-reader.c:2441
msgid "Mark the selected messages for deletion"
msgstr "为选中信息做删除标记"
-#: ../src/mail/e-mail-reader.c:2036
-msgid "_Add note..."
+#: ../src/mail/e-mail-reader.c:2446
+#, fuzzy
+#| msgid "_Add note..."
+msgid "_Add note…"
msgstr "添加便笺...(_A)"
-#: ../src/mail/e-mail-reader.c:2038
+#: ../src/mail/e-mail-reader.c:2448
msgid "Add a note for the selected message"
msgstr "为选中消息添加便笺"
-#: ../src/mail/e-mail-reader.c:2043
+#: ../src/mail/e-mail-reader.c:2453
msgid "Delete no_te"
msgstr "删除便笺(_T)"
-#: ../src/mail/e-mail-reader.c:2045
+#: ../src/mail/e-mail-reader.c:2455
msgid "Delete the note for the selected message"
msgstr "为选中消息删除便笺"
-#: ../src/mail/e-mail-reader.c:2050
-msgid "_Edit note..."
+#: ../src/mail/e-mail-reader.c:2460
+#, fuzzy
+#| msgid "_Edit note..."
+msgid "_Edit note…"
msgstr "编辑便笺...(_E)"
-#: ../src/mail/e-mail-reader.c:2052
+#: ../src/mail/e-mail-reader.c:2462
msgid "Edit a note for the selected message"
msgstr "编辑选中消息的便笺"
-#: ../src/mail/e-mail-reader.c:2057
-msgid "Create a Filter Rule for Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2467
+#, fuzzy
+#| msgid "Create a Filter Rule for Mailing _List..."
+msgid "Create a Filter Rule for Mailing _List…"
msgstr "为邮件列表创建一条过滤规则(_L)..."
-#: ../src/mail/e-mail-reader.c:2059
+#: ../src/mail/e-mail-reader.c:2469
msgid "Create a rule to filter messages to this mailing list"
msgstr "创建可过滤寄往此邮件列表的信息的规则"
-#: ../src/mail/e-mail-reader.c:2064
-msgid "Create a Filter Rule for _Recipients..."
+#: ../src/mail/e-mail-reader.c:2474
+#, fuzzy
+#| msgid "Create a Filter Rule for _Recipients..."
+msgid "Create a Filter Rule for _Recipients…"
msgstr "为收件人创建一条过滤规则(_R)..."
-#: ../src/mail/e-mail-reader.c:2066
+#: ../src/mail/e-mail-reader.c:2476
msgid "Create a rule to filter messages to these recipients"
msgstr "创建可过滤寄往这些收件人的信息的规则"
-#: ../src/mail/e-mail-reader.c:2071
-msgid "Create a Filter Rule for Se_nder..."
+#: ../src/mail/e-mail-reader.c:2481
+#, fuzzy
+#| msgid "Create a Filter Rule for Se_nder..."
+msgid "Create a Filter Rule for Se_nder…"
msgstr "为发件人创建一条过滤规则(_N)..."
-#: ../src/mail/e-mail-reader.c:2073
+#: ../src/mail/e-mail-reader.c:2483
msgid "Create a rule to filter messages from this sender"
msgstr "创建可过滤此人寄来的信息的规则"
-#: ../src/mail/e-mail-reader.c:2078
-msgid "Create a Filter Rule for _Subject..."
+#: ../src/mail/e-mail-reader.c:2488
+#, fuzzy
+#| msgid "Create a Filter Rule for _Subject..."
+msgid "Create a Filter Rule for _Subject…"
msgstr "为主题创建一条过滤规则(_S)..."
-#: ../src/mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2490
msgid "Create a rule to filter messages with this subject"
msgstr "创建可过滤此主题信息的规则"
-#: ../src/mail/e-mail-reader.c:2085
+#: ../src/mail/e-mail-reader.c:2495
msgid "A_pply Filters"
msgstr "应用过滤规则(_P)"
-#: ../src/mail/e-mail-reader.c:2087
+#: ../src/mail/e-mail-reader.c:2497
msgid "Apply filter rules to the selected messages"
msgstr "应用过滤规则到选中的信息"
-#: ../src/mail/e-mail-reader.c:2092
-msgid "_Find in Message..."
+#: ../src/mail/e-mail-reader.c:2502
+#, fuzzy
+#| msgid "_Find in Message..."
+msgid "_Find in Message…"
msgstr "在信息中查找(_F)..."
-#: ../src/mail/e-mail-reader.c:2094
+#: ../src/mail/e-mail-reader.c:2504
msgid "Search for text in the body of the displayed message"
msgstr "在显示信息的主体中搜索文本"
-#: ../src/mail/e-mail-reader.c:2099
+#: ../src/mail/e-mail-reader.c:2509
msgid "_Clear Flag"
msgstr "清除标志(_C)"
-#: ../src/mail/e-mail-reader.c:2101
+#: ../src/mail/e-mail-reader.c:2511
msgid "Remove the follow-up flag from the selected messages"
msgstr "删除选中信息的跟随标志"
-#: ../src/mail/e-mail-reader.c:2106
+#: ../src/mail/e-mail-reader.c:2516
msgid "_Flag Completed"
msgstr "标志为已完成(_F)"
-#: ../src/mail/e-mail-reader.c:2108
+#: ../src/mail/e-mail-reader.c:2518
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "设置选中信息的跟随标志为已完成"
-#: ../src/mail/e-mail-reader.c:2113
-msgid "Follow _Up..."
-msgstr "跟随(_U)..."
+#: ../src/mail/e-mail-reader.c:2523
+#, fuzzy
+#| msgid "Follow Up"
+msgid "Follow _Up…"
+msgstr "跟随"
-#: ../src/mail/e-mail-reader.c:2115
+#: ../src/mail/e-mail-reader.c:2525
msgid "Flag the selected messages for follow-up"
msgstr "为选中信息添加跟随标志"
-#: ../src/mail/e-mail-reader.c:2120
-#: ../src/modules/mail/e-mail-attachment-handler.c:430
+#: ../src/mail/e-mail-reader.c:2530
+#: ../src/modules/mail/e-mail-attachment-handler.c:431
msgid "_Attached"
msgstr "附件(_A)"
-#: ../src/mail/e-mail-reader.c:2122 ../src/mail/e-mail-reader.c:2129
-#: ../src/modules/mail/e-mail-attachment-handler.c:432
+#: ../src/mail/e-mail-reader.c:2532 ../src/mail/e-mail-reader.c:2539
+#: ../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:2127
+#: ../src/mail/e-mail-reader.c:2537
msgid "Forward As _Attached"
msgstr "作为附件转发(_A)"
-#: ../src/mail/e-mail-reader.c:2134
-#: ../src/modules/mail/e-mail-attachment-handler.c:437
+#: ../src/mail/e-mail-reader.c:2544
+#: ../src/modules/mail/e-mail-attachment-handler.c:438
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ../src/mail/e-mail-reader.c:2136 ../src/mail/e-mail-reader.c:2143
-#: ../src/modules/mail/e-mail-attachment-handler.c:439
+#: ../src/mail/e-mail-reader.c:2546 ../src/mail/e-mail-reader.c:2553
+#: ../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:2141
+#: ../src/mail/e-mail-reader.c:2551
msgid "Forward As _Inline"
msgstr "嵌入正文转发(_I)"
-#: ../src/mail/e-mail-reader.c:2148
-#: ../src/modules/mail/e-mail-attachment-handler.c:444
+#: ../src/mail/e-mail-reader.c:2558
+#: ../src/modules/mail/e-mail-attachment-handler.c:445
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ../src/mail/e-mail-reader.c:2150 ../src/mail/e-mail-reader.c:2157
-#: ../src/modules/mail/e-mail-attachment-handler.c:446
+#: ../src/mail/e-mail-reader.c:2560 ../src/mail/e-mail-reader.c:2567
+#: ../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:2155
+#: ../src/mail/e-mail-reader.c:2565
msgid "Forward As _Quoted"
msgstr "作文引用转发(_Q)"
-#: ../src/mail/e-mail-reader.c:2162
+#: ../src/mail/e-mail-reader.c:2572
+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:2581
+msgid "N_one"
+msgstr "无(_O)"
+
+#: ../src/mail/e-mail-reader.c:2588
msgid "_Load Images"
msgstr "载入图像(_L)"
-#: ../src/mail/e-mail-reader.c:2164
+#: ../src/mail/e-mail-reader.c:2590
msgid "Force images in HTML mail to be loaded"
msgstr "强制载入 HTML 邮件中的图像"
-#: ../src/mail/e-mail-reader.c:2169 ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2595 ../src/mail/e-mail-reader.c:3014
msgid "_Ignore Subthread"
msgstr "忽略子会话(_I)"
-#: ../src/mail/e-mail-reader.c:2171
+#: ../src/mail/e-mail-reader.c:2597
msgid "Mark new mails in a subthread as read automatically"
msgstr "标记此子会话的新邮件为自动阅读"
-#: ../src/mail/e-mail-reader.c:2176 ../src/mail/e-mail-reader.c:2563
+#: ../src/mail/e-mail-reader.c:2602 ../src/mail/e-mail-reader.c:3018
msgid "_Ignore Thread"
msgstr "忽略会话(_I)"
-#: ../src/mail/e-mail-reader.c:2178
+#: ../src/mail/e-mail-reader.c:2604
msgid "Mark new mails in this thread as read automatically"
msgstr "标记此会话的新邮件为自动阅读"
-#: ../src/mail/e-mail-reader.c:2183
+#: ../src/mail/e-mail-reader.c:2609
msgid "_Important"
msgstr "重要(_I)"
-#: ../src/mail/e-mail-reader.c:2185
+#: ../src/mail/e-mail-reader.c:2611
msgid "Mark the selected messages as important"
msgstr "把选中信息标记为重要邮件"
-#: ../src/mail/e-mail-reader.c:2190
+#: ../src/mail/e-mail-reader.c:2616
msgid "_Junk"
msgstr "垃圾(_J)"
-#: ../src/mail/e-mail-reader.c:2192
+#: ../src/mail/e-mail-reader.c:2618
msgid "Mark the selected messages as junk"
msgstr "把选中信息标记为垃圾信息"
-#: ../src/mail/e-mail-reader.c:2197
+#: ../src/mail/e-mail-reader.c:2623
msgid "_Not Junk"
msgstr "非垃圾(_N)"
-#: ../src/mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2625
msgid "Mark the selected messages as not being junk"
msgstr "把选中信息标记为非垃圾信息"
-#: ../src/mail/e-mail-reader.c:2204
+#: ../src/mail/e-mail-reader.c:2630
msgid "_Read"
-msgstr "读取(_R)"
+msgstr "已读(_R)"
-#: ../src/mail/e-mail-reader.c:2206
+#: ../src/mail/e-mail-reader.c:2632
msgid "Mark the selected messages as having been read"
msgstr "把选中信息标记为已读"
-#: ../src/mail/e-mail-reader.c:2211 ../src/mail/e-mail-reader.c:2583
+#: ../src/mail/e-mail-reader.c:2637 ../src/mail/e-mail-reader.c:3038
msgid "Do not _Ignore Subthread"
msgstr "不要忽略子会话(_I)"
-#: ../src/mail/e-mail-reader.c:2213
+#: ../src/mail/e-mail-reader.c:2639
msgid "Do not mark new mails in a subthread as read automatically"
msgstr "不要标记此子会话的新邮件为自动阅读"
-#: ../src/mail/e-mail-reader.c:2218 ../src/mail/e-mail-reader.c:2587
+#: ../src/mail/e-mail-reader.c:2644 ../src/mail/e-mail-reader.c:3042
msgid "Do not _Ignore Thread"
msgstr "不要忽略会话(_I)"
-#: ../src/mail/e-mail-reader.c:2220
+#: ../src/mail/e-mail-reader.c:2646
msgid "Do not mark new mails in this thread as read automatically"
msgstr "不要标记此会话中的新邮件为自动阅读"
-#: ../src/mail/e-mail-reader.c:2225
+#: ../src/mail/e-mail-reader.c:2651
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../src/mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2653
msgid "Mark the selected messages as unimportant"
msgstr "把选中信息标记为不重要"
-#: ../src/mail/e-mail-reader.c:2232
+#: ../src/mail/e-mail-reader.c:2658
msgid "_Unread"
msgstr "未读(_U)"
-#: ../src/mail/e-mail-reader.c:2234
+#: ../src/mail/e-mail-reader.c:2660
msgid "Mark the selected messages as not having been read"
msgstr "把选中信息标记为未读"
-#: ../src/mail/e-mail-reader.c:2239
-#: ../src/modules/mail/e-mail-attachment-handler.c:416
-msgid "_Edit as New Message..."
-msgstr "作为新信息进行编辑(_E)..."
+#: ../src/mail/e-mail-reader.c:2665
+#: ../src/modules/mail/e-mail-attachment-handler.c:417
+msgid "_Edit as New Message…"
+msgstr "作为新信息进行编辑(_E)…"
-#: ../src/mail/e-mail-reader.c:2241
-#: ../src/modules/mail/e-mail-attachment-handler.c:418
+#: ../src/mail/e-mail-reader.c:2667
+#: ../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:2246
+#: ../src/mail/e-mail-reader.c:2672
msgid "Compose _New Message"
msgstr "撰写新信息(_N)"
-#: ../src/mail/e-mail-reader.c:2248
+#: ../src/mail/e-mail-reader.c:2674
msgid "Open a window for composing a mail message"
msgstr "打开窗口以撰写信息"
-#: ../src/mail/e-mail-reader.c:2253
+#: ../src/mail/e-mail-reader.c:2679
msgid "_Open in New Window"
msgstr "在新窗口中打开(_O)"
-#: ../src/mail/e-mail-reader.c:2255
+#: ../src/mail/e-mail-reader.c:2681
msgid "Open the selected messages in a new window"
msgstr "在新窗口中打开选中的信息"
-#: ../src/mail/e-mail-reader.c:2260
-msgid "_Move to Folder..."
-msgstr "移至文件夹(_M)..."
+#: ../src/mail/e-mail-reader.c:2686
+msgid "_Move to Folder…"
+msgstr "移至文件夹(_M)…"
-#: ../src/mail/e-mail-reader.c:2262
+#: ../src/mail/e-mail-reader.c:2688
msgid "Move selected messages to another folder"
msgstr "把选中的信息移至其它文件夹"
-#: ../src/mail/e-mail-reader.c:2267
+#: ../src/mail/e-mail-reader.c:2693
msgid "_Next Message"
msgstr "下一封信(_N)"
-#: ../src/mail/e-mail-reader.c:2269
+#: ../src/mail/e-mail-reader.c:2695
msgid "Display the next message"
msgstr "显示下一封信息"
-#: ../src/mail/e-mail-reader.c:2274
+#: ../src/mail/e-mail-reader.c:2700
msgid "Next _Important Message"
msgstr "下一封重要信息(_I)"
-#: ../src/mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2702
msgid "Display the next important message"
msgstr "显示下一封重要信息"
-#: ../src/mail/e-mail-reader.c:2281
+#: ../src/mail/e-mail-reader.c:2707
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ../src/mail/e-mail-reader.c:2283
+#: ../src/mail/e-mail-reader.c:2709
msgid "Display the next thread"
msgstr "显示下一条线索"
-#: ../src/mail/e-mail-reader.c:2288
+#: ../src/mail/e-mail-reader.c:2714
msgid "Next _Unread Message"
msgstr "下一封未读信息(_U)"
-#: ../src/mail/e-mail-reader.c:2290
+#: ../src/mail/e-mail-reader.c:2716
msgid "Display the next unread message"
msgstr "显示下一封未读信息"
-#: ../src/mail/e-mail-reader.c:2295
+#: ../src/mail/e-mail-reader.c:2721
msgid "_Previous Message"
msgstr "上一封信(_P)"
-#: ../src/mail/e-mail-reader.c:2297
+#: ../src/mail/e-mail-reader.c:2723
msgid "Display the previous message"
msgstr "显示上一封信息"
-#: ../src/mail/e-mail-reader.c:2302
+#: ../src/mail/e-mail-reader.c:2728
msgid "Pr_evious Important Message"
msgstr "上一封重要信息(_E)"
-#: ../src/mail/e-mail-reader.c:2304
+#: ../src/mail/e-mail-reader.c:2730
msgid "Display the previous important message"
msgstr "显示上一封重要信息"
-#: ../src/mail/e-mail-reader.c:2309
+#: ../src/mail/e-mail-reader.c:2735
msgid "Previous T_hread"
msgstr "上一条线索(_H)"
-#: ../src/mail/e-mail-reader.c:2311
+#: ../src/mail/e-mail-reader.c:2737
msgid "Display the previous thread"
msgstr "显示上一条线索"
-#: ../src/mail/e-mail-reader.c:2316
+#: ../src/mail/e-mail-reader.c:2742
msgid "P_revious Unread Message"
msgstr "上一封未读信息(_R)"
-#: ../src/mail/e-mail-reader.c:2318
+#: ../src/mail/e-mail-reader.c:2744
msgid "Display the previous unread message"
msgstr "显示上一封未读信息"
-#: ../src/mail/e-mail-reader.c:2325
+#: ../src/mail/e-mail-reader.c:2751
msgid "Print this message"
msgstr "打印该信息"
-#: ../src/mail/e-mail-reader.c:2332
+#: ../src/mail/e-mail-reader.c:2758
msgid "Preview the message to be printed"
msgstr "预览要打印的信息"
-#: ../src/mail/e-mail-reader.c:2337
-#: ../src/modules/mail/e-mail-attachment-handler.c:451
+#: ../src/mail/e-mail-reader.c:2763
+#: ../src/modules/mail/e-mail-attachment-handler.c:452
msgid "Re_direct"
msgstr "重发(_D)"
-#: ../src/mail/e-mail-reader.c:2339
-#: ../src/modules/mail/e-mail-attachment-handler.c:453
+#: ../src/mail/e-mail-reader.c:2765
+#: ../src/modules/mail/e-mail-attachment-handler.c:454
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选中信息重发(退回)给某人"
-#: ../src/mail/e-mail-reader.c:2344
+#: ../src/mail/e-mail-reader.c:2770
msgid "Remo_ve Attachments"
msgstr "移除附件(_V)"
-#: ../src/mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2772
msgid "Remove attachments"
msgstr "移除附件"
-#: ../src/mail/e-mail-reader.c:2351
+#: ../src/mail/e-mail-reader.c:2777
msgid "Remove Du_plicate Messages"
msgstr "移除重复的信息(_P)"
-#: ../src/mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2779
msgid "Checks selected messages for duplicates"
msgstr "检查所选信息中的重复信息？"
-#: ../src/mail/e-mail-reader.c:2358 ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
-#: ../src/modules/mail/e-mail-attachment-handler.c:395
+#: ../src/mail/e-mail-reader.c:2784 ../src/mail/em-composer-utils.c:4102
+#: ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
+#: ../src/modules/mail/e-mail-attachment-handler.c:396
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: ../src/mail/e-mail-reader.c:2360
-#: ../src/modules/mail/e-mail-attachment-handler.c:397
+#: ../src/mail/e-mail-reader.c:2786
+#: ../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:2365 ../src/mail/mail.error.xml.h:26
-#: ../src/modules/mail/e-mail-attachment-handler.c:402
+#: ../src/mail/e-mail-reader.c:2791
+msgid "Al_ternative Reply…"
+msgstr ""
+
+#: ../src/mail/e-mail-reader.c:2793
+#, fuzzy
+#| msgid "Compose a reply to the sender of the selected message"
+msgid "Choose reply options for the selected message"
+msgstr "为选中信息的发件人撰写回复"
+
+#: ../src/mail/e-mail-reader.c:2798 ../src/mail/em-composer-utils.c:4097
+#: ../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:2367
-#: ../src/modules/mail/e-mail-attachment-handler.c:404
+#: ../src/mail/e-mail-reader.c:2800
+#: ../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:2372
-#: ../src/modules/mail/e-mail-attachment-handler.c:409
+#: ../src/mail/e-mail-reader.c:2805
+#: ../src/modules/mail/e-mail-attachment-handler.c:410
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../src/mail/e-mail-reader.c:2374
-#: ../src/modules/mail/e-mail-attachment-handler.c:411
+#: ../src/mail/e-mail-reader.c:2807
+#: ../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:2379
-msgid "_Save as mbox..."
-msgstr "另存为 mbox 格式(_S)..."
+#: ../src/mail/e-mail-reader.c:2812
+msgid "_Save as mbox…"
+msgstr "另存为 mbox 格式(_S)…"
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2814
msgid "Save selected messages as an mbox file"
msgstr "把选中信息另存为 mbox 格式文件"
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2826
msgid "_Message Source"
msgstr "信息源代码(_M)"
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2828
msgid "Show the raw email source of the message"
msgstr "显示信息的原始邮件源代码"
-#: ../src/mail/e-mail-reader.c:2400
+#: ../src/mail/e-mail-reader.c:2840
msgid "_Undelete Message"
msgstr "取消删除信息(_U)"
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2842
msgid "Undelete the selected messages"
msgstr "取消选中信息的删除"
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2847
msgid "_Normal Size"
msgstr "普通大小(_N)"
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2849
msgid "Reset the text to its original size"
msgstr "把文本重新设置为原来的大小"
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2854
msgid "_Zoom In"
msgstr "放大(_Z)"
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2856
msgid "Increase the text size"
msgstr "增加文本大小"
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2863
msgid "Decrease the text size"
msgstr "减少文本大小"
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2870
msgid "Cre_ate"
msgstr "创建(_A)"
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2877
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../src/mail/e-mail-reader.c:2444
-#: ../src/modules/mail/e-mail-attachment-handler.c:423
+#: ../src/mail/e-mail-reader.c:2884
+#: ../src/modules/mail/e-mail-attachment-handler.c:424
msgid "F_orward As"
msgstr "转发为(_O)"
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2891
+msgid "_Label"
+msgstr "标签(_L)"
+
+#: ../src/mail/e-mail-reader.c:2898
msgid "_Group Reply"
msgstr "回复全部(_G)"
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2905
msgid "_Go To"
msgstr "转到(_G)"
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2912
msgid "Mar_k As"
msgstr "标记为(_K)"
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2919
msgid "_Message"
msgstr "信息(_M)"
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2926
msgid "_Zoom"
msgstr "缩放(_Z)"
-#: ../src/mail/e-mail-reader.c:2489
-msgid "Create a Search Folder from Mailing _List..."
+#: ../src/mail/e-mail-reader.c:2936
+#, fuzzy
+#| msgid "Create a Search Folder from Mailing _List..."
+msgid "Create a Search Folder from Mailing _List…"
msgstr "从邮件列表创建搜索文件夹(_L)..."
-#: ../src/mail/e-mail-reader.c:2491
+#: ../src/mail/e-mail-reader.c:2938
msgid "Create a search folder for this mailing list"
msgstr "为此邮件列表创建搜索文件夹"
-#: ../src/mail/e-mail-reader.c:2496
-msgid "Create a Search Folder from Recipien_ts..."
+#: ../src/mail/e-mail-reader.c:2943
+#, fuzzy
+#| msgid "Create a Search Folder from Recipien_ts..."
+msgid "Create a Search Folder from Recipien_ts…"
msgstr "从收件人创建搜索文件夹(_T)..."
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2945
msgid "Create a search folder for these recipients"
msgstr "为这些收件人创建搜索文件夹"
-#: ../src/mail/e-mail-reader.c:2503
-msgid "Create a Search Folder from Sen_der..."
+#: ../src/mail/e-mail-reader.c:2950
+#, fuzzy
+#| msgid "Create a Search Folder from Sen_der..."
+msgid "Create a Search Folder from Sen_der…"
msgstr "从发件人创建搜索文件夹(_D)..."
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2952
msgid "Create a search folder for this sender"
msgstr "为该发件人创建搜索文件夹"
-#: ../src/mail/e-mail-reader.c:2510
-msgid "Create a Search Folder from S_ubject..."
+#: ../src/mail/e-mail-reader.c:2957
+#, fuzzy
+#| msgid "Create a Search Folder from S_ubject..."
+msgid "Create a Search Folder from S_ubject…"
msgstr "从主题创建搜索文件夹(_U)..."
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2959
msgid "Create a search folder for this subject"
msgstr "为该主题创建搜索文件夹"
-#: ../src/mail/e-mail-reader.c:2551
-msgid "Mark for Follo_w Up..."
+#: ../src/mail/e-mail-reader.c:3006
+#, fuzzy
+#| msgid "Mark for Follo_w Up..."
+msgid "Mark for Follo_w Up…"
msgstr "标记为跟随(_W)..."
-#: ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:3022
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../src/mail/e-mail-reader.c:2571
+#: ../src/mail/e-mail-reader.c:3026
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../src/mail/e-mail-reader.c:2575
+#: ../src/mail/e-mail-reader.c:3030
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:3034
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:3046
msgid "Mark as Uni_mportant"
msgstr "标记为不重要(_M)"
-#: ../src/mail/e-mail-reader.c:2595
+#: ../src/mail/e-mail-reader.c:3050
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:3098
msgid "_Caret Mode"
msgstr "光标模式(_C)"
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:3100
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信息的信体中显示闪烁光标"
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:3106
msgid "All Message _Headers"
msgstr "全部信头(_H)"
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:3108
msgid "Show messages with all email headers"
msgstr "显示信息时显示所有信头"
-#: ../src/mail/e-mail-reader.c:3178
+#: ../src/mail/e-mail-reader.c:3692
msgid "Retrieving message"
msgstr "正在获取信息"
-#: ../src/mail/e-mail-reader.c:4228
-#: ../src/modules/mail/e-mail-attachment-handler.c:388
+#: ../src/mail/e-mail-reader.c:5062
+#: ../src/modules/mail/e-mail-attachment-handler.c:389
msgid "_Forward"
msgstr "转发(_F)"
-#: ../src/mail/e-mail-reader.c:4229
-#: ../src/modules/mail/e-mail-attachment-handler.c:390
+#: ../src/mail/e-mail-reader.c:5063
+#: ../src/modules/mail/e-mail-attachment-handler.c:391
msgid "Forward the selected message to someone"
msgstr "把选中信息转发给某人"
@@ -17231,88 +18861,70 @@ msgstr "把选中信息转发给某人"
#. * (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:4248
+#: ../src/mail/e-mail-reader.c:5082
msgid "Group Reply"
msgstr "回复全部"
-#: ../src/mail/e-mail-reader.c:4249
+#: ../src/mail/e-mail-reader.c:5083
msgid "Reply to the mailing list, or to all recipients"
msgstr "为选中信息的邮件列表或全部收件人撰写回复"
-#: ../src/mail/e-mail-reader.c:4315 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5149 ../src/mail/filtertypes.xml.in.h:67
msgid "Delete"
msgstr "删除"
-#: ../src/mail/e-mail-reader.c:4327
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1241
+#: ../src/mail/e-mail-reader.c:5161
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
msgid "Next"
msgstr "下一项"
-#: ../src/mail/e-mail-reader.c:4331
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1234
+#: ../src/mail/e-mail-reader.c:5165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
msgid "Previous"
msgstr "上一项"
-#: ../src/mail/e-mail-reader.c:4340 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5174 ../src/mail/mail-dialogs.ui.h:9
msgid "Reply"
msgstr "回复"
-#: ../src/mail/e-mail-reader.c:5413
-#, c-format
-msgid "Allow remote content for anyone from %s"
-msgstr "允许任何发件人为 %s 的远程内容"
-
-#: ../src/mail/e-mail-reader.c:5415
-#, c-format
-msgid "Allow remote content for %s"
-msgstr "允许任何收件人为 %s 的远程内容"
-
-#: ../src/mail/e-mail-reader.c:5432
-#, c-format
-msgid "Allow remote content from %s"
-msgstr "允许任何发件人为 %s 的远程内容"
-
-#: ../src/mail/e-mail-reader.c:5449
-msgid "Do not show this message again"
-msgstr "不再显示该信息"
-
-#: ../src/mail/e-mail-reader.c:5497
-msgid "Load remote content"
-msgstr "加载远程内容"
-
#: ../src/mail/e-mail-reader-utils.c:144
msgid "Do not warn me again"
msgstr "不要再警告我"
-#: ../src/mail/e-mail-reader-utils.c:568
+#: ../src/mail/e-mail-reader-utils.c:632
#, fuzzy, c-format
-#| msgid "Refreshing folder '%s'"
+#| msgid "Saving message to folder '%s'"
+msgid "Deleting messages in Junk folder “%s”…"
+msgstr "把信息保存到文件夹 %s 中"
+
+#: ../src/mail/e-mail-reader-utils.c:727
+#, c-format
msgid "Refreshing folder “%s”"
-msgstr "刷新文件夹 %s"
+msgstr "正在刷新文件夹“%s”"
-#: ../src/mail/e-mail-reader-utils.c:1175
+#: ../src/mail/e-mail-reader-utils.c:1334
msgid "Marking thread to be ignored"
msgstr "正在标记会话为忽略"
-#: ../src/mail/e-mail-reader-utils.c:1179
+#: ../src/mail/e-mail-reader-utils.c:1338
msgid "Unmarking thread from being ignored"
msgstr "正在去掉会话的忽略标记"
-#: ../src/mail/e-mail-reader-utils.c:1183
+#: ../src/mail/e-mail-reader-utils.c:1342
msgid "Marking subthread to be ignored"
msgstr "标记子会话为忽略"
-#: ../src/mail/e-mail-reader-utils.c:1187
+#: ../src/mail/e-mail-reader-utils.c:1346
msgid "Unmarking subthread from being ignored"
msgstr "正在去掉子会话的忽略标记"
-#: ../src/mail/e-mail-reader-utils.c:1439
+#: ../src/mail/e-mail-reader-utils.c:1602
msgid "Printing"
msgstr "正在打印"
#. Translators: %s is replaced with a folder
#. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1676
+#: ../src/mail/e-mail-reader-utils.c:1839
#, fuzzy, c-format
#| msgid ""
#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
@@ -17328,7 +18940,7 @@ msgid_plural ""
"them?"
msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗？"
-#: ../src/mail/e-mail-reader-utils.c:2694
+#: ../src/mail/e-mail-reader-utils.c:3023
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "保存信息"
@@ -17338,36 +18950,74 @@ msgstr[0] "保存信息"
#. * mbox format, when the first message doesn't have a
#. * subject. The extension ".mbox" is appended to the
#. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:2715
+#: ../src/mail/e-mail-reader-utils.c:3044
msgid "Message"
msgid_plural "Messages"
msgstr[0] "信息"
-#: ../src/mail/e-mail-reader-utils.c:3088
+#: ../src/mail/e-mail-reader-utils.c:3458
msgid "Parsing message"
msgstr "正在解析信息"
-#: ../src/mail/e-mail-request.c:270
+#: ../src/mail/e-mail-remote-content-popover.c:232
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "允许任何发件人为 %s 的远程内容"
+
+#: ../src/mail/e-mail-remote-content-popover.c:234
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "允许任何收件人为 %s 的远程内容"
+
+#: ../src/mail/e-mail-remote-content-popover.c:251
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "允许任何发件人为 %s 的远程内容"
+
+#: ../src/mail/e-mail-remote-content-popover.c:268
+msgid "Do not show this message again"
+msgstr "不再显示该信息"
+
+#: ../src/mail/e-mail-remote-content-popover.c:320
+msgid "Load remote content"
+msgstr "加载远程内容"
+
+#: ../src/mail/e-mail-remote-content-popover.c:395
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"您可以手动下载远程内容，或设置为记住下载这个发件人或使用过网站的远程内容。"
+
+#: ../src/mail/e-mail-request.c:288
msgid "The message has no text content."
msgstr "该信息没有文本内容。"
-#: ../src/mail/e-mail-tag-editor.c:163
+#: ../src/mail/e-mail-tag-editor.c:155
msgid "Flag to Follow Up"
msgstr "跟随的标志"
-#: ../src/mail/e-mail-ui-session.c:813
+#: ../src/mail/e-mail-tag-editor.c:161
+msgid "Cl_ear"
+msgstr ""
+
+#: ../src/mail/e-mail-templates-store.c:115
+msgid "No Title"
+msgstr "无标题"
+
+#: ../src/mail/e-mail-ui-session.c:820
#, c-format
msgid "%s authentication failed"
msgstr "%s 认证失败"
-#: ../src/mail/e-mail-ui-session.c:863
+#: ../src/mail/e-mail-ui-session.c:870
#, fuzzy, c-format
#| msgid "No data source found for UID '%s'"
msgid "No data source found for UID “%s”"
msgstr "未找到对应 UID“%s”的数据源"
#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:388
+#: ../src/mail/em-composer-utils.c:395
#, c-format
msgid "Are you sure you want to send a message with %d To and CC recipients?"
msgid_plural ""
@@ -17375,7 +19025,7 @@ msgid_plural ""
msgstr[0] "您确定要寄信给 %d 个收件人与抄送？"
#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:394
+#: ../src/mail/em-composer-utils.c:401
#, c-format
msgid ""
"You are trying to send a message to %d recipients in To and CC fields. This "
@@ -17396,15 +19046,17 @@ msgstr[0] ""
#. This message is never removed from the camel operation, otherwise the GtkInfoBar
#. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:790
-msgid "Waiting for attachments to load..."
+#: ../src/mail/em-composer-utils.c:829
+#, fuzzy
+#| msgid "Waiting for attachments to load..."
+msgid "Waiting for attachments to load…"
msgstr "正在等待附件载入..."
#. Note to translators: this is the attribution string used
#. * when quoting messages. Each ${Variable} gets replaced
#. * with a value. To see a full list of available variables,
#. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1745
+#: ../src/mail/em-composer-utils.c:2032
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -17412,153 +19064,339 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${WeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone}，${Sender}写道："
-#: ../src/mail/em-composer-utils.c:1751
+#: ../src/mail/em-composer-utils.c:2038
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信息 --------"
-#: ../src/mail/em-composer-utils.c:1756
+#: ../src/mail/em-composer-utils.c:2043
msgid "-----Original Message-----"
msgstr "-------- 原始信息 --------"
-#: ../src/mail/em-composer-utils.c:3042
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate
into the same string, the same as the ':' separator.
+#: ../src/mail/em-composer-utils.c:2804
+#, c-format
+msgctxt "reply-attribution"
+msgid "Re: %s"
+msgstr "Re: %s"
+
+#: ../src/mail/em-composer-utils.c:3422
msgid "an unknown sender"
msgstr "未知发件人"
+#: ../src/mail/em-composer-utils.c:4048
+#, fuzzy
+#| msgid "Accept Tentatively"
+msgid "Alternative Reply"
+msgstr "暂时接受"
+
+#: ../src/mail/em-composer-utils.c:4051
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
+msgid "_Reply"
+msgstr "回复(_R)"
+
+#: ../src/mail/em-composer-utils.c:4064
+#, fuzzy
+#| msgid "Recipients"
+msgid "Recipients:"
+msgstr "收件人"
+
+#: ../src/mail/em-composer-utils.c:4092
+#, fuzzy
+#| msgid "_Reply to Sender"
+msgid "Reply to _Sender"
+msgstr "回复发件人(_R)"
+
+#: ../src/mail/em-composer-utils.c:4114
+#, fuzzy
+#| msgid "_Reply style:"
+msgid "Reply style:"
+msgstr "回复风格(_R)："
+
+#: ../src/mail/em-composer-utils.c:4122
+msgid "_Default"
+msgstr "默认(_D)"
+
+#: ../src/mail/em-composer-utils.c:4126
+msgid "Attach_ment"
+msgstr "附件(_M)"
+
+#: ../src/mail/em-composer-utils.c:4130
+#, fuzzy
+#| msgctxt "ReplyForward"
+#| msgid "Inline (Outlook style)"
+msgid "Inline (_Outlook style)"
+msgstr "内嵌(Outlook 风格)"
+
+#: ../src/mail/em-composer-utils.c:4134
+msgid "_Quote"
+msgstr "引用(_Q)"
+
+#: ../src/mail/em-composer-utils.c:4138
+msgid "Do _Not Quote"
+msgstr "不引用(_N)"
+
+#: ../src/mail/em-composer-utils.c:4145
+#, fuzzy
+#| msgid "For_mat messages in HTML"
+msgid "_Format message in HTML"
+msgstr "以 HTML 方式格式化信息(_M)"
+
+#: ../src/mail/em-composer-utils.c:4158
+#, fuzzy
+#| msgid "_Template:"
+msgid "Apply t_emplate"
+msgstr "模板(_T)："
+
+#: ../src/mail/em-composer-utils.c:4170
+#, fuzzy
+#| msgid "Original message"
+msgid "Preserve original message S_ubject"
+msgstr "原始信息"
+
+#: ../src/mail/em-composer-utils.c:4236
+#, fuzzy, c-format
+#| msgid "Sender or Recipients"
+msgid "one recipient"
+msgid_plural "%d recipients"
+msgstr[0] "发送者或接收者"
+
#. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3518
+#: ../src/mail/em-composer-utils.c:4669
msgid "Posting destination"
msgstr "投递目的"
-#: ../src/mail/em-composer-utils.c:3523
+#: ../src/mail/em-composer-utils.c:4674
msgid "Choose folders to post the message to."
msgstr "选择要将信息投递到哪个文件夹。"
-#: ../src/mail/em-filter-editor-folder-element.c:154
-msgid "Select Folder"
-msgstr "选择文件夹"
+#: ../src/mail/em-filter-editor.c:43
+#, fuzzy
+#| msgid "Description List"
+msgid "Description of Filters"
+msgstr "描述列表"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word;
+#. the third '%s' is replaced with the account name
+#: ../src/mail/em-filter-editor.c:167
+#, fuzzy, c-format
+#| msgid "List of accounts"
+msgid "%s (%s, for account %s)"
+msgstr "帐号列表"
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+#, fuzzy
+#| msgid "Enabled"
+msgid "enabled"
+msgstr "已启用"
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+#, fuzzy
+#| msgid "_Disable"
+msgid "disabled"
+msgstr "禁用(_D)"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word
+#: ../src/mail/em-filter-editor.c:171
+#, c-format
+msgid "%s (%s, for any account)"
+msgstr ""
+
+#: ../src/mail/em-filter-editor.c:183
+#, fuzzy
+#| msgid "all the following conditions"
+msgid "If all the following conditions are met"
+msgstr "下列所有条件"
+
+#: ../src/mail/em-filter-editor.c:186
+#, fuzzy
+#| msgid "any of the following conditions"
+msgid "If any of the following conditions are met"
+msgstr "下列条件之一"
#. and now for the action area
-#: ../src/mail/em-filter-rule.c:595
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1067
msgid "Then"
msgstr "然后"
-#: ../src/mail/em-filter-rule.c:660
+#: ../src/mail/em-filter-editor.c:408
+#, fuzzy
+#| msgid "Message Filters"
+msgid "De_scribe Filters…"
+msgstr "邮件过滤器"
+
+#: ../src/mail/em-filter-editor-folder-element.c:154
+msgid "Select Folder"
+msgstr "选择文件夹"
+
+#. Translators: This is in a Mail filter rule editor, part of "For account: [ Any ]" section
+#: ../src/mail/em-filter-rule.c:940
+#, fuzzy
+#| msgid "A_ngry"
+msgctxt "mail-filter-rule"
+msgid "Any"
+msgstr "愤怒(_N)"
+
+#: ../src/mail/em-filter-rule.c:1037
+#, fuzzy
+#| msgid "File _type:"
+msgid "Rul_e type:"
+msgstr "文件类型(_T)："
+
+#: ../src/mail/em-filter-rule.c:1055
+#, fuzzy
+#| msgid "_Account:"
+msgid "_For Account:"
+msgstr "帐号(_A)："
+
+#: ../src/mail/em-filter-rule.c:1140
msgid "Add Ac_tion"
msgstr "添加动作(_T)"
-#: ../src/mail/em-folder-properties.c:240
+#: ../src/mail/em-folder-properties.c:170
+#, fuzzy
+#| msgid "Selected Column"
+msgid "Select Custom Icon"
+msgstr "选中列"
+
+#: ../src/mail/em-folder-properties.c:219
+#, fuzzy
+#| msgid "Use custom fonts"
+msgid "_Use custom icon"
+msgstr "使用自定义字体"
+
+#: ../src/mail/em-folder-properties.c:312
+msgid "Use te_xt color"
+msgstr "使用文本颜色(_X)"
+
+#: ../src/mail/em-folder-properties.c:494
msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "未读信息数："
-#: ../src/mail/em-folder-properties.c:251
+#: ../src/mail/em-folder-properties.c:505
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "总信息数："
-#: ../src/mail/em-folder-properties.c:272
+#: ../src/mail/em-folder-properties.c:526
#, c-format
msgid "Quota usage (%s):"
msgstr "配额使用(%s)："
-#: ../src/mail/em-folder-properties.c:274
+#: ../src/mail/em-folder-properties.c:528
#, 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:398
+#: ../src/mail/em-folder-properties.c:672
msgid "_Send Account Override:"
-msgstr "发送帐户覆盖(_S)："
+msgstr "发送账号覆盖(_S)："
-#: ../src/mail/em-folder-properties.c:605
-msgid "_Archive this folder using these settings:"
+#: ../src/mail/em-folder-properties.c:912
+#, fuzzy
+#| msgid "_Archive this folder using these settings:"
+msgid "Archive this folder using these settings:"
msgstr "使用这些设置归档这个文件夹(_A)："
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:614
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:924
+#, fuzzy
+#| msgctxt "autoarchive"
+#| msgid "_Cleanup messages older than"
msgctxt "autoarchive"
-msgid "_Cleanup messages older than"
+msgid "Auto-_cleanup messages older than"
msgstr "清理早于这段时间的邮件(_C)"
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:630
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:937
msgctxt "autoarchive"
msgid "days"
msgstr "天"
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:632
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:939
msgctxt "autoarchive"
msgid "weeks"
msgstr "周"
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:634
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:941
msgctxt "autoarchive"
msgid "months"
msgstr "月"
-#: ../src/mail/em-folder-properties.c:640
-msgid "Move old messages to the default archive _folder"
+#: ../src/mail/em-folder-properties.c:947
+#, fuzzy
+#| msgid "Move old messages to the default archive _folder"
+msgid "Move messages to the default archive _folder"
msgstr "将旧的邮件移至默认的归档文件夹(_F)"
-#: ../src/mail/em-folder-properties.c:651
-msgid "_Move old messages to:"
+#: ../src/mail/em-folder-properties.c:954
+#, fuzzy
+#| msgid "_Move old messages to:"
+msgid "_Move messages to:"
msgstr "移动旧的邮件到(_M)："
-#: ../src/mail/em-folder-properties.c:655
-msgid "AutoArchive folder"
-msgstr "自动归档文件夹"
+#: ../src/mail/em-folder-properties.c:958
+msgid "Archive folder"
+msgstr "归档文件夹"
-#: ../src/mail/em-folder-properties.c:655
-msgid "Select folder to use for AutoArchive"
+#: ../src/mail/em-folder-properties.c:958
+#, fuzzy
+#| msgid "Select folder to use for AutoArchive"
+msgid "Select folder to use for Archive"
msgstr "选择用于自动归档的文件夹"
-#: ../src/mail/em-folder-properties.c:661
-msgid "_Delete old messages"
-msgstr "删除旧的邮件(_D)"
+#: ../src/mail/em-folder-properties.c:962
+msgid "_Delete messages"
+msgstr "删除信息(_D)"
-#: ../src/mail/em-folder-properties.c:1018
-#, fuzzy
-#| msgid "Server"
+#: ../src/mail/em-folder-properties.c:1317
msgid "Server Tag"
-msgstr "服务器"
+msgstr "服务器标签"
-#: ../src/mail/em-folder-properties.c:1022 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../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:1073
-msgid "AutoArchive"
-msgstr "自动归档"
+#: ../src/mail/em-folder-properties.c:1370
+msgid "Appearance"
+msgstr "外观"
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:118
+#. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
+#: ../src/mail/em-folder-properties.c:1374
+msgid "Archive"
+msgstr "归档"
+
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:126
#: ../src/mail/message-list.etspec.h:19
msgid "Labels"
msgstr "标签"
-#: ../src/mail/em-folder-properties.c:1155
+#: ../src/mail/em-folder-properties.c:1455
msgid "Folder Properties"
msgstr "文件夹属性"
-#: ../src/mail/em-folder-properties.c:1394
+#: ../src/mail/em-folder-properties.c:1694
#, fuzzy
#| msgid "Category Properties"
msgid "Gathering folder properties"
msgstr "类别属性"
-#: ../src/mail/em-folder-selection-button.c:77
+#: ../src/mail/em-folder-selection-button.c:80
msgid "<click here to select a folder>"
msgstr "<单击此处以选择文件夹>"
-#: ../src/mail/em-folder-selector.c:399
+#: ../src/mail/em-folder-selector.c:422
msgid "Create a new folder"
msgstr "创建新文件夹"
-#: ../src/mail/em-folder-tree.c:683
+#: ../src/mail/em-folder-tree.c:684
#, fuzzy
#| msgid "Folder names cannot contain '/'"
msgid "Folder names cannot contain “/”"
@@ -17582,161 +19420,176 @@ msgstr "文件夹名不能含有字符“/”"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../src/mail/em-folder-tree.c:877
+#: ../src/mail/em-folder-tree.c:878
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../src/mail/em-folder-tree.c:1742
+#: ../src/mail/em-folder-tree.c:1740
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../src/mail/em-folder-tree.c:2290 ../src/mail/em-folder-utils.c:83
+#: ../src/mail/em-folder-tree.c:2289
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
+#: ../src/mail/em-folder-tree.c:2292
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
+#: ../src/mail/em-folder-tree.c:2299 ../src/mail/message-list.c:2632
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信息移至文件夹 %s"
-#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
+#: ../src/mail/em-folder-tree.c:2303 ../src/mail/message-list.c:2634
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信息复制到文件夹 %s"
-#: ../src/mail/em-folder-tree.c:2323
+#: ../src/mail/em-folder-tree.c:2322
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信息放到顶级文件夹存储"
#. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445
-#: ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:460
+#: ../src/mail/em-folder-tree-model.c:462
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../src/mail/em-folder-tree-model.c:1325
-#: ../src/mail/em-folder-tree-model.c:1701
-msgid "Loading..."
-msgstr "正在载入..."
-
-#: ../src/mail/em-folder-utils.c:502
-msgid "Move Folder To"
-msgstr "移动文件夹到"
+#: ../src/mail/em-folder-utils.c:111
+#, fuzzy, c-format
+#| msgid "Removing folder '%s'"
+msgid "Moving folder “%s”"
+msgstr "删除文件夹 %s"
-#: ../src/mail/em-folder-utils.c:502
-msgid "Copy Folder To"
-msgstr "复制文件夹到"
+#: ../src/mail/em-folder-utils.c:113
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Copying folder “%s”"
+msgstr "存储文件夹“%s”"
-#: ../src/mail/em-subscription-editor.c:855
-msgid "_Subscribe"
+#: ../src/mail/em-folder-utils.c:252
+#, fuzzy, c-format
+#| msgid "Removing folder '%s'"
+msgid "Moving folder “%s” (%d/%d)"
+msgstr "删除文件夹 %s"
+
+#: ../src/mail/em-folder-utils.c:252
+#, fuzzy, c-format
+#| msgid "Storing folder '%s'"
+msgid "Copying folder “%s” (%d/%d)"
+msgstr "存储文件夹“%s”"
+
+#: ../src/mail/em-folder-utils.c:569
+msgid "Move Folder To"
+msgstr "移动文件夹到"
+
+#: ../src/mail/em-folder-utils.c:569
+msgid "Copy Folder To"
+msgstr "复制文件夹到"
+
+#: ../src/mail/em-subscription-editor.c:813
+msgid "_Subscribe"
msgstr "订阅(_S)"
-#: ../src/mail/em-subscription-editor.c:864
+#: ../src/mail/em-subscription-editor.c:822
msgid "Su_bscribe To Shown"
msgstr "要显示的订阅(_B)"
-#: ../src/mail/em-subscription-editor.c:872
+#: ../src/mail/em-subscription-editor.c:830
msgid "Subscribe To _All"
msgstr "订阅全部(_A)"
-#: ../src/mail/em-subscription-editor.c:970
-#: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
+#: ../src/mail/em-subscription-editor.c:936
+#: ../src/mail/em-subscription-editor.c:1890 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../src/mail/em-subscription-editor.c:979
+#: ../src/mail/em-subscription-editor.c:945
msgid "Unsu_bscribe From Hidden"
msgstr "退订隐藏列表(_B)"
-#: ../src/mail/em-subscription-editor.c:987
+#: ../src/mail/em-subscription-editor.c:953
msgid "Unsubscribe From _All"
msgstr "退订全部(_A)"
-#: ../src/mail/em-subscription-editor.c:1339
-#: ../src/modules/mail/e-mail-shell-view-private.c:1003
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:912
+#: ../src/modules/mail/e-mail-shell-view-private.c:944
+#: ../src/modules/mail/e-mail-shell-view-private.c:988
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] "，%d 封未读，"
-#: ../src/mail/em-subscription-editor.c:1343
-#: ../src/modules/mail/e-mail-shell-view-private.c:1013
+#: ../src/mail/em-subscription-editor.c:1319
+#: ../src/modules/mail/e-mail-shell-view-private.c:998
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../src/mail/em-subscription-editor.c:1755
+#: ../src/mail/em-subscription-editor.c:1731
msgid "Folder Subscriptions"
msgstr "文件夹订阅"
-#: ../src/mail/em-subscription-editor.c:1790
+#: ../src/mail/em-subscription-editor.c:1766
msgid "_Account:"
msgstr "帐号(_A)："
-#: ../src/mail/em-subscription-editor.c:1803
+#: ../src/mail/em-subscription-editor.c:1779
msgid "Clear Search"
msgstr "清除搜索"
-#: ../src/mail/em-subscription-editor.c:1820
+#: ../src/mail/em-subscription-editor.c:1796
msgid "Sho_w items that contain:"
msgstr "显示包含以下内容的项目(_W)："
-#: ../src/mail/em-subscription-editor.c:1867
+#: ../src/mail/em-subscription-editor.c:1843
msgid "Subscribe to the selected folder"
msgstr "订阅选定的文件夹"
-#: ../src/mail/em-subscription-editor.c:1868
+#: ../src/mail/em-subscription-editor.c:1844
msgid "Su_bscribe"
msgstr "订阅(_B)"
-#: ../src/mail/em-subscription-editor.c:1913
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
+#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
msgid "Unsubscribe from the selected folder"
msgstr "取消对选定文件夹的订阅"
-#: ../src/mail/em-subscription-editor.c:1953
+#: ../src/mail/em-subscription-editor.c:1929
msgid "Collapse all folders"
msgstr "折叠所有文件夹"
-#: ../src/mail/em-subscription-editor.c:1954
+#: ../src/mail/em-subscription-editor.c:1930
msgid "C_ollapse All"
msgstr "全部折叠(_O)"
-#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/mail/em-subscription-editor.c:1940
msgid "Expand all folders"
msgstr "展开所有文件夹"
-#: ../src/mail/em-subscription-editor.c:1965
+#: ../src/mail/em-subscription-editor.c:1941
msgid "E_xpand All"
msgstr "全部展开(_X)"
-#: ../src/mail/em-subscription-editor.c:1975
+#: ../src/mail/em-subscription-editor.c:1951
msgid "Refresh the folder list"
msgstr "刷新文件夹列表"
-#: ../src/mail/em-subscription-editor.c:1976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
-msgid "_Refresh"
-msgstr "刷新(_R)"
-
-#: ../src/mail/em-subscription-editor.c:1987
+#: ../src/mail/em-subscription-editor.c:1963
msgid "Stop the current operation"
msgstr "停止当前操作"
-#: ../src/mail/em-subscription-editor.c:1988
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:999
+#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
msgid "_Stop"
msgstr "停止(_S)"
@@ -17754,12 +19607,24 @@ msgstr[0] "您确定要一次打开 %d 封信吗？"
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../src/mail/em-utils.c:950
+#: ../src/mail/em-utils.c:1014
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信息"
-#: ../src/mail/em-utils.c:1764
+#. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the
'reply-attribution' translation context should translate into the same string.
+#: ../src/mail/em-utils.c:1575
+msgctxt "reply-attribution"
+msgid "Re"
+msgstr "Re"
+
+#. Translators: This is a reply attribution separator in the message reply subject. This should match the
':' in 'Re: %s' in the 'reply-attribution' translation context.
+#: ../src/mail/em-utils.c:1578
+msgctxt "reply-attribution"
+msgid ":"
+msgstr ":"
+
+#: ../src/mail/em-utils.c:1878
msgid "Deleting old messages"
msgstr "删除旧的邮件"
@@ -17767,35 +19632,35 @@ msgstr "删除旧的邮件"
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
-#: ../src/mail/em-vfolder-editor-rule.c:393
+#: ../src/mail/em-vfolder-editor-rule.c:404
msgid "Add Folder"
msgstr "添加文件夹"
-#: ../src/mail/em-vfolder-editor-rule.c:522
+#: ../src/mail/em-vfolder-editor-rule.c:533
msgid "Search Folder Sources"
msgstr "搜索文件夹来源"
-#: ../src/mail/em-vfolder-editor-rule.c:554
+#: ../src/mail/em-vfolder-editor-rule.c:565
msgid "Automatically update on any _source folder change"
msgstr "在源文件夹更改时自动更新(_S)"
-#: ../src/mail/em-vfolder-editor-rule.c:566
+#: ../src/mail/em-vfolder-editor-rule.c:577
msgid "All local folders"
msgstr "全部本地文件夹"
-#: ../src/mail/em-vfolder-editor-rule.c:567
+#: ../src/mail/em-vfolder-editor-rule.c:578
msgid "All active remote folders"
msgstr "全部活跃远程文件夹"
-#: ../src/mail/em-vfolder-editor-rule.c:568
+#: ../src/mail/em-vfolder-editor-rule.c:579
msgid "All local and active remote folders"
msgstr "全部本地和活跃远程文件夹"
-#: ../src/mail/em-vfolder-editor-rule.c:569
+#: ../src/mail/em-vfolder-editor-rule.c:580
msgid "Specific folders"
msgstr "指定文件夹"
-#: ../src/mail/em-vfolder-editor-rule.c:607
+#: ../src/mail/em-vfolder-editor-rule.c:618
msgid "include subfolders"
msgstr "包括子文件夹"
@@ -17950,7 +19815,7 @@ msgstr "重要"
msgid "Read"
msgstr "已读"
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:142
#: ../src/mail/vfoldertypes.xml.in.h:44
msgid "Junk"
msgstr "垃圾"
@@ -18138,7 +20003,7 @@ msgid "From"
msgstr "来自"
#: ../src/mail/importers/evolution-mbox-importer.c:569
-#: ../src/shell/e-shell-utils.c:176
+#: ../src/shell/e-shell-utils.c:166
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley 邮箱(mbox)"
@@ -18160,8 +20025,8 @@ msgstr "Evolution KMail 导入器"
msgid "Import mail and contacts from KMail."
msgstr "从 KMail 导入邮件和联系人。"
-#: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1034
+#: ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
msgid "Trash"
msgstr "回收站"
@@ -18174,16 +20039,15 @@ msgid "Importing mail and contacts from KMail"
msgstr "正在从 KMail 导入邮件和联系人。"
#. Destination folder, was set in our widget
-#: ../src/mail/importers/mail-importer.c:187
-#: ../src/mail/importers/mail-importer.c:312
-#: ../src/plugins/dbx-import/dbx-importer.c:605
+#: ../src/mail/importers/mail-importer.c:190
+#: ../src/mail/importers/mail-importer.c:315
+#: ../src/plugins/dbx-import/dbx-importer.c:612
#: ../src/plugins/pst-import/pst-importer.c:756
-#, fuzzy, c-format
-#| msgid "Importing '%s'"
+#, c-format
msgid "Importing “%s”"
msgstr "正在导入“%s”"
-#: ../src/mail/importers/mail-importer.c:556
+#: ../src/mail/importers/mail-importer.c:559
#, c-format
msgid "Scanning %s"
msgstr "正在扫描 %s"
@@ -18205,22 +20069,22 @@ msgstr "从 Pine 导入邮件。"
msgid "Mail to %s"
msgstr "发送给 %s"
-#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:268
#, c-format
msgid "Mail from %s"
msgstr "来自 %s 的邮件"
-#: ../src/mail/mail-autofilter.c:250
+#: ../src/mail/mail-autofilter.c:251
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
-#: ../src/mail/mail-autofilter.c:290
+#: ../src/mail/mail-autofilter.c:291
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
-#: ../src/mail/mail-autofilter.c:400
+#: ../src/mail/mail-autofilter.c:401
msgid "Add Filter Rule"
msgstr "添加过滤规则"
@@ -18229,7 +20093,7 @@ msgstr "添加过滤规则"
#. * folder. For more than one filter rule is each of
#. * them on a separate line, with four spaces in front
#. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:509
+#: ../src/mail/mail-autofilter.c:552
#, fuzzy, c-format
#| msgid ""
#| "The filter rule \"%s\" has been modified to account for the deleted "
@@ -18251,6 +20115,12 @@ msgstr[0] ""
"%s 已经修改，以用于删除文件夹\n"
"“%s”。"
+#: ../src/mail/mail-autofilter.c:560
+#, fuzzy
+#| msgid "Message Filters"
+msgid "Open Message Filters"
+msgstr "邮件过滤器"
+
#: ../src/mail/mail-config.ui.h:1
msgid "Set custom junk header"
msgstr "设置自定义垃圾信息头"
@@ -18318,351 +20188,392 @@ msgid "_Forward style:"
msgstr "转发方式(_F)："
#: ../src/mail/mail-config.ui.h:20
-msgid "Start _typing at the bottom on replying"
-msgstr "回复时在底部开始打字(_T)"
+msgid "_Language:"
+msgstr "语言(_L)："
-#: ../src/mail/mail-config.ui.h:21
-msgid "_Keep signature above the original message on replying"
-msgstr "回复时保留原始信息的签名(_K)"
+#: ../src/mail/mail-config.ui.h:24
+msgid "Include si_gnature in new messages only"
+msgstr ""
-#: ../src/mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:25
msgid "Ig_nore Reply-To: for mailing lists"
msgstr "忽略邮件列表的“Reply-To”(_N)"
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:26
msgid "Gro_up Reply goes only to mailing list, if possible"
msgstr "如果可能，组回复只回复给邮件列表(_U)"
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:27
msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
msgstr "在原信息签名时自动对信息进行数字签名(PGP 或 _S/MIME)"
-#: ../src/mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:28
msgid "_Wrap quoted text in replies"
msgstr "为回复中引用的文本换行(_W)"
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:33
msgctxt "ReplyForward"
msgid "Inline"
msgstr "内嵌"
-#: ../src/mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:35
msgid "Sig_natures"
msgstr "签名(_N)"
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:36
msgid "Signatures"
msgstr "签名"
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:37
msgid "_Languages"
msgstr "语言(_L)"
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:38
msgid "Languages Table"
msgstr "语言表"
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:39
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:41
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:43
msgid ""
"To help avoid email accidents and embarrassments, ask for confirmation "
"before taking the following checkmarked actions:"
msgstr "为了帮助避免电子邮件意外和问题，在采取以下勾选的操作前请求确认："
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:45
msgid "Sending a message with an _empty subject line"
msgstr "发送带空主题行的信息时(_E)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:47
msgid "Sending a message with only _Bcc recipients defined"
msgstr "发送只填写了密件抄送收件人的信息时(_B)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:49
msgid "Sending a message to many _To and CC recipients"
msgstr "发送邮件给大量收件人与抄送(_T)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:51
msgid "Sending a _private reply to a mailing list message"
msgstr "向邮件列表邮箱发送私人回复时(_P)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:53
msgid "Sending a reply to a large _number of recipients"
msgstr "向很多收件人发送回复时(_N)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:55
msgid "Allowing a _mailing list to redirect a private reply to the list"
msgstr "允许邮件列表将私人回复重定向到列表(_M)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:54
+#: ../src/mail/mail-config.ui.h:57
msgid "Sending a message with _recipients not entered as mail addresses"
msgstr "发送只填写了密件抄送收件人的信息时(_B)"
#. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:56
+#: ../src/mail/mail-config.ui.h:59
msgid "Sending a message using _key accelerator (Ctrl+Enter)"
msgstr "正在使用加速键(Ctrl+Enter) 发送信息(_K)"
-#. Translators:
-#: ../src/mail/mail-config.ui.h:58
+#. Translators: 'changes' is a verb. This is whether to show a warning or not in that situation
+#: ../src/mail/mail-config.ui.h:61
msgid "Before composer _format changes from HTML to Plain Text"
msgstr ""
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:62
msgid "Confirmations"
msgstr "配置"
#. Translators: Label of a frame with a list of folders for which to use selected account in Send account
overrides
-#: ../src/mail/mail-config.ui.h:63
+#: ../src/mail/mail-config.ui.h:66
msgid "Use for Folders"
msgstr "用于文件夹 "
#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account
overrides
-#: ../src/mail/mail-config.ui.h:68
+#: ../src/mail/mail-config.ui.h:71
msgid "Use for Recipients"
msgstr "用于接收者"
#. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
msgid "Account"
msgstr "帐号"
-#: ../src/mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:74
msgid "Send account overrides"
-msgstr "发送帐户覆盖"
+msgstr "发送账号覆盖"
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:75
msgid ""
"Assign which account should be used as a send account for respective folders "
"or recipients, an override for usual send account detection. List of "
"recipients can contain partial addresses or names. The name and the address "
"parts are compared separately."
msgstr ""
-"针对某些文件夹或收件人指定发送帐户，而不是通常检测的发送帐户。收件人列表可以"
+"针对某些文件夹或收件人指定发送账号，而不是通常检测的发送账号。收件人列表可以"
"包含部分地址或姓名。姓名和地址将分别比较。"
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:76
msgid "_Folder override has precedence over Recipient override"
msgstr "文件夹覆盖 比 收件人覆盖 优先(_F)"
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:77
msgid "Send Account"
msgstr "发送帐号"
-#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:83 ../src/smime/gui/smime-ui.ui.h:27
msgid "a"
msgstr "a"
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:84 ../src/smime/gui/smime-ui.ui.h:28
msgid "b"
msgstr "b"
-#: ../src/mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:85
msgid "Start up"
msgstr "启动"
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:86
msgid "Check for new _messages on start"
msgstr "启动时自动检查新信息(_M)"
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:87
msgid "Check for new messa_ges in all active accounts"
msgstr "检查所有活动帐号的新信息(_G)"
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:88
msgid "Message Display"
msgstr "信息显示"
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:89
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:90
msgid "S_tandard Font:"
msgstr "标准字体(_T)："
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:91
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:92
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:93
msgid "Fix_ed Width Font:"
msgstr "等宽字体(_E)："
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:94
+msgid "Minimum Font _Size:"
+msgstr "最小字体大小(_S)："
+
+#. Translators: This is part of 'Minimum Font Size: [ spin button ] (in pixels)'
+#: ../src/mail/mail-config.ui.h:96
+msgid "(in pixels)"
+msgstr "（像素）"
+
+#: ../src/mail/mail-config.ui.h:97
msgid "_Mark messages as read after"
msgstr "把信息标记为已读前等(_M)"
-#: ../src/mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:99
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../src/mail/mail-config.ui.h:94
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/mail/mail-config.ui.h:100
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
msgid "Pick a color"
msgstr "选取一种颜色"
-#: ../src/mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:101
msgid "color"
msgstr "颜色"
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:102
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N)："
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:103
msgid "Apply the same _view settings to all folders"
msgstr "应用同样的查看设置到所有文件夹(_v)"
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:104
msgid "F_all back to threading messages by subject"
msgstr "默认按照主题对线索中的信息排序(_A)"
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:105
msgid "Delete Mail"
msgstr "删除邮件"
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:106
msgid "Empty _trash folders"
msgstr "清空已删除邮件(_T)"
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:107
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:108
+#, fuzzy
+#| msgid "Confirm _when expunging a folder"
+msgid "Confirm when emptying a _Junk folder"
+msgstr "销毁文件夹时确认(_W)"
+
+#: ../src/mail/mail-config.ui.h:109
+#, fuzzy
+#| msgid "Go to the section %s of the message"
+msgid "Go to the previ_ous message after message deletion"
+msgstr "转到信息的 %s 部分"
+
+#: ../src/mail/mail-config.ui.h:110
msgid "Archive Mail"
msgstr "归档电子邮件"
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:111
msgid "Archive folder to use for On This Computer messages"
msgstr "用于“位于本机”信息的归档文件夹"
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:112
msgid "On This Computer A_rchive folder:"
msgstr "“位于本机”分类文件夹："
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:114
msgid "_Show animated images"
msgstr "显示动态图像(_S)"
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:115
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:116
msgid "Loading Remote Content"
msgstr "加载远程内容"
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:117
msgid "_Never load remote content from the Internet"
msgstr "永不从互联网加载远程内容(_N)"
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:118
msgid "_Load remote content only in messages from contacts"
msgstr "只加载由连络人寄出邮件中的远程内容(_L)"
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:119
msgid "_Always load remote content from the Internet"
msgstr "永远从互联网加载远程内容(_A)"
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:120
msgid "Notify about _missing remote content in the message preview"
msgstr "在邮件预览中显示关于远程内容缺失的通知(_M)"
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:121
+msgid "Add"
+msgstr "添加"
+
+#: ../src/mail/mail-config.ui.h:122
+msgid "Remove"
+msgstr "移除"
+
+#: ../src/mail/mail-config.ui.h:123
msgid "Allow for sites:"
msgstr "允许网站："
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:124
msgid "Allow for senders:"
msgstr "允许发件人："
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:125
msgid "HTML Messages"
msgstr "HTML 信息"
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:127
msgid "Sender Photograph"
msgstr "发送者照片"
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:128
msgid "_Show the photograph of sender in the message preview"
msgstr "在信息预览中显示发送者的照片(_S)"
-#: ../src/mail/mail-config.ui.h:121
-msgid "Search gra_vatar.com for the photograph of sender"
+#: ../src/mail/mail-config.ui.h:129
+#, fuzzy
+#| msgid "Search gra_vatar.com for the photograph of sender"
+msgid "Search libra_vatar.org for the photograph of sender"
msgstr "在 gravatar.com 中搜索发件人的照片"
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:130
msgid "Displayed Message Headers"
msgstr "显示信头"
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:131
+#, fuzzy
+#| msgid "Show junk messages in the message-list"
+msgid "Show _full mail addresses in message preview"
+msgstr "在消息列表中显示垃圾信息"
+
+#: ../src/mail/mail-config.ui.h:132
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../src/mail/mail-config.ui.h:124
-#: ../src/modules/addressbook/autocompletion-config.c:117
+#: ../src/mail/mail-config.ui.h:133
+msgid "Re_set"
+msgstr ""
+
+#: ../src/mail/mail-config.ui.h:134
+#: ../src/modules/addressbook/autocompletion-config.c:118
#: ../src/modules/calendar/e-calendar-preferences.ui.h:45
msgid "Date/Time Format"
msgstr "日期/时间格式"
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:136
msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾信息(_M)"
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:137
msgid "_Delete junk messages"
msgstr "删除垃圾信息(_D)"
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:138
msgid "Junk Test Options"
msgstr "垃圾过滤测试选项"
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:139
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:140
msgid "_Lookup in local address book only"
msgstr "仅在本地地址簿中查阅(_L)"
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:141
msgid "Check cu_stom headers for junk"
msgstr "检查自定义信头以判别垃圾信息(_S)"
-#: ../src/mail/mail-config.ui.h:133
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
+#: ../src/mail/mail-config.ui.h:143
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
msgid "No encryption"
msgstr "不加密"
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:144
msgid "TLS encryption"
msgstr "TLS 加密"
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:145
msgid "SSL encryption"
msgstr "SSL 加密"
@@ -18719,34 +20630,26 @@ msgid "_Due By:"
msgstr "延期人(_D)："
#. Translators: Flag Completed
-#: ../src/mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:17
msgid "Co_mpleted"
msgstr "已完成(_M)"
-#: ../src/mail/mail-dialogs.ui.h:19
+#: ../src/mail/mail-dialogs.ui.h:18
msgid "License Agreement"
msgstr "许可协议"
-#: ../src/mail/mail-dialogs.ui.h:21
+#: ../src/mail/mail-dialogs.ui.h:19
+msgid "_No"
+msgstr "否(_N)"
+
+#: ../src/mail/mail-dialogs.ui.h:20
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../src/mail/mail-dialogs.ui.h:22
+#: ../src/mail/mail-dialogs.ui.h:21
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../src/mail/mail-dialogs.ui.h:23
-msgid "Security Information"
-msgstr "安全信息"
-
-#: ../src/mail/mail-dialogs.ui.h:25
-msgid "Digital Signature"
-msgstr "数字签名"
-
-#: ../src/mail/mail-dialogs.ui.h:26
-msgid "Encryption"
-msgstr "加密"
-
#: ../src/mail/mail.error.xml.h:1
msgid "Invalid authentication"
msgstr "无效的身份验证"
@@ -18947,7 +20850,7 @@ msgid ""
msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗？"
#: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
msgid "_Empty Trash"
msgstr "清空废件箱(_E)"
@@ -19173,8 +21076,10 @@ msgid "You may not create two accounts with the same name."
msgstr "您不能创建两个同名帐号。"
#: ../src/mail/mail.error.xml.h:89
-msgid "Are you sure you want to delete this account?"
-msgstr "您确定要删除此帐号吗？"
+#, fuzzy
+#| msgid "Are you sure you want to delete the memo '{0}'?"
+msgid "Are you sure you want to delete account “{0}”?"
+msgstr "您确定要删除“{0}”备忘吗？"
#: ../src/mail/mail.error.xml.h:90
msgid "If you proceed, the account information will be deleted permanently."
@@ -19297,8 +21202,6 @@ msgid "_Append"
msgstr "追加(_A)"
#: ../src/mail/mail.error.xml.h:119
-#, fuzzy
-#| msgid "Evolution's local mail format has changed."
msgid "Evolution’s local mail format has changed."
msgstr "Evolution 的本地邮件格式已更改。"
@@ -19412,143 +21315,158 @@ msgid "In Current _Folder Only"
msgstr "只在当前文件夹(_F)"
#: ../src/mail/mail.error.xml.h:141
+#, fuzzy
+#| msgid "In Current _Folder Only"
+msgid "_Always In Current Folder Only"
+msgstr "只在当前文件夹(_F)"
+
+#: ../src/mail/mail.error.xml.h:142
msgid "Should Evolution close this window when replying or forwarding?"
msgstr "当回复或转发时 Evolution 是否关闭该窗口？"
-#: ../src/mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:143
msgid "_Yes, Always"
msgstr "是，总是如此(_Y)"
-#: ../src/mail/mail.error.xml.h:143
+#: ../src/mail/mail.error.xml.h:144
msgid "_No, Never"
msgstr "不，永不(_N)"
-#: ../src/mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:145
msgid "Copy folder in folder tree."
msgstr "复制文件夹树中的文件夹。"
-#: ../src/mail/mail.error.xml.h:145
+#: ../src/mail/mail.error.xml.h:146
#, fuzzy
#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
msgstr "您确定要将文件夹“{0}”复制到文件夹“{1}”吗？"
-#: ../src/mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:148
msgid "Do _not copy"
msgstr "不要复制(_N)"
-#: ../src/mail/mail.error.xml.h:148
+#: ../src/mail/mail.error.xml.h:149
msgid "_Always copy"
msgstr "永远复制(_A)"
-#: ../src/mail/mail.error.xml.h:149
+#: ../src/mail/mail.error.xml.h:150
msgid "N_ever copy"
msgstr "永不复制(_E)"
-#: ../src/mail/mail.error.xml.h:150
+#: ../src/mail/mail.error.xml.h:151
msgid "Move folder in folder tree."
msgstr "移动文件夹树中的文件夹。"
-#: ../src/mail/mail.error.xml.h:151
+#: ../src/mail/mail.error.xml.h:152
#, fuzzy
#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
msgstr "您确定要将文件夹“{0}”移动到文件夹“{1}”中吗？"
-#: ../src/mail/mail.error.xml.h:153
+#: ../src/mail/mail.error.xml.h:154
msgid "Do _not move"
msgstr "不要移动(_N)"
-#: ../src/mail/mail.error.xml.h:154
+#: ../src/mail/mail.error.xml.h:155
msgid "_Always move"
msgstr "永远移动(_A)"
-#: ../src/mail/mail.error.xml.h:155
+#: ../src/mail/mail.error.xml.h:156
msgid "N_ever move"
msgstr "永不移动(_E)"
-#: ../src/mail/mail.error.xml.h:156
+#: ../src/mail/mail.error.xml.h:157
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "无法发送此信息，因为您所选择用来发送的帐号未启用"
-#: ../src/mail/mail.error.xml.h:157
+#: ../src/mail/mail.error.xml.h:158
msgid "Please enable the account or send using another account."
msgstr "请启用帐号或者使用其它帐号发送。"
-#: ../src/mail/mail.error.xml.h:158
+#: ../src/mail/mail.error.xml.h:159
+#, fuzzy
+#| msgid ""
+#| "This message cannot be sent because you have not specified any recipients"
+msgid "This message cannot be sent because there is no mail account configured"
+msgstr "无法发送此信息，因为您没有指定任何收件人"
+
+#: ../src/mail/mail.error.xml.h:160
+msgid ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:161
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../src/mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:162
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../src/mail/mail.error.xml.h:160
+#: ../src/mail/mail.error.xml.h:163
#, fuzzy
#| msgid "\"Check Junk\" Failed"
msgid "“Check Junk” Failed"
msgstr "检查垃圾信息失败"
-#: ../src/mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:164
#, fuzzy
#| msgid "\"Report Junk\" Failed"
msgid "“Report Junk” Failed"
msgstr "报告垃圾信息失败"
-#: ../src/mail/mail.error.xml.h:162
+#: ../src/mail/mail.error.xml.h:165
#, fuzzy
#| msgid "\"Report Not Junk\" Failed"
msgid "“Report Not Junk” Failed"
msgstr "报告非垃圾信息失败"
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:166
msgid "Remove duplicate messages?"
msgstr "移除重复的信息？"
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:167
msgid "No duplicate messages found."
msgstr "没有找到重复信息。"
#. Translators: {0} is replaced with a folder name
-#: ../src/mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:169
#, fuzzy
#| msgid "Folder '{0}' doesn't contain any duplicate message."
msgid "Folder “{0}” doesn’t contain any duplicate message."
msgstr "“{0}”文件夹中没有重复信息。"
-#: ../src/mail/mail.error.xml.h:167
+#: ../src/mail/mail.error.xml.h:170
#, fuzzy
#| msgid "Failed to connect mail account '{0}'"
msgid "Failed to connect account “{0}”."
msgstr "无法连接至帐号“{0}”"
-#: ../src/mail/mail.error.xml.h:168
-#, fuzzy
-#| msgid "Failed to disconnect account "{0}"."
+#: ../src/mail/mail.error.xml.h:171
msgid "Failed to disconnect account “{0}”."
-msgstr "断开帐号“{0}”失败。"
+msgstr "断开“{0}”失败。"
-#: ../src/mail/mail.error.xml.h:169
-#, fuzzy
-#| msgid "Failed to unsubscribe from folder "{0}"."
+#: ../src/mail/mail.error.xml.h:172
msgid "Failed to unsubscribe from folder “{0}”."
msgstr "无法退订文件夹“{0}”。"
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:173
msgid "Unable to retrieve message."
msgstr "无法获取信息。"
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:174
msgid "{0}"
msgstr "{0}"
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:175
msgid "Message is not available in offline mode."
msgstr "脱机模式下也信息不可用。"
-#: ../src/mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:176
#, fuzzy
#| msgid ""
#| "This can be due to the message not being downloaded yet. The folder, or "
@@ -19567,201 +21485,222 @@ msgstr ""
"次上线，使用 文件->下载信息 来离线使用，当文件夹被选中，可以确保这个文件夹"
"里的所有信息在脱机模式下可用。"
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:177
msgid "Failed to open folder."
msgstr "打开文件夹失败。"
-#: ../src/mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:179
msgid "Failed to find duplicate messages."
msgstr "查找重复信息失败。"
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:180
msgid "Failed to retrieve messages."
msgstr "获取信息失败。"
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:181
msgid "Failed to mark messages as read."
msgstr "无法将信息标记为已读。"
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:182
msgid "Failed to remove attachments from messages."
msgstr "移除信息里的附件失败。"
-#: ../src/mail/mail.error.xml.h:180
-msgid "Failed to download messages for offline viewing."
-msgstr "无法下载信息以离线查看。"
+#: ../src/mail/mail.error.xml.h:183
+msgid "Failed to download messages for offline viewing for account “{0}”."
+msgstr "无法下载账号“{0}”的信息以离线查看。"
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:184
msgid "Failed to save messages to disk."
msgstr "保存信息到磁盘失败。"
-#: ../src/mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:185
msgid "Hidden file is attached."
msgstr "附加了隐藏文件。"
-#: ../src/mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:186
msgid ""
"The attachment named {0} is a hidden file and may contain sensitive data. "
"Please review it before sending."
msgstr "名为 {0} 的附件是隐藏文件，可能包含敏感数据。请在发送前核查一下它。"
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:187
msgid "Printing failed."
msgstr "打印失败。"
-#: ../src/mail/mail.error.xml.h:185
+#: ../src/mail/mail.error.xml.h:188
#, fuzzy
#| msgid "The printer replied "{0}"."
msgid "The printer replied “{0}”."
msgstr "打印机返回 "{0}"。"
-#: ../src/mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:189
msgid "Could not perform this operation on {0}."
msgstr "无法对 {0} 执行该操作。"
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:190
msgid "You must be working online to complete this operation."
msgstr "您必须上线以完成此操作。"
-#: ../src/mail/mail.error.xml.h:188
+#: ../src/mail/mail.error.xml.h:191
#, fuzzy
#| msgid "Message from "{0}" account:"
msgid "Message from “{0}” account:"
msgstr "来自“{0}”账户的信息："
-#: ../src/mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:192
#, fuzzy
#| msgid "Failed to mark thread to be ignored in folder '{0}'"
msgid "Failed to mark thread to be ignored in folder “{0}”"
msgstr "标记文件夹“{0}”中会话为忽略失败"
-#: ../src/mail/mail.error.xml.h:190
+#: ../src/mail/mail.error.xml.h:193
#, fuzzy
#| msgid "Failed to unmark thread from being ignored in folder '{0}'"
msgid "Failed to unmark thread from being ignored in folder “{0}”"
msgstr "去掉文件夹“{0}“ 中会话的忽略标志失败"
-#: ../src/mail/mail.error.xml.h:191
+#: ../src/mail/mail.error.xml.h:194
#, fuzzy
#| msgid "Failed to mark subthread to be ignored in folder '{0}'"
msgid "Failed to mark subthread to be ignored in folder “{0}”"
msgstr "标记文件夹“{0}”中子会话为忽略失败"
-#: ../src/mail/mail.error.xml.h:192
+#: ../src/mail/mail.error.xml.h:195
#, fuzzy
#| msgid "Failed to unmark subthread from being ignored in folder '{0}'"
msgid "Failed to unmark subthread from being ignored in folder “{0}”"
msgstr "去掉文件夹“{0}“ 中子会话的忽略标志失败"
-#: ../src/mail/mail.error.xml.h:193
-msgid "Remote content download had been blocked for this message."
-msgstr "已阻挡这封邮件的远程内容下载。"
-
-#: ../src/mail/mail.error.xml.h:194
-msgid ""
-"You can download remote content manually, or set to remember to download "
-"remote content for this sender or used sites."
-msgstr ""
-"您可以手动下载远程内容，或设置为记住下载这个发件人或使用过网站的远程内容。"
-
#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:197
msgid "{0}, Completed on {1}"
msgstr "{0} ，完成于 {1} "
#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:199
msgid "{0} by {1}"
msgstr "{0} 来自 {1}"
#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:201
msgid "Overdue: {0} by {1}"
msgstr "逾期：{0} 自 {1}"
-#: ../src/mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:203
msgid "This message note has been changed, but has not been saved."
msgstr "邮件笔记已更改，但尚未保存。"
#. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:205
+#: ../src/mail/mail.error.xml.h:206
#, fuzzy
#| msgid "Failed to delete message note in folder '{0}'"
msgid "Failed to delete message note in folder “{0}”"
msgstr "未能删除文件夹“{0}”中的邮件笔记"
#. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:207
+#: ../src/mail/mail.error.xml.h:208
#, fuzzy
#| msgid "Failed to store message note in folder '{0}'"
msgid "Failed to store message note in folder “{0}”"
msgstr "未能存储文件夹“{0}”中的邮件笔记"
-#: ../src/mail/mail.error.xml.h:208
+#: ../src/mail/mail.error.xml.h:209
#, fuzzy
#| msgid "Search for text in the body of the displayed message"
msgid "Something has gone wrong when displaying the message"
msgstr "在显示信息的主体中搜索文本"
-#: ../src/mail/mail.error.xml.h:209
+#: ../src/mail/mail.error.xml.h:210
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 the GNOME bugzilla."
+"report in GNOME Gitlab."
msgstr ""
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:211
msgid "Something has gone wrong when displaying the signature"
msgstr ""
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:212
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 the GNOME bugzilla."
+"a bug report in GNOME Gitlab."
+msgstr ""
+
+#: ../src/mail/mail.error.xml.h:213
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to permanently remove all the deleted messages in "
+#| "all folders?"
+msgid "Are you sure you want to delete all the messages in the Junk folder?"
+msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗？"
+
+#: ../src/mail/mail.error.xml.h:214
+msgid ""
+"These messages will be shown in the Trash folder, where they can be "
+"permanently deleted later."
msgstr ""
-#: ../src/mail/mail-send-recv.c:192
-msgid "Canceling..."
-msgstr "正在取消..."
+#: ../src/mail/mail.error.xml.h:215
+#, fuzzy
+#| msgid "_Not Junk"
+msgid "_Empty Junk"
+msgstr "非垃圾(_N)"
+
+#: ../src/mail/mail.error.xml.h:216
+#, fuzzy
+#| msgid "Failed to expunge folder "{0}"."
+msgid "Failed to empty Junk folder “{0}”"
+msgstr "擦除文件夹“{0}”失败。"
+
+#: ../src/mail/mail-send-recv.c:193
+msgid "Canceling…"
+msgstr "正在取消……"
+
+#: ../src/mail/mail-send-recv.c:610
+msgid "Edit Message"
+msgstr "编辑信息"
+
+#: ../src/mail/mail-send-recv.c:615
+#, fuzzy
+#| msgid "Move to Folder"
+msgid "Open Outbox Folder"
+msgstr "移至文件夹"
-#: ../src/mail/mail-send-recv.c:640
+#: ../src/mail/mail-send-recv.c:768
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../src/mail/mail-send-recv.c:654
+#: ../src/mail/mail-send-recv.c:782
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:1262
-msgid "Updating..."
-msgstr "正在更新..."
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1467
+msgid "Updating…"
+msgstr "正在更新……"
-#: ../src/mail/mail-send-recv.c:744 ../src/mail/mail-send-recv.c:826
-msgid "Waiting..."
-msgstr "正在等待..."
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
+msgid "Waiting…"
+msgstr "正在等待……"
-#: ../src/mail/mail-send-recv.c:1228
-#, fuzzy, c-format
-#| msgid "Checking for new mail at '%s'"
+#: ../src/mail/mail-send-recv.c:1433
+#, c-format
msgid "Checking for new mail at “%s”"
-msgstr "正在检查 '%s' 处的新邮件"
+msgstr "正在检查“%s”处的新邮件"
-#: ../src/mail/mail-send-recv.c:1455
-#, fuzzy, c-format
-#| msgid "Deleting junk and expunging trash at '%s'"
+#: ../src/mail/mail-send-recv.c:1660
+#, c-format
msgid "Deleting junk and expunging trash at “%s”"
msgstr "正在删除“%s”中的垃圾邮件并清空废件箱"
-#: ../src/mail/mail-send-recv.c:1457
-#, fuzzy, c-format
-#| msgid "Deleting junk at '%s'"
+#: ../src/mail/mail-send-recv.c:1662
+#, c-format
msgid "Deleting junk at “%s”"
msgstr "正在删除“%s”中的垃圾邮件"
-#: ../src/mail/mail-send-recv.c:1459
-#, fuzzy, c-format
-#| msgid "Expunging trash at '%s'"
+#: ../src/mail/mail-send-recv.c:1664
+#, c-format
msgid "Expunging trash at “%s”"
msgstr "正在清空“%s”中的废件箱"
@@ -19777,87 +21716,87 @@ msgstr "编辑搜索文件夹"
msgid "New Search Folder"
msgstr "新建搜索文件夹"
-#: ../src/mail/message-list.c:300
+#: ../src/mail/message-list.c:312
msgid "Unseen"
msgstr "未看"
-#: ../src/mail/message-list.c:301
+#: ../src/mail/message-list.c:313
msgid "Seen"
msgstr "已看"
-#: ../src/mail/message-list.c:302
+#: ../src/mail/message-list.c:314
msgid "Answered"
msgstr "已答复"
-#: ../src/mail/message-list.c:303
+#: ../src/mail/message-list.c:315
msgid "Forwarded"
msgstr "已转发"
-#: ../src/mail/message-list.c:304
+#: ../src/mail/message-list.c:316
msgid "Multiple Unseen Messages"
msgstr "多封未看信息"
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:317
msgid "Multiple Messages"
msgstr "多封信"
-#: ../src/mail/message-list.c:318
+#: ../src/mail/message-list.c:330
msgid "Lowest"
msgstr "最低"
-#: ../src/mail/message-list.c:319
+#: ../src/mail/message-list.c:331
msgid "Lower"
msgstr "较低"
-#: ../src/mail/message-list.c:323
+#: ../src/mail/message-list.c:335
msgid "Higher"
msgstr "较高"
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:336
msgid "Highest"
msgstr "最高"
-#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6286
+#: ../src/mail/message-list.c:485
msgid "Generating message list"
msgstr "生成信息列表"
#. strftime format of a time,
#. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2074
-#: ../src/modules/itip-formatter/itip-view.c:267
+#: ../src/mail/message-list.c:2154
+#: ../src/modules/itip-formatter/itip-view.c:273
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../src/mail/message-list.c:2083
+#: ../src/mail/message-list.c:2163
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../src/mail/message-list.c:2095
+#: ../src/mail/message-list.c:2175
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../src/mail/message-list.c:2103
+#: ../src/mail/message-list.c:2183
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../src/mail/message-list.c:2105
+#: ../src/mail/message-list.c:2185
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../src/mail/message-list.c:3062
+#: ../src/mail/message-list.c:3361
msgid "Select all visible messages"
msgstr "选中所有可见的信息"
-#: ../src/mail/message-list.c:3781 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4135 ../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:5213
+#: ../src/mail/message-list.c:5704
msgid "Follow-up"
msgstr "跟随"
-#: ../src/mail/message-list.c:6225
+#: ../src/mail/message-list.c:6791
#, fuzzy
#| msgid ""
#| "No message satisfies your search criteria. Change search criteria by "
@@ -19874,10 +21813,14 @@ msgstr ""
"示”信息过滤器；或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
"索。"
-#: ../src/mail/message-list.c:6233
+#: ../src/mail/message-list.c:6799
msgid "There are no messages in this folder."
msgstr "此文件夹中没有信息。"
+#: ../src/mail/message-list.c:6875
+msgid "Generating message list…"
+msgstr "正在生成信息列表……"
+
#: ../src/mail/message-list.etspec.h:2
msgid "Flagged"
msgstr "已标志"
@@ -19903,16 +21846,26 @@ msgid "Messages To"
msgstr "发信息给"
#: ../src/mail/message-list.etspec.h:20
-#, fuzzy
-#| msgid "Subject - Trimmed"
msgid "Subject — Trimmed"
-msgstr "主题 - 被截断"
+msgstr "主题 — 被截断"
#: ../src/mail/message-list.etspec.h:21
-#: ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/plugins/save-calendar/csv-format.c:361
msgid "UID"
msgstr "UID"
+#: ../src/mail/message-list.etspec.h:22
+#, fuzzy
+#| msgid "Sending Mail"
+msgid "Sender Mail"
+msgstr "发送邮件"
+
+#: ../src/mail/message-list.etspec.h:23
+#, fuzzy
+#| msgid "Recipients"
+msgid "Recipients Mail"
+msgstr "收件人"
+
#: ../src/mail/searchtypes.xml.in.h:23 ../src/mail/vfoldertypes.xml.in.h:23
msgid "Any header"
msgstr "任意信头"
@@ -19922,54 +21875,137 @@ msgid "Subject or Addresses contains"
msgstr "主题或地址包含"
#: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
msgid "Recipients contain"
msgstr "收件人含有"
#: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
msgid "Message contains"
msgstr "信息含有"
#: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
msgid "Subject contains"
msgstr "主题含有"
#: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
msgid "Sender contains"
msgstr "发件人含有"
#: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
msgid "Body contains"
msgstr "邮件体含有"
#: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
msgid "Free form expression"
msgstr "自由表达式"
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
+#, fuzzy
+#| msgid "Collection"
+msgid "Edit Collection"
+msgstr "收藏"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
+#, fuzzy
+#| msgid "Use for Folders"
+msgid "Use for"
+msgstr "用于文件夹 "
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:316
+#: ../src/plugins/pst-import/pst-importer.c:522
+msgid "_Mail"
+msgstr "邮件(_M)"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
+msgid "C_alendar"
+msgstr "日历(_A)"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:476
+#: ../src/modules/addressbook/e-book-shell-backend.c:269
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:139
+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-memo-shell-view-actions.c:180
+msgid "New Memo List"
+msgstr "新建备忘录"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:532
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:212
+msgid "Address Book Properties"
+msgstr "地址簿属性"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:536
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:285
+msgid "Calendar Properties"
+msgstr "日历属性"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:540
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:252
+msgid "Memo List Properties"
+msgstr "备忘录属性"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:544
+#: ../src/modules/calendar/e-task-shell-view-actions.c:276
+msgid "Task List Properties"
+msgstr "任务列表属性"
+
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:229
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+msgid "_Back"
+msgstr "后退(_B)"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+msgid "_Browse"
+msgstr "浏览(_B)"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+msgid ""
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
+"address books, calendars, memo lists or task lists there"
+msgstr ""
+
#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a
date in message list
-#: ../src/modules/addressbook/autocompletion-config.c:123
-#: ../src/modules/mail/em-mailer-prefs.c:1556
+#: ../src/modules/addressbook/autocompletion-config.c:124
+#: ../src/modules/mail/em-mailer-prefs.c:1697
msgid "_Table column:"
msgstr "表列(T)："
-#: ../src/modules/addressbook/autocompletion-config.c:126
-msgid "Address formatting"
-msgstr "地址格式化"
-
-#: ../src/modules/addressbook/autocompletion-config.c:129
+#: ../src/modules/addressbook/autocompletion-config.c:130
msgid "_Format address according to standard of its destination country"
msgstr "根据目的地国家标准格式化地址(_F)"
-#: ../src/modules/addressbook/autocompletion-config.c:137
+#. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:143
+msgctxt "OpenMap"
+msgid "Open _maps with"
+msgstr "打开地图(_M)，使用"
+
+#. Translators: This is part of "Open maps with OpenStreetMap"
+#: ../src/modules/addressbook/autocompletion-config.c:150
+msgctxt "OpenMap"
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap"
+
+#. Translators: This is part of "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:153
+msgctxt "OpenMap"
+msgid "Google"
+msgstr "谷歌"
+
+#: ../src/modules/addressbook/autocompletion-config.c:169
msgid "Autocompletion"
msgstr "自动补全"
-#: ../src/modules/addressbook/autocompletion-config.c:140
+#: ../src/modules/addressbook/autocompletion-config.c:172
msgid "Always _show address of the autocompleted contact"
msgstr "总是显示自动补全的联系人的地址(_S)"
@@ -19993,320 +22029,339 @@ msgstr "联系人信息"
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
-#: ../src/modules/addressbook/e-book-shell-backend.c:256
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
-msgid "New Address Book"
-msgstr "新地址簿"
-
-#: ../src/modules/addressbook/e-book-shell-backend.c:265
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
msgctxt "New"
msgid "_Contact"
msgstr "联系人(_C)"
-#: ../src/modules/addressbook/e-book-shell-backend.c:267
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1129
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: ../src/modules/addressbook/e-book-shell-backend.c:272
+#: ../src/modules/addressbook/e-book-shell-backend.c:285
msgctxt "New"
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: ../src/modules/addressbook/e-book-shell-backend.c:274
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
+#: ../src/modules/addressbook/e-book-shell-backend.c:287
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1136
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: ../src/modules/addressbook/e-book-shell-backend.c:282
+#: ../src/modules/addressbook/e-book-shell-backend.c:295
msgctxt "New"
msgid "Address _Book"
msgstr "地址簿(_B)"
-#: ../src/modules/addressbook/e-book-shell-backend.c:284
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:966
+#: ../src/modules/addressbook/e-book-shell-backend.c:297
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1045
msgid "Create a new address book"
msgstr "创建新地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
-msgid "Address Book Properties"
-msgstr "地址簿属性"
-
#. Translators: This is a save dialog title
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:533
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:829
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:607
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:908
msgid "Save as vCard"
msgstr "另存为 VCard"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:936
-msgid "Co_py All Contacts To..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
+#, fuzzy
+#| msgid "Co_py All Contacts To..."
+msgid "Co_py All Contacts To…"
msgstr "将全部联系人复制到(_P)..."
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:938
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
msgid "Copy the contacts of the selected address book to another"
msgstr "把选中地址簿中的联系人复制到其它地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:943
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
msgid "D_elete Address Book"
msgstr "删除地址簿(_E)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:945
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1024
msgid "Delete the selected address book"
msgstr "删除选中的地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:950
-msgid "_Manage Address Book groups..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
+#, fuzzy
+#| msgid "_Manage Address Book groups..."
+msgid "_Manage Address Book groups…"
msgstr "管理通信录组...(_M)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:952
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-task-shell-view-actions.c:733
msgid "Manage task list groups order and visibility"
msgstr "管理任务列表排序及可见性"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:957
-msgid "Mo_ve All Contacts To..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
+#, fuzzy
+#| msgid "Mo_ve All Contacts To..."
+msgid "Mo_ve All Contacts To…"
msgstr "将全部联系人移至(_V)..."
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:959
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
msgid "Move the contacts of the selected address book to another"
msgstr "把选中的地址簿中的联系人移至其它地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:964
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:971
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
msgid "Address _Book Properties"
msgstr "地址簿属性(_B)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:973
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1052
msgid "Show properties of the selected address book"
msgstr "显示选中地址簿的属性"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:978
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
-#: ../src/modules/calendar/e-task-shell-view-actions.c:738
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
msgid "Re_fresh"
msgstr "刷新(_F)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:980
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1059
msgid "Refresh the selected address book"
msgstr "重命名选中地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:985
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
+#, fuzzy
+#| msgid "Refresh the selected address book"
+msgid "Re_fresh list of account address books"
+msgstr "重命名选中地址簿"
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
msgid "Address Book _Map"
msgstr "地址簿地图(_M)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:987
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1073
msgid "Show map with all contacts from selected address book"
msgstr "显示选中地址簿中所有联系人的地图"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:992
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:619
-#: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
-msgid "_Rename..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#, fuzzy
+#| msgid "_Rename..."
+msgid "_Rename…"
msgstr "重命名(_R)..."
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:994
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
msgid "Rename the selected address book"
msgstr "重命名选中的地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
msgid "Stop loading"
msgstr "停止载入"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1006
-msgid "_Copy Contact To..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
+#, fuzzy
+#| msgid "_Copy Contact To..."
+msgid "_Copy Contact To…"
msgstr "复制联系人到(_C)..."
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1008
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
msgid "Copy selected contacts to another address book"
msgstr "把选中的联系人复制到其它地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1099
msgid "_Delete Contact"
msgstr "删除联系人(_D)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1020
-msgid "_Find in Contact..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1106
+#, fuzzy
+#| msgid "_Find in Contact..."
+msgid "_Find in Contact…"
msgstr "在联系人查找(_F)..."
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1108
msgid "Search for text in the displayed contact"
msgstr "在显示的联系人中搜索文本"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1027
-msgid "_Forward Contact..."
-msgstr "转发联系人(_F)..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1113
+#, fuzzy
+#| msgid "_Forward Contact"
+msgid "_Forward Contact…"
+msgstr "转发联系人(_F)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1115
msgid "Send selected contacts to another person"
msgstr "把选中的联系人发送给其他人"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1034
-msgid "_Move Contact To..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1120
+#, fuzzy
+#| msgid "_Move Contact To..."
+msgid "_Move Contact To…"
msgstr "移动联系人至(_M)..."
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1122
msgid "Move selected contacts to another address book"
msgstr "把选中的联系人移至其它地址簿"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1041
-msgid "_New Contact..."
-msgstr "新建联系人(_N)..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1127
+msgid "_New Contact…"
+msgstr "新建联系人(_N)…"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1048
-msgid "New Contact _List..."
-msgstr "新建联系人列表(_L)..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1134
+msgid "New Contact _List…"
+msgstr "新建联系人列表(_L)…"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1055
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
msgid "_Open Contact"
msgstr "打开联系人(_O)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1062
-msgid "_Send Message to Contact..."
-msgstr "给联系人发送信息(_S)..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1148
+msgid "_Send Message to Contact…"
+msgstr "给联系人发送信息(_S)…"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1150
msgid "Send a message to the selected contacts"
msgstr "给选中的联系人发送信息"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
-#: ../src/modules/calendar/e-task-shell-view-actions.c:810
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-task-shell-view-actions.c:831
msgid "_Actions"
msgstr "操作(_A)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
-#: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
msgid "_Preview"
msgstr "预览(_P)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1091
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:680
-#: ../src/modules/calendar/e-task-shell-view-actions.c:834
-msgid "_Manage groups..."
-msgstr "管理群组...(_M)"
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:701
+#: ../src/modules/calendar/e-task-shell-view-actions.c:855
+msgid "_Manage groups…"
+msgstr "管理群组(_M)…"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
msgid "Address Book Map"
msgstr "地址簿地图"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1135
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
msgid "Contact _Preview"
msgstr "联系人预览(_P)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1227
msgid "Show contact preview window"
msgstr "显示联系人预览窗口"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1233
msgid "Show _Maps"
msgstr "显示地图(_M)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
msgid "Show maps in contact preview window"
msgstr "在联系人预览窗口中显示地图"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:741
-#: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
msgid "_Classic View"
msgstr "分类视图(_C)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1256
msgid "Show contact preview below the contact list"
msgstr "在联系人列表下方显示联系人预览"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1171
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:748
-#: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2074
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
msgid "_Vertical View"
msgstr "竖直视图(_V)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1263
msgid "Show contact preview alongside the contact list"
msgstr "在联系人列表旁显示联系人预览"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1188
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1645
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:765
-#: ../src/modules/calendar/e-task-shell-view-actions.c:966
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:790
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1005
msgid "Unmatched"
msgstr "无匹配"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1198
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1655
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
-#: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
-#: ../src/shell/e-shell-content.c:655
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:800
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
+#: ../src/shell/e-shell-content.c:639
msgid "Advanced Search"
msgstr "高级搜索"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1321
msgid "Print all shown contacts"
msgstr "打印全部显示的联系人"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1328
msgid "Preview the contacts to be printed"
msgstr "预览将要打印的联系人"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1245
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1335
msgid "Print selected contacts"
msgstr "打印选中的联系人"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1260
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1350
msgid "S_ave Address Book as vCard"
msgstr "保存地址簿为 VCard(_A)"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1352
msgid "Save the contacts of the selected address book as a vCard"
msgstr "把选中地址簿中的的联系人保存为 VCard"
#. Translators: This is an action label
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
-msgid "_Save as vCard..."
-msgstr "另存为 vCard(_S)..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1358
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1368
+msgid "_Save as vCard…"
+msgstr "另存为 VCard(_S)…"
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
msgid "Save selected contacts as a vCard"
msgstr "把选中的联系人保存为 vCard"
-#: ../src/modules/addressbook/e-book-shell-view.c:311
+#: ../src/modules/addressbook/e-book-shell-view.c:355
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../src/modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:357
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../src/modules/addressbook/e-book-shell-view.c:344
+#: ../src/modules/addressbook/e-book-shell-view.c:388
msgid "_Send Message to Contacts"
msgstr "给联系人发送信息(_S)"
-#: ../src/modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:390
msgid "_Send Message to List"
msgstr "给列表发送信息(_S)"
-#: ../src/modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:392
msgid "_Send Message to Contact"
msgstr "给联系人发送信息(_M)"
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../src/modules/alarm-notify/alarm-notify.c:171
+#, fuzzy, c-format
+#| msgid "Failed to open calendar '{0}'"
+msgid "Failed to launch command “%s”:"
+msgstr "打开日历“{0}”失败"
+
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
msgid ""
"You can restore Evolution from a backup file.\n"
"\n"
@@ -20316,56 +22371,60 @@ msgstr ""
"\n"
"这会恢复您所有的个人数据、设置、邮件过滤器等。"
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:178
msgid "_Restore from a backup file:"
msgstr "从备份文件恢复(_R)："
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:189
msgid "Choose a backup file to restore"
msgstr "选择要恢复的备份文件"
#. Keep the title identical to EMailConfigRestorePage
#. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:292
#: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
msgid "Restore from Backup"
msgstr "从备份中恢复"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:233
+#: ../src/modules/backup-restore/evolution-backup-restore.c:306
msgid "Select name of the Evolution backup file"
msgstr "选择 Evolution 备份文件名称"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:266
+#: ../src/modules/backup-restore/evolution-backup-restore.c:351
msgid "_Restart Evolution after backup"
msgstr "备份后重新启动 Evolution(_R)"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:301
+#: ../src/modules/backup-restore/evolution-backup-restore.c:386
msgid "Re_start Evolution after restore"
msgstr "恢复后重新启动 Evolution(_S)"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:343
+#: ../src/modules/backup-restore/evolution-backup-restore.c:428
msgid "Select name of the Evolution backup file to restore"
msgstr "选择要恢复的 Evolution 备份文件名称"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:352
+#: ../src/modules/backup-restore/evolution-backup-restore.c:437
#, fuzzy, c-format
#| msgid "Checking content of backup file '%s', please wait..."
-msgid "Checking content of backup file “%s”, please wait..."
+msgid "Checking content of backup file “%s”, please wait…"
msgstr "检查备份文件“%s”的内容，请稍候…"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:373
-msgid "_Back up Evolution Data..."
+#: ../src/modules/backup-restore/evolution-backup-restore.c:458
+#, fuzzy
+#| msgid "_Back up Evolution Data..."
+msgid "_Back up Evolution Data…"
msgstr "备份 Evolution 数据(_B)..."
-#: ../src/modules/backup-restore/evolution-backup-restore.c:375
+#: ../src/modules/backup-restore/evolution-backup-restore.c:460
msgid "Back up Evolution data and settings to an archive file"
msgstr "备份 Evolution 的数据和设置到一个归档文件"
-#: ../src/modules/backup-restore/evolution-backup-restore.c:380
-msgid "R_estore Evolution Data..."
+#: ../src/modules/backup-restore/evolution-backup-restore.c:465
+#, fuzzy
+#| msgid "R_estore Evolution Data..."
+msgid "R_estore Evolution Data…"
msgstr "恢复 Evolution 数据(_E)..."
-#: ../src/modules/backup-restore/evolution-backup-restore.c:382
+#: ../src/modules/backup-restore/evolution-backup-restore.c:467
msgid "Restore Evolution data and settings from an archive file"
msgstr "从归档文件备份及恢复 Evolution 的数据和设置"
@@ -20432,43 +22491,43 @@ msgstr "删除临时备份文件"
msgid "Reloading registry service"
msgstr "重新加载注册服务"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:899
+#: ../src/modules/backup-restore/evolution-backup-tool.c:903
msgid "Evolution Back Up"
msgstr "Evolution 备份"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:900
+#: ../src/modules/backup-restore/evolution-backup-tool.c:904
#, fuzzy, c-format
#| msgid "Backing up to the folder %s"
msgid "Backing up to the file %s"
msgstr "正在备份到文件夹 %s"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:904
+#: ../src/modules/backup-restore/evolution-backup-tool.c:908
msgid "Evolution Restore"
msgstr "Evolution 恢复"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:905
+#: ../src/modules/backup-restore/evolution-backup-tool.c:909
#, fuzzy, c-format
#| msgid "Restoring from the folder %s"
msgid "Restoring from the file %s"
msgstr "正在从文件夹 %s 中恢复"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:974
+#: ../src/modules/backup-restore/evolution-backup-tool.c:978
msgid "Backing up Evolution Data"
msgstr "正在备份 Evolution 数据"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:975
+#: ../src/modules/backup-restore/evolution-backup-tool.c:979
msgid "Please wait while Evolution is backing up your data."
msgstr "请稍候，Evolution 正在备份您的数据。"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:977
+#: ../src/modules/backup-restore/evolution-backup-tool.c:981
msgid "Restoring Evolution Data"
msgstr "正在恢复 Evolution 数据"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:978
+#: ../src/modules/backup-restore/evolution-backup-tool.c:982
msgid "Please wait while Evolution is restoring your data."
msgstr "请稍候，Evolution 正在恢复您的数据。"
-#: ../src/modules/backup-restore/evolution-backup-tool.c:1000
+#: ../src/modules/backup-restore/evolution-backup-tool.c:1004
msgid "This may take a while depending on the amount of data in your account."
msgstr "这可能要花一点时间，取决于您帐号中的数据总量。"
@@ -20547,134 +22606,171 @@ msgid "Convert message text to _Unicode"
msgstr "将信息文本转换为 _Unicode"
#: ../src/modules/bogofilter/evolution-bogofilter.c:537
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:1
msgid "Bogofilter"
msgstr "Bogofilter"
-#: ../src/modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#: ../src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in.h:2
msgid "Junk filter using Bogofilter"
msgstr "使用 Bogofilter 过滤垃圾"
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:93
+msgid "Choose an Address Book"
+msgstr "选择一个地址簿"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
+#: ../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
+msgid "URL:"
+msgstr "URL："
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
+msgid "Find Address Books"
+msgstr "查找地址簿"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
+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:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:401
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "URL 不是有效的 http:// 或者 https:// URL"
+
#: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:994
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
#: ../src/modules/cal-config-google/e-cal-config-google.c:190
#: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
msgid "User name cannot be empty"
msgstr "用户名不能为空"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:443
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:418
+msgid "Looking up server search bases, please wait…"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:494
msgid "Standard LDAP Port"
msgstr "标准 LDAP 端口"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:449
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:632
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
msgid "LDAP over SSL/TLS (deprecated)"
msgstr "通过 SSL/TLS 的 LDAP(已废弃)"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:506
msgid "Microsoft Global Catalog"
msgstr "Microsoft 全局目录服务"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:461
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:512
msgid "Microsoft Global Catalog over SSL/TLS"
msgstr "通过 SSL/TlS 的 Microsoft 全局目录服务"
#. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:568
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
msgid "Connecting to LDAP"
msgstr "重新连接到 LDAP"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:585
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
msgid "Server Information"
msgstr "服务器信息"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:612
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
msgid "Port:"
msgstr "端口："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:620
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
msgid "Port number is not valid"
msgstr "端口号无效"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:635
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
msgid "StartTLS (recommended)"
msgstr "StartTLS (推荐)"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:637
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
msgid "Encryption:"
msgstr "加密："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
msgid "Authentication"
msgstr "身份验证"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
msgid "Anonymous"
msgstr "匿名"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+msgid "Username can be left empty"
+msgstr "用户名可以为空"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+msgid "requires anonymous access to your LDAP server"
+msgstr ""
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名(DN)"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+msgid "for example: uid=user,dc=example,dc=com"
+msgstr "例如：for example: uid=user,dc=example,dc=com"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
msgid "Method:"
msgstr "方法："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
-#, fuzzy
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you. Note that "
-#| "setting this to \"Using email address\" requires anonymous access to your "
-#| "LDAP server."
-msgid ""
-"This is the method Evolution will use to authenticate you. Note that "
-"setting this to “Using email address” requires anonymous access to your LDAP "
-"server."
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+msgid "This is the method Evolution will use to authenticate you."
msgstr ""
-"这是 Evolution 用来认证您的方法。注意若设为“使用电子邮件地址”则需要对您的 "
-"LDAP 服务器匿名访问。"
#. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
msgid "Using LDAP"
msgstr "使用 LDAP"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:729
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
#: ../src/modules/mail/e-mail-shell-view.c:118
+#: ../src/modules/mail/e-mail-shell-view.c:200
msgid "Searching"
msgstr "搜索"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:751
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
msgid "Search Base:"
msgstr "搜索基础："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
msgid "Find Possible Search Bases"
msgstr "查找可能的搜索基础"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
msgid "One Level"
msgstr "一级"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
msgid "Subtree"
msgstr "子树"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
msgid "Search Scope:"
msgstr "搜索范围："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
#, fuzzy
#| msgid ""
#| "The search scope defines how deep you would like the search to extend "
@@ -20691,88 +22787,64 @@ msgstr ""
"搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:795
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
msgid "Search Filter:"
msgstr "搜索过滤器："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:807
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
msgid "Downloading"
msgstr "下载"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
msgid "Limit:"
msgstr "限制："
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:839
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
msgid "contacts"
msgstr "联系人"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:844
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
msgid "Browse until limit is reached"
msgstr "浏览直到达到极限"
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:979
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
msgid "Server address cannot be empty"
msgstr "服务器地址不能为空"
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
-msgid "Choose an Address Book"
-msgstr "选择一个地址簿"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
-msgid "URL:"
-msgstr "URL："
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
-msgid "Find Address Books"
-msgstr "查找地址簿"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
-msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
-msgid "URL is not a valid http:// nor https:// URL"
-msgstr "URL 不是有效的 http:// 或者 https:// URL"
-
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:225
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:226
msgid "Choose a Calendar"
msgstr "选择日历"
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:229
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:230
msgid "Choose a Memo List"
msgstr "选择备忘录"
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:233
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:234
msgid "Choose a Task List"
msgstr "选择一个任务列表"
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
msgid "Find Calendars"
msgstr "查找日历"
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
msgid "Find Memo Lists"
msgstr "查找备忘录"
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
msgid "Find Task Lists"
msgstr "查找任务列表"
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
msgid "Email:"
msgstr "电子邮件："
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
msgid "Server handles meeting invitations"
msgstr "服务器处理会议邀请"
@@ -20786,9 +22858,9 @@ msgstr "在生日和纪念日日历中使用"
#: ../src/modules/cal-config-google/e-cal-config-google.c:101
msgid "Enable Calendars to synchronize"
-msgstr ""
+msgstr "启用日历以同步"
-#: ../src/modules/cal-config-google/e-google-chooser-button.c:144
+#: ../src/modules/cal-config-google/e-google-chooser-button.c:145
msgid "Default User Calendar"
msgstr "删除用户日历"
@@ -20848,141 +22920,146 @@ msgstr "单位："
msgid "Location cannot be empty"
msgstr "位置不能为空"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:106
+#, fuzzy
+#| msgid "Show Notes"
+msgid "Choose Notes"
+msgstr "显示备注 %s"
+
+#: ../src/modules/cal-config-webdav-notes/evolution-cal-config-webdav-notes.c:337
+msgid "Find Notes"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
#: ../src/smime/gui/smime-ui.ui.h:7
msgid "I_mport"
msgstr "导入(_M)"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#: ../src/modules/calendar/e-cal-attachment-handler.c:333
msgid "Importing an event"
msgstr "正在导入事件"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#: ../src/modules/calendar/e-cal-attachment-handler.c:337
msgid "Importing a memo"
msgstr "正在导入备忘"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#: ../src/modules/calendar/e-cal-attachment-handler.c:341
msgid "Importing a task"
msgstr "正在导入任务"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:401
+#: ../src/modules/calendar/e-cal-attachment-handler.c:399
msgid "Select a Calendar"
msgstr "选择一个日历"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#: ../src/modules/calendar/e-cal-attachment-handler.c:406
msgid "Select a Memo List"
msgstr "选择一个备忘录"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:415
+#: ../src/modules/calendar/e-cal-attachment-handler.c:413
msgid "Select a Task List"
msgstr "选择一个任务列表"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:422
+#: ../src/modules/calendar/e-cal-attachment-handler.c:420
msgid "I_mport to Calendar"
msgstr "导入到日历(_M)"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#: ../src/modules/calendar/e-cal-attachment-handler.c:427
msgid "I_mport to Memo List"
msgstr "导入到备忘录(_M)"
-#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#: ../src/modules/calendar/e-cal-attachment-handler.c:434
msgid "I_mport to Task List"
msgstr "导入到任务列表(_M)"
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
-msgid "New Memo List"
-msgstr "新建备忘录"
-
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
#, fuzzy, c-format
#| msgid "Copying an event into the calendar '%s'"
msgid "Copying an event into the calendar “%s”"
msgstr "正在将事件复制到日历“%s”"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
#, fuzzy, c-format
#| msgid "Moving an event into the calendar '%s'"
msgid "Moving an event into the calendar “%s”"
msgstr "正在将事件移至日历“%s”"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
#, fuzzy, c-format
#| msgid "Copying a memo into the memo list '%s'"
msgid "Copying a memo into the memo list “%s”"
msgstr "正在将备忘复制到备忘录“%s”"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
#, fuzzy, c-format
#| msgid "Moving a memo into the memo list '%s'"
msgid "Moving a memo into the memo list “%s”"
msgstr "正在将备忘移至备忘录“%s”"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
#, fuzzy, c-format
#| msgid "Copying a task into the task list '%s'"
msgid "Copying a task into the task list “%s”"
msgstr "正在将任务复制到任务列表“%s”"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
#, fuzzy, c-format
#| msgid "Moving a task into the task list '%s'"
msgid "Moving a task into the task list “%s”"
msgstr "正在将任务移至任务列表“%s”"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:693
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
msgid "Calendar Selector"
msgstr "日历选择器"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
msgid "Memo List Selector"
msgstr "备忘录选择器"
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
msgid "Task List Selector"
msgstr "任务列表选择器"
-#: ../src/modules/calendar/e-calendar-preferences.c:525
+#: ../src/modules/calendar/e-calendar-preferences.c:521
#, fuzzy
#| msgid "Select the calendars for reminder notification"
msgid "Selected Calendars for Notifications of Reminders"
msgstr "选择用于提醒通知的日历"
-#: ../src/modules/calendar/e-calendar-preferences.c:532
-#, fuzzy
-#| msgid "Select the calendars for reminder notification"
-msgid "Selected Memo Lists for Notifications of Reminders"
-msgstr "选择用于提醒通知的日历"
-
-#: ../src/modules/calendar/e-calendar-preferences.c:539
+#: ../src/modules/calendar/e-calendar-preferences.c:528
#, fuzzy
#| msgid "Select the calendars for reminder notification"
msgid "Selected Task Lists for Notifications of Reminders"
msgstr "选择用于提醒通知的日历"
-#: ../src/modules/calendar/e-calendar-preferences.c:635
+#: ../src/modules/calendar/e-calendar-preferences.c:612
msgid "Meeting Invitations"
msgstr "会议邀请"
-#: ../src/modules/calendar/e-calendar-preferences.c:661
+#: ../src/modules/calendar/e-calendar-preferences.c:638
msgid "_Delete message after acting"
msgstr "操作后删除信息(_D)"
-#: ../src/modules/calendar/e-calendar-preferences.c:675
-#: ../src/modules/calendar/e-calendar-preferences.c:706
+#: ../src/modules/calendar/e-calendar-preferences.c:645
+#, fuzzy
+#| msgid "_Preserve my reminder"
+msgid "_Preserve existing reminder by default"
+msgstr "保留我的提醒(_P)"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:690
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:690
+#: ../src/modules/calendar/e-calendar-preferences.c:674
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
-#: ../src/modules/calendar/e-calendar-preferences.c:1102
+#: ../src/modules/calendar/e-calendar-preferences.c:1116
msgid "Ti_me and date:"
msgstr "时间和日期(_M)："
-#: ../src/modules/calendar/e-calendar-preferences.c:1103
+#: ../src/modules/calendar/e-calendar-preferences.c:1117
msgid "_Date only:"
msgstr "仅日期(_D)："
@@ -21047,7 +23124,7 @@ msgid "_24 hour"
msgstr "_24 小时"
#: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1607
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
msgid "Work Week"
msgstr "工作日"
@@ -21168,170 +23245,179 @@ msgid "Sc_roll Month View by a week"
msgstr "通过一个周来滚动月视图(_R)"
#: ../src/modules/calendar/e-calendar-preferences.ui.h:57
+#, fuzzy
+#| msgid "Scroll Month View by a week"
+msgid "Start Month View with the c_urrent week"
+msgstr "通过一个周来滚动月视图"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Order days in Week View from _left to right"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Allo_w direct edit of event Summary"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+msgid "Hi_de cancelled events"
+msgstr "隐藏已取消事件(_D)"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
msgid "Alerts"
msgstr "提醒"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
msgid "Display"
msgstr "显示"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
-msgid "Task List"
-msgstr "任务列表"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
msgid "Highlight t_asks due today"
msgstr "高亮今天到期的任务(_A)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
msgid "Highlight _overdue tasks"
msgstr "高亮延期任务(_O)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
-msgid "Display reminders in _notification area only"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+msgid "Hid_e cancelled tasks"
+msgstr "隐藏已取消的任务(_E)"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#, fuzzy
+#| msgid "To Do"
+msgid "To Do bar"
+msgstr "待办"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+msgid "Show Tasks without _Due date"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
+#, fuzzy
+#| msgid "Display reminders in _notification area only"
+msgid "Display Reminders window with _notifications"
msgstr "只在通知区域显示提醒(_O)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
#, fuzzy
#| msgid "Display reminders in _notification area only"
msgid "Keep reminder notification _window always on top"
msgstr "只在通知区域显示提醒(_O)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
msgid "Display reminders for completed _tasks"
msgstr "显示已完成工作的提醒(_T)"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:77
#, fuzzy
#| msgid "Display reminders for completed _tasks"
msgid "Display reminders for _past events"
msgstr "显示已完成工作的提醒(_T)"
#. 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:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
#, fuzzy
#| msgid "Default reminder value"
msgid "Set _default reminder"
msgstr "默认提醒值"
#. 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:74
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
#, fuzzy
#| msgid "before every appointment"
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:76
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
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:78
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
msgid "before every anniversary/birthday"
msgstr "在每个周年/生日前"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
-msgid "Default _snooze time (in minutes)"
-msgstr "默认小睡时间 [以分钟计] (_S)"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
#, fuzzy
#| msgid "Select the calendars for reminder notification"
msgid "Select the sources for reminder notification:"
msgstr "选择用于提醒通知的日历"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
-#, fuzzy
-#| msgid "Calendar"
-msgid "Calendars"
-msgstr "日历"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-#, fuzzy
-#| msgctxt "New"
-#| msgid "Memo Li_st"
-msgid "Memo Lists"
-msgstr "备忘录(_S)"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
-#, fuzzy
-#| msgid "Task List"
-msgid "Task Lists"
-msgstr "任务列表"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
msgid "Default Free/Busy Server"
msgstr "默认闲/忙服务器"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
#, 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:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
+msgid ""
+"Specify login user name as part of the URL in case the server requires "
+"authentication, like: https://USER example com/"
+msgstr ""
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:94
msgid "Publishing Information"
msgstr "发布信息"
-#: ../src/modules/calendar/e-cal-shell-backend.c:112
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
msgctxt "New"
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../src/modules/calendar/e-cal-shell-backend.c:114
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../src/modules/calendar/e-cal-shell-backend.c:119
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../src/modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../src/modules/calendar/e-cal-shell-backend.c:126
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
msgctxt "New"
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../src/modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../src/modules/calendar/e-cal-shell-backend.c:136
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
msgctxt "New"
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../src/modules/calendar/e-cal-shell-backend.c:138
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
msgid "Create a new calendar"
msgstr "创建新日历"
-#: ../src/modules/calendar/e-cal-shell-backend.c:255
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
msgid "Calendar and Tasks"
msgstr "日历和任务"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:199
msgid "Print"
msgstr "打印"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
-msgid "Calendar Properties"
-msgstr "日历属性"
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:314
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -21341,377 +23427,401 @@ msgstr ""
#. Translators: This is the first part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:331
msgid "Purge events older than"
msgstr "销毁较早的事件"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
msgid "Making an occurrence movable"
msgstr "将循环发生标示成可移动"
#. Translators: Default filename part saving an event to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1084
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
msgid "event"
msgstr "事件"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1086
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:496
-#: ../src/modules/calendar/e-task-shell-view-actions.c:615
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
msgid "Save as iCalendar"
msgstr "保存为 iCalendar"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1220
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
-#: ../src/modules/calendar/e-task-shell-view-actions.c:703
-msgid "_Copy..."
-msgstr "复制(_C)..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+#, fuzzy
+#| msgid "_Copy"
+msgid "_Copy…"
+msgstr "复制(_C)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1227
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
msgid "D_elete Calendar"
msgstr "删除日历(_E)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
msgid "Delete the selected calendar"
msgstr "删除选中的日历"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
msgid "Go Back"
msgstr "后退"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
msgid "Go Forward"
msgstr "前进"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
msgid "Select today"
msgstr "选择今天"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
msgid "Select _Date"
msgstr "选择日期(_D)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
msgid "Select a specific date"
msgstr "选择特定日期"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1262
-msgid "_Manage Calendar groups..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1270
+#, fuzzy
+#| msgid "_Manage Calendar groups..."
+msgid "_Manage Calendar groups…"
msgstr "管理日历组...(_M)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
msgid "Manage Calendar groups order and visibility"
msgstr "管理日历组排序及可见性"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
-#: ../src/modules/calendar/e-task-shell-view-actions.c:801
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-task-shell-view-actions.c:822
msgid "Purg_e"
msgstr "销毁(_E)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
msgid "Purge old appointments and meetings"
msgstr "销毁旧约会和会议"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
msgid "Refresh the selected calendar"
msgstr "刷新选中的日历"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
+#, fuzzy
+#| msgid "Refresh the selected calendar"
+msgid "Re_fresh list of account calendars"
+msgstr "刷新选中的日历"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
msgid "Rename the selected calendar"
msgstr "重命名选中的日历"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
msgid "Find _Next"
msgstr "查找下一个(_N)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
msgid "Find next occurrence of the current search string"
msgstr "寻找搜索字符串出现的下一个位置"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
msgid "Find _Previous"
msgstr "查找上一个(_P)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
msgid "Find previous occurrence of the current search string"
msgstr "寻找该搜索字符串出现的上一个位置"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
msgid "Stop _Running Search"
msgstr "停止正在运行的搜索(_R)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
msgid "Stop currently running search"
msgstr "停止当前正在运行的搜索"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
msgid "Sho_w All Calendars"
msgstr "显示所有日历(_W)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
msgid "Show _Only This Calendar"
msgstr "只显示此日历(_O)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
-msgid "Cop_y to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+#, fuzzy
+#| msgid "Cop_y to Calendar..."
+msgid "Cop_y to Calendar…"
msgstr "复制到日历(_Y)..."
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
-msgid "_Delegate Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1361
+#, fuzzy
+#| msgid "_Delegate Meeting..."
+msgid "_Delegate Meeting…"
msgstr "代理会议(_D)..."
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
msgid "_Delete Appointment"
msgstr "删除约会(_D)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
msgid "Delete selected appointments"
msgstr "删除选中的约会"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
msgid "Delete This _Occurrence"
msgstr "删除此次发生(_O)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
msgid "Delete this occurrence"
msgstr "删除此次发生"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
msgid "Delete All Occ_urrences"
msgstr "删除所有发生(_U)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
msgid "Delete all occurrences"
msgstr "删除全部发生"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
-msgid "New All Day _Event..."
-msgstr "新建全天事件(_E)"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1389
+msgid "Edit as Ne_w…"
+msgstr ""
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
+#, fuzzy
+#| msgid "View the current appointment"
+msgid "Edit the current appointment as new"
+msgstr "查看当前约会"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1396
+#, fuzzy
+#| msgid "New All Day Event"
+msgid "New All Day _Event…"
+msgstr "新建全天事件"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
msgid "Create a new all day event"
msgstr "创建一个新的全天事件"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
-#: ../src/modules/calendar/e-task-shell-view-actions.c:696
-msgid "_Forward as iCalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+#, fuzzy
+#| msgid "_Forward as iCalendar..."
+msgid "_Forward as iCalendar…"
msgstr "作为 iCalendar 转发(_F)..."
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
-msgid "New _Meeting..."
-msgstr "新建会议(_M)..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
msgid "Create a new meeting"
msgstr "创建一个新的会议"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
-msgid "Mo_ve to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1417
+#, fuzzy
+#| msgid "Mo_ve to Calendar..."
+msgid "Mo_ve to Calendar…"
msgstr "移至日历(_V)..."
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "New _Appointment..."
-msgstr "新建约会(_A)..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
msgid "_Open Appointment"
msgstr "打开约会(_O)"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
-msgid "_Reply"
-msgstr "回复(_R)"
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
-msgid "_Schedule Meeting..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1459
+#, fuzzy
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule Meeting…"
msgstr "调度会议(_S)..."
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
msgid "Converts an appointment to a meeting"
msgstr "转换约会为会议"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
-msgid "Conv_ert to Appointment..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1466
+#, fuzzy
+#| msgid "Conv_ert to Appointment..."
+msgid "Conv_ert to Appointment…"
msgstr "转换到约会(_E)..."
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
msgid "Converts a meeting to an appointment"
msgstr "转换会议为约会"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
msgid "Quit"
msgstr "退出"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
msgid "Day"
msgstr "天"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
msgid "Show one day"
msgstr "显示一天"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
msgid "List"
msgstr "列表"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
msgid "Show as list"
msgstr "显示为列表"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
msgid "Month"
msgstr "月"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
msgid "Show one month"
msgstr "显示一个月"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
msgid "Week"
msgstr "周"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
msgid "Show one week"
msgstr "显示一周"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
msgid "Show one work week"
msgstr "显示一个工作周"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
msgid "Active Appointments"
msgstr "活动约会"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1631
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
#, fuzzy
#| msgid "Next 7 Days' Appointments"
msgid "Next 7 Days’ Appointments"
msgstr "下一周的约会"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
msgid "Occurs Less Than 5 Times"
msgstr "发生不到 5 次"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1669
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:789
-#: ../src/modules/calendar/e-task-shell-view-actions.c:990
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:814
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
msgid "Description contains"
msgstr "描述含有"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1676
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:796
-#: ../src/modules/calendar/e-task-shell-view-actions.c:997
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:821
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1036
msgid "Summary contains"
msgstr "概要含有"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1700
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:806
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
-msgid "Print..."
-msgstr "打印..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:831
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:845
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1060
+#, fuzzy
+#| msgid "Print"
+msgid "Print…"
+msgstr "打印"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
msgid "Print this calendar"
msgstr "打印此日历"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
msgid "Preview the calendar to be printed"
msgstr "预览将要打印的日历"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1717
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:837
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
-msgid "_Save as iCalendar..."
-msgstr "保存为 iCalendar(_S)..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:862
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1077
+msgid "_Save as iCalendar…"
+msgstr "保存为 iCalendar(_S)…"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
msgid "Go To"
msgstr "转到"
#. Translators: Default filename part saving a memo to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:494
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:202
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:508
msgid "memo"
msgstr "备忘"
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:245
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:661
msgid "New _Memo"
msgstr "新建备忘(_M)"
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:247
#: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:668
msgid "_Open Memo"
msgstr "打开备忘(_O)"
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
msgid "View the selected memo"
msgstr "查看选中的备忘"
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
-#: ../src/modules/calendar/e-task-shell-view-actions.c:794
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:815
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:822
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
msgid "Print the selected memo"
msgstr "打印选中的备忘"
-#: ../src/modules/calendar/e-cal-shell-view-private.c:811
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1019
msgid "Searching next matching event"
msgstr "正在搜索下一个匹配的事件"
-#: ../src/modules/calendar/e-cal-shell-view-private.c:812
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1020
msgid "Searching previous matching event"
msgstr "正在搜索上一个匹配的事件"
-#: ../src/modules/calendar/e-cal-shell-view-private.c:833
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1041
#, 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:837
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1045
#, 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:860
+#: ../src/modules/calendar/e-cal-shell-view-private.c:1068
msgid "Cannot search with no active calendar"
msgstr "无活动日历，无法搜索"
@@ -21719,58 +23829,58 @@ msgstr "无活动日历，无法搜索"
#. * no summary is filed, the '.ics' extension is concatenated to it.
#. Translators: Default filename part saving a task to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
-#: ../src/modules/calendar/e-task-shell-view-actions.c:613
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:627
msgid "task"
msgstr "任务"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:675
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:311
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
-#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../src/modules/calendar/e-task-shell-view-actions.c:768
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
msgid "Mark selected tasks as complete"
msgstr "把选中任务标记为完成"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:332
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../src/modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
msgid "Mark selected tasks as incomplete"
msgstr "把选中任务标记为未完成"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../src/modules/calendar/e-task-shell-view-actions.c:780
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:341
#: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
msgid "Create a new task"
msgstr "创建新任务"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../src/modules/calendar/e-task-shell-view-actions.c:787
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../src/modules/calendar/e-task-shell-view-actions.c:808
msgid "_Open Task"
msgstr "打开任务(_O)"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../src/modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
msgid "View the selected task"
msgstr "查看选中的任务"
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1023
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1062
msgid "Print the selected task"
msgstr "打印选中的任务"
@@ -21794,107 +23904,111 @@ msgid "Memo Li_st"
msgstr "备忘录(_S)"
#: ../src/modules/calendar/e-memo-shell-backend.c:96
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
msgid "Create a new memo list"
msgstr "创建新备忘录"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:194
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:209
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:196
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:211
msgid "Print Memos"
msgstr "打印备忘"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
-msgid "Memo List Properties"
-msgstr "备忘录属性"
-
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
msgid "_Delete Memo"
msgstr "删除备忘(_D)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
-msgid "_Find in Memo..."
-msgstr "在备忘中查找(_F)..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+msgid "_Find in Memo…"
+msgstr "在备忘中查找(_F)…"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:565
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
msgid "Search for text in the displayed memo"
msgstr "在显示备忘的主体中搜索文本"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
msgid "D_elete Memo List"
msgstr "删除备忘录(_D)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
msgid "Delete the selected memo list"
msgstr "重命名选中备忘录"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
-msgid "_Manage Memo List groups..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+#, fuzzy
+#| msgid "_Manage Memo List groups..."
+msgid "_Manage Memo List groups…"
msgstr "管理留言列表组...(_M)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
msgid "Manage Memo List groups order and visibility"
msgstr "管理备忘录排序及可见性"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
msgid "_New Memo List"
msgstr "新建备忘录(_N)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
msgid "Refresh the selected memo list"
msgstr "重命名选中备忘录"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+#, fuzzy
+#| msgid "Refresh the selected memo list"
+msgid "Re_fresh list of account memo lists"
+msgstr "重命名选中备忘录"
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
msgid "Rename the selected memo list"
msgstr "重命名选中备忘录"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
msgid "Show _Only This Memo List"
msgstr "只显示此备忘录(_O)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
msgid "Sho_w All Memo Lists"
msgstr "显示所有备忘录(_W)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:720
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:745
msgid "Memo _Preview"
msgstr "备忘预览(_P)"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
msgid "Show memo preview pane"
msgstr "显示备忘预览面板"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
msgid "Show memo preview below the memo list"
msgstr "在备忘录下方显示备忘预览"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
msgid "Show memo preview alongside the memo list"
msgstr "在备忘录下方显示备忘预览"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
msgid "Print the list of memos"
msgstr "打印备忘录"
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
msgid "Preview the list of memos to be printed"
msgstr "预览要打印的备忘录"
-#: ../src/modules/calendar/e-memo-shell-view.c:217
+#: ../src/modules/calendar/e-memo-shell-view.c:227
msgid "Delete Memos"
msgstr "删除备忘"
-#: ../src/modules/calendar/e-memo-shell-view.c:219
+#: ../src/modules/calendar/e-memo-shell-view.c:229
msgid "Delete Memo"
msgstr "删除备忘"
-#: ../src/modules/calendar/e-memo-shell-view-private.c:367
+#: ../src/modules/calendar/e-memo-shell-view-private.c:361
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../src/modules/calendar/e-memo-shell-view-private.c:371
-#: ../src/modules/calendar/e-task-shell-view-private.c:548
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:577
#, c-format
msgid "%d selected"
msgstr "选中 %d 个"
@@ -21919,20 +24033,16 @@ msgid "Tas_k List"
msgstr "任务列表(_K)"
#: ../src/modules/calendar/e-task-shell-backend.c:94
-#: ../src/modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:218
-#: ../src/modules/calendar/e-task-shell-view-actions.c:233
+#: ../src/modules/calendar/e-task-shell-view-actions.c:220
+#: ../src/modules/calendar/e-task-shell-view-actions.c:235
msgid "Print Tasks"
msgstr "打印任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:274
-msgid "Task List Properties"
-msgstr "任务列表属性"
-
-#: ../src/modules/calendar/e-task-shell-view-actions.c:557
+#: ../src/modules/calendar/e-task-shell-view-actions.c:571
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -21943,509 +24053,619 @@ msgstr ""
"\n"
"确实删除这些任务吗？"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:564
+#: ../src/modules/calendar/e-task-shell-view-actions.c:578
msgid "Do not ask me again"
msgstr "不要再次询问"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:682
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
msgid "_Delete Task"
msgstr "删除任务(_D)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:689
-msgid "_Find in Task..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+#, fuzzy
+#| msgid "_Find in Task..."
+msgid "_Find in Task…"
msgstr "在任务中查找(_F)..."
-#: ../src/modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-task-shell-view-actions.c:705
msgid "Search for text in the displayed task"
msgstr "在显示的任务中搜索文本"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
msgid "D_elete Task List"
msgstr "删除任务列表(_D)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
msgid "Delete the selected task list"
msgstr "重命名选中任务列表"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:717
-msgid "_Manage Task List groups..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+#, fuzzy
+#| msgid "_Manage Task List groups..."
+msgid "_Manage Task List groups…"
msgstr "管理任务列表组...(_M)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:724
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:754
msgid "Refresh the selected task list"
msgstr "更新选中任务列表"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
+#, fuzzy
+#| msgid "Refresh the selected task list"
+msgid "Re_fresh list of account task lists"
+msgstr "更新选中任务列表"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
msgid "Rename the selected task list"
msgstr "重命名选中任务列表"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:752
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
msgid "Sho_w All Task Lists"
msgstr "显示所有任务列表(_W)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:759
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
msgid "Show _Only This Task List"
msgstr "只显示此任务列表(_O)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
msgid "Mar_k as Incomplete"
msgstr "标记为未完成(_K)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
msgid "Delete completed tasks"
msgstr "删除已完成的任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:886
+#: ../src/modules/calendar/e-task-shell-view-actions.c:911
msgid "Task _Preview"
msgstr "任务预览(_P)"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:888
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
msgid "Show task preview pane"
msgstr "显示任务预览面板"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:909
+#: ../src/modules/calendar/e-task-shell-view-actions.c:934
msgid "Show task preview below the task list"
msgstr "在任务列表下方显示任务预览"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:916
+#: ../src/modules/calendar/e-task-shell-view-actions.c:941
msgid "Show task preview alongside the task list"
msgstr "在任务列表下方显示任务预览"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:924
+#: ../src/modules/calendar/e-task-shell-view-actions.c:949
msgid "Active Tasks"
msgstr "活动任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:938
+#: ../src/modules/calendar/e-task-shell-view-actions.c:963
+msgid "Cancelled Tasks"
+msgstr "已取消的任务"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:970
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+#: ../src/modules/calendar/e-task-shell-view-actions.c:977
+msgid "Uncompleted Tasks"
+msgstr "未完成的任务"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
#, fuzzy
#| msgid "Next 7 Days' Tasks"
msgid "Next 7 Days’ Tasks"
msgstr "下一周的任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:952
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:959
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
msgid "Print the list of tasks"
msgstr "打印任务列表"
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
msgid "Preview the list of tasks to be printed"
msgstr "预览要打印的任务列表"
-#: ../src/modules/calendar/e-task-shell-view.c:321
+#: ../src/modules/calendar/e-task-shell-view.c:353
msgid "Delete Tasks"
msgstr "删除任务"
-#: ../src/modules/calendar/e-task-shell-view.c:323
+#: ../src/modules/calendar/e-task-shell-view.c:355
msgid "Delete Task"
msgstr "删除任务"
-#: ../src/modules/calendar/e-task-shell-view-private.c:544
+#: ../src/modules/calendar/e-task-shell-view-private.c:573
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:380
#, fuzzy
#| msgid "Create a _Meeting"
msgid "Convert to M_eeting"
msgstr "创建一个会议(_M)"
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:382
#, fuzzy
#| msgid "%s has replied to a meeting request."
msgid "Convert the message to a meeting request"
msgstr "%s 已回复一个会议请求。"
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:365
#, fuzzy
#| msgid "Compose Message"
msgid "Convert to M_essage"
msgstr "新建消息"
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:367
#, fuzzy
#| msgid "Compose a new mail message"
msgid "Convert to the mail message"
msgstr "撰写一封新信"
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
+#: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
+#, fuzzy
+#| msgid "Last upgraded configuration version"
+msgid "Look up configuration with e-mail domain"
+msgstr "上次升级的配置版本"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+msgid "Looking up IMAP server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:89
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:90
+msgid "Looking up POP3 server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:91
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:92
+msgid "Looking up SMTP server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
+msgid "CalDAV server"
+msgstr "CalDAV 服务器"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:93
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:94
+msgid "Looking up CalDAV server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:118
+msgid "CardDAV server"
+msgstr "CardDAV 服务器"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:95
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:96
+msgid "Looking up CardDAV server…"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
+#, fuzzy
+#| msgid "LDAP Servers"
+msgid "LDAP server"
+msgstr "LDAP 服务器"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:97
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:98
+#, fuzzy
+#| msgid "On LDAP Servers"
+msgid "Looking up LDAP server…"
+msgstr "在 LDAP 服务器上"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:285
+msgid "Look up in SRV records"
+msgstr ""
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:104
+#, fuzzy, c-format
+#| msgid "CalDAV"
+msgid "CalDAV: %s"
+msgstr "CalDAV"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:111
+#, fuzzy, c-format
+#| msgid "vCard for %s"
+msgid "CardDAV: %s"
+msgstr "%s 的 vCard"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:117
+msgid "CalDAV and CardDAV server"
+msgstr "CalDAV 和 CardDAV 服务器"
+
+#: ../src/modules/config-lookup/e-webdav-config-lookup.c:213
+msgid "Look up for a CalDAV/CardDAV server"
+msgstr ""
+
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
msgid "ITIP"
msgstr "ITIP"
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
msgid "Display part as an invitation"
msgstr "以邀请方式显示部分"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:258
+#: ../src/modules/itip-formatter/itip-view.c:264
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:262
+#: ../src/modules/itip-formatter/itip-view.c:268
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:271
+#: ../src/modules/itip-formatter/itip-view.c:277
msgid "Today %l:%M:%S %p"
msgstr "今天%p%l:%M:%S"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:286
+#: ../src/modules/itip-formatter/itip-view.c:292
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:290
+#: ../src/modules/itip-formatter/itip-view.c:296
msgid "Tomorrow %H:%M:%S"
msgstr "明天 %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:295
+#: ../src/modules/itip-formatter/itip-view.c:301
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:299
+#: ../src/modules/itip-formatter/itip-view.c:305
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../src/modules/itip-formatter/itip-view.c:318
+#: ../src/modules/itip-formatter/itip-view.c:324
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:323
+#: ../src/modules/itip-formatter/itip-view.c:329
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:327
+#: ../src/modules/itip-formatter/itip-view.c:333
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:332
+#: ../src/modules/itip-formatter/itip-view.c:338
msgid "%A %l:%M %p"
msgstr "%A%p%l:%M"
#. strftime format of a weekday and a
#. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:336
+#: ../src/modules/itip-formatter/itip-view.c:342
msgid "%A %l:%M:%S %p"
msgstr "%A%p%l:%M:%S"
#. strftime format of a weekday and a date
#. * without a year.
-#: ../src/modules/itip-formatter/itip-view.c:345
+#: ../src/modules/itip-formatter/itip-view.c:353
msgid "%A, %B %e"
msgstr "%-m月%-d日%A"
#. strftime format of a weekday, a date
#. * without a year and a time,
#. * in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:351
+#: ../src/modules/itip-formatter/itip-view.c:359
msgid "%A, %B %e %H:%M"
msgstr "%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date without a year
#. * and a time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:355
+#: ../src/modules/itip-formatter/itip-view.c:363
msgid "%A, %B %e %H:%M:%S"
msgstr "%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. * and a time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:360
+#: ../src/modules/itip-formatter/itip-view.c:368
msgid "%A, %B %e %l:%M %p"
msgstr "%-m月%-d日%A%p%l:%M"
#. strftime format of a weekday, a date without a year
#. * and a time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:364
+#: ../src/modules/itip-formatter/itip-view.c:372
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%-m月%-d日%A%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../src/modules/itip-formatter/itip-view.c:370
+#: ../src/modules/itip-formatter/itip-view.c:380
msgid "%A, %B %e, %Y"
msgstr "%Y年%-m月%-d日%A"
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:375
+#: ../src/modules/itip-formatter/itip-view.c:385
msgid "%A, %B %e, %Y %H:%M"
msgstr "%Y年%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:379
+#: ../src/modules/itip-formatter/itip-view.c:389
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%Y年%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format, without seconds.
-#: ../src/modules/itip-formatter/itip-view.c:384
+#: ../src/modules/itip-formatter/itip-view.c:394
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M"
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format.
-#: ../src/modules/itip-formatter/itip-view.c:388
+#: ../src/modules/itip-formatter/itip-view.c:398
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../src/modules/itip-formatter/itip-view.c:426
-#: ../src/modules/itip-formatter/itip-view.c:427
-#: ../src/modules/itip-formatter/itip-view.c:516
-#: ../src/modules/itip-formatter/itip-view.c:517
-#: ../src/modules/itip-formatter/itip-view.c:606
+#. Translators: The first '%s' is replaced with an abbreviated date/time of an appointment start or end,
like "Tomorrow" or "Tomorrow 10:30";
+#. the second '%s' is replaced with the actual date, to know what the 'Tomorrow' means. What the date looks
like depends on the user settings.
+#. Example: 'Tomorrow 10:30 (20.2.2020)'
+#: ../src/modules/itip-formatter/itip-view.c:425
+#, fuzzy, c-format
+#| msgctxt "language"
+#| msgid "%s (%s)"
+msgctxt "cal-itip"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../src/modules/itip-formatter/itip-view.c:463
+#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:553
+#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:643
msgid "An unknown person"
msgstr "未知的人"
-#: ../src/modules/itip-formatter/itip-view.c:431
-#: ../src/modules/itip-formatter/itip-view.c:521
-#: ../src/modules/itip-formatter/itip-view.c:610
+#: ../src/modules/itip-formatter/itip-view.c:468
+#: ../src/modules/itip-formatter/itip-view.c:558
+#: ../src/modules/itip-formatter/itip-view.c:647
#, c-format
msgid "Please respond on behalf of %s"
msgstr "请以 %s 的身份回应"
-#: ../src/modules/itip-formatter/itip-view.c:433
-#: ../src/modules/itip-formatter/itip-view.c:523
-#: ../src/modules/itip-formatter/itip-view.c:612
+#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:649
#, c-format
msgid "Received on behalf of %s"
msgstr "以 %s 的身份接收"
-#: ../src/modules/itip-formatter/itip-view.c:438
+#: ../src/modules/itip-formatter/itip-view.c:475
#, c-format
msgid "%s through %s has published the following meeting information:"
msgstr "%s 通过 %s 发布了会议信息："
-#: ../src/modules/itip-formatter/itip-view.c:440
+#: ../src/modules/itip-formatter/itip-view.c:477
#, c-format
msgid "%s has published the following meeting information:"
msgstr "%s 发布了会议信息："
-#: ../src/modules/itip-formatter/itip-view.c:445
+#: ../src/modules/itip-formatter/itip-view.c:482
#, c-format
msgid "%s has delegated the following meeting to you:"
msgstr "%s 为您代理了下列会议："
-#: ../src/modules/itip-formatter/itip-view.c:448
+#: ../src/modules/itip-formatter/itip-view.c:485
#, c-format
msgid "%s through %s requests your presence at the following meeting:"
msgstr "%s 通过 %s 请求您参加下列会议："
-#: ../src/modules/itip-formatter/itip-view.c:450
+#: ../src/modules/itip-formatter/itip-view.c:487
#, c-format
msgid "%s requests your presence at the following meeting:"
msgstr "%s 请求您参加下列会议："
-#: ../src/modules/itip-formatter/itip-view.c:456
+#: ../src/modules/itip-formatter/itip-view.c:493
#, c-format
msgid "%s through %s wishes to add to an existing meeting:"
msgstr "%s 通过 %s 希望加入到已有的会议："
-#: ../src/modules/itip-formatter/itip-view.c:458
+#: ../src/modules/itip-formatter/itip-view.c:495
#, c-format
msgid "%s wishes to add to an existing meeting:"
msgstr "%s 希望加入到已有的会议："
-#: ../src/modules/itip-formatter/itip-view.c:462
+#: ../src/modules/itip-formatter/itip-view.c:499
#, c-format
msgid ""
"%s through %s wishes to receive the latest information for the following "
"meeting:"
msgstr "%s 通过 %s 希望接收到下列会议的最新信息："
-#: ../src/modules/itip-formatter/itip-view.c:464
+#: ../src/modules/itip-formatter/itip-view.c:501
#, c-format
msgid "%s wishes to receive the latest information for the following meeting:"
msgstr "%s 希望接收到下列会议的最新信息："
-#: ../src/modules/itip-formatter/itip-view.c:468
+#: ../src/modules/itip-formatter/itip-view.c:505
#, c-format
msgid "%s through %s has sent back the following meeting response:"
msgstr "%s 通过 %s 发回了下列会议请求的响应："
-#: ../src/modules/itip-formatter/itip-view.c:470
+#: ../src/modules/itip-formatter/itip-view.c:507
#, c-format
msgid "%s has sent back the following meeting response:"
msgstr "%s 发回了下列会议请求的响应："
-#: ../src/modules/itip-formatter/itip-view.c:474
+#: ../src/modules/itip-formatter/itip-view.c:511
#, c-format
msgid "%s through %s has cancelled the following meeting:"
msgstr "%s 通过 %s 取消了下列会议："
-#: ../src/modules/itip-formatter/itip-view.c:476
+#: ../src/modules/itip-formatter/itip-view.c:513
#, c-format
msgid "%s has cancelled the following meeting:"
msgstr "%s 已取消下列会议："
-#: ../src/modules/itip-formatter/itip-view.c:480
+#: ../src/modules/itip-formatter/itip-view.c:517
#, c-format
msgid "%s through %s has proposed the following meeting changes."
msgstr "%s 通过 %s 提议了下列会议变更。"
-#: ../src/modules/itip-formatter/itip-view.c:482
+#: ../src/modules/itip-formatter/itip-view.c:519
#, c-format
msgid "%s has proposed the following meeting changes:"
msgstr "%s 已提议了下列会议变更："
-#: ../src/modules/itip-formatter/itip-view.c:486
+#: ../src/modules/itip-formatter/itip-view.c:523
#, c-format
msgid "%s through %s has declined the following meeting changes:"
msgstr "%s 通过 %s 拒绝了下列会议变更："
-#: ../src/modules/itip-formatter/itip-view.c:488
+#: ../src/modules/itip-formatter/itip-view.c:525
#, c-format
msgid "%s has declined the following meeting changes:"
msgstr "%s 拒绝了下列会议变更："
-#: ../src/modules/itip-formatter/itip-view.c:528
+#: ../src/modules/itip-formatter/itip-view.c:565
#, c-format
msgid "%s through %s has published the following task:"
msgstr "%s 通过 %s 发布了下列任务："
-#: ../src/modules/itip-formatter/itip-view.c:530
+#: ../src/modules/itip-formatter/itip-view.c:567
#, c-format
msgid "%s has published the following task:"
msgstr "%s 发布了下列任务："
-#: ../src/modules/itip-formatter/itip-view.c:535
+#: ../src/modules/itip-formatter/itip-view.c:572
#, c-format
msgid "%s requests the assignment of %s to the following task:"
msgstr "%s 请求给 %s 分配下列任务："
-#: ../src/modules/itip-formatter/itip-view.c:538
+#: ../src/modules/itip-formatter/itip-view.c:575
#, c-format
msgid "%s through %s has assigned you a task:"
msgstr "%s 通过 %s 为您分配了下列任务："
-#: ../src/modules/itip-formatter/itip-view.c:540
+#: ../src/modules/itip-formatter/itip-view.c:577
#, c-format
msgid "%s has assigned you a task:"
msgstr "%s 为您分配了一个任务："
-#: ../src/modules/itip-formatter/itip-view.c:546
+#: ../src/modules/itip-formatter/itip-view.c:583
#, c-format
msgid "%s through %s wishes to add to an existing task:"
msgstr "%s 通过 %s 希望加入到已有的任务："
-#: ../src/modules/itip-formatter/itip-view.c:548
+#: ../src/modules/itip-formatter/itip-view.c:585
#, c-format
msgid "%s wishes to add to an existing task:"
msgstr "%s 希望加入到已存在的任务："
-#: ../src/modules/itip-formatter/itip-view.c:552
+#: ../src/modules/itip-formatter/itip-view.c:589
#, c-format
msgid ""
"%s through %s wishes to receive the latest information for the following "
"assigned task:"
msgstr "%s 通过 %s 想要收到所分配的下列任务的最新信息："
-#: ../src/modules/itip-formatter/itip-view.c:554
+#: ../src/modules/itip-formatter/itip-view.c:591
#, c-format
msgid ""
"%s wishes to receive the latest information for the following assigned task:"
msgstr "%s 想要收到所分配的下列任务的最新信息："
-#: ../src/modules/itip-formatter/itip-view.c:558
+#: ../src/modules/itip-formatter/itip-view.c:595
#, c-format
msgid "%s through %s has sent back the following assigned task response:"
msgstr "%s 通过 %s 发回了下列分配任务的回应："
-#: ../src/modules/itip-formatter/itip-view.c:560
+#: ../src/modules/itip-formatter/itip-view.c:597
#, c-format
msgid "%s has sent back the following assigned task response:"
msgstr "%s 发回了下列分配任务的回应："
-#: ../src/modules/itip-formatter/itip-view.c:564
+#: ../src/modules/itip-formatter/itip-view.c:601
#, c-format
msgid "%s through %s has cancelled the following assigned task:"
msgstr "%s 通过 %s 取消了下列已分配的任务："
-#: ../src/modules/itip-formatter/itip-view.c:566
+#: ../src/modules/itip-formatter/itip-view.c:603
#, c-format
msgid "%s has cancelled the following assigned task:"
msgstr "%s 取消下列已分配的任务："
-#: ../src/modules/itip-formatter/itip-view.c:570
+#: ../src/modules/itip-formatter/itip-view.c:607
#, c-format
msgid "%s through %s has proposed the following task assignment changes:"
msgstr "%s 通过 %s 提议了下列任务分配变更："
-#: ../src/modules/itip-formatter/itip-view.c:572
+#: ../src/modules/itip-formatter/itip-view.c:609
#, c-format
msgid "%s has proposed the following task assignment changes:"
msgstr "%s 提议了下列任务分配变更："
-#: ../src/modules/itip-formatter/itip-view.c:576
+#: ../src/modules/itip-formatter/itip-view.c:613
#, c-format
msgid "%s through %s has declined the following assigned task:"
msgstr "%s 通过 %s 拒绝了下列任务分配："
-#: ../src/modules/itip-formatter/itip-view.c:578
+#: ../src/modules/itip-formatter/itip-view.c:615
#, c-format
msgid "%s has declined the following assigned task:"
msgstr "%s 拒绝了分配的下列任务："
-#: ../src/modules/itip-formatter/itip-view.c:617
+#: ../src/modules/itip-formatter/itip-view.c:654
#, c-format
msgid "%s through %s has published the following memo:"
msgstr "%s 通过 %s 发布了下列备忘："
-#: ../src/modules/itip-formatter/itip-view.c:619
+#: ../src/modules/itip-formatter/itip-view.c:656
#, c-format
msgid "%s has published the following memo:"
msgstr "%s 发布了下列备忘："
-#: ../src/modules/itip-formatter/itip-view.c:624
+#: ../src/modules/itip-formatter/itip-view.c:661
#, c-format
msgid "%s through %s wishes to add to an existing memo:"
msgstr "%s 通过 %s 希望加入到已有的备忘："
-#: ../src/modules/itip-formatter/itip-view.c:626
+#: ../src/modules/itip-formatter/itip-view.c:663
#, c-format
msgid "%s wishes to add to an existing memo:"
msgstr "%s 希望加入到已有的备忘中："
-#: ../src/modules/itip-formatter/itip-view.c:630
+#: ../src/modules/itip-formatter/itip-view.c:667
#, c-format
msgid "%s through %s has cancelled the following shared memo:"
msgstr "%s 通过 %s 取消了下列共享备忘："
-#: ../src/modules/itip-formatter/itip-view.c:632
+#: ../src/modules/itip-formatter/itip-view.c:669
#, c-format
msgid "%s has cancelled the following shared memo:"
msgstr "%s 取消了下列共享备忘："
@@ -22459,7 +24679,7 @@ msgid "Start day:"
msgstr "开始日期："
#: ../src/modules/itip-formatter/itip-view.c:863
-#: ../src/modules/itip-formatter/itip-view.c:1679
+#: ../src/modules/itip-formatter/itip-view.c:1701
msgid "Start time:"
msgstr "开始时间："
@@ -22468,108 +24688,120 @@ msgid "End day:"
msgstr "结束日期："
#: ../src/modules/itip-formatter/itip-view.c:872
-#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:1702
msgid "End time:"
msgstr "结束时间："
-#: ../src/modules/itip-formatter/itip-view.c:1210
+#: ../src/modules/itip-formatter/itip-view.c:1248
msgid "Ope_n Calendar"
msgstr "打开日历(_N)"
-#: ../src/modules/itip-formatter/itip-view.c:1213
+#: ../src/modules/itip-formatter/itip-view.c:1251
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../src/modules/itip-formatter/itip-view.c:1216
+#: ../src/modules/itip-formatter/itip-view.c:1254
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../src/modules/itip-formatter/itip-view.c:1219
+#: ../src/modules/itip-formatter/itip-view.c:1257
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../src/modules/itip-formatter/itip-view.c:1222
+#: ../src/modules/itip-formatter/itip-view.c:1260
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../src/modules/itip-formatter/itip-view.c:1225
+#: ../src/modules/itip-formatter/itip-view.c:1263
msgid "Acce_pt all"
msgstr "全部接受(_P)"
-#: ../src/modules/itip-formatter/itip-view.c:1228
+#: ../src/modules/itip-formatter/itip-view.c:1266
msgid "Acce_pt"
msgstr "接受(_P)"
-#: ../src/modules/itip-formatter/itip-view.c:1231
+#: ../src/modules/itip-formatter/itip-view.c:1269
msgid "Send _Information"
msgstr "发送信息(_I)"
-#: ../src/modules/itip-formatter/itip-view.c:1234
+#: ../src/modules/itip-formatter/itip-view.c:1272
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../src/modules/itip-formatter/itip-view.c:1237
-#: ../src/smime/gui/certificate-manager.c:1677
+#: ../src/modules/itip-formatter/itip-view.c:1275
+#: ../src/smime/gui/certificate-manager.c:1661
msgid "_Update"
msgstr "更新(_U)"
-#: ../src/modules/itip-formatter/itip-view.c:1682
-#: ../src/modules/itip-formatter/itip-view.c:1730
-#: ../src/modules/itip-formatter/itip-view.c:1801
+#: ../src/modules/itip-formatter/itip-view.c:1704
+#: ../src/modules/itip-formatter/itip-view.c:1752
+#: ../src/modules/itip-formatter/itip-view.c:1823
msgid "Comment:"
msgstr "注释："
#. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1718
+#: ../src/modules/itip-formatter/itip-view.c:1740
msgid "Send reply to sender"
msgstr "回复发件人"
#. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1733
+#: ../src/modules/itip-formatter/itip-view.c:1755
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
#. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1758
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../src/modules/itip-formatter/itip-view.c:1737
+#: ../src/modules/itip-formatter/itip-view.c:1759
msgid "Show time as _free"
msgstr "将时间显示为空闲(_F)"
-#: ../src/modules/itip-formatter/itip-view.c:1738
+#: ../src/modules/itip-formatter/itip-view.c:1760
msgid "_Preserve my reminder"
msgstr "保留我的提醒(_P)"
-#: ../src/modules/itip-formatter/itip-view.c:1739
+#: ../src/modules/itip-formatter/itip-view.c:1761
msgid "_Inherit reminder"
msgstr "继承提醒(_I)"
-#: ../src/modules/itip-formatter/itip-view.c:2048
+#: ../src/modules/itip-formatter/itip-view.c:1975
msgid "_Tasks:"
msgstr "任务(_T)："
-#: ../src/modules/itip-formatter/itip-view.c:2051
+#: ../src/modules/itip-formatter/itip-view.c:1978
msgid "_Memos:"
msgstr "备忘(_M)："
-#: ../src/modules/itip-formatter/itip-view.c:2964
+#: ../src/modules/itip-formatter/itip-view.c:2974
msgid "Sa_ve"
msgstr "保存(_V)"
-#: ../src/modules/itip-formatter/itip-view.c:3486
-#: ../src/modules/itip-formatter/itip-view.c:4955
+#: ../src/modules/itip-formatter/itip-view.c:3535
+#: ../src/modules/itip-formatter/itip-view.c:5287
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../src/modules/itip-formatter/itip-view.c:3658
+#: ../src/modules/itip-formatter/itip-view.c:3745
#, fuzzy, c-format
#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../src/modules/itip-formatter/itip-view.c:3664
+#: ../src/modules/itip-formatter/itip-view.c:3752
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "A task “%s” in the task list “%s” conflicts with this task"
+msgstr "日历“%s”中的一个约会与此会议冲突"
+
+#: ../src/modules/itip-formatter/itip-view.c:3759
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
+msgstr "日历“%s”中的一个约会与此会议冲突"
+
+#: ../src/modules/itip-formatter/itip-view.c:3770
#, fuzzy, c-format
#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgid ""
@@ -22578,197 +24810,309 @@ msgid_plural ""
"The calendar “%s” contains %d appointments which conflict with this meeting"
msgstr[0] "日历“%s”中的一个约会与此会议冲突"
-#: ../src/modules/itip-formatter/itip-view.c:3697
+#: ../src/modules/itip-formatter/itip-view.c:3779
#, fuzzy, c-format
-#| msgid "Found the appointment in the calendar '%s'"
-msgid "Found the appointment in the calendar “%s”"
-msgstr "在日历“%s”中找到了约会"
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "The task list “%s” contains a task which conflicts with this task"
+msgid_plural ""
+"The task list “%s” contains %d tasks which conflict with this task"
+msgstr[0] "日历“%s”中的一个约会与此会议冲突"
+
+#: ../src/modules/itip-formatter/itip-view.c:3788
+#, fuzzy, c-format
+#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
+msgid "The memo list “%s” contains a memo which conflicts with this memo"
+msgid_plural ""
+"The memo list “%s” contains %d memos which conflict with this memo"
+msgstr[0] "日历“%s”中的一个约会与此会议冲突"
+
+#: ../src/modules/itip-formatter/itip-view.c:3826
+#, fuzzy, c-format
+#| msgid "Found the appointment in the calendar '%s'"
+msgid "Found the appointment in the calendar “%s”"
+msgstr "在日历“%s”中找到了约会"
#: ../src/modules/itip-formatter/itip-view.c:3831
+#, fuzzy, c-format
+#| msgid "Moving a task into the task list '%s'"
+msgid "Found the task in the task list “%s”"
+msgstr "正在将任务移至任务列表“%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:3836
+#, fuzzy, c-format
+#| msgid "Moving a memo into the memo list '%s'"
+msgid "Found the memo in the memo list “%s”"
+msgstr "正在将备忘移至备忘录“%s”"
+
+#: ../src/modules/itip-formatter/itip-view.c:3847
+#, fuzzy
+#| msgid "The meeting is invalid and cannot be updated"
+msgid "This meeting invitation is obsolete. It had been updated."
+msgstr "会议无效，无法更新"
+
+#: ../src/modules/itip-formatter/itip-view.c:3989
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../src/modules/itip-formatter/itip-view.c:3839
+#: ../src/modules/itip-formatter/itip-view.c:3997
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../src/modules/itip-formatter/itip-view.c:3844
+#: ../src/modules/itip-formatter/itip-view.c:4002
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../src/modules/itip-formatter/itip-view.c:3849
+#: ../src/modules/itip-formatter/itip-view.c:4007
msgid "Unable to find this memo in any memo list"
msgstr "无法在任何备忘录中找到此备忘"
-#: ../src/modules/itip-formatter/itip-view.c:4190
-msgid "Opening the calendar. Please wait..."
-msgstr "正在打开日历，请稍候..."
-
-#: ../src/modules/itip-formatter/itip-view.c:4195
+#: ../src/modules/itip-formatter/itip-view.c:4301
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../src/modules/itip-formatter/itip-view.c:4594
+#: ../src/modules/itip-formatter/itip-view.c:4305
+#, fuzzy
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this task"
+msgstr "搜索此约会的已有版本"
+
+#: ../src/modules/itip-formatter/itip-view.c:4309
+#, fuzzy
+#| msgid "Searching for an existing version of this appointment"
+msgid "Searching for an existing version of this memo"
+msgstr "搜索此约会的已有版本"
+
+#: ../src/modules/itip-formatter/itip-view.c:4367
+#, fuzzy
+#| msgid "Opening the calendar. Please wait..."
+msgid "Opening the calendar. Please wait…"
+msgstr "正在打开日历，请稍候..."
+
+#: ../src/modules/itip-formatter/itip-view.c:4783
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar '%s'. %s"
+msgid "Unable to send item to calendar “%s”. %s"
+msgstr "无法将项目发送到日历“%s”。%s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4791
+#, fuzzy, c-format
+#| msgid "Unable to send item to calendar '%s'. %s"
+msgid "Unable to send item to task list “%s”. %s"
+msgstr "无法将项目发送到日历“%s”。%s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4799
#, fuzzy, c-format
#| msgid "Unable to send item to calendar '%s'. %s"
-msgid "Unable to send item to calendar “%s”. %s"
+msgid "Unable to send item to memo list “%s”. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../src/modules/itip-formatter/itip-view.c:4609
+#: ../src/modules/itip-formatter/itip-view.c:4819
#, fuzzy, c-format
#| msgid "Sent to calendar '%s' as accepted"
msgid "Sent to calendar “%s” as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../src/modules/itip-formatter/itip-view.c:4614
+#: ../src/modules/itip-formatter/itip-view.c:4824
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as accepted"
+msgid "Sent to task list “%s” as accepted"
+msgstr "将日历“%s”发送为已接受"
+
+#: ../src/modules/itip-formatter/itip-view.c:4829
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as accepted"
+msgid "Sent to memo list “%s” as accepted"
+msgstr "将日历“%s”发送为已接受"
+
+#: ../src/modules/itip-formatter/itip-view.c:4839
#, fuzzy, c-format
#| msgid "Sent to calendar '%s' as tentative"
msgid "Sent to calendar “%s” as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../src/modules/itip-formatter/itip-view.c:4620
+#: ../src/modules/itip-formatter/itip-view.c:4844
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as tentative"
+msgid "Sent to task list “%s” as tentative"
+msgstr "将日历“%s”发送为待定"
+
+#: ../src/modules/itip-formatter/itip-view.c:4849
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as tentative"
+msgid "Sent to memo list “%s” as tentative"
+msgstr "将日历“%s”发送为待定"
+
+#: ../src/modules/itip-formatter/itip-view.c:4859
#, fuzzy, c-format
#| msgid "Sent to calendar '%s' as declined"
msgid "Sent to calendar “%s” as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../src/modules/itip-formatter/itip-view.c:4626
+#: ../src/modules/itip-formatter/itip-view.c:4864
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as declined"
+msgid "Sent to task list “%s” as declined"
+msgstr "将日历“%s”发送为已拒绝"
+
+#: ../src/modules/itip-formatter/itip-view.c:4869
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as declined"
+msgid "Sent to memo list “%s” as declined"
+msgstr "将日历“%s”发送为已拒绝"
+
+#: ../src/modules/itip-formatter/itip-view.c:4879
#, fuzzy, c-format
#| msgid "Sent to calendar '%s' as cancelled"
msgid "Sent to calendar “%s” as cancelled"
msgstr "将“%s”作为已取消日历发送"
-#: ../src/modules/itip-formatter/itip-view.c:4646
-#: ../src/modules/itip-formatter/itip-view.c:5092
-#: ../src/modules/itip-formatter/itip-view.c:5195
-msgid "Saving changes to the calendar. Please wait..."
+#: ../src/modules/itip-formatter/itip-view.c:4884
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to task list “%s” as cancelled"
+msgstr "将“%s”作为已取消日历发送"
+
+#: ../src/modules/itip-formatter/itip-view.c:4889
+#, fuzzy, c-format
+#| msgid "Sent to calendar '%s' as cancelled"
+msgid "Sent to memo list “%s” as cancelled"
+msgstr "将“%s”作为已取消日历发送"
+
+#: ../src/modules/itip-formatter/itip-view.c:4907
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the calendar. Please wait…"
+msgstr "正在保存日历更改，请稍候..."
+
+#: ../src/modules/itip-formatter/itip-view.c:4910
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the task list. Please wait…"
+msgstr "正在保存日历更改，请稍候..."
+
+#: ../src/modules/itip-formatter/itip-view.c:4913
+#, fuzzy
+#| msgid "Saving changes to the calendar. Please wait..."
+msgid "Saving changes to the memo list. Please wait…"
msgstr "正在保存日历更改，请稍候..."
-#: ../src/modules/itip-formatter/itip-view.c:4687
+#: ../src/modules/itip-formatter/itip-view.c:5004
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../src/modules/itip-formatter/itip-view.c:4879
+#: ../src/modules/itip-formatter/itip-view.c:5212
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../src/modules/itip-formatter/itip-view.c:4896
-msgid "Sent a cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5229
+#, fuzzy
+#| msgid "Sent a cancelation notice to the delegate"
+msgid "Sent a cancellation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../src/modules/itip-formatter/itip-view.c:4900
-msgid "Could not send the cancelation notice to the delegate"
+#: ../src/modules/itip-formatter/itip-view.c:5233
+#, fuzzy
+#| msgid "Could not send the cancelation notice to the delegate"
+msgid "Could not send the cancellation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../src/modules/itip-formatter/itip-view.c:4947
+#: ../src/modules/itip-formatter/itip-view.c:5279
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../src/modules/itip-formatter/itip-view.c:4982
+#: ../src/modules/itip-formatter/itip-view.c:5312
msgid "The meeting is invalid and cannot be updated"
msgstr "会议无效，无法更新"
-#: ../src/modules/itip-formatter/itip-view.c:5057
+#: ../src/modules/itip-formatter/itip-view.c:5397
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新，原因是状态无效"
-#: ../src/modules/itip-formatter/itip-view.c:5128
-#: ../src/modules/itip-formatter/itip-view.c:5166
+#: ../src/modules/itip-formatter/itip-view.c:5472
+#: ../src/modules/itip-formatter/itip-view.c:5510
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../src/modules/itip-formatter/itip-view.c:5227
+#: ../src/modules/itip-formatter/itip-view.c:5571
msgid "Meeting information sent"
msgstr "会议信息已发送"
-#: ../src/modules/itip-formatter/itip-view.c:5232
+#: ../src/modules/itip-formatter/itip-view.c:5576
msgid "Task information sent"
msgstr "任务信息已发送"
-#: ../src/modules/itip-formatter/itip-view.c:5237
+#: ../src/modules/itip-formatter/itip-view.c:5581
msgid "Memo information sent"
msgstr "备忘信息已发送"
-#: ../src/modules/itip-formatter/itip-view.c:5248
+#: ../src/modules/itip-formatter/itip-view.c:5592
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "无法发送会议信息，会议不存在"
-#: ../src/modules/itip-formatter/itip-view.c:5253
+#: ../src/modules/itip-formatter/itip-view.c:5597
msgid "Unable to send task information, the task does not exist"
msgstr "无法发送任务信息，任务不存在"
-#: ../src/modules/itip-formatter/itip-view.c:5258
+#: ../src/modules/itip-formatter/itip-view.c:5602
msgid "Unable to send memo information, the memo does not exist"
msgstr "无法发送备忘信息，备忘不存在"
#. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5323
+#: ../src/modules/itip-formatter/itip-view.c:5647
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../src/modules/itip-formatter/itip-view.c:5328
+#: ../src/modules/itip-formatter/itip-view.c:5652
msgid "Save Calendar"
msgstr "保存日历"
-#: ../src/modules/itip-formatter/itip-view.c:5376
-#: ../src/modules/itip-formatter/itip-view.c:5389
+#: ../src/modules/itip-formatter/itip-view.c:5700
+#: ../src/modules/itip-formatter/itip-view.c:5713
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../src/modules/itip-formatter/itip-view.c:5377
-#: ../src/modules/itip-formatter/itip-view.c:5390
+#: ../src/modules/itip-formatter/itip-view.c:5701
+#: ../src/modules/itip-formatter/itip-view.c:5714
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信息声明其包含日历，但日历不是有效的 iCalendar。"
-#: ../src/modules/itip-formatter/itip-view.c:5432
-#: ../src/modules/itip-formatter/itip-view.c:5462
-#: ../src/modules/itip-formatter/itip-view.c:5565
+#: ../src/modules/itip-formatter/itip-view.c:5796
+#: ../src/modules/itip-formatter/itip-view.c:5880
+#: ../src/modules/itip-formatter/itip-view.c:5984
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../src/modules/itip-formatter/itip-view.c:5433
-#: ../src/modules/itip-formatter/itip-view.c:5463
-#: ../src/modules/itip-formatter/itip-view.c:5566
+#: ../src/modules/itip-formatter/itip-view.c:5797
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5985
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
msgstr "信息的确包含日历，但是日历不包含事件、任务或忙/闲信息"
-#: ../src/modules/itip-formatter/itip-view.c:5478
+#: ../src/modules/itip-formatter/itip-view.c:5890
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../src/modules/itip-formatter/itip-view.c:5479
+#: ../src/modules/itip-formatter/itip-view.c:5891
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目，应该保存文件并导入日历"
-#: ../src/modules/itip-formatter/itip-view.c:5997
+#: ../src/modules/itip-formatter/itip-view.c:6478
msgctxt "cal-itip"
msgid "None"
msgstr "无"
-#: ../src/modules/itip-formatter/itip-view.c:6013
+#: ../src/modules/itip-formatter/itip-view.c:6496
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../src/modules/itip-formatter/itip-view.c:6179
-msgid "This meeting recurs"
-msgstr "此会议重现"
-
-#: ../src/modules/itip-formatter/itip-view.c:6182
-msgid "This task recurs"
-msgstr "此任务重现"
-
-#: ../src/modules/itip-formatter/itip-view.c:6185
-msgid "This memo recurs"
-msgstr "此备忘重现"
-
#: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
msgid ""
"This response is not from a current attendee. Add the sender as an attendee?"
@@ -22785,21 +25129,21 @@ msgstr "该会议已被代理"
msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”？"
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:283
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
msgid "Google Features"
msgstr "Google 特性"
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:292
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:310
msgid "Add Google Ca_lendar to this account"
msgstr "添加 Google Ca_lendar 到此帐。"
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:301
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:319
msgid "Add Google Con_tacts to this account"
msgstr "添加 Google Con_tacts 到此帐号"
#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:312
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:330
#, fuzzy
#| msgid "IMAP Headers"
msgctxt "GoggleSummary"
@@ -22808,7 +25152,7 @@ msgstr "IMAP 信头"
#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:315
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:333
#, fuzzy
#| msgid "Calendars to run reminders for"
msgctxt "GoggleSummary"
@@ -22817,7 +25161,7 @@ msgstr "用来运行提醒的日历"
#. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
#. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
-#: ../src/modules/mail-config/e-mail-config-google-summary.c:318
+#: ../src/modules/mail-config/e-mail-config-google-summary.c:336
#, fuzzy, c-format
#| msgid "You may need to enable IMAP access"
msgctxt "GoggleSummary"
@@ -22881,55 +25225,48 @@ msgstr "选择 mbox 池目录"
msgid "Mbox spool directory cannot be empty"
msgstr "Mbox 池目录不能为空"
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
+#: ../src/plugins/mail-notification/mail-notification.c:1220
msgid "Configuration"
msgstr "配置"
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
-msgid "_Server:"
-msgstr "服务器(_S)："
-
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:231
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:186
msgid "_Port:"
msgstr "端口(_P)："
#. do not reference
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:252
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:314
msgid "User_name:"
msgstr "用户名(_N)："
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:266
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:328
msgid "_Forget password"
msgstr "忘记密码(_F)"
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:235
msgid "Encryption _method:"
msgstr "加密方法(_M)："
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:307
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:250
msgid "STARTTLS after connecting"
msgstr "连接后进行 STARTTLS"
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:311
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:254
msgid "TLS on a dedicated port"
msgstr "专用端口上的 TLS"
#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
-#, fuzzy
-#| msgid "_Use custom binary, instead of 'sendmail'"
msgid "_Use custom binary, instead of “sendmail”"
-msgstr "使用自定义二进制程序，而不是“sendmail” (_U)"
+msgstr "使用自定义二进制程序，而不是“sendmail”(_U)"
#: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:79
msgid "_Custom binary:"
@@ -22967,11 +25304,11 @@ msgid "Custom binary cannot be empty"
msgstr "自定义二进制程序不能为空"
#. do not reference
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:207
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:296
msgid "T_ype:"
msgstr "类型(_Y)："
@@ -22983,535 +25320,578 @@ msgstr "Yahoo! 特性"
msgid "Add Yahoo! Ca_lendar and Tasks to this account"
msgstr "添加 Yahoo! 日历和任务到此帐号(_L) "
-#: ../src/modules/mail/e-mail-attachment-handler.c:671
+#: ../src/modules/mail/e-mail-attachment-handler.c:644
#, c-format
msgid "%d attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 个附加的信息"
-#: ../src/modules/mail/e-mail-shell-backend.c:375
+#: ../src/modules/mail/e-mail-shell-backend.c:399
msgctxt "New"
msgid "_Mail Message"
msgstr "信息(_M)"
-#: ../src/modules/mail/e-mail-shell-backend.c:377
+#: ../src/modules/mail/e-mail-shell-backend.c:401
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../src/modules/mail/e-mail-shell-backend.c:385
+#: ../src/modules/mail/e-mail-shell-backend.c:409
msgctxt "New"
msgid "Mail Acco_unt"
msgstr "邮件帐号(_U)"
-#: ../src/modules/mail/e-mail-shell-backend.c:387
+#: ../src/modules/mail/e-mail-shell-backend.c:411
msgid "Create a new mail account"
msgstr "创建新邮件帐号"
-#: ../src/modules/mail/e-mail-shell-backend.c:392
+#: ../src/modules/mail/e-mail-shell-backend.c:416
msgctxt "New"
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../src/modules/mail/e-mail-shell-backend.c:394
+#: ../src/modules/mail/e-mail-shell-backend.c:418
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:709
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:786
msgctxt "NetworkMonitor"
msgid "base"
msgstr "base"
#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:712
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:789
msgctxt "NetworkMonitor"
msgid "netlink"
msgstr "netlink"
#. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
-#. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:715
+#. it to some user-friendly form, or keep it as is.
+#: ../src/modules/mail/e-mail-shell-backend.c:792
msgctxt "NetworkMonitor"
msgid "networkmanager"
msgstr "networkmanager"
-#: ../src/modules/mail/e-mail-shell-backend.c:749
+#: ../src/modules/mail/e-mail-shell-backend.c:822
msgctxt "NetworkMonitor"
msgid "Method to detect _online state:"
msgstr "检测在线状态的方法(_O)："
+#. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
+#: ../src/modules/mail/e-mail-shell-backend.c:833
+#, c-format
+msgctxt "NetworkMonitor"
+msgid "Default (%s)"
+msgstr "默认（%s）"
+
#. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:758
+#: ../src/modules/mail/e-mail-shell-backend.c:837
msgctxt "NetworkMonitor"
msgid "Default"
msgstr "默认"
#. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:772
+#: ../src/modules/mail/e-mail-shell-backend.c:854
msgctxt "NetworkMonitor"
msgid "Always Online"
msgstr "永远在线"
-#: ../src/modules/mail/e-mail-shell-backend.c:832
-msgid "Mail Accounts"
-msgstr "邮件帐号"
-
-#: ../src/modules/mail/e-mail-shell-backend.c:841
+#: ../src/modules/mail/e-mail-shell-backend.c:923
msgid "Mail Preferences"
msgstr "邮件首选项"
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:932
msgid "Composer Preferences"
msgstr "编写器首选项"
-#: ../src/modules/mail/e-mail-shell-backend.c:859
+#: ../src/modules/mail/e-mail-shell-backend.c:941
msgid "Network Preferences"
msgstr "网络首选项"
#. Translators: The first item in the list, to be
#. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1151
+#: ../src/modules/mail/e-mail-shell-backend.c:1302
msgctxt "label"
msgid "None"
msgstr "无"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:734
-msgid "Marking messages as read..."
-msgstr "正在把信息标记为已读..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:853
+msgid "Marking messages as read…"
+msgstr "正在把信息标记为已读……"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1093
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
msgid "Go to Folder"
msgstr "前往文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
msgid "_Select"
msgstr "选择(_S)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
msgid "_Disable Account"
msgstr "禁用帐号(_D)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
msgid "Disable this account"
msgstr "禁用这个帐号"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
msgid "Permanently remove all the deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
+#, fuzzy
+#| msgid "_Junk"
+msgid "Empty _Junk"
+msgstr "垃圾(_J)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
+#, fuzzy
+#| msgid "Permanently remove all the deleted messages from all folders"
+msgid "Delete all Junk messages from all folders"
+msgstr "永久删除所有文件夹中的所有已删除的信息"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
msgid "Edit properties of this account"
msgstr "编辑该帐号的属性"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
msgid "Refresh list of folders of this account"
msgstr "刷新该帐号的文件夹列表"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
msgid "_Download Messages for Offline Usage"
msgstr "下载信息以离线使用(_D)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
msgid "Download messages of accounts and folders marked for offline usage"
msgstr "下载标记为离线使用的帐号和文件夹的信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
msgid "Fl_ush Outbox"
msgstr "清空发件箱(_U)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
-msgid "_Copy Folder To..."
-msgstr "文件夹复制到(_C)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+#, fuzzy
+#| msgid "Copy Folder To"
+msgid "_Copy Folder To…"
+msgstr "复制文件夹到"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
msgid "Copy the selected folder into another folder"
msgstr "把选中的文件夹复制到其它文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+msgid "Edit Sort _Order…"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+#, fuzzy
+#| msgid "Move folder in folder tree."
+msgid "Change sort order of the folders in the folder tree"
+msgstr "移动文件夹树中的文件夹。"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
msgid "E_xpunge"
msgstr "销毁(_X)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
msgid "Permanently remove all deleted messages from this folder"
msgstr "从该文件夹永久删除所有已删除的信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
msgid "Mar_k All Messages as Read"
msgstr "把全部信息标记为已读(_K)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
msgid "Mark all messages in the folder as read"
msgstr "将此文件夹中的所有信息标记为已读"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
-msgid "_Move Folder To..."
-msgstr "文件夹移至(_M)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+#, fuzzy
+#| msgid "Move Folder To"
+msgid "_Move Folder To…"
+msgstr "移动文件夹到"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
msgid "Move the selected folder into another folder"
msgstr "把选中的文件夹移至其它文件夹"
#. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
-msgid "_New..."
-msgstr "新建(_N)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+#, fuzzy
+#| msgid "_New"
+msgid "_New…"
+msgstr "新建(_N)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
msgid "Create a new folder for storing mail"
msgstr "创建存储邮件的新文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
msgid "Change the properties of this folder"
msgstr "更改此文件夹的属性"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
msgid "Refresh the folder"
msgstr "刷新文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
msgid "Change the name of this folder"
msgstr "更改此文件夹的名称"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
msgid "Select Message _Thread"
msgstr "选择信息线索(_T)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
msgid "Select all messages in the same thread as the selected message"
msgstr "把同一线索中的所有信息选择为选中信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
msgid "Select Message S_ubthread"
msgstr "选择信息子线索(_U)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
msgid "Select all replies to the currently selected message"
msgstr "选择当前选中信息的所有回复"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1777
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
msgid "Empty _Trash"
msgstr "清空废件箱(_T)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "永久删除所有帐号中的所有已删除的信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
msgid "Go to _Folder"
msgstr "前往文件夹(_F)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
msgid "Opens a dialog to select a folder to go to"
msgstr "打开对话框选取要移至的文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
-msgid "_New Label"
-msgstr "新建标签(_N)"
-
-#. Translators: "None" is used in the message label context menu.
-#. * It removes all labels from the selected messages.
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
-msgid "N_one"
-msgstr "无(_O)"
-
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
msgid "_Manage Subscriptions"
msgstr "管理订阅(_M)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或退订远程服务器上的文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
msgid "Send / _Receive"
msgstr "发送/接收(_R)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1835
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
msgid "R_eceive All"
msgstr "全部接收(_E)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1837
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
msgid "Receive new items from all accounts"
msgstr "接收所有帐号中的新条目"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
msgid "_Send All"
msgstr "全部发送(_S)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
msgid "Send queued items in all accounts"
msgstr "发送所有帐号的队列中的条目"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
msgid "Cancel the current mail operation"
msgstr "取消当前邮件操作"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
msgid "Collapse All _Threads"
msgstr "折叠全部线索(_T)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
msgid "Collapse all message threads"
msgstr "折叠全部信息线索"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
msgid "E_xpand All Threads"
msgstr "展开全部线索(_X)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
msgid "Expand all message threads"
msgstr "展开全部信息线索"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
msgid "_Message Filters"
msgstr "信息过滤(_M)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
msgid "Create or edit rules for filtering new mail"
msgstr "创建或编辑过滤新邮件的规则"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
-msgid "_Subscriptions..."
-msgstr "订阅(_S)..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+msgid "_Subscriptions…"
+msgstr "订阅(_S)…"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
msgid "F_older"
msgstr "文件夹(_O)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1914
-msgid "_Label"
-msgstr "标签(_L)"
-
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1931
-msgid "C_reate Search Folder From Search..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#, fuzzy
+#| msgid "C_reate Search Folder From Search..."
+msgid "C_reate Search Folder From Search…"
msgstr "从头创建搜索文件夹(_R)..."
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1938
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
msgid "Create or edit search folder definitions"
msgstr "创建或编辑搜索文件夹定义"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
-msgid "_New Folder..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+#, fuzzy
+#| msgid "_New Folder..."
+msgid "_New Folder…"
msgstr "新建文件夹(_N)..."
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2007
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
msgid "Show Message _Preview"
msgstr "显示信息预览(_P)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
msgid "Show message preview pane"
msgstr "显示信息预览窗口"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2015
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
msgid "Show _Attachment Bar"
msgstr "显示附件栏(_A)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
msgid ""
"Show Attachment Bar below the message preview pane when the message has "
"attachments"
msgstr "当消息含有附件时在信息预览面板下面显示附件栏。"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
msgid "Show _Deleted Messages"
msgstr "显示删除的信息(_D)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2025
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
msgid "Show deleted messages with a line through them"
msgstr "在信息列表中显示删除了的信息(带有删除线)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
msgid "Show _Junk Messages"
msgstr "显示垃圾信息(_J)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2033
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
msgid "Show junk messages with a red line through them"
msgstr "使用红色删除线标记垃圾消息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2039
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
msgid "_Group By Threads"
msgstr "按线索分组(_G)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2041
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
msgid "Threaded message list"
msgstr "按线索排列信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2047
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
+#, fuzzy
+#| msgid "Show _Tool Bar"
+msgid "Show To _Do Bar"
+msgstr "显示工具栏(_T)"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
+msgid "Show To Do bar with appointments and tasks"
+msgstr ""
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
msgid "_Unmatched Folder Enabled"
msgstr "“未匹配”文件夹已启用(_U)"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2049
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
msgid "Toggles whether Unmatched search folder is enabled"
msgstr "开关“未匹配”搜索文件夹"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
msgid "Show message preview below the message list"
msgstr "在信息列表下方显示信息预览"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2076
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
msgid "Show message preview alongside the message list"
msgstr "在信息列表旁显示信息预览"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
msgid "All Messages"
msgstr "全部信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
msgid "Important Messages"
msgstr "重要信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
#, fuzzy
#| msgid "Last 5 Days' Messages"
msgid "Last 5 Days’ Messages"
msgstr "前五天的信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
msgid "Messages Not Junk"
msgstr "不是垃圾信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
msgid "Messages with Attachments"
msgstr "有附件的信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
msgid "Messages with Notes"
msgstr "带有便笺的消息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
msgid "No Label"
msgstr "无标签"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
msgid "Read Messages"
msgstr "已读信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
msgid "Unread Messages"
msgstr "未读信息"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2147
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
msgid "Message Thread"
msgstr "信息线索"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2207
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
msgid "Subject or Addresses contain"
msgstr "主题或地址含有"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
msgid "All Accounts"
msgstr "全部帐号"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
msgid "Current Account"
msgstr "当前帐号"
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2231
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
msgid "Current Folder"
msgstr "当前文件夹"
-#: ../src/modules/mail/e-mail-shell-view.c:777
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+msgid "Current Folder and Subfolders"
+msgstr "在当前文件夹和子文件夹"
+
+#: ../src/modules/mail/e-mail-shell-view.c:1028
+msgid "Current Folder and Subfolders Search"
+msgstr "在当前文件夹和子文件夹搜索"
+
+#: ../src/modules/mail/e-mail-shell-view.c:1150
msgid "All Account Search"
msgstr "全部帐号搜索"
-#: ../src/modules/mail/e-mail-shell-view.c:885
+#: ../src/modules/mail/e-mail-shell-view.c:1260
msgid "Account Search"
msgstr "帐号搜索"
-#: ../src/modules/mail/e-mail-shell-view-private.c:931
+#: ../src/modules/mail/e-mail-shell-view-private.c:905
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "已选中 %d 个，"
-#: ../src/modules/mail/e-mail-shell-view-private.c:940
-#: ../src/modules/mail/e-mail-shell-view-private.c:957
+#: ../src/modules/mail/e-mail-shell-view-private.c:920
+#: ../src/modules/mail/e-mail-shell-view-private.c:937
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../src/modules/mail/e-mail-shell-view-private.c:966
-#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:951
+#: ../src/modules/mail/e-mail-shell-view-private.c:957
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../src/modules/mail/e-mail-shell-view-private.c:979
+#: ../src/modules/mail/e-mail-shell-view-private.c:964
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../src/modules/mail/e-mail-shell-view-private.c:985
+#: ../src/modules/mail/e-mail-shell-view-private.c:970
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../src/modules/mail/e-mail-shell-view-private.c:991
+#: ../src/modules/mail/e-mail-shell-view-private.c:976
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../src/modules/mail/e-mail-shell-view-private.c:1008
+#: ../src/modules/mail/e-mail-shell-view-private.c:993
#, c-format
msgid "%d unread"
msgid_plural "%d unread"
msgstr[0] "%d 封未读"
-#: ../src/modules/mail/e-mail-shell-view-private.c:1526
+#: ../src/modules/mail/e-mail-shell-view-private.c:1511
msgid "Send / Receive"
msgstr "发送/接收"
-#: ../src/modules/mail/em-composer-prefs.c:419
+#: ../src/modules/mail/em-composer-prefs.c:420
msgid "Select Folder to Add"
msgstr "选择要添加的文件夹"
-#: ../src/modules/mail/em-composer-prefs.c:895
+#: ../src/modules/mail/em-composer-prefs.c:896
msgid "Folder"
msgstr "文件夹"
-#: ../src/modules/mail/em-composer-prefs.c:931
+#: ../src/modules/mail/em-composer-prefs.c:932
msgid "Recipient"
msgstr "收件人"
-#: ../src/modules/mail/em-composer-prefs.c:1222
+#: ../src/modules/mail/em-composer-prefs.c:1223
msgid "Keep in Outbox"
msgstr "保留在发件箱"
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1224
msgid "Send immediately"
msgstr "立即发送"
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1225
msgid "Send after 5 minutes"
msgstr "5 分钟后发送"
-#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/mail/em-composer-prefs.c:1310
msgid "Language(s)"
msgstr "语言"
+#: ../src/modules/mail/em-composer-prefs.c:1340
+msgid "Same as user interface"
+msgstr "与用户界面相同"
+
#: ../src/modules/mail/em-mailer-prefs.c:77
msgid "On exit, every time"
msgstr "退出时，每次"
@@ -23532,23 +25912,33 @@ msgstr "每月一次"
msgid "Immediately, on folder leave"
msgstr "立即，一离开文件夹"
-#: ../src/modules/mail/em-mailer-prefs.c:418
+#: ../src/modules/mail/em-mailer-prefs.c:436
msgid "Header"
msgstr "页眉"
-#: ../src/modules/mail/em-mailer-prefs.c:422
+#: ../src/modules/mail/em-mailer-prefs.c:440
msgid "Contains Value"
msgstr "包含值"
#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1558
+#: ../src/modules/mail/em-mailer-prefs.c:1699
msgid "_Date header:"
msgstr "日期头：(_D)"
-#: ../src/modules/mail/em-mailer-prefs.c:1559
+#: ../src/modules/mail/em-mailer-prefs.c:1700
msgid "Show _original header value"
msgstr "显示原始邮件头值(_o)"
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
+#, fuzzy
+#| msgid "Yahoo account settings:"
+msgid "Do _not change settings"
+msgstr "Yahoo 帐号设置："
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+msgid "_Set as default email client"
+msgstr "设为默认电子邮件客户端(_S)"
+
#: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
msgid "Do you want to make Evolution your default email client?"
msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端？"
@@ -23558,24 +25948,28 @@ msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端
#: ../src/modules/mdn/evolution-mdn.c:308
#, fuzzy, c-format
#| msgid "Your message to %s about \"%s\" on %s has been read."
-msgid "Your message to %s about “%s” on %s has been read."
+msgid ""
+"Your message to %s about “%s” on %s has been displayed. This is no guarantee "
+"that the message has been read or understood."
msgstr "您在 %3$s 上给 %1$s 发送的关于“%2$s”的信息已被阅读。"
-#. Translators: %s is the subject of the email message.
-#: ../src/modules/mdn/evolution-mdn.c:374
+#. Translators: %s is the subject of the email message This text is used as
+#. a subject of a delivery notification email (basically a notification, that
+#. the user did read (or better displayed) the message).
+#: ../src/modules/mdn/evolution-mdn.c:376
#, fuzzy, c-format
-#| msgid "Delivery Notification for \"%s\""
-msgid "Delivery Notification for “%s”"
-msgstr "“%s”的邮件通知"
+#| msgid "URL: %s"
+msgid "Read: %s"
+msgstr "URL：%s"
-#: ../src/modules/mdn/evolution-mdn.c:540
+#: ../src/modules/mdn/evolution-mdn.c:542
#, fuzzy, c-format
#| msgid "Send a read receipt to '%s'"
msgid "Send a read receipt to “%s”"
msgstr "向“%s”发送回执"
#. name doesn't matter
-#: ../src/modules/mdn/evolution-mdn.c:545
+#: ../src/modules/mdn/evolution-mdn.c:547
msgid "_Notify Sender"
msgstr "通知发件人(_N)"
@@ -23611,44 +26005,44 @@ msgstr "一旦建立了网络连接，Evolution 将返回在线模式。"
msgid "Author(s)"
msgstr "作者"
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
msgid "Plugin Manager"
msgstr "插件管理器"
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
msgid "Note: Some changes will not take effect until restart"
msgstr "注意：某些更改直到重新启动后才生效"
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
msgid "Overview"
msgstr "概览"
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
msgid "Plugin"
msgstr "插件"
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
msgid "_Plugins"
msgstr "插件(_P)"
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
msgid "Enable and disable plugins"
msgstr "启用和禁用插件"
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:137
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:138
msgid "Display plain text version"
msgstr "显示纯文字版本"
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
msgid "Display plain text version of multipart/alternative message"
msgstr "显示多部分/可选信息的纯文字版本"
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:145
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:146
msgid "Display HTML version"
msgstr "显示 HTML 版本"
-#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
+#: ../src/modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
msgid "Display HTML version of multipart/alternative message"
msgstr "显示多部分/可选信息的 HTML 版本"
@@ -23753,11 +26147,11 @@ msgid "This will make SpamAssassin more reliable, but slower."
msgstr "这将让 SpamAssassin 更可靠，但稍慢。"
#: ../src/modules/spamassassin/evolution-spamassassin.c:740
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:1
msgid "SpamAssassin"
msgstr "SpamAssassin"
-#: ../src/modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#: ../src/modules/spamassassin/org.gnome.Evolution-spamassassin.metainfo.xml.in.h:2
msgid "Junk filter using SpamAssassin"
msgstr "使用 SpamAssassin 过滤垃圾"
@@ -23768,15 +26162,15 @@ msgstr "使用 SpamAssassin 过滤垃圾"
msgid "Importing Files"
msgstr "导入文件"
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
msgid "Import cancelled."
msgstr "导入已取消。"
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
msgid "Import complete."
msgstr "导入完成。"
-#: ../src/modules/startup-wizard/e-startup-assistant.c:156
+#: ../src/modules/startup-wizard/e-startup-assistant.c:186
msgid ""
"Welcome to Evolution.\n"
"\n"
@@ -23787,23 +26181,44 @@ msgstr ""
"\n"
"下面几屏将配置 Evolution 连接到您的电子邮件帐号，并从其他应用程序导入文件。"
-#: ../src/modules/startup-wizard/evolution-startup-wizard.c:226
-msgid "Loading accounts..."
+#: ../src/modules/startup-wizard/e-startup-assistant.c:193
+msgid "Do not _show this wizard again"
+msgstr "不再显示本向导(_S)"
+
+#. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead."
sentence from the same translation context.
+#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+#, fuzzy
+#| msgid "Create a new mail account"
+msgctxt "wizard-ca-note"
+msgid "create a collection account"
+msgstr "创建新邮件帐号"
+
+#. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
+#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#, c-format
+msgctxt "wizard-ca-note"
+msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
+msgstr ""
+
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
+#, fuzzy
+#| msgid "Loading accounts..."
+msgid "Loading accounts…"
msgstr "正在载入..."
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-msgid "_Format as..."
-msgstr "格式化为(_F)..."
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:94
+msgid "_Format as…"
+msgstr "格式化为(_F)…"
-#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
+#: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:102
msgid "_Other languages"
msgstr "其他语言(_O)"
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:436
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:493
msgid "Text Highlight"
msgstr "文字高度"
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:437
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:494
msgid "Syntax highlighting of mail parts"
msgstr "邮件部分的语法高亮"
@@ -24015,36 +26430,34 @@ msgstr "_TCSH"
msgid "_VHDL"
msgstr "_VHDL"
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:188
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:153
msgid "Show F_ull vCard"
msgstr "显示完整 vCard(_U)"
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../src/modules/vcard-inline/e-mail-part-vcard.c:193
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:183
msgid "Show Com_pact vCard"
msgstr "显示紧凑 vCard(_P)"
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:163
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:205
msgid "Save _To Addressbook"
msgstr "保存至地址簿(_T)"
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:187
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:228
msgid "There is one other contact."
msgstr "有另外 1 个联系人。"
#. Translators: This will always be two or more.
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:192
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:233
#, c-format
msgid "There is %d other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "有另外 %d 个联系人。"
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:218
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:259
msgid "Addressbook Contact"
msgstr "地址簿联系人"
-#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:219
+#: ../src/modules/vcard-inline/e-mail-formatter-vcard.c:260
msgid "Display the part as an addressbook contact"
msgstr "将该部分显示为地址簿联系人"
@@ -24052,8 +26465,8 @@ msgstr "将该部分显示为地址簿联系人"
msgid "_Do not show this message again."
msgstr "不再显示此信息(_D)。"
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
-#: ../src/plugins/templates/templates.c:488
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:571
+#: ../src/plugins/templates/templates.c:489
msgid "Keywords"
msgstr "关键字"
@@ -24083,35 +26496,40 @@ msgstr "附件提醒"
msgid "Reminds you when you forgot to add an attachment to a mail message."
msgstr "当您忘记为邮件信息添加附件时提醒您。"
-#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/bbdb.c:715 ../src/plugins/bbdb/bbdb.c:838
#: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../src/plugins/bbdb/bbdb.c:750
+#: ../src/plugins/bbdb/bbdb.c:730
msgid "Create _address book entries when sending mails"
msgstr "回复邮件时自动在地址簿中创建联系人项(_a)"
-#: ../src/plugins/bbdb/bbdb.c:760
+#. File Under setting
+#: ../src/plugins/bbdb/bbdb.c:741
+msgid "Set File _under as “First Last”, instead of “Last, First”"
+msgstr ""
+
+#: ../src/plugins/bbdb/bbdb.c:752
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../src/plugins/bbdb/bbdb.c:780
+#: ../src/plugins/bbdb/bbdb.c:772
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:795
+#: ../src/plugins/bbdb/bbdb.c:787
msgid "_Synchronize contact info and images from Pidgin buddy list"
msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像(_S)"
-#: ../src/plugins/bbdb/bbdb.c:805
+#: ../src/plugins/bbdb/bbdb.c:797
msgid "Select Address book for Pidgin buddy list"
msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:821
+#: ../src/plugins/bbdb/bbdb.c:813
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
@@ -24148,54 +26566,54 @@ msgstr "Outlook 个人文件夹(.dbx)"
msgid "Import Outlook Express messages from DBX file"
msgstr "从 DBX 文件中导入 Outlook 邮件"
-#: ../src/plugins/email-custom-header/email-custom-header.c:291
+#: ../src/plugins/email-custom-header/email-custom-header.c:292
msgctxt "email-custom-header-Security"
msgid "Security:"
msgstr "安全："
-#: ../src/plugins/email-custom-header/email-custom-header.c:295
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
msgctxt "email-custom-header-Security"
msgid "Personal"
msgstr "个人"
-#: ../src/plugins/email-custom-header/email-custom-header.c:296
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
msgctxt "email-custom-header-Security"
msgid "Unclassified"
msgstr "未分类"
-#: ../src/plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
msgctxt "email-custom-header-Security"
msgid "Protected"
msgstr "受保护的"
-#: ../src/plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
msgctxt "email-custom-header-Security"
msgid "Confidential"
msgstr "机密"
-#: ../src/plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
msgctxt "email-custom-header-Security"
msgid "Secret"
msgstr "机密"
-#: ../src/plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:301
msgctxt "email-custom-header-Security"
msgid "Top secret"
msgstr "绝密"
#. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from
Composer,
#. * indicating the header will not be added to a mail message
-#: ../src/plugins/email-custom-header/email-custom-header.c:360
+#: ../src/plugins/email-custom-header/email-custom-header.c:361
msgctxt "email-custom-header"
msgid "None"
msgstr "无"
-#: ../src/plugins/email-custom-header/email-custom-header.c:537
+#: ../src/plugins/email-custom-header/email-custom-header.c:538
msgid "_Custom Header"
msgstr "自定义信头(_C)"
#. To translators: This string is used while adding a new message header to configuration, to specifying the
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:807
+#: ../src/plugins/email-custom-header/email-custom-header.c:808
#, fuzzy
#| msgid ""
#| "The format for specifying a Custom Header key value is:\n"
@@ -24207,12 +26625,12 @@ msgstr ""
"指定头和头值的格式为：\n"
"自定义头的名称，值，头与头之间以“;”分割。"
-#: ../src/plugins/email-custom-header/email-custom-header.c:860
+#: ../src/plugins/email-custom-header/email-custom-header.c:862
msgid "Key"
msgstr "键"
-#: ../src/plugins/email-custom-header/email-custom-header.c:877
-#: ../src/plugins/templates/templates.c:497
+#: ../src/plugins/email-custom-header/email-custom-header.c:879
+#: ../src/plugins/templates/templates.c:498
msgid "Values"
msgstr "值"
@@ -24223,17 +26641,17 @@ msgstr "自定义信头"
#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to
specify what value for the message header would be added
#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
msgid "Add custom headers to outgoing mail messages."
-msgstr "添加自定义邮件头到发送的邮件信息"
+msgstr "向发出的邮件信息添加自定义邮件头。"
#: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
msgid "Email Custom Header"
msgstr "自定义信头"
-#: ../src/plugins/external-editor/external-editor.c:111
+#: ../src/plugins/external-editor/external-editor.c:108
msgid "Command to be executed to launch the editor: "
msgstr "调用编辑器要执行的命令："
-#: ../src/plugins/external-editor/external-editor.c:112
+#: ../src/plugins/external-editor/external-editor.c:109
#, fuzzy
#| msgid ""
#| "For XEmacs use \"xemacs\"\n"
@@ -24245,12 +26663,12 @@ msgstr ""
"XEmacs 应使用“xemacs”\n"
"Vim 应使用“gvim -f”"
-#: ../src/plugins/external-editor/external-editor.c:122
+#: ../src/plugins/external-editor/external-editor.c:119
msgid "_Automatically launch when a new mail is edited"
msgstr "在编辑新邮件时自动启动(_A)"
-#: ../src/plugins/external-editor/external-editor.c:453
-#: ../src/plugins/external-editor/external-editor.c:455
+#: ../src/plugins/external-editor/external-editor.c:489
+#: ../src/plugins/external-editor/external-editor.c:491
msgid "Compose in External Editor"
msgstr "在外部编辑器中写作"
@@ -24292,27 +26710,23 @@ msgid ""
"closed as long as the editor is active."
msgstr "外部编辑器仍在运行。邮件编辑器窗口无法在外部文本编辑器活动时关闭。"
-#: ../src/plugins/face/face.c:292
+#: ../src/plugins/face/face.c:295
msgid "Select a Face Picture"
msgstr "选择一个文件"
-#: ../src/plugins/face/face.c:302
-msgid "Image files"
-msgstr "图像文件"
-
-#: ../src/plugins/face/face.c:390
+#: ../src/plugins/face/face.c:389
msgid "_Insert Face picture by default"
msgstr "按默认方式插入头像图片(_I)"
-#: ../src/plugins/face/face.c:403
+#: ../src/plugins/face/face.c:402
msgid "Load new _Face picture"
msgstr "加载新头像图片(_F)"
-#: ../src/plugins/face/face.c:447
+#: ../src/plugins/face/face.c:446
msgid "Change Face Image"
msgstr "改变头像"
-#: ../src/plugins/face/face.c:535
+#: ../src/plugins/face/face.c:534
msgid "Include _Face"
msgstr "包含头像(_F)"
@@ -24368,63 +26782,63 @@ msgstr "不是一个图像"
msgid "The file you selected does not look like a valid PNG image. Error: {0}"
msgstr "您选取的文件似乎不是有效的 PNG 图像。错误：{0}"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:413
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:417
msgid "Get List _Archive"
msgstr "获得列表存档(_A)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:415
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:419
msgid "Get an archive of the list this message belongs to"
msgstr "获取这封信所属邮件列表的存档"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:424
msgid "Copy _Message Archive URL"
msgstr "复制消息归档 URL (_M)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:426
msgid "Copy direct URL for the selected message in its archive"
msgstr "复制选中消息的直接 URL 到其归档"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:431
msgid "Get List _Usage Information"
msgstr "获得列表用法信息(_U)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:429
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:433
msgid "Get information about the usage of the list this message belongs to"
msgstr "获取这封信所属邮件列表的用法信息"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:434
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:438
msgid "Contact List _Owner"
msgstr "联系列表所有者(_O)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:436
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:440
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "联系这封信所属邮件列表的所有者"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:441
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:445
msgid "_Post Message to List"
msgstr "投递到列表(_P)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:443
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:447
msgid "Post a message to the mailing list this message belongs to"
msgstr "给这封信所属的邮件列表投递"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:448
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:452
msgid "_Subscribe to List"
msgstr "订阅列表(_S)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:450
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:454
msgid "Subscribe to the mailing list this message belongs to"
msgstr "订阅这封信所属的邮件列表"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:455
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:459
msgid "_Unsubscribe from List"
msgstr "退订列表(_U)"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:457
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:461
msgid "Unsubscribe from the mailing list this message belongs to"
msgstr "退订这封信所属的邮件列表"
-#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:464
+#: ../src/plugins/mailing-list-actions/mailing-list-actions.c:468
msgid "Mailing _List"
msgstr "邮件列表(_L)"
@@ -24518,8 +26932,7 @@ msgstr ""
"头：{0}"
#. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:398
-#: ../src/plugins/mail-notification/mail-notification.c:434
+#: ../src/plugins/mail-notification/mail-notification.c:462
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
@@ -24527,90 +26940,109 @@ msgstr[0] "您收到了 %d 封新邮件。"
#. Translators: "From:" is preceding a new mail
#. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:409
+#: ../src/plugins/mail-notification/mail-notification.c:471
#, c-format
msgid "From: %s"
msgstr "来自：%s"
#. Translators: "Subject:" is preceding a new mail
#. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:423
+#: ../src/plugins/mail-notification/mail-notification.c:485
#, c-format
msgid "Subject: %s"
msgstr "主题：%s"
-#: ../src/plugins/mail-notification/mail-notification.c:440
+#. Translators: %d is the count of mails received in addition
+#. * to the one displayed in this notification.
+#: ../src/plugins/mail-notification/mail-notification.c:501
+#, c-format
+msgid "(and %d more)"
+msgid_plural "(and %d more)"
+msgstr[0] "（还有 %d 个）"
+
+#: ../src/plugins/mail-notification/mail-notification.c:513
msgid "New email in Evolution"
msgstr "Evolution 中有新邮件"
#. Translators: The '%s' is a mail
#. * folder name. (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:481
+#: ../src/plugins/mail-notification/mail-notification.c:553
#, c-format
msgid "Show %s"
msgstr "显示 %s"
-#: ../src/plugins/mail-notification/mail-notification.c:685
+#: ../src/plugins/mail-notification/mail-notification.c:792
msgid "_Play sound when a new message arrives"
msgstr "新信息到达时播放声音(_P)"
-#: ../src/plugins/mail-notification/mail-notification.c:717
+#: ../src/plugins/mail-notification/mail-notification.c:824
msgid "_Beep"
msgstr "响铃(_B)"
-#: ../src/plugins/mail-notification/mail-notification.c:730
+#: ../src/plugins/mail-notification/mail-notification.c:837
msgid "Use sound _theme"
msgstr "使用声音主题(_T)"
-#: ../src/plugins/mail-notification/mail-notification.c:749
+#: ../src/plugins/mail-notification/mail-notification.c:856
msgid "Play _file:"
msgstr "播放文件(_F)："
-#: ../src/plugins/mail-notification/mail-notification.c:758
+#: ../src/plugins/mail-notification/mail-notification.c:865
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../src/plugins/mail-notification/mail-notification.c:835
+#: ../src/plugins/mail-notification/mail-notification.c:1014
+#, fuzzy
+#| msgid "Select the calendars for reminder notification"
+msgid "Select _accounts for which enable notifications:"
+msgstr "选择用于提醒通知的日历"
+
+#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "邮件通知"
+
+#: ../src/plugins/mail-notification/mail-notification.c:1190
msgid "Notify new messages for _Inbox only"
msgstr "只通知收件箱中的新信息(_I)"
-#: ../src/plugins/mail-notification/mail-notification.c:851
+#: ../src/plugins/mail-notification/mail-notification.c:1206
msgid "Show _notification when a new message arrives"
msgstr "新信息到达时在通知区显示通知(_N)"
-#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "邮件通知"
+#: ../src/plugins/mail-notification/mail-notification.c:1224
+msgid "Accounts"
+msgstr "帐号"
#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
msgid "Notifies you when new mail messages arrive."
msgstr "当新的邮件信息到达时提示您。"
#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:194
+#: ../src/plugins/mail-to-task/mail-to-task.c:198
#, c-format
msgid "Created from a mail by %s"
msgstr "被%s从邮件创建"
#. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:576
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
msgctxt "mail-to-task"
msgid "_Cancel"
msgstr "取消(_C)"
#. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:578
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
msgctxt "mail-to-task"
msgid "_Edit"
msgstr "编辑(_E)"
#. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:580
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
msgctxt "mail-to-task"
msgid "_New"
msgstr "新建(_N)"
-#: ../src/plugins/mail-to-task/mail-to-task.c:598
+#: ../src/plugins/mail-to-task/mail-to-task.c:622
#, fuzzy, c-format
#| msgid ""
#| "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -24620,7 +27052,7 @@ msgid ""
"old event?"
msgstr "选定的日历已经包含“%s”事件。您想编辑旧的事件吗？"
-#: ../src/plugins/mail-to-task/mail-to-task.c:601
+#: ../src/plugins/mail-to-task/mail-to-task.c:625
#, fuzzy, c-format
#| msgid ""
#| "Selected task list contains task '%s' already. Would you like to edit the "
@@ -24630,7 +27062,7 @@ msgid ""
"old task?"
msgstr "选定的任务列表已经包含“%s”任务。您想编辑旧的任务吗？"
-#: ../src/plugins/mail-to-task/mail-to-task.c:604
+#: ../src/plugins/mail-to-task/mail-to-task.c:628
#, fuzzy, c-format
#| msgid ""
#| "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -24641,7 +27073,7 @@ msgid ""
msgstr "选定的备忘录已经包含“%s”备忘。您想编辑旧的备忘吗？"
#. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:624
+#: ../src/plugins/mail-to-task/mail-to-task.c:648
#, c-format
msgid ""
"You have selected %d mails to be converted to events. Do you really want to "
@@ -24652,7 +27084,7 @@ msgid_plural ""
msgstr[0] "您选择了将 %d 封邮件转换为事件。您真的要全部添加它们吗？"
#. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:631
+#: ../src/plugins/mail-to-task/mail-to-task.c:655
#, c-format
msgid ""
"You have selected %d mails to be converted to tasks. Do you really want to "
@@ -24663,7 +27095,7 @@ msgid_plural ""
msgstr[0] "您选择了将 %d 封邮件转换为任务。您真的要全部添加它们吗？"
#. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:638
+#: ../src/plugins/mail-to-task/mail-to-task.c:662
#, c-format
msgid ""
"You have selected %d mails to be converted to memos. Do you really want to "
@@ -24673,88 +27105,94 @@ msgid_plural ""
"add them all?"
msgstr[0] "您选择了将 %d 封邮件转换为备忘。您真的要全部添加它们吗？"
-#: ../src/plugins/mail-to-task/mail-to-task.c:659
+#: ../src/plugins/mail-to-task/mail-to-task.c:683
msgid "Do you wish to continue converting remaining mails?"
msgstr "您想继续转换剩下的邮件吗？"
-#: ../src/plugins/mail-to-task/mail-to-task.c:735
+#: ../src/plugins/mail-to-task/mail-to-task.c:759
msgid "[No Summary]"
msgstr "[没有概要]"
-#: ../src/plugins/mail-to-task/mail-to-task.c:748
+#: ../src/plugins/mail-to-task/mail-to-task.c:772
msgid "Invalid object returned from a server"
msgstr "从一个服务器上返回了无效的对象"
-#: ../src/plugins/mail-to-task/mail-to-task.c:802
+#: ../src/plugins/mail-to-task/mail-to-task.c:826
#, c-format
msgid "An error occurred during processing: %s"
msgstr "在处理时出现了一个错误：%s"
-#: ../src/plugins/mail-to-task/mail-to-task.c:838
+#: ../src/plugins/mail-to-task/mail-to-task.c:877
#, c-format
msgid "Cannot open calendar. %s"
msgstr "无法打开日历。%s"
-#: ../src/plugins/mail-to-task/mail-to-task.c:842
+#: ../src/plugins/mail-to-task/mail-to-task.c:881
msgid ""
"Selected calendar is read only, thus cannot create event there. Select other "
"calendar, please."
msgstr "选中的日历是只读的，因此不能在此创建事件。请选择其它的日历。"
-#: ../src/plugins/mail-to-task/mail-to-task.c:845
+#: ../src/plugins/mail-to-task/mail-to-task.c:884
msgid ""
"Selected task list is read only, thus cannot create task there. Select other "
"task list, please."
msgstr "选中的任务列表是只读的，因此不能在此创建任务。请选择其它的任务列表。"
-#: ../src/plugins/mail-to-task/mail-to-task.c:848
+#: ../src/plugins/mail-to-task/mail-to-task.c:887
msgid ""
"Selected memo list is read only, thus cannot create memo there. Select other "
"memo list, please."
msgstr "选中的备忘录是只读的，因此不能在此创建备忘。请选择其它的备忘录。"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1252
+#: ../src/plugins/mail-to-task/mail-to-task.c:1328
msgid "Create an _Appointment"
msgstr "创建新约会(_A)"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1254
+#: ../src/plugins/mail-to-task/mail-to-task.c:1330
msgid "Create a new event from the selected message"
msgstr "从选择的信息中创建一个新的事件"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1259
+#: ../src/plugins/mail-to-task/mail-to-task.c:1335
msgid "Create a Mem_o"
msgstr "创建一个备忘(_O)"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1261
+#: ../src/plugins/mail-to-task/mail-to-task.c:1337
msgid "Create a new memo from the selected message"
msgstr "用所选邮件创建新备忘"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1266
+#: ../src/plugins/mail-to-task/mail-to-task.c:1342
msgid "Create a _Task"
msgstr "创建一个任务(_T)"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1268
+#: ../src/plugins/mail-to-task/mail-to-task.c:1344
msgid "Create a new task from the selected message"
msgstr "用所选邮件创建新任务"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1276
+#: ../src/plugins/mail-to-task/mail-to-task.c:1352
msgid "Create a _Meeting"
msgstr "创建一个会议(_M)"
-#: ../src/plugins/mail-to-task/mail-to-task.c:1278
+#: ../src/plugins/mail-to-task/mail-to-task.c:1354
msgid "Create a new meeting from the selected message"
msgstr "用所选邮件创建新会议"
#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#, fuzzy
+#| msgid "Mail to %s"
+msgid "Mail-to-Task"
+msgstr "发送给 %s"
+
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
msgid "Convert a mail message to a task."
msgstr "转换一个邮件信息成为一个任务。"
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:1
#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
msgid "Outlook PST import"
msgstr "Outlook PST 导入"
-#: ../src/plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
+#: ../src/plugins/pst-import/org.gnome.Evolution-pst.metainfo.xml.in.h:2
#: ../src/plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
msgid "Import Outlook messages from PST file"
msgstr "从 PST 文件中导入 Outlook 邮件"
@@ -24763,10 +27201,6 @@ msgstr "从 PST 文件中导入 Outlook 邮件"
msgid "Outlook personal folders (.pst)"
msgstr "Outlook 个人文件夹(.pst)"
-#: ../src/plugins/pst-import/pst-importer.c:522
-msgid "_Mail"
-msgstr "邮件(_M)"
-
#: ../src/plugins/pst-import/pst-importer.c:551
msgid "Destination folder:"
msgstr "目的文件夹："
@@ -24802,38 +27236,38 @@ msgid "Publish calendars to the web."
msgstr "将日历发布到 Web。"
#: ../src/plugins/publish-calendar/publish-calendar.c:215
-#: ../src/plugins/publish-calendar/publish-calendar.c:482
+#: ../src/plugins/publish-calendar/publish-calendar.c:483
#, c-format
msgid "Could not open %s:"
msgstr "无法打开 %s："
-#: ../src/plugins/publish-calendar/publish-calendar.c:234
+#: ../src/plugins/publish-calendar/publish-calendar.c:235
#, c-format
msgid "There was an error while publishing to %s:"
-msgstr "发布到%s时出现错误"
+msgstr "发布到 %s 时出现错误："
-#: ../src/plugins/publish-calendar/publish-calendar.c:240
+#: ../src/plugins/publish-calendar/publish-calendar.c:241
#, c-format
msgid "Publishing to %s finished successfully"
msgstr "发布到%s成功完成"
-#: ../src/plugins/publish-calendar/publish-calendar.c:288
+#: ../src/plugins/publish-calendar/publish-calendar.c:289
#, c-format
msgid "Mount of %s failed:"
msgstr "加载 %s 失败："
-#: ../src/plugins/publish-calendar/publish-calendar.c:787
+#: ../src/plugins/publish-calendar/publish-calendar.c:788
msgid "Are you sure you want to remove this location?"
msgstr "您确定您想要删除此位置吗？"
#. To Translators: This is shown to a user when creation of a new thread,
#. * where the publishing should be done, fails. Basically, this shouldn't
#. * ever happen, and if so, then something is really wrong.
-#: ../src/plugins/publish-calendar/publish-calendar.c:1097
+#: ../src/plugins/publish-calendar/publish-calendar.c:1098
msgid "Could not create publish thread."
msgstr "无法创建发布索引。"
-#: ../src/plugins/publish-calendar/publish-calendar.c:1107
+#: ../src/plugins/publish-calendar/publish-calendar.c:1108
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
@@ -24842,91 +27276,84 @@ msgid "iCal"
msgstr "iCal"
#: ../src/plugins/publish-calendar/publish-calendar.ui.h:3
+#, fuzzy
+#| msgid "Free/Busy Reply"
+msgid "Free/Busy with Details"
+msgstr "忙闲应答"
+
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
msgid "Daily"
msgstr "每天"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:4
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
msgid "Weekly"
msgstr "每周"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:5
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Manual (via Actions menu)"
msgstr "手动(通过动作菜单)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:9
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Secure FTP (SFTP)"
msgstr "安全 FTP (SFTP)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:10
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
msgid "Public FTP"
msgstr "公共 FTP"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:11
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
msgid "FTP (with login)"
msgstr "FTP(使用登录)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:12
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
msgid "Windows share"
msgstr "窗口共享"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:13
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
msgid "WebDAV (HTTP)"
msgstr "WebDAV (HTTP)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:14
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
msgid "Secure WebDAV (HTTPS)"
msgstr "安全 WebDAV (HTTPS)"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:15
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
msgid "Custom Location"
msgstr "自定义位置"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
msgid "_Publish as:"
msgstr "发布为(_P)："
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:18
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
msgid "Publishing _Frequency:"
msgstr "发布频率(_F)："
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:19
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
msgid "Time _duration:"
msgstr "时长(_D)："
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:20
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
msgid "Sources"
msgstr "来源"
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:24
msgid "Service _type:"
msgstr "服务类型(_T)："
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
msgid "_File:"
msgstr "文件(_F)："
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
msgid "P_ort:"
msgstr "端口(_O)："
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:28
-msgid "_Username:"
-msgstr "用户名(_U)："
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../src/smime/gui/certificate-manager.c:785
-msgid "_Password:"
-msgstr "密码(_P)："
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-msgid "_Remember password"
-msgstr "记住密码(_R)"
-
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:32
msgid "Publishing Location"
msgstr "发布位置"
-#: ../src/plugins/publish-calendar/publish-format-fb.c:82
+#: ../src/plugins/publish-calendar/publish-format-fb.c:83
#: ../src/plugins/publish-calendar/publish-format-ical.c:102
#, fuzzy, c-format
#| msgid "Invalid source UID '%s'"
@@ -24944,80 +27371,80 @@ msgstr "编辑位置"
#. Translators: the %F %T is the third argument for a
#. * strftime function. It lets you define the formatting
#. * of the date in the csv-file.
-#: ../src/plugins/save-calendar/csv-format.c:158
+#: ../src/plugins/save-calendar/csv-format.c:154
msgid "%F %T"
msgstr "%F %T"
-#: ../src/plugins/save-calendar/csv-format.c:374
+#: ../src/plugins/save-calendar/csv-format.c:363
msgid "Description List"
msgstr "描述列表"
-#: ../src/plugins/save-calendar/csv-format.c:375
+#: ../src/plugins/save-calendar/csv-format.c:364
msgid "Categories List"
msgstr "类别列表"
-#: ../src/plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:365
msgid "Comment List"
msgstr "注释列表"
-#: ../src/plugins/save-calendar/csv-format.c:379
+#: ../src/plugins/save-calendar/csv-format.c:368
msgid "Contact List"
msgstr "联系人列表"
-#: ../src/plugins/save-calendar/csv-format.c:380
+#: ../src/plugins/save-calendar/csv-format.c:369
msgid "Start"
msgstr "开始"
-#: ../src/plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:370
msgid "End"
msgstr "结束"
-#: ../src/plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:371
msgid "Due"
msgstr "到期"
-#: ../src/plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:372
msgid "percent Done"
msgstr "完成百分比"
-#: ../src/plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:374
msgid "URL"
msgstr "URL"
-#: ../src/plugins/save-calendar/csv-format.c:386
+#: ../src/plugins/save-calendar/csv-format.c:375
msgid "Attendees List"
msgstr "出席者列表"
-#: ../src/plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:377
msgid "Modified"
msgstr "修改日期"
-#: ../src/plugins/save-calendar/csv-format.c:561
+#: ../src/plugins/save-calendar/csv-format.c:537
msgid "A_dvanced options for the CSV format"
msgstr "CSV 格式的高级选项(_D)"
-#: ../src/plugins/save-calendar/csv-format.c:569
+#: ../src/plugins/save-calendar/csv-format.c:545
msgid "Prepend a _header"
msgstr "预置标头(_H)"
-#: ../src/plugins/save-calendar/csv-format.c:578
+#: ../src/plugins/save-calendar/csv-format.c:554
msgid "_Value delimiter:"
msgstr "数值分隔符(_V)："
-#: ../src/plugins/save-calendar/csv-format.c:589
+#: ../src/plugins/save-calendar/csv-format.c:565
msgid "_Record delimiter:"
msgstr "记录分隔符(_R)："
-#: ../src/plugins/save-calendar/csv-format.c:600
+#: ../src/plugins/save-calendar/csv-format.c:576
msgid "_Encapsulate values with:"
msgstr "封装数值使用(_E)："
-#: ../src/plugins/save-calendar/csv-format.c:626
+#: ../src/plugins/save-calendar/csv-format.c:602
msgid "Comma separated values (.csv)"
msgstr "逗号分隔的值(.csv)"
#: ../src/plugins/save-calendar/ical-format.c:181
-#: ../src/shell/e-shell-utils.c:182
+#: ../src/shell/e-shell-utils.c:172
msgid "iCalendar (.ics)"
msgstr "iCalendar (.ics)"
@@ -25038,15 +27465,15 @@ msgstr "保存一个日历或者任务到磁盘。"
msgid "%FT%T"
msgstr "%FT%T"
-#: ../src/plugins/save-calendar/rdf-format.c:383
+#: ../src/plugins/save-calendar/rdf-format.c:373
msgid "RDF (.rdf)"
msgstr "RDF (.rdf)"
-#: ../src/plugins/save-calendar/save-calendar.c:117
+#: ../src/plugins/save-calendar/save-calendar.c:116
msgid "_Format:"
msgstr "格式(_F)："
-#: ../src/plugins/save-calendar/save-calendar.c:182
+#: ../src/plugins/save-calendar/save-calendar.c:183
msgid "Select destination file"
msgstr "选择目的文件"
@@ -25054,90 +27481,73 @@ msgstr "选择目的文件"
msgid "_Save As"
msgstr "另存为(_S)"
-#: ../src/plugins/save-calendar/save-calendar.c:349
+#: ../src/plugins/save-calendar/save-calendar.c:346
msgid "Save the selected calendar to disk"
msgstr "保存选中的日历到磁盘"
-#: ../src/plugins/save-calendar/save-calendar.c:380
+#: ../src/plugins/save-calendar/save-calendar.c:385
msgid "Save the selected memo list to disk"
msgstr "保存选中的备忘录到磁盘"
-#: ../src/plugins/save-calendar/save-calendar.c:411
+#: ../src/plugins/save-calendar/save-calendar.c:424
msgid "Save the selected task list to disk"
msgstr "保存选中的任务列表到磁盘"
-#: ../src/plugins/templates/e-templates-store.c:115
-msgid "No Title"
-msgstr "无标题"
-
#: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
+#, fuzzy
+#| msgid ""
+#| "Drafts based template plugin. You can use variables like $ORIG[subject], "
+#| "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values "
+#| "from an email you are replying to."
msgid ""
"Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
+"$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-"
+"credits], which will be replaced by values from an email you are replying to."
msgstr ""
"基于草稿的模板插件。您可以使用 $ORIG[subject]、$ORIG[from]、$ORIG[to] 或 "
"$ORIG[body] 这样的变量，它们将替换为您所回复邮件中对应的值。"
-#: ../src/plugins/templates/templates.c:1299
+#: ../src/plugins/templates/templates.c:878
msgid "Saving message template"
msgstr "正在保存消息模板"
-#: ../src/plugins/templates/templates.c:1320
+#: ../src/plugins/templates/templates.c:899
msgid "Save as _Template"
msgstr "另存为模板(_T)"
-#: ../src/plugins/templates/templates.c:1322
+#: ../src/plugins/templates/templates.c:901
msgid "Save as Template"
msgstr "另存为模板"
#: ../src/shell/e-shell.c:379
-msgid "Preparing to go offline..."
-msgstr "正在准备离线..."
+msgid "Preparing to go offline…"
+msgstr "正在准备离线……"
#: ../src/shell/e-shell.c:408
-msgid "Preparing to go online..."
-msgstr "正在准备上线..."
+msgid "Preparing to go online…"
+msgstr "正在准备上线……"
#: ../src/shell/e-shell.c:519
msgid "Preparing to quit"
msgstr "正在准备退出"
#: ../src/shell/e-shell.c:525
-msgid "Preparing to quit..."
-msgstr "正在准备退出..."
+msgid "Preparing to quit…"
+msgstr "正在准备退出…"
-#: ../src/shell/e-shell.c:926
-#, fuzzy
-#| msgid "Settings"
+#: ../src/shell/e-shell.c:1088
msgid "Open _Settings"
-msgstr "设置"
+msgstr "打开设置(_S)"
-#: ../src/shell/e-shell.c:1127
+#: ../src/shell/e-shell.c:1297
msgid "Credentials are required to connect to the destination host."
-msgstr "需要凭证来连接到目的主机"
-
-#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:836
-msgid "New _Window"
-msgstr "新建窗口(_W)"
-
-#: ../src/shell/e-shell.c:1308
-msgid "Quick _Reference"
-msgstr "速查表(_R)"
-
-#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:773
-msgid "_About"
-msgstr "关于(_A)"
+msgstr "需要凭证来连接到目标主机。"
-#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:871
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../src/shell/e-shell-content.c:718 ../src/shell/e-shell-content.c:719
+#: ../src/shell/e-shell-content.c:702 ../src/shell/e-shell-content.c:703
msgid "Searches"
msgstr "搜索"
-#: ../src/shell/e-shell-content.c:762
+#: ../src/shell/e-shell-content.c:746
msgid "Save Search"
msgstr "保存搜索"
@@ -25151,28 +27561,28 @@ msgstr "显示(_W)："
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:950
+#: ../src/shell/e-shell-searchbar.c:951
msgid "Sear_ch:"
msgstr "搜索(_C)："
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1018
+#: ../src/shell/e-shell-searchbar.c:1019
msgid "i_n"
msgstr "在(_N) "
-#: ../src/shell/e-shell-utils.c:179
+#: ../src/shell/e-shell-utils.c:169
msgid "vCard (.vcf)"
msgstr "vCard (.vff)"
-#: ../src/shell/e-shell-utils.c:205
+#: ../src/shell/e-shell-utils.c:195
msgid "All Files (*)"
msgstr "全部文件(*)"
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../src/shell/e-shell-utils.c:419
+#: ../src/shell/e-shell-utils.c:343
msgid "translator-credits"
msgstr ""
"Wang Li <charles linux net cn>, 2002, 2003\n"
@@ -25187,306 +27597,351 @@ msgstr ""
"Jeff Bai <jeffbai aosc xyz>, 2015, 2016\n"
"Dingzhong Chen <wsxy162 gmail com>, 2015, 2016"
-#: ../src/shell/e-shell-utils.c:430
-msgid "Evolution Website"
-msgstr "Evolution 网站"
+#: ../src/shell/e-shell-utils.c:354
+msgid "Website"
+msgstr "网站"
-#: ../src/shell/e-shell-view.c:290
+#: ../src/shell/e-shell-view.c:295
msgid "Saving user interface state"
msgstr "保存用户界面状态"
-#: ../src/shell/e-shell-window-actions.c:275
+#: ../src/shell/e-shell-window-actions.c:351
msgid "Categories Editor"
msgstr "类别编辑器"
-#: ../src/shell/e-shell-window-actions.c:594
+#: ../src/shell/e-shell-window-actions.c:654
msgid "Bug Buddy is not installed."
msgstr "未安装 Bug Buddy。"
-#: ../src/shell/e-shell-window-actions.c:595
+#: ../src/shell/e-shell-window-actions.c:655
msgid "Bug Buddy could not be run."
msgstr "无法运行 Bug Buddy。"
-#: ../src/shell/e-shell-window-actions.c:775
+#: ../src/shell/e-shell-window-actions.c:851
+#, fuzzy
+#| msgid "Collection"
+msgid "Collect_ion Account"
+msgstr "收藏"
+
+#: ../src/shell/e-shell-window-actions.c:853
+#, fuzzy
+#| msgid "Create a new mail account"
+msgid "Create a new collection account"
+msgstr "创建新邮件帐号"
+
+#: ../src/shell/e-shell-window-actions.c:861
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../src/shell/e-shell-window-actions.c:863
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../src/shell/e-shell-window-actions.c:780
-#: ../src/shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:868
+msgid "_Accounts"
+msgstr "帐号(_A)"
+
+#: ../src/shell/e-shell-window-actions.c:870
+msgid "Configure Evolution Accounts"
+msgstr "配置 Evolution 帐号"
+
+#: ../src/shell/e-shell-window-actions.c:875
+#: ../src/shell/e-shell-window-actions.c:889
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../src/shell/e-shell-window-actions.c:801
+#: ../src/shell/e-shell-window-actions.c:896
msgid "_Contents"
msgstr "目录(_C)"
-#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:898
msgid "Open the Evolution User Guide"
msgstr "打开 Evolution 用户指南"
-#: ../src/shell/e-shell-window-actions.c:829
-msgid "I_mport..."
-msgstr "导入(_M)..."
+#: ../src/shell/e-shell-window-actions.c:924
+msgid "I_mport…"
+msgstr "导入(_M)…"
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:926
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:931
+msgid "New _Window"
+msgstr "新建窗口(_W)"
+
+#: ../src/shell/e-shell-window-actions.c:933
msgid "Create a new window displaying this view"
msgstr "创建一个新窗口来显示这个视图"
-#: ../src/shell/e-shell-window-actions.c:850
+#: ../src/shell/e-shell-window-actions.c:945
msgid "Available Cate_gories"
msgstr "可用类别(_G)"
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/shell/e-shell-window-actions.c:947
msgid "Manage available categories"
msgstr "管理可用类别"
-#: ../src/shell/e-shell-window-actions.c:864
-msgid "_Quick Reference"
-msgstr "快速指南(_Q)"
-
-#: ../src/shell/e-shell-window-actions.c:866
-#, fuzzy
-#| msgid "Show Evolution's shortcut keys"
-msgid "Show Evolution’s shortcut keys"
-msgstr "显示 Evolution 的快捷键"
+#: ../src/shell/e-shell-window-actions.c:959
+msgid "_Quit"
+msgstr "退出(_Q)"
-#: ../src/shell/e-shell-window-actions.c:873
+#: ../src/shell/e-shell-window-actions.c:961
msgid "Exit the program"
msgstr "退出程序"
-#: ../src/shell/e-shell-window-actions.c:878
-msgid "_Advanced Search..."
-msgstr "高级搜索(_A)..."
+#: ../src/shell/e-shell-window-actions.c:966
+msgid "_Advanced Search…"
+msgstr "高级搜索(_A)…"
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:968
msgid "Construct a more advanced search"
msgstr "构造一个更高级的搜索"
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:975
msgid "Clear the current search parameters"
msgstr "清除当前搜索参数"
-#: ../src/shell/e-shell-window-actions.c:892
-msgid "_Edit Saved Searches..."
+#: ../src/shell/e-shell-window-actions.c:980
+#, fuzzy
+#| msgid "_Edit Saved Searches..."
+msgid "_Edit Saved Searches…"
msgstr "编辑保存的搜索(_E)..."
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:982
msgid "Manage your saved searches"
msgstr "管理您保存的搜索"
-#: ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell-window-actions.c:989
msgid "Click here to change the search type"
msgstr "单击此处更改搜索类型"
-#: ../src/shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:994
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:996
msgid "Execute the current search parameters"
msgstr "执行当前搜索参数"
-#: ../src/shell/e-shell-window-actions.c:913
-msgid "_Save Search..."
-msgstr "保存搜索(_S)..."
+#: ../src/shell/e-shell-window-actions.c:1001
+#, fuzzy
+#| msgid "Save Search"
+msgid "_Save Search…"
+msgstr "保存搜索"
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:1003
msgid "Save the current search parameters"
msgstr "保存当前搜索参数"
-#: ../src/shell/e-shell-window-actions.c:927
-msgid "Submit _Bug Report..."
-msgstr "提交错误报告(_B)..."
+#: ../src/shell/e-shell-window-actions.c:1015
+msgid "_Keyboard Shortcuts"
+msgstr "键盘快捷键(_K)"
+
+#: ../src/shell/e-shell-window-actions.c:1017
+msgid "Show keyboard shortcuts"
+msgstr "显示键盘快捷键"
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/shell/e-shell-window-actions.c:1022
+msgid "Submit _Bug Report…"
+msgstr "提交错误报告(_B)…"
+
+#: ../src/shell/e-shell-window-actions.c:1024
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:1029
msgid "_Work Offline"
msgstr "离线工作(_W)"
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:1031
msgid "Put Evolution into offline mode"
msgstr "将 Evolution 转入离线模式"
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:1036
msgid "_Work Online"
msgstr "在线工作(_W)"
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:1038
msgid "Put Evolution into online mode"
msgstr "将 Evolution 转入在线模式"
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:1066
msgid "Lay_out"
msgstr "布局(_O)"
#. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:979
+#: ../src/shell/e-shell-window-actions.c:1074
msgid "_New"
msgstr "新建(_N)"
-#: ../src/shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:1081
msgid "_Search"
msgstr "搜索(_S)"
-#: ../src/shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:1088
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../src/shell/e-shell-window-actions.c:1007
+#: ../src/shell/e-shell-window-actions.c:1102
msgid "_Window"
msgstr "窗口(_W)"
-#: ../src/shell/e-shell-window-actions.c:1036
-#, fuzzy
-#| msgid "Show _Status Bar"
+#: ../src/shell/e-shell-window-actions.c:1131
msgid "Show _Menu Bar"
-msgstr "显示状态栏(_S)"
+msgstr "显示菜单栏(_M)"
-#: ../src/shell/e-shell-window-actions.c:1038
-#, fuzzy
-#| msgid "Show the side bar"
+#: ../src/shell/e-shell-window-actions.c:1133
msgid "Show the menu bar"
-msgstr "显示侧边栏"
+msgstr "显示菜单栏"
-#: ../src/shell/e-shell-window-actions.c:1044
+#: ../src/shell/e-shell-window-actions.c:1139
msgid "Show Side _Bar"
msgstr "显示侧边栏(_B)"
-#: ../src/shell/e-shell-window-actions.c:1046
+#: ../src/shell/e-shell-window-actions.c:1141
msgid "Show the side bar"
msgstr "显示侧边栏"
-#: ../src/shell/e-shell-window-actions.c:1052
+#: ../src/shell/e-shell-window-actions.c:1147
msgid "Show _Buttons"
msgstr "显示按钮(_B)"
-#: ../src/shell/e-shell-window-actions.c:1054
+#: ../src/shell/e-shell-window-actions.c:1149
msgid "Show the switcher buttons"
msgstr "显示切换器按钮"
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1155
msgid "Show _Status Bar"
msgstr "显示状态栏(_S)"
-#: ../src/shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:1157
msgid "Show the status bar"
msgstr "显示状态栏"
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1163
msgid "Show _Tool Bar"
msgstr "显示工具栏(_T)"
-#: ../src/shell/e-shell-window-actions.c:1070
+#: ../src/shell/e-shell-window-actions.c:1165
msgid "Show the tool bar"
msgstr "显示工具栏"
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1187
msgid "_Icons Only"
msgstr "只有图标(_I)"
-#: ../src/shell/e-shell-window-actions.c:1094
+#: ../src/shell/e-shell-window-actions.c:1189
msgid "Display window buttons with icons only"
msgstr "显示只有图标的窗口按钮"
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1194
msgid "_Text Only"
msgstr "只有文字(_T)"
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1196
msgid "Display window buttons with text only"
msgstr "显示只有文字的窗口按钮"
-#: ../src/shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1201
msgid "Icons _and Text"
msgstr "图标和文字(_A)"
-#: ../src/shell/e-shell-window-actions.c:1108
+#: ../src/shell/e-shell-window-actions.c:1203
msgid "Display window buttons with icons and text"
msgstr "显示带图标和文字的窗口按钮"
-#: ../src/shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1208
msgid "Tool_bar Style"
msgstr "工具栏样式(_B)"
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1210
msgid "Display window buttons using the desktop toolbar setting"
msgstr "使用桌面工具栏设置显示窗口按钮"
-#: ../src/shell/e-shell-window-actions.c:1123
+#: ../src/shell/e-shell-window-actions.c:1218
msgid "Delete Current View"
msgstr "保存当前视图"
-#: ../src/shell/e-shell-window-actions.c:1130
-msgid "Save Custom View..."
-msgstr "保存当前视图..."
+#: ../src/shell/e-shell-window-actions.c:1225
+msgid "Save Custom View…"
+msgstr "保存当前视图…"
-#: ../src/shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1227
msgid "Save current custom view"
msgstr "保存当前自定义视图"
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1241
msgid "C_urrent View"
msgstr "当前视图(_U)"
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1251
msgid "Custom View"
msgstr "当前视图"
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1253
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
-#: ../src/shell/e-shell-window-actions.c:1159
-msgid "Page Set_up..."
-msgstr "页面设置(_U)..."
+#: ../src/shell/e-shell-window-actions.c:1261
+msgid "Page Set_up…"
+msgstr "页面设置(_U)…"
-#: ../src/shell/e-shell-window-actions.c:1161
+#: ../src/shell/e-shell-window-actions.c:1263
msgid "Change the page settings for your current printer"
msgstr "更改当前打印机的页面设置"
-#: ../src/shell/e-shell-window-actions.c:1530
+#: ../src/shell/e-shell-window-actions.c:1633
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../src/shell/e-shell-window-actions.c:1653
+#: ../src/shell/e-shell-window-actions.c:1757
#, c-format
msgid "Select view: %s"
msgstr "选择视图：%s"
-#: ../src/shell/e-shell-window-actions.c:1670
+#: ../src/shell/e-shell-window-actions.c:1774
#, c-format
msgid "Delete view: %s"
msgstr "删除视图：%s"
-#: ../src/shell/e-shell-window-actions.c:1771
+#: ../src/shell/e-shell-window-actions.c:1884
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:563
+#: ../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:720
-#, fuzzy, c-format
-#| msgid "%s - Evolution"
+#: ../src/shell/e-shell-window-private.c:826
+#, c-format
msgid "%s — Evolution"
-msgstr "%s - Evolution"
+msgstr "%s — Evolution"
#. Preview/Alpha/Beta version warning message
-#: ../src/shell/main.c:195
-#, no-c-format
+#: ../src/shell/main.c:192
+#, fuzzy, no-c-format
+#| msgid ""
+#| "Hi. Thanks for taking the time to download this preview release\n"
+#| "of the Evolution groupware suite.\n"
+#| "\n"
+#| "This version of Evolution is not yet complete. It is getting close,\n"
+#| "but some features are either unfinished or do not work properly.\n"
+#| "\n"
+#| "If you want a stable version of Evolution, we urge you to uninstall\n"
+#| "this version, and install version %s instead.\n"
+#| "\n"
+#| "If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+#| "This product comes with no warranty and is not intended for\n"
+#| "individuals prone to violent fits of anger.\n"
+#| "\n"
+#| "We hope that you enjoy the results of our hard work, and we\n"
+#| "eagerly await your contributions!\n"
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
"of the Evolution groupware suite.\n"
@@ -25497,7 +27952,8 @@ msgid ""
"If you want a stable version of Evolution, we urge you to uninstall\n"
"this version, and install version %s instead.\n"
"\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"If you find bugs, please report them at\n"
+"https://gitlab.gnome.org/GNOME/evolution/issues/.\n";
"This product comes with no warranty and is not intended for\n"
"individuals prone to violent fits of anger.\n"
"\n"
@@ -25517,7 +27973,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
-#: ../src/shell/main.c:219
+#: ../src/shell/main.c:217
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -25525,13 +27981,13 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../src/shell/main.c:225
+#: ../src/shell/main.c:223
msgid "Do not tell me again"
msgstr "不要再通知我"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../src/shell/main.c:314
+#: ../src/shell/main.c:325
#, fuzzy
#| msgid ""
#| "Start Evolution showing the specified component. Available options are "
@@ -25543,52 +27999,50 @@ msgstr ""
"启动 Evolution 后显示特定组件。可用的选项"
"有“mail”、“calendar”、“contacts”、“tasks”和“memos”"
-#: ../src/shell/main.c:318
+#: ../src/shell/main.c:329
msgid "Apply the given geometry to the main window"
msgstr "应用给定的几何参数到主窗口"
-#: ../src/shell/main.c:322
+#: ../src/shell/main.c:333
msgid "Start in online mode"
msgstr "以在线模式启动"
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:335
msgid "Ignore network availability"
msgstr "忽略网络是否可用"
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:338
msgid "Forcibly shut down Evolution"
msgstr "强制关闭所有 Evolution"
-#: ../src/shell/main.c:330
+#: ../src/shell/main.c:341
msgid "Disable loading of any plugins."
msgstr "禁止载入任何插件。"
-#: ../src/shell/main.c:332
+#: ../src/shell/main.c:343
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "禁用邮件、联系人和任务的预览面板。"
-#: ../src/shell/main.c:336
+#: ../src/shell/main.c:347
msgid "Import URIs or filenames given as rest of arguments."
msgstr "导入 URI 或者给定文件名作为剩余参数。"
-#: ../src/shell/main.c:338
+#: ../src/shell/main.c:349
msgid "Request a running Evolution process to quit"
msgstr "请求正在运行的 Evolution 进程退出"
-#: ../src/shell/main.c:415
+#: ../src/shell/main.c:431
#, c-format
msgid ""
"Cannot start Evolution. Another Evolution instance may be unresponsive. "
"System error: %s"
msgstr "无法启动 Evolution。也许有另外的 Evolution 实例没有响应。系统错误：%s"
-#: ../src/shell/main.c:466 ../src/shell/main.c:471
-#, fuzzy
-#| msgid "- The Evolution PIM and Email Client"
+#: ../src/shell/main.c:493 ../src/shell/main.c:498
msgid "— The Evolution PIM and Email Client"
-msgstr "- Evolution 个人信息管理和邮件客户"
+msgstr "— Evolution 个人信息管理和邮件客户端"
-#: ../src/shell/main.c:533
+#: ../src/shell/main.c:554
#, fuzzy, c-format
#| msgid ""
#| "%s: --online and --offline cannot be used together.\n"
@@ -25600,7 +28054,7 @@ msgstr ""
"%s：不能同时使用 --online 和 --offline。\n"
" 运行 %s --help 了解更多信息。\n"
-#: ../src/shell/main.c:539
+#: ../src/shell/main.c:560
#, fuzzy, c-format
#| msgid ""
#| "%s: --force-online and --offline cannot be used together.\n"
@@ -25612,6 +28066,10 @@ msgstr ""
"%s：不能同时使用 --force-online 和 --offline。\n"
" 运行 %s --help 了解更多信息。\n"
+#: ../src/shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "正在导入..."
+
#: ../src/shell/shell.error.xml.h:2
msgid "Upgrade from previous version failed:"
msgstr "从先前版本升级失败："
@@ -25743,6 +28201,10 @@ msgstr "为“{0}”的 SSL 认证未被信任。"
msgid "Reason: {1}"
msgstr "原因：{1}"
+#: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
+msgid "_View Certificate"
+msgstr "查看证书(_V)"
+
#: ../src/shell/shell.error.xml.h:29
#, fuzzy
#| msgid "SSL certificate for address book '{0}' is not trusted."
@@ -25773,12 +28235,20 @@ msgstr "备忘录“{0}”的 SSL 证书不受信任。"
msgid "SSL certificate for task list “{0}” is not trusted."
msgstr "任务列表“{0}”的 SSL 证书不受信任。"
+#: ../src/shell/shell.error.xml.h:34
+msgid "Menu Bar is hidden"
+msgstr "菜单栏已隐藏"
+
+#: ../src/shell/shell.error.xml.h:35
+msgid "Press the “Alt” key to access the Menu Bar again."
+msgstr "按下“Alt”键以重新使用菜单栏。"
+
+#: ../src/shell/shell.error.xml.h:36
+msgid "_Show Menu Bar"
+msgstr "显示菜单栏(_S)"
+
#: ../src/smime/gui/ca-trust-dialog.c:104
-#, fuzzy, c-format
-#| msgid ""
-#| "Certificate '%s' is a CA certificate.\n"
-#| "\n"
-#| "Edit trust settings:"
+#, c-format
msgid ""
"Certificate “%s” is a CA certificate.\n"
"\n"
@@ -25863,40 +28333,40 @@ msgstr "MD5 指纹"
msgid "Email Address"
msgstr "电子邮件地址"
-#: ../src/smime/gui/certificate-manager.c:663
-msgid "Select a file to backup your key and certificate..."
-msgstr "选择一个文件来备份密钥和证书…"
+#: ../src/smime/gui/certificate-manager.c:648
+msgid "Select a file to backup your key and certificate…"
+msgstr "选择一个文件来备份您的密钥和证书…"
#. To Translators:
#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
#. * when a user wants to backup one of her/his private keys/certificates.
#. * For example: gnomedev-backup.p12
#.
-#: ../src/smime/gui/certificate-manager.c:675
+#: ../src/smime/gui/certificate-manager.c:658
#, c-format
msgid "%s-backup.p12"
msgstr "%s-备份.p12"
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:721
msgid "Backup Certificate"
msgstr "备份证书"
#. filename selection
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:736
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:760
-msgid "Please select a file..."
+#: ../src/smime/gui/certificate-manager.c:741
+msgid "Please select a file…"
msgstr "请选择一个文件…"
-#: ../src/smime/gui/certificate-manager.c:774
+#: ../src/smime/gui/certificate-manager.c:755
msgid "_Include certificate chain in the backup"
msgstr "在备份里包含证书链(_I)"
#. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:761
msgid ""
"The certificate backup password you set here protects the backup file that "
"you are about to create.\n"
@@ -25905,16 +28375,16 @@ msgstr ""
"您在这里设置的证书备份密码保护您将要创建的备份文件。\n"
"继续进行备份必须要你设置这个密码。"
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:780
msgid "_Repeat Password:"
msgstr "重复密码(_P)："
-#: ../src/smime/gui/certificate-manager.c:818
+#: ../src/smime/gui/certificate-manager.c:799
msgid "Passwords do not match"
msgstr "密码不匹配"
#. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:826
+#: ../src/smime/gui/certificate-manager.c:807
msgid ""
"Important:\n"
"If you forget your certificate backup password, you will not be able to "
@@ -25925,311 +28395,866 @@ msgstr ""
"如果您忘记您的证书备份密码，你今后就不能还原备份。\n"
"请将它记录在安全的地方。"
-#: ../src/smime/gui/certificate-manager.c:871
+#: ../src/smime/gui/certificate-manager.c:852
msgid "No file name provided"
msgstr "没有提供文件名"
-#: ../src/smime/gui/certificate-manager.c:875
+#: ../src/smime/gui/certificate-manager.c:856
msgid "Failed to backup key and certificate"
msgstr "备份密钥和证书失败"
-#: ../src/smime/gui/certificate-manager.c:964
-msgid "Select a certificate to import..."
-msgstr "选择要导入的证书..."
+#: ../src/smime/gui/certificate-manager.c:948
+msgid "Select a certificate to import…"
+msgstr "选择要导入的证书…"
-#: ../src/smime/gui/certificate-manager.c:1014
+#: ../src/smime/gui/certificate-manager.c:997
msgid "Failed to import certificate"
msgstr "导入证书失败"
-#: ../src/smime/gui/certificate-manager.c:1130
+#: ../src/smime/gui/certificate-manager.c:1114
msgctxt "CamelTrust"
msgid "Ask when used"
msgstr "使用时询问"
-#: ../src/smime/gui/certificate-manager.c:1132
-msgctxt "CamelTrust"
-msgid "Never"
-msgstr "从不"
+#: ../src/smime/gui/certificate-manager.c:1116
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "从不"
+
+#: ../src/smime/gui/certificate-manager.c:1118
+msgctxt "CamelTrust"
+msgid "Marginally"
+msgstr "勉强的"
+
+#: ../src/smime/gui/certificate-manager.c:1120
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "完整"
+
+#: ../src/smime/gui/certificate-manager.c:1122
+msgctxt "CamelTrust"
+msgid "Ultimately"
+msgstr "彻底的"
+
+#: ../src/smime/gui/certificate-manager.c:1124
+msgctxt "CamelTrust"
+msgid "Temporarily"
+msgstr "暂时的"
+
+#: ../src/smime/gui/certificate-manager.c:1330
+msgid "Change certificate trust"
+msgstr "变更证书信任"
+
+#: ../src/smime/gui/certificate-manager.c:1342
+#, c-format
+msgid "Change trust for the host “%s”:"
+msgstr "变更对主机“%s”的信任："
+
+#: ../src/smime/gui/certificate-manager.c:1366
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "使用时询问(_A)"
+
+#: ../src/smime/gui/certificate-manager.c:1367
+msgctxt "CamelTrust"
+msgid "_Never trust this certificate"
+msgstr "永不信任此证书(_N)"
+
+#: ../src/smime/gui/certificate-manager.c:1368
+msgctxt "CamelTrust"
+msgid "_Temporarily trusted (this session only)"
+msgstr "暂时信任(仅此会话)(_T)"
+
+#: ../src/smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Marginally trusted"
+msgstr "勉强信任(_M)"
+
+#: ../src/smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Fully trusted"
+msgstr "完全信任(_F)"
+
+#: ../src/smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Ultimately trusted"
+msgstr "绝对信任(_U)"
+
+#: ../src/smime/gui/certificate-manager.c:1375
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr "在信任此网站之前，您应该先检查该证书及其策略和过程(若可用)。"
+
+#: ../src/smime/gui/certificate-manager.c:1390
+msgid "_Display certificate"
+msgstr "查看证书(_D)"
+
+#: ../src/smime/gui/certificate-manager.c:1595
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "您拥有证明这些邮件服务器的证书："
+
+#: ../src/smime/gui/certificate-manager.c:1626
+msgid "Host name"
+msgstr "主机名称"
+
+#: ../src/smime/gui/certificate-manager.c:1628
+msgid "Issuer"
+msgstr "发行者"
+
+#: ../src/smime/gui/certificate-manager.c:1629
+msgid "Fingerprint"
+msgstr "指纹"
+
+#: ../src/smime/gui/certificate-manager.c:1630
+msgid "Trust"
+msgstr "信任"
+
+#: ../src/smime/gui/certificate-manager.c:1651
+msgid "_Edit Trust"
+msgstr "编辑信任(_E)"
+
+#: ../src/smime/gui/certificate-manager.c:2105
+msgid "All PKCS12 files"
+msgstr "全部 PKCS12 文件"
+
+#: ../src/smime/gui/certificate-manager.c:2122
+msgid "All email certificate files"
+msgstr "所有电子邮件证书文件"
+
+#: ../src/smime/gui/certificate-manager.c:2139
+msgid "All CA certificate files"
+msgstr "全部颁证机构文件"
+
+#: ../src/smime/gui/cert-trust-dialog.c:150
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr "由于您信任颁发此证书的机构，您就将信任此证书的权威性，除非在此声明"
+
+#: ../src/smime/gui/cert-trust-dialog.c:155
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr "由于您不信任颁发此证书的机构，您就将不信任此证书的权威性，除非在此声明"
+
+#: ../src/smime/gui/component.c:53
+#, c-format
+msgid "Enter the password for “%s”, token “%s”"
+msgstr "输入“%s”的密码，令牌“%s”"
+
+#: ../src/smime/gui/component.c:55
+#, c-format
+msgid "Enter the password for “%s”"
+msgstr "输入“%s”的密码"
+
+#. we're setting the password initially
+#: ../src/smime/gui/component.c:83
+msgid "Enter new password for certificate database"
+msgstr "输入证书数据库的新密码"
+
+#: ../src/smime/gui/component.c:86
+msgid "Enter new password"
+msgstr "输入新密码"
+
+#: ../src/smime/gui/e-cert-selector.c:178
+msgid "Select certificate"
+msgstr "选择证书"
+
+#: ../src/smime/gui/smime-ui.ui.h:1
+msgid "You have certificates from these organizations that identify you:"
+msgstr "您拥有这些组织证明您身份的证书："
+
+#: ../src/smime/gui/smime-ui.ui.h:2
+msgid "Certificates Table"
+msgstr "证书表"
+
+#. This is a verb, as in "make a backup".
+#: ../src/smime/gui/smime-ui.ui.h:5
+msgid "_Backup"
+msgstr "备份(_B)"
+
+#: ../src/smime/gui/smime-ui.ui.h:6
+msgid "Backup _All"
+msgstr "全部备份(_A)"
+
+#: ../src/smime/gui/smime-ui.ui.h:9
+msgid "Your Certificates"
+msgstr "您的证书"
+
+#: ../src/smime/gui/smime-ui.ui.h:10
+msgid "You have certificates on file that identify these people:"
+msgstr "您拥有证明这些人的文件型证书："
+
+#: ../src/smime/gui/smime-ui.ui.h:12
+msgid "Contact Certificates"
+msgstr "联系人证书"
+
+#: ../src/smime/gui/smime-ui.ui.h:13
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
+msgstr "您拥有证明这些颁发机构的文件型证书："
+
+#: ../src/smime/gui/smime-ui.ui.h:14
+msgid "Authorities"
+msgstr "证书颁发机构"
+
+#: ../src/smime/gui/smime-ui.ui.h:15
+msgid "Certificate Authority Trust"
+msgstr "证书颁发机构信任"
+
+#: ../src/smime/gui/smime-ui.ui.h:19
+msgid "Trust this CA to identify _websites."
+msgstr "信任此颁发机构标识的网站(_W)。"
+
+#: ../src/smime/gui/smime-ui.ui.h:20
+msgid "Trust this CA to identify _email users."
+msgstr "信任此颁发机构标识的电子邮件用户(_E)。"
+
+#: ../src/smime/gui/smime-ui.ui.h:21
+msgid "Trust this CA to identify _software developers."
+msgstr "信任此颁发机构标识的软件开发者(_S)。"
+
+#: ../src/smime/gui/smime-ui.ui.h:22
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr "在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
+
+#: ../src/smime/gui/smime-ui.ui.h:23
+msgid "Email Certificate Trust Settings"
+msgstr "电子邮件证书信任设置"
+
+#: ../src/smime/gui/smime-ui.ui.h:24
+msgid "_Edit CA Trust"
+msgstr "编辑 CA 信任(_E)"
+
+#: ../src/smime/gui/smime-ui.ui.h:25
+msgid "Trust the authenticity of this certificate"
+msgstr "信任此证书的颁发机构"
+
+#: ../src/smime/gui/smime-ui.ui.h:26
+msgid "Do not trust the authenticity of this certificate"
+msgstr "不信任此证书的颁发机构"
+
+#: ../src/smime/gui/smime-ui.ui.h:29
+msgid "C_ertificate:"
+msgstr "证书(_E)："
+
+#. x509 certificate usage types
+#: ../src/smime/lib/e-cert.c:402
+msgid "Sign"
+msgstr "签名"
+
+#: ../src/smime/lib/e-cert.c:403
+msgid "Encrypt"
+msgstr "加密"
+
+#: ../src/smime/lib/e-cert-db.c:788
+msgid "Certificate already exists"
+msgstr "证书已经存在"
+
+#: ../src/smime/lib/e-pkcs12.c:200
+msgid "PKCS12 File Password"
+msgstr "PKCS12 文件密码"
+
+#: ../src/smime/lib/e-pkcs12.c:201
+msgid "Enter password for PKCS12 file:"
+msgstr "输入 PKCS12 文件的密码："
+
+#: ../src/smime/lib/e-pkcs12.c:327
+#, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "无法创建导出环境，错误码：%i"
+
+#: ../src/smime/lib/e-pkcs12.c:334
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "无法设置密码的完整性，错误码：%i"
+
+# PKCS12 safe bag
+#: ../src/smime/lib/e-pkcs12.c:344
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "创建安全袋(safe bag)失败，错误码 %i"
+
+#: ../src/smime/lib/e-pkcs12.c:362
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "无法添加密钥/证书到存储，错误码：%i"
+
+#: ../src/smime/lib/e-pkcs12.c:380
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "无法写存储到磁盘，错误码：%i"
+
+#: ../src/smime/lib/e-pkcs12.c:407
+msgid "Imported Certificate"
+msgstr "导入的证书"
+
+#~ msgid "Evolution Alarm Notify"
+#~ msgstr "Evolution 提醒通知"
+
+#~ msgid "Calendar event notifications"
+#~ msgstr "日历事件信息"
+
+#~ msgid ""
+#~ "Default reminder snooze interval, in minutes, to be filled in the "
+#~ "reminder notification dialog"
+#~ msgstr "预览提醒的小睡间隔，以分钟计，会用于提醒通知对话盒中"
+
+#, fuzzy
+#~| msgctxt "iCalImp"
+#~| msgid "has reminders"
+#~ msgid "Allow past reminders"
+#~ msgstr "有提醒"
+
+#~ msgid "Reminder programs"
+#~ msgstr "提醒程序"
+
+#~ msgid "Programs that are allowed to be run by reminders"
+#~ msgstr "允许提醒运行的程序。"
+
+#~ msgid "Show display reminders in notification tray"
+#~ msgstr "在通知托盘中显示提醒"
+
+#~ msgid "Whether or not to use the notification tray for display reminders"
+#~ msgstr "是否使用通知托盘来显示提醒。"
+
+#, fuzzy
+#~| msgid "Sh_ow reminder notifications"
+#~ msgid "Show reminder notification dialog always on top"
+#~ msgstr "显示提醒通知(_O)"
+
+#~ msgid "Show reminders for completed tasks"
+#~ msgstr "显示已完成工作的提醒"
+
+#~ msgid ""
+#~ "Whether to show reminders for completed tasks. When set to false, "
+#~ "reminders for completed tasks are suppressed."
+#~ msgstr "是否显示已完成工作的提醒。设置为 false 时，会抑制已完成工作的提醒。"
+
+#~ msgid "Logfile to log filter actions."
+#~ msgstr "记录过滤动作的日志文件。"
+
+#~ msgid ""
+#~ "Check to make sure your password is spelled correctly and that you are "
+#~ "using a supported login method. Remember that many passwords are case "
+#~ "sensitive; your caps lock might be on."
+#~ msgstr ""
+#~ "选中此处以确保您的密码拼写正确，并确保您使用了支持的登录方式。请记住，很多"
+#~ "密码都是区分大小写的；您的 Caps Lock 灯可能为开。"
+
+#, fuzzy
+#~| msgid "Delete address book '{0}'?"
+#~ msgid "Delete address book “{0}”?"
+#~ msgstr "删除地址簿“{0}”吗？"
+
+#~ msgid "minute"
+#~ msgid_plural "minutes"
+#~ msgstr[0] "分钟"
+
+#~ msgid "hour"
+#~ msgid_plural "hours"
+#~ msgstr[0] "小时"
+
+#~ msgid "day"
+#~ msgid_plural "days"
+#~ msgstr[0] "天"
+
+#~ msgid "Start time"
+#~ msgstr "开始时间"
+
+#~ msgid "Appointments"
+#~ msgstr "约会"
+
+#~ msgid "Dismiss _All"
+#~ msgstr "全部错过(_A)"
+
+#~ msgid "_Snooze"
+#~ msgstr "小睡(_S)"
+
+#~ msgid "location of appointment"
+#~ msgstr "约会位置"
+
+#~ msgid "Snooze _time:"
+#~ msgstr "小睡时间(_T)："
+
+#~ msgid "No summary available."
+#~ msgstr "没有可用的摘要。"
+
+#~ msgid "No description available."
+#~ msgstr "没有描述。"
+
+#~ msgid "No location information available."
+#~ msgstr "没有可用的位置信息。"
+
+#~ msgid "Evolution Reminders"
+#~ msgstr "Evolution 提醒器"
+
+#~ msgid "You have %d reminder"
+#~ msgid_plural "You have %d reminders"
+#~ msgstr[0] "您有 %d 条提醒"
+
+#~ msgid "Warning"
+#~ msgstr "警告"
+
+#~ msgid "_Yes"
+#~ msgstr "是(_Y)"
+
+#~ msgid ""
+#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
+#~ "configured to run the following program:\n"
+#~ "\n"
+#~ " %s\n"
+#~ "\n"
+#~ "Are you sure you want to run this program?"
+#~ msgstr ""
+#~ "Evolution 日历提醒将要触发。该提醒被配置为运行以下程序：\n"
+#~ "\n"
+#~ " %s\n"
+#~ "\n"
+#~ "您确信您要运行该程序吗？"
+
+#~ msgid "Do not ask me about this program again."
+#~ msgstr "不要再次询问此问题。"
+
+#~ msgid "invalid time"
+#~ msgstr "无效时间"
+
+#, fuzzy
+#~| msgid "Delete calendar '{0}'?"
+#~ msgid "Delete calendar “{0}”?"
+#~ msgstr "删除日历“{0}”吗？"
+
+#, fuzzy
+#~| msgid "Delete task list '{0}'?"
+#~ msgid "Delete task list “{0}”?"
+#~ msgstr "删除任务列表“{0}”吗？"
+
+#, fuzzy
+#~| msgid "Delete memo list '{0}'?"
+#~ msgid "Delete memo list “{0}”?"
+#~ msgstr "删除备忘录“{0}”吗？"
+
+#, fuzzy
+#~| msgid "Delete remote calendar '{0}'?"
+#~ msgid "Delete remote calendar “{0}”?"
+#~ msgstr "删除远端日历“{0}”吗？"
+
+#, fuzzy
+#~| msgid "Delete remote task list '{0}'?"
+#~ msgid "Delete remote task list “{0}”?"
+#~ msgstr "删除远端任务列表“{0}”吗？"
+
+#, fuzzy
+#~| msgid "Delete remote memo list '{0}'?"
+#~ msgid "Delete remote memo list “{0}”?"
+#~ msgstr "删除远端备忘录“{0}”吗？"
+
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d 周"
+
+#~ msgid "Summary:"
+#~ msgstr "概要："
+
+#~ msgctxt "cal-task-status"
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "_Attachment..."
+#~ msgstr "附件(_A)..."
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "出席者(_N)..."
+
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d 天前"
+
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d 时前"
+
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d 分前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "一刻钟前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "一小时前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "一天前"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "类别...(_C)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "未开始"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "进行中"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "已完成"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "已取消"
+
+#~ msgid "_Print..."
+#~ msgstr "打印(_P)..."
+
+#~ msgid "Pre_view..."
+#~ msgstr "预览(_V)..."
+
+#~ msgid "Select..."
+#~ msgstr "选择..."
+
+#~ msgid "Attendee "
+#~ msgstr "出席者 "
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "出席者(_N)..."
+
+#~ msgid "1st"
+#~ msgstr "1日"
+
+#~ msgid "2nd"
+#~ msgstr "2日"
+
+#~ msgid "3rd"
+#~ msgstr "3日"
+
+#~ msgid "4th"
+#~ msgstr "4日"
+
+#~ msgid "5th"
+#~ msgstr "5日"
+
+#~ msgid "6th"
+#~ msgstr "6日"
+
+#~ msgid "7th"
+#~ msgstr "7日"
+
+#~ msgid "8th"
+#~ msgstr "8日"
+
+#~ msgid "9th"
+#~ msgstr "9日"
+
+#~ msgid "10th"
+#~ msgstr "10日"
+
+#~ msgid "11th"
+#~ msgstr "11日"
+
+#~ msgid "12th"
+#~ msgstr "12日"
+
+#~ msgid "13th"
+#~ msgstr "13日"
+
+#~ msgid "14th"
+#~ msgstr "14日"
+
+#~ msgid "15th"
+#~ msgstr "15日"
+
+#~ msgid "16th"
+#~ msgstr "16日"
+
+#~ msgid "17th"
+#~ msgstr "17日"
+
+#~ msgid "18th"
+#~ msgstr "18日"
+
+#~ msgid "19th"
+#~ msgstr "19日"
+
+#~ msgid "20th"
+#~ msgstr "20日"
+
+#~ msgid "21st"
+#~ msgstr "21日"
+
+#~ msgid "22nd"
+#~ msgstr "22日"
+
+#~ msgid "23rd"
+#~ msgstr "23日"
+
+#~ msgid "24th"
+#~ msgstr "24日"
+
+#~ msgid "25th"
+#~ msgstr "25日"
+
+#~ msgid "26th"
+#~ msgstr "26日"
+
+#~ msgid "27th"
+#~ msgstr "27日"
+
+#~ msgid "28th"
+#~ msgstr "28日"
+
+#~ msgid "29th"
+#~ msgstr "29日"
+
+#~ msgid "30th"
+#~ msgstr "30日"
+
+#~ msgid "31st"
+#~ msgstr "31日"
+
+#~ msgid "Save _As..."
+#~ msgstr "另存为(_A)..."
+
+#~ msgid "This certificate is not viewable"
+#~ msgstr "此证书不可查看"
+
+#~ msgid "A_dd Attachment..."
+#~ msgstr "添加附件(_D)..."
+
+#~ msgid "Ctrl-click to open a link"
+#~ msgstr "Ctrl 加单击来打开一个链接"
+
+#~ msgid "Other..."
+#~ msgstr "其它..."
+
+#~ msgid "_Find..."
+#~ msgstr "查找(_F)..."
+
+#~ msgid "Re_place..."
+#~ msgstr "替换(_R)..."
+
+#~ msgid "_Image..."
+#~ msgstr "图像(_I)..."
+
+#~ msgid "_Link..."
+#~ msgstr "链接(_L)…"
-#: ../src/smime/gui/certificate-manager.c:1134
-msgctxt "CamelTrust"
-msgid "Marginally"
-msgstr "勉强的"
+#~ msgid "_Rule..."
+#~ msgstr "横线(_R)..."
-#: ../src/smime/gui/certificate-manager.c:1136
-msgctxt "CamelTrust"
-msgid "Fully"
-msgstr "完整"
+#~ msgid "_Table..."
+#~ msgstr "表格(_T)"
-#: ../src/smime/gui/certificate-manager.c:1138
-msgctxt "CamelTrust"
-msgid "Ultimately"
-msgstr "彻底的"
+#~ msgid "_Plain Text"
+#~ msgstr "纯文字(_P)"
-#: ../src/smime/gui/certificate-manager.c:1140
-msgctxt "CamelTrust"
-msgid "Temporarily"
-msgstr "暂时的"
+#~ msgid "Cell..."
+#~ msgstr "单元格…"
-#: ../src/smime/gui/certificate-manager.c:1346
-msgid "Change certificate trust"
-msgstr "变更证书信任"
+#~ msgid "Image..."
+#~ msgstr "图像…"
-#: ../src/smime/gui/certificate-manager.c:1358
-#, fuzzy, c-format
-#| msgid "Change trust for the host '%s':"
-msgid "Change trust for the host “%s”:"
-msgstr "变更信任对主机 \"%s\"："
+#~ msgid "Link..."
+#~ msgstr "链接…"
-#: ../src/smime/gui/certificate-manager.c:1382
-msgctxt "CamelTrust"
-msgid "_Ask when used"
-msgstr "使用时询问(_A)"
+#~ msgid "Page..."
+#~ msgstr "页面…"
-#: ../src/smime/gui/certificate-manager.c:1383
-msgctxt "CamelTrust"
-msgid "_Never trust this certificate"
-msgstr "永不信任此证书(_N)"
+#~ msgid "Rule..."
+#~ msgstr "横线..."
-#: ../src/smime/gui/certificate-manager.c:1384
-msgctxt "CamelTrust"
-msgid "_Temporarily trusted (this session only)"
-msgstr "暂时信任(仅此会话)(_T)"
+#~ msgid "Table..."
+#~ msgstr "表格…"
-#: ../src/smime/gui/certificate-manager.c:1385
-msgctxt "CamelTrust"
-msgid "_Marginally trusted"
-msgstr "勉强信任(_M)"
+#~ msgid "Text..."
+#~ msgstr "文字…"
-#: ../src/smime/gui/certificate-manager.c:1386
-msgctxt "CamelTrust"
-msgid "_Fully trusted"
-msgstr "完全信任(_F)"
+#~ msgid "<b>Colors</b>"
+#~ msgstr "<b>颜色</b>"
-#: ../src/smime/gui/certificate-manager.c:1387
-msgctxt "CamelTrust"
-msgid "_Ultimately trusted"
-msgstr "绝对信任(_U)"
+#~ msgid "<b>Background Image</b>"
+#~ msgstr "<b>背景图像</b>"
-#: ../src/smime/gui/certificate-manager.c:1391
-msgid ""
-"Before trusting this site, you should examine its certificate and its policy "
-"and procedures (if available)."
-msgstr "在信任此网站之前，您应该先检查该证书及其策略和过程(若可用)。"
+#~ msgid "User"
+#~ msgstr "用户"
-#: ../src/smime/gui/certificate-manager.c:1406
-msgid "_Display certificate"
-msgstr "查看证书(_D)"
+#~ msgid "More..."
+#~ msgstr "更多..."
-#: ../src/smime/gui/certificate-manager.c:1611
-msgid "You have certificates on file that identify these mail servers:"
-msgstr "您拥有证明这些邮件服务器的证书："
+#~ msgid "Add a C_olumn..."
+#~ msgstr "添加一列(_O)..."
-#: ../src/smime/gui/certificate-manager.c:1642
-msgid "Host name"
-msgstr "主机名称"
+#~ msgid "Custo_mize Current View..."
+#~ msgstr "自定义当前视图(_M)..."
-#: ../src/smime/gui/certificate-manager.c:1644
-msgid "Issuer"
-msgstr "发行者"
+#~ msgid "Save _Image..."
+#~ msgstr "保存图像(_I)..."
-#: ../src/smime/gui/certificate-manager.c:1645
-msgid "Fingerprint"
-msgstr "指纹"
+#~ msgid "OAuth2 Google"
+#~ msgstr "OAuth2 Google"
-#: ../src/smime/gui/certificate-manager.c:1646
-msgid "Trust"
-msgstr "信任"
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the Google "
+#~ "server"
+#~ msgstr "该选项将使用 OAuth 2.0 访问令牌连接到谷歌服务器。"
-#: ../src/smime/gui/certificate-manager.c:1667
-msgid "_Edit Trust"
-msgstr "编辑信任(_E)"
+#~ msgid "OAuth2"
+#~ msgstr "OAuth2"
-#: ../src/smime/gui/certificate-manager.c:2121
-msgid "All PKCS12 files"
-msgstr "全部 PKCS12 文件"
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the server"
+#~ msgstr "该选项将使用 OAuth 2.0 访问令牌连接到服务器。"
-#: ../src/smime/gui/certificate-manager.c:2138
-msgid "All email certificate files"
-msgstr "所有电子邮件证书文件"
+#~ msgid "Edit"
+#~ msgstr "编辑"
-#: ../src/smime/gui/certificate-manager.c:2155
-msgid "All CA certificate files"
-msgstr "全部颁证机构文件"
+#~ msgid "Retrieving message..."
+#~ msgstr "正在收取信息..."
-#: ../src/smime/gui/cert-trust-dialog.c:150
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr "由于您信任颁发此证书的机构，您就将信任此证书的权威性，除非在此声明"
+#~ msgid "_Copy to Folder..."
+#~ msgstr "复制到文件夹(_C)..."
-#: ../src/smime/gui/cert-trust-dialog.c:155
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr "由于您不信任颁发此证书的机构，您就将不信任此证书的权威性，除非在此声明"
+#~ msgid "Follow _Up..."
+#~ msgstr "跟随(_U)..."
-#: ../src/smime/gui/component.c:53
-#, fuzzy, c-format
-#| msgid "Enter the password for '%s', token '%s'"
-msgid "Enter the password for “%s”, token “%s”"
-msgstr "输入“%s”的密码，令牌 '%s'"
+#~ msgid "_Move to Folder..."
+#~ msgstr "移至文件夹(_M)..."
-#: ../src/smime/gui/component.c:55
-#, fuzzy, c-format
-#| msgid "Enter the password for '%s'"
-msgid "Enter the password for “%s”"
-msgstr "输入“%s”的密码"
+#~ msgid "_Delete old messages"
+#~ msgstr "删除旧的邮件(_D)"
-#. we're setting the password initially
-#: ../src/smime/gui/component.c:83
-msgid "Enter new password for certificate database"
-msgstr "输入证书数据库的新密码"
+#~ msgid "AutoArchive"
+#~ msgstr "自动归档"
-#: ../src/smime/gui/component.c:86
-msgid "Enter new password"
-msgstr "输入新密码"
+#~ msgid "Loading..."
+#~ msgstr "正在载入..."
-#: ../src/smime/gui/e-cert-selector.c:178
-msgid "Select certificate"
-msgstr "选择证书"
+#~ msgid "Security Information"
+#~ msgstr "安全信息"
-#: ../src/smime/gui/smime-ui.ui.h:1
-msgid "You have certificates from these organizations that identify you:"
-msgstr "您拥有这些组织证明您身份的证书："
+#~ msgid "Are you sure you want to delete this account?"
+#~ msgstr "您确定要删除此帐号吗？"
-#: ../src/smime/gui/smime-ui.ui.h:2
-msgid "Certificates Table"
-msgstr "证书表"
+#~ msgid "Address formatting"
+#~ msgstr "地址格式化"
-#. This is a verb, as in "make a backup".
-#: ../src/smime/gui/smime-ui.ui.h:5
-msgid "_Backup"
-msgstr "备份(_B)"
+#~ msgid "_Forward Contact..."
+#~ msgstr "转发联系人(_F)..."
-#: ../src/smime/gui/smime-ui.ui.h:6
-msgid "Backup _All"
-msgstr "全部备份(_A)"
+#~ msgid "_New Contact..."
+#~ msgstr "新建联系人(_N)..."
-#: ../src/smime/gui/smime-ui.ui.h:9
-msgid "Your Certificates"
-msgstr "您的证书"
+#~ msgid "New Contact _List..."
+#~ msgstr "新建联系人列表(_L)..."
-#: ../src/smime/gui/smime-ui.ui.h:10
-msgid "You have certificates on file that identify these people:"
-msgstr "您拥有证明这些人的文件型证书："
+#~ msgid "_Send Message to Contact..."
+#~ msgstr "给联系人发送信息(_S)..."
-#: ../src/smime/gui/smime-ui.ui.h:12
-msgid "Contact Certificates"
-msgstr "联系人证书"
+#~ msgid "_Save as vCard..."
+#~ msgstr "另存为 vCard(_S)..."
-#: ../src/smime/gui/smime-ui.ui.h:13
-msgid ""
-"You have certificates on file that identify these certificate authorities:"
-msgstr "您拥有证明这些颁发机构的文件型证书："
+#, fuzzy
+#~| msgid ""
+#~| "This is the method Evolution will use to authenticate you. Note that "
+#~| "setting this to \"Using email address\" requires anonymous access to "
+#~| "your LDAP server."
+#~ msgid ""
+#~ "This is the method Evolution will use to authenticate you. Note that "
+#~ "setting this to “Using email address” requires anonymous access to your "
+#~ "LDAP server."
+#~ msgstr ""
+#~ "这是 Evolution 用来认证您的方法。注意若设为“使用电子邮件地址”则需要对您的 "
+#~ "LDAP 服务器匿名访问。"
-#: ../src/smime/gui/smime-ui.ui.h:14
-msgid "Authorities"
-msgstr "证书颁发机构"
+#, fuzzy
+#~| msgid "Select the calendars for reminder notification"
+#~ msgid "Selected Memo Lists for Notifications of Reminders"
+#~ msgstr "选择用于提醒通知的日历"
-#: ../src/smime/gui/smime-ui.ui.h:15
-msgid "Certificate Authority Trust"
-msgstr "证书颁发机构信任"
+#~ msgid "Default _snooze time (in minutes)"
+#~ msgstr "默认小睡时间 [以分钟计] (_S)"
-#: ../src/smime/gui/smime-ui.ui.h:19
-msgid "Trust this CA to identify _websites."
-msgstr "信任此颁发机构标识的网站(_W)。"
+#~ msgid "_Copy..."
+#~ msgstr "复制(_C)..."
-#: ../src/smime/gui/smime-ui.ui.h:20
-msgid "Trust this CA to identify _email users."
-msgstr "信任此颁发机构标识的电子邮件用户(_E)。"
+#~ msgid "New All Day _Event..."
+#~ msgstr "新建全天事件(_E)"
-#: ../src/smime/gui/smime-ui.ui.h:21
-msgid "Trust this CA to identify _software developers."
-msgstr "信任此颁发机构标识的软件开发者(_S)。"
+#~ msgid "New _Meeting..."
+#~ msgstr "新建会议(_M)..."
-#: ../src/smime/gui/smime-ui.ui.h:22
-msgid ""
-"Before trusting this CA for any purpose, you should examine its certificate "
-"and its policy and procedures (if available)."
-msgstr "在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
+#~ msgid "New _Appointment..."
+#~ msgstr "新建约会(_A)..."
-#: ../src/smime/gui/smime-ui.ui.h:23
-msgid "Email Certificate Trust Settings"
-msgstr "电子邮件证书信任设置"
+#~ msgid "Print..."
+#~ msgstr "打印..."
-#: ../src/smime/gui/smime-ui.ui.h:24
-msgid "_Edit CA Trust"
-msgstr "编辑 CA 信任(_E)"
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "保存为 iCalendar(_S)..."
-#: ../src/smime/gui/smime-ui.ui.h:25
-msgid "Trust the authenticity of this certificate"
-msgstr "信任此证书的颁发机构"
+#~ msgid "This meeting recurs"
+#~ msgstr "此会议重现"
-#: ../src/smime/gui/smime-ui.ui.h:26
-msgid "Do not trust the authenticity of this certificate"
-msgstr "不信任此证书的颁发机构"
+#~ msgid "This task recurs"
+#~ msgstr "此任务重现"
-#: ../src/smime/gui/smime-ui.ui.h:29
-msgid "C_ertificate:"
-msgstr "证书(_E)："
+#~ msgid "This memo recurs"
+#~ msgstr "此备忘重现"
-#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
-msgid "%d/%m/%Y"
-msgstr "%Y-%m-%d"
+#~ msgid "_Copy Folder To..."
+#~ msgstr "文件夹复制到(_C)..."
-#. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:403
-msgid "Sign"
-msgstr "签名"
+#~ msgid "_Move Folder To..."
+#~ msgstr "文件夹移至(_M)..."
-#: ../src/smime/lib/e-cert.c:404
-msgid "Encrypt"
-msgstr "加密"
+#~ msgid "_New..."
+#~ msgstr "新建(_N)..."
-#: ../src/smime/lib/e-cert-db.c:786
-msgid "Certificate already exists"
-msgstr "证书已经存在"
+#, fuzzy
+#~| msgid "Delivery Notification for \"%s\""
+#~ msgid "Delivery Notification for “%s”"
+#~ msgstr "“%s”的邮件通知"
-#: ../src/smime/lib/e-pkcs12.c:200
-msgid "PKCS12 File Password"
-msgstr "PKCS12 文件密码"
+#~ msgid "Preparing to quit..."
+#~ msgstr "正在准备退出..."
-#: ../src/smime/lib/e-pkcs12.c:201
-msgid "Enter password for PKCS12 file:"
-msgstr "输入 PKCS12 文件的密码："
+#~ msgid "Quick _Reference"
+#~ msgstr "速查表(_R)"
-#: ../src/smime/lib/e-pkcs12.c:327
-#, c-format
-msgid "Unable to create export context, err_code: %i"
-msgstr "无法创建导出环境，错误码：%i"
+#~ msgid "Evolution Website"
+#~ msgstr "Evolution 网站"
-#: ../src/smime/lib/e-pkcs12.c:334
-#, c-format
-msgid "Unable to setup password integrity, err_code: %i"
-msgstr "无法设置密码的完整性，错误码：%i"
+#~ msgid "I_mport..."
+#~ msgstr "导入(_M)..."
-# PKCS12 safe bag
-#: ../src/smime/lib/e-pkcs12.c:344
-#, c-format
-msgid "Unable to create safe bag, err_code: %i"
-msgstr "创建安全袋(safe bag)失败，错误码 %i"
+#~ msgid "_Quick Reference"
+#~ msgstr "快速指南(_Q)"
-#: ../src/smime/lib/e-pkcs12.c:362
-#, c-format
-msgid "Unable to add key/cert to the store, err_code: %i"
-msgstr "无法添加密钥/证书到存储，错误码：%i"
+#, fuzzy
+#~| msgid "Show Evolution's shortcut keys"
+#~ msgid "Show Evolution’s shortcut keys"
+#~ msgstr "显示 Evolution 的快捷键"
-#: ../src/smime/lib/e-pkcs12.c:380
-#, c-format
-msgid "Unable to write store to disk, err_code: %i"
-msgstr "无法写存储到磁盘，错误码：%i"
+#~ msgid "_Advanced Search..."
+#~ msgstr "高级搜索(_A)..."
-#: ../src/smime/lib/e-pkcs12.c:407
-msgid "Imported Certificate"
-msgstr "导入的证书"
+#~ msgid "_Save Search..."
+#~ msgstr "保存搜索(_S)..."
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%Y-%m-%d"
#~ msgid "Because "{1}"."
#~ msgstr "原因是“{1}”。"
@@ -26466,9 +29491,6 @@ msgstr "导入的证书"
#~ msgid "_Delegatees"
#~ msgstr "代理人(_D)"
-#~ msgid "Atte_ndees"
-#~ msgstr "出席者(_N)"
-
#~ msgid "%d day before appointment"
#~ msgid_plural "%d days before appointment"
#~ msgstr[0] "约会的 %d 天前"
@@ -26579,9 +29601,6 @@ msgstr "导入的证书"
#~ msgid "Could not get a selection to modify."
#~ msgstr "无法获得要修改的选中项。"
-#~ msgid "Could not get a selection to delete."
-#~ msgstr "无法获得要删除的选中项。"
-
#~ msgid "Date/Time"
#~ msgstr "日期/时间"
@@ -26723,9 +29742,6 @@ msgstr "导入的证书"
#~ msgid "Whether editor changed"
#~ msgstr "是否变更编辑器"
-#~ msgid "_Unsort"
-#~ msgstr "未排序(_U)"
-
#~ msgid "Canceled."
#~ msgstr "已取消。"
@@ -26742,11 +29758,6 @@ msgstr "导入的证书"
#~ msgid "Canceled"
#~ msgstr "已取消"
-#, fuzzy
-#~ msgctxt "CamelTrust"
-#~ msgid "Marginal"
-#~ msgstr "轻微"
-
#, fuzzy
#~ msgctxt "CamelTrust"
#~ msgid "Ultimate"
@@ -26881,9 +29892,6 @@ msgstr "导入的证书"
#~ msgid "Path"
#~ msgstr "路径"
-#~ msgid "Enter Google password for user '%s'."
-#~ msgstr "输入“%s”的 Google 密码。"
-
#~ msgid "User declined to provide a password"
#~ msgstr "用户拒绝提供密码"
@@ -27015,9 +30023,6 @@ msgstr "导入的证书"
#~ msgid "Field Value"
#~ msgstr "域值"
-#~ msgid "Details"
-#~ msgstr "细节"
-
#~ msgid "Version"
#~ msgstr "版本"
@@ -27203,18 +30208,6 @@ msgstr "导入的证书"
#~ msgid "Could not perform this operation."
#~ msgstr "无法执行该操作。"
-#~ msgid "Day View"
-#~ msgstr "日视图"
-
-#~ msgid "Work Week View"
-#~ msgstr "工作日视图"
-
-#~ msgid "Week View"
-#~ msgstr "周视图"
-
-#~ msgid "Month View"
-#~ msgstr "月视图"
-
#~ msgid "Unable to open the calendar '%s': %s"
#~ msgstr "无法打开日历“%s”：%s"
@@ -27260,9 +30253,6 @@ msgstr "导入的证书"
#~ msgid "Please enter your password."
#~ msgstr "请输入您的密码。"
-#~ msgid "CalDAV"
-#~ msgstr "CalDAV"
-
#~ msgid "Always (SSL)"
#~ msgstr "总是(SSL)"
@@ -27360,9 +30350,6 @@ msgstr "导入的证书"
#~ msgid "Review account"
#~ msgstr "检查帐号"
-#~ msgid "Finish"
-#~ msgstr "完成"
-
#~ msgid "Back - Sending"
#~ msgstr "后退 - 发送"
@@ -27389,9 +30376,6 @@ msgstr "导入的证书"
#~ "Yahoo 日历命名为 名字_姓氏。我们尝试着生成这种日历名称。请确认名字是否正"
#~ "确，如果不正确，请重新输入日历名称。"
-#~ msgid "Yahoo account settings:"
-#~ msgstr "Yahoo 帐号设置："
-
#~ msgid "Yahoo Calendar name:"
#~ msgstr "Yahoo 日历名称："
@@ -27872,9 +30856,6 @@ msgstr "导入的证书"
#~ "level (for example \"2.6.0\")."
#~ msgstr "Evolution 的配置版本，带主/次/配置级别(如“2.6.0”)。"
-#~ msgid "Last upgraded configuration version"
-#~ msgstr "上次升级的配置版本"
-
#~ msgid ""
#~ "The last upgraded configuration version of Evolution, with major/minor/"
#~ "configuration level (for example \"2.6.0\")."
@@ -28062,9 +31043,6 @@ msgstr "导入的证书"
#~ msgid "Mail browser width"
#~ msgstr "邮件浏览器宽度"
-#~ msgid "Default width of the mail browser window."
-#~ msgstr "邮件浏览器窗口的默认宽度。"
-
#~ msgid "Mail browser height"
#~ msgstr "邮件浏览器高度"
@@ -28114,9 +31092,6 @@ msgstr "导入的证书"
#~ "可能的取值有：never - 不关闭浏览器窗口 always - 问题关闭浏览器窗口 ask - "
#~ "(或任何其他值)将询问用户"
-#~ msgid "List of accounts"
-#~ msgstr "帐号列表"
-
#~ msgid ""
#~ "List of accounts known to the mail component of Evolution. The list "
#~ "contains strings naming subdirectories relative to /apps/evolution/mail/"
@@ -28365,9 +31340,6 @@ msgstr "导入的证书"
#~ msgid "Whether to show maps in preview pane."
#~ msgstr "是否在预览面板中显示地图。"
-#~ msgid "On LDAP Servers"
-#~ msgstr "在 LDAP 服务器上"
-
#~ msgid ""
#~ "The UID of the selected (or \"primary\") calendar in the sidebar of the "
#~ "\"Calendar\" view."
@@ -28453,9 +31425,6 @@ msgstr "导入的证书"
#~ "布局样式决定了在哪里放置备忘列表的预览面板。“0”(经典视图)会把预览面板放置"
#~ "在备忘列表下面。“1”(竖直视图)会把预览面板放置在备忘列表旁边。"
-#~ msgid "If \"true\", show the memo preview pane in the main window."
-#~ msgstr "如果 “true”，在主窗口中显示备忘预览面板。"
-
#~ msgid "Position of the task preview pane when oriented horizontally."
#~ msgstr "当水平定向时，任务预览面板的位置。"
@@ -28563,9 +31532,6 @@ msgstr "导入的证书"
#~ msgid "Whether to show week numbers in various places in the Calendar."
#~ msgstr "是否在日历中显示周数。"
-#~ msgid "Scroll Month View by a week"
-#~ msgstr "通过一个周来滚动月视图"
-
#~ msgid "Whether to scroll a Month View by a week, not by a month."
#~ msgstr "是否按星期滚动一个月，而不是按照月份滚动。"
@@ -28649,15 +31615,9 @@ msgstr "导入的证书"
#~ "服务器返回未预料的数据。\n"
#~ "%d - %s"
-#~ msgid "Events"
-#~ msgstr "事件"
-
#~ msgid "User's calendars"
#~ msgstr "用户的日历"
-#~ msgid "Searching for user's calendars..."
-#~ msgstr "搜索用户的日历..."
-
#~ msgid "Previous attempt failed: %s"
#~ msgstr "上次尝试失败：%s"
@@ -28670,18 +31630,12 @@ msgstr "导入的证书"
#~ msgid "Cannot create soup message for URL '%s'"
#~ msgstr "无法为 URL “%s”创建 soup 消息"
-#~ msgid "Searching folder content..."
-#~ msgstr "搜索文件夹内容..."
-
#~ msgid "List of available calendars:"
#~ msgstr "可用日历列表："
#~ msgid "Supports"
#~ msgstr "支持"
-#~ msgid "User e_mail:"
-#~ msgstr "用户电子邮箱(_M)："
-
#~ msgid "Server URL '%s' is not a valid URL"
#~ msgstr "服务器 URL %s 不是有效的 URL"
@@ -28764,9 +31718,6 @@ msgstr "导入的证书"
#~ msgid "Imperial (Fahrenheit, inches, etc)"
#~ msgstr "英制(华氏、英寸等等)"
-#~ msgid "Weather Calendars"
-#~ msgstr "天气月历"
-
#~ msgid "Add weather calendars to Evolution."
#~ msgstr "添加天气日历到 Evolution。"
@@ -28873,9 +31824,6 @@ msgstr "导入的证书"
#~ msgid "Default window Y coordinate"
#~ msgstr "默认窗口纵坐标"
-#~ msgid "The default Y coordinate for the main window."
-#~ msgstr "主窗口的默认纵坐标。"
-
#~ msgid "Default window X coordinate"
#~ msgstr "默认窗口横坐标"
@@ -29195,9 +32143,6 @@ msgstr "导入的证书"
#~ msgid "Run Anjal in a window"
#~ msgstr "在新窗口中运行 Anjal"
-#~ msgid "Make Anjal the default email client"
-#~ msgstr "将 Anjal 设为默认电子邮件客户端"
-
#~ msgid "Anjal email client"
#~ msgstr "Anjal 邮件客户端"
@@ -29302,9 +32247,6 @@ msgstr "导入的证书"
#~ msgid "Retract Mail"
#~ msgstr "收回邮件"
-#~ msgid "Accept Tentatively"
-#~ msgstr "暂时接受"
-
#~ msgid "Decline"
#~ msgstr "拒绝"
@@ -29378,9 +32320,6 @@ msgstr "导入的证书"
#~ msgid "Message retract failed"
#~ msgstr "邮件收回失败"
-#~ msgid "The server did not allow the selected message to be retracted."
-#~ msgstr "服务器不允许收回选中的邮件。"
-
#~ msgid ""
#~ "Account "{0}" already exists. Please check your folder tree."
#~ msgstr "已经存在帐号“{0}”。请检查您的文件夹目录。"
@@ -29414,9 +32353,6 @@ msgstr "导入的证书"
#~ msgid "You have to specify a user name which you want to add to the list"
#~ msgstr "您必须指定一个您希望加入列表的用户名"
-#~ msgid "Do you want to resend the meeting?"
-#~ msgstr "您确信您要重新发送该会议吗？"
-
#~ msgid "Do you want to resend the recurring meeting?"
#~ msgstr "您确定要再次发送这个定期召开的会议么？"
@@ -29450,9 +32386,6 @@ msgstr "导入的证书"
#~ msgid "Con_tacts..."
#~ msgstr "联系人(_T)..."
-#~ msgid "Users:"
-#~ msgstr "用户："
-
#~ msgid "_Not Shared"
#~ msgstr "未共享(_N)"
@@ -29505,9 +32438,6 @@ msgstr "导入的证书"
#~ msgid "Add User"
#~ msgstr "添加用户"
-#~ msgid "Advanced send options"
-#~ msgstr "高级发送选项"
-
#~ msgid "Enter the users and set permissions"
#~ msgstr "输入用户及设定权限"
@@ -29553,9 +32483,6 @@ msgstr "导入的证书"
#~ msgid "Declined: "
#~ msgstr "已拒绝："
-#~ msgid "Completed: "
-#~ msgstr "已完成："
-
#~ msgid "Undelivered: "
#~ msgstr "未投递："
@@ -29613,9 +32540,6 @@ msgstr "导入的证书"
#~ msgid "SpamAssassin not found, code: %d"
#~ msgstr "未找到 SpamAssassin，代码：%d"
-#~ msgid "Failed to create pipe: %s"
-#~ msgstr "创建管道失败：%s"
-
#~ msgid "Error after fork: %s"
#~ msgstr "fork 后出错：%s"
@@ -29702,9 +32626,6 @@ msgstr "导入的证书"
#~ msgid "URI of the highlighted (\"primary\") task list"
#~ msgstr "高亮显示的“主要”任务列表的 URL"
-#~ msgid "Recurring:"
-#~ msgstr "重复："
-
#~ msgid "Yes. (Complex Recurrence)"
#~ msgstr "是(复杂重现)"
@@ -29797,9 +32718,6 @@ msgstr "导入的证书"
#~ msgid "%s has canceled a meeting."
#~ msgstr "%s 取消了一个会议。"
-#~ msgid "Meeting Cancelation"
-#~ msgstr "会议取消"
-
#~ msgid "%s has sent an unintelligible message."
#~ msgstr "%s 发送了一个无法理解的信息。"
@@ -29863,9 +32781,6 @@ msgstr "导入的证书"
#~ msgid "%s has replied to a free/busy request."
#~ msgstr "%s 应答了忙闲请求。"
-#~ msgid "Free/Busy Reply"
-#~ msgstr "忙闲应答"
-
#~ msgid "Bad Free/Busy Message"
#~ msgstr "错误的忙闲信息"
@@ -29923,9 +32838,6 @@ msgstr "导入的证书"
#~ msgid "Loading calendar..."
#~ msgstr "正在载入日历..."
-#~ msgid "Organizer:"
-#~ msgstr "组织者："
-
#~ msgid "Server Message:"
#~ msgstr "服务器信息："
@@ -30130,12 +33042,6 @@ msgstr "导入的证书"
#~ msgid "Select Trash Folder"
#~ msgstr "选择废件箱文件夹"
-#~ msgid "Sending Mail"
-#~ msgstr "发送邮件"
-
-#~ msgid "Sent and Draft Messages"
-#~ msgstr "发送信息并保存草稿"
-
#~ msgid "Top Posting Option"
#~ msgstr "顶部回复选项"
@@ -30240,9 +33146,6 @@ msgstr "导入的证书"
#~ msgid "Source Book"
#~ msgstr "来源地址簿"
-#~ msgid "Target Book"
-#~ msgstr "目标地址簿"
-
#~ msgid "Is New Contact"
#~ msgstr "为新联系人"
@@ -30324,9 +33227,6 @@ msgstr "导入的证书"
#~ msgid "Could not cancel"
#~ msgstr "无法取消"
-#~ msgid "Authentication Required"
-#~ msgstr "必须认证"
-
#~ msgid "TLS not Available"
#~ msgstr "TLS 不可用"
@@ -30476,18 +33376,12 @@ msgstr "导入的证书"
#~ msgid "The filename of the module"
#~ msgstr "更改此文件夹的名称"
-#~ msgid "Whether the plugin is enabled"
-#~ msgstr "插件是否已启用"
-
#~ msgid "Could not parse PGP message: Unknown error"
#~ msgstr "无法解析 PGP 信息：未知错误"
#~ msgid "Show Deleted"
#~ msgstr "显示删除的"
-#~ msgid "To Do"
-#~ msgstr "待办"
-
#~ msgid "Later"
#~ msgstr "稍候"
@@ -30595,9 +33489,6 @@ msgstr "导入的证书"
#~ msgid "Whether the preview pane is visible"
#~ msgstr "是否显示预览面板。"
-#~ msgid "LDAP Servers"
-#~ msgstr "LDAP 服务器"
-
#~ msgid "Autocompletion Settings"
#~ msgstr "自动补全设置"
@@ -30763,9 +33654,6 @@ msgstr "导入的证书"
#~ msgid "Page Number"
#~ msgstr "页码"
-#~ msgid "Search Rule"
-#~ msgstr "搜索过滤器"
-
#, fuzzy
#~ msgid "Criteria for the current search results"
#~ msgstr "取消当前邮件操作"
@@ -30831,9 +33719,6 @@ msgstr "导入的证书"
#~ msgid "Whether the shell window's task bar is visible"
#~ msgstr "切换器是否可见"
-#~ msgid "Whether the shell window's tool bar is visible"
-#~ msgstr "切换器是否可见"
-
#~ msgid "UI Manager"
#~ msgstr "UI 管理器"
@@ -30906,9 +33791,6 @@ msgstr "导入的证书"
#~ msgid "Import"
#~ msgstr "导入"
-#~ msgid "Collection"
-#~ msgstr "收藏"
-
#~ msgid "Instance"
#~ msgstr "实例"
@@ -30978,9 +33860,6 @@ msgstr "导入的证书"
#~ msgid "Cursor Mode"
#~ msgstr "光标模式"
-#~ msgid "Selected Column"
-#~ msgstr "选中列"
-
#~ msgid "Focused Column"
#~ msgstr "聚焦列"
@@ -31075,9 +33954,6 @@ msgstr "导入的证书"
#~ msgid "Anchor"
#~ msgstr "锚点"
-#~ msgid "Justification"
-#~ msgstr "两端对齐"
-
#~ msgid "Clip Width"
#~ msgstr "裁剪宽度"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
