[evolution/gnome-3-20] Update zh_CN translation



commit 2bc4bc2ae82dd697722c6e01f768d06b024f12c9
Author: Mandy Wang <wangmychn gmail com>
Date:   Wed Feb 15 21:10:52 2017 +0800

    Update zh_CN translation

 po/zh_CN.po | 9478 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 4995 insertions(+), 4483 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0931a9f..34a044d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,17 +16,21 @@
 # Wylmer Wang <wantinghard gmail com>, 2011, 2012, 2014.
 # tuhaihe <1132321739qq gmail com>, 2012.
 # 甘露(Gan Lu) <rhythm gan gmail com>,2013
-# Tong Hui <tonghuix gmail com>, 2013, 2014, 2015.
+# Tong Hui <tonghuix gmail com>, 2013, 2014, 2015, 2016.
 # Mingye Wang (Arthur2e5) <arthur200126 gmail com>, 2015.
+# Jeff bai <jeffbai aosc xyz>, 2016.
+# Dingzhong Chen <wsxy162 gmail com>, 2015, 2016.
+#
+#: ../shell/main.c:522
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2016-02-22 09:12+0000\n"
-"PO-Revision-Date: 2016-04-05 16:40+0800\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 gmail com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"product=evolution&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2016-11-21 10:54+0000\n"
+"PO-Revision-Date: 2017-02-15 21:15+0800\n"
+"Last-Translator: Mandy Wang <wangmychn 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"
@@ -46,7 +50,7 @@ msgstr "此地址簿服务器不可达,或服务器名称拼错,又或者您
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
-msgstr "使用 LDAP 服务器认证失败。"
+msgstr "与 LDAP 服务器认证失败。"
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
@@ -94,8 +98,8 @@ msgstr "删除地址簿“{0}”吗?"
 msgid "This address book will be removed permanently."
 msgstr "此地址簿即将被永久删除。"
 
-#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
-#: ../mail/mail.error.xml.h:69
+#: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "不删除(_N)"
 
@@ -110,7 +114,7 @@ msgid ""
 msgstr "这将从服务器永久删除地址簿“{0}”。您确定要继续吗?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "从服务器删除(_D)"
 
@@ -194,16 +198,13 @@ msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添
 #: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-comp-editor-page-general.c:1357
 #: ../e-util/e-mail-signature-manager.c:327
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:57 ../modules/mail/em-composer-prefs.c:417
-#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:457
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
@@ -297,9 +298,6 @@ msgid "_Where:"
 msgstr "何处(_W):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
@@ -340,8 +338,7 @@ msgid "_Home Page:"
 msgstr "主页(_H):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/e-comp-editor-event.c:631
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "日历(_C):"
@@ -359,7 +356,7 @@ msgid "Home Page:"
 msgstr "主页:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:92
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "日历:"
 
@@ -432,18 +429,19 @@ msgstr "周年(_A):"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../calendar/gui/e-calendar-view.c:2049
+#: ../calendar/gui/e-calendar-view.c:2044
 msgid "Anniversary"
 msgstr "纪念日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:874
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../calendar/gui/e-calendar-view.c:2048
+#: ../calendar/gui/e-calendar-view.c:2043
 msgid "Birthday"
 msgstr "生日"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "杂项"
 
@@ -495,7 +493,7 @@ msgstr "工作"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3791
+#: ../calendar/gui/e-cal-model.c:3825
 msgid "Other"
 msgstr "其它"
 
@@ -504,6 +502,8 @@ msgid "Mailing Address"
 msgstr "邮政地址"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "笔记"
 
@@ -517,15 +517,14 @@ msgstr "添加 _X.509"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:475
-#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
-#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:58
-#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../calendar/gui/e-comp-editor-page-general.c:1373
+#: ../e-util/e-attachment-view.c:475 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.error.xml.h:18
+#: ../e-util/filter.ui.h:18 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:630
+#: ../mail/mail-config.ui.h:59
+#: ../plugins/attachment-reminder/attachment-reminder.c:467
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
@@ -545,15 +544,14 @@ msgstr "加载 X.509 (_L)"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
-#: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../calendar/calendar.error.xml.h:47 ../calendar/gui/e-comp-editor.c:2106
 #: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
 #: ../e-util/e-attachment-store.c:641
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3334
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
-#: ../smime/gui/certificate-manager.c:655
-#: ../smime/gui/certificate-manager.c:732
+#: ../smime/gui/certificate-manager.c:657
+#: ../smime/gui/certificate-manager.c:734
 msgid "_Save"
 msgstr "保存(_S)"
 
@@ -563,16 +561,16 @@ msgid "Certificates"
 msgstr "证书"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
+#: ../calendar/gui/e-comp-editor.c:2003 ../calendar/gui/e-comp-editor.c:2075
+#: ../e-util/e-preferences-window.c:382 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell.c:1222 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1998
+#: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "选项"
 
@@ -590,31 +588,28 @@ msgstr "选项"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1365
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2339
+#: ../calendar/gui/e-cal-dialogs.c:689
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:302
 #: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
 #: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
 #: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-html-editor-actions.c:589 ../e-util/e-html-editor-actions.c:684
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3333
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
-#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:18
-#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:16
+#: ../mail/mail-send-recv.c:746 ../mail/mail-send-recv.c:828
 #: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
 #: ../modules/calendar/e-cal-attachment-handler.c:285
@@ -624,10 +619,10 @@ msgstr "选项"
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
-#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
-#: ../smime/gui/certificate-manager.c:731
-#: ../smime/gui/certificate-manager.c:955
-#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:656
+#: ../smime/gui/certificate-manager.c:733
+#: ../smime/gui/certificate-manager.c:957
+#: ../smime/gui/certificate-manager.c:1339 ../smime/gui/e-cert-selector.c:237
 #: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -677,24 +672,22 @@ msgid "Show Certificates"
 msgstr "显示证书"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../calendar/gui/e-comp-editor.c:2038 ../e-util/e-html-editor-actions.c:1108
 msgid "_Undo"
 msgstr "撤消(_U)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2040 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "撤消"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/dialogs/comp-editor.c:1333
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../calendar/gui/e-comp-editor.c:2045 ../e-util/e-html-editor-actions.c:1094
 msgid "_Redo"
 msgstr "重做(_R)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2047 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "重做"
 
@@ -726,8 +719,8 @@ msgid "PGP keys"
 msgstr "PGP 密钥"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
-#: ../smime/gui/certificate-manager.c:678
-#: ../smime/gui/certificate-manager.c:967
+#: ../smime/gui/certificate-manager.c:680
+#: ../smime/gui/certificate-manager.c:969
 msgid "All files"
 msgstr "全部文件"
 
@@ -742,9 +735,9 @@ msgstr "打开 X.509 证书"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
 #: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-html-editor-actions.c:590 ../e-util/e-html-editor-actions.c:685
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
-#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:958
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -826,16 +819,13 @@ msgstr "无效的联系人。"
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2340
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
 #: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:792
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
 #: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
 #: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
@@ -846,7 +836,7 @@ msgstr "无效的联系人。"
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1340
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "确定(_O)"
@@ -984,12 +974,12 @@ msgid "_Top"
 msgstr "顶部(_T)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
 msgid "_Up"
 msgstr "上(_U)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
 msgid "_Down"
 msgstr "下(_D)"
 
@@ -1019,22 +1009,22 @@ msgid "Error removing list"
 msgstr "删除列表出错"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Name contains"
 msgstr "姓名含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:985
 msgid "Any field contains"
 msgstr "任何域含有"
 
@@ -1159,16 +1149,14 @@ msgid "Video Chat"
 msgstr "视频聊天"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
-#: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:572
+#: ../data/evolution.desktop.in.in.h:9 ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../modules/calendar/e-cal-shell-view.c:579
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "日历"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "忙/闲"
@@ -1422,7 +1410,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "从剪贴板中粘贴联系人"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:700
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
@@ -1457,15 +1445,16 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "您确定要删除联系人(%s)吗?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1366
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../e-util/e-focus-tracker.c:785
-#: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../calendar/gui/e-comp-editor.c:1996 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1089
+#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:832
 #: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:813
-#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/certificate-manager.c:1663 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -1597,7 +1586,7 @@ msgid "Title"
 msgstr "头衔"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:659
+#: ../calendar/gui/e-meeting-list-view.c:660
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "角色"
@@ -1611,10 +1600,9 @@ msgid "Journal"
 msgstr "日记"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "类别"
 
@@ -1630,7 +1618,7 @@ msgstr "联系人列表:"
 msgid "Contact: "
 msgstr "联系人:"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:187
+#: ../addressbook/gui/widgets/ea-minicard.c:182
 msgid "evolution minicard"
 msgstr "evolution 袖珍卡"
 
@@ -1659,13 +1647,13 @@ msgstr "放大(_I)"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2385
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2090
+#: ../e-util/e-html-editor-actions.c:2103
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1732,9 +1720,10 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:431
-#: ../calendar/importers/icalendar-importer.c:926
-#: ../calendar/importers/icalendar-importer.c:965 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:485
+#: ../calendar/importers/icalendar-importer.c:980
+#: ../calendar/importers/icalendar-importer.c:1019
+#: ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "正在导入..."
 
@@ -1956,11 +1945,7 @@ msgid "hour"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
-#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1266
 msgid "day"
 msgid_plural "days"
 msgstr[0] "天"
@@ -1970,7 +1955,7 @@ msgid "Start time"
 msgstr "开始时间"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1949
+#: ../calendar/alarm-notify/alarm-queue.c:1947
 msgid "Appointments"
 msgstr "约会"
 
@@ -1983,16 +1968,13 @@ msgid "_Snooze"
 msgstr "小睡(_S)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-html-editor-actions.c:1120
+#: ../calendar/gui/e-comp-editor-page-general.c:1365
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2240
+#: ../calendar/gui/e-comp-editor.c:2061 ../e-util/e-html-editor-actions.c:1117
 #: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
-#: ../plugins/attachment-reminder/attachment-reminder.c:443
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:173
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:63
+#: ../plugins/attachment-reminder/attachment-reminder.c:462
 #: ../plugins/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
@@ -2009,8 +1991,8 @@ msgid "_Dismiss"
 msgstr "错过(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1916
-#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../calendar/alarm-notify/alarm-queue.c:1914
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2028,45 +2010,40 @@ msgstr "小睡时间(_T):"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
 #: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:326
+#: ../modules/calendar/e-cal-shell-view-actions.c:344
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "天"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "小时"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19
 #: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "分钟"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1896
+#: ../calendar/alarm-notify/alarm-queue.c:1715
+#: ../calendar/alarm-notify/alarm-queue.c:1895
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1723
-#: ../calendar/alarm-notify/alarm-queue.c:1725
+#: ../calendar/alarm-notify/alarm-queue.c:1724
+#: ../calendar/alarm-notify/alarm-queue.c:1726
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1733
+#: ../calendar/alarm-notify/alarm-queue.c:1734
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1887
-#: ../calendar/alarm-notify/alarm-queue.c:2240
+#: ../calendar/alarm-notify/alarm-queue.c:1739
+#: ../calendar/alarm-notify/alarm-queue.c:1886
+#: ../calendar/alarm-notify/alarm-queue.c:2237
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒器"
 
@@ -2076,21 +2053,21 @@ msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 条提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2058
+#: ../calendar/alarm-notify/alarm-queue.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2056 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2060
+#: ../calendar/alarm-notify/alarm-queue.c:2057
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2064
+#: ../calendar/alarm-notify/alarm-queue.c:2061
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2106,24 +2083,32 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2079
+#: ../calendar/alarm-notify/alarm-queue.c:2076
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
-#: ../calendar/alarm-notify/util.c:43
+#: ../calendar/alarm-notify/util.c:67
 msgid "invalid time"
 msgstr "无效时间"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
+#. Translator: Entire string is like "Pop up an alert %d days before start"
+#: ../calendar/alarm-notify/util.c:93 ../calendar/gui/e-alarm-list.c:370
+#: ../calendar/gui/misc.c:97
+#, 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"
+#: ../calendar/alarm-notify/util.c:99 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
+#. Translator: Entire string is like "Pop up an alert %d minutes before start"
+#: ../calendar/alarm-notify/util.c:105 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -2131,9 +2116,9 @@ msgid_plural "%d minutes"
 msgstr[0] "%d 分钟"
 
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
+#. 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")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
+#: ../calendar/alarm-notify/util.c:109 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2158,7 +2143,7 @@ msgstr "不发送(_N)"
 msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您要删除该会议吗?"
@@ -2174,7 +2159,7 @@ msgid ""
 "the task has been deleted."
 msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
 
-#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定要删除此任务吗?"
@@ -2193,8 +2178,7 @@ msgid ""
 "the memo has been deleted."
 msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "您确信您要删除该备忘吗?"
@@ -2270,7 +2254,8 @@ msgstr "您已经对此会议做出了更改,但尚未保存。"
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
@@ -2307,8 +2292,8 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
 
-#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:13
-#: ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:36 ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "发送(_S)"
@@ -2364,322 +2349,367 @@ msgid ""
 msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
 
 #: ../calendar/calendar.error.xml.h:52
+msgid "Would you like to send this memo to participants?"
+msgstr "您是否想要给出席者发送此备忘?"
+
+#: ../calendar/calendar.error.xml.h:53
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this memo."
+msgstr "将会向全部出席者发送电子邮件邀请,并使他们可以接受此备忘。"
+
+#: ../calendar/calendar.error.xml.h:54
+msgid "Would you like to send updated memo information to participants?"
+msgstr "您是否想要给出席者发送更新的备忘?"
+
+#: ../calendar/calendar.error.xml.h:55
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr "发送更新的信息允许其他出席者使他们的备忘录保持最新。"
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "无法载入编辑器。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "删除日历“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
 msgstr "删除任务列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
-msgstr "删除备忘录列表“{0}”吗?"
+msgstr "删除备忘录“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
-msgstr "此备忘录列表将被永久删除。"
+msgstr "此备忘录将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "删除远端日历“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
 msgstr "这将从服务器永久删除日历“{0}”。您确定要继续吗?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
 msgstr "删除远端任务列表“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
 msgstr "这将从服务器永久删除任务列表“{0}”。您确定要继续吗?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
-msgstr "删除远端备忘录列表“{0}”吗?"
+msgstr "删除远端备忘录“{0}”吗?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
-msgstr "这将从服务器永久删除备忘录列表“{0}”。您确定要继续吗?"
+msgstr "这将从服务器永久删除备忘录“{0}”。您确定要继续吗?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "您确定想要发送没有摘要的约会吗?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 msgstr "在您的约会中添加有意义的摘要可以让您的收件人更容易明白您约会的内容。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "您确定想要发送没有摘要的任务吗?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
 msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "您确定想要保存没有摘要的备忘吗?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "载入日历“{0}”时出错"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为离线使用。"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "无法保存事件"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
 msgstr "“{0}”是只读日历,无法修改。请另选一个可接受约会的日历。"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "无法保存任务"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr "“{0}”不支持分配的任务,请另选一个任务列表。"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "Error loading task list '{0}'"
 msgstr "载入任务列表“{0}”出错"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为离线使用。"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Error loading memo list '{0}'"
-msgstr "载入备忘录列表“{0}”出错"
+msgstr "载入备忘录“{0}”出错"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
-msgstr "备忘录列表未标为离线使用。"
+msgstr "备忘录未标为离线使用。"
+
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to add timezone to '{0}'"
+msgstr "向“{0}”添加时区失败"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to save attachments"
+msgstr "保存附件失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:95
 msgid "Failed to open calendar '{0}'"
 msgstr "打开日历“{0}”失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:97
 msgid "Failed to open memo list '{0}'"
-msgstr "打开备忘录列表“{0}”失败"
+msgstr "打开备忘录“{0}”失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:99
 msgid "Failed to open task list '{0}'"
 msgstr "打开任务列表“{0}”失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:101
 msgid "Failed to create an event in the calendar '{0}'"
-msgstr "在日历“{0}”里创建活动失败"
+msgstr "在日历“{0}”里创建事件失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:103
 msgid "Failed to create a memo in the memo list '{0}'"
-msgstr "在备忘录列表“{0}”里创建备忘失败"
+msgstr "在备忘录“{0}”里创建备忘失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:105
 msgid "Failed to create a task in the task list '{0}'"
 msgstr "在任务列表“{0}”里创建任务失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:107
 msgid "Failed to modify an event in the calendar '{0}'"
-msgstr "修改日历“{0}”里的活动失败"
+msgstr "修改日历“{0}”里的事件失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:109
 msgid "Failed to modify a memo in the memo list '{0}'"
-msgstr "修改备忘录列表“{0}”里的备忘录失败"
+msgstr "修改备忘录“{0}”里的备忘失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:111
 msgid "Failed to modify a task in the task list '{0}'"
 msgstr "修改任务列表“{0}”里的任务失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:113
 msgid "Failed to delete an event in the calendar '{0}'"
-msgstr "删除日历“{0}”里的活动失败"
+msgstr "删除日历“{0}”里的事件失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:115
 msgid "Failed to delete a memo in the memo list '{0}'"
-msgstr "删除备忘录列表“{0}”里的备忘录失败"
+msgstr "删除备忘录“{0}”里的备忘失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:117
 msgid "Failed to delete a task in the task list '{0}'"
 msgstr "删除任务列表“{0}”里的任务失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
+#: ../calendar/calendar.error.xml.h:119
 msgid "Failed to update an event in the calendar '{0}'"
-msgstr "更新日历“{0}”里的活动失败"
+msgstr "更新日历“{0}”里的事件失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:113
+#: ../calendar/calendar.error.xml.h:121
 msgid "Failed to update a memo in the memo list '{0}'"
-msgstr "更新备忘录列表“{0}”里的备忘录失败"
+msgstr "更新备忘录“{0}”里的备忘失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:115
+#: ../calendar/calendar.error.xml.h:123
 msgid "Failed to update a task in the task list '{0}'"
 msgstr "更新任务列表“{0}”里的任务失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:117
+#: ../calendar/calendar.error.xml.h:125
 msgid "Failed to send an event to the calendar '{0}'"
-msgstr "发送活动到日历“{0}”失败"
+msgstr "发送事件到日历“{0}”失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:119
+#: ../calendar/calendar.error.xml.h:127
 msgid "Failed to send a memo to the memo list '{0}'"
-msgstr "发送备忘录到备忘录列表“{0}”失败"
+msgstr "发送备忘到备忘录“{0}”失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:121
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to send a task to the task list '{0}'"
 msgstr "发送任务到任务列表“{0}”失败"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:123
+#: ../calendar/calendar.error.xml.h:131
 msgid "Error creating view for the calendar '{0}'"
 msgstr "创建日历“{0}”视图时出错"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:125
+#: ../calendar/calendar.error.xml.h:133
 msgid "Error creating view for the task list '{0}'"
 msgstr "创建任务列表“{0}”视图时出错"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
+#: ../calendar/calendar.error.xml.h:135
 msgid "Error creating view for the memo list '{0}'"
-msgstr "创建备忘录列表“{0}”视图时出错"
+msgstr "创建备忘录“{0}”视图时出错"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "无法将事件复制到日历“{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:131
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "无法将任务复制到任务列表“{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:133
+#: ../calendar/calendar.error.xml.h:141
 msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "无法将备忘录复制到备忘录列表“{0}”"
+msgstr "无法将备忘复制到备忘录“{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:143
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "无法将事件移动到日历“{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:137
+#: ../calendar/calendar.error.xml.h:145
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "无法将任务移动到任务列表“{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:139
+#: ../calendar/calendar.error.xml.h:147
 msgid "Failed to move a memo into the memo list '{0}'"
-msgstr "无法将备忘录移动到备忘录列表“{0}”"
+msgstr "无法将备忘移动到备忘录“{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:149
+msgid "Failed to get an event from the calendar '{0}'"
+msgstr "无法从日历“{0}”中获取事件"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:151
+msgid "Failed to get a task from the task list '{0}'"
+msgstr "无法从任务列表“{0}”中获取任务"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to get a memo from the memo list '{0}'"
+msgstr "无法从留言列表“{0}”中获取留言"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:155
 msgid "Copying an event into the calendar '{0}'"
 msgstr "正在将事件复制到日历“{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:143
+#: ../calendar/calendar.error.xml.h:157
 msgid "Copying a task into the task list '{0}'"
 msgstr "正在将任务复制到任务列表“{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:145
+#: ../calendar/calendar.error.xml.h:159
 msgid "Copying a memo into the memo list '{0}'"
-msgstr "正在将一条备忘录复制到备忘录列表“{0}”"
+msgstr "正在将一条备忘复制到备忘录“{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:147
+#: ../calendar/calendar.error.xml.h:161
 msgid "Moving an event into the calendar '{0}'"
 msgstr "正在将事件移动到日历“{0}”"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:149
+#: ../calendar/calendar.error.xml.h:163
 msgid "Moving a task into the task list '{0}'"
 msgstr "正在将任务移动到任务列表“{0}”"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:151
+#: ../calendar/calendar.error.xml.h:165
 msgid "Moving a memo into the memo list '{0}'"
-msgstr "正在将备忘录移动到备忘录列表“{0}”"
+msgstr "正在将备忘移动到备忘录“{0}”"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:153
+#: ../calendar/calendar.error.xml.h:167
 msgid "Failed to refresh calendar '{0}'"
 msgstr "刷新日历“{0}”失败"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:155
+#: ../calendar/calendar.error.xml.h:169
 msgid "Failed to refresh task list '{0}'"
 msgstr "刷新任务列表“{0}”失败"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:157
+#: ../calendar/calendar.error.xml.h:171
 msgid "Failed to refresh memo list '{0}'"
-msgstr "刷新备忘录列表“{0}”失败"
+msgstr "刷新备忘录“{0}”失败"
 
-#: ../calendar/calendar.error.xml.h:158
+#: ../calendar/calendar.error.xml.h:172
 msgid "Failed to make an occurrence movable"
-msgstr "将事件标示成可移动失败"
+msgstr "将循环发生标示成可移动失败"
 
-#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "概要"
@@ -2698,7 +2728,7 @@ msgstr "不含有"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:149 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "描述"
@@ -2724,25 +2754,21 @@ msgstr "是"
 msgid "is not"
 msgstr "不是"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306
-#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "公开"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315
-#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "保密"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:243
+#: ../calendar/gui/e-cal-model.c:316 ../calendar/gui/e-task-table.c:500
+#: ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "机密"
@@ -2758,8 +2784,8 @@ msgstr "组织者"
 msgid "Attendee"
 msgstr "出席者"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../mail/message-list.etspec.h:14
+#: ../calendar/gui/caltypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
@@ -2772,28 +2798,27 @@ msgid "Category"
 msgstr "类别"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
 #: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "附件"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
-#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "存在"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/caltypes.xml.h:19
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
 msgid "Recurrence"
 msgstr "重复"
 
@@ -2823,1280 +2848,23 @@ msgstr "概要含有"
 msgid "Description Contains"
 msgstr "描述含有"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "编辑提醒"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:424
-msgid "Pop up an alert"
-msgstr "弹出警告"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:420
-msgid "Play a sound"
-msgstr "播放声音"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:432
-msgid "Run a program"
-msgstr "运行程序"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:428
-msgid "Send an email"
-msgstr "发送电子邮件"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "之前"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "之后"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "约会开始"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "约会结束"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "分钟"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "小时"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "天"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "添加提醒"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "提醒"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "重复"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "重复提醒(_R)"
-
-#. This is part of the sentence:
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "extra times every"
-msgstr "每个额外时间"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "自定义信息(_M)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "信息(_S):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "自定义提醒声音"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "声音(_S):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "选择一个文件"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "程序(_P):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "参数(_A):"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "发送至:"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "动作/触发器"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "Reminders"
-msgstr "提醒"
-
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "此事件已经被删除。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "此任务已经被删除。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "此备注已经被删除。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  您还没有进行修改,关闭编辑器吗?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "此事件已经被更改。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "此任务已经被更改。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "此备注已经被更改。"
-
-#: ../calendar/gui/dialogs/changed-comp.c:102
-#, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:104
-#, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  您还没有进行修改,更新编辑器吗?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:299
-msgid "Could not save attachments"
-msgstr "不能保存附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:653
-msgid "Could not update object"
-msgstr "无法更新对象"
-
-#: ../calendar/gui/dialogs/comp-editor.c:787
-msgid "Edit Appointment"
-msgstr "编辑约会"
-
-#: ../calendar/gui/dialogs/comp-editor.c:794
-#, c-format
-msgid "Meeting - %s"
-msgstr "会议 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:796
-#, c-format
-msgid "Appointment - %s"
-msgstr "约会 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:802
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "分配的任务 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:804
-#, c-format
-msgid "Task - %s"
-msgstr "任务 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:809
-#, c-format
-msgid "Memo - %s"
-msgstr "备忘 - %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:825
-msgid "No Summary"
-msgstr "没有概要"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-msgid "Keep original item?"
-msgstr "保留原始条目?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Unable to synchronize with the server"
-msgstr "无法与服务器同步"
-
-#. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
-#: ../e-util/e-mail-signature-editor.c:295
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
-#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
-#: ../smime/gui/certificate-manager.c:2066
-msgid "_Close"
-msgstr "关闭(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1251
-msgid "Close the current window"
-msgstr "关闭当前窗口"
-
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
-#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:134
-#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:175
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
-#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
-#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:801
-msgid "Copy the selection"
-msgstr "复制选中内容"
-
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
-msgid "Cu_t"
-msgstr "剪切(_T)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1265 ../e-util/e-focus-tracker.c:168
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
-msgid "Cut the selection"
-msgstr "剪切选中内容"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../e-util/e-focus-tracker.c:189
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
-#: ../shell/e-shell-window-actions.c:815
-msgid "Delete the selection"
-msgstr "删除选中内容"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1279
-msgid "View help"
-msgstr "查看帮助"
-
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1286 ../e-util/e-focus-tracker.c:182
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
-msgid "Paste the clipboard"
-msgstr "粘贴剪贴板"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1291
-#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/addressbook/e-book-shell-view-actions.c:1219
-msgid "_Print..."
-msgstr "打印(_P)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
-#: ../modules/addressbook/e-book-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-actions.c:1642
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:964
-msgid "Pre_view..."
-msgstr "预览(_V)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1307
-msgid "Save current changes"
-msgstr "保存当前更改"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1312
-#: ../e-util/e-mail-signature-editor.c:304
-msgid "Save and Close"
-msgstr "保存并关闭"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "Save current changes and close editor"
-msgstr "保存当前更改并关闭编辑器"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
-#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
-msgid "Select _All"
-msgstr "全选(_A)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1321 ../e-util/e-focus-tracker.c:196
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:913
-msgid "Select all text"
-msgstr "选中所有文字"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-msgid "_Classification"
-msgstr "分类(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:948
-msgid "_File"
-msgstr "文件(_F)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1370
-#: ../e-util/e-html-editor-actions.c:1148
-msgid "_Insert"
-msgstr "插入(_I)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:378
-msgid "_Options"
-msgstr "选项(_O)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1384
-#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "查看(_V)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1394
-#: ../composer/e-composer-actions.c:327
-msgid "_Attachment..."
-msgstr "附件(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
-msgid "Attach a file"
-msgstr "添加附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1404
-msgid "_Categories"
-msgstr "类别(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1406
-msgid "Toggles whether to display categories"
-msgstr "切换是否显示类别"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Time _Zone"
-msgstr "时区(_Z)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1414
-msgid "Toggles whether the time zone is displayed"
-msgstr "切换是否显示时区"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1423
-msgid "Pu_blic"
-msgstr "公开(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1425
-msgid "Classify as public"
-msgstr "分类为公开"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "_Private"
-msgstr "私人(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1432
-msgid "Classify as private"
-msgstr "分类为私人"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1437
-msgid "_Confidential"
-msgstr "机密(_C)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1439
-msgid "Classify as confidential"
-msgstr "分类为机密"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1447
-msgid "R_ole Field"
-msgstr "角色域(_O)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1449
-msgid "Toggles whether the Role field is displayed"
-msgstr "切换是否显示角色域"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1455
-msgid "_RSVP"
-msgstr "请回复(_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1457
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "切换是否显示请回复域"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1463
-msgid "_Status Field"
-msgstr "状态域(_S)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1465
-msgid "Toggles whether the Status field is displayed"
-msgstr "切换是否显示状态域"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1471
-msgid "_Type Field"
-msgstr "类型域(_T)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1473
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "切换是否显示出席者类型域"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2596
-#: ../composer/e-composer-actions.c:612
-msgid "Attach"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2926
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../calendar/gui/dialogs/comp-editor.c:4525
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4487
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4557
-msgid "Unable to use current version!"
-msgstr "无法使用当前版本!"
-
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "校验错误:%s"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1968
-msgid "Destination is read only"
-msgstr "目的只读"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:209
-#, c-format
-msgid "Copying events to the calendar '%s'"
-msgstr "正在将活动复制到日历“%s”"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:215
-#, c-format
-msgid "Copying memos to the memo list '%s'"
-msgstr "正在将备忘录复制到备忘录列表“%s”"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:221
-#, c-format
-msgid "Copying tasks to the task list '%s'"
-msgstr "正在将任务复制到任务列表“%s”"
-
-#: ../calendar/gui/dialogs/delete-comp.c:215
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
-
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "撤销评论(_R):"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "输入代表"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "授权给:"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "联系人..."
-
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "提醒(_R)"
-
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "设置或取消此活动的提醒"
-
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "将时间显示为忙(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "切换是否将时间显示为忙"
-
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "再现(_R)"
-
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "将此事件标为重复发生"
-
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "发送选项"
-
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "插入高级发送选项"
-
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "全天事件(_D)"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "切换是否有全天事件"
-
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "忙/闲(_F)"
-
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "查询出席者的忙闲信息"
-
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
-msgid "Appointment"
-msgstr "约会"
-
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "出席者"
-
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "打印此事件"
-
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "活动开始时间在过去"
-
-#: ../calendar/gui/dialogs/event-page.c:634
-msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr "因所选的日程为只读,您无法编辑该事件。"
-
-#: ../calendar/gui/dialogs/event-page.c:638
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "您并非组织者,因此无法编辑全部事件。"
-
-#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3198
-msgid "This event has reminders"
-msgstr "此事件有提醒"
-
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "组织者(_G):"
-
-#: ../calendar/gui/dialogs/event-page.c:1309
-msgid "Event with no start date"
-msgstr "没有开始日期的事件"
-
-#: ../calendar/gui/dialogs/event-page.c:1312
-msgid "Event with no end date"
-msgstr "没有结束日期的事件"
-
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1032
-msgid "Start date is wrong"
-msgstr "开始日期有错"
-
-#: ../calendar/gui/dialogs/event-page.c:1501
-msgid "End date is wrong"
-msgstr "结束日期有错"
-
-#: ../calendar/gui/dialogs/event-page.c:1543
-msgid "Start time is wrong"
-msgstr "开始时间有错"
-
-#: ../calendar/gui/dialogs/event-page.c:1551
-msgid "End time is wrong"
-msgstr "结束时间有错"
-
-#: ../calendar/gui/dialogs/event-page.c:1715
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1086
-msgid "An organizer is required."
-msgstr "需要一名组织者。"
-
-#: ../calendar/gui/dialogs/event-page.c:1750
-#: ../calendar/gui/dialogs/task-page.c:1121
-msgid "At least one attendee is required."
-msgstr "需要至少一个出席者。"
-
-#: ../calendar/gui/dialogs/event-page.c:1956
-msgid "_Delegatees"
-msgstr "代理人(_D)"
-
-#: ../calendar/gui/dialogs/event-page.c:1958
-msgid "Atte_ndees"
-msgstr "出席者(_N)"
-
-#: ../calendar/gui/dialogs/event-page.c:3478
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "约会的 %d 天前"
-
-#: ../calendar/gui/dialogs/event-page.c:3484
-#, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "约会的 %d 小时前"
-
-#: ../calendar/gui/dialogs/event-page.c:3490
-#, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "约会的 %d 分钟前"
-
-#: ../calendar/gui/dialogs/event-page.c:3511
-msgid "Custom"
-msgstr "自定义"
-
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3518
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "无"
-
-#. TRANSLATORS:
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "持续时间"
-
-#. TRANSLATORS:
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "直到"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "约会前 15 分钟"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "约会前 1 小时"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "约会前 1 天"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "位置(_L):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:558
-#: ../e-util/e-html-editor-link-dialog.c:422
-msgid "_Description:"
-msgstr "描述(_D):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "时间(_T):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "时区(_Z):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "概要(_S):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "事件描述"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:555
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "提醒(_R)"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "一月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "二月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "三月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "四月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "五月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "六月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "七月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "八月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "九月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "十月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "十一月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "十二月"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "选择日期"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1219
-msgid "Select _Today"
-msgstr "选择今天(_T)"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
-msgid "Memo"
-msgstr "备忘"
-
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "打印此备忘录"
-
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "备忘录开始时间在过去"
-
-#: ../calendar/gui/dialogs/memo-page.c:460
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr "因所选的备忘列表为只读,您无法编辑该备忘。"
-
-#: ../calendar/gui/dialogs/memo-page.c:464
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "您并非组织者,因此无法编辑全部备忘。"
-
-#: ../calendar/gui/dialogs/memo-page.c:1168
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "To"
-msgstr "收件人"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-msgid "_List:"
-msgstr "列表(_L):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "组织者(_Z):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "到(_O):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
-msgid "Sta_rt date:"
-msgstr "开始日期(_R):"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "概要(_M):"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "您即将修改重复事件。您想要修改何内容?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "您即将代理重复事件。您想要代理何内容?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "您即将修改重复任务。您想要修改何内容?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "您即将修改重复备忘。您想要修改何内容?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "只是本次"
-
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "本次和以前各次"
-
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "本次和以后各次"
-
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "所有各次"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "此约会含有 Evolution 无法编辑的再现。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1018
-msgid "Recurrence date is invalid"
-msgstr "再现日期无效"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1062
-msgid "End time of the recurrence was before event's start"
-msgstr "重复活动条目的结束时间小于开始时间"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-msgid "on"
-msgstr "在"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1172
-msgid "first"
-msgstr "第一个"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1178
-msgid "second"
-msgstr "第二"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1183
-msgid "third"
-msgstr "第三个"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1188
-msgid "fourth"
-msgstr "第四个"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1193
-msgid "fifth"
-msgstr "第五个"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
-#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
-#. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
-msgid "last"
-msgstr "最后一个"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
-#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1222
-msgid "Other Date"
-msgstr "其它日期"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1228
-msgid "1st to 10th"
-msgstr "上旬"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1234
-msgid "11th to 20th"
-msgstr "中旬"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
-#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1240
-msgid "21st to 31st"
-msgstr "下旬"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1267
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "Monday"
-msgstr "星期一"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1268
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Tuesday"
-msgstr "星期二"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1269
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Wednesday"
-msgstr "星期三"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1270
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Thursday"
-msgstr "星期四"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1271
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Friday"
-msgstr "星期五"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1272
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "Saturday"
-msgstr "星期六"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1273
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Sunday"
-msgstr "星期日"
-
-#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
-#. * (dropdown menu options are in [square brackets])."
-#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1404
-msgid "on the"
-msgstr "在"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1589
-msgid "occurrences"
-msgstr "事件"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2359
-msgid "Add exception"
-msgstr "添加例外"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2401
-msgid "Could not get a selection to modify."
-msgstr "无法获得要修改的选中项。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2407
-msgid "Modify exception"
-msgstr "修改例外"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2453
-msgid "Could not get a selection to delete."
-msgstr "无法获得要删除的选中项。"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2594
-msgid "Date/Time"
-msgstr "日期/时间"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "天"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "周"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "月"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "年"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
-msgid "for"
-msgstr "持续时间"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
-msgid "until"
-msgstr "直到"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
-msgid "forever"
-msgstr "永远"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "此约会重现(_U)"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "每"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgid "Exceptions"
-msgstr "例外"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "预览"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-msgid "Send my reminders with this event"
-msgstr "发送我有关此事件的提醒"
-
-# #####
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "只通知新的出席者(_O)"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "发送选项(_S)"
-
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "任务"
-
-#: ../calendar/gui/dialogs/task-editor.c:285
-msgid "Print this task"
-msgstr "打印此任务"
-
-#: ../calendar/gui/dialogs/task-page.c:330
-msgid "Task's start date is in the past"
-msgstr "任务的开始日期是在过去"
-
-#: ../calendar/gui/dialogs/task-page.c:331
-msgid "Task's due date is in the past"
-msgstr "任务的到期时间是在过去"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "任务不能被编辑,因为选择的任务列表是只读的"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "无法完全编辑任务,因为您不是组织者"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr "任务无法编辑,因为选定的任务列表不支持分配的任务"
-
-#: ../calendar/gui/dialogs/task-page.c:1013
-msgid "Due date is wrong"
-msgstr "到期日期错误"
-
-#: ../calendar/gui/dialogs/task-page.c:1181
-#: ../calendar/gui/dialogs/task-page.c:1206
-msgid "Completed date is wrong"
-msgstr "完成日期有错"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
-msgid "High"
-msgstr "高"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:329
-#: ../calendar/gui/e-cal-model.c:1856 ../calendar/gui/e-task-table.c:525
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:312
-msgid "Normal"
-msgstr "中"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
-msgid "Low"
-msgstr "低"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14 ../calendar/gui/e-task-table.c:527
-#: ../calendar/gui/tasktypes.xml.h:22 ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "未定义"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
-msgid "Not Started"
-msgstr "未开始"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:302
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3576
-msgid "In Progress"
-msgstr "进行中"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:305
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
-#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
-msgid "Completed"
-msgstr "已完成"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
-#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "已取消"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "到期日期(_U):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "时区:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "状态(_S):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "完成日期(_C):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "完成百分比(_P):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "优先级(_Y):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "分类(_L):"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "网页(_W):"
-
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New All Day Event"
 msgstr "新建全天事件"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New Meeting"
 msgstr "新会议"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "Go to Today"
 msgstr "转到今天"
 
-#: ../calendar/gui/ea-cal-view.c:288
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Date"
 msgstr "转到日期"
 
@@ -4172,71 +2940,101 @@ msgstr "跳转按钮"
 msgid "Click here, you can find more events."
 msgstr "单击此处可查找更多事件。"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d 天"
-
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 周"
 
-#: ../calendar/gui/e-alarm-list.c:438
+#. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:421
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1829
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "播放声音"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1827
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "弹出警报"
+
+#. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:429
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1833
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "发送邮件"
+
+#. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-alarm-list.c:433
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1831
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "运行程序"
+
+#: ../calendar/gui/e-alarm-list.c:439
+msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
-msgstr "执行未知的动作"
+msgstr "即将进行一项未知的操作"
 
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "在约会开始之前 %s %s"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "开始前 %s%s"
 
-#: ../calendar/gui/e-alarm-list.c:459
+#: ../calendar/gui/e-alarm-list.c:460
 #, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "在约会开始之后 %s %s"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "开始后 %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:467
 #, c-format
-msgid "%s at the start of the appointment"
-msgstr "在约会开始时 %s"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "开始时 %s"
 
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "在约会结束之前 %s %s"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "结束前 %s%s"
 
-#: ../calendar/gui/e-alarm-list.c:484
+#: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "在约会结束之后 %s %s"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "结束后 %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:492
 #, c-format
-msgid "%s at the end of the appointment"
-msgstr "在约会结束时 %s"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "结束时 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:515
+#: ../calendar/gui/e-alarm-list.c:516
 #, c-format
+msgctxt "cal-reminders"
 msgid "%s at %s"
-msgstr "在 %2$s 时 %1$s"
+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
-#: ../calendar/gui/e-alarm-list.c:523
+#: ../calendar/gui/e-alarm-list.c:524
 #, c-format
+msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
-msgstr "%s 为未知触发类型"
+msgstr "对于未知触发类型,%s"
 
 #: ../calendar/gui/ea-week-view.c:114
 #, c-format
@@ -4287,10 +3085,65 @@ msgstr "到期日期:"
 msgid "Status:"
 msgstr "状态:"
 
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3582
+msgid "In Progress"
+msgstr "进行中"
+
+#: ../calendar/gui/e-cal-component-preview.c:305
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
+#: ../calendar/gui/tasktypes.xml.h:13
+#: ../plugins/save-calendar/csv-format.c:379
+msgid "Completed"
+msgstr "已完成"
+
+#: ../calendar/gui/e-cal-component-preview.c:308
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3588 ../mail/mail-send-recv.c:966
+msgid "Canceled"
+msgstr "已取消"
+
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr "未开始"
+
 #: ../calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "优先级:"
 
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:318
+msgid "High"
+msgstr "高"
+
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1890 ../calendar/gui/e-task-table.c:525
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:317
+msgid "Normal"
+msgstr "中"
+
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:316
+msgid "Low"
+msgstr "低"
+
 #: ../calendar/gui/e-cal-component-preview.c:350
 #: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
@@ -4313,115 +3166,181 @@ msgstr "正在创建任务列表“%s”视图"
 #: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
 msgid "Creating view for memo list '%s'"
-msgstr "正在创建备忘录列表“%s”的视图"
+msgstr "正在创建备忘录“%s”视图"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "单击以添加任务"
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1957
+msgid "Destination is read only"
+msgstr "目的只读"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "开始日期"
+#: ../calendar/gui/e-cal-dialogs.c:294
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "正在将事件复制到日历“%s”"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:645
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:591
-#: ../mail/e-mail-account-tree-view.c:157
-msgid "Type"
-msgstr "类型"
+#: ../calendar/gui/e-cal-dialogs.c:300
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "正在将备忘复制到备忘录“%s”"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "完成日期"
+#: ../calendar/gui/e-cal-dialogs.c:306
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "正在将任务复制到任务列表“%s”"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
-msgid "Complete"
-msgstr "完成"
+#: ../calendar/gui/e-cal-dialogs.c:525
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "到期日期"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "撤销评论(_R):"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% 完成"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "选择日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18 ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "优先级"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+msgstr "选择今天(_T)"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. * Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3845 ../calendar/gui/e-meeting-list-view.c:688
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
-msgid "Status"
-msgstr "状态"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "一月"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Created"
-msgstr "创建时间"
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "二月"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "上次修改"
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "三月"
+
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "四月"
+
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "五月"
+
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "六月"
+
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "七月"
+
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "八月"
+
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "九月"
+
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "十月"
+
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "十一月"
+
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "十二月"
+
+#: ../calendar/gui/e-cal-dialogs.c:868
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "您即将修改重复事件。您想要修改何内容?"
+
+#: ../calendar/gui/e-cal-dialogs.c:870
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "您即将代理重复事件。您想要代理何内容?"
+
+#: ../calendar/gui/e-cal-dialogs.c:874
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "您即将修改重复任务。您想要修改何内容?"
+
+#: ../calendar/gui/e-cal-dialogs.c:878
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "您即将修改重复备忘。您想要修改何内容?"
 
-#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "只是本次"
+
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "本次和以前各次"
+
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "本次和以后各次"
+
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "所有各次"
+
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+msgid "Send my reminders with this event"
+msgstr "发送我有关此事件的提醒"
+
+# #####
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "只通知新的出席者(_O)"
+
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Cut selected events to the clipboard"
 msgstr "将选中事件剪切到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:465
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Copy selected events to the clipboard"
 msgstr "将选中事件复制到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:471
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Paste events from the clipboard"
 msgstr "从剪贴板中粘贴事件"
 
-#: ../calendar/gui/e-calendar-view.c:477
+#: ../calendar/gui/e-calendar-view.c:470
 msgid "Delete selected events"
 msgstr "删除选中的事件"
 
-#: ../calendar/gui/e-calendar-view.c:859
+#: ../calendar/gui/e-calendar-view.c:852
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "粘贴文本中没有有效的 iCalendar 数据"
 
-#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1554
 msgid "Default calendar not found"
 msgstr "默认日历未找到"
 
-#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1557
 msgid "Default memo list not found"
-msgstr "默认备忘录列表未找到"
+msgstr "默认备忘录未找到"
 
-#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1560
 msgid "Default task list not found"
 msgstr "默认任务列表未找到"
 
-#: ../calendar/gui/e-calendar-view.c:969
+#: ../calendar/gui/e-calendar-view.c:962
 msgid "No suitable component found"
 msgstr "找不到合适的组件"
 
-#: ../calendar/gui/e-calendar-view.c:1039
+#: ../calendar/gui/e-calendar-view.c:1032
 msgid "Pasting iCalendar data"
 msgstr "粘贴 iCalendar 数据"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:495
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4430,29 +3349,29 @@ msgstr "组织者:%s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:500
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1862
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1850
+#: ../calendar/gui/e-meeting-time-sel.c:2727 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1902
+#: ../calendar/gui/e-calendar-view.c:1890
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间:%s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2281
-#: ../calendar/gui/e-calendar-view.c:2288
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-calendar-view.c:2298
+#: ../calendar/gui/e-calendar-view.c:2276
+#: ../calendar/gui/e-calendar-view.c:2283
+#: ../calendar/gui/e-calendar-view.c:2290
+#: ../calendar/gui/e-calendar-view.c:2293
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -4461,13 +3380,13 @@ msgstr "%Y年%-m月%-d日"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
-#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-calendar-view.c:2281 ../calendar/gui/e-day-view.c:3050
+#: ../calendar/gui/e-day-view-top-item.c:851
 #: ../calendar/gui/e-week-view-main-item.c:230
 msgid "%d %b"
 msgstr "%B%-d日"
 
-#: ../calendar/gui/e-calendar-view.c:2308
+#: ../calendar/gui/e-calendar-view.c:2303
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -4477,15 +3396,15 @@ msgstr "%Y年%-m月%-d日%A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
-#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-calendar-view.c:2307 ../calendar/gui/e-day-view.c:3034
+#: ../calendar/gui/e-day-view-top-item.c:847
 #: ../calendar/gui/e-week-view-main-item.c:216
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
 
-#: ../calendar/gui/e-calendar-view.c:2315
-#: ../calendar/gui/e-calendar-view.c:2321
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../calendar/gui/e-calendar-view.c:2310
+#: ../calendar/gui/e-calendar-view.c:2316
+#: ../calendar/gui/e-calendar-view.c:2319
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -4498,94 +3417,129 @@ msgstr "开始日期"
 msgid "End Date"
 msgstr "结束日期"
 
-#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-task-table.etspec.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "创建时间"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "上次修改"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:8
+#: ../calendar/gui/e-task-table.etspec.h:15
+#: ../em-format/e-mail-formatter-source.c:120
+msgid "Source"
+msgstr "来源"
+
+#: ../calendar/gui/e-cal-model.c:318 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
-#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1266 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3604
-#: ../modules/itip-formatter/itip-view.c:6218
+#: ../modules/itip-formatter/itip-view.c:6213
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
-#: ../calendar/gui/e-cal-ops.c:1232
-#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#: ../calendar/gui/e-cal-model.c:1404 ../calendar/gui/e-cal-ops.c:615
+#: ../calendar/gui/e-cal-ops.c:1251
+#: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "未找到 UID 为 %s 的源"
 
-#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
-#: ../calendar/gui/e-cal-ops.c:1349
+#: ../calendar/gui/e-cal-model.c:1507 ../calendar/gui/e-cal-ops.c:187
+#: ../calendar/gui/e-cal-ops.c:1368
 msgid "Creating an event"
-msgstr "正在创建活动"
+msgstr "正在创建事件"
 
-#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
-#: ../calendar/gui/e-cal-ops.c:1353
+#: ../calendar/gui/e-cal-model.c:1511 ../calendar/gui/e-cal-ops.c:191
+#: ../calendar/gui/e-cal-ops.c:1372
 msgid "Creating a memo"
 msgstr "正在创建备忘"
 
-#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
-#: ../calendar/gui/e-cal-ops.c:1357
+#: ../calendar/gui/e-cal-model.c:1515 ../calendar/gui/e-cal-ops.c:195
+#: ../calendar/gui/e-cal-ops.c:1376
 msgid "Creating a task"
 msgstr "正在创建任务"
 
-#: ../calendar/gui/e-cal-model.c:1858
+#: ../calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:1860
+#: ../calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "已分配"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
-#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-cal-model.c:1896 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-meeting-list-view.c:210
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3786 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3820
+#: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6206
+#: ../modules/itip-formatter/itip-view.c:6201
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3787 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3821
+#: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6212
+#: ../modules/itip-formatter/itip-view.c:6207
 msgid "Declined"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-cal-model.c:3788 ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3822
+#: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
 #: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../calendar/gui/e-cal-model.c:3789 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3823
+#: ../calendar/gui/e-meeting-list-view.c:224
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6215
+#: ../modules/itip-formatter/itip-view.c:6210
 msgid "Delegated"
 msgstr "被委任的"
 
-#: ../calendar/gui/e-cal-model.c:3790
+#: ../calendar/gui/e-cal-model.c:3824
 msgid "Needs action"
 msgstr "需要动作"
 
-#: ../calendar/gui/e-cal-model-calendar.c:151
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. * Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/e-cal-model.c:3879
+#: ../calendar/gui/e-meeting-list-view.c:689
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../calendar/gui/e-task-table.etspec.h:11 ../calendar/gui/tasktypes.xml.h:8
+#: ../mail/filtertypes.xml.in.h:36 ../mail/message-list.etspec.h:1
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "状态"
+
+#: ../calendar/gui/e-cal-model-calendar.c:150
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "空闲"
 
-#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-cal-model-calendar.c:153
 #: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "繁忙"
@@ -4606,155 +3560,155 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:306
 msgid "Modifying an event"
 msgstr "修改一个事件"
 
-#: ../calendar/gui/e-cal-ops.c:291
+#: ../calendar/gui/e-cal-ops.c:310
 msgid "Modifying a memo"
 msgstr "修改备忘"
 
-#: ../calendar/gui/e-cal-ops.c:295
+#: ../calendar/gui/e-cal-ops.c:314
 msgid "Modifying a task"
 msgstr "修改任务"
 
-#: ../calendar/gui/e-cal-ops.c:394
+#: ../calendar/gui/e-cal-ops.c:413
 msgid "Removing an event"
-msgstr "正在移除活动"
+msgstr "正在移除事件"
 
-#: ../calendar/gui/e-cal-ops.c:398
+#: ../calendar/gui/e-cal-ops.c:417
 msgid "Removing a memo"
 msgstr "正在移除备忘"
 
-#: ../calendar/gui/e-cal-ops.c:402
+#: ../calendar/gui/e-cal-ops.c:421
 msgid "Removing a task"
 msgstr "正在移除任务"
 
-#: ../calendar/gui/e-cal-ops.c:493
+#: ../calendar/gui/e-cal-ops.c:512
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
-msgstr[0] "正在删除 %d 件活动"
+msgstr[0] "正在删除 %d 件事件"
 
-#: ../calendar/gui/e-cal-ops.c:497
+#: ../calendar/gui/e-cal-ops.c:516
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "正在删除 %d 个备忘"
 
-#: ../calendar/gui/e-cal-ops.c:501
+#: ../calendar/gui/e-cal-ops.c:520
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "正在删除 %d 项任务"
 
-#: ../calendar/gui/e-cal-ops.c:704
+#: ../calendar/gui/e-cal-ops.c:723
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
-msgstr[0] "正在粘贴 %d 件活动"
+msgstr[0] "正在粘贴 %d 件事件"
 
-#: ../calendar/gui/e-cal-ops.c:719
+#: ../calendar/gui/e-cal-ops.c:738
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "正在粘贴 %d 个备忘"
 
-#: ../calendar/gui/e-cal-ops.c:734
+#: ../calendar/gui/e-cal-ops.c:753
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "正在粘贴 %d 项任务"
 
-#: ../calendar/gui/e-cal-ops.c:833
+#: ../calendar/gui/e-cal-ops.c:852
 msgid "Updating an event"
-msgstr "更新活动"
+msgstr "更新事件"
 
-#: ../calendar/gui/e-cal-ops.c:837
+#: ../calendar/gui/e-cal-ops.c:856
 msgid "Updating a memo"
 msgstr "更新备忘"
 
-#: ../calendar/gui/e-cal-ops.c:841
+#: ../calendar/gui/e-cal-ops.c:860
 msgid "Updating a task"
 msgstr "更新任务"
 
-#: ../calendar/gui/e-cal-ops.c:949
+#: ../calendar/gui/e-cal-ops.c:968
 #, c-format
 msgid "Getting events to purge in the calendar '%s'"
-msgstr "正在获取日历“%s”里要清除的活动"
+msgstr "正在获取日历“%s”里要清除的事件"
 
-#: ../calendar/gui/e-cal-ops.c:953
+#: ../calendar/gui/e-cal-ops.c:972
 #, c-format
 msgid "Getting memos to purge in the memo list '%s'"
-msgstr "正在获取备忘录列表“%s”里要清除的备忘录"
+msgstr "正在获取备忘录“%s”里要清除的备忘"
 
-#: ../calendar/gui/e-cal-ops.c:957
+#: ../calendar/gui/e-cal-ops.c:976
 #, c-format
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "正在获取任务列表“%s”里要清除的任务"
 
-#: ../calendar/gui/e-cal-ops.c:983
+#: ../calendar/gui/e-cal-ops.c:1002
 #, c-format
 msgid "Purging events in the calendar '%s'"
-msgstr "正在清除日历“%s”里的活动"
+msgstr "正在清除日历“%s”里的事件"
 
-#: ../calendar/gui/e-cal-ops.c:987
+#: ../calendar/gui/e-cal-ops.c:1006
 #, c-format
 msgid "Purging memos in the memo list '%s'"
-msgstr "正在清除备忘录列表“%s”里的备忘录"
+msgstr "正在清除备忘录“%s”里的备忘"
 
-#: ../calendar/gui/e-cal-ops.c:991
+#: ../calendar/gui/e-cal-ops.c:1010
 #, c-format
 msgid "Purging tasks in the task list '%s'"
 msgstr "正在清除任务列表“%s”里的任务"
 
-#: ../calendar/gui/e-cal-ops.c:1091
+#: ../calendar/gui/e-cal-ops.c:1110
 msgid "Purging events"
-msgstr "正在清除活动"
+msgstr "正在清除事件"
 
-#: ../calendar/gui/e-cal-ops.c:1095
+#: ../calendar/gui/e-cal-ops.c:1114
 msgid "Purging memos"
 msgstr "正在清除备忘"
 
-#: ../calendar/gui/e-cal-ops.c:1099
+#: ../calendar/gui/e-cal-ops.c:1118
 msgid "Purging tasks"
 msgstr "正在清除任务"
 
-#: ../calendar/gui/e-cal-ops.c:1201
+#: ../calendar/gui/e-cal-ops.c:1220
 msgid "Expunging completed tasks"
 msgstr "删掉已完成的任务"
 
-#: ../calendar/gui/e-cal-ops.c:2062
+#: ../calendar/gui/e-cal-ops.c:2051
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
-msgstr[0] "正在移动 %d 件活动"
+msgstr[0] "正在移动 %d 件事件"
 
-#: ../calendar/gui/e-cal-ops.c:2063
+#: ../calendar/gui/e-cal-ops.c:2052
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
-msgstr[0] "正在复制 %d 件活动"
+msgstr[0] "正在复制 %d 件事件"
 
-#: ../calendar/gui/e-cal-ops.c:2069
+#: ../calendar/gui/e-cal-ops.c:2058
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "正在移动 %d 个备忘"
 
-#: ../calendar/gui/e-cal-ops.c:2070
+#: ../calendar/gui/e-cal-ops.c:2059
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "正在复制 %d 个备忘"
 
-#: ../calendar/gui/e-cal-ops.c:2076
+#: ../calendar/gui/e-cal-ops.c:2065
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "正在移动 %d 项任务"
 
-#: ../calendar/gui/e-cal-ops.c:2077
+#: ../calendar/gui/e-cal-ops.c:2066
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -4779,17 +3733,1115 @@ msgstr ""
 "日期必须按照以下格式输入:\n"
 "%s"
 
+#: ../calendar/gui/e-comp-editor-event.c:101
+msgid "Event's time is in the past"
+msgstr "事件来自过去的时间点"
+
+#: ../calendar/gui/e-comp-editor-event.c:202
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr "任务不能被编辑,因为选择的日历无法被打开"
+
+#: ../calendar/gui/e-comp-editor-event.c:204
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "因所选的日程为只读,您无法编辑该事件。"
+
+#: ../calendar/gui/e-comp-editor-event.c:206
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "您并非组织者,因此无法编辑全部事件。"
+
+#: ../calendar/gui/e-comp-editor-event.c:350
+#: ../calendar/gui/e-comp-editor-task.c:348
+msgid "Start date is not a valid date"
+msgstr "起始日期无效"
+
+#: ../calendar/gui/e-comp-editor-event.c:352
+msgid "Start time is not a valid time"
+msgstr "起始时间无效"
+
+#: ../calendar/gui/e-comp-editor-event.c:356
+#: ../calendar/gui/e-comp-editor-event.c:372
+#: ../calendar/gui/e-comp-editor-page-attachments.c:211
+#: ../calendar/gui/e-comp-editor.c:339 ../mail/e-mail-display.c:2057
+#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:489
+#: ../mail/mail-send-recv.c:1288 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:991 ../shell/e-shell.c:1013
+#: ../smime/gui/certificate-manager.c:348
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: ../calendar/gui/e-comp-editor-event.c:366
+msgid "End date is not a valid date"
+msgstr "结束日期无效"
+
+#: ../calendar/gui/e-comp-editor-event.c:368
+msgid "End time is not a valid time"
+msgstr "结束时间无效"
+
+#: ../calendar/gui/e-comp-editor-event.c:490
+#: ../calendar/gui/e-comp-editor-memo.c:106
+#: ../calendar/gui/e-comp-editor-task.c:406
+msgid "_Categories"
+msgstr "类别(_C)"
+
+#: ../calendar/gui/e-comp-editor-event.c:492
+#: ../calendar/gui/e-comp-editor-memo.c:108
+#: ../calendar/gui/e-comp-editor-task.c:408
+msgid "Toggles whether to display categories"
+msgstr "切换是否显示类别"
+
+#: ../calendar/gui/e-comp-editor-event.c:498
+msgid "Time _Zone"
+msgstr "时区(_Z)"
+
+#: ../calendar/gui/e-comp-editor-event.c:500
+msgid "Toggles whether the time zone is displayed"
+msgstr "切换是否显示时区"
+
+#: ../calendar/gui/e-comp-editor-event.c:506
+msgid "All _Day Event"
+msgstr "全天事件(_D)"
+
+#: ../calendar/gui/e-comp-editor-event.c:508
+msgid "Toggles whether to have All Day Event"
+msgstr "切换是否有全天事件"
+
+#: ../calendar/gui/e-comp-editor-event.c:514
+msgid "Show Time as _Busy"
+msgstr "将时间显示为忙(_B)"
+
+#: ../calendar/gui/e-comp-editor-event.c:516
+msgid "Toggles whether to show time as busy"
+msgstr "切换是否将时间显示为忙"
+
+#: ../calendar/gui/e-comp-editor-event.c:525
+msgid "Pu_blic"
+msgstr "公开(_B)"
+
+#: ../calendar/gui/e-comp-editor-event.c:527
+msgid "Classify as public"
+msgstr "分类为公开"
+
+#: ../calendar/gui/e-comp-editor-event.c:532
+msgid "_Private"
+msgstr "私人(_P)"
+
+#: ../calendar/gui/e-comp-editor-event.c:534
+msgid "Classify as private"
+msgstr "分类为私人"
+
+#: ../calendar/gui/e-comp-editor-event.c:539
+msgid "_Confidential"
+msgstr "机密(_C)"
+
+#: ../calendar/gui/e-comp-editor-event.c:541
+msgid "Classify as confidential"
+msgstr "分类为机密"
+
+#: ../calendar/gui/e-comp-editor-event.c:642
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "开始时间(_S):"
+
+#: ../calendar/gui/e-comp-editor-event.c:647
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "结束时间(_E):"
+
+#: ../calendar/gui/e-comp-editor-event.c:657
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "所有当日事件"
+
+#: ../calendar/gui/e-comp-editor-event.c:710
+#: ../calendar/gui/e-comp-editor-memo.c:192
+#: ../calendar/gui/e-comp-editor-task.c:529
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "常规"
+
+#: ../calendar/gui/e-comp-editor-event.c:713
+#: ../calendar/gui/e-comp-editor-task.c:535
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "提醒"
+
+#: ../calendar/gui/e-comp-editor-event.c:716
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "再现"
+
+#: ../calendar/gui/e-comp-editor-event.c:719
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "附件"
+
+#: ../calendar/gui/e-comp-editor-event.c:729
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr "日程"
+
+#: ../calendar/gui/e-comp-editor-event.c:758
+#, c-format
+msgid "Meeting - %s"
+msgstr "会议 - %s"
+
+#: ../calendar/gui/e-comp-editor-event.c:759
+#, c-format
+msgid "Appointment - %s"
+msgstr "约会 - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:68
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr "备忘录不能被编辑,因为选择的备忘录列表无法被打开"
+
+#: ../calendar/gui/e-comp-editor-memo.c:70
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "因所选的备忘列表为只读,您无法编辑该备忘。"
+
+#: ../calendar/gui/e-comp-editor-memo.c:72
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "您并非组织者,因此无法编辑全部备忘。"
+
+#: ../calendar/gui/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "列表(_L):"
+
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "起始日期:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, c-format
+msgid "Assigned Memo - %s"
+msgstr "已分配留言 - %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+msgstr "备忘 - %s"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:125
+#: ../calendar/gui/e-comp-editor-page-attachments.c:130
+#: ../em-format/e-mail-formatter-attachment.c:424
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../e-util/e-attachment.c:2542
+#, c-format
+msgid "Could not load '%s'"
+msgstr "不能加载“%s”"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:208
+#: ../e-util/e-attachment.c:2545
+#, c-format
+msgid "Could not load the attachment"
+msgstr "不能加载附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr "仍在下载一部分附件。请等待下载完成。"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#, c-format
+msgid "Attachment '%s' cannot be found, remove it from the list, please"
+msgstr "找不到附件“%s”,请将其从列表移除"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#, c-format
+msgid "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+msgstr "附件“%s”不具有有效的 URI,请将其从列表移除"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:618
+#: ../composer/e-composer-actions.c:327
+msgid "_Attachment..."
+msgstr "附件(_A)..."
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:620
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+msgid "Attach a file"
+msgstr "添加附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+msgid "_Attachments"
+msgstr "附件(_A)"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+msgid "Show attachments"
+msgstr "显示附件"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:782
+#: ../e-util/e-attachment-bar.c:701 ../e-util/e-attachment-paned.c:735
+msgid "Icon View"
+msgstr "图标视图"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:784
+#: ../e-util/e-attachment-bar.c:703 ../e-util/e-attachment-paned.c:737
+msgid "List View"
+msgstr "列表视图"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:313
+#, c-format
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "无法从参与者列表中找到参与者 '%s'"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr "没有足够权力来删除参与者 '%s'"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "删除选中参与者失败"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+msgid "A_ttendees"
+msgstr "参与者(_T)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+msgid "Toggles whether the Attendees are displayed"
+msgstr "切换是否显示与会者"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "角色域(_O)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "切换是否显示角色域"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "请回复(_R)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "切换是否显示请回复域"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "状态域(_S)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "切换是否显示状态域"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "类型域(_T)"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "切换是否显示出席者类型域"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "需要一名组织者。"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "需要至少一个出席者。"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "组织者(_G):"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1288
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+msgid "Add exception"
+msgstr "添加例外"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+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.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
+msgid "on"
+msgstr "在"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+msgctxt "ECompEditorPageRecur"
+msgid "first"
+msgstr "第一"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+msgctxt "ECompEditorPageRecur"
+msgid "second"
+msgstr "第二"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+msgctxt "ECompEditorPageRecur"
+msgid "third"
+msgstr "第三"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+msgctxt "ECompEditorPageRecur"
+msgid "fourth"
+msgstr "第四"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+msgctxt "ECompEditorPageRecur"
+msgid "fifth"
+msgstr "第五"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+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]).
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+msgctxt "ECompEditorPageRecur"
+msgid "Other Date"
+msgstr "其他日期"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+msgctxt "ECompEditorPageRecur"
+msgid "1st to 10th"
+msgstr "上旬"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+msgctxt "ECompEditorPageRecur"
+msgid "11th to 20th"
+msgstr "中旬"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
+#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+msgctxt "ECompEditorPageRecur"
+msgid "21st to 31st"
+msgstr "下旬"
+
+# DIRTY HACK: 配上前面的就是上旬,中旬,下旬
+#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
+#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:667
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "天"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+msgctxt "ECompEditorPageRecur"
+msgid "Monday"
+msgstr "星期一"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+msgctxt "ECompEditorPageRecur"
+msgid "Tuesday"
+msgstr "星期二"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+msgctxt "ECompEditorPageRecur"
+msgid "Wednesday"
+msgstr "星期三"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+msgctxt "ECompEditorPageRecur"
+msgid "Thursday"
+msgstr "星期四"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+msgctxt "ECompEditorPageRecur"
+msgid "Friday"
+msgstr "星期五"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+msgctxt "ECompEditorPageRecur"
+msgid "Saturday"
+msgstr "星期六"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+msgctxt "ECompEditorPageRecur"
+msgid "Sunday"
+msgstr "星期日"
+
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
+#. * (dropdown menu options are in [square brackets])."
+#.
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+msgctxt "ECompEditorPageRecur"
+msgid "on the"
+msgstr "在"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1486
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2016
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1491
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1496
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1501
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "组件再现周期(_U)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+msgid "Recurrence exception date is invalid"
+msgstr "重复例外日期无效"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+msgid "End time of the recurrence is before the start"
+msgstr "再现的结束时间早于开始时间"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+msgid "R_ecurrence"
+msgstr "重复"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2056
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2091
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2093
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2095
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2097
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2126
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2128
+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])
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2130
+msgctxt "ECompEditorPageRecur"
+msgid "forever"
+msgstr "永远"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "此约会含有 Evolution 无法编辑的再现。"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+msgid "Exceptions"
+msgstr "例外"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1779
+#: ../mail/mail-config.ui.h:62
+msgid "A_dd"
+msgstr "添加(_D)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1787
+#: ../mail/mail-config.ui.h:64
+msgid "Re_move"
+msgstr "删除(_M)"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+msgid "Preview"
+msgstr "预览"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+msgid "Send To"
+msgstr "发送到"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1556
+msgid "_Reminders"
+msgstr "提醒(_R)"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1558
+msgid "Set or unset reminders"
+msgstr "设置或取消提醒"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1611
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Reminders"
+msgstr "提醒"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1640
+msgid "_Reminder"
+msgstr "提醒(_R)"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1673
+#, c-format
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d 天前"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1680
+#, c-format
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d 时前"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1687
+#, c-format
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d 分前"
+
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1695
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "无"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1697
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "一刻钟前"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1699
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "一小时前"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1701
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "一天前"
+
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1713
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "自定义"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1864
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "分"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1866
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "时"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1868
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "日"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1885
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "之前"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1887
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "后"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1903
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "开始"
+
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1905
+msgctxt "cal-reminders"
+msgid "end"
+msgstr "结束"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1928
+msgid "Re_peat the reminder"
+msgstr "重复提醒"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1953
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "重复一次,每隔"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1990
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "分"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1992
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "时"
+
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1994
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "天"
+
+#. page_reminders->priv->custom_email_entry is initialized on demand
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2035
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2192
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "自定义消息"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2079
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "自定义提醒声音"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2090
+msgid "Select a sound file"
+msgstr "选择一个音频文件"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2118
+msgid "_Program:"
+msgstr "程序(_P):"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2143
+msgid "_Arguments:"
+msgstr "参数(_A):"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2175
+msgid "_Send To:"
+msgstr "发送到:(_S)"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+msgid "_Schedule"
+msgstr "日程(_S)"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "查询出席者的忙闲信息"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "概要:(_S)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "位置(_L):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "类别...(_C)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "描述(_D):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "网页:(_W)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "截止日期:(_U)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "完成日期:(_C)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "公开"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "保密"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "机密"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1151
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "分类:(_L)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1170
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "未开始"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1171
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "进行中"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1172
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "已完成"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1173
+msgctxt "ECompEditor"
+msgid "Canceled"
+msgstr "已取消"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1182
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "状态:(_S)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1212
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "未定义"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1213
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "高"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1214
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "中"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1215
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "低"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1224
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "优先级:(_Y)"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1278
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "完成百分比:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1359
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "时区(_Z):"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1484
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "将时间显示为忙(_B)"
+
+#: ../calendar/gui/e-comp-editor-task.c:75
+msgid "Task's start date is in the past"
+msgstr "任务的开始日期是在过去"
+
+#: ../calendar/gui/e-comp-editor-task.c:83
+msgid "Task's due date is in the past"
+msgstr "任务的到期时间是在过去"
+
+#: ../calendar/gui/e-comp-editor-task.c:308
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr "任务不能被编辑,因为选择的任务列表无法被打开"
+
+#: ../calendar/gui/e-comp-editor-task.c:310
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "任务不能被编辑,因为选择的任务列表是只读的"
+
+#: ../calendar/gui/e-comp-editor-task.c:312
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "无法完全编辑任务,因为您不是组织者"
+
+#: ../calendar/gui/e-comp-editor-task.c:359
+msgid "Due date is not a valid date"
+msgstr "截止日期无效"
+
+#: ../calendar/gui/e-comp-editor-task.c:370
+msgid "Completed date is not a valid date"
+msgstr "完成日期无效"
+
+#: ../calendar/gui/e-comp-editor-task.c:381
+msgid "Completed date cannot be in the future"
+msgstr "完成日期不能在将来"
+
+#: ../calendar/gui/e-comp-editor-task.c:566
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "分配的任务 - %s"
+
+#: ../calendar/gui/e-comp-editor-task.c:567
+#, c-format
+msgid "Task - %s"
+msgstr "任务 - %s"
+
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/e-comp-editor.c:609
+msgid "Sending notifications to attendees..."
+msgstr "正向参与者发送通知…"
+
+#: ../calendar/gui/e-comp-editor.c:994
+msgid "Saving changes..."
+msgstr "正保存更改…"
+
+#: ../calendar/gui/e-comp-editor.c:1250
+msgid "No Summary"
+msgstr "没有概要"
+
+#. == Button box ==
+#: ../calendar/gui/e-comp-editor.c:1975 ../composer/e-composer-actions.c:334
+#: ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:299
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:391
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:129
+#: ../mail/e-mail-notes.c:903 ../mail/em-folder-properties.c:688
+#: ../mail/em-subscription-editor.c:1765
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
+#: ../smime/gui/certificate-manager.c:2203
+msgid "_Close"
+msgstr "关闭(_C)"
+
+#: ../calendar/gui/e-comp-editor.c:1977
+msgid "Close the current window"
+msgstr "关闭当前窗口"
+
+#. copy menu item
+#: ../calendar/gui/e-comp-editor.c:1982 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1073 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:136
+#: ../mail/mail.error.xml.h:140 ../shell/e-shell-window-actions.c:799
+msgid "_Copy"
+msgstr "复制(_C)"
+
+#: ../calendar/gui/e-comp-editor.c:1984 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
+#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:138
+#: ../shell/e-shell-window-actions.c:801
+msgid "Copy the selection"
+msgstr "复制选中内容"
+
+#. cut menu item
+#: ../calendar/gui/e-comp-editor.c:1989 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1080 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+msgid "Cu_t"
+msgstr "剪切(_T)"
+
+#: ../calendar/gui/e-comp-editor.c:1991 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
+#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+msgid "Cut the selection"
+msgstr "剪切选中内容"
+
+#: ../calendar/gui/e-comp-editor.c:1998 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:815
+msgid "Delete the selection"
+msgstr "删除选中内容"
+
+#: ../calendar/gui/e-comp-editor.c:2005
+msgid "View help"
+msgstr "查看帮助"
+
+#. paste menu item
+#: ../calendar/gui/e-comp-editor.c:2010 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1087 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+msgid "_Paste"
+msgstr "粘贴(_P)"
+
+#: ../calendar/gui/e-comp-editor.c:2012 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
+#: ../mail/e-mail-browser.c:152 ../shell/e-shell-window-actions.c:836
+msgid "Paste the clipboard"
+msgstr "粘贴剪贴板"
+
+#: ../calendar/gui/e-comp-editor.c:2017 ../composer/e-composer-actions.c:388
+#: ../mail/e-mail-reader.c:2287
+#: ../modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../modules/addressbook/e-book-shell-view-actions.c:1245
+msgid "_Print..."
+msgstr "打印(_P)..."
+
+#: ../calendar/gui/e-comp-editor.c:2024 ../mail/e-mail-reader.c:2294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-memo-shell-view-actions.c:815
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
+msgid "Pre_view..."
+msgstr "预览(_V)..."
+
+#: ../calendar/gui/e-comp-editor.c:2031 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-web-view.c:389
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+msgid "Select _All"
+msgstr "全选(_A)"
+
+#: ../calendar/gui/e-comp-editor.c:2033 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:159 ../shell/e-shell-window-actions.c:913
+msgid "Select all text"
+msgstr "选中所有文字"
+
+#: ../calendar/gui/e-comp-editor.c:2054
+msgid "_Classification"
+msgstr "分类(_C)"
+
+#: ../calendar/gui/e-comp-editor.c:2068 ../e-util/e-html-editor-actions.c:1124
+#: ../e-util/e-mail-signature-editor.c:313 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+msgid "_File"
+msgstr "文件(_F)"
+
+#: ../calendar/gui/e-comp-editor.c:2082 ../e-util/e-html-editor-actions.c:1145
+msgid "_Insert"
+msgstr "插入(_I)"
+
+#: ../calendar/gui/e-comp-editor.c:2089 ../composer/e-composer-actions.c:378
+msgid "_Options"
+msgstr "选项(_O)"
+
+#: ../calendar/gui/e-comp-editor.c:2096 ../e-util/e-html-editor-actions.c:1166
+#: ../mail/e-mail-browser.c:180 ../shell/e-shell-window-actions.c:991
+#: ../smime/gui/certificate-manager.c:1653 ../smime/gui/smime-ui.ui.h:5
+msgid "_View"
+msgstr "查看(_V)"
+
+#: ../calendar/gui/e-comp-editor.c:2108
+msgid "Save current changes"
+msgstr "保存当前更改"
+
+#: ../calendar/gui/e-comp-editor.c:2113
+#: ../e-util/e-mail-signature-editor.c:308 ../mail/e-mail-notes.c:912
+msgid "Save and Close"
+msgstr "保存并关闭"
+
+#: ../calendar/gui/e-comp-editor.c:2115
+msgid "Save current changes and close editor"
+msgstr "保存当前更改并关闭编辑器"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1706
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
+#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
+#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1709
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
+#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
 msgid "pm"
 msgstr "下午"
 
@@ -4799,13 +4851,13 @@ msgstr "下午"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:3019 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3017 ../calendar/gui/e-day-view-top-item.c:843
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2095
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3744
+#: ../calendar/gui/e-day-view.c:3742
 #, c-format
 msgid "Week %d"
 msgstr "第%d周"
@@ -4827,8 +4879,8 @@ msgstr "显示第二时区"
 
 #. Translators: "None" indicates no second time zone set for a day view
 #: ../calendar/gui/e-day-view-time-item.c:848
-#: ../modules/calendar/e-calendar-preferences.c:308
-#: ../modules/calendar/e-calendar-preferences.c:360
+#: ../modules/calendar/e-calendar-preferences.c:303
+#: ../modules/calendar/e-calendar-preferences.c:355
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
@@ -4836,85 +4888,98 @@ msgstr "无"
 
 #: ../calendar/gui/e-day-view-time-item.c:882
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:391
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "选择..."
 
-#: ../calendar/gui/e-meeting-list-view.c:63
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-list-view.c:165
+msgid "Attendees"
+msgstr "出席者"
+
+#: ../calendar/gui/e-meeting-list-view.c:181
 #: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
-#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1245
 msgid "Individual"
 msgstr "个人"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1246 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "组"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "房间"
 
-#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-list-view.c:195
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
-#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1263
 msgid "Required Participant"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "不参加"
 
-#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
 #: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "需要动作"
 
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:620
 msgid "Attendee                          "
 msgstr "出席者                            "
 
-#: ../calendar/gui/e-meeting-list-view.c:674
+#: ../calendar/gui/e-meeting-list-view.c:646
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-task-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:207
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "类型"
+
+#: ../calendar/gui/e-meeting-list-view.c:675
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "请回复"
@@ -4947,59 +5012,63 @@ msgstr "办公室以外"
 msgid "No Information"
 msgstr "没有信息"
 
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
+
 #: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:594
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:625
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:711
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:732
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "开始时间(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:800
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "结束时间(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2721
+#: ../calendar/gui/e-meeting-time-sel.c:2723
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5008,7 +5077,7 @@ msgstr ""
 "简要:%s\n"
 "位置:%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "概要:%s"
@@ -5037,46 +5106,46 @@ msgstr "通用名"
 msgid "Language"
 msgstr "语言"
 
-#: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1631
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-#: ../modules/calendar/e-memo-shell-view.c:308
+#: ../calendar/gui/e-memo-table.c:370 ../data/evolution.desktop.in.in.h:11
+#: ../modules/calendar/e-cal-shell-content.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "备忘"
 
-#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:757
 msgid "* No Summary *"
 msgstr "* 没有概要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:542 ../calendar/gui/e-task-table.c:839
 msgid "Start: "
 msgstr "开始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:562 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:683
+#: ../calendar/gui/e-memo-table.c:720
 msgid "Cut selected memos to the clipboard"
 msgstr "将选中备忘剪切到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:689
+#: ../calendar/gui/e-memo-table.c:726
 msgid "Copy selected memos to the clipboard"
 msgstr "将选中备忘复制到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:695
+#: ../calendar/gui/e-memo-table.c:732
 msgid "Paste memos from the clipboard"
 msgstr "从剪贴板中粘贴备忘"
 
-#: ../calendar/gui/e-memo-table.c:701
-#: ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../calendar/gui/e-memo-table.c:738
+#: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "删除选中的备忘"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:744
 msgid "Select all visible memos"
 msgstr "选中所有可见的备忘"
 
@@ -5084,6 +5153,11 @@ msgstr "选中所有可见的备忘"
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "未定义"
+
 #. Translators: "%d%%" is the percentage of a task done.
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
@@ -5093,38 +5167,69 @@ msgstr "单击以添加备忘"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
 #: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1063
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1591
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-#: ../modules/calendar/e-task-shell-view.c:466
+#: ../calendar/importers/icalendar-importer.c:1117
+#: ../data/evolution.desktop.in.in.h:12
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-cal-shell-content.c:1627
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "任务"
 
-#: ../calendar/gui/e-task-table.c:998
+#: ../calendar/gui/e-task-table.c:1033
 msgid "Cut selected tasks to the clipboard"
 msgstr "将选中任务剪切到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:1004
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Copy selected tasks to the clipboard"
 msgstr "将选中任务复制到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:1010
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Paste tasks from the clipboard"
 msgstr "从剪贴板中粘贴任务"
 
-#: ../calendar/gui/e-task-table.c:1016
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../calendar/gui/e-task-table.c:1051
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1057
 msgid "Select all visible tasks"
 msgstr "选中所有可见的任务"
 
+#: ../calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "单击以添加任务"
+
+#: ../calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "开始日期"
+
+#: ../calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "完成日期"
+
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:968
+msgid "Complete"
+msgstr "完成"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "到期日期"
+
+#: ../calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% 完成"
+
+#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Priority"
+msgstr "优先级"
+
 #: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "选择时区"
@@ -5132,36 +5237,36 @@ msgstr "选择时区"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:842
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:699
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
 msgid "Event information"
 msgstr "事件信息"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
 msgid "Task information"
 msgstr "任务信息"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
 msgid "Memo information"
 msgstr "备忘信息"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:942
 msgid "Calendar information"
 msgstr "日历信息"
 
@@ -5169,7 +5274,7 @@ msgstr "日历信息"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:979
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "接受"
@@ -5178,7 +5283,7 @@ msgstr "接受"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:985
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
@@ -5190,7 +5295,7 @@ msgstr "暂时接受"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
+#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "拒绝"
@@ -5199,7 +5304,7 @@ msgstr "拒绝"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:999
+#: ../calendar/gui/itip-utils.c:1000
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被委任的"
@@ -5207,7 +5312,7 @@ msgstr "被委任的"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1012
+#: ../calendar/gui/itip-utils.c:1013
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新"
@@ -5215,7 +5320,7 @@ msgstr "更新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1019
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -5223,7 +5328,7 @@ msgstr "取消"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1026
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
@@ -5231,166 +5336,166 @@ msgstr "刷新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1033
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:1112
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../calendar/gui/itip-utils.c:1120
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: ../calendar/gui/itip-utils.c:1148
+#: ../calendar/gui/itip-utils.c:1149
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "无法预约资源,新事件与其它事件冲突。"
 
-#: ../calendar/gui/itip-utils.c:1153
+#: ../calendar/gui/itip-utils.c:1154
 msgid "Unable to book a resource, error: "
 msgstr "无法预约资源,错误:"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/itip-utils.c:1918
+#: ../calendar/gui/itip-utils.c:1933
 msgid "Sending an event"
-msgstr "正在发送活动"
+msgstr "正在发送事件"
 
-#: ../calendar/gui/itip-utils.c:1922
+#: ../calendar/gui/itip-utils.c:1937
 msgid "Sending a memo"
 msgstr "正在发送备忘"
 
-#: ../calendar/gui/itip-utils.c:1926
+#: ../calendar/gui/itip-utils.c:1941
 msgid "Sending a task"
 msgstr "正在发送任务"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:670
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31日"
 
@@ -5398,102 +5503,114 @@ msgstr "31日"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "一"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "二"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "三"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "四"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:734
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "五"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "六"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:735
 msgid "Su"
 msgstr "日"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3309
+#: ../calendar/gui/print.c:3315
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3341
 msgid " (Due "
 msgstr " (预定 "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3342
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/print.c:3546
+#: ../calendar/gui/print.c:3492
+msgid "Appointment"
+msgstr "约会"
+
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "任务"
+
+#: ../calendar/gui/print.c:3496
+msgid "Memo"
+msgstr "备忘"
+
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "出席者:"
 
-#: ../calendar/gui/print.c:3590
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: ../calendar/gui/print.c:3606
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级:%s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率:%i"
 
-#: ../calendar/gui/print.c:3638
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "URL:%s"
 
-#: ../calendar/gui/print.c:3652
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "类别:%s"
 
-#: ../calendar/gui/print.c:3663
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "联系人:"
 
@@ -5520,181 +5637,201 @@ msgstr "小于"
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:453
-#: ../calendar/importers/icalendar-importer.c:892
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../modules/calendar/e-cal-base-shell-backend.c:183
+#: ../modules/calendar/e-cal-shell-view-actions.c:180
+msgid "New Calendar"
+msgstr "新建日历"
+
+#: ../calendar/importers/icalendar-importer.c:315
+#: ../modules/calendar/e-cal-base-shell-backend.c:191
+#: ../modules/calendar/e-task-shell-view-actions.c:204
+msgid "New Task List"
+msgstr "新建任务列表"
+
+#: ../calendar/importers/icalendar-importer.c:357
+msgid "Cre_ate new calendar"
+msgstr "创建新日历(_A)"
+
+#: ../calendar/importers/icalendar-importer.c:361
+msgid "Cre_ate new task list"
+msgstr "创建新任务列表(_A)"
+
+#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:601
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:602
+#: ../calendar/importers/icalendar-importer.c:656
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:694
+#: ../calendar/importers/icalendar-importer.c:748
 msgid "Reminder!"
 msgstr "提醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:778
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 文件(.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:779
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1056
+#: ../calendar/importers/icalendar-importer.c:1110
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: ../calendar/importers/icalendar-importer.c:1099
-msgid "Gnome Calendar"
-msgstr "Gnome 日历"
+#: ../calendar/importers/icalendar-importer.c:1153
+msgid "GNOME Calendar"
+msgstr "GNOME 日历"
 
-#: ../calendar/importers/icalendar-importer.c:1100
+#: ../calendar/importers/icalendar-importer.c:1154
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 日历智能导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1171
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会议"
 
-#: ../calendar/importers/icalendar-importer.c:1171
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1174
-#: ../calendar/importers/icalendar-importer.c:1486
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/importers/icalendar-importer.c:1177
-#: ../calendar/importers/icalendar-importer.c:1487
+#: ../calendar/importers/icalendar-importer.c:1231
+#: ../calendar/importers/icalendar-importer.c:1541
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "有再现"
 
-#: ../calendar/importers/icalendar-importer.c:1191
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "本次和以前各次"
 
-#: ../calendar/importers/icalendar-importer.c:1196
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1201
+#: ../calendar/importers/icalendar-importer.c:1255
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1214
+#: ../calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公开"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1217
+#: ../calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "保密"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1220
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "机密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1224
+#: ../calendar/importers/icalendar-importer.c:1278
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "分类"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1229
-#: ../calendar/importers/icalendar-importer.c:1529
+#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "概要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1235
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1243
-#: ../calendar/importers/icalendar-importer.c:1524
+#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1578
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "开始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1254
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1266
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "End"
 msgstr "结束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1276
+#: ../calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "类别"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1300
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1362
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1319
-#: ../calendar/importers/icalendar-importer.c:1322
+#: ../calendar/importers/icalendar-importer.c:1373
+#: ../calendar/importers/icalendar-importer.c:1376
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "组织者"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1342
-#: ../calendar/importers/icalendar-importer.c:1345
+#: ../calendar/importers/icalendar-importer.c:1396
+#: ../calendar/importers/icalendar-importer.c:1399
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1359
+#: ../calendar/importers/icalendar-importer.c:1413
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1519
+#: ../calendar/importers/icalendar-importer.c:1573
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "类型"
@@ -7262,7 +7399,7 @@ msgstr "新建信息(_M)"
 msgid "Open New Message window"
 msgstr "打开新建信息窗口"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1215
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "首选项(_P)"
@@ -7365,13 +7502,13 @@ msgstr "用您的 S/MIME 签名认证签名该信息"
 
 #: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-msgid "Unicode smileys"
+msgid "Unicode emoticons"
 msgstr "Unicode 表情"
 
 #: ../composer/e-composer-actions.c:525
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
-msgid "Use Unicode characters for smileys."
-msgstr "用 Unicode 中的表情字符。"
+msgid "Use Unicode characters for emoticons."
+msgstr "使用 Unicode 字符表示表情。"
 
 #: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
@@ -7407,6 +7544,10 @@ msgstr "回复至域(_R)"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "是否显示回复域"
 
+#: ../composer/e-composer-actions.c:612
+msgid "Attach"
+msgstr "附件"
+
 #: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "保存草稿"
@@ -7414,8 +7555,8 @@ msgstr "保存草稿"
 #: ../composer/e-composer-from-header.c:109
 #: ../e-util/e-mail-signature-script-dialog.c:415
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "名称(_N):"
 
@@ -7462,7 +7603,7 @@ msgid "S_ubject:"
 msgstr "主题(_U):"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:504
+#: ../mail/e-mail-config-identity-page.c:516
 msgid "Si_gnature:"
 msgstr "签名(_G):"
 
@@ -7474,24 +7615,25 @@ msgstr "单击此处以使用地址簿"
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:874
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信息签名:未对此帐号设置签名证书"
 
-#: ../composer/e-msg-composer.c:881
+#: ../composer/e-msg-composer.c:883
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
 
-#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2614
+#: ../composer/e-msg-composer.c:1599 ../composer/e-msg-composer.c:2608
+#: ../data/evolution.desktop.in.in.h:7
 msgid "Compose Message"
 msgstr "新建消息"
 
-#: ../composer/e-msg-composer.c:4964
+#: ../composer/e-msg-composer.c:4981
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "编写器含有不可编辑的非文本信体。"
 
@@ -7538,22 +7680,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "保存到自动保存出错,原因是“{1}”。"
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "下载进行中。您想要发送邮件吗?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr "附件正在下载中。发送邮件将使得邮件发送时无法包含后续的附件"
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信息吗?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:12
 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 "
@@ -7563,81 +7695,81 @@ msgstr ""
 "您在稍后继续编写信息。"
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "继续编辑(_C)"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "保存草稿(_S)"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "您确定想要丢弃您正在编写的信息吗?"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "无法创建信息。"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:19
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "由于“{0}”,您可能要选择不同的邮件选项。"
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "无法读取签名文件“{0}”。"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "已经删除了全部帐号。"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "在您可以撰写邮件之前您需要配置一个帐号。"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:23
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "在保存到您的发件箱文件夹时出现了一个错误。"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:24
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "报告的错误为“{0}”。信息很可能没有发送。"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "在保存到您的草稿文件夹时出现了一个错误。"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:26
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr "报告的错误为“{0}”。信息很可能没有保存。"
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:27
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "在发送时出错了错误。您想继续吗?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "报告的错误为“{0}”。"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Save to Outbox"
 msgstr "保存到发件箱(_S)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "重试(_T)"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:31
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "您的消息已发送,但在处理时出现了一个错误。"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:32
 msgid "Saving message to Outbox."
 msgstr "把信息保存到发件箱中。"
 
-#: ../composer/mail-composer.error.xml.h:36
+#: ../composer/mail-composer.error.xml.h:33
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7646,33 +7778,32 @@ msgstr ""
 "由于目标服务当前不可用,信息将保存到您的本地发件箱文件夹。在上线后,您可以通"
 "过点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
 
-#: ../composer/mail-composer.error.xml.h:37
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Are you sure you want to send the message?"
 msgstr "您确定要发送信息吗?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../composer/mail-composer.error.xml.h:35
 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 ""
-"发送信息的键盘快捷键已经被按下。要么取消发送信息(如果是误操作),要么是发送"
-"信息。"
+"发送信息的快捷键已经被按下。要么取消发送信息(如果是误操作),要么是发送信息。"
 
-#: ../composer/mail-composer.error.xml.h:39
+#: ../composer/mail-composer.error.xml.h:37
 msgid "Are you sure you want to change the composer mode?"
 msgstr "您确定要改变编辑器模式?"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:38
 msgid ""
 "Turning HTML mode off will cause the text to lose all formatting. Do you "
 "want to continue?"
 msgstr "关闭 HTML 模式会使文本丢弃所有格式。您想继续吗?"
 
-#: ../composer/mail-composer.error.xml.h:41
+#: ../composer/mail-composer.error.xml.h:39
 msgid "_Don't lose formatting"
 msgstr "不要丢弃格式(_D)"
 
-#: ../composer/mail-composer.error.xml.h:42
+#: ../composer/mail-composer.error.xml.h:40
 msgid "Lose _formatting"
 msgstr "丢失格式(_F)"
 
@@ -7684,7 +7815,8 @@ msgstr "Evolution 提醒通知"
 msgid "Calendar event notifications"
 msgstr "日历事件信息"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1121
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7698,7 +7830,7 @@ msgstr "Groupwise 套件"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 邮件及日历"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
 msgid "Manage your email, contacts and schedule"
 msgstr "配置您的电子邮件,联系人和日程表"
 
@@ -7706,6 +7838,24 @@ msgstr "配置您的电子邮件,联系人和日程表"
 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:8 ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:373
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../data/evolution.desktop.in.in.h:10 ../e-util/e-send-options.c:538
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/kmail-importer.c:253
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1242
+#: ../smime/gui/certificate-manager.c:1673
+msgid "Mail"
+msgstr "邮件"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "启用地址格式化"
@@ -7846,7 +7996,7 @@ msgstr "是否在编辑器中显示备注"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
 msgid "Whether to show Certificates tab in the editor"
-msgstr "是否在编辑器中显示证书标签页"
+msgstr "是否在编辑器中显示证书选项卡"
 
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
@@ -8234,8 +8384,8 @@ msgid ""
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
 "list. \"1\" (Vertical View) places the preview pane next to the memo list"
 msgstr ""
-"布局样式决定了在哪里放置备忘录列表的预览面板。“0”(经典视图)会把预览面板放置在"
-"备忘录列表下面。“1”(竖直视图)会把预览面板放置在备忘录列表旁边。"
+"布局样式决定了在哪里放置备忘录的预览面板。“0”(经典视图)会把预览面板放置在备忘"
+"录下面。“1”(竖直视图)会把预览面板放置在备忘录旁边。"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
@@ -8300,13 +8450,13 @@ msgstr "在“日历”视图侧边栏中选定的(或“主”)日历的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
-msgstr "首选备忘录列表"
+msgstr "首选备忘录"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
-msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘录列表的 UID"
+msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘录的 UID"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
@@ -8359,62 +8509,70 @@ msgid "Whether to display the end time of events in the week and month views"
 msgstr "是否在周视图和月视图中显示事件的结束时间"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+msgid "Show appointment icons in the month view"
+msgstr "在月视图中显示约会结束时间"
+
+#: ../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:113
 msgid "Show the memo preview pane"
 msgstr "显示“备忘预览”面板"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "如果“true”,在主窗口中显示备忘预览面板"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../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:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "如果“true”,在主窗口中显示任务预览面板"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr "在日视图、工作日视图和日期导航中显示周数"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../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:117
+#: ../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:118
+#: ../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:119
+#: ../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:120
+#: ../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:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
 msgstr ""
 "今天到期任务的背景颜色,“#rrggbb”格式;与 task-due-today-highlight 一起使用"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../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:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "任务外观风格"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8423,38 +8581,38 @@ msgstr ""
 "布局样式决定了在哪里放置任务列表的预览面板。“0”(经典视图)会把预览面板放置在任"
 "务列表下面。“1”(竖直视图)会把预览面板放置在任务列表旁边。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../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:126
+#: ../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:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Show reminders for completed tasks"
-msgstr "显示已完成任务的提醒"
+msgstr "显示已完成工作的提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 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:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
 msgstr "高亮延期任务"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 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:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8462,19 +8620,19 @@ msgstr ""
 "延期任务的背景颜色,以“#rrggbb”格式。与 task-overdue-highlight(任务延期高亮)"
 "一道使用。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "时间分割"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "日视图和工作周视图中显示的间隔,以分钟计。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "时区"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8482,86 +8640,90 @@ msgstr ""
 "日历中日期和时间所使用的默认时区,以未翻译的 Olson 时区数据库位置表示,"
 "如“Asia/Chongqing”。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "二十四小时时间格式"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 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:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
 msgstr "生日和纪念日提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "是否为生日或周年纪念日设置提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
 msgstr "默认约会提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Whether to set a default reminder for appointments"
 msgstr "是否为约会设置默认提醒"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "使用系统时区"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "First day of the week"
 msgstr "本周第一天"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "周一为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "周二为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "周三为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "周四为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "周五为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "周六为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "周日为工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "Create events, memos and tasks as Private by default"
+msgstr "默认创建私密事件、备忘录和任务"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
 msgstr ""
 "该键值已在版本 3.10 中弃用,不应当再使用。请使用 \"week-start-day-name\"。"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(已弃用)工作日"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -8641,8 +8803,8 @@ msgid "Default charset in which to compose messages"
 msgstr "编写信息的默认字符集"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
-msgstr "编写信息的默认字符集。"
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr "编写信息的默认字符集。若未设定的话,将使用 UTF-8。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
@@ -8968,18 +9130,26 @@ msgstr ""
 "们只会在被使用时才显示。"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Wrap quoted text in replies"
+msgstr "为回复中引用的文本换行"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid "If set to 'true' quoted text in replies will be wrapped."
+msgstr "如设置为 true,则将为回复中引用的文本换行"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Save file format for drag-and-drop operation"
 msgstr "拖放操作时保存文件类型"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "可以是“mbox”或“pdf”。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Show image animations"
 msgstr "显示图像动画"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8987,91 +9157,104 @@ msgstr ""
 "在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
 "是动态的。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable type ahead search feature"
 msgstr "启用或禁用自动前进功能"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable or disable magic space bar"
 msgstr "启用或禁用魔术空格键"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 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:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr "启用以在所有文件夹中使用相似的信息列表视图设置"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr "启用以在所有文件夹中使用相似的信息列表视图设置。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Mark citations in the message \"Preview\""
 msgstr "在信息“预览”中标出引用"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在信息“预览”中标出引用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Citation highlight color"
 msgstr "引用突出颜色"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Citation highlight color."
 msgstr "引用突出颜色。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable/disable caret mode"
 msgstr "启用/禁用光标模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Default charset in which to display messages"
 msgstr "显示信息的默认字符集"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Default charset in which to display messages."
 msgstr "显示信息的默认字符集。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "自动在 HTML 信息中载入 HTTP 图像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Show notification about missing remote content"
+msgstr "显示关于远程内容缺失的通知"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+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 "
+"show a notification about it on top of the preview panel."
+msgstr ""
+"当信息预览显示了一封需要下载远程内容的邮件而从此用户或站点下载又被禁止时,在"
+"预览面板顶层显示相应通知。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show animated images as animations."
 msgstr "将动画图像显示为动画。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show all message headers"
 msgstr "显示全部信头"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show all the headers when viewing a messages."
 msgstr "查看信息时显示全部信头。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "List of headers to show when viewing a message."
 msgstr "要在查看信息时显示的信头列表。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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 "
@@ -9080,81 +9263,89 @@ msgstr ""
 "每个信头都成对出现:信头名,指示该信头是否启用的布尔值。当查看某个信息时,禁"
 "用的信头将不会显示,但仍然会列在“首选项”中。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show photo of the sender"
 msgstr "显示发件人照片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在信息阅读面板中显示发件人照片。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Search gravatar.com for photo of the sender"
 msgstr "从 gravatar.com 搜索发件人照片"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "允许搜索发件人照片并在 gravatar.com 里搜索"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过后标为已看"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过后标为已看。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen always after specified timeout"
-msgstr "总是在指定的时限过后标示成已阅"
+msgstr "在指定的时限过后永远标示成已阅"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Timeout for marking messages as seen"
 msgstr "将信息标为已看的超时时长"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "将信息标为已看的超时时长,单位为毫秒。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Sender email-address column in the message list"
 msgstr "在信息列表中显示 email 地址列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Show deleted messages in the message-list"
 msgstr "在信息列表中显示删除了的信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在信息列表中显示删除了的信息(带有删除线)。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+msgid "Show junk messages in the message-list"
+msgstr "在消息列表中显示垃圾信息"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr "在信息列表中显示垃圾信息(带有红色删除线)。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Enable Unmatched search folder"
 msgstr "启用“无匹配”搜索文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隐藏单文件夹预览并移除选择"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -9162,31 +9353,31 @@ msgstr ""
 "此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Height of the message-list pane"
 msgstr "信息列表面板的高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Height of the message-list pane."
 msgstr "信息列表面板的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "是否在用户界面中折叠信息头"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Width of the message-list pane"
 msgstr "信息列表面板的高度"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Width of the message-list pane."
 msgstr "信息列表面板的高度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Layout style"
 msgstr "布局样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9196,75 +9387,75 @@ msgstr ""
 "布局样式决定了在哪里放置信息列表的预览面板。“0”(经典视图)会把预览面板放置在消"
 "息列表下面。“1”(竖直视图)会把预览面板放置在信息列表旁边。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的变宽字体。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "压缩 TO/CC/BCC 中地址的显示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "要在 TO/CC/BCC 中显示的地址数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "设定默认信息视图中要显示的地址数,超过的部分显示为“...”。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信息列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 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:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Default value for thread expand state"
-msgstr "线索的默认展开状态"
+msgstr "话题的默认展开状态"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否以线索中的最新信息来排序线索"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9273,11 +9464,11 @@ msgstr ""
 "此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
 "启 Evolution。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether sort thread children always ascending"
-msgstr "是否永远递增排序相关邮件线索子项"
+msgstr "是否永远递增排序相关邮件子项"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 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."
@@ -9285,11 +9476,11 @@ msgstr ""
 "这个设置值指定相关邮件的子项是否永远递增排序,而非依照相关邮件同样的排序顺"
 "序。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "在文件夹树中按字母顺序排列帐号"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9297,29 +9488,29 @@ msgid ""
 "given by a user"
 msgstr ""
 "指出在邮件视图的文件夹树里如何排序帐号。若设为 true,帐号按字母顺序排列,“在"
-"此计算机中”和“搜索”文件夹除外;否则帐号按用户指定的顺序排列"
+"此计算机上”和“搜索”文件夹除外;否则帐号按用户指定的顺序排列"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Logfile to log filter actions."
 msgstr "记录过滤动作的日志文件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Flush Outbox after filtering"
 msgstr "在过滤之后清空输出窗口"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9328,100 +9519,100 @@ msgstr ""
 "在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
 "约一分钟后进行发件箱刷新。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Default forward style"
 msgstr "默认转发方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Default reply style"
 msgstr "默认回复样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr "使用 键盘快捷键(Ctrl+Enter) 发送时提示"
+msgstr "使用 快捷键(Ctrl+Enter) 发送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
-msgstr "用户试图通过键盘快捷键发送信息时提示。"
+msgstr "用户试图通过快捷键发送信息时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt on empty subject"
 msgstr "空主题时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "用户视图发送没有主题的信息时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when emptying the trash"
 msgstr "清空废件箱时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "在用户试图清空废件箱时提示他/她。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user expunges"
 msgstr "用户销毁时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "用户试图销毁文件夹时提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "下列接收者不能被识别为有效的电子邮件地址"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user only fills Bcc"
 msgstr "用户只填入密件抄送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "当用户是否发送意外的 HTML 时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "当用户试图一次打开超过十封信时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt while marking multiple messages"
 msgstr "标记多封信息时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "禁用/启用对多条信息标记时的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when deleting messages in search folder"
 msgstr "删除搜索文件夹中的信息时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 "
@@ -9429,11 +9620,11 @@ msgid ""
 msgstr ""
 "禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr "询问是否通过文件夹树的拖放操作复制文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9443,11 +9634,11 @@ msgstr ""
 "可取的值有:“never”- 不允许在文件夹树中拖放复制文件夹;“always”- 允许复制,无"
 "须询问;“ask”- (或其他任意值) 询问用户。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr "询问是否通过文件夹树的拖放操作移动文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9457,21 +9648,21 @@ msgstr ""
 "可取的值有:“never”- 不允许在文件夹树中拖放移动文件夹;“always”- 允许移动,无"
 "须询问;“ask”- (或其他任意值) 询问用户。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when replying privately to list messages"
 msgstr "当对邮件列表作私人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "当邮件列表劫持私人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -9480,34 +9671,34 @@ msgstr ""
 "当您正要发送一个通过邮件列表收到的信息的私人回复,而邮件头的 Reply-To: 重定向"
 "到了列表时,禁用或启用反复的警告提示。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying to many recipients"
 msgstr "当向多个收件人回复时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr "是否在切换编辑器模式会导致内容失去现有格式时先提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
 msgstr ""
 "它会停用/启用重复提示警告您正在切换编辑器模式而其中内容会失去先前的格式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "当回复给许多收件人与抄送时提示"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
@@ -9515,56 +9706,56 @@ msgstr ""
 "当寄信给许多收件人与抄送时启用或停用提示。“composer-many-to-cc-recips-num”定"
 "义了这个界限值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空废件箱"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出 Evolution 时清空废件箱。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空废件箱的最少天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "退出时清空废件箱的最少天数。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Last time Empty Trash was run"
 msgstr "上次清空废件箱的时间为:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的信息会被记录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Show original \"Date\" header value."
 msgstr "显示原始的邮件头日期值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9573,11 +9764,11 @@ msgstr ""
 "显示原始的邮件头“Date”值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
 "式和本地时区显示邮件头“Date”值。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "List of Labels and their associated colors"
 msgstr "标签及其对应颜色的列表"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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."
@@ -9585,44 +9776,44 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
 "颜色使用了 HTML 十六进制编码方式。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Check incoming mail being junk"
 msgstr "检查收到的邮件是否是垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Run junk test on incoming mail."
 msgstr "对收到的邮件运行垃圾信息测试。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty Junk folders on exit"
 msgstr "退出时清空垃圾信息文件夹"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "退出 Evolution 时清空垃圾信息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Minimum days between emptying the junk on exit"
 msgstr "退出时清空垃圾信息的最少天数"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "退出时清空垃圾信息的最少时间,以天计。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Last time Empty Junk was run"
 msgstr "上次清空垃圾信息的时间为:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信息钩子插件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9631,11 +9822,11 @@ msgstr ""
 "这是默认的垃圾信息插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
 "缺省到其它可用的插件。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "决定是否在地址簿中查找发件人电子邮件"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9646,13 +9837,13 @@ msgstr ""
 "为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
 "比较慢。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -9661,11 +9852,11 @@ msgstr ""
 "此选项与 lookup_addressbook 键值相关,用于决定是否查询本地地址簿以避免您认识"
 "的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "决定是否使用自定义信头检测垃圾信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -9674,51 +9865,51 @@ msgstr ""
 "决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话,将提高"
 "垃圾信息检测速度。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Custom headers to use while checking for junk."
 msgstr "自定义用以检查垃圾信息的信头。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr "自定义用以检查垃圾信息的信头。列表元素的字符串格式为“信头名=值”。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "UID string of the default account."
 msgstr "默认帐号的 UID 字符串。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Save directory"
 msgstr "保存目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Directory for saving mail component files."
 msgstr "保存邮件组件文件的目录。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Composer load/attach directory"
 msgstr "编辑器加载/附件目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Directory for loading/attaching files to composer."
 msgstr "邮件写作器用来加载/附加文件的目录"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Check for new messages on start"
 msgstr "启动时检查新信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Check for new messages in all active accounts"
 msgstr "检查所有活动帐号的新信息"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9727,21 +9918,21 @@ msgstr ""
 "在 Evolution 启动时,是不是检查所有活动帐号的新信息而不管帐号的“每隔 X 分钟自"
 "动检查新信息”选项如何设置。该选项仅与“send_recv_on_start”选项一起使用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Server synchronization interval"
 msgstr "服务器同步间隔"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 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:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Allow expunge in virtual folders"
 msgstr "允许在虚拟文件夹中销毁"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -9752,75 +9943,75 @@ msgstr ""
 "虚拟文件夹中信息的操作会在所有文件夹中进行,而不仅仅是只删除属于虚拟文件夹中"
 "的信息。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
-msgstr "在 HTML 模式中继承主题的颜色"
+msgstr "继承主题的颜色为 HTML 模式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 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:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "An Archive folder for On This Computer folders."
-msgstr "一个对应于“在此计算机中”文件夹的归档文件夹。"
+msgstr "一个对应于“位于本机”文件夹的归档文件夹。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
-msgstr "在“在此计算机中”文件夹里使用 信息|分类… 功能的归档文件夹。"
+msgstr "在“位于本机”文件夹里使用 信息|分类… 功能的归档文件夹。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Default forward style"
 msgstr "(已弃用) 默认转发方式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
 msgstr "该键已在 3.10 版本中弃用,不应再使用。请转用 \"forward-style-name\"。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "(Deprecated) Default reply style"
 msgstr "(已弃用) 默认回复样式"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
 msgstr "该键已在 3.10 版本中弃用,不应再使用。请转用 \"reply-style-name\"。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(已弃用)自定义信头及是否启用。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
 msgstr "该键已在 3.10 版本中弃用,不应再使用。请转用 \"show-headers\"。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(已弃用) 在 HTML 信息中载入 HTTP 图像"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
 msgstr ""
 "该键已在 3.10 版本中弃用,不应再使用。请转用 \"image-loading-policy\"。"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 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:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10045,11 +10236,12 @@ msgstr "显示邮件时所用模式"
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"prefer_source\" makes it use the text part, if present, otherwise shows "
+"HTML source, and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
-"用于显示邮件的模式。“normal”使 Evolution 选择要显示的最佳部"
-"分;“prefer_plain”让 Evolution 尽可能用文字部分;“only_plain”强制 Evolution "
-"只显示纯文字"
+"显示邮件所使用的模式。“normal”使 Evolution 自己选择最好的显示部"
+"分;“prefer_plain”使其在可用时使用文本部分;“prefer_source”使其在可用时使用文"
+"本部分,否则显示 HTML 源码;“only_plain”强制使 Evolution 只显示纯文本"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:3
 msgid "Whether to show suppressed HTML output"
@@ -10126,18 +10318,30 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "用于启用简洁用户界面的标识。"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+msgid "List of button names to hide in the window switcher"
+msgstr "要在窗口切换器中隐藏的按钮名称列表"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+"Change of this requires restart of the application."
+msgstr ""
+"有效值为 'mail', 'addressbook', 'calendar', 'tasks' 及 'memos''。需要重启应用"
+"程序以让此项修改生效。"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
 msgstr "窗口按钮可见"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Whether the window buttons should be visible."
 msgstr "窗口按钮是否可见。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "窗口按钮样式"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10146,39 +10350,39 @@ msgstr ""
 "窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、“toolbar”(工"
 "具栏)。如果设置为“toolbar”(工具栏),则工具栏的样式由 GNOME 设置决定。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "工具栏可见"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "工具栏是否可见。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "侧边栏可见"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "侧边栏是否可见。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "状态栏可见"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "状态栏是否可见。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "启动时默认显示的组件 ID 或别名。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "默认侧边栏宽度"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "侧边栏的默认宽度,以像素计。"
 
@@ -10216,14 +10420,6 @@ msgstr ""
 "运行 sa-learn 命令的完整路径。如果未设置,使用编译时路径,通常是 /usr/bin/sa-"
 "learn 。命令不该包含任何其他参数。"
 
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "附件"
-
 #: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "以附件显示"
@@ -10267,15 +10463,15 @@ msgstr "RFC822 信息"
 msgid "Format part as an RFC822 message"
 msgstr "将部分格式化为 RFC822 信息"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:51
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "姓名"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:195 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "大小"
 
@@ -10283,14 +10479,15 @@ msgstr "大小"
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
 #: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
-#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1634
 msgid "Subject"
 msgstr "主题"
 
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1484
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "邮件程序"
 
@@ -10305,18 +10502,18 @@ msgid "Display part as enriched text"
 msgstr "以富文本显示部分"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:385
+#: ../em-format/e-mail-formatter-text-html.c:387
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:386
+#: ../em-format/e-mail-formatter-text-html.c:388
 msgid "Format part as HTML"
 msgstr "将部分格式化为 HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
 #: ../em-format/e-mail-formatter-text-plain.c:198
-#: ../e-util/e-html-editor-actions.c:1526
+#: ../e-util/e-html-editor-actions.c:1523
 msgid "Plain Text"
 msgstr "纯文字"
 
@@ -10370,10 +10567,11 @@ msgid "Signature exists, but need public key"
 msgstr "签名已存在,但需要公钥"
 
 #: ../em-format/e-mail-formatter-secure-button.c:55
+#, fuzzy
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
-msgstr "这封信的签名有效,但是没有相应的公钥。"
+msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
 
 #: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Unencrypted"
@@ -10430,14 +10628,18 @@ msgstr "查看证书(_V)"
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "来源"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "显示 MIME 部分的源内容"
 
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
+msgid "To"
+msgstr "收件人"
+
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
@@ -10450,26 +10652,26 @@ msgstr "抄送"
 msgid "Bcc"
 msgstr "密件抄送"
 
-#: ../em-format/e-mail-formatter-utils.c:564
+#: ../em-format/e-mail-formatter-utils.c:566
 msgid "GPG signed"
 msgstr "已经 GPG 签名"
 
-#: ../em-format/e-mail-formatter-utils.c:570
+#: ../em-format/e-mail-formatter-utils.c:572
 msgid "GPG encrypted"
 msgstr "已经 GPG 加密"
 
-#: ../em-format/e-mail-formatter-utils.c:576
+#: ../em-format/e-mail-formatter-utils.c:578
 msgid "S/MIME signed"
 msgstr "已经 S/MIME 签名"
 
-#: ../em-format/e-mail-formatter-utils.c:582
+#: ../em-format/e-mail-formatter-utils.c:584
 msgid "S/MIME encrypted"
 msgstr "已经 S/MIME 加密"
 
-#: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:748
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+#: ../em-format/e-mail-formatter-utils.c:593
+#: ../mail/e-mail-config-security-page.c:760
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:204
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:154
 msgid "Security"
 msgstr "安全"
 
@@ -10560,7 +10762,7 @@ msgstr "新闻组"
 msgid "Face"
 msgstr "头像"
 
-#: ../em-format/e-mail-part-utils.c:544
+#: ../em-format/e-mail-part-utils.c:547
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
@@ -10627,72 +10829,54 @@ msgstr "关闭该信息 (Escape 键)"
 
 #: ../e-util/e-alert-sink.c:246
 msgid "Failed to create a thread: "
-msgstr "创建线索失败:"
-
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
-msgid "Icon View"
-msgstr "图标视图"
-
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
-msgid "List View"
-msgstr "列表视图"
+msgstr "创建会话失败:"
 
 #. To Translators: This text is set as a description of an attached
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1223
+#: ../e-util/e-attachment.c:1227
 msgid "Attached message"
 msgstr "附加的信息"
 
-#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
 msgid "Operation was cancelled"
 msgstr "操作已取消"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
-#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:696
+#: ../e-util/e-attachment.c:2333 ../e-util/e-attachment.c:3032
+#: ../e-util/e-attachment.c:3403 ../e-util/e-attachment-store.c:696
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
 msgid "A load operation is already in progress"
 msgstr "一个已经加载的操作正在进行"
 
-#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
 msgid "A save operation is already in progress"
 msgstr "个已经保存的操作正在进行"
 
-#: ../e-util/e-attachment.c:2521
-#, c-format
-msgid "Could not load '%s'"
-msgstr "不能加载“%s”"
-
-#: ../e-util/e-attachment.c:2524
-#, c-format
-msgid "Could not load the attachment"
-msgstr "不能加载附件"
-
-#: ../e-util/e-attachment.c:2809
+#: ../e-util/e-attachment.c:2830
 #, c-format
 msgid "Could not open '%s'"
 msgstr "不能打开“%s”"
 
-#: ../e-util/e-attachment.c:2812
+#: ../e-util/e-attachment.c:2833
 #, c-format
 msgid "Could not open the attachment"
 msgstr "不能打开附件"
 
-#: ../e-util/e-attachment.c:3459
+#: ../e-util/e-attachment.c:3480
 msgid "Attachment contents not loaded"
 msgstr "附件内容未载入"
 
-#: ../e-util/e-attachment.c:3550
+#: ../e-util/e-attachment.c:3571
 #, c-format
 msgid "Could not save '%s'"
 msgstr "不能保存“%s”"
 
-#: ../e-util/e-attachment.c:3553
+#: ../e-util/e-attachment.c:3574
 #, c-format
 msgid "Could not save the attachment"
 msgstr "无法保存附件"
@@ -10705,6 +10889,12 @@ msgstr "附件属性"
 msgid "F_ilename:"
 msgstr "文件名(_I):"
 
+#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:568
+#: ../e-util/e-html-editor-link-dialog.c:422
+msgid "_Description:"
+msgstr "描述(_D):"
+
 #: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME  类型:"
@@ -10721,13 +10911,13 @@ msgstr "不能设置为背景"
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:554
+#: ../e-util/e-attachment-icon-view.c:170
+#: ../e-util/e-attachment-tree-view.c:170
 msgid "Loading"
 msgstr "载入"
 
-#: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:566
+#: ../e-util/e-attachment-icon-view.c:182
+#: ../e-util/e-attachment-tree-view.c:182
 msgid "Saving"
 msgstr "保存"
 
@@ -10792,16 +10982,16 @@ msgid "A_dd Attachment..."
 msgstr "添加附件(_D)..."
 
 #: ../e-util/e-attachment-view.c:468
-#: ../modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../modules/calendar/e-cal-shell-view-actions.c:1240
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 #: ../modules/mail/e-mail-shell-view-actions.c:1645
 #: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "属性(_P)"
 
-#: ../e-util/e-attachment-view.c:485
+#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
@@ -10819,7 +11009,7 @@ msgstr "嵌入查看(_W)"
 
 #: ../e-util/e-attachment-view.c:513
 msgid "_Zoom to 100%"
-msgstr "缩放到 100% (_Z)"
+msgstr "放到到 100% (_Z)"
 
 #: ../e-util/e-attachment-view.c:515
 msgid "Zoom the image to its natural size"
@@ -10860,40 +11050,40 @@ msgstr "将地址簿内容复制到本地以进行离线操作"
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl 加单击来打开一个链接"
 
-#: ../e-util/e-calendar.c:207
+#: ../e-util/e-calendar.c:247
 msgid "Previous month"
 msgstr "上个月"
 
-#: ../e-util/e-calendar.c:232
+#: ../e-util/e-calendar.c:266
 msgid "Next month"
 msgstr "下个月"
 
-#: ../e-util/e-calendar.c:258
+#: ../e-util/e-calendar.c:286
 msgid "Previous year"
 msgstr "上一年"
 
-#: ../e-util/e-calendar.c:283
+#: ../e-util/e-calendar.c:305
 msgid "Next year"
 msgstr "下一年"
 
-#: ../e-util/e-calendar.c:307
+#: ../e-util/e-calendar.c:329
 msgid "Month Calendar"
 msgstr "月历"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
+#: ../e-util/e-calendar-item.c:1340 ../e-util/e-calendar-item.c:2220
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1339
+#: ../e-util/e-calendar-item.c:1342
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1376
+#: ../e-util/e-calendar-item.c:1379
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y %B"
@@ -10908,7 +11098,7 @@ msgstr "标为默认任务列表"
 
 #: ../e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
-msgstr "标为默认备忘录列表"
+msgstr "标为默认备忘录"
 
 #: ../e-util/e-cal-source-config.c:200
 msgid "Color:"
@@ -10924,7 +11114,7 @@ msgstr "将任务列表内容复制到本地以进行离线操作"
 
 #: ../e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
-msgstr "将备忘录列表内容复制到本地以进行离线操作"
+msgstr "将备忘录内容复制到本地以进行离线操作"
 
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
@@ -10990,7 +11180,7 @@ msgid "popup list"
 msgstr "弹出列表"
 
 #: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
-#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2034
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2054
 msgid "?"
 msgstr "?"
 
@@ -11000,7 +11190,7 @@ msgstr "现在"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 #: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "今天"
@@ -11141,7 +11331,7 @@ msgstr "深绿 #2"
 
 #: ../e-util/e-color-combo.c:85
 msgid "navy"
-msgstr "海军蓝"
+msgstr "深蓝"
 
 #: ../e-util/e-color-combo.c:86
 msgid "dark blue"
@@ -11249,7 +11439,7 @@ msgstr "紫红"
 
 #: ../e-util/e-color-combo.c:115
 msgid "light grey"
-msgstr "浅灰"
+msgstr "亮灰"
 
 #: ../e-util/e-color-combo.c:117
 msgid "pink"
@@ -11257,36 +11447,36 @@ msgstr "粉色"
 
 #: ../e-util/e-color-combo.c:118
 msgid "light orange"
-msgstr "浅橙"
+msgstr "亮橙"
 
 #: ../e-util/e-color-combo.c:119
 msgid "light yellow"
-msgstr "浅黄"
+msgstr "亮黄色"
 
 #: ../e-util/e-color-combo.c:120
 msgid "light green"
-msgstr "浅绿"
+msgstr "亮绿色"
 
 #: ../e-util/e-color-combo.c:121
 msgid "light cyan"
-msgstr "浅青"
+msgstr "亮青色"
 
 #: ../e-util/e-color-combo.c:122
 msgid "light blue"
-msgstr "浅蓝"
+msgstr "亮蓝色"
 
 #: ../e-util/e-color-combo.c:123
 msgid "light purple"
-msgstr "浅紫"
+msgstr "亮紫色"
 
 #: ../e-util/e-color-combo.c:124
 msgid "white"
 msgstr "白色"
 
-#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../e-util/e-color-combo.c:644 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3899
-#: ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4035
+#: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "默认"
 
@@ -11306,7 +11496,8 @@ msgstr "单击此按钮可显示日历"
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629
+#: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "时间"
 
@@ -11671,8 +11862,8 @@ msgstr "查找符合下列条件的项目"
 #: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "无"
 
@@ -11717,504 +11908,504 @@ msgstr "插入 HTML 文件失败。"
 msgid "Failed to insert text file."
 msgstr "插入文本文件失败。"
 
-#: ../e-util/e-html-editor-actions.c:591
+#: ../e-util/e-html-editor-actions.c:587
 msgid "Insert HTML File"
 msgstr "插入 HTML 文件"
 
-#: ../e-util/e-html-editor-actions.c:597
+#: ../e-util/e-html-editor-actions.c:593
 msgid "HTML file"
 msgstr "HTML 文件"
 
-#: ../e-util/e-html-editor-actions.c:624
+#: ../e-util/e-html-editor-actions.c:620
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: ../e-util/e-html-editor-actions.c:686
+#: ../e-util/e-html-editor-actions.c:682
 msgid "Insert text file"
 msgstr "插入文本文件"
 
-#: ../e-util/e-html-editor-actions.c:692
+#: ../e-util/e-html-editor-actions.c:688
 msgid "Text file"
 msgstr "文本文件"
 
-#: ../e-util/e-html-editor-actions.c:1078
+#: ../e-util/e-html-editor-actions.c:1075
 msgid "Copy selected text to the clipboard"
 msgstr "将选中文本复制到剪贴板"
 
-#: ../e-util/e-html-editor-actions.c:1085
+#: ../e-util/e-html-editor-actions.c:1082
 msgid "Cut selected text to the clipboard"
 msgstr "将选中文本剪切到剪贴板"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:1089
 msgid "Paste text from the clipboard"
 msgstr "从剪贴板中粘贴文本"
 
-#: ../e-util/e-html-editor-actions.c:1099
+#: ../e-util/e-html-editor-actions.c:1096
 msgid "Redo the last undone action"
 msgstr "重做上次操作"
 
-#: ../e-util/e-html-editor-actions.c:1113
+#: ../e-util/e-html-editor-actions.c:1110
 msgid "Undo the last action"
 msgstr "撤消上次操作"
 
-#: ../e-util/e-html-editor-actions.c:1134
+#: ../e-util/e-html-editor-actions.c:1131
 msgid "For_mat"
 msgstr "格式(_M)"
 
-#: ../e-util/e-html-editor-actions.c:1141
+#: ../e-util/e-html-editor-actions.c:1138
 msgid "_Paragraph Style"
 msgstr "段落样式(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1155
-#: ../e-util/e-html-editor-image-dialog.c:635
+#: ../e-util/e-html-editor-actions.c:1152
+#: ../e-util/e-html-editor-image-dialog.c:645
 msgid "_Alignment"
 msgstr "对齐(_A)"
 
-#: ../e-util/e-html-editor-actions.c:1162
+#: ../e-util/e-html-editor-actions.c:1159
 msgid "Current _Languages"
 msgstr "当前语言(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1179
+#: ../e-util/e-html-editor-actions.c:1176
 msgid "_Increase Indent"
 msgstr "增加缩进(_I)"
 
-#: ../e-util/e-html-editor-actions.c:1181
+#: ../e-util/e-html-editor-actions.c:1178
 msgid "Increase Indent"
 msgstr "增加缩进"
 
-#: ../e-util/e-html-editor-actions.c:1186
+#: ../e-util/e-html-editor-actions.c:1183
 msgid "_HTML File..."
 msgstr "HTML 文件(_H)..."
 
-#: ../e-util/e-html-editor-actions.c:1193
+#: ../e-util/e-html-editor-actions.c:1190
 msgid "Te_xt File..."
 msgstr "文本文件(_X)..."
 
-#: ../e-util/e-html-editor-actions.c:1200
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "Paste _Quotation"
 msgstr "粘贴引用(_Q)"
 
-#: ../e-util/e-html-editor-actions.c:1207
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "_Find..."
 msgstr "查找(_F)..."
 
-#: ../e-util/e-html-editor-actions.c:1209
+#: ../e-util/e-html-editor-actions.c:1206
 msgid "Search for text"
 msgstr "搜索文本"
 
-#: ../e-util/e-html-editor-actions.c:1214
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Find A_gain"
 msgstr "再查找一遍(_G)"
 
-#: ../e-util/e-html-editor-actions.c:1221
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Re_place..."
 msgstr "替换(_R)..."
 
-#: ../e-util/e-html-editor-actions.c:1223
+#: ../e-util/e-html-editor-actions.c:1220
 msgid "Search for and replace text"
 msgstr "搜索和替换文本"
 
-#: ../e-util/e-html-editor-actions.c:1228
+#: ../e-util/e-html-editor-actions.c:1225
 msgid "Check _Spelling..."
 msgstr "检查拼写(_S)..."
 
-#: ../e-util/e-html-editor-actions.c:1235
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "_Decrease Indent"
 msgstr "减小缩进(_D)"
 
-#: ../e-util/e-html-editor-actions.c:1237
+#: ../e-util/e-html-editor-actions.c:1234
 msgid "Decrease Indent"
 msgstr "减小缩进"
 
-#: ../e-util/e-html-editor-actions.c:1242
+#: ../e-util/e-html-editor-actions.c:1239
 msgid "_Wrap Lines"
-msgstr "自动换行(_W)"
+msgstr "换行(_W)"
 
-#: ../e-util/e-html-editor-actions.c:1249
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Open Inspector"
 msgstr "打开检查器"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-actions.c:1256
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "中间(_C)"
 
-#: ../e-util/e-html-editor-actions.c:1261
+#: ../e-util/e-html-editor-actions.c:1258
 msgid "Center Alignment"
 msgstr "中间对齐"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-actions.c:1263
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "左(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1268
+#: ../e-util/e-html-editor-actions.c:1265
 msgid "Left Alignment"
 msgstr "左对齐"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-actions.c:1270
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "右(_R)"
 
-#: ../e-util/e-html-editor-actions.c:1275
+#: ../e-util/e-html-editor-actions.c:1272
 msgid "Right Alignment"
 msgstr "右对齐"
 
-#: ../e-util/e-html-editor-actions.c:1283
+#: ../e-util/e-html-editor-actions.c:1280
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1285
+#: ../e-util/e-html-editor-actions.c:1282
 msgid "HTML editing mode"
 msgstr "编辑 HTML 模式"
 
-#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1287
 msgid "Plain _Text"
 msgstr "纯文字(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:1289
 msgid "Plain text editing mode"
 msgstr "纯文字编辑模式"
 
-#: ../e-util/e-html-editor-actions.c:1300
+#: ../e-util/e-html-editor-actions.c:1297
 msgid "_Normal"
 msgstr "中(_N)"
 
-#: ../e-util/e-html-editor-actions.c:1307
+#: ../e-util/e-html-editor-actions.c:1304
 msgid "Header _1"
 msgstr "标题 _1"
 
-#: ../e-util/e-html-editor-actions.c:1314
+#: ../e-util/e-html-editor-actions.c:1311
 msgid "Header _2"
 msgstr "标题 _2"
 
-#: ../e-util/e-html-editor-actions.c:1321
+#: ../e-util/e-html-editor-actions.c:1318
 msgid "Header _3"
 msgstr "标题 _3"
 
-#: ../e-util/e-html-editor-actions.c:1328
+#: ../e-util/e-html-editor-actions.c:1325
 msgid "Header _4"
 msgstr "标题 _4"
 
-#: ../e-util/e-html-editor-actions.c:1335
+#: ../e-util/e-html-editor-actions.c:1332
 msgid "Header _5"
 msgstr "标题 _5"
 
-#: ../e-util/e-html-editor-actions.c:1342
+#: ../e-util/e-html-editor-actions.c:1339
 msgid "Header _6"
 msgstr "标题 _6"
 
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1346
 msgid "_Preformatted"
 msgstr "预格式化(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1353
 msgid "A_ddress"
 msgstr "地址(_D)"
 
-#: ../e-util/e-html-editor-actions.c:1363
+#: ../e-util/e-html-editor-actions.c:1360
 msgid "_Blockquote"
 msgstr "块引用(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1370
+#: ../e-util/e-html-editor-actions.c:1367
 msgid "_Bulleted List"
 msgstr "项目符号列表(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1377
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "_Roman Numeral List"
 msgstr "罗马数字列表(_R)"
 
-#: ../e-util/e-html-editor-actions.c:1384
+#: ../e-util/e-html-editor-actions.c:1381
 msgid "Numbered _List"
 msgstr "编号列表(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1391
+#: ../e-util/e-html-editor-actions.c:1388
 msgid "_Alphabetical List"
 msgstr "字母列表(_A)"
 
-#: ../e-util/e-html-editor-actions.c:1407
-#: ../e-util/e-html-editor-actions.c:1445
+#: ../e-util/e-html-editor-actions.c:1404
+#: ../e-util/e-html-editor-actions.c:1442
 msgid "_Image..."
 msgstr "图像(_I)..."
 
 #. Translators: This is an action tooltip
-#: ../e-util/e-html-editor-actions.c:1410
+#: ../e-util/e-html-editor-actions.c:1407
 msgid "Insert Image"
 msgstr "插入图像"
 
-#: ../e-util/e-html-editor-actions.c:1415
-#: ../e-util/e-html-editor-actions.c:1452
+#: ../e-util/e-html-editor-actions.c:1412
+#: ../e-util/e-html-editor-actions.c:1449
 msgid "_Link..."
 msgstr "链接(_L)…"
 
-#: ../e-util/e-html-editor-actions.c:1417
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Insert Link"
 msgstr "插入链接"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1423
-#: ../e-util/e-html-editor-actions.c:1467
+#: ../e-util/e-html-editor-actions.c:1420
+#: ../e-util/e-html-editor-actions.c:1464
 msgid "_Rule..."
 msgstr "横线(_R)..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1426
+#: ../e-util/e-html-editor-actions.c:1423
 msgid "Insert Rule"
 msgstr "插入横线"
 
-#: ../e-util/e-html-editor-actions.c:1431
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-actions.c:1471
 msgid "_Table..."
 msgstr "表格(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1430
 msgid "Insert Table"
 msgstr "插入表格"
 
-#: ../e-util/e-html-editor-actions.c:1438
+#: ../e-util/e-html-editor-actions.c:1435
 msgid "_Cell..."
 msgstr "单元格(_C)…"
 
-#: ../e-util/e-html-editor-actions.c:1459
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "Pa_ge..."
 msgstr "页面(_G)..."
 
-#: ../e-util/e-html-editor-actions.c:1483
+#: ../e-util/e-html-editor-actions.c:1480
 msgid "Font _Size"
 msgstr "字体大小(_S)"
 
-#: ../e-util/e-html-editor-actions.c:1490
+#: ../e-util/e-html-editor-actions.c:1487
 msgid "_Font Style"
 msgstr "字体样式(_F)"
 
-#: ../e-util/e-html-editor-actions.c:1497
+#: ../e-util/e-html-editor-actions.c:1494
 msgid "Paste As _Text"
 msgstr "以文本粘贴(_T)"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1505
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "粗体(_B)"
 
-#: ../e-util/e-html-editor-actions.c:1510
+#: ../e-util/e-html-editor-actions.c:1507
 msgid "Bold"
 msgstr "粗体"
 
-#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-actions.c:1513
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "斜体(_I)"
 
-#: ../e-util/e-html-editor-actions.c:1518
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Italic"
 msgstr "斜体"
 
-#: ../e-util/e-html-editor-actions.c:1524
+#: ../e-util/e-html-editor-actions.c:1521
 msgid "_Plain Text"
 msgstr "纯文字(_P)"
 
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1529
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "删除线(_S)"
 
-#: ../e-util/e-html-editor-actions.c:1534
+#: ../e-util/e-html-editor-actions.c:1531
 msgid "Strikethrough"
 msgstr "删除线"
 
-#: ../e-util/e-html-editor-actions.c:1540
+#: ../e-util/e-html-editor-actions.c:1537
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "下划线(_U)"
 
-#: ../e-util/e-html-editor-actions.c:1542
+#: ../e-util/e-html-editor-actions.c:1539
 msgid "Underline"
 msgstr "下划线"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1552
+#: ../e-util/e-html-editor-actions.c:1549
 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.
-#: ../e-util/e-html-editor-actions.c:1560
+#: ../e-util/e-html-editor-actions.c:1557
 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.
-#: ../e-util/e-html-editor-actions.c:1568
+#: ../e-util/e-html-editor-actions.c:1565
 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.
-#: ../e-util/e-html-editor-actions.c:1576
+#: ../e-util/e-html-editor-actions.c:1573
 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.
-#: ../e-util/e-html-editor-actions.c:1584
+#: ../e-util/e-html-editor-actions.c:1581
 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.
-#: ../e-util/e-html-editor-actions.c:1592
+#: ../e-util/e-html-editor-actions.c:1589
 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.
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1597
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1619
+#: ../e-util/e-html-editor-actions.c:1616
 msgid "Cell Contents"
 msgstr "单元格内容"
 
-#: ../e-util/e-html-editor-actions.c:1626
+#: ../e-util/e-html-editor-actions.c:1623
 msgid "Column"
 msgstr "列"
 
-#: ../e-util/e-html-editor-actions.c:1633
+#: ../e-util/e-html-editor-actions.c:1630
 msgid "Row"
 msgstr "行"
 
-#: ../e-util/e-html-editor-actions.c:1640
-#: ../e-util/e-html-editor-actions.c:1725
+#: ../e-util/e-html-editor-actions.c:1637
+#: ../e-util/e-html-editor-actions.c:1722
 msgid "Table"
 msgstr "表格"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1647
 msgid "Table Delete"
 msgstr "表格删除"
 
-#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
+#: ../e-util/e-html-editor-actions.c:1654 ../e-util/e-text.c:2147
 msgid "Input Methods"
 msgstr "输入法"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1665
+#: ../e-util/e-html-editor-actions.c:1662
 msgid "Table Insert"
 msgstr "表格插入"
 
-#: ../e-util/e-html-editor-actions.c:1672
+#: ../e-util/e-html-editor-actions.c:1669
 msgid "Properties"
 msgstr "属性"
 
-#: ../e-util/e-html-editor-actions.c:1690
+#: ../e-util/e-html-editor-actions.c:1687
 msgid "Column After"
 msgstr "列后"
 
-#: ../e-util/e-html-editor-actions.c:1697
+#: ../e-util/e-html-editor-actions.c:1694
 msgid "Column Before"
 msgstr "列前"
 
-#: ../e-util/e-html-editor-actions.c:1704
+#: ../e-util/e-html-editor-actions.c:1701
 msgid "Insert _Link"
 msgstr "插入链接(_L)"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1708
 msgid "Row Above"
 msgstr "行上"
 
-#: ../e-util/e-html-editor-actions.c:1718
+#: ../e-util/e-html-editor-actions.c:1715
 msgid "Row Below"
 msgstr "行下"
 
-#: ../e-util/e-html-editor-actions.c:1732
+#: ../e-util/e-html-editor-actions.c:1729
 msgid "Cell..."
 msgstr "单元格…"
 
-#: ../e-util/e-html-editor-actions.c:1739
+#: ../e-util/e-html-editor-actions.c:1736
 msgid "Image..."
 msgstr "图像…"
 
-#: ../e-util/e-html-editor-actions.c:1746
+#: ../e-util/e-html-editor-actions.c:1743
 msgid "Link..."
 msgstr "链接…"
 
-#: ../e-util/e-html-editor-actions.c:1753
+#: ../e-util/e-html-editor-actions.c:1750
 msgid "Page..."
 msgstr "页面…"
 
-#: ../e-util/e-html-editor-actions.c:1760
+#: ../e-util/e-html-editor-actions.c:1757
 msgid "Paragraph..."
 msgstr "段落…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1768
+#: ../e-util/e-html-editor-actions.c:1765
 msgid "Rule..."
 msgstr "横线..."
 
-#: ../e-util/e-html-editor-actions.c:1775
+#: ../e-util/e-html-editor-actions.c:1772
 msgid "Table..."
 msgstr "表格…"
 
-#: ../e-util/e-html-editor-actions.c:1782
+#: ../e-util/e-html-editor-actions.c:1779
 msgid "Text..."
 msgstr "文字…"
 
-#: ../e-util/e-html-editor-actions.c:1789
+#: ../e-util/e-html-editor-actions.c:1786
 msgid "Remove Link"
 msgstr "删除链接"
 
-#: ../e-util/e-html-editor-actions.c:1806
+#: ../e-util/e-html-editor-actions.c:1803
 msgid "Add Word to Dictionary"
 msgstr "添加词语到字典"
 
-#: ../e-util/e-html-editor-actions.c:1813
+#: ../e-util/e-html-editor-actions.c:1810
 msgid "Ignore Misspelled Word"
 msgstr "忽略拼错词语"
 
-#: ../e-util/e-html-editor-actions.c:1820
+#: ../e-util/e-html-editor-actions.c:1817
 msgid "Add Word To"
 msgstr "添加词语到"
 
-#: ../e-util/e-html-editor-actions.c:1829
+#: ../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.
-#: ../e-util/e-html-editor-actions.c:1937
+#: ../e-util/e-html-editor-actions.c:1947
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s 字典"
 
-#: ../e-util/e-html-editor-actions.c:2024
+#: ../e-util/e-html-editor-actions.c:2037
 msgid "_Emoticon"
 msgstr "表情(_E)"
 
-#: ../e-util/e-html-editor-actions.c:2025
+#: ../e-util/e-html-editor-actions.c:2038
 msgid "Insert Emoticon"
 msgstr "插入表情"
 
-#: ../e-util/e-html-editor-actions.c:2093
+#: ../e-util/e-html-editor-actions.c:2106
 msgid "Re_place"
 msgstr "替换(_P)"
 
-#: ../e-util/e-html-editor-actions.c:2096
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "_Image"
 msgstr "图像(_I)"
 
-#: ../e-util/e-html-editor-actions.c:2099
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Link"
 msgstr "链接(_L)"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2103
+#: ../e-util/e-html-editor-actions.c:2116
 msgid "_Rule"
 msgstr "横线(_R)"
 
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2119
 #: ../e-util/e-html-editor-cell-dialog.c:738
 msgid "_Table"
 msgstr "表格(_T)"
@@ -12278,17 +12469,17 @@ msgid "_Horizontal:"
 msgstr "水平(_H)"
 
 #: ../e-util/e-html-editor-cell-dialog.c:792
-#: ../e-util/e-html-editor-image-dialog.c:625
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "Top"
 msgstr "顶部"
 
 #: ../e-util/e-html-editor-cell-dialog.c:793
-#: ../e-util/e-html-editor-image-dialog.c:626
+#: ../e-util/e-html-editor-image-dialog.c:636
 msgid "Middle"
 msgstr "中间"
 
 #: ../e-util/e-html-editor-cell-dialog.c:794
-#: ../e-util/e-html-editor-image-dialog.c:627
+#: ../e-util/e-html-editor-image-dialog.c:637
 msgid "Bottom"
 msgstr "底部"
 
@@ -12299,15 +12490,15 @@ msgstr "垂直(_V)"
 #. Wrap Text
 #: ../e-util/e-html-editor-cell-dialog.c:808
 msgid "_Wrap Text"
-msgstr "自动换行(_W)"
+msgstr "换行(_W)"
 
 #. Header Style
 #: ../e-util/e-html-editor-cell-dialog.c:816
 msgid "_Header Style"
-msgstr "表头样式(_H)"
+msgstr "报头样式(_H)"
 
 #: ../e-util/e-html-editor-cell-dialog.c:830
-#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-image-dialog.c:575
 #: ../e-util/e-html-editor-table-dialog.c:812
 msgid "<b>Layout</b>"
 msgstr "<b>版面</b>"
@@ -12340,13 +12531,13 @@ msgid "C_olor:"
 msgstr "颜色(_O):"
 
 #: ../e-util/e-html-editor-cell-dialog.c:930
-#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-image-dialog.c:537
 #: ../e-util/e-html-editor-table-dialog.c:945
 msgid "Choose Background Image"
 msgstr "选择背景图像"
 
 #: ../e-util/e-html-editor-cell-dialog.c:935
-#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-image-dialog.c:543
 #: ../e-util/e-html-editor-table-dialog.c:950
 msgid "Images"
 msgstr "图像"
@@ -12394,7 +12585,7 @@ msgstr "<b>大小</b>"
 
 #. Width
 #: ../e-util/e-html-editor-hrule-dialog.c:368
-#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-image-dialog.c:593
 #: ../e-util/e-html-editor-table-dialog.c:823
 msgid "_Width:"
 msgstr "宽度(_W)"
@@ -12421,48 +12612,48 @@ msgstr "阴影(_H)"
 msgid "Rule properties"
 msgstr "横线属性"
 
-#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-image-dialog.c:525
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:766
 msgid "<b>General</b>"
 msgstr "<b>常规</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:544
+#: ../e-util/e-html-editor-image-dialog.c:554
 msgid "_Source:"
 msgstr "来源(_S):"
 
-#: ../e-util/e-html-editor-image-dialog.c:607
+#: ../e-util/e-html-editor-image-dialog.c:617
 msgid "_Height:"
 msgstr "高度(_H):"
 
-#: ../e-util/e-html-editor-image-dialog.c:648
+#: ../e-util/e-html-editor-image-dialog.c:658
 msgid "_X-Padding:"
 msgstr "X-边距(_X):"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-image-dialog.c:674
 msgid "_Y-Padding:"
 msgstr "Y-边距(_Y):"
 
-#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-image-dialog.c:690
 #: ../e-util/e-html-editor-table-dialog.c:890
 msgid "_Border:"
 msgstr "边框(_B):"
 
-#: ../e-util/e-html-editor-image-dialog.c:690
+#: ../e-util/e-html-editor-image-dialog.c:700
 msgid "<b>Link</b>"
 msgstr "<b>链接</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-image-dialog.c:718
 #: ../e-util/e-html-editor-link-dialog.c:400
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:723
 #: ../e-util/e-html-editor-link-dialog.c:405
 msgid "_Test URL..."
 msgstr "测试 URL(_T):"
 
-#: ../e-util/e-html-editor-image-dialog.c:730
+#: ../e-util/e-html-editor-image-dialog.c:740
 msgid "Image Properties"
 msgstr "图像属性"
 
@@ -12494,8 +12685,8 @@ msgstr "功能区"
 msgid "Midnight"
 msgstr "午夜"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
-#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "草稿"
 
@@ -12528,11 +12719,12 @@ msgid "<b>Background Image</b>"
 msgstr "<b>背景图像</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:638
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "_Template:"
 msgstr "模板(_T):"
 
-#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+#: ../e-util/e-html-editor-page-dialog.c:646
+#: ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "选择一个文件"
 
@@ -12568,7 +12760,7 @@ msgstr "替换(_R):"
 
 #: ../e-util/e-html-editor-replace-dialog.c:239
 msgid "_With:"
-msgstr "替换为(_W):"
+msgstr "打开方式(_W):"
 
 #: ../e-util/e-html-editor-replace-dialog.c:251
 msgid "_Case sensitive"
@@ -12601,46 +12793,47 @@ msgstr "替换"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>“%s”建议</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:520
+#: ../e-util/e-html-editor-spell-check-dialog.c:522
 msgid "<b>Suggestions</b>"
 msgstr "<b>建议</b>"
 
 #. Replace
-#: ../e-util/e-html-editor-spell-check-dialog.c:555
+#: ../e-util/e-html-editor-spell-check-dialog.c:557
 msgid "Replace"
 msgstr "替换"
 
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:564
+#: ../e-util/e-html-editor-spell-check-dialog.c:566
 msgid "Replace All"
 msgstr "替换全部"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:112
+#: ../e-util/e-html-editor-spell-check-dialog.c:575
+#: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "忽略"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:582
+#: ../e-util/e-html-editor-spell-check-dialog.c:584
 msgid "Skip"
 msgstr "跳过"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#: ../e-util/e-html-editor-spell-check-dialog.c:593
 msgid "Back"
 msgstr "后退"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:600
+#: ../e-util/e-html-editor-spell-check-dialog.c:602
 msgid "<b>Dictionary</b>"
 msgstr "<b>字典</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:620
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
 msgid "Add word"
 msgstr "添加词语"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:38
+#: ../e-util/e-html-editor-spell-check-dialog.c:639
+#: ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "拼写检查"
 
@@ -12675,19 +12868,19 @@ msgstr "表格属性"
 
 #: ../e-util/e-html-editor-text-dialog.c:281
 msgid "Si_ze:"
-msgstr "大小(_Z):"
+msgstr "大小(_S):"
 
 #: ../e-util/e-html-editor-text-dialog.c:296
 msgid "Text Properties"
 msgstr "文本属性"
 
-#: ../e-util/e-html-editor-view.c:6298
+#: ../e-util/e-html-editor-view.c:6376
 msgid "Changed property"
 msgstr "变更属性"
 
-#: ../e-util/e-html-editor-view.c:6299
+#: ../e-util/e-html-editor-view.c:6377
 msgid "Whether editor changed"
-msgstr "编辑器是否已变更"
+msgstr "是否变更编辑器"
 
 #: ../e-util/e-import-assistant.c:256
 msgid ""
@@ -12723,11 +12916,11 @@ msgstr "请选择您希望导入的信息:"
 #: ../e-util/e-import-assistant.c:533
 msgid ""
 "Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the \"Back\" button."
 msgstr ""
-"Evolution 检查了从以下程序导入的设置:Pine、Netscape、Elm、iCalendar。并未发"
-"现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
+"Evolution 检查了可从以下程序导入的设置:Pine、Netscape、Elm、iCalendar、"
+"Kmail,并未发现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
 
 #: ../e-util/e-import-assistant.c:559
 #: ../modules/startup-wizard/e-mail-config-import-page.c:229
@@ -12791,23 +12984,23 @@ msgstr "单击“应用”以便开始将文件导入到 Evolution。"
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: ../e-util/e-mail-signature-editor.c:297
+#: ../e-util/e-mail-signature-editor.c:301 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "关闭"
 
-#: ../e-util/e-mail-signature-editor.c:302
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "保存并关闭(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:533
 msgid "Edit Signature"
 msgstr "编辑签名"
 
-#: ../e-util/e-mail-signature-editor.c:562
+#: ../e-util/e-mail-signature-editor.c:566
 msgid "_Signature Name:"
 msgstr "签名(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:598
+#: ../e-util/e-mail-signature-editor.c:602
 msgid "Unnamed"
 msgstr "未命名"
 
@@ -12868,7 +13061,7 @@ msgstr "打开日历“%s”"
 #: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening memo list '%s'"
-msgstr "打开备忘录列表“%s”"
+msgstr "打开备忘录“%s”"
 
 #: ../e-util/e-misc-utils.c:2393
 #, c-format
@@ -12903,10 +13096,10 @@ msgstr "搜索(_S):"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1183
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Any Category"
 msgstr "任何类别"
 
@@ -12918,16 +13111,11 @@ msgstr "联系人(_N)"
 msgid "Search"
 msgstr "搜索"
 
-#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../e-util/e-name-selector-dialog.c:451
-#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:373
-msgid "Contacts"
-msgstr "联系人"
-
 #: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "从地址簿选择联系人"
@@ -12942,7 +13130,7 @@ msgstr "在行内展开 %s (_X)"
 #: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
-msgstr "复制 %s (_Y)"
+msgstr "复制 %s (_Y)"
 
 #. Cut Contact Item
 #: ../e-util/e-name-selector-entry.c:3213
@@ -12997,7 +13185,7 @@ msgstr "记住该密码(_R)"
 msgid "_Remember this password for the remainder of this session"
 msgstr "在该会话内记住该提醒器的密码(_R)"
 
-#: ../e-util/e-preferences-window.c:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Evolution 首选项"
 
@@ -13028,7 +13216,7 @@ msgstr "打开桌面设置(_O)"
 
 #: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
-msgstr "手册"
+msgstr "手动"
 
 #: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
@@ -13105,53 +13293,46 @@ msgstr "编辑规则"
 msgid "Matches: %u"
 msgstr "匹配:%u"
 
-#: ../e-util/e-search-bar.c:569
+#: ../e-util/e-search-bar.c:572
 msgid "Close the find bar"
 msgstr "关闭查找栏"
 
-#: ../e-util/e-search-bar.c:577
+#: ../e-util/e-search-bar.c:580
 msgid "Fin_d:"
 msgstr "查找(_D):"
 
-#: ../e-util/e-search-bar.c:589
+#: ../e-util/e-search-bar.c:592
 msgid "Clear the search"
 msgstr "清除搜索"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
 msgid "_Previous"
 msgstr "上一项(_P)"
 
-#: ../e-util/e-search-bar.c:616
+#: ../e-util/e-search-bar.c:619
 msgid "Find the previous occurrence of the phrase"
 msgstr "寻找该词句出现的前一个位置"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
 msgid "_Next"
 msgstr "下一项(_N)"
 
-#: ../e-util/e-search-bar.c:628
+#: ../e-util/e-search-bar.c:631
 msgid "Find the next occurrence of the phrase"
 msgstr "寻找该词句出现的下一个位置"
 
-#: ../e-util/e-search-bar.c:637
+#: ../e-util/e-search-bar.c:640
 msgid "Mat_ch case"
 msgstr "大小写匹配(_C)"
 
-#: ../e-util/e-search-bar.c:665
+#: ../e-util/e-search-bar.c:668
 msgid "Reached bottom of page, continued from top"
 msgstr "到达页面底部,移到顶部继续"
 
-#: ../e-util/e-search-bar.c:687
+#: ../e-util/e-search-bar.c:690
 msgid "Reached top of page, continued from bottom"
 msgstr "到达页面顶部,移到底部继续"
 
-#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
-#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
-#: ../modules/mail/e-mail-shell-view.c:1172
-#: ../smime/gui/certificate-manager.c:1671
-msgid "Mail"
-msgstr "邮件"
-
 #: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "删除时(_L):"
@@ -13186,6 +13367,10 @@ msgstr "无"
 msgid "Mail Receipt"
 msgstr "已读回执"
 
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "发送选项"
+
 #: ../e-util/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "请求回复(_E)"
@@ -13299,24 +13484,48 @@ msgstr "类型:"
 msgid "Name:"
 msgstr "名称:"
 
+#: ../e-util/e-source-config.c:813
+msgid "Name cannot be empty"
+msgstr "名称不能为空"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1311
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "刷新间隔"
 
-#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "使用安全连接"
 
-#: ../e-util/e-source-config.c:1437
-msgid "Unset _trust for SSL certificate"
-msgstr "不再信任 SSL 证书(_T)"
+#: ../e-util/e-source-config.c:1439
+msgid "Unset _trust for SSL/TLS certificate"
+msgstr "不再信任 SSL/TLS 证书(_T)"
 
-#: ../e-util/e-source-config.c:1473
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "用户"
 
+#: ../e-util/e-source-selector.c:3214
+msgid "Show"
+msgstr "显示"
+
+#: ../e-util/e-source-selector.c:3221
+msgid "Group name"
+msgstr "组名"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+msgid "_Show"
+msgstr "显示(_S)"
+
+#: ../e-util/e-source-selector.c:3428
+msgid "Manage Groups"
+msgstr "管理群组"
+
+#: ../e-util/e-source-selector.c:3440
+msgid "Available Groups:"
+msgstr "可用组:"
+
 #: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "目标位置(_D)"
@@ -13341,26 +13550,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:457
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(无建议)"
 
-#: ../e-util/e-spell-entry.c:481
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "更多..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:566
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "添加“%s”到字典"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:615
+#: ../e-util/e-spell-entry.c:636
 msgid "Ignore All"
 msgstr "忽略全部"
 
-#: ../e-util/e-spell-entry.c:647
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "拼写建议"
 
@@ -13389,7 +13598,7 @@ msgstr "无法打开文件“{0}”。"
 msgid "Failed to remove data source &quot;{0}&quot;."
 msgstr "无法移除数据源“{0}”。"
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "报告的错误为“{1}”。"
 
@@ -13422,7 +13631,7 @@ msgstr "在您重新启动 Evolution 之前某些备忘可能无法使用。"
 
 #: ../e-util/e-system.error.xml.h:15
 msgid "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
-msgstr "备忘录列表后端服务 &quot;{0}&quot; 异常退出。"
+msgstr "备忘录后端服务 &quot;{0}&quot; 异常退出。"
 
 #: ../e-util/e-system.error.xml.h:16
 msgid "Some of your memos may not be available until Evolution is restarted."
@@ -13447,7 +13656,7 @@ msgstr "日历后端服务 &quot;{0}&quot; 遇到一个错误。"
 
 #: ../e-util/e-system.error.xml.h:21
 msgid "The memo list backend servicing &quot;{0}&quot; encountered an error."
-msgstr "备忘录列表后端服务 &quot;{0}&quot; 遇到一个错误。"
+msgstr "备忘录后端服务 &quot;{0}&quot; 遇到一个错误。"
 
 #: ../e-util/e-system.error.xml.h:22
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
@@ -13527,11 +13736,11 @@ msgstr "全部清除(_A)"
 msgid "_Show field in View"
 msgstr "在视图中显示域(_S)"
 
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1796
 msgid "Ascending"
 msgstr "升序"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1796
 msgid "Descending"
 msgstr "降序"
 
@@ -13589,60 +13798,60 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 项)"
 
-#: ../e-util/e-table-header-item.c:1578
+#: ../e-util/e-table-header-item.c:1619
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../e-util/e-table-header-item.c:1601
+#: ../e-util/e-table-header-item.c:1642
 msgid "Sort _Ascending"
 msgstr "升序排序(_A)"
 
-#: ../e-util/e-table-header-item.c:1604
+#: ../e-util/e-table-header-item.c:1645
 msgid "Sort _Descending"
 msgstr "降序排序(_D)"
 
-#: ../e-util/e-table-header-item.c:1607
+#: ../e-util/e-table-header-item.c:1648
 msgid "_Unsort"
 msgstr "未排序(_U)"
 
-#: ../e-util/e-table-header-item.c:1610
+#: ../e-util/e-table-header-item.c:1651
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../e-util/e-table-header-item.c:1613
+#: ../e-util/e-table-header-item.c:1654
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../e-util/e-table-header-item.c:1617
+#: ../e-util/e-table-header-item.c:1658
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../e-util/e-table-header-item.c:1620
+#: ../e-util/e-table-header-item.c:1661
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../e-util/e-table-header-item.c:1624
+#: ../e-util/e-table-header-item.c:1665
 msgid "A_lignment"
 msgstr "对齐(_L)"
 
-#: ../e-util/e-table-header-item.c:1627
+#: ../e-util/e-table-header-item.c:1668
 msgid "B_est Fit"
 msgstr "最佳匹配(_E)"
 
-#: ../e-util/e-table-header-item.c:1630
+#: ../e-util/e-table-header-item.c:1671
 msgid "Format Column_s..."
 msgstr "格式化列(_S)..."
 
-#: ../e-util/e-table-header-item.c:1634
+#: ../e-util/e-table-header-item.c:1675
 msgid "Custo_mize Current View..."
 msgstr "自定义当前视图(_M)..."
 
-#: ../e-util/e-table-header-item.c:1705
+#: ../e-util/e-table-header-item.c:1746
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1728
+#: ../e-util/e-table-header-item.c:1769
 msgid "_Custom"
 msgstr "自定义(_C)"
 
@@ -13704,7 +13913,7 @@ msgid "Flags"
 msgstr "标志"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:721
+#: ../mail/e-mail-config-identity-page.c:760
 msgid "Identity"
 msgstr "标识"
 
@@ -13779,15 +13988,15 @@ msgstr "转到信息的开头"
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
-#: ../e-util/e-web-view.c:3127
+#: ../e-util/e-web-view.c:3143
 msgid "Copying image to clipboard"
 msgstr "正在将图像复制到剪贴板"
 
-#: ../e-util/e-web-view.c:3315
+#: ../e-util/e-web-view.c:3331
 msgid "Save Image"
 msgstr "保存图像"
 
-#: ../e-util/e-web-view.c:3351
+#: ../e-util/e-web-view.c:3367
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "正在保存图像至 %s"
@@ -13836,7 +14045,7 @@ msgstr "无效的正则表达式“{0}”。"
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "无法编译正则表达式“{1}”。"
 
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
 msgid "Missing name."
 msgstr "缺少名称。"
 
@@ -13868,6 +14077,14 @@ msgstr "缺少值。"
 msgid "One or more values cannot be empty."
 msgstr "一个或多个值不能为空。"
 
+#: ../e-util/filter.error.xml.h:16
+msgid "Are you sure you want to remove rule '{0}'?"
+msgstr "您确定要删除规则“{0}”吗?"
+
+#: ../e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr "保留(_K)"
+
 #: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "当前时间"
@@ -13880,7 +14097,7 @@ msgstr "您指定的时间"
 msgid "a time relative to the current time"
 msgstr "相对于当前时间的时间"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
 msgid "seconds"
 msgstr "秒"
 
@@ -13888,7 +14105,8 @@ msgstr "秒"
 msgid "weeks"
 msgstr "周"
 
-#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "月"
 
@@ -13983,7 +14201,7 @@ msgstr "创建新视图(_C)"
 msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
 msgid "Do you wish to save your changes?"
 msgstr "您希望保存更改吗?"
 
@@ -13991,7 +14209,7 @@ msgstr "您希望保存更改吗?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "签名已经更改,但尚未保存。"
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
 msgid "_Discard changes"
 msgstr "丢弃更改(_D)"
 
@@ -14019,13 +14237,13 @@ msgstr "无法加载签名。"
 msgid "Could not save signature."
 msgstr "无法保存签名。"
 
-#: ../evolution.appdata.xml.in.h:1
+#: ../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:2
+#: ../evolution.appdata.xml.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -14036,6 +14254,16 @@ msgstr ""
 "和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
 "进行顺利集成。"
 
+#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+msgid "OAuth2 Google"
+msgstr "OAuth2 Google"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr "该选项将使用 OAuth 2.0 访问令牌连接到谷歌服务器。"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -14054,7 +14282,7 @@ msgid "Forwarded messages"
 msgstr "转发的信息"
 
 #: ../libemail-engine/e-mail-folder-utils.c:684
-#: ../libemail-engine/e-mail-folder-utils.c:935
+#: ../libemail-engine/e-mail-folder-utils.c:938
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -14064,92 +14292,92 @@ msgstr[0] "收取 %d 封信"
 msgid "Scanning messages for duplicates"
 msgstr "扫描信息中的重复信息?"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1148
+#: ../libemail-engine/e-mail-folder-utils.c:1151
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "删除文件夹 %s"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1328
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "已经删除了“%s”文件。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1332
+#: ../libemail-engine/e-mail-folder-utils.c:1336
 msgid "File has been removed."
 msgstr "文件已移除。"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1391
+#: ../libemail-engine/e-mail-folder-utils.c:1413
 msgid "Removing attachments"
 msgstr "正在移除附件"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1555
+#: ../libemail-engine/e-mail-folder-utils.c:1577
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "保存 %d 封信"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1933
+#: ../libemail-engine/e-mail-folder-utils.c:1955
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "无效的文件夹 URI:“%s”"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:680
 #: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
-#: ../modules/mail/e-mail-shell-view-private.c:1049
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Inbox"
 msgstr "收件箱"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "发件箱"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "已发箱"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
 #: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "模板"
 
-#: ../libemail-engine/e-mail-session.c:1261
+#: ../libemail-engine/e-mail-session.c:1262
 #, c-format
 msgid "User cancelled operation"
 msgstr "用户己取消操作"
 
-#: ../libemail-engine/e-mail-session.c:1318
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "缺少发送目标地址,信息转发被取消。"
 
-#: ../libemail-engine/e-mail-session.c:1331
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "无可用身份,信息转发被取消。"
 
-#: ../libemail-engine/e-mail-session.c:2360
+#: ../libemail-engine/e-mail-session.c:2362
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "正在等待“%s”"
@@ -14175,7 +14403,7 @@ msgstr "应用寄出过滤器失败:%s"
 #: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
 #, c-format
 msgid "Storing sent message to '%s'"
-msgstr "正在保存已发送信息到“%s”"
+msgstr "正在保存发送信息到“%s”"
 
 #: ../libemail-engine/e-mail-session-utils.c:721
 #: ../libemail-engine/mail-ops.c:803
@@ -14198,17 +14426,17 @@ msgstr "追加到本地“已发”文件夹失败:%s"
 msgid "Sending message"
 msgstr "发送信息"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "断开与 %s 的连接"
 
-#: ../libemail-engine/e-mail-store-utils.c:265
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "重新连接到 %s"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "正在准备离线使用帐号“%s”"
@@ -14370,7 +14598,7 @@ msgid "De_fault"
 msgstr "默认(_F)"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/mail/em-composer-prefs.c:1282
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -14388,12 +14616,12 @@ msgstr "没有提供电子邮件地址"
 msgid "Missing domain in email address"
 msgstr "电子邮件地址中缺少域"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../mail/e-mail-browser.c:131 ../shell/e-shell-window-actions.c:773
 #: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:289
 msgid "(No Subject)"
 msgstr "(无主题)"
 
@@ -14415,7 +14643,11 @@ msgstr "Evolution 帐号助手"
 msgid "_Revise Details"
 msgstr "核实详细信息(_R)"
 
-#: ../mail/e-mail-config-auth-check.c:339
+#: ../mail/e-mail-config-auth-check.c:177
+msgid "Querying authentication types..."
+msgstr "正在查询认证类型"
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "检查支持的类型"
 
@@ -14437,96 +14669,133 @@ msgstr ""
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:371
+msgid "Checking server settings..."
+msgstr "正在检查服务器设置…"
+
+#: ../mail/e-mail-config-defaults-page.c:489
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "使用全局设置"
+
+#: ../mail/e-mail-config-defaults-page.c:491 ../mail/mail-config.ui.h:26
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "附件"
+
+#: ../mail/e-mail-config-defaults-page.c:493 ../mail/mail-config.ui.h:27
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "内嵌(Outlook 风格)"
+
+#: ../mail/e-mail-config-defaults-page.c:495 ../mail/mail-config.ui.h:28
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "引用"
+
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "不引用"
+
+#: ../mail/e-mail-config-defaults-page.c:822
 msgid "Special Folders"
 msgstr "特殊文件夹"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:831
 msgid "Draft Messages _Folder:"
 msgstr "草稿信息文件夹(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:841
 msgid "Choose a folder for saving draft messages."
 msgstr "选择保存草稿信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Sent _Messages Folder:"
 msgstr "已发送信息文件夹(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:865
 msgid "Choose a folder for saving sent messages."
 msgstr "选择保存已发送信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:884
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "将回复邮件保存在被回复信息所在的文件夹"
 
-#: ../mail/e-mail-config-defaults-page.c:628
+#: ../mail/e-mail-config-defaults-page.c:901
 msgid "Archi_ve Folder:"
 msgstr "归档文件夹(_V):"
 
-#: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1397
+#: ../mail/e-mail-config-defaults-page.c:911
+#: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "选择要将信息归档到哪个文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:929
 msgid "_Restore Defaults"
 msgstr "恢复默认值(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:666
+#: ../mail/e-mail-config-defaults-page.c:946
+msgid "_Lookup Folders"
+msgstr "查找文件夹(_L)"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "Use a Real Folder for _Trash:"
 msgstr "使用真实文件夹作为废件箱(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:667
+#: ../mail/e-mail-config-defaults-page.c:965
 msgid "Choose a folder for deleted messages."
 msgstr "选择已删除信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:676
+#: ../mail/e-mail-config-defaults-page.c:974
 msgid "Use a Real Folder for _Junk:"
 msgstr "使用真实文件夹存放垃圾信息(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:677
+#: ../mail/e-mail-config-defaults-page.c:975
 msgid "Choose a folder for junk messages."
 msgstr "选择垃圾信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:694
+#: ../mail/e-mail-config-defaults-page.c:992
 msgid "Composing Messages"
 msgstr "撰写信息"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:1001
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "总是抄送到(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:728
+#: ../mail/e-mail-config-defaults-page.c:1026
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "总是密件抄送到(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:763
+#: ../mail/e-mail-config-defaults-page.c:1057
+msgid "Re_ply style:"
+msgstr "回复风格:(_P)"
+
+#: ../mail/e-mail-config-defaults-page.c:1093
 msgid "Message Receipts"
 msgstr "已读回执"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:1102
 msgid "S_end message receipts:"
 msgstr "发送信息收条(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:797
+#: ../mail/e-mail-config-defaults-page.c:1127
 msgid "Never"
 msgstr "从不"
 
-#: ../mail/e-mail-config-defaults-page.c:803
+#: ../mail/e-mail-config-defaults-page.c:1133
 msgid "Always"
 msgstr "总是"
 
-#: ../mail/e-mail-config-defaults-page.c:809
+#: ../mail/e-mail-config-defaults-page.c:1139
 msgid "Ask for each message"
 msgstr "每条信息都询问"
 
-#: ../mail/e-mail-config-defaults-page.c:880
+#: ../mail/e-mail-config-defaults-page.c:1246
 msgid "Defaults"
 msgstr "默认值"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:286
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14535,13 +14804,13 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:322
+#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "帐号信息"
 
-#: ../mail/e-mail-config-identity-page.c:346
-#: ../mail/e-mail-config-summary-page.c:352
+#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
@@ -14549,39 +14818,61 @@ msgstr ""
 "上述名称用来代表这个帐号。\n"
 "例如:“工作”或“个人”。"
 
-#: ../mail/e-mail-config-identity-page.c:363
+#: ../mail/e-mail-config-identity-page.c:369
 msgid "Required Information"
 msgstr "需要的信息"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:378
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:399
+#: ../mail/e-mail-config-identity-page.c:407
 msgid "Email _Address:"
 msgstr "电子邮件地址(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:446
+#: ../mail/e-mail-config-identity-page.c:456
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "可选信息"
 
-#: ../mail/e-mail-config-identity-page.c:455
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Re_ply-To:"
 msgstr "回复到(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:482
+#: ../mail/e-mail-config-identity-page.c:494
 msgid "Or_ganization:"
 msgstr "组织(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:537
+#: ../mail/e-mail-config-identity-page.c:549
 msgid "Add Ne_w Signature..."
 msgstr "添加新签名(_W)..."
 
-#: ../mail/e-mail-config-identity-page.c:555
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "根据输入的电子邮件地址搜寻邮件服务器详情"
 
+#: ../mail/e-mail-config-identity-page.c:611
+#, fuzzy
+msgid "Full Name cannot be empty"
+msgstr "名称不能为空"
+
+#: ../mail/e-mail-config-identity-page.c:618
+msgid "Email Address cannot be empty"
+msgstr "邮件地址不能为空"
+
+#: ../mail/e-mail-config-identity-page.c:623
+msgid "Email Address is not a valid email"
+msgstr "邮件地址不是有效的邮箱"
+
+#: ../mail/e-mail-config-identity-page.c:635
+msgid "Reply To is not a valid email"
+msgstr "回复到 不是有效的邮箱"
+
+#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-summary-page.c:632
+msgid "Account Name cannot be empty"
+msgstr "账户名称不能为空"
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "正在查找帐号详情..."
@@ -14610,11 +14901,11 @@ msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
-#: ../mail/mail-config.ui.h:30
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:625
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
+#: ../modules/calendar/e-calendar-preferences.c:620
+#: ../modules/calendar/e-calendar-preferences.ui.h:48
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "常规"
@@ -14625,33 +14916,33 @@ msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
 #: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
-msgstr "GNU 安全卫士(OpenPGP)"
+msgstr "PGP 加密 (OpenPGP)"
 
 #: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
-msgstr "OpenPGP _Key ID:"
+msgstr "OpenPGP 密钥 ID (_K):"
 
 #: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
-msgstr "签名函数(_N):"
+msgstr "签名函数(_G):"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -14671,105 +14962,109 @@ msgstr "当发送加密邮件时总是对自身加密(_M)"
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: ../mail/e-mail-config-security-page.c:514
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr "优先为纯文本信息内嵌签名/加密信息(_I)"
+
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Secure MIME (S/MIME)"
-msgstr "安全 MIME(S/MIME)"
+msgstr "安全 MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N):"
 
-#: ../mail/e-mail-config-security-page.c:547
-#: ../mail/e-mail-config-security-page.c:653
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "选择"
 
-#: ../mail/e-mail-config-security-page.c:556
-#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "签名函数(_A):"
 
-#: ../mail/e-mail-config-security-page.c:606
+#: ../mail/e-mail-config-security-page.c:618
 msgid "Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../mail/e-mail-config-security-page.c:629
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "加密证书:"
 
-#: ../mail/e-mail-config-security-page.c:671
+#: ../mail/e-mail-config-security-page.c:683
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../mail/e-mail-config-security-page.c:691
+#: ../mail/e-mail-config-security-page.c:703
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "当发送加密信息时总是对自身加密"
 
 #: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
-msgstr "发送电子邮件"
+msgstr "发送电子邮件中"
 
 #: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "服务器类型(_T):"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:305
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "这是将用于访问您邮件的设置汇总。"
 
-#: ../mail/e-mail-config-summary-page.c:369
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "个人详细信息"
 
-#: ../mail/e-mail-config-summary-page.c:378
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../mail/e-mail-config-summary-page.c:392
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: ../mail/e-mail-config-summary-page.c:406
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "接收"
 
-#: ../mail/e-mail-config-summary-page.c:418
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "发送"
 
-#: ../mail/e-mail-config-summary-page.c:430
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "服务器类型:"
 
-#: ../mail/e-mail-config-summary-page.c:451
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "服务器:"
 
-#: ../mail/e-mail-config-summary-page.c:472
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "用户名:"
 
-#: ../mail/e-mail-config-summary-page.c:493
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "安全:"
 
-#: ../mail/e-mail-config-summary-page.c:784
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "帐号摘要"
 
@@ -14781,7 +15076,7 @@ msgid ""
 msgstr ""
 "欢迎使用 Evolution 邮件程序配置助手。\n"
 "\n"
-"单击“前进”开始。"
+"单击“下一步”开始。"
 
 #: ../mail/e-mail-config-welcome-page.c:166
 #: ../modules/startup-wizard/e-startup-assistant.c:151
@@ -14792,27 +15087,27 @@ msgstr "欢迎"
 msgid "Account Editor"
 msgstr "帐号编辑器"
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:104
 msgid "_Add to Address Book..."
 msgstr "添加到地址簿(_A)..."
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:111
 msgid "_To This Address"
 msgstr "到此地址(_T)"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:118
 msgid "_From This Address"
 msgstr "自此地址(_F)"
 
-#: ../mail/e-mail-display.c:124
+#: ../mail/e-mail-display.c:125
 msgid "Send _Reply To..."
 msgstr "发送回复给(_R)..."
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:127
 msgid "Send a reply message to this address"
 msgstr "发送一条回复信息到这个地址"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:134
 msgid "Create Search _Folder"
 msgstr "创建搜索文件夹(_F)"
 
@@ -14837,7 +15132,7 @@ msgstr "文件夹名称(_N):"
 #: ../mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Answered"
-msgstr "已回复"
+msgstr "已答复"
 
 #: ../mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
@@ -14852,7 +15147,7 @@ msgstr "草稿"
 #: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
-msgstr "已标记"
+msgstr "已标志"
 
 #: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
@@ -14925,6 +15220,26 @@ msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
 msgid "Color"
 msgstr "颜色"
 
+#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+msgid "Message Note"
+msgstr "消息附带的便笺"
+
+#: ../mail/e-mail-notes.c:612
+msgid "Cannot find message in its folder summary"
+msgstr "未在所在文件夹的摘要中找到邮件"
+
+#: ../mail/e-mail-notes.c:815
+msgid "Storing changes..."
+msgstr "存储更改..."
+
+#: ../mail/e-mail-notes.c:940
+msgid "Edit Message Note"
+msgstr "编辑消息附带的便笺"
+
+#: ../mail/e-mail-notes.c:1058
+msgid "Retrieving message..."
+msgstr "正在收取信息..."
+
 #: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "把选中的信头移到顶部"
@@ -14953,7 +15268,7 @@ msgstr "信头名称"
 msgid "Header Value"
 msgstr "信头值"
 
-#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:121
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "信头"
 
@@ -14962,637 +15277,687 @@ msgstr "信头"
 msgid "Page %d of %d"
 msgstr "第 %d 页,共 %d 页"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "复制到文件夹"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:147
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:146
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:488
+msgid "Deleting message note..."
+msgstr "删除消息附带的便笺"
+
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "不再询问(_D)。"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
 
-#: ../mail/e-mail-reader.c:1661
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "获取信息失败:"
 
-#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "收取信息 %s"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1965
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1967
 msgid "Add sender to address book"
 msgstr "将发件人添加到地址簿"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1972
 msgid "_Archive..."
 msgstr "归档(_A)…"
 
-#: ../mail/e-mail-reader.c:1903
+#: ../mail/e-mail-reader.c:1974
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "把选中的信息移至账户的归档文件夹"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1979
 msgid "Check for _Junk"
 msgstr "检查垃圾信息(_J)"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1981
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1986
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1988
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信息复制到其它文件夹"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1993
 msgid "_Delete Message"
 msgstr "删除信息(_D)"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信息做删除标记"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2000
+msgid "_Add note..."
+msgstr "添加便笺...(_A)"
+
+#: ../mail/e-mail-reader.c:2002
+msgid "Add a note for the selected message"
+msgstr "为选中消息添加便笺"
+
+#: ../mail/e-mail-reader.c:2007
+msgid "Delete no_te"
+msgstr "删除便笺(_T)"
+
+#: ../mail/e-mail-reader.c:2009
+msgid "Delete the note for the selected message"
+msgstr "为选中消息删除便笺"
+
+#: ../mail/e-mail-reader.c:2014
+msgid "_Edit note..."
+msgstr "编辑便笺...(_E)"
+
+#: ../mail/e-mail-reader.c:2016
+msgid "Edit a note for the selected message"
+msgstr "编辑选中消息的便笺"
+
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "为邮件列表创建一条过滤规则(_L)..."
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2023
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建可过滤寄往此邮件列表的信息的规则"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:2028
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "为收件人创建一条过滤规则(_R)..."
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2030
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建可过滤寄往这些收件人的信息的规则"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:2035
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "为发件人创建一条过滤规则(_N)..."
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2037
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建可过滤此人寄来的信息的规则"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:2042
 msgid "Create a Filter Rule for _Subject..."
 msgstr "为主题创建一条过滤规则(_S)..."
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2044
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建可过滤此主题信息的规则"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:2049
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:2051
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信息"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2056
 msgid "_Find in Message..."
 msgstr "在信息中查找(_F)..."
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2058
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信息的主体中搜索文本"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2063
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:2065
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "删除选中信息的跟随标志"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:2070
 msgid "_Flag Completed"
 msgstr "标志为已完成(_F)"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2072
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置选中信息的跟随标志为已完成"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2077
 msgid "Follow _Up..."
 msgstr "跟随(_U)..."
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2079
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信息添加跟随标志"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2084
+#: ../modules/mail/e-mail-attachment-handler.c:364
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
+#: ../modules/mail/e-mail-attachment-handler.c:366
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信息作为附件转发给某人"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2091
 msgid "Forward As _Attached"
 msgstr "作为附件转发(_A)"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2098
+#: ../modules/mail/e-mail-attachment-handler.c:371
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
+#: ../modules/mail/e-mail-attachment-handler.c:373
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转发选中信息"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2105
 msgid "Forward As _Inline"
 msgstr "嵌入正文转发(_I)"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2112
+#: ../modules/mail/e-mail-attachment-handler.c:378
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
+#: ../modules/mail/e-mail-attachment-handler.c:380
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选中的信息"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2119
 msgid "Forward As _Quoted"
 msgstr "作文引用转发(_Q)"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2126
 msgid "_Load Images"
 msgstr "载入图像(_L)"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2128
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制载入 HTML 邮件中的图像"
 
-#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
 msgid "_Ignore Subthread"
-msgstr "忽略子线索(_I)"
+msgstr "忽略子会话(_I)"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2135
 msgid "Mark new mails in a subthread as read automatically"
-msgstr "标记此子线索的新邮件为自动阅读"
+msgstr "标记此子会话的新邮件为自动阅读"
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
 msgid "_Ignore Thread"
-msgstr "忽略线索(_I)"
+msgstr "忽略会话(_I)"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2142
 msgid "Mark new mails in this thread as read automatically"
-msgstr "标记此线索的新邮件为自动阅读"
+msgstr "标记此会话的新邮件为自动阅读"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2147
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2149
 msgid "Mark the selected messages as important"
 msgstr "把选中信息标记为重要邮件"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2154
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2156
 msgid "Mark the selected messages as junk"
 msgstr "把选中信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2161
 msgid "_Not Junk"
 msgstr "非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2163
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信息标记为非垃圾信息"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2168
 msgid "_Read"
 msgstr "读取(_R)"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2170
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信息标记为已读"
 
-#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
+#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
 msgid "Do not _Ignore Subthread"
-msgstr "不要忽略子线索(_I)"
+msgstr "不要忽略子会话(_I)"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2177
 msgid "Do not mark new mails in a subthread as read automatically"
-msgstr "不要标记此子线索的新邮件为自动阅读"
+msgstr "不要标记此子会话的新邮件为自动阅读"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
 msgid "Do not _Ignore Thread"
-msgstr "不要忽略线索(_I)"
+msgstr "不要忽略会话(_I)"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2184
 msgid "Do not mark new mails in this thread as read automatically"
-msgstr "不要标记此线索中的新邮件为自动阅读"
+msgstr "不要标记此会话中的新邮件为自动阅读"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2189
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信息标记为不重要"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2196
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2198
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信息标记为未读"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2203
+#: ../modules/mail/e-mail-attachment-handler.c:350
 msgid "_Edit as New Message..."
 msgstr "作为新信息进行编辑(_E)..."
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2205
+#: ../modules/mail/e-mail-attachment-handler.c:352
 msgid "Open the selected messages in the composer for editing"
 msgstr "在编辑器中打开选中的信息以便编辑"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose _New Message"
 msgstr "撰写新信息(_N)"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2212
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以撰写信息"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2217
 msgid "_Open in New Window"
 msgstr "在新窗口中打开(_O)"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2219
 msgid "Open the selected messages in a new window"
 msgstr "在新窗口中打开选中的信息"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2224
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2226
 msgid "Move selected messages to another folder"
 msgstr "把选中的信息移至其它文件夹"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2231
 msgid "_Next Message"
 msgstr "下一封信(_N)"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2233
 msgid "Display the next message"
 msgstr "显示下一封信息"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2238
 msgid "Next _Important Message"
 msgstr "下一封重要信息(_I)"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2240
 msgid "Display the next important message"
 msgstr "显示下一封重要信息"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2245
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2247
 msgid "Display the next thread"
 msgstr "显示下一条线索"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2252
 msgid "Next _Unread Message"
 msgstr "下一封未读信息(_U)"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2254
 msgid "Display the next unread message"
 msgstr "显示下一封未读信息"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2259
 msgid "_Previous Message"
 msgstr "上一封信(_P)"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2261
 msgid "Display the previous message"
 msgstr "显示上一封信息"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2266
 msgid "Pr_evious Important Message"
 msgstr "上一封重要信息(_E)"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2268
 msgid "Display the previous important message"
 msgstr "显示上一封重要信息"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2273
 msgid "Previous T_hread"
 msgstr "上一条线索(_H)"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2275
 msgid "Display the previous thread"
 msgstr "显示上一条线索"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2280
 msgid "P_revious Unread Message"
 msgstr "上一封未读信息(_R)"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2282
 msgid "Display the previous unread message"
 msgstr "显示上一封未读信息"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2289
 msgid "Print this message"
 msgstr "打印该信息"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2296
 msgid "Preview the message to be printed"
 msgstr "预览要打印的信息"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2301
+#: ../modules/mail/e-mail-attachment-handler.c:385
 msgid "Re_direct"
 msgstr "重发(_D)"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2303
+#: ../modules/mail/e-mail-attachment-handler.c:387
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信息重发(退回)给某人"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2308
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2310
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2315
 msgid "Remove Du_plicate Messages"
 msgstr "移除重复的信息(_P)"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2317
 msgid "Checks selected messages for duplicates"
 msgstr "检查所选信息中的重复信息?"
 
-#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
-#: ../modules/mail/e-mail-attachment-handler.c:213
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-attachment-handler.c:329
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2324
+#: ../modules/mail/e-mail-attachment-handler.c:331
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信息的所有收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
+#: ../modules/mail/e-mail-attachment-handler.c:336
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2331
+#: ../modules/mail/e-mail-attachment-handler.c:338
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信息的邮件列表撰写回复"
 
-#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336
+#: ../modules/mail/e-mail-attachment-handler.c:343
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2338
+#: ../modules/mail/e-mail-attachment-handler.c:345
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信息的发件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2343
 msgid "_Save as mbox..."
 msgstr "另存为 mbox 格式(_S)..."
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2345
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信息另存为 mbox 格式文件"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message Source"
 msgstr "信息源代码(_M)"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2352
 msgid "Show the raw email source of the message"
 msgstr "显示信息的原始邮件源代码"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2364
 msgid "_Undelete Message"
 msgstr "取消删除信息(_U)"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2366
 msgid "Undelete the selected messages"
 msgstr "取消选中信息的删除"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2371
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2373
 msgid "Reset the text to its original size"
 msgstr "把文本重新设置为原来的大小"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2378
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2380
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ../mail/e-mail-reader.c:2295
+#: ../mail/e-mail-reader.c:2387
 msgid "Decrease the text size"
 msgstr "减少文本大小"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2394
 msgid "Cre_ate"
 msgstr "创建(_A)"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2401
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../mail/e-mail-reader.c:2316
+#: ../mail/e-mail-reader.c:2408
+#: ../modules/mail/e-mail-attachment-handler.c:357
 msgid "F_orward As"
 msgstr "转发为(_O)"
 
-#: ../mail/e-mail-reader.c:2323
+#: ../mail/e-mail-reader.c:2415
 msgid "_Group Reply"
 msgstr "回复全部(_G)"
 
-#: ../mail/e-mail-reader.c:2330
+#: ../mail/e-mail-reader.c:2422
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../mail/e-mail-reader.c:2337
+#: ../mail/e-mail-reader.c:2429
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2436
 msgid "_Message"
 msgstr "信息(_M)"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2443
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2453
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "从邮件列表创建搜索文件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2455
 msgid "Create a search folder for this mailing list"
 msgstr "为此邮件列表创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2460
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "从收件人创建搜索文件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2462
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2467
 msgid "Create a Search Folder from Sen_der..."
 msgstr "从发件人创建搜索文件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2469
 msgid "Create a search folder for this sender"
 msgstr "为该发件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2474
 msgid "Create a Search Folder from S_ubject..."
 msgstr "从主题创建搜索文件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2476
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2515
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2531
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2535
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2539
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2439
+#: ../mail/e-mail-reader.c:2543
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2555
 msgid "Mark as Uni_mportant"
 msgstr "标记为不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2559
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2603
 msgid "_Caret Mode"
 msgstr "光标模式(_C)"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2605
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信息的信体中显示闪烁光标"
 
-#: ../mail/e-mail-reader.c:2507
+#: ../mail/e-mail-reader.c:2611
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2613
 msgid "Show messages with all email headers"
 msgstr "显示信息时显示所有信头"
 
-#: ../mail/e-mail-reader.c:3047
+#: ../mail/e-mail-reader.c:3164
 msgid "Retrieving message"
 msgstr "正在获取信息"
 
-#: ../mail/e-mail-reader.c:4078 ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4214
+#: ../modules/mail/e-mail-attachment-handler.c:322
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../mail/e-mail-reader.c:4079
+#: ../mail/e-mail-reader.c:4215
+#: ../modules/mail/e-mail-attachment-handler.c:324
 msgid "Forward the selected message to someone"
 msgstr "把选中信息转发给某人"
 
-#: ../mail/e-mail-reader.c:4098
+#: ../mail/e-mail-reader.c:4234
 msgid "Group Reply"
 msgstr "回复全部"
 
-#: ../mail/e-mail-reader.c:4099
+#: ../mail/e-mail-reader.c:4235
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "为选中信息的邮件列表或全部收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4301 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "删除"
 
-#: ../mail/e-mail-reader.c:4177
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../mail/e-mail-reader.c:4313
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "下一项"
 
-#: ../mail/e-mail-reader.c:4181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../mail/e-mail-reader.c:4317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "上一项"
 
-#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4326 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "回复"
 
-#: ../mail/e-mail-reader.c:5240
+#: ../mail/e-mail-reader.c:5398
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "允许任何发件人为 %s 的远程内容"
 
-#: ../mail/e-mail-reader.c:5242
+#: ../mail/e-mail-reader.c:5400
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "允许任何收件人为 %s 的远程内容"
 
-#: ../mail/e-mail-reader.c:5259
+#: ../mail/e-mail-reader.c:5417
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "允许任何发件人为 %s 的远程内容"
 
-#: ../mail/e-mail-reader.c:5316
+#: ../mail/e-mail-reader.c:5434
+msgid "Do not show this message again"
+msgstr "不再显示该信息"
+
+#: ../mail/e-mail-reader.c:5482
 msgid "Load remote content"
 msgstr "加载远程内容"
 
@@ -15605,36 +15970,29 @@ msgstr "不要再警告我"
 msgid "Refreshing folder '%s'"
 msgstr "刷新文件夹 %s"
 
-#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
-#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
-#: ../shell/e-shell.c:990 ../shell/e-shell.c:1012
-#: ../smime/gui/certificate-manager.c:346
-msgid "Unknown error"
-msgstr "未知错误"
-
 #: ../mail/e-mail-reader-utils.c:1165
 msgid "Marking thread to be ignored"
-msgstr "正在标记线索为忽略"
+msgstr "正在标记会话为忽略"
 
 #: ../mail/e-mail-reader-utils.c:1169
 msgid "Unmarking thread from being ignored"
-msgstr "正在去掉线索的忽略标记"
+msgstr "正在去掉会话的忽略标记"
 
 #: ../mail/e-mail-reader-utils.c:1173
 msgid "Marking subthread to be ignored"
-msgstr "标记子线索为忽略"
+msgstr "标记子会话为忽略"
 
 #: ../mail/e-mail-reader-utils.c:1177
 msgid "Unmarking subthread from being ignored"
-msgstr "正在去掉子线索的忽略标记"
+msgstr "正在去掉子会话的忽略标记"
 
-#: ../mail/e-mail-reader-utils.c:1417
+#: ../mail/e-mail-reader-utils.c:1421
 msgid "Printing"
 msgstr "正在打印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1654
+#: ../mail/e-mail-reader-utils.c:1658
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15644,7 +16002,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗?"
 
-#: ../mail/e-mail-reader-utils.c:2485
+#: ../mail/e-mail-reader-utils.c:2489
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "保存信息"
@@ -15654,12 +16012,12 @@ msgstr[0] "保存信息"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2506
+#: ../mail/e-mail-reader-utils.c:2510
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "信息"
 
-#: ../mail/e-mail-reader-utils.c:2879
+#: ../mail/e-mail-reader-utils.c:2883
 msgid "Parsing message"
 msgstr "正在解析信息"
 
@@ -15681,11 +16039,45 @@ msgstr "%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.
+#: ../mail/em-composer-utils.c:390
+#, c-format
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] "您确定要寄信给 %d 个收件人与抄送?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:396
+#, c-format
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+"您正在尝试寄信给 %d 位收件人和抄送。这会导致所有收件人看到对方的电子邮件地"
+"址。这种行为在某些情况下不受欢迎,特别是如果收件者们不认识对方或注重隐私时。"
+"请考虑将收件人加入到密件副本字段。"
+
+#. This message is never removed from the camel operation, otherwise the GtkInfoBar
+#. hides itself and the user sees no feedback.
+#: ../mail/em-composer-utils.c:790
+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.
-#: ../mail/em-composer-utils.c:1603
+#: ../mail/em-composer-utils.c:1711
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15693,24 +16085,24 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone},${Sender}写道:"
 
-#: ../mail/em-composer-utils.c:1609
+#: ../mail/em-composer-utils.c:1717
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的信息 --------"
 
-#: ../mail/em-composer-utils.c:1614
+#: ../mail/em-composer-utils.c:1722
 msgid "-----Original Message-----"
 msgstr "-------- 原始信息 --------"
 
-#: ../mail/em-composer-utils.c:2901
+#: ../mail/em-composer-utils.c:3027
 msgid "an unknown sender"
 msgstr "未知发件人"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3339
+#: ../mail/em-composer-utils.c:3514
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../mail/em-composer-utils.c:3344
+#: ../mail/em-composer-utils.c:3519
 msgid "Choose folders to post the message to."
 msgstr "选择要将信息投递到哪个文件夹。"
 
@@ -15761,7 +16153,7 @@ msgstr "使用这些设置归档这个文件夹(_A):"
 #: ../mail/em-folder-properties.c:500
 msgctxt "autoarchive"
 msgid "_Cleanup messages older than"
-msgstr "清理早于这个时间的邮件(_C)"
+msgstr "清理早于这段时间的邮件(_C)"
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
 #: ../mail/em-folder-properties.c:516
@@ -15841,12 +16233,12 @@ msgstr "移动文件夹“%s”"
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2468
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2496
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信息移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2470
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2498
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信息复制到文件夹 %s"
@@ -15885,7 +16277,7 @@ msgstr "要显示的订阅(_B)"
 msgid "Subscribe To _All"
 msgstr "订阅全部(_A)"
 
-#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1914
 #: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
@@ -15899,80 +16291,80 @@ msgid "Unsubscribe From _All"
 msgstr "退订全部(_A)"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] ",%d 封未读,"
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../mail/em-subscription-editor.c:1749
+#: ../mail/em-subscription-editor.c:1755
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../mail/em-subscription-editor.c:1788
+#: ../mail/em-subscription-editor.c:1790
 msgid "_Account:"
 msgstr "帐号(_A):"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1803
 msgid "Clear Search"
 msgstr "清除搜索"
 
-#: ../mail/em-subscription-editor.c:1818
+#: ../mail/em-subscription-editor.c:1820
 msgid "Sho_w items that contain:"
 msgstr "显示包含以下内容的项目(_W):"
 
-#: ../mail/em-subscription-editor.c:1865
+#: ../mail/em-subscription-editor.c:1867
 msgid "Subscribe to the selected folder"
 msgstr "订阅选定的文件夹"
 
-#: ../mail/em-subscription-editor.c:1866
+#: ../mail/em-subscription-editor.c:1868
 msgid "Su_bscribe"
 msgstr "订阅(_B)"
 
-#: ../mail/em-subscription-editor.c:1911
+#: ../mail/em-subscription-editor.c:1913
 #: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "取消对选定文件夹的订阅"
 
-#: ../mail/em-subscription-editor.c:1951
+#: ../mail/em-subscription-editor.c:1953
 msgid "Collapse all folders"
 msgstr "折叠所有文件夹"
 
-#: ../mail/em-subscription-editor.c:1952
+#: ../mail/em-subscription-editor.c:1954
 msgid "C_ollapse All"
 msgstr "全部折叠(_O)"
 
-#: ../mail/em-subscription-editor.c:1962
+#: ../mail/em-subscription-editor.c:1964
 msgid "Expand all folders"
 msgstr "展开所有文件夹"
 
-#: ../mail/em-subscription-editor.c:1963
+#: ../mail/em-subscription-editor.c:1965
 msgid "E_xpand All"
 msgstr "全部展开(_X)"
 
-#: ../mail/em-subscription-editor.c:1973
+#: ../mail/em-subscription-editor.c:1975
 msgid "Refresh the folder list"
 msgstr "刷新文件夹列表"
 
-#: ../mail/em-subscription-editor.c:1974
+#: ../mail/em-subscription-editor.c:1976
 #: ../modules/mail/e-mail-shell-view-actions.c:1652
 #: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
-#: ../mail/em-subscription-editor.c:1985
+#: ../mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "停止当前操作"
 
-#: ../mail/em-subscription-editor.c:1986
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../mail/em-subscription-editor.c:1988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "停止(_S)"
 
@@ -16165,162 +16557,172 @@ msgstr "分数"
 msgid "Size (kB)"
 msgstr "大小(kB)"
 
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+msgid "is greater than or equal to"
+msgstr "大于或等于"
+
 #: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
+msgid "is less than or equal to"
+msgstr "小于或等于"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "已回复到"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "重要"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "已读"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "跟随"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "已标志"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "未标志"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "is Completed"
 msgstr "已完成 "
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "is not Completed"
 msgstr "未完成 "
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "正则表达式匹配"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "信头"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "来源帐号"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "管道到程序"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "返回"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "不含有"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "返回大于"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "返回小于"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "是垃圾信息"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "不是垃圾信息"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr "信息位置"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "全部匹配"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "设置标签"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "分配颜色"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "取消颜色"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "分配计分"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "调整计分"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "设置状态"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "已删除"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "取消状态"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "响铃"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "播放声音"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:79
 msgid "Run Program"
-msgstr "运行程序"
+msgstr "运进程序"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "转发至"
 
@@ -16366,7 +16768,8 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "来自"
 
-#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
+#: ../mail/importers/evolution-mbox-importer.c:568
+#: ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
@@ -16378,7 +16781,7 @@ msgstr "导入 Berkeley 邮箱格式文件夹"
 #, c-format
 msgid "%d Address"
 msgid_plural "%d Addresses"
-msgstr[0] "%d 个地址"
+msgstr[0] "%d 地址"
 
 #: ../mail/importers/kmail-importer.c:354
 msgid "Evolution KMail importer"
@@ -16389,7 +16792,7 @@ msgid "Import mail and contacts from KMail."
 msgstr "从 KMail 导入邮件和联系人。"
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 msgid "Trash"
 msgstr "回收站"
 
@@ -16500,8 +16903,8 @@ msgid "Automatically insert _emoticons"
 msgstr "自动插入表情(_E)"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Use Unicode characters for smile_ys"
-msgstr "使用 Unicode 字符作表情(_Y)"
+msgid "Use Un_icode characters for emoticons"
+msgstr "使用 Un_icode 字符表示表情。"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -16517,7 +16920,7 @@ msgstr "通过发件箱文件夹发送信息(_X)"
 
 #: ../mail/mail-config.ui.h:15
 msgid "Number of characters for word w_rapping:"
-msgstr "自动换行字符数(_R):"
+msgstr "自动换行字符指数(_R):"
 
 #: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
@@ -16556,134 +16959,110 @@ msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr "在原信息签名时自动对信息进行数字签名(PGP 或 _S/MIME)"
 
 #: ../mail/mail-config.ui.h:25
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "附件"
-
-#: ../mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "内嵌(Outlook 风格)"
-
-#: ../mail/mail-config.ui.h:27
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "引用"
-
-#: ../mail/mail-config.ui.h:28
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "不引用"
+msgid "_Wrap quoted text in replies"
+msgstr "为回复中引用的文本换行(_W)"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "内嵌"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "签名(_N)"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "签名"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "语言(_L)"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "语言表"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "在此列出的语言反映了您所安装的字典。"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "在我输入时进行拼写检查(_T)"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
 msgstr "为了帮助避免电子邮件意外和问题,在采取以下勾选的操作前请求确认:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "发送带空主题行的信息时(_E)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "发送只填写了密件抄送收件人的信息时(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a message to many _To and CC recipients"
 msgstr "发送邮件给大量收件人与抄送(_T)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "向邮件列表邮箱发送私人回复时(_P)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 msgstr "向很多收件人发送回复时(_N)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "允许邮件列表将私人回复重定向到列表(_M)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "发送只填写了密件抄送收件人的信息时(_B)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:56
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "正在使用加速键(Ctrl+Enter) 发送信息(_K)"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Confirmations"
 msgstr "配置"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Use for Folders"
 msgstr "用于文件夹 "
 
-#: ../mail/mail-config.ui.h:61
-msgid "A_dd"
-msgstr "添加(_D)"
-
-#: ../mail/mail-config.ui.h:63
-msgid "Re_move"
-msgstr "删除(_M)"
-
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid "Use for Recipients"
 msgstr "用于接收者"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:67 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "帐号"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
 msgstr "发送帐户覆盖"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 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 "
@@ -16693,221 +17072,225 @@ msgstr ""
 "针对某些文件夹或收件人指定发送帐户,而不是通常检测的发送帐户。收件人列表可以"
 "包含部分地址或姓名。姓名和地址将分别比较。"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "_Folder override has precedence over Recipient override"
 msgstr "文件夹覆盖 比 收件人覆盖 优先(_F)"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "Send Account"
 msgstr "发送帐号"
 
-#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "启动"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "启动时自动检查新信息(_M)"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Check for new messa_ges in all active accounts"
 msgstr "检查所有活动帐号的新信息(_G)"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "信息显示"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "标准字体(_T):"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "等宽字体(_E):"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "把信息标记为已读前等(_M)"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
-#: ../mail/mail-config.ui.h:91
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "颜色"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "默认字符编码(_N):"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Apply the same _view settings to all folders"
 msgstr "应用同样的查看设置到所有文件夹(_v)"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "默认按照主题对线索中的信息排序(_A)"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "删除邮件"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "清空已删除邮件(_T)"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "销毁文件夹时确认(_W)"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Archive Mail"
 msgstr "归档电子邮件"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "On This Computer A_rchive folder:"
-msgstr "“在此计算机中”分类文件夹:"
+msgstr "“位于本机”分类文件夹:"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Archive folder to use for On This Computer messages"
-msgstr "用于“在此计算机中”信息的归档文件夹"
+msgstr "用于“位于本机”信息的归档文件夹"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "显示动态图像(_S)"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Loading Remote Content"
 msgstr "加载远程内容"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:107
 msgid "_Never load remote content from the Internet"
 msgstr "永不从互联网加载远程内容(_N)"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:108
 msgid "_Load remote content only in messages from contacts"
 msgstr "只加载由连络人寄出邮件中的远程内容(_L)"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:109
 msgid "_Always load remote content from the Internet"
 msgstr "永远从互联网加载远程内容(_A)"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:110
+msgid "Notify about _missing remote content in the message preview"
+msgstr "在邮件预览中显示关于远程内容缺失的通知(_M)"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Add"
 msgstr "添加"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:112
 msgid "Remove"
 msgstr "移除"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Allow for sites:"
 msgstr "允许网站:"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:114
 msgid "Allow for senders:"
 msgstr "允许发件人:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "HTML 信息"
 
-#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "标签"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "发送者照片"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在信息预览中显示发送者的照片(_S)"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "在 gravatar.com 中搜索发件人的照片"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "显示信头"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "邮件头表"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 #: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "日期/时间格式"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "检查收到的邮件是否是垃圾信息(_M)"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "_Delete junk messages"
 msgstr "删除垃圾信息(_D)"
 
-#: ../mail/mail-config.ui.h:124
+#: ../mail/mail-config.ui.h:126
 msgid "Junk Test Options"
 msgstr "垃圾过滤测试选项"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "仅在本地地址簿中查阅(_L)"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid "Check cu_stom headers for junk"
 msgstr "检查自定义信头以判别垃圾信息(_S)"
 
-#: ../mail/mail-config.ui.h:129
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../mail/mail-config.ui.h:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:234
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:184
 msgid "No encryption"
 msgstr "不加密"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "TLS 加密"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
@@ -17063,27 +17446,11 @@ msgstr ""
 "个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
 "一个 To: 或 CC: 收件人。"
 
-#: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message with {0} To and CC recipients?"
-msgstr "您确定要寄信给 {0} 个收件人与抄送?"
-
 #: ../mail/mail.error.xml.h:17
-msgid ""
-"You are trying to send a message to {0} recipients in To and CC fields. This "
-"would result in all recipients seeing the email addresses of each other. In "
-"some cases this behaviour is undesired, especially if they do not know each "
-"other or if privacy is a concern. Consider adding recipients to the BCC "
-"field instead."
-msgstr ""
-"您正在尝试寄信给 {0} 位收件人和抄送。这会导致所有收件人看到对方的电子邮件地"
-"址。这种行为在某些情况下不受欢迎,特别是如果收件者们不认识对方或注重隐私时。"
-"请考虑将收件人加入到密件副本字段。"
-
-#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "您确信您要发送收件人地址无效的信息吗?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -17091,11 +17458,11 @@ msgstr ""
 "下列接收者不能被识别为有效的电子邮件地址:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "您确信您要发送收件人地址无效的信息吗?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -17103,11 +17470,11 @@ msgstr ""
 "下列接收者不能被识别为有效的电子邮件地址:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "发送私人回复?"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -17116,11 +17483,11 @@ msgstr ""
 "您正在给一封通过邮件列表收到的邮件发送一个私下的回复,而邮件列表正试图重定向"
 "您的回复回邮件列表。您确定要继续么?"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "私人回复(_P)"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -17129,22 +17496,22 @@ msgstr ""
 "您正在回复一封通过邮件列表收到的邮件,但是您正私下的回复给发件人,而不是邮件"
 "列表。您确定要这么做么?"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "发送回复给所有收件人?"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
 msgstr "您正要向多个收件人回复信息,您确定要回复其中的所有人吗?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "无法发送此信息,因为您没有指定任何收件人"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -17152,57 +17519,62 @@ msgstr ""
 "请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
 "邮件地址。"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "使用默认的草稿文件夹吗?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
+#, fuzzy
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
-msgstr "无法打开此帐号的草稿文件夹。使用系统的草稿文件夹吗?"
+msgstr ""
+"无法打开此帐号的草稿文件夹。使用系统的草稿文件夹吗?\n"
+"\n"
+"报告的错误是 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Use _Default"
 msgstr "使用默认值(_D)"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
 msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信息吗?"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您继续的话,您将无法恢复这些信息。"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid "_Expunge"
 msgstr "销毁(_E)"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗?"
 
-#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:40
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "清空废件箱(_E)"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次打开太多封信可能要花一点时间。"
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "_Open Messages"
 msgstr "打开信息(_O)"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未发送信息,您仍然想要退出吗?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -17211,96 +17583,96 @@ msgstr "如果您退出,这些信息将会等到 Evolution 下次启动才会
 #. Translators: the {0} is replaced with an operation name, which failed.
 #. It can be basically anything run asynchronously, like "Fetching Mail",
 #. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while {0}."
 msgstr "{0} 时出错。"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while performing operation."
 msgstr "执行操作时出错。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "输入密码。"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "载入过滤器定义错误。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Cannot save to directory \"{0}\"."
 msgstr "无法保存到目录“{0}”。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Cannot save to file \"{0}\"."
 msgstr "无法保存到文件“{0}”。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "无法创建保存目录,原因是“{1}”"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot create temporary save directory."
 msgstr "无法创建临时保存目录。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "文件存在但无法覆盖。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "文件存在但不是普通文件。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Cannot delete folder \"{0}\"."
 msgstr "无法删除文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "无法删除系统文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "擦除文件夹“{0}”失败。"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "刷新文件夹“{0}”失败。"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "无法重命名或移动系统文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
 msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Really delete folder \"{0}\"?"
 msgstr "真要删除文件夹“{0}”?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "如果您删除文件夹,其中的全部内容将被永久删除。"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid "These messages are not copies."
 msgstr "这些信息不是副本。"
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "Messages shown in Search Folders are not copies. Deleting them from a Search "
 "Folder will delete the actual messages from the folder or folders in which "
@@ -17309,129 +17681,129 @@ msgstr ""
 "搜索文件夹中所显示的信息不是副本。从搜索文件夹删除他们将删除其所在文件夹中的"
 "实际信息。您真的要删除这些信息吗?"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "无法将“{0}”重命名为“{1}”。"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:73
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "已经存在名为“{1}”的文件夹。请使用不同的名称。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”移至“{1}”。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open source folder. Error: {2}"
 msgstr "无法打开源文件夹。错误:{2}"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot open target folder. Error: {2}"
 msgstr "无法打开目标文件夹。错误:{2}"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”复制到“{1}”。"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot create folder \"{0}\"."
 msgstr "无法创建文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot open folder. Error: {1}"
 msgstr "无法打开文件夹。错误:{1}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot save changes to account."
 msgstr "无法将更改保存到帐号。"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "You have not filled in all of the required information."
 msgstr "您没有填入所需的全部信息。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "You may not create two accounts with the same name."
 msgstr "您不能创建两个同名帐号。"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Are you sure you want to delete this account?"
 msgstr "您确定要删除此帐号吗?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果您继续的话,帐号信息将被永久删除。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "您确定要删除此帐号及其全部代理服务器吗?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "如果您继续的话,帐号信息及其全部代理服务器信息将被永久删除。"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "您确定要禁用此帐号及其全部代理服务器吗?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果您继续的话,全部代理服务器帐号都将被永久删除。"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Do _Not Disable"
 msgstr "不禁用(_N)"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
 msgstr ""
 "此文件夹可能已经隐式添加了。如果需要的话,请转到搜索文件夹编辑器显式添加。"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "无法添加搜索文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:97
 msgid "Search Folders automatically updated."
 msgstr "搜索文件夹已自动更新。"
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:98
 msgid "Mail filters automatically updated."
 msgstr "邮件过滤器已自动更新。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid "Missing folder."
 msgstr "缺少文件夹。"
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:100
 msgid "You must specify a folder."
 msgstr "您必须指定文件夹。"
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:102
 msgid "You must name this Search Folder."
 msgstr "您必须为此搜索文件夹命名。"
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:103
 msgid "No folder selected."
 msgstr "没有选定文件夹。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -17440,11 +17812,11 @@ msgstr ""
 "您必须一次至少指定一个文件夹作为源。\n"
 "或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:106
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -17455,19 +17827,19 @@ msgstr ""
 "\n"
 "您可以选择忽略此文件夹,覆盖或追加其内容,或者退出。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:111
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "_Append"
 msgstr "追加(_A)"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid "Evolution's local mail format has changed."
 msgstr "Evolution 的本地邮件格式已更改。"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "Evolution's local mail format has changed from mbox to Maildir. Your local "
 "mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -17482,19 +17854,19 @@ msgstr ""
 "将会创建一个 mbox 帐号来保留旧的 mbox 文件夹。在确信数据已经安全迁移后,您可"
 "以删除它。要迁移,请先确保有足够的磁盘空间。"
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:117
 msgid "_Exit Evolution"
 msgstr "退出 Evolution(_E)"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:118
 msgid "_Migrate Now"
 msgstr "迁移 Now(_M)"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "无法读取许可文件。"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -17502,183 +17874,187 @@ msgstr ""
 "无法读取许可文件“{0}”,原因是安装有问题。您将无法使用此提供者,除非您接受其许"
 "可协议。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:121
 msgid "Please wait."
 msgstr "请稍候。"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:122
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "查询服务器所支持的身份验证算法列表。"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr "查询服务器所支持的身份验证方法列表失败。"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:124
+msgid "Failed to get server setup."
+msgstr "获取服务器设置失败。"
+
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "同步文件夹到本地以离线使用吗?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "您想要同步那些标记为离线使用的文件夹吗?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "不同步(_D)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "同步(_S)"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "您是否想要把所有信息标记为已读?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "This will mark all messages as read in the selected folder."
 msgstr "这将把选中文件夹中的全部信息标记为已读。"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:131
 msgid "Also mark messages in subfolders?"
 msgstr "也标记的子文件夹中的信息吗?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr "您是想要只标记当前文件夹中的信息,还是也包括子文件夹中的信息?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:133
 msgid "In Current Folder and _Subfolders"
 msgstr "在当前文件夹和子文件夹(_S)"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:134
 msgid "In Current _Folder Only"
 msgstr "只在当前文件夹(_F)"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:135
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr "当回复或转发时 Evolution 是否关闭该窗口?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Yes, Always"
 msgstr "是,总是如此(_Y)"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_No, Never"
 msgstr "不,永不(_N)"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:138
 msgid "Copy folder in folder tree."
 msgstr "复制文件夹树中的文件夹。"
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:139
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr "您确定要将文件夹“{0}”复制到文件夹“{1}”吗?"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:141
 msgid "Do _not copy"
 msgstr "不要复制(_N)"
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:142
 msgid "_Always copy"
 msgstr "永远复制(_A)"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:143
 msgid "N_ever copy"
 msgstr "永不复制(_E)"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:144
 msgid "Move folder in folder tree."
 msgstr "移动文件夹树中的文件夹。"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr "您确定要将文件夹“{0}”移动到文件夹“{1}”中吗?"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not move"
 msgstr "不要移动(_N)"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:148
 msgid "_Always move"
 msgstr "永远移动(_A)"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever move"
 msgstr "永不移动(_E)"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "无法发送此信息,因为您所选择用来发送的帐号未启用"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:151
 msgid "Please enable the account or send using another account."
 msgstr "请启用帐号或者使用其它帐号发送。"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:152
 msgid "Mail Deletion Failed"
 msgstr "邮件删除失败"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:153
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您没有足够的权限删除此邮件。"
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:154
 msgid "\"Check Junk\" Failed"
 msgstr "检查垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Junk\" Failed"
 msgstr "报告垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Not Junk\" Failed"
 msgstr "报告非垃圾信息失败"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:157
 msgid "Remove duplicate messages?"
 msgstr "移除重复的信息?"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:158
 msgid "No duplicate messages found."
 msgstr "没有找到重复信息。"
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:160
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "“{0}”文件夹中没有重复信息。"
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "连接帐号“{0}”失败。"
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "断开帐号“{0}”失败。"
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "无法退订文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:164
 msgid "Unable to retrieve message."
 msgstr "无法获取信息。"
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:165
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:166
 msgid "Message is not available in offline mode."
-msgstr "脱机模式下信息不可用。"
+msgstr "脱机模式下也信息不可用。"
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:167
 msgid ""
 "This can be due to the message not being downloaded yet. The folder, or the "
 "account, can be marked for offline synchronization. Then, once the account "
@@ -17690,85 +18066,85 @@ msgstr ""
 "次上线,使用 文件-&gt;下载信息 来离线使用,当文件夹被选中,可以确保这个文件夹"
 "里的所有信息在脱机模式下可用。"
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to open folder."
 msgstr "打开文件夹失败。"
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to find duplicate messages."
 msgstr "查找重复信息失败。"
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to retrieve messages."
 msgstr "获取信息失败。"
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to mark messages as read."
 msgstr "无法将信息标记为已读。"
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to remove attachments from messages."
 msgstr "移除信息里的附件失败。"
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to download messages for offline viewing."
 msgstr "无法下载信息以离线查看。"
 
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to save messages to disk."
 msgstr "保存信息到磁盘失败。"
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:176
 msgid "Hidden file is attached."
 msgstr "附加了隐藏文件。"
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:177
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
 msgstr "名为 {0} 的附件是隐藏文件,可能包含敏感数据。请在发送前核查一下它。"
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:178
 msgid "Printing failed."
 msgstr "打印失败。"
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:179
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "打印机返回 &quot;{0}&quot;。"
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:180
 msgid "Could not perform this operation on {0}."
 msgstr "无法对 {0} 执行该操作。"
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:181
 msgid "You must be working online to complete this operation."
 msgstr "您必须上线以完成此操作。"
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:182
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "来自“{0}”账户的信息:"
 
-#: ../mail/mail.error.xml.h:184
+#: ../mail/mail.error.xml.h:183
 msgid "Failed to mark thread to be ignored in folder '{0}'"
-msgstr "标记文件夹“{0}”中线索为忽略失败"
+msgstr "标记文件夹“{0}”中会话为忽略失败"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
-msgstr "去掉文件夹“{0}“ 中线索的忽略标志失败"
+msgstr "去掉文件夹“{0}“ 中会话的忽略标志失败"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
-msgstr "标记文件夹“{0}”中子线索为忽略失败"
+msgstr "标记文件夹“{0}”中子会话为忽略失败"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
-msgstr "去掉文件夹“{0}“ 中子线索的忽略标志失败"
+msgstr "去掉文件夹“{0}“ 中子会话的忽略标志失败"
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:187
 msgid "Remote content download had been blocked for this message."
 msgstr "已阻挡这封邮件的远程内容下载。"
 
-#: ../mail/mail.error.xml.h:189
+#: ../mail/mail.error.xml.h:188
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -17776,56 +18152,70 @@ msgstr ""
 "您可以手动下载远程内容,或设置为记住下载这个发件人或使用过网站的远程内容。"
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:191
+#: ../mail/mail.error.xml.h:190
 msgid "{0}, Completed on {1}"
 msgstr "{0} ,完成于 {1} "
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:193
+#: ../mail/mail.error.xml.h:192
 msgid "{0} by {1}"
-msgstr "{0} 自 {1}"
+msgstr "{0} 来自 {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:195
+#: ../mail/mail.error.xml.h:194
 msgid "Overdue: {0} by {1}"
 msgstr "逾期:{0} 自 {1}"
 
+#: ../mail/mail.error.xml.h:196
+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.
+#: ../mail/mail.error.xml.h:199
+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.
+#: ../mail/mail.error.xml.h:201
+msgid "Failed to store message note in folder '{0}'"
+msgstr "未能存储文件夹“{0}”中的邮件笔记"
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:636
+#: ../mail/mail-send-recv.c:639
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: ../mail/mail-send-recv.c:650
+#: ../mail/mail-send-recv.c:653
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:1262
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:1225
+#: ../mail/mail-send-recv.c:1228
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "正在检查 '%s' 处的新邮件"
 
-#: ../mail/mail-send-recv.c:1452
+#: ../mail/mail-send-recv.c:1455
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "正在删除“%s”中的垃圾邮件并清空废件箱"
 
-#: ../mail/mail-send-recv.c:1454
+#: ../mail/mail-send-recv.c:1457
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "正在删除“%s”中的垃圾邮件"
 
-#: ../mail/mail-send-recv.c:1456
+#: ../mail/mail-send-recv.c:1459
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "正在清空“%s”中的废件箱"
@@ -17842,86 +18232,86 @@ msgstr "编辑搜索文件夹"
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:296
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:297
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:293
+#: ../mail/message-list.c:298
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:299
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:300
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信息"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:301
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:309
+#: ../mail/message-list.c:314
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:315
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:314
+#: ../mail/message-list.c:319
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:320
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6042
+#: ../mail/message-list.c:466 ../mail/message-list.c:6186
 msgid "Generating message list"
 msgstr "生成信息列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2042 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2062 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:2051
+#: ../mail/message-list.c:2071
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:2063
+#: ../mail/message-list.c:2083
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:2071
+#: ../mail/message-list.c:2091
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:2073
+#: ../mail/message-list.c:2093
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2958
+#: ../mail/message-list.c:3001
 msgid "Select all visible messages"
 msgstr "选中所有可见的信息"
 
-#: ../mail/message-list.c:3623 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3703 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "信息"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4979
+#: ../mail/message-list.c:5117
 msgid "Follow-up"
 msgstr "跟随"
 
-#: ../mail/message-list.c:5981
+#: ../mail/message-list.c:6125
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -17932,7 +18322,7 @@ msgstr ""
 "示”信息过滤器;或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
 "索。"
 
-#: ../mail/message-list.c:5989
+#: ../mail/message-list.c:6133
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信息。"
 
@@ -17964,47 +18354,51 @@ msgstr "发信息给"
 msgid "Subject - Trimmed"
 msgstr "主题 - 被截断"
 
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "UID"
+
 #: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "任意信头"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "主题或地址包含"
 
-#: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2136
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2159
 msgid "Recipients contain"
 msgstr "收件人含有"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2152
 msgid "Message contains"
 msgstr "信息含有"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2150
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2173
 msgid "Subject contains"
 msgstr "主题含有"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2143
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2166
 msgid "Sender contains"
 msgstr "发件人含有"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Body contains"
 msgstr "邮件体含有"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2145
 msgid "Free form expression"
 msgstr "自由表达式"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1552
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "表列(T):"
 
@@ -18045,7 +18439,7 @@ msgid "Contact information for %s"
 msgstr "%s 的联系人信息"
 
 #: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "新地址簿"
 
@@ -18055,7 +18449,7 @@ msgid "_Contact"
 msgstr "联系人(_C)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "创建一个新联系人"
 
@@ -18065,7 +18459,7 @@ msgid "Contact _List"
 msgstr "联系人列表(_L)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
@@ -18075,249 +18469,265 @@ msgid "Address _Book"
 msgstr "地址簿(_B)"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "创建新地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "地址簿属性"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:520
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "另存为 VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "将全部联系人复制到(_P)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Copy the contacts of the selected address book to another"
 msgstr "把选中地址簿中的联系人复制到其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "删除地址簿(_E)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "删除选中的地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+msgid "_Manage Address Book groups..."
+msgstr "管理通信录组...(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Manage task list groups order and visibility"
+msgstr "管理任务列表排序及可见性"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Mo_ve All Contacts To..."
 msgstr "将全部联系人移至(_V)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Move the contacts of the selected address book to another"
 msgstr "把选中的地址簿中的联系人移至其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "地址簿属性(_B)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Show properties of the selected address book"
 msgstr "显示选中地址簿的属性"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "刷新(_F)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Refresh the selected address book"
 msgstr "重命名选中地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Address Book _Map"
 msgstr "地址簿地图(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Show map with all contacts from selected address book"
 msgstr "显示选中地址簿中所有联系人的地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 #: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "重命名选中的地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "停止载入"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "复制联系人到(_C)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 msgid "Copy selected contacts to another address book"
 msgstr "把选中的联系人复制到其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "删除联系人(_D)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "在联系人查找(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "在显示的联系人中搜索文本"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "把选中的联系人发送给其他人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "移动联系人至(_M)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move selected contacts to another address book"
 msgstr "把选中的联系人移至其它地址簿"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "新建联系人(_N)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "打开联系人(_O)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "给联系人发送信息(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "给选中的联系人发送信息"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Actions"
 msgstr "操作(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1080
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 #: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:836
+msgid "_Manage groups..."
+msgstr "管理群组...(_M)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "地址簿地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "联系人预览(_P)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "显示联系人预览窗口"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "显示地图(_M)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Show maps in contact preview window"
 msgstr "在联系人预览窗口中显示地图"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../modules/calendar/e-memo-shell-view-actions.c:743
+#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Classic View"
 msgstr "分类视图(_C)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Show contact preview below the contact list"
 msgstr "在联系人列表下方显示联系人预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
-#: ../modules/calendar/e-memo-shell-view-actions.c:699
-#: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "_Vertical View"
 msgstr "竖直视图(_V)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Show contact preview alongside the contact list"
 msgstr "在联系人列表旁显示联系人预览"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:716
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:968
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-memo-shell-view-actions.c:777
+#: ../modules/calendar/e-task-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:2131
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "打印全部显示的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "保存地址簿为 VCard(_A)"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "把选中地址簿中的的联系人保存为 VCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1244
-#: ../modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "另存为 vCard(_S)..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "把选中的联系人保存为 vCard"
 
@@ -18585,67 +18995,82 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "使用 Bogofilter 过滤垃圾"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
+#: ../modules/book-config-google/evolution-book-config-google.c:92
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:993
+#: ../modules/cal-config-google/e-cal-config-google.c:177
+#: ../modules/cal-config-google/e-cal-config-gtasks.c:117
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:361
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:396
+msgid "User name cannot be empty"
+msgstr "用户名不能为空"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "标准 LDAP 端口"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
-msgid "LDAP over SSL (deprecated)"
-msgstr "通过 SSL 的 LDAP(已废弃)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "通过 SSL/TLS 的 LDAP(已废弃)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 全局目录服务"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
-msgid "Microsoft Global Catalog over SSL"
-msgstr "通过 SSL 的 Microsoft 全局目录服务"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+msgid "Microsoft Global Catalog over SSL/TLS"
+msgstr "通过 SSL/TlS 的 Microsoft 全局目录服务"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "重新连接到 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
 msgid "Port:"
 msgstr "端口:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:185
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:140
+msgid "Port number is not valid"
+msgstr "端口号无效"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (推荐)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:660
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:255
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:205
 msgid "Authentication"
 msgstr "身份验证"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名(DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "方法:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -18655,36 +19080,36 @@ msgstr ""
 "LDAP 服务器匿名访问。"
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "搜索"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "搜索基础:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 msgid "Find Possible Search Bases"
 msgstr "查找可能的搜索基础"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "一级"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "子树"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "搜索范围:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -18695,26 +19120,32 @@ msgstr ""
 "搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
 "级的项目。"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "搜索过滤器:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "下载"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "联系人"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "浏览直到达到极限"
 
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:978
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:342
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:378
+msgid "Server address cannot be empty"
+msgstr "服务器地址不能为空"
+
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
@@ -18725,18 +19156,24 @@ msgstr "URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
 
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:184
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "URL 不是有效的 http:// 或者 https:// URL"
+
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
-#: ../modules/cal-config-google/e-google-chooser-button.c:213
+#: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "选择日历"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
-#: ../modules/cal-config-google/e-google-chooser-button.c:217
+#: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
-msgstr "选择备忘录列表"
+msgstr "选择备忘录"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
-#: ../modules/cal-config-google/e-google-chooser-button.c:221
+#: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "选择一个任务列表"
 
@@ -18746,7 +19183,7 @@ msgstr "查找日历"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
-msgstr "查找备忘录列表"
+msgstr "查找备忘录"
 
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
@@ -18768,7 +19205,7 @@ msgstr "选择使用哪个地址簿。"
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "在生日和纪念日日历中使用"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:145
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "删除用户日历"
 
@@ -18824,6 +19261,10 @@ msgstr "开氏(K)"
 msgid "Units:"
 msgstr "单位:"
 
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+msgid "Location cannot be empty"
+msgstr "位置不能为空"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
@@ -18831,7 +19272,7 @@ msgstr "导入(_M)"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:337
 msgid "Importing an event"
-msgstr "正在导入活动"
+msgstr "正在导入事件"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:341
 msgid "Importing a memo"
@@ -18847,7 +19288,7 @@ msgstr "选择一个日历"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:410
 msgid "Select a Memo List"
-msgstr "选择一个备忘录列表"
+msgstr "选择一个备忘录"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
@@ -18859,96 +19300,86 @@ msgstr "导入到日历(_M)"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:431
 msgid "I_mport to Memo List"
-msgstr "导入到备忘录列表(_M)"
+msgstr "导入到备忘录(_M)"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:438
 msgid "I_mport to Task List"
 msgstr "导入到任务列表(_M)"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:186
-#: ../modules/calendar/e-cal-shell-view-actions.c:162
-msgid "New Calendar"
-msgstr "新建日历"
-
-#: ../modules/calendar/e-cal-base-shell-backend.c:190
-#: ../modules/calendar/e-memo-shell-view-actions.c:164
+#: ../modules/calendar/e-cal-base-shell-backend.c:187
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
-msgstr "新建备忘录列表"
+msgstr "新建备忘录"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:194
-#: ../modules/calendar/e-task-shell-view-actions.c:187
-msgid "New Task List"
-msgstr "新建任务列表"
-
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
 #, c-format
 msgid "Copying an event into the calendar '%s'"
-msgstr "正在将活动复制到日历“%s”"
+msgstr "正在将事件复制到日历“%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
 #, c-format
 msgid "Moving an event into the calendar '%s'"
-msgstr "正在将活动移至日历“%s”"
+msgstr "正在将事件移至日历“%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
 #, c-format
 msgid "Copying a memo into the memo list '%s'"
-msgstr "正在将备忘录复制到备忘录列表“%s”"
+msgstr "正在将备忘复制到备忘录“%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
 msgid "Moving a memo into the memo list '%s'"
-msgstr "正在将备忘录移至备忘录列表“%s”"
+msgstr "正在将备忘移至备忘录“%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
 #, c-format
 msgid "Copying a task into the task list '%s'"
 msgstr "正在将任务复制到任务列表“%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
 msgid "Moving a task into the task list '%s'"
 msgstr "正在将任务移至任务列表“%s”"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
 msgid "Calendar Selector"
 msgstr "日历选择器"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
 msgid "Memo List Selector"
-msgstr "备忘录列表选择器"
+msgstr "备忘录选择器"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
 msgid "Task List Selector"
 msgstr "任务列表选择器"
 
-#: ../modules/calendar/e-calendar-preferences.c:520
+#: ../modules/calendar/e-calendar-preferences.c:515
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于提醒的日历"
 
-#: ../modules/calendar/e-calendar-preferences.c:616
+#: ../modules/calendar/e-calendar-preferences.c:611
 msgid "Meeting Invitations"
 msgstr "会议邀请"
 
-#: ../modules/calendar/e-calendar-preferences.c:642
+#: ../modules/calendar/e-calendar-preferences.c:637
 msgid "_Delete message after acting"
 msgstr "操作后删除信息(_D)"
 
-#: ../modules/calendar/e-calendar-preferences.c:656
-#: ../modules/calendar/e-calendar-preferences.c:687
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:671
+#: ../modules/calendar/e-calendar-preferences.c:666
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
-#: ../modules/calendar/e-calendar-preferences.c:1057
+#: ../modules/calendar/e-calendar-preferences.c:1064
 msgid "Ti_me and date:"
 msgstr "时间和日期(_M):"
 
-#: ../modules/calendar/e-calendar-preferences.c:1058
+#: ../modules/calendar/e-calendar-preferences.c:1065
 msgid "_Date only:"
 msgstr "仅日期(_D):"
 
@@ -18992,6 +19423,10 @@ msgstr "第二时区(_C):"
 msgid "(Shown in a Day View)"
 msgstr "(在日视图中显示)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "时区(_Z):"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "显示系统时区(_Y)"
@@ -19009,7 +19444,7 @@ msgid "_24 hour"
 msgstr "_24 小时"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "工作日"
 
@@ -19031,142 +19466,178 @@ msgstr "一天开始(_D):"
 msgid "_Mon"
 msgstr "周一(_M)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "星期一"
+
 #. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "周二(_T)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "星期二"
+
 #. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "周三(_W)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "星期三"
+
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "周四(_H)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "星期四"
+
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "周五(_F)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "星期五"
+
 #. Saturday
 #: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "周六(_S)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "星期六"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "周日(_U)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "星期日"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "一天结束(_E):"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "Create events, memos and tasks as _Private by default"
+msgstr "默认创建私密事件、备忘录和任务(_P)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:49
 msgid "View Options"
 msgstr "视图选项"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:48
+#: ../modules/calendar/e-calendar-preferences.ui.h:50
 msgid "_Time divisions:"
 msgstr "时间分割(_T):"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:49
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
 msgstr "在周视图和月视图中显示约会结束时间(_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:50
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
+msgid "Show appointment _icons in the month view"
+msgstr "在月视图中显示约会图标(_I)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Show week _numbers"
 msgstr "显示周数(_N)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr "在底部左侧的日历中以斜体显示重复发生的事件(_E)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Sc_roll Month View by a week"
 msgstr "通过一个周来滚动月视图(_R)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Alerts"
 msgstr "提醒"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Display"
 msgstr "显示"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Task List"
 msgstr "任务列表"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight t_asks due today"
 msgstr "高亮今天到期的任务(_A)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Highlight _overdue tasks"
 msgstr "高亮延期任务(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
 msgid "Display reminders in _notification area only"
 msgstr "只在通知区域显示提醒(_O)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Display reminders for completed _tasks"
 msgstr "显示已完成工作的提醒(_T)"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Sh_ow a reminder"
 msgstr "显示一条提醒(_O)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every appointment"
 msgstr "在每次约会前"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Show a _reminder"
 msgstr "显示一条提醒(_R)"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "before every anniversary/birthday"
 msgstr "在每个周年/生日前"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default _snooze time (in minutes)"
 msgstr "默认小睡时间 [以分钟计] (_S)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Select the calendars for reminder notification"
 msgstr "选择用于提醒通知的日历"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 msgid "Default Free/Busy Server"
 msgstr "默认闲/忙服务器"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:82
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u 和 %d 将被替换为电子邮件地址中的用户和域名。"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../modules/calendar/e-calendar-preferences.ui.h:83
 msgid "Publishing Information"
 msgstr "发布信息"
 
@@ -19176,7 +19647,7 @@ msgid "_Appointment"
 msgstr "约会(_A)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
@@ -19204,7 +19675,7 @@ msgid "Cale_ndar"
 msgstr "日历(_N)"
 
 #: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
@@ -19212,15 +19683,15 @@ msgstr "创建新日历"
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "打印"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:267
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:296
+#: ../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 "
@@ -19230,363 +19701,375 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "销毁较早的事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
 msgid "Making an occurrence movable"
-msgstr "将事件标示成可移动"
+msgstr "将循环发生标示成可移动"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1055
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1057
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
-#: ../modules/calendar/e-memo-shell-view-actions.c:469
-#: ../modules/calendar/e-task-shell-view-actions.c:587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1088
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:498
+#: ../modules/calendar/e-task-shell-view-actions.c:617
 msgid "Save as iCalendar"
 msgstr "保存为 iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1191
-#: ../modules/calendar/e-memo-shell-view-actions.c:550
-#: ../modules/calendar/e-task-shell-view-actions.c:675
+#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "删除日历(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "删除选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "后退"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "前进"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "选择今天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "选择日期(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "选择特定日期"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "_Manage Calendar groups..."
+msgstr "管理日历组...(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr "管理日历组排序及可见性"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1247
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "销毁(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "销毁旧约会和会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "刷新选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "重命名选中的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Find next occurrence of the current search string"
 msgstr "寻找搜索字符串出现的下一个位置"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find _Previous"
 msgstr "查找上一个(_P)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Find previous occurrence of the current search string"
 msgstr "寻找该搜索字符串出现的上一个位置"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop _Running Search"
 msgstr "停止正在运行的搜索(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "停止当前正在运行的搜索"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+msgid "Sho_w All Calendars"
+msgstr "显示所有日历(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "只显示此日历(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "代理会议(_D)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
 msgstr "删除约会(_D)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
 msgstr "删除选中的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
-msgstr "删除此次出现(_O)"
+msgstr "删除此次发生(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "删除此次发生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
-msgstr "删除所有出现(_U)"
+msgstr "删除所有发生(_U)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "删除全部发生"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "新建全天事件(_E)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "创建一个新的全天事件"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1338
-#: ../modules/calendar/e-cal-shell-view-memopad.c:242
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-memo-shell-view-actions.c:543
-#: ../modules/calendar/e-task-shell-view-actions.c:668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "新建会议(_M)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "创建一个新的会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "移至日历(_V)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "将此次发生变为可移动(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "打开约会(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "查看当前约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "转换约会为会议"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "转换到约会(_E)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "转换会议为约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "退出"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1528
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "显示一天"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
 msgstr "列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1537
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
 msgstr "显示为列表"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1544
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "显示一个月"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "显示一周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "显示一个工作周"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
 msgstr "活动约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
 msgstr "下一周的约会"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "发生不到 5 次"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Description contains"
 msgstr "描述含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Summary contains"
 msgstr "概要含有"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1635
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:957
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print..."
 msgstr "打印..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "打印此日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "预览将要打印的日历"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:1040
 msgid "_Save as iCalendar..."
 msgstr "保存为 iCalendar(_S)..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Go To"
 msgstr "转到"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:206
-#: ../modules/calendar/e-memo-shell-view-actions.c:467
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:249
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "新建备忘(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
-#: ../modules/calendar/e-memo-shell-backend.c:65
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:81
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:256
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "打开备忘(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "查看选中的备忘"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "打印选中的备忘"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:810
+#: ../modules/calendar/e-cal-shell-view-private.c:816
 msgid "Searching next matching event"
 msgstr "正在搜索下一个匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:811
+#: ../modules/calendar/e-cal-shell-view-private.c:817
 msgid "Searching previous matching event"
 msgstr "正在搜索上一个匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:832
+#: ../modules/calendar/e-cal-shell-view-private.c:838
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "无法在接下来的 %d 年中找到匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:836
+#: ../modules/calendar/e-cal-shell-view-private.c:842
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "无法在过去的 %d 年中找到匹配的事件"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:859
+#: ../modules/calendar/e-cal-shell-view-private.c:865
 msgid "Cannot search with no active calendar"
 msgstr "无活动日历,无法搜索"
 
@@ -19594,159 +20077,171 @@ 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
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "分配任务(_A)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "标记为完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "把选中任务标记为完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "标记为未完成(_M)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "把选中任务标记为未完成"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-backend.c:64
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "打开任务(_O)"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "查看选中的任务"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "打印选中的任务"
 
-#: ../modules/calendar/e-memo-shell-backend.c:63
+#: ../modules/calendar/e-memo-shell-backend.c:79
 msgctxt "New"
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:70
+#: ../modules/calendar/e-memo-shell-backend.c:86
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "共享的备忘(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:72
+#: ../modules/calendar/e-memo-shell-backend.c:88
 msgid "Create a new shared memo"
 msgstr "创建一个新的共享备忘"
 
-#: ../modules/calendar/e-memo-shell-backend.c:80
+#: ../modules/calendar/e-memo-shell-backend.c:96
 msgctxt "New"
 msgid "Memo Li_st"
-msgstr "备忘录列表(_S)"
+msgstr "备忘录(_S)"
 
-#: ../modules/calendar/e-memo-shell-backend.c:82
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../modules/calendar/e-memo-shell-backend.c:98
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
-msgstr "创建新备忘录列表"
+msgstr "创建新备忘录"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "打印备忘"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
-msgstr "备忘录列表属性"
+msgstr "备忘录属性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:529
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "删除备忘(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:536
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "在备忘中查找(_F)..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:538
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "在显示备忘的主体中搜索文本"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:557
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
-msgstr "删除备忘录列表(_D)"
+msgstr "删除备忘录(_D)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:559
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
-msgstr "重命名选中备忘录列表"
+msgstr "重命名选中备忘录"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr "管理留言列表组...(_M)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "Manage Memo List groups order and visibility"
+msgstr "管理备忘录排序及可见性"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "_New Memo List"
-msgstr "新建备忘录列表(_N)"
+msgstr "新建备忘录(_N)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
-msgstr "重命名选中备忘录列表"
+msgstr "重命名选中备忘录"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
-msgstr "重命名选中备忘录列表"
+msgstr "重命名选中备忘录"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
-msgstr "只显示此备忘录列表(_O)"
+msgstr "只显示此备忘录(_O)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+msgid "Sho_w All Memo Lists"
+msgstr "显示所有备忘录(_W)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "备忘预览(_P)"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "显示备忘预览面板"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Show memo preview below the memo list"
-msgstr "在备忘录列表下方显示备忘录预览"
+msgstr "在备忘录下方显示备忘预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview alongside the memo list"
-msgstr "在备忘录列表下方显示备忘录预览"
+msgstr "在备忘录下方显示备忘预览"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
-msgstr "打印备忘录列表"
+msgstr "打印备忘录"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Preview the list of memos to be printed"
-msgstr "预览要打印的备忘录列表"
+msgstr "预览要打印的备忘录"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "删除备忘"
 
-#: ../modules/calendar/e-memo-shell-view.c:214
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "删除备忘"
 
@@ -19757,45 +20252,45 @@ msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:539
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr "选中 %d 个"
 
-#: ../modules/calendar/e-task-shell-backend.c:62
+#: ../modules/calendar/e-task-shell-backend.c:77
 msgctxt "New"
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../modules/calendar/e-task-shell-backend.c:69
+#: ../modules/calendar/e-task-shell-backend.c:84
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "分配的任务(_D)"
 
-#: ../modules/calendar/e-task-shell-backend.c:71
+#: ../modules/calendar/e-task-shell-backend.c:86
 msgid "Create a new assigned task"
 msgstr "创建新分配的任务"
 
-#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../modules/calendar/e-task-shell-backend.c:94
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "任务列表(_K)"
 
-#: ../modules/calendar/e-task-shell-backend.c:81
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-backend.c:96
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "打印任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:259
+#: ../modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:529
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -19806,107 +20301,115 @@ msgstr ""
 "\n"
 "确实删除这些任务吗?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:536
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "不要再次询问"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "删除任务(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:661
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "在任务中查找(_F)..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Search for text in the displayed task"
 msgstr "在显示的任务中搜索文本"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
 msgstr "删除任务列表(_D)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
 msgstr "重命名选中任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "_Manage Task List groups..."
+msgstr "管理任务列表组...(_M)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "新建任务列表(_N)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "更新选中任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "重命名选中任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+msgid "Sho_w All Task Lists"
+msgstr "显示所有任务列表(_W)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
 msgstr "只显示此任务列表(_O)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "标记为未完成(_K)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "删除已完成的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "任务预览(_P)"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "显示任务预览面板"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:859
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Show task preview below the task list"
 msgstr "在任务列表下方显示任务预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Show task preview alongside the task list"
 msgstr "在任务列表下方显示任务预览"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:874
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "活动任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "已完成任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "下一周的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "延期任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "有附件的任务"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
 msgstr "打印任务列表"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Preview the list of tasks to be printed"
 msgstr "预览要打印的任务列表"
 
-#: ../modules/calendar/e-task-shell-view.c:316
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view.c:318
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view-private.c:535
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -20132,12 +20635,12 @@ msgid "%s has sent back the following meeting response:"
 msgstr "%s 发回了下列会议请求的响应:"
 
 #: ../modules/itip-formatter/itip-view.c:442
-#, c-format
+#, fuzzy, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s 通过 %s 取消了下列会议:"
 
 #: ../modules/itip-formatter/itip-view.c:444
-#, c-format
+#, fuzzy, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s 已取消下列会议:"
 
@@ -20220,14 +20723,14 @@ msgid "%s has sent back the following assigned task response:"
 msgstr "%s 发回了下列分配任务的回应:"
 
 #: ../modules/itip-formatter/itip-view.c:532
-#, c-format
+#, fuzzy, c-format
 msgid "%s through %s has canceled the following assigned task:"
-msgstr "%s 通过 %s 取消了下列任务分配:"
+msgstr "%s 通过 %s 取消了下列已分配的任务:"
 
 #: ../modules/itip-formatter/itip-view.c:534
-#, c-format
+#, fuzzy, c-format
 msgid "%s has canceled the following assigned task:"
-msgstr "%s 取消分配的下列任务:"
+msgstr "%s 取消下列已分配的任务:"
 
 #: ../modules/itip-formatter/itip-view.c:538
 #, c-format
@@ -20270,12 +20773,12 @@ msgid "%s wishes to add to an existing memo:"
 msgstr "%s 希望加入到已有的备忘中:"
 
 #: ../modules/itip-formatter/itip-view.c:598
-#, c-format
+#, fuzzy, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s 通过 %s 取消了下列共享备忘:"
 
 #: ../modules/itip-formatter/itip-view.c:600
-#, c-format
+#, fuzzy, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s 取消了下列共享备忘:"
 
@@ -20338,7 +20841,7 @@ msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
 #: ../modules/itip-formatter/itip-view.c:1066
-#: ../smime/gui/certificate-manager.c:1666
+#: ../smime/gui/certificate-manager.c:1668
 msgid "_Update"
 msgstr "更新(_U)"
 
@@ -20388,7 +20891,7 @@ msgid "Sa_ve"
 msgstr "保存(_V)"
 
 #: ../modules/itip-formatter/itip-view.c:3679
-#: ../modules/itip-formatter/itip-view.c:5151
+#: ../modules/itip-formatter/itip-view.c:5146
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
@@ -20416,7 +20919,7 @@ msgstr "无法在任何任务列表中找到此任务"
 
 #: ../modules/itip-formatter/itip-view.c:4042
 msgid "Unable to find this memo in any memo list"
-msgstr "无法在任何备忘录列表中找到此备忘录"
+msgstr "无法在任何备忘录中找到此备忘"
 
 #: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
@@ -20426,159 +20929,159 @@ msgstr "正在打开日历,请稍候..."
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../modules/itip-formatter/itip-view.c:4787
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../modules/itip-formatter/itip-view.c:4802
+#: ../modules/itip-formatter/itip-view.c:4797
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../modules/itip-formatter/itip-view.c:4813
+#: ../modules/itip-formatter/itip-view.c:4808
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../modules/itip-formatter/itip-view.c:4819
-#, c-format
+#: ../modules/itip-formatter/itip-view.c:4814
+#, fuzzy, c-format
 msgid "Sent to calendar '%s' as canceled"
-msgstr "将日历“%s”发送为已取消"
+msgstr "将“%s”作为已取消日历发送"
 
-#: ../modules/itip-formatter/itip-view.c:4840
-#: ../modules/itip-formatter/itip-view.c:5298
-#: ../modules/itip-formatter/itip-view.c:5404
+#: ../modules/itip-formatter/itip-view.c:4835
+#: ../modules/itip-formatter/itip-view.c:5293
+#: ../modules/itip-formatter/itip-view.c:5399
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "正在保存日历更改,请稍候..."
 
-#: ../modules/itip-formatter/itip-view.c:4881
+#: ../modules/itip-formatter/itip-view.c:4876
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../modules/itip-formatter/itip-view.c:5074
+#: ../modules/itip-formatter/itip-view.c:5069
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../modules/itip-formatter/itip-view.c:5091
+#: ../modules/itip-formatter/itip-view.c:5086
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../modules/itip-formatter/itip-view.c:5095
+#: ../modules/itip-formatter/itip-view.c:5090
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5138
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5182
 msgid "The meeting is invalid and cannot be updated"
 msgstr "会议无效,无法更新"
 
-#: ../modules/itip-formatter/itip-view.c:5263
+#: ../modules/itip-formatter/itip-view.c:5258
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新,原因是状态无效"
 
-#: ../modules/itip-formatter/itip-view.c:5335
-#: ../modules/itip-formatter/itip-view.c:5374
+#: ../modules/itip-formatter/itip-view.c:5330
+#: ../modules/itip-formatter/itip-view.c:5369
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
-#: ../modules/itip-formatter/itip-view.c:5437
+#: ../modules/itip-formatter/itip-view.c:5432
 msgid "Meeting information sent"
 msgstr "会议信息已发送"
 
-#: ../modules/itip-formatter/itip-view.c:5442
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Task information sent"
 msgstr "任务信息已发送"
 
-#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Memo information sent"
 msgstr "备忘信息已发送"
 
-#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5453
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法发送会议信息,会议不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5463
+#: ../modules/itip-formatter/itip-view.c:5458
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法发送任务信息,任务不存在"
 
-#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "无法发送备忘信息,备忘不存在"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5533
+#: ../modules/itip-formatter/itip-view.c:5528
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5538
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "Save Calendar"
 msgstr "保存日历"
 
-#: ../modules/itip-formatter/itip-view.c:5587
-#: ../modules/itip-formatter/itip-view.c:5600
+#: ../modules/itip-formatter/itip-view.c:5582
+#: ../modules/itip-formatter/itip-view.c:5595
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../modules/itip-formatter/itip-view.c:5588
-#: ../modules/itip-formatter/itip-view.c:5601
+#: ../modules/itip-formatter/itip-view.c:5583
+#: ../modules/itip-formatter/itip-view.c:5596
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信息声明其包含日历,但日历不是有效的 iCalendar。"
 
-#: ../modules/itip-formatter/itip-view.c:5643
-#: ../modules/itip-formatter/itip-view.c:5673
-#: ../modules/itip-formatter/itip-view.c:5774
+#: ../modules/itip-formatter/itip-view.c:5638
+#: ../modules/itip-formatter/itip-view.c:5668
+#: ../modules/itip-formatter/itip-view.c:5769
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../modules/itip-formatter/itip-view.c:5644
-#: ../modules/itip-formatter/itip-view.c:5674
-#: ../modules/itip-formatter/itip-view.c:5775
+#: ../modules/itip-formatter/itip-view.c:5639
+#: ../modules/itip-formatter/itip-view.c:5669
+#: ../modules/itip-formatter/itip-view.c:5770
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "信息的确包含日历,但是日历不包含事件、任务或忙/闲信息"
 
-#: ../modules/itip-formatter/itip-view.c:5689
+#: ../modules/itip-formatter/itip-view.c:5684
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../modules/itip-formatter/itip-view.c:5690
+#: ../modules/itip-formatter/itip-view.c:5685
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要处理这些全部项目,应该保存文件并导入日历"
 
-#: ../modules/itip-formatter/itip-view.c:6193
+#: ../modules/itip-formatter/itip-view.c:6188
 msgctxt "cal-itip"
 msgid "None"
 msgstr "无"
 
-#: ../modules/itip-formatter/itip-view.c:6209
+#: ../modules/itip-formatter/itip-view.c:6204
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
-#: ../modules/itip-formatter/itip-view.c:6369
+#: ../modules/itip-formatter/itip-view.c:6364
 msgid "This meeting recurs"
 msgstr "此会议重现"
 
-#: ../modules/itip-formatter/itip-view.c:6372
+#: ../modules/itip-formatter/itip-view.c:6367
 msgid "This task recurs"
 msgstr "此任务重现"
 
-#: ../modules/itip-formatter/itip-view.c:6375
+#: ../modules/itip-formatter/itip-view.c:6370
 msgid "This memo recurs"
 msgstr "此备忘重现"
 
@@ -20595,114 +21098,135 @@ msgstr "该会议已被代理"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”?"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:265
 msgid "Google Features"
 msgstr "Google 特性"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:274
 msgid "Add Google Ca_lendar to this account"
 msgstr "添加 Google Ca_lendar 到此帐。"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:283
 msgid "Add Google Con_tacts to this account"
 msgstr "添加 Google Con_tacts 到此帐号"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:286
+#: ../modules/mail-config/e-mail-config-google-summary.c:292
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要启用 IMAP 访问"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Mail _Directory:"
 msgstr "邮件目录(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Choose a MH mail directory"
 msgstr "选择 MH 邮件目录"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+msgid "MH mail directory cannot be empty"
+msgstr "MH 邮件目录不能为空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr "本地分发文件(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a local delivery file"
 msgstr "选择本地分发文件"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+msgid "Local delivery file cannot be empty"
+msgstr "本地分发文件不能为空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Choose a Maildir mail directory"
 msgstr "选择 Maildir 邮件目录"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+msgid "Maildir mail directory cannot be empty"
+msgstr "Maildir 邮件目录不能为空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 msgid "Spool _File:"
 msgstr "池文件(_F):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Choose a mbox spool file"
 msgstr "选择 mbox 池(spool)文件"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+msgid "Mbox spool file cannot be empty"
+msgstr "Mbox 池文件不能为空"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 msgid "Spool _Directory:"
 msgstr "池目录(_D):"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Choose a mbox spool directory"
 msgstr "选择 mbox 池目录"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+msgid "Mbox spool directory cannot be empty"
+msgstr "Mbox 池目录不能为空"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "配置"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "服务器(_S):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
 msgid "_Port:"
 msgstr "端口(_P):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "User_name:"
 msgstr "用户名(_N):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
 msgid "Encryption _method:"
 msgstr "加密方法(_M):"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
 msgid "STARTTLS after connecting"
 msgstr "连接后进行 STARTTLS"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
-msgid "SSL on a dedicated port"
-msgstr "专用端口上的 SSL"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+msgid "TLS on a dedicated port"
+msgstr "专用端口上的 TLS"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
-msgstr "使用自定义二进制程序,而不是 'sendmail' (_U)"
+msgstr "使用自定义二进制程序,而不是“sendmail” (_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "自定义命令(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 msgid "U_se custom arguments"
 msgstr "使用自定义参数(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 msgid "Cus_tom arguments:"
 msgstr "自定义参数(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -20712,27 +21236,32 @@ msgstr ""
 "   %F - 表示来源地址\n"
 "   %R - 表示收件人地址"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
 msgid "Send mail also when in offline _mode"
 msgstr "脱机模式下也可发送邮件(_M)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+msgid "Custom binary cannot be empty"
+msgstr "自定义二进制程序不能为空"
+
+#. do not reference
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "T_ype:"
 msgstr "类型(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:251
 msgid "Yahoo! Features"
 msgstr "Yahoo! 特性"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:260
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "添加 Yahoo! 日历和任务到此帐号(_L) "
 
-#: ../modules/mail/e-mail-attachment-handler.c:440
+#: ../modules/mail/e-mail-attachment-handler.c:605
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -21038,130 +21567,146 @@ msgid "Show deleted messages with a line through them"
 msgstr "在信息列表中显示删除了的信息(带有删除线)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2004
+msgid "Show _Junk Messages"
+msgstr "显示垃圾信息(_J)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
+msgid "Show junk messages with a red line through them"
+msgstr "使用红色删除线标记垃圾消息"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Threaded message list"
 msgstr "按线索排列信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "_Unmatched Folder Enabled"
 msgstr "“未匹配”文件夹已启用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "开关“未匹配”搜索文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2034
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Show message preview below the message list"
 msgstr "在信息列表下方显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2041
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Show message preview alongside the message list"
 msgstr "在信息列表旁显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "All Messages"
 msgstr "全部信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Important Messages"
 msgstr "重要信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Last 5 Days' Messages"
 msgstr "前五天的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Messages Not Junk"
 msgstr "不是垃圾信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Messages with Attachments"
 msgstr "有附件的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
+msgid "Messages with Notes"
+msgstr "带有便笺的消息"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2099
 msgid "No Label"
 msgstr "无标签"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2106
 msgid "Read Messages"
 msgstr "已读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2098
+#: ../modules/mail/e-mail-shell-view-actions.c:2113
 msgid "Unread Messages"
 msgstr "未读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2157
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
+msgid "Message Thread"
+msgstr "信息线索"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2180
 msgid "Subject or Addresses contain"
 msgstr "主题或地址含有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2167
+#: ../modules/mail/e-mail-shell-view-actions.c:2190
 msgid "All Accounts"
 msgstr "全部帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2174
+#: ../modules/mail/e-mail-shell-view-actions.c:2197
 msgid "Current Account"
 msgstr "当前帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2181
+#: ../modules/mail/e-mail-shell-view-actions.c:2204
 msgid "Current Folder"
 msgstr "当前文件夹"
 
-#: ../modules/mail/e-mail-shell-view.c:700
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "全部帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view.c:808
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view-private.c:954
+#: ../modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:963
-#: ../modules/mail/e-mail-shell-view-private.c:980
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:983
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已删除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:989
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1002
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 封草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1017
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d 封未读"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1549
+#: ../modules/mail/e-mail-shell-view-private.c:1552
 msgid "Send / Receive"
 msgstr "发送/接收"
 
@@ -21189,7 +21734,7 @@ msgstr "立即发送"
 msgid "Send after 5 minutes"
 msgstr "5 分钟后发送"
 
-#: ../modules/mail/em-composer-prefs.c:1280
+#: ../modules/mail/em-composer-prefs.c:1286
 msgid "Language(s)"
 msgstr "语言"
 
@@ -21222,11 +21767,11 @@ msgid "Contains Value"
 msgstr "包含值"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1554
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "日期头:(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1555
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "显示原始邮件头值(_o)"
 
@@ -21247,13 +21792,13 @@ msgstr "您在 %3$s 上给 %1$s 发送的关于“%2$s”的信息已被阅读
 msgid "Delivery Notification for \"%s\""
 msgstr "“%s”的邮件通知"
 
-#: ../modules/mdn/evolution-mdn.c:531
+#: ../modules/mdn/evolution-mdn.c:534
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "向“%s”发送回执"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:536
+#: ../modules/mdn/evolution-mdn.c:539
 msgid "_Notify Sender"
 msgstr "通知发件人(_N)"
 
@@ -21328,45 +21873,55 @@ msgstr "显示 HTML 版本"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "显示多部分/可选信息的 HTML 版本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "首选 HTML"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 msgid "Let Evolution choose the best part to show."
 msgstr "让Evolution选择最好的部分显示。"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "如果可用则显示纯文本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
 msgstr "如果提出,那么显示纯文本部分,否则让Evolution选择好的部分显示,"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+msgid "Show plain text if present, or HTML source"
+msgstr "如果可用则显示纯文本,或是 HTML 源码"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr "如果可用则显示纯文本部分,否则就显示 HTML 部分的源码"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid "Only ever show plain text"
 msgstr "仅显示纯文本"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
 msgstr "如果请求,总是显示文本部分而把其他部分作为附件"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "显示支持的HTML部分作为附件(_s)"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "HT_ML 模式"
 
@@ -21720,7 +22275,7 @@ msgstr "Evolution 网络审查器"
 msgid "_Do not show this message again."
 msgstr "不再显示此信息(_D)。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:465
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "关键字"
@@ -22017,55 +22572,63 @@ msgstr "不是一个图像"
 msgid "The file you selected does not look like a valid PNG image. Error: {0}"
 msgstr "您选取的文件似乎不是有效的 PNG 图像。错误:{0}"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Get List _Archive"
 msgstr "获得列表存档(_A)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Get an archive of the list this message belongs to"
 msgstr "获取这封信所属邮件列表的存档"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+msgid "Copy _Message Archive URL"
+msgstr "复制消息归档 URL (_M)"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "复制选中消息的直接 URL 到其归档"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Get List _Usage Information"
 msgstr "获得列表用法信息(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "获取这封信所属邮件列表的用法信息"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Contact List _Owner"
 msgstr "联系列表所有者(_O)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "联系这封信所属邮件列表的所有者"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "_Post Message to List"
 msgstr "投递到列表(_P)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "给这封信所属的邮件列表投递"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "_Subscribe to List"
 msgstr "订阅列表(_S)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "订阅这封信所属的邮件列表"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "_Unsubscribe from List"
 msgstr "退订列表(_U)"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "退订这封信所属的邮件列表"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Mailing _List"
 msgstr "邮件列表(_L)"
 
@@ -22075,7 +22638,7 @@ msgstr "邮件列表操作"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
-msgstr "执行普通邮件列表活动 (订阅,取消订阅,等等)。"
+msgstr "执行普通邮件列表操作 (订阅,取消订阅,等等)。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
@@ -22220,51 +22783,51 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "当新的邮件信息到达时提示您。"
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:229
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "被%s从邮件创建"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/mail-to-task/mail-to-task.c:561
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:596
+#: ../plugins/mail-to-task/mail-to-task.c:563
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:598
+#: ../plugins/mail-to-task/mail-to-task.c:565
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
 "old event?"
 msgstr "选定的日历已经包含“%s”事件。您想编辑旧的事件吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
 "old task?"
 msgstr "选定的任务列表已经包含“%s”任务。您想编辑旧的任务吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
 "old memo?"
-msgstr "选定的备忘录列表已经包含“%s”备忘录。您想编辑旧的备忘录吗?"
+msgstr "选定的备忘录已经包含“%s”备忘。您想编辑旧的备忘吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -22274,7 +22837,7 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您选择了将 %d 封邮件转换为事件。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -22284,7 +22847,7 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您选择了将 %d 封邮件转换为任务。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -22294,76 +22857,75 @@ msgid_plural ""
 "add them all?"
 msgstr[0] "您选择了将 %d 封邮件转换为备忘。您真的要全部添加它们吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:644
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "您想继续转换剩下的邮件吗?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[没有概要]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "从一个服务器上返回了无效的对象"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "在处理时出现了一个错误:%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "无法打开日历。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr "选中的日历是只读的,因此不能在此创建事件。请选择其它的日历。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
 msgstr "选中的任务列表是只读的,因此不能在此创建任务。请选择其它的任务列表。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:867
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
-msgstr ""
-"选中的备忘录列表是只读的,因此不能在此创建备忘录。请选择其它的备忘录列表。"
+msgstr "选中的备忘录是只读的,因此不能在此创建备忘。请选择其它的备忘录。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create an _Appointment"
 msgstr "创建新约会(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a new event from the selected message"
 msgstr "从选择的信息中创建一个新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../plugins/mail-to-task/mail-to-task.c:1242
 msgid "Create a Mem_o"
 msgstr "创建一个备忘(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a new memo from the selected message"
 msgstr "用所选邮件创建新备忘"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1283
+#: ../plugins/mail-to-task/mail-to-task.c:1249
 msgid "Create a _Task"
 msgstr "创建一个任务(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1251
 msgid "Create a new task from the selected message"
 msgstr "用所选邮件创建新任务"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a _Meeting"
 msgstr "创建一个会议(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new meeting from the selected message"
 msgstr "用所选邮件创建新会议"
 
@@ -22371,18 +22933,20 @@ msgstr "用所选邮件创建新会议"
 msgid "Convert a mail message to a task."
 msgstr "转换一个邮件信息成为一个任务。"
 
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Outlook PST 导入"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Outlook 个人文件夹(.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "从 PST 文件中导入 Outlook 邮件"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Outlook 个人文件夹(.pst)"
+
 #: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "邮件(_M)"
@@ -22538,7 +23102,7 @@ msgid "_Username:"
 msgstr "用户名(_U):"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
-#: ../smime/gui/certificate-manager.c:774
+#: ../smime/gui/certificate-manager.c:776
 msgid "_Password:"
 msgstr "密码(_P):"
 
@@ -22571,10 +23135,6 @@ msgstr "编辑位置"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "UID"
-
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "描述列表"
@@ -22686,7 +23246,7 @@ msgstr "保存选中的日历到磁盘"
 
 #: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
-msgstr "保存选中的备忘录列表到磁盘"
+msgstr "保存选中的备忘录到磁盘"
 
 #: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
@@ -22713,39 +23273,39 @@ msgstr "另存为模板(_T)"
 msgid "Save as Template"
 msgstr "另存为模板"
 
-#: ../shell/e-shell.c:379
+#: ../shell/e-shell.c:380
 msgid "Preparing to go offline..."
 msgstr "正在准备离线..."
 
-#: ../shell/e-shell.c:408
+#: ../shell/e-shell.c:409
 msgid "Preparing to go online..."
 msgstr "正在准备上线..."
 
-#: ../shell/e-shell.c:519
+#: ../shell/e-shell.c:520
 msgid "Preparing to quit"
 msgstr "正在准备退出"
 
-#: ../shell/e-shell.c:525
+#: ../shell/e-shell.c:526
 msgid "Preparing to quit..."
 msgstr "正在准备退出..."
 
-#: ../shell/e-shell.c:1042
+#: ../shell/e-shell.c:1043
 msgid "Credentials are required to connect to the destination host."
 msgstr "需要凭证来连接到目的主机"
 
-#: ../shell/e-shell.c:1210 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../shell/e-shell.c:1221
+#: ../shell/e-shell.c:1222
 msgid "Quick _Reference"
 msgstr "速查表(_R)"
 
-#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "退出(_Q)"
 
@@ -22798,7 +23358,10 @@ msgstr ""
 "Funda Wang <fundawang0zheng gmail com>, 2010\n"
 "Aron Xu <aronxu gnome org>, 2010\n"
 "du baodao <centerpoint 139 com>, 2010\n"
-"Tong Hui <tonghuix gmail com>, 2014, 2015"
+"Tong Hui <tonghuix gmail com>, 2014, 2015, 2016\n"
+"Mingye Wang <arthur2e5 aosc xyz>, 2015\n"
+"Jeff Bai <jeffbai aosc xyz>, 2015, 2016\n"
+"Dingzhong Chen <wsxy162 gmail com>, 2015, 2016"
 
 #: ../shell/e-shell-utils.c:420
 msgid "Evolution Website"
@@ -22858,7 +23421,7 @@ msgstr "管理可用类别"
 
 #: ../shell/e-shell-window-actions.c:855
 msgid "_Quick Reference"
-msgstr "快速首选项(_Q)"
+msgstr "快速指南(_Q)"
 
 #: ../shell/e-shell-window-actions.c:857
 msgid "Show Evolution's shortcut keys"
@@ -23064,13 +23627,13 @@ msgstr "选择视图:%s"
 msgid "Delete view: %s"
 msgstr "删除视图:%s"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1748
 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
-#: ../shell/e-shell-window.c:555
+#: ../shell/e-shell-window.c:567
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "新建"
@@ -23284,7 +23847,7 @@ msgstr "无法连接至帐号“{0}”"
 
 #: ../shell/shell.error.xml.h:22
 msgid "Failed to connect memo list '{0}'"
-msgstr "无法连接至备忘录列表“{0}”"
+msgstr "无法连接至备忘录“{0}”"
 
 #: ../shell/shell.error.xml.h:23
 msgid "Failed to connect task list '{0}'"
@@ -23320,7 +23883,7 @@ msgstr "邮件帐号“{0}”的 SSL 证书不受信任。"
 
 #: ../shell/shell.error.xml.h:32
 msgid "SSL certificate for memo list '{0}' is not trusted."
-msgstr "备忘录列表“{0}”的 SSL 证书不受信任。"
+msgstr "备忘录“{0}”的 SSL 证书不受信任。"
 
 #: ../shell/shell.error.xml.h:33
 msgid "SSL certificate for task list '{0}' is not trusted."
@@ -23337,60 +23900,72 @@ msgstr ""
 "\n"
 "编辑信任设置:"
 
-#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "授予组织"
 
-#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "授予组织单元"
 
-#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "序列号"
 
-#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "颁发者"
 
-#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "颁发组织"
 
-#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "颁发组织单元"
 
-#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "已颁发"
 
-#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "到期时间"
 
-#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 指纹"
@@ -23400,7 +23975,7 @@ msgstr "MD5 指纹"
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#: ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:654
 msgid "Select a file to backup your key and certificate..."
 msgstr "选择一个文件来备份密钥和证书…"
 
@@ -23409,31 +23984,31 @@ msgstr "选择一个文件来备份密钥和证书…"
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:666
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-备份.p12"
 
-#: ../smime/gui/certificate-manager.c:730
+#: ../smime/gui/certificate-manager.c:732
 msgid "Backup Certificate"
 msgstr "备份证书"
 
 #. filename selection
-#: ../smime/gui/certificate-manager.c:744
+#: ../smime/gui/certificate-manager.c:746
 msgid "_File name:"
 msgstr "文件名(_F):"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../smime/gui/certificate-manager.c:749
+#: ../smime/gui/certificate-manager.c:751
 msgid "Please select a file..."
 msgstr "请选择一个文件…"
 
-#: ../smime/gui/certificate-manager.c:763
+#: ../smime/gui/certificate-manager.c:765
 msgid "_Include certificate chain in the backup"
 msgstr "在备份里包含证书链(_I)"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:769
+#: ../smime/gui/certificate-manager.c:771
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -23442,16 +24017,16 @@ msgstr ""
 "您在这里设置的证书备份密码保护您将要创建的备份文件。\n"
 "继续进行备份必须要你设置这个密码。"
 
-#: ../smime/gui/certificate-manager.c:788
+#: ../smime/gui/certificate-manager.c:790
 msgid "_Repeat Password:"
 msgstr "重复密码(_P):"
 
-#: ../smime/gui/certificate-manager.c:807
+#: ../smime/gui/certificate-manager.c:809
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
 #. To Translators: this text was copied from Firefox
-#: ../smime/gui/certificate-manager.c:815
+#: ../smime/gui/certificate-manager.c:817
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -23462,134 +24037,134 @@ msgstr ""
 "如果您忘记您的证书备份密码,你今后就不能还原备份。\n"
 "请将它记录在安全的地方。"
 
-#: ../smime/gui/certificate-manager.c:860
+#: ../smime/gui/certificate-manager.c:862
 msgid "No file name provided"
 msgstr "没有提供文件名"
 
-#: ../smime/gui/certificate-manager.c:864
+#: ../smime/gui/certificate-manager.c:866
 msgid "Failed to backup key and certificate"
 msgstr "备份密钥和证书失败"
 
-#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:955
 msgid "Select a certificate to import..."
 msgstr "选择要导入的证书..."
 
-#: ../smime/gui/certificate-manager.c:1003
+#: ../smime/gui/certificate-manager.c:1005
 msgid "Failed to import certificate"
 msgstr "导入证书失败"
 
-#: ../smime/gui/certificate-manager.c:1119
+#: ../smime/gui/certificate-manager.c:1121
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "使用时询问"
 
-#: ../smime/gui/certificate-manager.c:1121
+#: ../smime/gui/certificate-manager.c:1123
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "从不"
 
-#: ../smime/gui/certificate-manager.c:1123
+#: ../smime/gui/certificate-manager.c:1125
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "勉强的"
 
-#: ../smime/gui/certificate-manager.c:1125
+#: ../smime/gui/certificate-manager.c:1127
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "完整"
 
-#: ../smime/gui/certificate-manager.c:1127
+#: ../smime/gui/certificate-manager.c:1129
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "彻底的"
 
-#: ../smime/gui/certificate-manager.c:1129
+#: ../smime/gui/certificate-manager.c:1131
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "暂时的"
 
-#: ../smime/gui/certificate-manager.c:1335
+#: ../smime/gui/certificate-manager.c:1337
 msgid "Change certificate trust"
 msgstr "变更证书信任"
 
-#: ../smime/gui/certificate-manager.c:1347
+#: ../smime/gui/certificate-manager.c:1349
 #, c-format
 msgid "Change trust for the host '%s':"
-msgstr "对主机“%s”变更信任:"
+msgstr "变更信任对主机 \"%s\":"
 
-#: ../smime/gui/certificate-manager.c:1371
+#: ../smime/gui/certificate-manager.c:1373
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "使用时询问(_A)"
 
-#: ../smime/gui/certificate-manager.c:1372
+#: ../smime/gui/certificate-manager.c:1374
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "永不信任此证书(_N)"
 
-#: ../smime/gui/certificate-manager.c:1373
+#: ../smime/gui/certificate-manager.c:1375
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
-msgstr "暂时信任(仅此会话)(_T)"
+msgstr "暂时信任(仅此会话)(_T)"
 
-#: ../smime/gui/certificate-manager.c:1374
+#: ../smime/gui/certificate-manager.c:1376
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "勉强信任(_M)"
 
-#: ../smime/gui/certificate-manager.c:1375
+#: ../smime/gui/certificate-manager.c:1377
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "完全信任(_F)"
 
-#: ../smime/gui/certificate-manager.c:1376
+#: ../smime/gui/certificate-manager.c:1378
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "绝对信任(_U)"
 
-#: ../smime/gui/certificate-manager.c:1380
+#: ../smime/gui/certificate-manager.c:1382
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
 msgstr "在信任此网站之前,您应该先检查该证书及其策略和过程(若可用)。"
 
-#: ../smime/gui/certificate-manager.c:1395
+#: ../smime/gui/certificate-manager.c:1397
 msgid "_Display certificate"
 msgstr "查看证书(_D)"
 
-#: ../smime/gui/certificate-manager.c:1600
+#: ../smime/gui/certificate-manager.c:1602
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "您拥有证明这些邮件服务器的证书:"
 
-#: ../smime/gui/certificate-manager.c:1631
+#: ../smime/gui/certificate-manager.c:1633
 msgid "Host name"
 msgstr "主机名称"
 
-#: ../smime/gui/certificate-manager.c:1633
+#: ../smime/gui/certificate-manager.c:1635
 msgid "Issuer"
 msgstr "发行者"
 
-#: ../smime/gui/certificate-manager.c:1634
+#: ../smime/gui/certificate-manager.c:1636
 msgid "Fingerprint"
 msgstr "指纹"
 
-#: ../smime/gui/certificate-manager.c:1635
+#: ../smime/gui/certificate-manager.c:1637
 msgid "Trust"
 msgstr "信任"
 
-#: ../smime/gui/certificate-manager.c:1656
+#: ../smime/gui/certificate-manager.c:1658
 msgid "_Edit Trust"
 msgstr "编辑信任(_E)"
 
-#: ../smime/gui/certificate-manager.c:1975
+#: ../smime/gui/certificate-manager.c:2112
 msgid "All PKCS12 files"
 msgstr "全部 PKCS12 文件"
 
-#: ../smime/gui/certificate-manager.c:1992
+#: ../smime/gui/certificate-manager.c:2129
 msgid "All email certificate files"
 msgstr "所有电子邮件证书文件"
 
-#: ../smime/gui/certificate-manager.c:2009
+#: ../smime/gui/certificate-manager.c:2146
 msgid "All CA certificate files"
 msgstr "全部颁证机构文件"
 
@@ -23749,7 +24324,7 @@ msgstr "无法设置密码的完整性,错误码:%i"
 #: ../smime/lib/e-pkcs12.c:345
 #, c-format
 msgid "Unable to create safe bag, err_code: %i"
-msgstr "创建安全袋(safe bag)失败,错误码 %i"
+msgstr "创建安全袋(safe bag)失败,错误码 %i"
 
 #: ../smime/lib/e-pkcs12.c:363
 #, c-format
@@ -23837,707 +24412,584 @@ msgstr "到期日期(_D)"
 msgid "With _Status"
 msgstr "状态(_S)"
 
-#~ msgid "Would you like to send this memo to participants?"
-#~ msgstr "您是否想要给出席者发送此备忘?"
-
-#~ msgid ""
-#~ "Email invitations will be sent to all participants and allow them to "
-#~ "accept this memo."
-#~ msgstr "将会向全部出席者发送电子邮件邀请,并使他们可以接受此备忘。"
-
-#~ msgid "Would you like to send updated memo information to participants?"
-#~ msgstr "您是否想要给出席者发送更新的备忘?"
-
-#~ msgid ""
-#~ "Sending updated information allows other participants to keep their memo "
-#~ "lists up to date."
-#~ msgstr "发送更新的信息允许其他出席者使他们的备忘录保持最新。"
+#~ msgid "Can't open .csv file"
+#~ msgstr "无法打开 .csv 文件"
 
-#~ msgid "Failed to add timezone to '{0}'"
-#~ msgstr "向“{0}”添加时区失败"
+#~ msgid "Can't open .ldif file"
+#~ msgstr "无法打开 .ldif 文件"
 
-#~ msgid "Failed to save attachments"
-#~ msgstr "保存附件失败"
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "已取消"
 
-#~ msgid "Failed to get an event from the calendar '{0}'"
-#~ msgstr "无法从日历“{0}”中获取事件"
+#~ msgid "An error occurred while saving to your Templates folder."
+#~ msgstr "保存到您的模板文件夹时出现了一个错误。"
 
-#~ msgid "Failed to get a task from the task list '{0}'"
-#~ msgstr "无法从任务列表“{0}”中获取任务"
+#~ msgid "Name of the editor to prefer in the message composer"
+#~ msgstr "在信息预览中首选的编辑器名称"
 
-#~ msgid "Failed to get a memo from the memo list '{0}'"
-#~ msgstr "无法从留言列表“{0}”中获取留言"
+#~ msgid ""
+#~ "If the name doesn't correspond to any known editor, then the built-in "
+#~ "WebKit editor is used."
+#~ msgstr "如果没有在已知的编辑器中找到对应的名字,则使用内部 WebKit 编辑器。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Play a sound"
-#~ msgstr "播放声音"
+#~ msgid "Whether to obey Content-Disposition:inline message header hint"
+#~ msgstr "是否遵从 Content-Disposition:inline 消息标头提示"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Pop up an alert"
-#~ msgstr "弹出警报"
+#~ msgid ""
+#~ "Set to 'false' to block automatic display of attachments with Content-"
+#~ "Disposition: inline."
+#~ msgstr "设置为“false”可以屏蔽 Content-Disposition: inline 附件的自动显示"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Send an email"
-#~ msgstr "发送邮件"
+#~ msgid "Show Attachment Bar"
+#~ msgstr "显示附件栏"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Run a program"
-#~ msgstr "运行程序"
+#~ msgid ""
+#~ "Show Attachment Bar below the message preview pane when the message has "
+#~ "attachments."
+#~ msgstr "当消息含有附件时在信息预览面板下面显示附件栏。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Unknown action to be performed"
-#~ msgstr "即将进行一项未知的操作"
+#~ msgid "Compression format used by autoar"
+#~ msgstr "autoar 使用的压缩格式"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s %s before the start"
-#~ msgstr "开始前 %s%s"
+#~ msgid ""
+#~ "Compression format used when compressing attached directories with autoar."
+#~ msgstr "使用 autoar 压缩附件的目录时使用的压缩格式。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s %s after the start"
-#~ msgstr "开始后 %s %s"
+#~ msgid "Compression filter used by autoar"
+#~ msgstr "autoar 使用的压缩过滤器"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s at the start"
-#~ msgstr "开始时 %s"
+#~ msgid ""
+#~ "Compression filter used when compressing attached directories with autoar."
+#~ msgstr "使用 autoar 压缩附件的目录时使用的压缩过滤器。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s %s before the end"
-#~ msgstr "结束前 %s%s"
+#~ msgid "Enable special WebKit developer features"
+#~ msgstr "启用特殊 WebKit 开发者特性"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s %s after the end"
-#~ msgstr "结束后 %s %s"
+#~ msgid "Any change of this option requires restart of Evolution."
+#~ msgstr "此选项的任何变动都需要重启 Evolution。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s at the end"
-#~ msgstr "结束时 %s"
+#~ msgid "This message is signed, but the public key is not in your keyring"
+#~ msgstr "这封信已签名,但是没有相应的公钥。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s at %s"
-#~ msgstr "%s 在 %s"
+#~ 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 of messages from this person, you should obtain the public "
+#~ "key through a trusted method and add it to your keyring. Until then, "
+#~ "there is no guarantee that this message truly came from that person and "
+#~ "that it arrived unaltered."
+#~ msgstr ""
+#~ "此消息已经数字签名,但对应的公钥并不在您的密钥环中。如果您想能够验证此消息"
+#~ "的发送者,您需要通过可信的渠道获取此公钥并加入到您的密钥环中。在此之前,无"
+#~ "法保证此消息是真的从这个发送者发送并在传输过程中没有更改。"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "%s for an unknown trigger type"
-#~ msgstr "对于未知触发类型,%s"
+#~ msgid "_Reset sort"
+#~ msgstr "重置顺序(_R)"
 
-#~ msgid "Event's time is in the past"
-#~ msgstr "事件来自过去的时间点"
+#~ msgid "Cannot get URI '%s', do not know how to download it."
+#~ msgstr "不能获取 URI “%s”,不知道如何下载。"
 
-#~ msgid ""
-#~ "Event cannot be edited, because the selected calendar could not be opened"
-#~ msgstr "任务不能被编辑,因为选择的日历无法被打开"
+#~ msgid "Cancelled."
+#~ msgstr "已取消"
 
-#~ msgid "Start date is not a valid date"
-#~ msgstr "起始日期无效"
+#~ msgid "_Templates Folder:"
+#~ msgstr "模板文件夹(_T):"
 
-#~ msgid "Start time is not a valid time"
-#~ msgstr "起始时间无效"
+#~ msgid "Choose a folder to use for template messages."
+#~ msgstr "选择消息模板的文件夹。"
 
-#~ msgid "End date is not a valid date"
-#~ msgstr "结束日期无效"
+#~ msgid "Full Name should not be empty"
+#~ msgstr "全名不能为空"
 
-#~ msgid "End time is not a valid time"
-#~ msgstr "结束时间无效"
+#~ msgid "Really unsubscribe folder \"{0}\"?"
+#~ msgstr "真要退订文件夹“{0}”?"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "_Start time:"
-#~ msgstr "开始时间(_S):"
+#~ msgid ""
+#~ "If you unsubscribe the folder, it might not be visible in the Evolution, "
+#~ "while still being available on the server. You can re-subscribe in Folder-"
+#~ ">Subscriptions... menu."
+#~ msgstr ""
+#~ "如果您退订此文件夹,将不能再在 Evolution 里看到,但仍可以在服务器上使用。"
+#~ "可以通过菜单“文件夹 -> 订阅…”重新订阅。"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "_End time:"
-#~ msgstr "结束时间(_E):"
+#~ msgid "Do _Not Unsubscribe"
+#~ msgstr "不要退订(_N)"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "All da_y event"
-#~ msgstr "所有当日事件"
+#~ msgid "Choose an Address Book"
+#~ msgstr "选择一个地址簿"
 
-#~ msgctxt "ECompEditorPage"
-#~ msgid "General"
-#~ msgstr "常规"
+#~ msgid "Find Address Books"
+#~ msgstr "查找地址簿"
 
-#~ msgctxt "ECompEditorPage"
-#~ msgid "Reminders"
-#~ msgstr "提醒"
+#~ msgid "_Forget password"
+#~ msgstr "忘记密码(_F)"
 
-#~ msgctxt "ECompEditorPage"
-#~ msgid "Recurrence"
-#~ msgstr "再现"
+#~ msgctxt "NetworkMonitor"
+#~ msgid "base"
+#~ msgstr "base"
 
-#~ msgctxt "ECompEditorPage"
-#~ msgid "Attachments"
-#~ msgstr "附件"
+#~ msgctxt "NetworkMonitor"
+#~ msgid "netlink"
+#~ msgstr "netlink"
 
-#~ msgctxt "ECompEditorPage"
-#~ msgid "Schedule"
-#~ msgstr "日程"
+#~ msgctxt "NetworkMonitor"
+#~ msgid "networkmanager"
+#~ msgstr "networkmanager"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Sta_rt date:"
-#~ msgstr "起始日期:"
+#~ msgctxt "NetworkMonitor"
+#~ msgid "Method to detect _online state:"
+#~ msgstr "检测在线状态的方法(_O):"
 
-#~ msgid "Assigned Memo - %s"
-#~ msgstr "已分配留言 - %s"
+#~ msgctxt "NetworkMonitor"
+#~ msgid "Default"
+#~ msgstr "默认"
 
-#~ msgid ""
-#~ "Some attachments are still being downloaded. Please wait until the "
-#~ "download is finished."
-#~ msgstr "仍在下载一部分附件。请等待下载完成。"
+#~ msgctxt "NetworkMonitor"
+#~ msgid "Always Online"
+#~ msgstr "永远在线"
 
-#~ msgid "Attachment '%s' cannot be found, remove it from the list, please"
-#~ msgstr "找不到附件“%s”,请将其从列表移除"
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "显示附件栏(_A)"
 
 #~ msgid ""
-#~ "Attachment '%s' doesn't have valid URI, remove it from the list, please"
-#~ msgstr "附件“%s”不具有有效的 URI,请将其从列表移除"
+#~ "Show Attachment Bar below the message preview pane when the message has "
+#~ "attachments"
+#~ msgstr "当消息含有附件时在信息预览面板下面显示附件栏。"
 
-#~ msgid "_Attachments"
-#~ msgstr "附件(_A)"
+#~ msgid "Saving message template"
+#~ msgstr "正在保存消息模板"
 
-#~ msgid "Show attachments"
-#~ msgstr "显示附件"
+#~ msgid "Edit Reminder"
+#~ msgstr "编辑提醒"
 
-#~ msgid "Cannot find attendee '%s' in the list of attendees"
-#~ msgstr "无法从参与者列表中找到参与者 '%s'"
+#~ msgid "Pop up an alert"
+#~ msgstr "弹出警告"
 
-#~ msgid "Not enough rights to delete attendee '%s'"
-#~ msgstr "没有足够权力来删除参与者 '%s'"
+#~ msgid "Play a sound"
+#~ msgstr "播放声音"
 
-#~ msgid "Failed to delete selected attendee"
-#~ msgid_plural "Failed to delete selected attendees"
-#~ msgstr[0] "删除选中参与者失败"
+#~ msgid "Run a program"
+#~ msgstr "运进程序"
 
-#~ msgid "A_ttendees"
-#~ msgstr "参与者(_T)"
+#~ msgid "Send an email"
+#~ msgstr "发送电子邮件"
 
-#~ msgid "Toggles whether the Attendees are displayed"
-#~ msgstr "切换是否显示与会者"
+#~ msgid "before"
+#~ msgstr "之前"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Atte_ndees..."
-#~ msgstr "出席者(_N)..."
+#~ msgid "after"
+#~ msgstr "之后"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "first"
-#~ msgstr "第一"
+#~ msgid "start of appointment"
+#~ msgstr "约会开始"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "second"
-#~ msgstr "第二"
+#~ msgid "end of appointment"
+#~ msgstr "约会结束"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "third"
-#~ msgstr "第三"
+#~ msgid "minute(s)"
+#~ msgstr "分钟"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "fourth"
-#~ msgstr "第四"
+#~ msgid "hour(s)"
+#~ msgstr "小时"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "fifth"
-#~ msgstr "第五"
+#~ msgid "day(s)"
+#~ msgstr "天"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "last"
-#~ msgstr "最后"
+#~ msgid "Add Reminder"
+#~ msgstr "添加提醒"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Other Date"
-#~ msgstr "其他日期"
+#~ msgid "Reminder"
+#~ msgstr "提醒"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "1st to 10th"
-#~ msgstr "上旬"
+#~ msgid "Repeat"
+#~ msgstr "重复"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "11th to 20th"
-#~ msgstr "中旬"
+#~ msgid "_Repeat the reminder"
+#~ msgstr "重复提醒(_R)"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "21st to 31st"
-#~ msgstr "下旬"
+#~ msgid "extra times every"
+#~ msgstr "每个额外时间"
 
-# DIRTY HACK: 配上前面的就是上旬,中旬,下旬
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "day"
-#~ msgstr "天"
+#~ msgid "Custom _message"
+#~ msgstr "自定义信息(_M)"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Monday"
-#~ msgstr "星期一"
+#~ msgid "Mes_sage:"
+#~ msgstr "信息(_S):"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Tuesday"
-#~ msgstr "星期二"
+#~ msgid "Custom reminder sound"
+#~ msgstr "自定义提醒声音"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Wednesday"
-#~ msgstr "星期三"
+#~ msgid "_Sound:"
+#~ msgstr "声音(_S):"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Thursday"
-#~ msgstr "星期四"
+#~ msgid "Select A File"
+#~ msgstr "选择一个文件"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Friday"
-#~ msgstr "星期五"
+#~ msgid "Send To:"
+#~ msgstr "发送至:"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Saturday"
-#~ msgstr "星期六"
+#~ msgid "Action/Trigger"
+#~ msgstr "动作/触发器"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Sunday"
-#~ msgstr "星期日"
+#~ msgid "This event has been deleted."
+#~ msgstr "此事件已经被删除。"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "on the"
-#~ msgstr "在"
+#~ msgid "This task has been deleted."
+#~ msgstr "此任务已经被删除。"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "occurrences"
-#~ msgstr "发生"
+#~ msgid "This memo has been deleted."
+#~ msgstr "此备注已经被删除。"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "This appointment rec_urs"
-#~ msgstr "会议再现周期(_U)"
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr "%s  您已经做了修改。放弃这些修改并关闭编辑器吗?"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "This task rec_urs"
-#~ msgstr "任务再现周期(_U)"
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  您还没有进行修改,关闭编辑器吗?"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "This memo rec_urs"
-#~ msgstr "备忘再现周期(_U)"
+#~ msgid "This event has been changed."
+#~ msgstr "此事件已经被更改。"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "This component rec_urs"
-#~ msgstr "组件再现周期(_U)"
+#~ msgid "This task has been changed."
+#~ msgstr "此任务已经被更改。"
 
-#~ msgid "Recurrence exception date is invalid"
-#~ msgstr "重复例外日期无效"
+#~ msgid "This memo has been changed."
+#~ msgstr "此备注已经被更改。"
 
-#~ msgid "End time of the recurrence is before the start"
-#~ msgstr "再现的结束时间早于开始时间"
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗?"
 
-#~ msgid "R_ecurrence"
-#~ msgstr "重复"
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  您还没有进行修改,更新编辑器吗?"
 
-#~ msgid "Set or unset recurrence"
-#~ msgstr "设置或取消事件重复"
+#, fuzzy
+#~ msgid "Could not save attachments"
+#~ msgstr "无法保存附件"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "Every"
-#~ msgstr "每"
+#~ msgid "Could not update object"
+#~ msgstr "无法更新对象"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "day(s)"
-#~ msgstr "日"
+#~ msgid "Edit Appointment"
+#~ msgstr "编辑约会"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "week(s)"
-#~ msgstr "周"
+#~ msgid "Keep original item?"
+#~ msgstr "保留原始条目?"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "month(s)"
-#~ msgstr "月"
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "无法与服务器同步"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "year(s)"
-#~ msgstr "年"
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr "如果更新到达的话,对此项目的更改将被丢弃"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "for"
-#~ msgstr "共"
+#~ msgid "Unable to use current version!"
+#~ msgstr "无法使用当前版本!"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "until"
-#~ msgstr "直到"
+#~ msgid "Validation error: %s"
+#~ msgstr "校验错误:%s"
 
-#~ msgctxt "ECompEditorPageRecur"
-#~ msgid "forever"
-#~ msgstr "永远"
+#~ msgid "Enter Delegate"
+#~ msgstr "输入代表"
 
-#~ msgid "Send To"
-#~ msgstr "发送到"
+#~ msgid "Delegate To:"
+#~ msgstr "授权给:"
 
-#~ msgid "Set or unset reminders"
-#~ msgstr "设置或取消提醒"
+#~ msgid "Contacts..."
+#~ msgstr "联系人..."
 
-#~ msgid "%d day before"
-#~ msgid_plural "%d days before"
-#~ msgstr[0] "%d 天前"
+#~ msgid "Set or unset reminders for this event"
+#~ msgstr "设置或取消此活动的提醒"
 
-#~ msgid "%d hour before"
-#~ msgid_plural "%d hours before"
-#~ msgstr[0] "%d 时前"
+#~ msgid "_Recurrence"
+#~ msgstr "再现(_R)"
 
-#~ msgid "%d minute before"
-#~ msgid_plural "%d minutes before"
-#~ msgstr[0] "%d 分前"
+#~ msgid "Make this a recurring event"
+#~ msgstr "将此事件标为重复发生"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "15 minutes before"
-#~ msgstr "一刻钟前"
+#~ msgid "Insert advanced send options"
+#~ msgstr "插入高级发送选项"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "1 hour before"
-#~ msgstr "一小时前"
+#~ msgid "_Free/Busy"
+#~ msgstr "忙/闲(_F)"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "1 day before"
-#~ msgstr "一天前"
+#~ msgid "Print this event"
+#~ msgstr "打印此事件"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Custom"
-#~ msgstr "自定义"
+#~ msgid "Event's start time is in the past"
+#~ msgstr "活动开始时间在过去"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "minute(s)"
-#~ msgstr "分"
+#~ msgid "This event has reminders"
+#~ msgstr "此事件有提醒"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "hour(s)"
-#~ msgstr "时"
+#~ msgid "Event with no start date"
+#~ msgstr "没有开始日期的事件"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "day(s)"
-#~ msgstr "日"
+#~ msgid "Event with no end date"
+#~ msgstr "没有结束日期的事件"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "before"
-#~ msgstr "之前"
+#~ msgid "Start date is wrong"
+#~ msgstr "开始日期有错"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "after"
-#~ msgstr "后"
+#~ msgid "End date is wrong"
+#~ msgstr "结束日期有错"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "start"
-#~ msgstr "开始"
+#~ msgid "Start time is wrong"
+#~ msgstr "开始时间有错"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "end"
-#~ msgstr "结束"
+#~ msgid "End time is wrong"
+#~ msgstr "结束时间有错"
 
-#~ msgid "Re_peat the reminder"
-#~ msgstr "重复提醒"
+#~ msgid "_Delegatees"
+#~ msgstr "代理人(_D)"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "extra times every"
-#~ msgstr "重复一次,每隔"
+#~ msgid "Atte_ndees"
+#~ msgstr "出席者(_N)"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "minutes"
-#~ msgstr "分"
+#~ msgid "%d day before appointment"
+#~ msgid_plural "%d days before appointment"
+#~ msgstr[0] "约会的 %d 天前"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "hours"
-#~ msgstr "时"
+#~ msgid "%d hour before appointment"
+#~ msgid_plural "%d hours before appointment"
+#~ msgstr[0] "约会的 %d 小时前"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "days"
-#~ msgstr "天"
+#~ msgid "%d minute before appointment"
+#~ msgid_plural "%d minutes before appointment"
+#~ msgstr[0] "约会的 %d 分钟前"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Custom _message"
-#~ msgstr "自定义消息"
+#~ msgid "Custom"
+#~ msgstr "自定义"
 
-#~ msgctxt "cal-reminders"
-#~ msgid "Custom reminder _sound"
-#~ msgstr "自定义提醒声音"
+#~ msgctxt "eventpage"
+#~ msgid "for"
+#~ msgstr "持续时间"
 
-#~ msgid "Select a sound file"
-#~ msgstr "选择一个音频文件"
+#~ msgctxt "eventpage"
+#~ msgid "until"
+#~ msgstr "直到"
 
-#~ msgid "_Send To:"
-#~ msgstr "发送到:(_S)"
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "约会前 15 分钟"
 
-#~ msgid "_Schedule"
-#~ msgstr "日程(_S)"
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "约会前 1 小时"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "_Summary:"
-#~ msgstr "概要:(_S)"
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "约会前 1 天"
 
-#~ msgctxt "ECompEditor"
 #~ msgid "_Location:"
 #~ msgstr "位置(_L):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "_Categories..."
-#~ msgstr "类别...(_C)"
-
-#~ msgctxt "ECompEditor"
-#~ msgid "_Description:"
-#~ msgstr "描述(_D):"
-
-#~ msgctxt "ECompEditor"
-#~ msgid "_Web page:"
-#~ msgstr "网页:(_W)"
+#~ msgid "_Time:"
+#~ msgstr "时间(_T):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "D_ue date:"
-#~ msgstr "截止日期:(_U)"
-
-#~ msgctxt "ECompEditor"
-#~ msgid "Date _completed:"
-#~ msgstr "完成日期:(_C)"
-
-#~ msgctxt "ECompEditor"
-#~ msgid "Public"
-#~ msgstr "公开"
+#~ msgid "_Summary:"
+#~ msgstr "概要(_S):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Private"
-#~ msgstr "保密"
+#~ msgid "Event Description"
+#~ msgstr "事件描述"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Confidential"
-#~ msgstr "机密"
+#~ msgid "Print this memo"
+#~ msgstr "打印此备忘录"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "C_lassification:"
-#~ msgstr "分类:(_L)"
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "备忘录开始时间在过去"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Not Started"
-#~ msgstr "未开始"
+#~ msgid "Organi_zer:"
+#~ msgstr "组织者(_Z):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "In Progress"
-#~ msgstr "进行中"
+#~ msgid "T_o:"
+#~ msgstr "到(_O):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Completed"
-#~ msgstr "已完成"
-
-#~ msgctxt "ECompEditor"
-#~ msgid "Canceled"
-#~ msgstr "已取消"
-
-#~ msgctxt "ECompEditor"
-#~ msgid "_Status:"
-#~ msgstr "状态:(_S)"
+#~ msgid "Sta_rt date:"
+#~ msgstr "开始日期(_R):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Undefined"
-#~ msgstr "未定义"
+#~ msgid "Su_mmary:"
+#~ msgstr "概要(_M):"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "High"
-#~ msgstr "高"
+#~ msgid "Recurrence date is invalid"
+#~ msgstr "再现日期无效"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Normal"
-#~ msgstr "中"
+#~ msgid "End time of the recurrence was before event's start"
+#~ msgstr "重复活动条目的结束时间小于开始时间"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Low"
-#~ msgstr "低"
+#~ msgid "first"
+#~ msgstr "第一个"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Priorit_y:"
-#~ msgstr "优先级:(_Y)"
+#~ msgid "second"
+#~ msgstr "第二"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Percent complete:"
-#~ msgstr "完成百分比:"
+#~ msgid "third"
+#~ msgstr "第三个"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Time _zone:"
-#~ msgstr "时区(_Z):"
+#~ msgid "fourth"
+#~ msgstr "第四个"
 
-#~ msgctxt "ECompEditor"
-#~ msgid "Show time as _busy"
-#~ msgstr "将时间显示为忙(_B)"
+#~ msgid "fifth"
+#~ msgstr "第五个"
 
-#~ msgid ""
-#~ "Task cannot be edited, because the selected task list could not be opened"
-#~ msgstr "任务不能被编辑,因为选择的任务列表无法被打开"
+#~ msgid "last"
+#~ msgstr "最后一个"
 
-#~ msgid "Due date is not a valid date"
-#~ msgstr "截止日期无效"
+#~ msgid "Other Date"
+#~ msgstr "其它日期"
 
-#~ msgid "Completed date is not a valid date"
-#~ msgstr "完成日期无效"
+#~ msgid "1st to 10th"
+#~ msgstr "上旬"
 
-#~ msgid "Completed date cannot be in the future"
-#~ msgstr "完成日期不能在将来"
+#~ msgid "11th to 20th"
+#~ msgstr "中旬"
 
-#~ msgid "Sending notifications to attendees..."
-#~ msgstr "正向参与者发送通知…"
+#~ msgid "21st to 31st"
+#~ msgstr "下旬"
 
-#~ msgid "Saving changes..."
-#~ msgstr "正保存更改…"
+#~ msgid "on the"
+#~ msgstr "在"
 
-#~ msgid "Cre_ate new calendar"
-#~ msgstr "创建新日历(_A)"
+#~ msgid "occurrences"
+#~ msgstr "循环"
 
-#~ msgid "Cre_ate new task list"
-#~ msgstr "创建新任务列表(_A)"
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "无法获得要修改的选中项。"
 
-#~ msgid "GNOME Calendar"
-#~ msgstr "GNOME 日历"
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "无法获得要删除的选中项。"
 
-#~ msgid "Wrap quoted text in replies"
-#~ msgstr "为回复中引用的文本换行"
+#~ msgid "Date/Time"
+#~ msgstr "日期/时间"
 
-#~ msgid "If set to 'true' quoted text in replies will be wrapped."
-#~ msgstr "如设置为 true,则将为回复中引用的文本换行"
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "天"
 
-#~ msgid "Show notification about missing remote content"
-#~ msgstr "显示关于远程内容缺失的通知"
+#~ msgctxt "recurrpage"
+#~ msgid "week(s)"
+#~ msgstr "周"
 
-#~ 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 show a notification about it on top of the preview panel."
-#~ msgstr ""
-#~ "当信息预览显示了一封需要下载远程内容的邮件而从此用户或站点下载又被禁止时,"
-#~ "在预览面板顶层显示相应通知。"
+#~ msgctxt "recurrpage"
+#~ msgid "month(s)"
+#~ msgstr "月"
 
-#~ msgid "Show junk messages in the message-list"
-#~ msgstr "在消息列表中显示垃圾信息"
+#~ msgctxt "recurrpage"
+#~ msgid "year(s)"
+#~ msgstr "年"
 
-#~ msgid "Show junk messages (with a red strike-through) in the message-list."
-#~ msgstr "在信息列表中显示垃圾信息(带有红色删除线)。"
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "持续时间"
 
-#~ msgid "Show"
-#~ msgstr "显示"
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "直到"
 
-#~ msgid "Group name"
-#~ msgstr "组名"
+#~ msgctxt "recurrpage"
+#~ msgid "forever"
+#~ msgstr "永远"
 
-#~ msgid "_Show"
-#~ msgstr "显示(_S)"
+#~ msgid "This appointment rec_urs"
+#~ msgstr "此约会重现(_U)"
 
-#~ msgid "Manage Groups"
-#~ msgstr "管理群组"
+#~ msgid "Every"
+#~ msgstr "每"
 
-#~ msgid "Available Groups:"
-#~ msgstr "可用组:"
+#~ msgid "_Send Options"
+#~ msgstr "发送选项(_S)"
 
-#~ msgid "OAuth2 Google"
-#~ msgstr "OAuth2 Google"
+#~ msgid "Print this task"
+#~ msgstr "打印此任务"
 
 #~ msgid ""
-#~ "This option will use an OAuth 2.0 access token to connect to the Google "
-#~ "server"
-#~ msgstr "该选项将使用 OAuth 2.0 访问令牌连接到谷歌服务器。"
-
-#~ msgid "Querying authentication types..."
-#~ msgstr "正在查询认证类型"
-
-#~ msgctxt "ReplyForward"
-#~ msgid "Use global setting"
-#~ msgstr "使用全局设置"
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr "任务无法编辑,因为选定的任务列表不支持分配的任务"
 
-#~ msgid "Re_ply style:"
-#~ msgstr "回复风格:(_P)"
+#~ msgid "Due date is wrong"
+#~ msgstr "到期日期错误"
 
-#~ msgid "Message Note"
-#~ msgstr "消息附带的便笺"
+#~ msgid "Completed date is wrong"
+#~ msgstr "完成日期有错"
 
-#~ msgid "Cannot find message in its folder summary"
-#~ msgstr "未在所在文件夹的摘要中找到邮件"
-
-#~ msgid "Storing changes..."
-#~ msgstr "存储更改..."
-
-#~ msgid "Edit Message Note"
-#~ msgstr "编辑消息附带的便笺"
-
-#~ msgid "Retrieving message..."
-#~ msgstr "正在收取信息..."
-
-#~ msgid "Deleting message note..."
-#~ msgstr "删除消息附带的便笺"
-
-#~ msgid "_Add note..."
-#~ msgstr "添加便笺...(_A)"
-
-#~ msgid "Add a note for the selected message"
-#~ msgstr "为选中消息添加便笺"
-
-#~ msgid "Delete no_te"
-#~ msgstr "删除便笺(_T)"
-
-#~ msgid "Delete the note for the selected message"
-#~ msgstr "为选中消息删除便笺"
-
-#~ msgid "_Edit note..."
-#~ msgstr "编辑便笺...(_E)"
+#~ msgid "D_ue date:"
+#~ msgstr "到期日期(_U):"
 
-#~ msgid "Edit a note for the selected message"
-#~ msgstr "编辑选中消息的便笺"
+#~ msgid "Time zone:"
+#~ msgstr "时区:"
 
-#~ msgid "Do not show this message again"
-#~ msgstr "不再显示该信息"
+#~ msgid "_Status:"
+#~ msgstr "状态(_S):"
 
-#~ msgid "Waiting for attachments to load..."
-#~ msgstr "正在等待附件载入..."
+#~ msgid "Date _completed:"
+#~ msgstr "完成日期(_C):"
 
-#~ msgid "is greater than or equal to"
-#~ msgstr "大于或等于"
+#~ msgid "_Percent complete:"
+#~ msgstr "完成百分比(_P):"
 
-#~ msgid "is less than or equal to"
-#~ msgstr "小于或等于"
+#~ msgid "Priorit_y:"
+#~ msgstr "优先级(_Y):"
 
-#~ msgid "_Wrap quoted text in replies"
-#~ msgstr "为回复中引用的文本换行(_W)"
+#~ msgid "C_lassification:"
+#~ msgstr "分类(_L):"
 
-#~ msgid "Notify about _missing remote content in the message preview"
-#~ msgstr "在邮件预览中显示关于远程内容缺失的通知(_M)"
+#~ msgid "_Web Page:"
+#~ msgstr "网页(_W):"
 
-#~ msgid "This message note has been changed, but has not been saved."
-#~ msgstr "邮件笔记已更改,但尚未保存。"
+#~ msgid "Unknown action to be performed"
+#~ msgstr "执行未知的动作"
 
-#~ msgid "Failed to delete message note in folder '{0}'"
-#~ msgstr "未能删除文件夹“{0}”中的邮件笔记"
+#~ msgid "%s %s before the start of the appointment"
+#~ msgstr "在约会开始之前 %s %s"
 
-#~ msgid "Failed to store message note in folder '{0}'"
-#~ msgstr "未能存储文件夹“{0}”中的邮件笔记"
+#~ msgid "%s %s after the start of the appointment"
+#~ msgstr "在约会开始之后 %s %s"
 
-#~ msgid "_Manage Address Book groups..."
-#~ msgstr "管理通信录组...(_M)"
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "在约会开始时 %s"
 
-#~ msgid "Manage task list groups order and visibility"
-#~ msgstr "管理任务列表排序及可见性"
+#~ msgid "%s %s before the end of the appointment"
+#~ msgstr "在约会结束之前 %s %s"
 
-#~ msgid "_Manage groups..."
-#~ msgstr "管理群组...(_M)"
+#~ msgid "%s %s after the end of the appointment"
+#~ msgstr "在约会结束之后 %s %s"
 
-#~ msgid "_Manage Calendar groups..."
-#~ msgstr "管理日历组...(_M)"
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "在约会结束时 %s"
 
-#~ msgid "Manage Calendar groups order and visibility"
-#~ msgstr "管理日历组排序及可见性"
+#~ msgid "%s at %s"
+#~ msgstr "在 %2$s 时 %1$s"
 
-#~ msgid "_Manage Memo List groups..."
-#~ msgstr "管理留言列表组...(_M)"
+#~ msgid "%s for an unknown trigger type"
+#~ msgstr "%s 为未知触发类型"
 
-#~ msgid "Manage Memo List groups order and visibility"
-#~ msgstr "管理备忘录排序及可见性"
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnome 日历"
 
-#~ msgid "_Manage Task List groups..."
-#~ msgstr "管理任务列表组...(_M)"
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "下载进行中。您想要发送邮件吗?"
 
-#~ msgid "Show _Junk Messages"
-#~ msgstr "显示垃圾信息(_J)"
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr "附件正在下载中。发送邮件将使得邮件发送时无法包含后续的附件"
 
-#~ msgid "Show junk messages with a red line through them"
-#~ msgstr "使用红色删除线标记垃圾消息"
+#~ msgid "SSL"
+#~ msgstr "SSL"
 
-#~ msgid "Messages with Notes"
-#~ msgstr "带有便笺的消息"
+#~ msgid "Use Unicode characters for smile_ys"
+#~ msgstr "使用 Unicode 字符作表情(_Y)"
 
+#, fuzzy
 #~ msgctxt "CamelTrust"
 #~ msgid "Marginal"
-#~ msgstr "勉强"
+#~ msgstr "轻微"
 
+#, fuzzy
 #~ msgctxt "CamelTrust"
 #~ msgid "Ultimate"
-#~ msgstr "完全"
+#~ msgstr "极限"
 
 #~ msgid ""
 #~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
@@ -25635,8 +26087,9 @@ msgstr "状态(_S)"
 #~ msgid "_Type:"
 #~ msgstr "类型(_T):"
 
+#, fuzzy
 #~ msgid "Sh_ow reminder notifications"
-#~ msgstr "显示提醒通知(_O)"
+#~ msgstr "在通知托盘中显示提醒"
 
 #~ msgid "You are acting on behalf of %s"
 #~ msgstr "您正在以 %s 的身份行动"
@@ -26452,9 +26905,6 @@ msgstr "状态(_S)"
 #~ "服务器返回未预料的数据。\n"
 #~ "%d - %s"
 
-#~ msgid "Failed to parse server response."
-#~ msgstr "处理服务器响应失败"
-
 #~ msgid "Events"
 #~ msgstr "事件"
 
@@ -26521,9 +26971,6 @@ msgstr "状态(_S)"
 #~ msgid "Force read _only"
 #~ msgstr "强制只读(_O)"
 
-#~ msgid "Local Calendars"
-#~ msgstr "载入日历"
-
 #~ msgid "Add local calendars to Evolution."
 #~ msgstr "添加本地日历到 Evolution。"
 
@@ -26826,9 +27273,6 @@ msgstr "状态(_S)"
 #~ msgid "URL that provides proxy configuration values."
 #~ msgstr "提供代理配置值的 URL。"
 
-#~ msgid "_Forget Passwords"
-#~ msgstr "丢弃密码(_F)"
-
 #~ msgid "Forget all remembered passwords"
 #~ msgstr "丢弃所有记住的密码"
 
@@ -27031,15 +27475,9 @@ msgstr "状态(_S)"
 #~ msgid "Retrieving quota information for folder '%s'"
 #~ msgstr "正在获取文件加 %s 的配额信息"
 
-#~ msgid "Local Folders"
-#~ msgstr "本地文件夹"
-
 #~ msgid "Error saving messages to: %s:\n"
 #~ msgstr "在将信息保存到 %s 时发生错误:\n"
 
-#~ msgid "Checking Service"
-#~ msgstr "检查服务"
-
 #~ msgid "Updating Search Folders for '%s'"
 #~ msgstr "更新“%s”的搜索文件夹"
 
@@ -28724,9 +29162,6 @@ msgstr "状态(_S)"
 #~ "\n"
 #~ "您需要在继续之前在主目录中腾出更多空间。"
 
-#~ msgid "_Keep Data"
-#~ msgstr "保留数据(_K)"
-
 #~ msgid "_Remind Me Later"
 #~ msgstr "稍后提醒(_R)"
 
@@ -28745,9 +29180,6 @@ msgstr "状态(_S)"
 #~ msgid "Action"
 #~ msgstr "活动"
 
-#~ msgid "Show _Attachment Bar"
-#~ msgstr "显示附件栏(_A)"
-
 #~ msgid "Fill color"
 #~ msgstr "填充颜色"
 
@@ -29052,5 +29484,85 @@ msgstr "状态(_S)"
 #~ msgid "Show Hidde_n Messages"
 #~ msgstr "显示隐藏的信息(_N)"
 
-#~ msgid "Allow newlines"
-#~ msgstr "允许新行"
+#, fuzzy
+#~| msgid "Compose Message"
+#~ msgid "Compose a Message"
+#~ msgstr "新建消息"
+
+#, fuzzy
+#~| msgid "Sh_ow reminder notifications"
+#~ msgid "Show reminder notification dialog always on top"
+#~ msgstr "显示提醒通知(_O)"
+
+#, fuzzy
+#~| msgid "Sidebar is visible"
+#~ msgid "Menubar is visible"
+#~ msgstr "侧边栏可见"
+
+#, fuzzy
+#~| msgid "Whether the sidebar should be visible."
+#~ msgid "Whether the menubar should be visible."
+#~ msgstr "侧边栏是否可见。"
+
+#, fuzzy
+#~| msgid "All _Day Event"
+#~ msgid "All _Day Task"
+#~ msgstr "全天事件(_D)"
+
+#, fuzzy
+#~| msgid "Toggles whether to have All Day Event"
+#~ msgid "Toggles whether to have All Day Task"
+#~ msgstr "切换是否有全天事件"
+
+#, fuzzy
+#~| msgid "Select the calendars for reminder notification"
+#~ msgid "Selected Calendars for Notifications of Reminders"
+#~ msgstr "选择用于提醒通知的日历"
+
+#, fuzzy
+#~| msgid "Display reminders in _notification area only"
+#~ msgid "Keep reminder notification _window always on top"
+#~ msgstr "只在通知区域显示提醒(_O)"
+
+#, fuzzy
+#~| msgid "Default reminder value"
+#~ msgid "Set _default reminder"
+#~ msgstr "默认提醒值"
+
+#, fuzzy
+#~| msgid "Calendar"
+#~ msgid "Calendars"
+#~ msgstr "日历"
+
+#, fuzzy
+#~| msgctxt "New"
+#~| msgid "Memo Li_st"
+#~ msgid "Memo Lists"
+#~ msgstr "备忘录(_S)"
+
+#, fuzzy
+#~| msgid "Task List"
+#~ msgid "Task Lists"
+#~ msgstr "任务列表"
+
+#, fuzzy
+#~| msgid "Show _Status Bar"
+#~ msgid "Show _Menu Bar"
+#~ msgstr "显示状态栏(_S)"
+
+#, fuzzy
+#~| msgid "Show the side bar"
+#~ msgid "Show the menu bar"
+#~ msgstr "显示侧边栏"
+
+#~ msgid ""
+#~ "The mode to use for displaying mails. \"normal\" makes Evolution choose "
+#~ "the best part to show, \"prefer_plain\" makes it use the text part, if "
+#~ "present, and \"only_plain\" forces Evolution to only show plain text"
+#~ msgstr ""
+#~ "用于显示邮件的模式。“normal”使 Evolution 选择要显示的最佳部"
+#~ "分;“prefer_plain”让 Evolution 尽可能用文字部分;“only_plain”强制 "
+#~ "Evolution 只显示纯文字"
+
+#~ msgid "Local Calendars"
+#~ msgstr "载入日历"


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