[evolution/evolution-3-12] Bug fix in zh_CN translation



commit 662ea8e2fb24fd1ff428aa2783b28a41699b9ed1
Author: Ze Zhao <newelevenken aliyun com>
Date:   Wed Feb 15 21:13:30 2017 +0800

    Bug fix in zh_CN translation

 po/zh_CN.po | 2880 +++++++++++++++++++++++++++++------------------------------
 1 files changed, 1426 insertions(+), 1454 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bdf31d4..40e7c00 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,14 +18,14 @@
 # 甘露(Gan Lu) <rhythm gan gmail com>,2013
 # Tong Hui <tonghuix gmail com>, 2013, 2014.
 #
-#: ../shell/main.c:554
+#: ../shell/main.c:559
 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: 2014-03-08 05:29+0000\n"
-"PO-Revision-Date: 2014-01-23 21:43+0800\n"
+"POT-Creation-Date: 2015-09-19 15:57+0000\n"
+"PO-Revision-Date: 2017-02-15 21:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
@@ -94,8 +94,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:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:66
 msgid "Do _Not Delete"
 msgstr "不删除(_N)"
 
@@ -194,12 +194,12 @@ msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
 #: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
-#: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
+#: ../e-util/e-mail-signature-manager.c:326
+#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:718
 #: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
 #: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
 #: ../modules/mail/em-composer-prefs.c:443
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/attachment-reminder/attachment-reminder.c:556
 #: ../plugins/email-custom-header/email-custom-header.c:838
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
@@ -310,8 +310,8 @@ msgstr "愿意接收 HTML 邮件(_W)"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/widgets/eab-contact-merging.c:408
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:589
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:981
 msgid "Email"
 msgstr "电子邮件"
 
@@ -352,7 +352,7 @@ msgid "Home Page:"
 msgstr "主页:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "日历:"
 
@@ -427,8 +427,8 @@ msgid "_Anniversary:"
 msgstr "周年(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2277
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
+#: ../calendar/gui/e-calendar-view.c:2317
 msgid "Anniversary"
 msgstr "纪念日"
 
@@ -438,8 +438,8 @@ msgstr "纪念日"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
-#: ../calendar/gui/e-calendar-view.c:2276 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../calendar/gui/e-calendar-view.c:2316 ../shell/main.c:132
 msgid "Birthday"
 msgstr "生日"
 
@@ -477,7 +477,7 @@ msgstr "地址(_A):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:80
 msgid "Home"
@@ -485,10 +485,10 @@ msgstr "家庭"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
 msgid "Work"
 msgstr "工作"
 
@@ -496,8 +496,8 @@ msgstr "工作"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:81
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:727
+#: ../calendar/gui/e-cal-model.c:3941
 msgid "Other"
 msgstr "其它"
 
@@ -514,14 +514,14 @@ msgstr "笔记"
 #: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
 #: ../e-util/e-preferences-window.c:379
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "帮助(_H)"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3591
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
@@ -537,32 +537,32 @@ msgstr "帮助(_H)"
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
 #: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-activity-bar.c:340 ../e-util/e-attachment-dialog.c:311
 #: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
 #: ../e-util/e-attachment-view.c:370 ../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-filter-datespec.c:291
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:468
 #: ../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-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3088 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-web-view.c:3161 ../e-util/evolution-source-viewer.c:833
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../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:281
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:633
+#: ../mail/mail-send-recv.c:715 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:949
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
+#: ../modules/backup-restore/evolution-backup-tool.c:952
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:187
 #: ../modules/calendar/e-cal-attachment-handler.c:317
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
 #: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
 #: ../plugins/publish-calendar/publish-calendar.c:806
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
 #: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
 #: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
@@ -576,63 +576,67 @@ msgstr "取消(_C)"
 #: ../calendar/gui/dialogs/comp-editor.c:1278
 #: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
 #: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3089
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3162
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
 msgid "_Save"
 msgstr "保存(_S)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
 msgid "Yahoo"
 msgstr "雅虎"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
 msgid "Skype"
 msgstr "Skype"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
 msgid "Twitter"
 msgstr "Twitter"
 
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1299
 #: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
 msgid "Undo"
 msgstr "撤消"
 
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:276
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:1306
 #: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
 msgid "Redo"
 msgstr "重做"
@@ -656,21 +660,21 @@ msgstr "删除联系人出错"
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3588
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3592
 #: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
 #: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3593
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3942
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -678,28 +682,28 @@ msgstr ""
 "联系人数据无效:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3956
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "“%s”不能是未来的日期"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3964
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3977
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3991
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4006
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
@@ -717,16 +721,16 @@ msgstr "无效的联系人。"
 #: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
 #: ../e-util/e-passwords.c:469 ../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-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:282 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../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:167 ../smime/gui/e-cert-selector.c:233
+#: ../shell/main.c:172 ../smime/gui/e-cert-selector.c:233
 #: ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "确定(_O)"
@@ -739,15 +743,15 @@ msgstr "快速添加联系人"
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "电子邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "选择地址簿(_S)"
 
@@ -855,12 +859,12 @@ msgstr "从列表中删除电子邮件地址"
 #: ../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/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
-#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:225
+#: ../e-util/e-mail-signature-manager.c:366
 #: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
 #: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
 #: ../mail/mail-config.ui.h:52
-#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/attachment-reminder/attachment-reminder.c:566
 #: ../plugins/email-custom-header/email-custom-header.c:848
 #: ../plugins/publish-calendar/publish-calendar.c:807
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
@@ -900,19 +904,19 @@ msgstr "底部(_B)"
 msgid "Contact List Members"
 msgstr "联系人列表成员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "成员(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "添加列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "修改列表出错"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "删除列表出错"
 
@@ -1058,14 +1062,13 @@ msgstr "您确定要删除联系人(%s)吗?"
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1331
 #: ../calendar/gui/dialogs/comp-editor.c:1243
 #: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
-#: ../e-util/evolution-source-viewer.c:803
-#: ../mail/e-mail-account-manager.c:737
+#: ../e-util/evolution-source-viewer.c:804 ../mail/e-mail-account-manager.c:736
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-cal-shell-view-actions.c:1593
 #: ../modules/calendar/e-memo-shell-view-actions.c:692
 #: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1561
-#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../shell/e-shell-window-actions.c:943 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -1103,7 +1106,7 @@ msgid "Family Name"
 msgstr "姓"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:591
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "Nickname"
 msgstr "昵称"
 
@@ -1160,7 +1163,7 @@ msgid "ISDN Phone"
 msgstr "ISDN 电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
 msgid "Mobile Phone"
 msgstr "移动电话"
 
@@ -1199,7 +1202,7 @@ msgid "TTYTDD"
 msgstr "TTYTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:644
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 msgid "Company"
 msgstr "公司"
 
@@ -1208,7 +1211,7 @@ msgid "Unit"
 msgstr "单位"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
 msgid "Office"
 msgstr "办公室"
 
@@ -1223,12 +1226,12 @@ msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
 msgid "Manager"
 msgstr "经理"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
 msgid "Assistant"
 msgstr "助手"
 
@@ -1249,33 +1252,33 @@ msgid "Categories"
 msgstr "类别"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:694
 msgid "Spouse"
 msgstr "配偶"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
 msgid "Note"
 msgstr "注释"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "联系人地图"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "放大(_I)"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2192
 msgid "Zoom _Out"
 msgstr "缩小(_O)"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:1021
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "查找(_F)"
 
@@ -1391,22 +1394,22 @@ msgid "Copy _Email Address"
 msgstr "复制电子邮件地址(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
+#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:310
 msgid "Copy the email address to the clipboard"
 msgstr "复制电子邮件地址到剪贴板"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
+#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:315
 msgid "_Send New Message To..."
 msgstr "把新信息发送到(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
+#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:317
 msgid "Send a mail message to this address"
 msgstr "发送一个邮件信息到这个地址"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:1004
 #, c-format
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
@@ -1415,82 +1418,82 @@ msgstr "单击以给 %s 发送邮件"
 msgid "Open map"
 msgstr "打开地图"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:528
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:536
 msgid "List Members:"
 msgstr "列出成员:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
 msgid "Department"
 msgstr "部门"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Profession"
 msgstr "职业"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
 msgid "Video Chat"
 msgstr "视频聊天"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../e-util/e-send-options.c:545
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
+#: ../e-util/e-send-options.c:546
 #: ../modules/calendar/e-cal-shell-view-actions.c:215
 #: ../modules/calendar/e-cal-shell-view-actions.c:244
-#: ../modules/calendar/e-cal-shell-view.c:590
+#: ../modules/calendar/e-cal-shell-view.c:591
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "日历"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
 #: ../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 "忙/闲"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 msgid "Phone"
 msgstr "电话"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
 msgid "Fax"
 msgstr "传真"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Address"
 msgstr "地址"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Home Page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 msgid "Web Log"
 msgstr "Web 日志"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
 msgid "Personal"
 msgstr "个人"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:945
 msgid "List Members"
 msgstr "列出成员"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
 msgid "Job Title"
 msgstr "职称"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
 msgid "Home page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1017
 msgid "Blog"
 msgstr "Blog"
 
@@ -1603,9 +1606,9 @@ 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:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "正在导入..."
 
@@ -1740,15 +1743,14 @@ msgstr "午睡(_S)"
 #: ../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/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
+#: ../e-util/e-categories-editor.c:278 ../e-util/e-mail-signature-manager.c:356
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
 #: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
-#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../plugins/attachment-reminder/attachment-reminder.c:561
 #: ../plugins/email-custom-header/email-custom-header.c:843
 #: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "编辑(_E)"
@@ -1757,14 +1759,14 @@ msgstr "编辑(_E)"
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "错过(_D)"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:250
+#: ../calendar/alarm-notify/alarm-queue.c:1844
+#: ../calendar/alarm-notify/alarm-queue.c:1854
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
 #: ../modules/itip-formatter/itip-view.c:1503
 #: ../modules/itip-formatter/itip-view.c:1614
 msgid "Location:"
@@ -1782,7 +1784,7 @@ msgstr "午睡时间(_T):"
 #. * "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/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
+#: ../e-util/e-interval-chooser.c:143
 #: ../modules/calendar/e-cal-shell-view-actions.c:351
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
@@ -1791,60 +1793,59 @@ 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/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../e-util/e-interval-chooser.c:141
 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/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
-#: ../mail/e-mail-config-provider-page.c:526
+#: ../e-util/e-interval-chooser.c:139 ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "分钟"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Evolution 提醒器"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "您有 %d 条提醒"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "否(_N)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "是(_Y)"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1860,7 +1861,7 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
@@ -1869,7 +1870,7 @@ 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:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1877,7 +1878,7 @@ 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:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1887,7 +1888,7 @@ msgstr[0] "%d 分钟"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -1912,8 +1913,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/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您要删除该会议吗?"
@@ -1929,8 +1929,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/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定要删除此任务吗?"
@@ -2026,8 +2025,7 @@ 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:16
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
@@ -2064,8 +2062,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:13
+#: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "发送(_S)"
@@ -2310,8 +2308,7 @@ msgstr "正在将任务移动到任务列表 '{0}'"
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "正在将备忘移动到备忘列表“{0}”"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
@@ -2356,23 +2353,23 @@ 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:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:453
+#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:556
 #: ../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:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:462
+#: ../calendar/gui/e-task-table.c:557 ../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:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:464
+#: ../calendar/gui/e-task-table.c:558 ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "机密"
@@ -2388,8 +2385,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:903
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
@@ -2403,8 +2400,7 @@ msgstr "类别"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../em-format/e-mail-formatter-print-headers.c:203 ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "附件"
 
@@ -2418,8 +2414,7 @@ msgstr "存在"
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../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
 msgid "Recurrence"
@@ -2456,22 +2451,22 @@ msgid "Edit Reminder"
 msgstr "编辑提醒"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../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:407
+#: ../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:419
+#: ../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:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "发送电子邮件"
 
@@ -2520,7 +2515,7 @@ msgstr "重复"
 msgid "_Repeat the reminder"
 msgstr "重复提醒(_R)"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence:
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "每个额外时间"
@@ -2669,13 +2664,12 @@ msgstr "无法与服务器同步"
 #: ../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:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:275 ../e-util/e-mail-signature-editor.c:307
 #: ../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:126
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
 #: ../smime/gui/certificate-manager.c:1182
 msgid "_Close"
 msgstr "关闭(_C)"
@@ -2686,37 +2680,37 @@ msgstr "关闭当前窗口"
 
 #. copy menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
-#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
+#: ../e-util/e-text.c:2089 ../e-util/e-web-view-gtkhtml.c:452
+#: ../e-util/e-web-view.c:342 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "复制(_C)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
 #: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
 #: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
+#: ../e-util/e-web-view.c:344 ../e-util/e-web-view.c:1319
+#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
 #. cut menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:937
+#: ../e-util/e-text.c:2075 ../mail/e-mail-browser.c:140
+#: ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
 #: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1313
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
 #: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
-#: ../shell/e-shell-window-actions.c:946
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "删除选中内容"
 
@@ -2726,26 +2720,26 @@ msgstr "查看帮助"
 
 #. paste menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
-#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:965
+#: ../e-util/e-text.c:2101 ../mail/e-mail-browser.c:147
+#: ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
 #: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1325
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
+#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2094
 #: ../modules/addressbook/e-book-shell-view-actions.c:1160
 #: ../modules/addressbook/e-book-shell-view-actions.c:1174
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
+#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2101
 #: ../modules/addressbook/e-book-shell-view-actions.c:1167
 #: ../modules/calendar/e-cal-shell-view-actions.c:1801
 #: ../modules/calendar/e-memo-shell-view-actions.c:821
@@ -2767,14 +2761,14 @@ msgid "Save current changes and close editor"
 msgstr "保存当前更改并关闭编辑器"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:352
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "全选(_A)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
 #: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "选中所有文字"
 
@@ -2784,7 +2778,7 @@ msgstr "分类(_C)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1329
 #: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -2798,7 +2792,7 @@ msgid "_Options"
 msgstr "选项(_O)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../shell/e-shell-window-actions.c:1120 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -2889,18 +2883,18 @@ msgstr "切换是否显示出席者类型域"
 msgid "Attach"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../calendar/gui/dialogs/comp-editor.c:2564
+#: ../calendar/gui/dialogs/comp-editor.c:2774
+#: ../calendar/gui/dialogs/comp-editor.c:3787
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话,对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../calendar/gui/dialogs/comp-editor.c:3749
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
 msgid "attachment"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:3819
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本!"
 
@@ -2917,11 +2911,11 @@ msgstr "无法打开目的"
 msgid "Destination is read only"
 msgstr "目的只读"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
+#: ../calendar/gui/dialogs/copy-source-dialog.c:174
 msgid "Cannot create object"
 msgstr "无法创建对象"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
+#: ../calendar/gui/dialogs/copy-source-dialog.c:205
 msgid "Could not open source"
 msgstr "无法打开源"
 
@@ -3058,7 +3052,7 @@ msgstr "忙/闲(_F)"
 msgid "Query free / busy information for the attendees"
 msgstr "查询出席者的忙闲信息"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3503
 msgid "Appointment"
 msgstr "约会"
 
@@ -3085,7 +3079,7 @@ 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:3171
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "此事件有提醒"
 
@@ -3094,104 +3088,104 @@ msgstr "此事件有提醒"
 msgid "Or_ganizer:"
 msgstr "组织者(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
 #: ../calendar/gui/dialogs/task-page.c:1030
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
 #: ../calendar/gui/dialogs/task-page.c:1084
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1725
+#: ../calendar/gui/dialogs/event-page.c:1732
 #: ../calendar/gui/dialogs/task-page.c:1119
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1931
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1940
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:3463
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgid "Customize"
 msgstr "自定义"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "无"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
+#. TRANSLATORS:
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 msgctxt "eventpage"
 msgid "for"
 msgstr "持续时间"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS:
 #: ../calendar/gui/dialogs/event-page.ui.h:4
 msgctxt "eventpage"
 msgid "until"
 msgstr "直到"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "约会前 15 分钟"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "约会前 1 小时"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:10
 msgctxt "eventpage"
 msgid "1 day before appointment"
@@ -3227,7 +3221,7 @@ msgstr "事件描述"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "出席者(_N)..."
 
@@ -3296,7 +3290,7 @@ msgstr "选择日期"
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3507
 msgid "Memo"
 msgstr "备忘"
 
@@ -3549,43 +3543,43 @@ msgstr "无法获得要删除的选中项。"
 msgid "Date/Time"
 msgstr "日期/时间"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
 msgid "forever"
@@ -3622,8 +3616,8 @@ msgstr "只通知新的出席者(_O)"
 msgid "_Send Options"
 msgstr "发送选项(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3505
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "任务"
 
@@ -3665,32 +3659,31 @@ msgstr "完成日期有错"
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-task-table.c:582 ../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:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../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:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-task-table.c:584 ../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:575 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/tasktypes.xml.h:22 ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "未定义"
 
@@ -3698,9 +3691,9 @@ msgstr "未定义"
 #: ../calendar/gui/dialogs/task-page.ui.h:16
 #: ../calendar/gui/e-cal-component-preview.c:321
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:218
+#: ../calendar/gui/e-task-table.c:233 ../calendar/gui/e-task-table.c:665
+#: ../calendar/gui/print.c:3590 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -3709,9 +3702,9 @@ msgstr "尚未开始"
 #: ../calendar/gui/e-cal-component-preview.c:311
 #: ../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:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:666
+#: ../calendar/gui/print.c:3593
 msgid "In Progress"
 msgstr "进行中"
 
@@ -3721,10 +3714,9 @@ msgstr "进行中"
 #: ../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:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:237
+#: ../calendar/gui/e-task-table.c:667 ../calendar/gui/print.c:3596
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "已完成"
 
@@ -3732,9 +3724,9 @@ msgstr "已完成"
 #: ../calendar/gui/dialogs/task-page.ui.h:22
 #: ../calendar/gui/e-cal-component-preview.c:317
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:224
+#: ../calendar/gui/e-task-table.c:239 ../calendar/gui/e-task-table.c:668
+#: ../calendar/gui/print.c:3599 ../mail/mail-send-recv.c:853
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3770,56 +3762,56 @@ msgstr "分类(_L):"
 msgid "_Web Page:"
 msgstr "网页(_W):"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "新建全天事件"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "新会议"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "转到今天"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "转到日期"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "有提醒。"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "有再现。"
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "为会议。"
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "日历事件:摘要为 %s。"
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "日历事件:无摘要。"
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "日历视图事件"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "获得焦点"
 
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3827,36 +3819,36 @@ msgstr[0] "有 %d 个事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:160 ../calendar/gui/ea-week-view.c:156
+#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
 msgid "It has no events."
 msgstr "无事件。"
 
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "工作日视图:%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:175
+#: ../calendar/gui/ea-day-view.c:133
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "日视图:%s。%s"
 
-#: ../calendar/gui/ea-day-view.c:209
+#: ../calendar/gui/ea-day-view.c:167
 msgid "calendar view for a work week"
 msgstr "工作日的日历视图"
 
-#: ../calendar/gui/ea-day-view.c:211
+#: ../calendar/gui/ea-day-view.c:169
 msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
-#: ../calendar/gui/ea-day-view-main-item.c:326
-#: ../calendar/gui/ea-week-view-main-item.c:353
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "可查看并选择当前时间范围的表"
 
 #: ../calendar/gui/ea-gnome-calendar.c:47
 #: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Gnome Calendar"
 msgstr "Gnome 日历"
 
@@ -3871,9 +3863,9 @@ msgstr "%Y年%-m月%-d日%A"
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2795
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2816
+#: ../calendar/gui/e-day-view-top-item.c:854
+#: ../calendar/gui/e-week-view-main-item.c:216
 #: ../modules/calendar/e-cal-shell-view-private.c:1194
 msgid "%a %d %b"
 msgstr "%-m月%-d日%A"
@@ -3903,9 +3895,9 @@ msgstr "%Y年%-m月%-d日"
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2811
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
+#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2832
+#: ../calendar/gui/e-day-view-top-item.c:858
+#: ../calendar/gui/e-week-view-main-item.c:230
 #: ../modules/calendar/e-cal-shell-view-private.c:1230
 msgid "%d %b"
 msgstr "%B%-d日"
@@ -3919,90 +3911,90 @@ 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:357 ../calendar/gui/misc.c:97
+#: ../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"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../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:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "执行未知的动作"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "在约会开始之前 %s %s"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "在约会开始之后 %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "在约会开始时 %s"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "在约会结束之前 %s %s"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "在约会结束之后 %s %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "在约会结束时 %s"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr "在 %2$s 时 %1$s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月视图:%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:167
+#: ../calendar/gui/ea-week-view.c:124
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "周视图:%s。%s"
 
-#: ../calendar/gui/ea-week-view.c:201
+#: ../calendar/gui/ea-week-view.c:158
 msgid "calendar view for a month"
 msgstr "月日历视图"
 
-#: ../calendar/gui/ea-week-view.c:203
+#: ../calendar/gui/ea-week-view.c:160
 msgid "calendar view for one or more weeks"
 msgstr "一周或多周的日历视图"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "无标题"
@@ -4038,7 +4030,7 @@ msgid "Priority:"
 msgstr "优先级:"
 
 #: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "描述:"
 
@@ -4046,13 +4038,13 @@ msgstr "描述:"
 msgid "Web Page:"
 msgstr "网页:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
+#: ../calendar/gui/e-calendar-selector.c:355
 #: ../modules/calendar/e-cal-shell-view-private.c:1096
 #, c-format
 msgid "Copying an event into the calendar %s"
 msgstr "正在将事件复制到日历 %s"
 
-#: ../calendar/gui/e-calendar-selector.c:357
+#: ../calendar/gui/e-calendar-selector.c:356
 #: ../modules/calendar/e-cal-shell-view-private.c:1095
 #, c-format
 msgid "Moving an event into the calendar %s"
@@ -4071,7 +4063,7 @@ msgstr "开始日期"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "类型"
 
@@ -4079,7 +4071,7 @@ msgstr "类型"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:855
 msgid "Complete"
 msgstr "完成"
 
@@ -4093,16 +4085,14 @@ msgid "% Complete"
 msgstr "% 完成"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/tasktypes.xml.h:18 ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "优先级"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4011
-#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-cal-model.c:3995 ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
 #: ../mail/message-list.etspec.h:1
@@ -4122,37 +4112,37 @@ msgstr "创建时间"
 msgid "Last modified"
 msgstr "上次修改"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Cut selected events to the clipboard"
 msgstr "将选中事件剪切到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:451
+#: ../calendar/gui/e-calendar-view.c:454
 msgid "Copy selected events to the clipboard"
 msgstr "将选中事件复制到剪贴板"
 
-#: ../calendar/gui/e-calendar-view.c:457
+#: ../calendar/gui/e-calendar-view.c:460
 msgid "Paste events from the clipboard"
 msgstr "从剪贴板中粘贴事件"
 
-#: ../calendar/gui/e-calendar-view.c:463
+#: ../calendar/gui/e-calendar-view.c:466
 msgid "Delete selected events"
 msgstr "删除选中的事件"
 
-#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
+#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:274
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-task-table.c:1190
 msgid "Updating objects"
 msgstr "更新对象"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2083 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:2112 ../calendar/gui/e-memo-table.c:553
+#: ../calendar/gui/e-task-table.c:854
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者:%s <%s>"
@@ -4160,21 +4150,21 @@ msgstr "组织者:%s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2087 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:2116 ../calendar/gui/e-memo-table.c:558
+#: ../calendar/gui/e-task-table.c:858
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者:%s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2103
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:2132
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3544
 #, c-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2134
+#: ../calendar/gui/e-calendar-view.c:2172
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间:%s %s"
@@ -4191,74 +4181,70 @@ msgstr "结束日期"
 #: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../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:1253
+#: ../calendar/gui/print.c:1270 ../e-util/e-charset.c:51
 #: ../modules/itip-formatter/itip-view.c:3510
 #: ../modules/itip-formatter/itip-view.c:6097
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1651
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1653
 msgid "Assigned"
 msgstr "已分配"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-cal-model-tasks.c:1157
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../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:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-cal-model-tasks.c:1157
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "否"
 
-#: ../calendar/gui/e-cal-model.c:3952
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3936 ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../modules/itip-formatter/itip-view.c:6085
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-cal-model.c:3953
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3937 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 #: ../modules/itip-formatter/itip-view.c:6091
 msgid "Declined"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-cal-model.c:3954
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3938 ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../calendar/gui/e-cal-model.c:3955
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3939 ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../modules/itip-formatter/itip-view.c:6094
 msgid "Delegated"
 msgstr "被委任的"
 
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3940
 msgid "Needs action"
 msgstr "需要动作"
 
 #: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-task-table.c:640
 msgid "Free"
 msgstr "空闲"
 
 #: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:641
 msgid "Busy"
 msgstr "繁忙"
 
@@ -4279,16 +4265,16 @@ msgid "None"
 msgstr "无"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4298,16 +4284,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1985 ../calendar/gui/e-week-view.c:1539
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/e-day-view.c:1996 ../calendar/gui/e-week-view.c:1593
+#: ../calendar/gui/print.c:1076 ../calendar/gui/print.c:1095
+#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2658
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1988 ../calendar/gui/e-week-view.c:1542
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/e-day-view.c:1999 ../calendar/gui/e-week-view.c:1596
+#: ../calendar/gui/print.c:1081 ../calendar/gui/print.c:1097
+#: ../calendar/gui/print.c:2643 ../calendar/gui/print.c:2660
 msgid "pm"
 msgstr "下午"
 
@@ -4317,13 +4303,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:2778 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:2799 ../calendar/gui/e-day-view-top-item.c:850
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2094
 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:3442
+#: ../calendar/gui/e-day-view.c:3463
 #, c-format
 msgid "Week %d"
 msgstr "第%d周"
@@ -4334,17 +4320,17 @@ msgstr "第%d周"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:800
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "显示第二时区"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.c:305
 #: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
@@ -4352,7 +4338,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:878
 #: ../calendar/gui/e-timezone-entry.c:323
 #: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
@@ -4376,49 +4362,49 @@ msgstr "资源"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../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:1249
 msgid "Individual"
 msgstr "个人"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
 #: ../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:1250 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "组"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1251
 msgid "Resource"
 msgstr "资源"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1252
 msgid "Room"
 msgstr "房间"
 
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1266
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
 #: ../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:1267
 msgid "Required Participant"
 msgstr "必需的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../calendar/gui/print.c:1268
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1269
 msgid "Non-Participant"
 msgstr "不参加"
 
@@ -4457,67 +4443,67 @@ msgstr "失败原因:%s"
 msgid "Enter password"
 msgstr "输入密码"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "没有信息"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "开始时间(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "结束时间(_E):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4526,7 +4512,7 @@ msgstr ""
 "简要:%s\n"
 "位置:%s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Summary: %s"
 msgstr "概要:%s"
@@ -4555,7 +4541,7 @@ msgstr "通用名"
 msgid "Language"
 msgstr "语言"
 
-#: ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-memo-table.c:429
 #: ../modules/calendar/e-cal-shell-content.c:481
 #: ../modules/calendar/e-memo-shell-view-actions.c:211
 #: ../modules/calendar/e-memo-shell-view-actions.c:226
@@ -4563,38 +4549,38 @@ msgstr "语言"
 msgid "Memos"
 msgstr "备忘"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:817
 msgid "* No Summary *"
 msgstr "* 没有概要 *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:901
 msgid "Start: "
 msgstr "开始:"
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:919
 msgid "Due: "
 msgstr "到期:"
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:742
 msgid "Cut selected memos to the clipboard"
 msgstr "将选中备忘剪切到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:748
 msgid "Copy selected memos to the clipboard"
 msgstr "将选中备忘复制到剪贴板"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:754
 msgid "Paste memos from the clipboard"
 msgstr "从剪贴板中粘贴备忘"
 
-#: ../calendar/gui/e-memo-table.c:759
+#: ../calendar/gui/e-memo-table.c:760
 #: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete selected memos"
 msgstr "删除选中的备忘"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:766
 msgid "Select all visible memos"
 msgstr "选中所有可见的备忘"
 
@@ -4606,14 +4592,14 @@ msgstr "单击以添加备忘"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:613
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:730 ../calendar/gui/print.c:2419
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1072
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
 #: ../modules/calendar/e-cal-shell-content.c:438
 #: ../modules/calendar/e-task-shell-view-actions.c:234
@@ -4622,24 +4608,24 @@ msgstr "%d%%"
 msgid "Tasks"
 msgstr "任务"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:1054
 msgid "Cut selected tasks to the clipboard"
 msgstr "将选中任务剪切到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1060
 msgid "Copy selected tasks to the clipboard"
 msgstr "将选中任务复制到剪贴板"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1066
 msgid "Paste tasks from the clipboard"
 msgstr "从剪贴板中粘贴任务"
 
-#: ../calendar/gui/e-task-table.c:1057
+#: ../calendar/gui/e-task-table.c:1072
 #: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete selected tasks"
 msgstr "删除选中的任务"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1078
 msgid "Select all visible tasks"
 msgstr "选中所有可见的任务"
 
@@ -4650,11 +4636,11 @@ 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:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2073
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:2371
+#: ../calendar/gui/gnome-cal.c:2374
 msgid "Purging"
 msgstr "销毁"
 
@@ -4780,127 +4766,127 @@ msgstr "无法预约资源,错误:%s"
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31日"
 
@@ -4908,102 +4894,102 @@ msgstr "31日"
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "一"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "二"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "三"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "四"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "五"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "六"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../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:3319
+#: ../calendar/gui/print.c:3326
 msgid " to "
 msgstr " 到 "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3336
 msgid " (Completed "
 msgstr " (完成 "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3342
 msgid "Completed "
 msgstr "已完成 "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3352
 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:3352
+#: ../calendar/gui/print.c:3359
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3563
 msgid "Attendees: "
 msgstr "出席者:"
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3607
 #, c-format
 msgid "Status: %s"
 msgstr "状态:%s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3623
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级:%s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3641
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率:%i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3655
 #, c-format
 msgid "URL: %s"
 msgstr "URL:%s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3669
 #, c-format
 msgid "Categories: %s"
 msgstr "类别:%s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3680
 msgid "Contacts: "
 msgstr "联系人:"
 
@@ -5028,177 +5014,177 @@ msgstr "小于"
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "提醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar 文件(.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1065
 msgid "Calendar Events"
 msgstr "日历事件"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 日历智能导入器"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "会议"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "事件"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "有再现"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "本次和以前各次"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1205
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "有提醒"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "有附件"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "公开"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1226
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "保密"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "机密"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "分类"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "概要"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "位置"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "开始"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "到期"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "End"
 msgstr "结束"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1285
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "类别"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1309
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "已完成"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1328
+#: ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "组织者"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1351
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "出席者"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "描述"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "类型"
@@ -6766,11 +6752,11 @@ msgstr "新建信息(_M)"
 msgid "Open New Message window"
 msgstr "打开新建信息窗口"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "配置 Evolution"
 
@@ -6908,44 +6894,44 @@ msgid ""
 "appearing in the recipient list of the message"
 msgstr "输入将接收该信息副本,但不出现在收件人列表中的收件人地址"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:770
 msgid "Fr_om:"
 msgstr "发件人(_O):"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:777
 msgid "_Reply-To:"
 msgstr "回复到(_R):"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:782
 msgid "_To:"
 msgstr "收件人(_T):"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:788
 msgid "_Cc:"
 msgstr "抄送(_C):"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:794
 msgid "_Bcc:"
 msgstr "密件抄送(_B):"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:799
 msgid "_Post To:"
 msgstr "投递到(_P):"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:803
 msgid "S_ubject:"
 msgstr "主题(_U):"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:811
+#: ../mail/e-mail-config-identity-page.c:487
 msgid "Si_gnature:"
 msgstr "签名(_G):"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "单击此处以使用地址簿"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
@@ -6962,15 +6948,15 @@ msgid ""
 "account"
 msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1610 ../composer/e-msg-composer.c:2022
 msgid "Compose Message"
 msgstr "新建消息"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4287
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "编写器含有不可编辑的非文本信体。"
 
-#: ../composer/e-msg-composer.c:4943
+#: ../composer/e-msg-composer.c:4987
 msgid "Untitled Message"
 msgstr "无标题信息"
 
@@ -7129,30 +7115,13 @@ msgstr "Evolution 提醒通知"
 msgid "Calendar event notifications"
 msgstr "日历事件信息"
 
-#: ../data/evolution.appdata.xml.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr "Evolution 是一款个人信息管理应用,提供集成的邮件、日历和地址簿功能。"
-
-#: ../data/evolution.appdata.xml.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution 支持众多的工业标准数据格式和信息交换的网络协议,并强化了标准兼容性"
-"和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
-"进行顺利集成。"
-
 #: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
@@ -9256,7 +9225,7 @@ msgstr "初始文件选择器文件夹"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "GtkFileChooser 对话框的起始文件夹。"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:312
 msgid "Start in offline mode"
 msgstr "以离线模式启动"
 
@@ -9346,15 +9315,15 @@ msgstr "只使用本地垃圾信息测试。"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "之使用本地垃圾信息测试(无 DNS)。"
 
-#: ../em-format/e-mail-formatter-attachment.c:407
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "附件"
 
-#: ../em-format/e-mail-formatter-attachment.c:408
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "以附件显示"
 
@@ -9367,7 +9336,7 @@ msgid "Play the attachment in embedded audio player"
 msgstr "在嵌入式音乐播放器中播放附件"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
 #: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
 msgid "From"
 msgstr "发件人"
@@ -9428,14 +9397,14 @@ msgid "S/MIME encrpyted"
 msgstr "已经 S/MIME 加密"
 
 #: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
+#: ../mail/e-mail-config-security-page.c:644
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
 msgstr "安全"
 
 #: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
 #: ../modules/mail/em-mailer-prefs.c:68
 msgid "Subject"
@@ -9444,37 +9413,37 @@ msgstr "主题"
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:186
 #: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1145
 msgid "Mailer"
 msgstr "邮件程序"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
-#: ../em-format/e-mail-formatter-text-enriched.c:96
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
+#: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "富文本"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:93
-#: ../em-format/e-mail-formatter-text-enriched.c:97
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
+#: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr "以富文本显示部分"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:93
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
 #: ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:94
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
 #: ../em-format/e-mail-formatter-text-html.c:360
 msgid "Format part as HTML"
 msgstr "将部分格式化为 HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:117
-#: ../em-format/e-mail-formatter-text-plain.c:195
+#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../em-format/e-mail-formatter-text-plain.c:197
 msgid "Plain Text"
 msgstr "纯文字"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:118
-#: ../em-format/e-mail-formatter-text-plain.c:196
+#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "将部分格式化为纯文字"
 
@@ -9583,11 +9552,11 @@ msgstr "查看证书(_V)"
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../em-format/e-mail-formatter-source.c:118
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "来源"
 
-#: ../em-format/e-mail-formatter-source.c:119
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "显示 MIME 部分的源内容"
 
@@ -9613,12 +9582,12 @@ msgstr "解析 MBOX 部分出错:%s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "无法解析 S/MIME 信息:%s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "无法解析 PGP 信息:%s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -9743,7 +9712,7 @@ msgstr "天"
 msgid "_When convenient"
 msgstr "方便时(_W)"
 
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:848
 msgid "Replies"
 msgstr "回复"
 
@@ -9835,8 +9804,8 @@ msgid "Sta_tus Tracking"
 msgstr "状态跟踪(_T)"
 
 #: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
 msgid "_Apply"
 msgstr "应用(_A)"
 
@@ -9860,11 +9829,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:1753
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
 msgid "Ascending"
 msgstr "升序"
 
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
 msgid "Descending"
 msgstr "降序"
 
@@ -9925,7 +9894,7 @@ msgstr "选择(_S)"
 msgid "Timezone drop-down combination box"
 msgstr "时区下拉组合框"
 
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1244
 #: ../mail/em-utils.c:229
 msgid "Incoming"
 msgstr "接收"
@@ -9950,8 +9919,7 @@ 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 "月"
 
@@ -10002,9 +9970,9 @@ msgid "_Create new view"
 msgstr "创建新视图(_C)"
 
 #: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../mail/e-mail-config-identity-page.c:309
+#: ../mail/e-mail-config-summary-page.c:339
 msgid "_Name:"
 msgstr "名称(_N):"
 
@@ -10012,8 +9980,8 @@ msgstr "名称(_N):"
 msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1727
 msgid "Cancel"
 msgstr "取消"
 
@@ -10057,11 +10025,11 @@ msgstr "%s (%d%% 完成)"
 msgid "Close this message (Escape)"
 msgstr "关闭该信息 (Escape 键)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
 msgid "Icon View"
 msgstr "图标视图"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
 msgid "List View"
 msgstr "列表视图"
 
@@ -10089,21 +10057,21 @@ msgstr "不能设置为背景"
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "载入"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "保存"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:104
 msgid "Hide Attachment _Bar"
 msgstr "隐藏附件栏(_B)"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
 msgid "Show Attachment _Bar"
 msgstr "显示附件栏(_B)"
 
@@ -10121,8 +10089,8 @@ msgid_plural "Save Attachments"
 msgstr[0] "保存附件"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
+#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2059
+#: ../e-util/e-attachment.c:2722
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -10154,8 +10122,8 @@ msgstr "添加附件(_D)..."
 #: ../modules/calendar/e-cal-shell-view-actions.c:1399
 #: ../modules/calendar/e-memo-shell-view-actions.c:628
 #: ../modules/calendar/e-task-shell-view-actions.c:752
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1599
 msgid "_Properties"
 msgstr "属性(_P)"
 
@@ -10189,48 +10157,48 @@ msgstr "在 %s 中打开附件"
 #. * 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:1108
+#: ../e-util/e-attachment.c:1109
 msgid "Attached message"
 msgstr "附加的信息"
 
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
+#: ../e-util/e-attachment.c:2140 ../e-util/e-attachment.c:3028
 msgid "A load operation is already in progress"
 msgstr "一个已经加载的操作正在进行"
 
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
+#: ../e-util/e-attachment.c:2148 ../e-util/e-attachment.c:3036
 msgid "A save operation is already in progress"
 msgstr "个已经保存的操作正在进行"
 
-#: ../e-util/e-attachment.c:2267
+#: ../e-util/e-attachment.c:2268
 #, c-format
 msgid "Could not load '%s'"
 msgstr "不能加载“%s”"
 
-#: ../e-util/e-attachment.c:2270
+#: ../e-util/e-attachment.c:2271
 #, c-format
 msgid "Could not load the attachment"
 msgstr "不能加载附件"
 
-#: ../e-util/e-attachment.c:2574
+#: ../e-util/e-attachment.c:2575
 #, c-format
 msgid "Could not open '%s'"
 msgstr "不能打开“%s”"
 
-#: ../e-util/e-attachment.c:2577
+#: ../e-util/e-attachment.c:2578
 #, c-format
 msgid "Could not open the attachment"
 msgstr "不能打开附件"
 
-#: ../e-util/e-attachment.c:3044
+#: ../e-util/e-attachment.c:3045
 msgid "Attachment contents not loaded"
 msgstr "附件内容未载入"
 
-#: ../e-util/e-attachment.c:3124
+#: ../e-util/e-attachment.c:3125
 #, c-format
 msgid "Could not save '%s'"
 msgstr "不能保存“%s”"
 
-#: ../e-util/e-attachment.c:3127
+#: ../e-util/e-attachment.c:3128
 #, c-format
 msgid "Could not save the attachment"
 msgstr "无法保存附件"
@@ -10281,40 +10249,40 @@ msgid "Copy memo list contents locally for offline operation"
 msgstr "将备忘列表内容复制到本地以进行离线操作"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
+#: ../e-util/e-calendar-item.c:1307 ../e-util/e-calendar-item.c:2185
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
+#: ../e-util/e-calendar-item.c:1309
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
+#: ../e-util/e-calendar-item.c:1346
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: ../e-util/e-calendar.c:189
+#: ../e-util/e-calendar.c:195
 msgid "Previous month"
 msgstr "上个月"
 
-#: ../e-util/e-calendar.c:214
+#: ../e-util/e-calendar.c:220
 msgid "Next month"
 msgstr "下个月"
 
-#: ../e-util/e-calendar.c:240
+#: ../e-util/e-calendar.c:246
 msgid "Previous year"
 msgstr "上一年"
 
-#: ../e-util/e-calendar.c:265
+#: ../e-util/e-calendar.c:271
 msgid "Next year"
 msgstr "下一年"
 
-#: ../e-util/e-calendar.c:289
+#: ../e-util/e-calendar.c:295
 msgid "Month Calendar"
 msgstr "月历"
 
@@ -10326,9 +10294,9 @@ msgstr "当前使用的分类(_U):"
 msgid "_Available Categories:"
 msgstr "可用类别(_A):"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:272
 #: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#: ../shell/e-shell-window-actions.c:1099
 msgid "_New"
 msgstr "新建(_N)"
 
@@ -10336,7 +10304,7 @@ msgstr "新建(_N)"
 msgid "Icon"
 msgstr "图标"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:304
 #, c-format
 msgid "Create category \"%s\""
 msgstr "创建分类 \"%s\""
@@ -10394,16 +10362,16 @@ msgstr "无"
 msgid "OK"
 msgstr "确定"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "时间必须采用格式:%s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1839
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:1887
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
 
@@ -10411,11 +10379,11 @@ msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
 msgid "Character Encoding"
 msgstr "字符编码"
 
-#: ../e-util/e-charset-combo-box.c:122
+#: ../e-util/e-charset-combo-box.c:119
 msgid "Enter the character set to use"
 msgstr "输入要使用的字符集"
 
-#: ../e-util/e-charset-combo-box.c:368
+#: ../e-util/e-charset-combo-box.c:365
 msgid "Other..."
 msgstr "其它..."
 
@@ -10496,7 +10464,7 @@ msgstr "乌克兰语"
 msgid "Visual"
 msgstr "可视"
 
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-client-cache.c:1222
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "无法从名为 '%s' 的扩展创建客户端对象"
@@ -10517,8 +10485,7 @@ msgstr "单击此按钮可显示日历"
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:626 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "时间"
 
@@ -10750,23 +10717,23 @@ msgstr "选择用于比较的时间"
 msgid "Choose a File"
 msgstr "选择文件"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "规则名(_U):"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "下列所有条件"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "下列条件之一"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "查找匹配的项目(_F):"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "查找符合下列条件的项目"
 
@@ -10774,35 +10741,35 @@ msgstr "查找符合下列条件的项目"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-mail-identity-combo-box.c:472
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "无"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "无回复或原始邮件"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "包含线索(_N):"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "添加动作(_D)"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -10837,7 +10804,7 @@ msgid "Import a _single file"
 msgstr "导入单个文件(_S)"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息:"
 
@@ -10851,7 +10818,7 @@ msgstr ""
 "现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "从 %s:"
@@ -10908,7 +10875,7 @@ msgstr "选择一个文件"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "单击“应用”以便开始将文件导入到 Evolution。"
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "自动生成的"
 
@@ -10920,31 +10887,31 @@ msgstr "关闭"
 msgid "_Save and Close"
 msgstr "保存并关闭(_S)"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:527
 msgid "Edit Signature"
 msgstr "编辑签名"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:547
 msgid "_Signature Name:"
 msgstr "签名(_S):"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:593
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../e-util/e-mail-signature-manager.c:337
+#: ../e-util/e-mail-signature-manager.c:336
 msgid "Add _Script"
 msgstr "添加脚本(_S)"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:418
 msgid "Add Signature Script"
 msgstr "添加签名脚本"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:488
 msgid "Edit Signature Script"
 msgstr "编辑签名脚本"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -10953,11 +10920,11 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "脚本(_C):"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "脚本文件必须可执行。"
 
@@ -11014,8 +10981,7 @@ msgstr "联系人(_N)"
 msgid "Search"
 msgstr "搜索"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:427
 msgid "Address Book"
 msgstr "地址簿"
 
@@ -11030,25 +10996,25 @@ msgid "Select Contacts from Address Book"
 msgstr "从地址簿选择联系人"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3121
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "在行内展开 %s (_X)"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3137
 #, c-format
 msgid "Cop_y %s"
 msgstr "复制 %s (_Y)"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3148
 #, c-format
 msgid "C_ut %s"
 msgstr "剪切 %s (_U)"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3166
 #, c-format
 msgid "_Edit %s"
 msgstr "编辑 %s(_E)"
@@ -11058,15 +11024,15 @@ msgstr "编辑 %s(_E)"
 msgid "_Delete %s"
 msgstr "删除 %s(_D)"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr "Evolution 目前在线。单击该按钮可离线工作。"
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr "Evolution 目前离线。单击该按钮可在线工作。"
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "因为网络不可用,所以 Evolution 目前离线。"
 
@@ -11111,63 +11077,63 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "打印系统未报告关于错误的任何额外细节。"
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "方法(_M):"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "随桌面设置"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "打开桌面设置(_O)"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "手册"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_HTTP 代理:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS 代理:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_Socks 代理:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "忽略 Hosts(_I):"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "自动"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "配置 _URL:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "直接连接,不需要代理。"
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "切换到基本代理首选项"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "切换到高级代理首选项"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "将自定义代理设置应用到这些帐户:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -11193,92 +11159,92 @@ msgstr "添加规则"
 msgid "Edit Rule"
 msgstr "编辑规则"
 
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "匹配:%u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "关闭查找栏"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "查找(_D):"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "清除搜索"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "上一项(_P)"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "寻找该词句出现的前一个位置"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "下一项(_N)"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "寻找该词句出现的下一个位置"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "大小写匹配(_C)"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "到达页面底部,移到顶部继续"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "到达页面顶部,移到底部继续"
 
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:420
 #: ../modules/mail/e-mail-shell-view.c:1097
 msgid "Mail"
 msgstr "邮件"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "删除时(_L):"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
 msgid "Type:"
 msgstr "类型:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
 msgid "Name:"
 msgstr "名称:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1301
+#: ../e-util/e-source-config.c:1305
 msgid "Refresh every"
 msgstr "刷新间隔"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
 msgid "Use a secure connection"
 msgstr "使用安全连接"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1431
 msgid "Unset _trust for SSL certificate"
 msgstr "不再信任 SSL 证书(_T)"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1467
 msgid "User"
 msgstr "用户"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "目标位置(_D)"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "选择目标位置"
 
@@ -11399,29 +11365,29 @@ msgstr "备忘录列表后端服务 &quot;{0}&quot; 遇到一个错误。"
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "任务列表后端服务 &quot;{0}&quot; 遇到一个错误。"
 
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:684
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "单击可添加"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "把选定的栏名移至顶端"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "把选中的栏名上移一行"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "把选中的联系人移至其它地址簿"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "把选定的栏名移至底端"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "选中所有栏名"
 
@@ -11471,68 +11437,68 @@ msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 项)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "升序排序(_A)"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "降序排序(_D)"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "未排序(_U)"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "对齐(_L)"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "最佳匹配(_E)"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "格式化列(_S)..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "自定义当前视图(_M)..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "全选"
 
-#: ../e-util/e-text.c:2123
+#: ../e-util/e-text.c:2127
 msgid "Input Methods"
 msgstr "输入法"
 
@@ -11551,72 +11517,72 @@ msgstr "单击此处打开该 URL 地址"
 msgid "Enter a URL here"
 msgstr "在此输入 URL 地址"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:288
 msgid "_Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:290
 msgid "Copy the link to the clipboard"
 msgstr "将链接复制到剪贴板"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:298
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:300
 msgid "Open the link in a web browser"
 msgstr "在浏览器中打开链接"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:308
 msgid "_Copy Email Address"
 msgstr "复制电子邮件地址(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:325
 msgid "_Copy Image"
 msgstr "复制图像(_C)"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:327
 msgid "Copy the image to the clipboard"
 msgstr "将图像复制到剪贴板"
 
 #: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
+#: ../e-util/e-web-view.c:354 ../e-util/e-web-view.c:1331
 msgid "Select all text and images"
 msgstr "选中全部文本和图像"
 
 #: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
-#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:1006
+#: ../e-util/e-web-view.c:1008 ../e-util/e-web-view.c:1010
 #, c-format
 msgid "Click to call %s"
 msgstr "单击以呼叫 %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1012
 msgid "Click to hide/unhide addresses"
 msgstr "单击可隐藏/显示地址"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1014
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
-#: ../e-util/e-web-view.c:326
+#: ../e-util/e-web-view.c:332
 msgid "Save _Image..."
 msgstr "保存图像(_I)..."
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:334
 msgid "Save the image to a file"
 msgstr "保存该图像为文件"
 
-#: ../e-util/e-web-view.c:2898
+#: ../e-util/e-web-view.c:2971
 msgid "Copying image to clipboard"
 msgstr "正在将图像复制到剪贴板"
 
-#: ../e-util/e-web-view.c:3086
+#: ../e-util/e-web-view.c:3159
 msgid "Save Image"
 msgstr "保存图像"
 
-#: ../e-util/e-web-view.c:3122
+#: ../e-util/e-web-view.c:3195
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "正在保存图像至 %s"
@@ -11664,7 +11630,7 @@ msgid "Flags"
 msgstr "标志"
 
 #: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
+#: ../mail/e-mail-config-identity-page.c:676
 msgid "Identity"
 msgstr "标识"
 
@@ -11800,6 +11766,23 @@ msgstr "无法加载签名。"
 msgid "Could not save signature."
 msgstr "无法保存签名。"
 
+#: ../evolution.appdata.xml.in.h:1
+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
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution 支持众多的工业标准数据格式和信息交换的网络协议,并强化了标准兼容性"
+"和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
+"进行顺利集成。"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -11866,14 +11849,14 @@ msgstr "无效的文件夹 URI:“%s”"
 msgid "No mail transport service available"
 msgstr "没有可用的邮件传送服务"
 
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
+#: ../libemail-engine/e-mail-session-utils.c:647
+#: ../libemail-engine/mail-ops.c:736
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败:%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:750
+#: ../libemail-engine/e-mail-session-utils.c:696
+#: ../libemail-engine/mail-ops.c:779
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11882,74 +11865,74 @@ msgstr ""
 "追加到 %s:%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../libemail-engine/mail-ops.c:774
+#: ../libemail-engine/e-mail-session-utils.c:722
+#: ../libemail-engine/mail-ops.c:803
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败:%s"
 
-#: ../libemail-engine/e-mail-session-utils.c:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
+#: ../libemail-engine/e-mail-session-utils.c:924
+#: ../libemail-engine/mail-ops.c:951 ../libemail-engine/mail-ops.c:1053
 msgid "Sending message"
 msgstr "发送信息"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1057
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174
+#: ../modules/mail/e-mail-shell-view-private.c:1067
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Inbox"
 msgstr "收件箱"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../modules/mail/e-mail-shell-view-private.c:1065
 msgid "Drafts"
 msgstr "草稿"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../modules/mail/e-mail-shell-view-private.c:1069
 msgid "Outbox"
 msgstr "发件箱"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 msgid "Sent"
 msgstr "已发箱"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../modules/mail/e-mail-shell-view-private.c:1073
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
+#: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "模板"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1252
 #, c-format
 msgid "User cancelled operation"
 msgstr "用户己取消操作"
 
-#: ../libemail-engine/e-mail-session.c:1373
+#: ../libemail-engine/e-mail-session.c:1380
 #, c-format
 msgid "%s authentication failed"
 msgstr "%s 认证失败"
 
-#: ../libemail-engine/e-mail-session.c:1423
+#: ../libemail-engine/e-mail-session.c:1430
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "未找到对应 UID “%s”的数据源"
 
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1493
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "缺少发送目标地址,信息转发被取消。"
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1506
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "无可用身份,信息转发被取消。"
@@ -11990,7 +11973,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "正在从 '%s' 收取邮件"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:730
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12002,51 +11985,51 @@ msgstr ""
 "过“编辑”->“信息过滤器”检查您的过滤器。\n"
 "原错误为:%s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:962
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在发送第 %d 封信,共 %d 封"
 
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1014
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "无法发送 %d/%d 条信息"
 
-#: ../libemail-engine/mail-ops.c:975
+#: ../libemail-engine/mail-ops.c:1020
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1022
 msgid "Complete."
 msgstr "完成。"
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1134
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "正在移动信息至 %s"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1135
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "把信息复制到 %s"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1254
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s”"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1382
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销毁并存储帐号“%s”"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1383
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储帐号“%s”"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1458
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s”中的废件箱"
@@ -12108,50 +12091,50 @@ msgstr "打开在线帐号(_O)"
 msgid "This account was created through the Online Accounts service."
 msgstr "该帐号通过在线帐号服务创建"
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "重置顺序(_R)"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr "您可以拖放帐号名来重新排序。"
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "默认(_F)"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1203
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "帐号名"
 
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
+#: ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:334
+#: ../mail/e-mail-config-security-page.c:474 ../mail/e-mail-reader.c:3626
 #: ../mail/mail-config.ui.h:66
 msgid "Default"
 msgstr "默认"
 
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "没有提供电子邮件地址"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "电子邮件地址中缺少域"
 
-#: ../mail/e-mail-backend.c:841
+#: ../mail/e-mail-backend.c:855
 msgid "Unknown background operation"
 msgstr "未知的后台操作"
 
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "关闭此窗口"
 
@@ -12169,19 +12152,19 @@ msgstr "后退(_B)"
 msgid "_Skip Lookup"
 msgstr "跳过查找(_S)"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:653
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帐号助手"
 
-#: ../mail/e-mail-config-assistant.c:936
+#: ../mail/e-mail-config-assistant.c:935
 msgid "_Revise Details"
 msgstr "核实详细信息(_R)"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "检查支持的类型"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12195,91 +12178,91 @@ msgstr ""
 "\n"
 "单击“应用”可保存您的设置。"
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:548
 msgid "Special Folders"
 msgstr "特殊文件夹"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:557
 msgid "Draft Messages _Folder:"
 msgstr "草稿信息文件夹(_F):"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:567
 msgid "Choose a folder for saving draft messages."
 msgstr "选择保存草稿信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:581
 msgid "Sent _Messages Folder:"
 msgstr "已发送信息文件夹(_M):"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:591
 msgid "Choose a folder for saving sent messages."
 msgstr "选择保存已发送信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:610
 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:627
 msgid "_Restore Defaults"
 msgstr "恢复默认值(_R)"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:641
 msgid "Use a Real Folder for _Trash:"
 msgstr "使用真实文件夹作为废件箱(_T):"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:642
 msgid "Choose a folder for deleted messages."
 msgstr "选择已删除信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:651
 msgid "Use a Real Folder for _Junk:"
 msgstr "使用真实文件夹存放垃圾信息(_J):"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "Choose a folder for junk messages."
 msgstr "选择垃圾信息的文件夹。"
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:669
 msgid "Composing Messages"
 msgstr "撰写信息"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:678
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "总是抄送到(_S):"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "总是密件抄送到(_B):"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:738
 msgid "Message Receipts"
 msgstr "已读回执"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:747
 msgid "S_end message receipts:"
 msgstr "发送信息收条(_E):"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "Never"
 msgstr "从不"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:778
 msgid "Always"
 msgstr "总是"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:784
 msgid "Ask for each message"
 msgstr "每条信息都询问"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Defaults"
 msgstr "默认值"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:264
 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 "
@@ -12288,13 +12271,13 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:292
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "帐号信息"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:301
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12302,36 +12285,36 @@ msgstr ""
 "输入您想要给此帐号起的名字。\n"
 "如:“工作”或“私人”。"
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:346
 msgid "Required Information"
 msgstr "需要的信息"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:355
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:382
 msgid "Email _Address:"
 msgstr "电子邮件地址(_A):"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:429
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "可选信息"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:438
 msgid "Re_ply-To:"
 msgstr "回复到(_P):"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Or_ganization:"
 msgstr "组织(_G):"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:520
 msgid "Add Ne_w Signature..."
 msgstr "添加新签名(_W)..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "正在查找帐号详情..."
 
@@ -12343,7 +12326,7 @@ msgstr "检查新邮件"
 msgid "Check for _new messages every"
 msgstr "自动检查新信息的间隔(_N)"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "接收选项"
 
@@ -12351,99 +12334,99 @@ msgstr "接收选项"
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
-#: ../modules/addressbook/autocompletion-config.c:113
+#: ../mail/e-mail-config-security-page.c:259 ../mail/em-folder-properties.c:334
+#: ../mail/mail-config.ui.h:26
+#: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "常规"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:268
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:290
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "GNU 安全卫士(OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:299
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _Key ID:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:321
 msgid "Si_gning algorithm:"
 msgstr "签名函数(_N):"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:337
+#: ../mail/e-mail-config-security-page.c:477 ../mail/mail-config.ui.h:67
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/e-mail-config-security-page.c:480 ../mail/mail-config.ui.h:68
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:343
+#: ../mail/e-mail-config-security-page.c:483 ../mail/mail-config.ui.h:69
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:346
+#: ../mail/e-mail-config-security-page.c:486 ../mail/mail-config.ui.h:70
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:362
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息(_W)"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:374
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "当发送加密邮件时总是对自身加密(_M)"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:386
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:410
 msgid "Secure MIME (S/MIME)"
 msgstr "安全 MIME(S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:419
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N):"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:443
+#: ../mail/e-mail-config-security-page.c:549
 msgid "Select"
 msgstr "选择"
 
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1007
+#: ../mail/e-mail-config-security-page.c:452
+#: ../mail/e-mail-config-security-page.c:558 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:461
 msgid "Signing _algorithm:"
 msgstr "签名函数(_A):"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Always sign outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:525
 msgid "Encryption certificate:"
 msgstr "加密证书:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:567
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "当使用该帐号时总是发送签名信息"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:587
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "当发送加密信息时总是对自身加密"
 
@@ -12451,7 +12434,7 @@ msgstr "当发送加密信息时总是对自身加密"
 msgid "Sending Email"
 msgstr "发送电子邮件"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "服务器类型(_T):"
 
@@ -12463,50 +12446,50 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "这是将用于访问您邮件的设置汇总。"
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "个人详细信息"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "全名:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "电子邮件地址:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "接收"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "发送"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "服务器类型:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "服务器:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "用户名:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "安全:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "帐号摘要"
 
@@ -12525,31 +12508,31 @@ msgstr ""
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "帐号编辑器"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "添加到地址簿(_A)..."
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "到此地址(_T)"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "自此地址(_F)"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "发送回复给(_R)..."
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "发送一条回复信息到这个地址"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "创建搜索文件夹(_F)"
 
@@ -12588,7 +12571,7 @@ msgid "_Later"
 msgstr "稍候(_L)"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1031
 msgid "Add Label"
 msgstr "添加标签"
 
@@ -12606,31 +12589,31 @@ msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
 msgid "Color"
 msgstr "颜色"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "把选中的信头移到顶部"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "把选中的信头上移一行"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "把选中的信头下移一行"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "把选中的信头移到底部"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "选中所有信头"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "信头名称"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "信头值"
 
@@ -12643,579 +12626,577 @@ msgstr "信头"
 msgid "Page %d of %d"
 msgstr "第 %d 页,共 %d 页"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "复制到文件夹"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "复制(_O)"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:345 ../mail/em-filter-i18n.h:33
 msgid "Move to Folder"
 msgstr "移至文件夹"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:345 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "复制到文件夹"
+
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:505
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:505
+msgid "C_opy"
+msgstr "复制(_O)"
+
+#: ../mail/e-mail-reader.c:1135 ../mail/e-mail-reader.c:1347
+#: ../mail/e-mail-reader.c:1387
 msgid "_Do not ask me again."
 msgstr "不再询问(_D)。"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1393
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1595
 msgid "Failed to retrieve message:"
 msgstr "获取信息失败:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1640 ../mail/e-mail-reader.c:2817
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "收取信息 %s"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1828
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1830
 msgid "Add sender to address book"
 msgstr "将发件人添加到地址簿"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1835
 msgid "Check for _Junk"
 msgstr "检查垃圾信息(_J)"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1837
 msgid "Filter the selected messages for junk status"
 msgstr "把选中的信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1842
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1844
 msgid "Copy selected messages to another folder"
 msgstr "把选中的信息复制到其它文件夹"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1849
 msgid "_Delete Message"
 msgstr "删除信息(_D)"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1851
 msgid "Mark the selected messages for deletion"
 msgstr "为选中信息做删除标记"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1856
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "为邮件列表创建一条过滤规则(_L)..."
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1858
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "创建可过滤寄往此邮件列表的信息的规则"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1863
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "为收件人创建一条过滤规则(_R)..."
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1865
 msgid "Create a rule to filter messages to these recipients"
 msgstr "创建可过滤寄往这些收件人的信息的规则"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1870
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "为发件人创建一条过滤规则(_N)..."
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1872
 msgid "Create a rule to filter messages from this sender"
 msgstr "创建可过滤此人寄来的信息的规则"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1877
 msgid "Create a Filter Rule for _Subject..."
 msgstr "为主题创建一条过滤规则(_S)..."
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1879
 msgid "Create a rule to filter messages with this subject"
 msgstr "创建可过滤此主题信息的规则"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1884
 msgid "A_pply Filters"
 msgstr "应用过滤规则(_P)"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1886
 msgid "Apply filter rules to the selected messages"
 msgstr "应用过滤规则到选中的信息"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1891
 msgid "_Find in Message..."
 msgstr "在信息中查找(_F)..."
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1893
 msgid "Search for text in the body of the displayed message"
 msgstr "在显示信息的主体中搜索文本"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1898
 msgid "_Clear Flag"
 msgstr "清除标志(_C)"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1900
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "删除选中信息的跟随标志"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1905
 msgid "_Flag Completed"
 msgstr "标志为已完成(_F)"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1907
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "设置选中信息的跟随标志为已完成"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1912
 msgid "Follow _Up..."
 msgstr "跟随(_U)..."
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1914
 msgid "Flag the selected messages for follow-up"
 msgstr "为选中信息添加跟随标志"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1919
 msgid "_Attached"
 msgstr "附件(_A)"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1921 ../mail/e-mail-reader.c:1928
 msgid "Forward the selected message to someone as an attachment"
 msgstr "把选中信息作为附件转发给某人"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1926
 msgid "Forward As _Attached"
 msgstr "作为附件转发(_A)"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:1933
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1935 ../mail/e-mail-reader.c:1942
 msgid "Forward the selected message in the body of a new message"
 msgstr "在新信体中转发选中信息"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1940
 msgid "Forward As _Inline"
 msgstr "嵌入正文转发(_I)"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:1947
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1949 ../mail/e-mail-reader.c:1956
 msgid "Forward the selected message quoted like a reply"
 msgstr "以类似于回复的引用方式转发选中的信息"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1954
 msgid "Forward As _Quoted"
 msgstr "作文引用转发(_Q)"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1961
 msgid "_Load Images"
 msgstr "载入图像(_L)"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:1963
 msgid "Force images in HTML mail to be loaded"
 msgstr "强制载入 HTML 邮件中的图像"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:1968
 msgid "_Important"
 msgstr "重要(_I)"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:1970
 msgid "Mark the selected messages as important"
 msgstr "把选中信息标记为重要邮件"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:1975
 msgid "_Junk"
 msgstr "垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:1977
 msgid "Mark the selected messages as junk"
 msgstr "把选中信息标记为垃圾信息"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:1982
 msgid "_Not Junk"
 msgstr "非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:1984
 msgid "Mark the selected messages as not being junk"
 msgstr "把选中信息标记为非垃圾信息"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:1989
 msgid "_Read"
 msgstr "读取(_R)"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages as having been read"
 msgstr "把选中信息标记为已读"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:1996
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark the selected messages as unimportant"
 msgstr "把选中信息标记为不重要"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2003
 msgid "_Unread"
 msgstr "未读(_U)"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2005
 msgid "Mark the selected messages as not having been read"
 msgstr "把选中信息标记为未读"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2010
 msgid "_Edit as New Message..."
 msgstr "作为新信息进行编辑(_E)..."
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2012
 msgid "Open the selected messages in the composer for editing"
 msgstr "在编辑器中打开选中的信息以便编辑"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2017
 msgid "Compose _New Message"
 msgstr "撰写新信息(_N)"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2019
 msgid "Open a window for composing a mail message"
 msgstr "打开窗口以撰写信息"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2024
 msgid "_Open in New Window"
 msgstr "在新窗口中打开(_O)"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2026
 msgid "Open the selected messages in a new window"
 msgstr "在新窗口中打开选中的信息"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2031
 msgid "_Move to Folder..."
 msgstr "移至文件夹(_M)..."
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2033
 msgid "Move selected messages to another folder"
 msgstr "把选中的信息移至其它文件夹"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2038
 msgid "_Next Message"
 msgstr "下一封信(_N)"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2040
 msgid "Display the next message"
 msgstr "显示下一封信息"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2045
 msgid "Next _Important Message"
 msgstr "下一封重要信息(_I)"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2047
 msgid "Display the next important message"
 msgstr "显示下一封重要信息"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2052
 msgid "Next _Thread"
 msgstr "下一条线索(_T)"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2054
 msgid "Display the next thread"
 msgstr "显示下一条线索"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2059
 msgid "Next _Unread Message"
 msgstr "下一封未读信息(_U)"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2061
 msgid "Display the next unread message"
 msgstr "显示下一封未读信息"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2066
 msgid "_Previous Message"
 msgstr "上一封信(_P)"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2068
 msgid "Display the previous message"
 msgstr "显示上一封信息"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2073
 msgid "Pr_evious Important Message"
 msgstr "上一封重要信息(_E)"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2075
 msgid "Display the previous important message"
 msgstr "显示上一封重要信息"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2080
 msgid "Previous T_hread"
 msgstr "上一条线索(_H)"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2082
 msgid "Display the previous thread"
 msgstr "显示上一条线索"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2087
 msgid "P_revious Unread Message"
 msgstr "上一封未读信息(_R)"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2089
 msgid "Display the previous unread message"
 msgstr "显示上一封未读信息"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2096
 msgid "Print this message"
 msgstr "打印该信息"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2103
 msgid "Preview the message to be printed"
 msgstr "预览要打印的信息"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2108
 msgid "Re_direct"
 msgstr "重发(_D)"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2110
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "将选中信息重发(退回)给某人"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2115
 msgid "Remo_ve Attachments"
 msgstr "移除附件(_V)"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2117
 msgid "Remove attachments"
 msgstr "移除附件"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2122
 msgid "Remove Du_plicate Messages"
 msgstr "移除重复的信息(_P)"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2124
 msgid "Checks selected messages for duplicates"
 msgstr "检查所选信息中的重复信息?"
 
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2129 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1546
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2131
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "为选中信息的所有收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2136 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2138
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "为选中信息的邮件列表撰写回复"
 
-#: ../mail/e-mail-reader.c:2177
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2143 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2145
 msgid "Compose a reply to the sender of the selected message"
 msgstr "为选中信息的发件人撰写回复"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2150
 msgid "_Save as mbox..."
 msgstr "另存为 mbox 格式(_S)..."
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2152
 msgid "Save selected messages as an mbox file"
 msgstr "把选中信息另存为 mbox 格式文件"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2157
 msgid "_Message Source"
 msgstr "信息源代码(_M)"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2159
 msgid "Show the raw email source of the message"
 msgstr "显示信息的原始邮件源代码"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2171
 msgid "_Undelete Message"
 msgstr "取消删除信息(_U)"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2173
 msgid "Undelete the selected messages"
 msgstr "取消选中信息的删除"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2178
 msgid "_Normal Size"
 msgstr "普通大小(_N)"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2180
 msgid "Reset the text to its original size"
 msgstr "把文本重新设置为原来的大小"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2185
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2187
 msgid "Increase the text size"
 msgstr "增加文本大小"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2194
 msgid "Decrease the text size"
 msgstr "减少文本大小"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2201
 msgid "Cre_ate"
 msgstr "创建(_A)"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2208
 msgid "Ch_aracter Encoding"
 msgstr "字符编码(_A)"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2215
 msgid "F_orward As"
 msgstr "转发为(_O)"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2222
 msgid "_Group Reply"
 msgstr "回复全部(_G)"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2229
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2236
 msgid "Mar_k As"
 msgstr "标记为(_K)"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2243
 msgid "_Message"
 msgstr "信息(_M)"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2250
 msgid "_Zoom"
 msgstr "缩放(_Z)"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2260
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "从邮件列表创建搜索文件夹(_L)..."
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2262
 msgid "Create a search folder for this mailing list"
 msgstr "为此邮件列表创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2267
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "从收件人创建搜索文件夹(_T)..."
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2269
 msgid "Create a search folder for these recipients"
 msgstr "为这些收件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2274
 msgid "Create a Search Folder from Sen_der..."
 msgstr "从发件人创建搜索文件夹(_D)..."
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2276
 msgid "Create a search folder for this sender"
 msgstr "为该发件人创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2281
 msgid "Create a Search Folder from S_ubject..."
 msgstr "从主题创建搜索文件夹(_U)..."
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2283
 msgid "Create a search folder for this subject"
 msgstr "为该主题创建搜索文件夹"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2306
 msgid "Mark for Follo_w Up..."
 msgstr "标记为跟随(_W)..."
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2314
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2318
 msgid "Mark as _Junk"
 msgstr "标记为垃圾(_J)"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2322
 msgid "Mark as _Not Junk"
 msgstr "标记为非垃圾(_N)"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2326
 msgid "Mar_k as Read"
 msgstr "标记为已读(_K)"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2330
 msgid "Mark as Uni_mportant"
 msgstr "标记为不重要(_M)"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2334
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2378
 msgid "_Caret Mode"
 msgstr "光标模式(_C)"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2380
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在显示信息的信体中显示闪烁光标"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2386
 msgid "All Message _Headers"
 msgstr "全部信头(_H)"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2388
 msgid "Show messages with all email headers"
 msgstr "显示信息时显示所有信头"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:2823
 msgid "Retrieving message"
 msgstr "正在获取信息"
 
-#: ../mail/e-mail-reader.c:3772
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:3796 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:3797
 msgid "Forward the selected message to someone"
 msgstr "把选中信息转发给某人"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:3816
 msgid "Group Reply"
 msgstr "回复全部"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:3817
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "为选中信息的邮件列表或全部收件人撰写回复"
 
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3883 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "删除"
 
-#: ../mail/e-mail-reader.c:3871
+#: ../mail/e-mail-reader.c:3895
 #: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Next"
 msgstr "下一项"
 
-#: ../mail/e-mail-reader.c:3875
+#: ../mail/e-mail-reader.c:3899
 #: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Previous"
 msgstr "上一项"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3908 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "回复"
 
@@ -13228,13 +13209,13 @@ msgstr "不要再警告我"
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:985
 msgid "Printing"
 msgstr "正在打印"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1220
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13244,7 +13225,7 @@ msgid_plural ""
 "them?"
 msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2046
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "保存信息"
@@ -13254,12 +13235,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:2047
+#: ../mail/e-mail-reader-utils.c:2067
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "信息"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2440
 msgid "Parsing message"
 msgstr "正在解析信息"
 
@@ -13275,7 +13256,7 @@ msgstr "跟随的标志"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1454
+#: ../mail/em-composer-utils.c:1462
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13283,23 +13264,23 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone},${Sender}写道:"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1468
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 转发的信息 --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1473
 msgid "-----Original Message-----"
 msgstr "-------- 原始信息 --------"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2629
 msgid "an unknown sender"
 msgstr "未知发件人"
 
-#: ../mail/em-composer-utils.c:3040
+#: ../mail/em-composer-utils.c:3054
 msgid "Posting destination"
 msgstr "投递目的"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3055
 msgid "Choose folders to post the message to."
 msgstr "选择要将信息投递到哪个文件夹。"
 
@@ -13608,11 +13589,11 @@ msgstr "文件夹属性"
 msgid "<click here to select a folder>"
 msgstr "<单击此处以选择文件夹>"
 
-#: ../mail/em-folder-selector.c:387
+#: ../mail/em-folder-selector.c:391
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../mail/em-folder-selector.c:393
+#: ../mail/em-folder-selector.c:397
 msgid "Folder _name:"
 msgstr "文件夹名称(_N):"
 
@@ -13626,31 +13607,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1661
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2268
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2319
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信息移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2270
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2321
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信息复制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信息放到顶级文件夹存储"
@@ -13660,7 +13641,7 @@ msgstr "无法将信息放到顶级文件夹存储"
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "正在载入..."
 
@@ -13693,7 +13674,7 @@ msgid "Subscribe To _All"
 msgstr "订阅全部(_A)"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1634
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
@@ -13730,7 +13711,7 @@ msgid "Su_bscribe"
 msgstr "订阅(_B)"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "Unsubscribe from the selected folder"
 msgstr "取消对选定文件夹的订阅"
 
@@ -13755,8 +13736,8 @@ msgid "Refresh the folder list"
 msgstr "刷新文件夹列表"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1536
+#: ../modules/mail/e-mail-shell-view-actions.c:1606
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
@@ -13868,8 +13849,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "来自"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
-#: ../shell/e-shell-utils.c:171
+#: ../mail/importers/evolution-mbox-importer.c:493 ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
@@ -14129,7 +14109,6 @@ 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:54
-#| msgid " Use for Folders "
 msgid "Use for Folders"
 msgstr "用于文件夹 "
 
@@ -14138,18 +14117,16 @@ msgid "A_dd"
 msgstr "添加(_D)"
 
 #: ../mail/mail-config.ui.h:57
-#| msgid "Remove"
 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:59
-#| msgid " Use for Recipients "
 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:61 ../modules/mail/em-composer-prefs.c:870
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:883
 msgid "Account"
 msgstr "帐号"
 
@@ -14168,7 +14145,6 @@ msgstr ""
 "包含部分地址或姓名。姓名和地址将分别比较。"
 
 #: ../mail/mail-config.ui.h:64
-#| msgid "Folder override has precedence over Recipient override"
 msgid "_Folder override has precedence over Recipient override"
 msgstr "文件夹覆盖 比 收件人覆盖 优先(_F)"
 
@@ -14306,7 +14282,7 @@ msgid "Mail Headers Table"
 msgstr "邮件头表"
 
 #: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
+#: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "日期/时间格式"
@@ -14337,7 +14313,7 @@ msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
 
 #: ../mail/mail-config.ui.h:114
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "不加密"
 
@@ -14608,8 +14584,7 @@ msgid ""
 "folders?"
 msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../mail/mail.error.xml.h:39 ../modules/mail/e-mail-shell-view-actions.c:1522
 msgid "_Empty Trash"
 msgstr "清空废件箱(_E)"
 
@@ -15148,19 +15123,19 @@ msgstr "正在取消..."
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:540
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:630 ../mail/mail-send-recv.c:1022
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:630 ../mail/mail-send-recv.c:712
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:995
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "正在检查 '%s' 处的新邮件"
@@ -15177,86 +15152,86 @@ msgstr "编辑搜索文件夹"
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信息"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5719
+#: ../mail/message-list.c:459 ../mail/message-list.c:5823
 msgid "Generating message list"
 msgstr "生成信息列表"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1846 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:1895 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:1855
+#: ../mail/message-list.c:1904
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1916
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:1924
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:1926
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2755
+#: ../mail/message-list.c:2809
 msgid "Select all visible messages"
 msgstr "选中所有可见的信息"
 
-#: ../mail/message-list.c:3383 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3457 ../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:4690
+#: ../mail/message-list.c:4764
 msgid "Follow-up"
 msgstr "跟随"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5760
 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 "
@@ -15267,7 +15242,7 @@ msgstr ""
 "示”信息过滤器;或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
 "索。"
 
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5768
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信息。"
 
@@ -15303,50 +15278,45 @@ msgstr "主题 - 被截断"
 msgid "Subject or Addresses contains"
 msgstr "主题或地址包含"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.h:2 ../modules/mail/e-mail-shell-view-actions.c:2005
 msgid "Recipients contain"
 msgstr "收件人含有"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.h:3 ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Message contains"
 msgstr "信息含有"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.h:4 ../modules/mail/e-mail-shell-view-actions.c:2019
 msgid "Subject contains"
 msgstr "主题含有"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.h:5 ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "Sender contains"
 msgstr "发件人含有"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.h:6 ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Body contains"
 msgstr "邮件体含有"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1213
 msgid "_Table column:"
 msgstr "表列(T):"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "地址格式化"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr "根据目的地国家标准格式化地址(_F)"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "自动补全"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "总是显示自动补全的联系人的地址(_S)"
 
@@ -15478,7 +15448,7 @@ msgstr "显示选中地址簿中所有联系人的地图"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1420
 #: ../modules/calendar/e-memo-shell-view-actions.c:642
 #: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1613
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
@@ -15559,7 +15529,7 @@ msgstr "操作(_A)"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1013
 #: ../modules/calendar/e-memo-shell-view-actions.c:679
 #: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1778
 msgid "_Preview"
 msgstr "预览(_P)"
 
@@ -15586,7 +15556,7 @@ msgstr "在联系人预览窗口中显示地图"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1095
 #: ../modules/calendar/e-memo-shell-view-actions.c:749
 #: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/mail/e-mail-shell-view-actions.c:1908
 msgid "_Classic View"
 msgstr "分类视图(_C)"
 
@@ -15597,7 +15567,7 @@ msgstr "在联系人列表下方显示联系人预览"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1102
 #: ../modules/calendar/e-memo-shell-view-actions.c:756
 #: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1915
 msgid "_Vertical View"
 msgstr "竖直视图(_V)"
 
@@ -15616,7 +15586,7 @@ msgstr "无匹配"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1763
 #: ../modules/calendar/e-memo-shell-view-actions.c:783
 #: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "高级搜索"
@@ -15671,7 +15641,7 @@ msgstr "给列表发送信息(_S)"
 msgid "_Send Message to Contact"
 msgstr "给联系人发送信息(_M)"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15681,17 +15651,17 @@ msgstr ""
 "\n"
 "这会恢复您所有的个人数据、设置、邮件过滤器等。"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "从备份文件恢复(_R):"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "选择要恢复的备份文件"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "从备份中恢复"
@@ -15767,7 +15737,7 @@ msgid "Back up complete"
 msgstr "备份完成"
 
 #: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:705
 msgid "Restarting Evolution"
 msgstr "重新启动 Evolution"
 
@@ -15787,45 +15757,45 @@ msgstr "载入 Evolution 的设置"
 msgid "Removing temporary back up files"
 msgstr "删除临时备份文件"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:690
 msgid "Reloading registry service"
 msgstr "重新加载注册服务"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:919
 msgid "Evolution Back Up"
 msgstr "Evolution 备份"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:920
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正在备份到文件夹 %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:924
 msgid "Evolution Restore"
 msgstr "Evolution 恢复"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:925
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "正在从文件夹 %s 中恢复"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:994
 msgid "Backing up Evolution Data"
 msgstr "正在备份 Evolution 数据"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:995
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请稍候,Evolution 正在备份您的数据。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:997
 msgid "Restoring Evolution Data"
 msgstr "正在恢复 Evolution 数据"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:998
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请稍候,Evolution 正在恢复您的数据。"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:1020
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "这可能要花一点时间,取决于您帐号中的数据总量。"
 
@@ -15902,70 +15872,77 @@ msgid "Convert message text to _Unicode"
 msgstr "将信息文本转换为 _Unicode"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#, fuzzy
+#| msgid "Junk filtering software:"
+msgid "Junk filter using Bogofilter"
+msgstr "垃圾过滤软件:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "标准 LDAP 端口"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "通过 SSL 的 LDAP(已废弃)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft 全局目录服务"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog over SSL"
 msgstr "通过 SSL 的 Microsoft 全局目录服务"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "重新连接到 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "端口:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (推荐)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "加密:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "身份验证"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名(DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "方法:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -15975,36 +15952,36 @@ msgstr ""
 "LDAP 服务器匿名访问。"
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "使用 LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
 #: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "搜索"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "搜索基础:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "查找可能的搜索基础"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "一级"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "子树"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "搜索范围:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 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 "
@@ -16015,23 +15992,23 @@ msgstr ""
 "搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
 "级的项目。"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "搜索过滤器:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "下载"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "限制:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "联系人"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "浏览直到达到极限"
 
@@ -16070,16 +16047,16 @@ msgstr "无法定位用户的日历"
 msgid "Path"
 msgstr "路径"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:198
 msgid "Choose a Calendar"
 msgstr "选择日历"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
 msgid "Choose a Memo List"
 msgstr "选择备忘列表"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
 msgid "Choose a Task List"
 msgstr "选择一个任务列表"
 
@@ -16107,11 +16084,11 @@ msgstr "服务器处理会议邀请"
 msgid "Choose which address books to use."
 msgstr "选择使用哪个地址簿。"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "在生日和纪念日日历中使用"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:125
 msgid "Default User Calendar"
 msgstr "删除用户日历"
 
@@ -16144,36 +16121,35 @@ msgstr "文件:"
 msgid "Allow Evolution to update the file"
 msgstr "允许 Evolution 更新该文件"
 
-#. Translators: Translate to the default units to use for presenting
-#. * temperature units to the user. The value can be only "default:inch"
-#. * or "default:mm", any other value is treated as "default:mm" (quotes
-#. * for clarity only). Note the value is used only if the system this
-#. * is running on doesn't provide other ways for figuring out temperature
-#. * units for the current locale.
-#.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:188
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "默认:毫米"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:260
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
 msgid "Fahrenheit (°F)"
 msgstr "华氏(°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:265
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
 msgid "Centigrade (°C)"
 msgstr "摄氏(°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
 msgid "Kelvin (K)"
 msgstr "开氏(K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:271
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
 msgid "Units:"
 msgstr "单位:"
 
@@ -16463,16 +16439,16 @@ msgstr "日历(_N)"
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:712
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
+#: ../modules/calendar/e-cal-shell-sidebar.c:119
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "打开日历“%s”"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
+#: ../modules/calendar/e-cal-shell-sidebar.c:590
 msgid "Calendar Selector"
 msgstr "日历选择器"
 
@@ -16947,12 +16923,12 @@ msgstr "备忘列表(_S)"
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
+#: ../modules/calendar/e-memo-shell-sidebar.c:117
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "打开备忘列表“%s”"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
+#: ../modules/calendar/e-memo-shell-sidebar.c:546
 msgid "Memo List Selector"
 msgstr "备忘列表选择器"
 
@@ -17040,7 +17016,7 @@ msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-task-shell-view-private.c:767
 #, c-format
 msgid "%d selected"
 msgstr "选中 %d 个"
@@ -17074,12 +17050,12 @@ msgstr "任务列表(_K)"
 msgid "Create a new task list"
 msgstr "创建新任务列表"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
+#: ../modules/calendar/e-task-shell-sidebar.c:117
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "正在打开任务列表“%s”"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:545
+#: ../modules/calendar/e-task-shell-sidebar.c:546
 msgid "Task List Selector"
 msgstr "任务列表选择器"
 
@@ -17203,11 +17179,11 @@ msgstr "删除任务"
 msgid "Delete Task"
 msgstr "删除任务"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
+#: ../modules/calendar/e-task-shell-view-private.c:652
 msgid "Expunging"
 msgstr "销毁"
 
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:763
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17921,19 +17897,19 @@ msgstr "Itip 格式化"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Google 特性"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "添加 Google Ca_lendar 到此帐。"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "添加 Google Con_tacts 到此帐号"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "您可能需要启用 IMAP 访问"
 
@@ -17975,60 +17951,60 @@ 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:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../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:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../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:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "端口(_P):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "用户名(_N):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "加密方法(_M):"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 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:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "专用端口上的 SSL"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "使用自定义二进制程序,而不是 'sendmail' (_U)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "自定义命令(_C):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "使用自定义参数(_S)"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "自定义参数(_T):"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18038,23 +18014,23 @@ msgstr ""
 "   %F - 表示来源地址\n"
 "   %R - 表示收件人地址"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
 msgid "Send mail also when in offline _mode"
 msgstr "脱机模式下也可发送邮件(_M)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "类型(_Y):"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Yahoo! 特性"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "添加 Yahoo! 日历和任务到此帐号(_L) "
 
@@ -18091,330 +18067,330 @@ msgstr "邮件文件夹(_F)"
 msgid "Create a new mail folder"
 msgstr "创建新邮件文件夹"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:643
 msgid "Mail Accounts"
 msgstr "邮件帐号"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:652
 msgid "Mail Preferences"
 msgstr "邮件首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:661
 msgid "Composer Preferences"
 msgstr "编写器首选项"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:671
 msgid "Network Preferences"
 msgstr "网络首选项"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:964
+#: ../modules/mail/e-mail-shell-backend.c:963
 msgctxt "label"
 msgid "None"
 msgstr "无"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:673
 msgid "Marking messages as read..."
 msgstr "正在把信息标记为已读..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1515
 msgid "_Disable Account"
 msgstr "禁用帐号(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1517
 msgid "Disable this account"
 msgstr "禁用这个帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1524
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "永久删除所有文件夹中的所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1531
 msgid "Edit properties of this account"
 msgstr "编辑该帐号的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1538
 msgid "Refresh list of folders of this account"
 msgstr "刷新该帐号的文件夹列表"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1543
 msgid "_Download Messages for Offline Usage"
 msgstr "下载信息以离线使用(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "下载标记为离线使用的帐号和文件夹的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1550
 msgid "Fl_ush Outbox"
 msgstr "清空发件箱(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "_Copy Folder To..."
 msgstr "文件夹复制到(_C)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1559
 msgid "Copy the selected folder into another folder"
 msgstr "把选中的文件夹复制到其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "Permanently remove this folder"
 msgstr "永久删除此文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1571
 msgid "E_xpunge"
 msgstr "销毁(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "从该文件夹永久删除所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1678
 msgid "Mar_k All Messages as Read"
 msgstr "把全部信息标记为已读(_K)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Mark all messages in the folder as read"
 msgstr "将此文件夹中的所有信息标记为已读"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1585
 msgid "_Move Folder To..."
 msgstr "文件夹移至(_M)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
 msgid "Move the selected folder into another folder"
 msgstr "把选中的文件夹移至其它文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1592
 msgid "_New..."
 msgstr "新建(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
 msgid "Create a new folder for storing mail"
 msgstr "创建存储邮件的新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Change the properties of this folder"
 msgstr "更改此文件夹的属性"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "Refresh the folder"
 msgstr "刷新文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
 msgid "Change the name of this folder"
 msgstr "更改此文件夹的名称"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1620
 msgid "Select Message _Thread"
 msgstr "选择信息线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "Select all messages in the same thread as the selected message"
 msgstr "把同一线索中的所有信息选择为选中信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1627
 msgid "Select Message S_ubthread"
 msgstr "选择信息子线索(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Select all replies to the currently selected message"
 msgstr "选择当前选中信息的所有回复"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1641
 msgid "Empty _Trash"
 msgstr "清空废件箱(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1643
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "永久删除所有帐号中的所有已删除的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1648
 msgid "_New Label"
 msgstr "新建标签(_N)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1657
 msgid "N_one"
 msgstr "无(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Manage Subscriptions"
 msgstr "管理订阅(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "订阅或退订远程服务器上的文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1706
 msgid "Send / _Receive"
 msgstr "发送/接收(_R)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1692
 msgid "R_eceive All"
 msgstr "全部接收(_E)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Receive new items from all accounts"
 msgstr "接收所有帐号中的新条目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1699
 msgid "_Send All"
 msgstr "全部发送(_S)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Send queued items in all accounts"
 msgstr "发送所有帐号的队列中的条目"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1729
 msgid "Cancel the current mail operation"
 msgstr "取消当前邮件操作"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1734
 msgid "Collapse All _Threads"
 msgstr "折叠全部线索(_T)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1736
 msgid "Collapse all message threads"
 msgstr "折叠全部信息线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
 msgid "E_xpand All Threads"
 msgstr "展开全部线索(_X)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1743
 msgid "Expand all message threads"
 msgstr "展开全部信息线索"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1748
 msgid "_Message Filters"
 msgstr "信息过滤(_M)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1750
 msgid "Create or edit rules for filtering new mail"
 msgstr "创建或编辑过滤新邮件的规则"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1755
 msgid "_Subscriptions..."
 msgstr "订阅(_S)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1764
 msgid "F_older"
 msgstr "文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1771
 msgid "_Label"
 msgstr "标签(_L)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "C_reate Search Folder From Search..."
 msgstr "从头创建搜索文件夹(_R)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "Search F_olders"
 msgstr "搜索文件夹(_O)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Create or edit search folder definitions"
 msgstr "创建或编辑搜索文件夹定义"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1836
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1864
 msgid "Show Message _Preview"
 msgstr "显示信息预览(_P)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1866
 msgid "Show message preview pane"
 msgstr "显示信息预览窗口"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "Show _Deleted Messages"
 msgstr "显示删除的信息(_D)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Show deleted messages with a line through them"
 msgstr "在信息列表中显示删除了的信息(带有删除线)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1880
 msgid "_Group By Threads"
 msgstr "按线索分组(_G)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1882
 msgid "Threaded message list"
 msgstr "按线索排列信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "_Unmatched Folder Enabled"
 msgstr "“未匹配”文件夹已启用(_U)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1890
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "开关“未匹配”搜索文件夹"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:1910
 msgid "Show message preview below the message list"
 msgstr "在信息列表下方显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:1917
 msgid "Show message preview alongside the message list"
 msgstr "在信息列表旁显示信息预览"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1925
 msgid "All Messages"
 msgstr "全部信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Important Messages"
 msgstr "重要信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:1939
 msgid "Last 5 Days' Messages"
 msgstr "前五天的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:1946
 msgid "Messages Not Junk"
 msgstr "不是垃圾信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:1953
 msgid "Messages with Attachments"
 msgstr "有附件的信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "No Label"
 msgstr "无标签"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "Read Messages"
 msgstr "已读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:1974
 msgid "Unread Messages"
 msgstr "未读信息"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Subject or Addresses contain"
 msgstr "主题或地址含有"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 msgid "All Accounts"
 msgstr "全部帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Current Account"
 msgstr "当前帐号"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
 msgid "Current Folder"
 msgstr "当前文件夹"
 
@@ -18426,61 +18402,61 @@ msgstr "全部帐号搜索"
 msgid "Account Search"
 msgstr "帐号搜索"
 
-#: ../modules/mail/e-mail-shell-view-private.c:969
+#: ../modules/mail/e-mail-shell-view-private.c:979
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "已选中 %d 个,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:978
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:988
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已删除"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1004
-#: ../modules/mail/e-mail-shell-view-private.c:1010
+#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 封草稿"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1033
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已发"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] ",%d 封未读,"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "总共 %d 封"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:1075
 msgid "Trash"
 msgstr "回收站"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1502
+#: ../modules/mail/e-mail-shell-view-private.c:1562
 msgid "Send / Receive"
 msgstr "发送/接收"
 
@@ -18488,15 +18464,15 @@ msgstr "发送/接收"
 msgid "Select Folder to Add"
 msgstr "选择要添加的文件夹"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:901
 msgid "Folder"
 msgstr "文件夹"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:937
 msgid "Recipient"
 msgstr "收件人"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1207
 msgid "Language(s)"
 msgstr "语言"
 
@@ -18520,20 +18496,20 @@ msgstr "退出时,每月一次"
 msgid "Immediately, on folder leave"
 msgstr "立即,一离开文件夹"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:357
 msgid "Header"
 msgstr "页眉"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:361
 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:1214
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "_Date header:"
 msgstr "日期头:(_D)"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1216
 msgid "Show _original header value"
 msgstr "显示原始邮件头值(_o)"
 
@@ -18543,24 +18519,24 @@ msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "您在 %3$s 上给 %1$s 发送的关于“%2$s”的信息已被阅读。"
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "“%s”的邮件通知"
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "向“%s”发送回执"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "通知发件人(_N)"
 
@@ -18725,21 +18701,28 @@ msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "这将让 SpamAssassin 更可靠,但稍慢。"
 
 #: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#, fuzzy
+#| msgid "Junk filtering software:"
+msgid "Junk filter using SpamAssassin"
+msgstr "垃圾过滤软件:"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "导入文件"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "导入已取消。"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "导入完成。"
 
@@ -18766,11 +18749,11 @@ msgstr "格式化为(_F)..."
 msgid "_Other languages"
 msgstr "其他语言(_O)"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "文字高度"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "邮件部分的语法高亮"
 
@@ -19030,7 +19013,7 @@ msgstr "Evolution 网络审查器"
 msgid "_Do not show this message again."
 msgstr "不再显示此信息(_D)。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "关键字"
@@ -19061,35 +19044,35 @@ msgstr "附件提醒"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "当您忘记为邮件信息添加附件时提醒您。"
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:708 ../plugins/bbdb/bbdb.c:717
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:732
 msgid "Create _address book entries when sending mails"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_a)"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动联系人的地址簿"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:756
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:771
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像(_S)"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:778
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好友列表的地址簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:791
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
@@ -19217,8 +19200,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "在编辑新邮件时自动启动(_A)"
 
-#: ../plugins/external-editor/external-editor.c:417
 #: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:421
 msgid "Compose in External Editor"
 msgstr "在外部编辑器中写作"
 
@@ -19592,59 +19575,59 @@ msgstr "从一个服务器上返回了无效的对象"
 msgid "An error occurred during processing: %s"
 msgstr "在处理时出现了一个错误:%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:854
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "无法打开日历。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:858
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
 msgstr "选中的日历是只读的,因此不能在此创建事件。请选择其它的日历。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:861
 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:862
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
 msgstr ""
 "选中的备忘录列表是只读的,因此不能在此创建备忘录。请选择其它的备忘录列表。"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create an _Appointment"
 msgstr "创建新约会(_A)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new event from the selected message"
 msgstr "从选择的信息中创建一个新的事件"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a Mem_o"
 msgstr "创建一个备忘(_O)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new memo from the selected message"
 msgstr "用所选邮件创建新备忘"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a _Task"
 msgstr "创建一个任务(_T)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new task from the selected message"
 msgstr "用所选邮件创建新任务"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Meeting"
 msgstr "创建一个会议(_M)"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new meeting from the selected message"
 msgstr "用所选邮件创建新会议"
 
@@ -19739,11 +19722,11 @@ msgstr "您确定您想要删除此位置吗?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "无法创建发布索引。"
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "发布日历信息(_P)"
 
@@ -19835,8 +19818,8 @@ msgstr "记住密码(_R)"
 msgid "Publishing Location"
 msgstr "发布位置"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "无效的源 UID “%s”"
@@ -19953,15 +19936,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "格式(_F):"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "选择目的文件"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "另存为(_S)"
 
@@ -19986,31 +19969,31 @@ msgstr ""
 "基于草稿的模板插件。您可以使用 $ORIG[subject]、$ORIG[from]、$ORIG[to] 或 "
 "$ORIG[body] 这样的变量,它们将替换为您所回复邮件中对应的值。"
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "无标题"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "另存为模板(_T)"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "另存为模板"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:319
 msgid "Preparing to go offline..."
 msgstr "正在准备离线..."
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:372
 msgid "Preparing to go online..."
 msgstr "正在准备上线..."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:453
 msgid "Preparing to quit"
 msgstr "正在准备退出"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:459
 msgid "Preparing to quit..."
 msgstr "正在准备退出..."
 
@@ -20026,19 +20009,19 @@ msgstr "保存搜索"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:937
+#: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
 msgstr "显示(_W):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:962
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "搜索(_C):"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "在(_N) "
 
@@ -20057,7 +20040,7 @@ msgstr "保存用户界面状态"
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Wang Li <charles linux net cn>, 2002, 2003\n"
@@ -20069,274 +20052,274 @@ msgstr ""
 "du baodao <centerpoint 139 com>, 2010\n"
 "Tong Hui <tonghuix gmail com>, 2014"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "类别编辑器"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "未安装 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "无法运行 Bug Buddy。"
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "目录(_C)"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "打开 Evolution 用户指南"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "导入(_M)..."
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "创建一个新窗口来显示这个视图"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "可用类别(_G)"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "管理可用类别"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
-msgstr "快速首选项(_Q)"
+msgstr "快速指南(_Q)"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "显示 Evolution 的快捷键"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "退出程序"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "高级搜索(_A)..."
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "构造一个更高级的搜索"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "清除当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "编辑保存的搜索(_E)..."
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "管理您保存的搜索"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "单击此处更改搜索类型"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "立即查找(_F)"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "执行当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "保存搜索(_S)..."
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "保存当前搜索参数"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "提交错误报告(_B)..."
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "将 Evolution 转入离线模式"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "将 Evolution 转入在线模式"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "布局(_O)"
 
-#: ../shell/e-shell-window-actions.c:1107
+#: ../shell/e-shell-window-actions.c:1106
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1113
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1127
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1156
 msgid "Show Side _Bar"
 msgstr "显示侧边栏(_B)"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Show the side bar"
 msgstr "显示侧边栏"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Show _Buttons"
 msgstr "显示按钮(_B)"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Show the switcher buttons"
 msgstr "显示切换器按钮"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Show the status bar"
 msgstr "显示状态栏"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Show _Tool Bar"
 msgstr "显示工具栏(_T)"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Show the tool bar"
 msgstr "显示工具栏"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1204
 msgid "_Icons Only"
 msgstr "只有图标(_I)"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Display window buttons with icons only"
 msgstr "显示只有图标的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1211
 msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1213
 msgid "Display window buttons with text only"
 msgstr "显示只有文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Icons _and Text"
 msgstr "图标和文字(_A)"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Display window buttons with icons and text"
 msgstr "显示带图标和文字的窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Tool_bar Style"
 msgstr "工具栏样式(_B)"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "使用桌面工具栏设置显示窗口按钮"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Delete Current View"
 msgstr "保存当前视图"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1242
 msgid "Save Custom View..."
 msgstr "保存当前视图..."
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1244
 msgid "Save current custom view"
 msgstr "保存当前自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1251
 msgid "C_urrent View"
 msgstr "当前视图(_U)"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1261
 msgid "Custom View"
 msgstr "当前视图"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1263
 msgid "Current view is a customized view"
 msgstr "当前视图为自定义视图"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1271
 msgid "Page Set_up..."
 msgstr "页面设置(_U)..."
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1273
 msgid "Change the page settings for your current printer"
 msgstr "更改当前打印机的页面设置"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1634
 #, c-format
 msgid "Switch to %s"
 msgstr "切换到 %s"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "选择视图:%s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "删除视图:%s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1868
 msgid "Execute these search parameters"
 msgstr "执行这些搜索参数"
 
@@ -20351,7 +20334,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:187
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20383,7 +20366,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:211
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20391,13 +20374,13 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:217
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:306
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20405,50 +20388,50 @@ msgstr ""
 "启动 Evolution 后显示特定组件。可用的选项"
 "有“mail”、“calendar”、“contacts”、“tasks”和“memos”"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:310
 msgid "Apply the given geometry to the main window"
 msgstr "应用给定的几何参数到主窗口"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:314
 msgid "Start in online mode"
 msgstr "以在线模式启动"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:316
 msgid "Ignore network availability"
 msgstr "忽略网络是否可用"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "强制关闭所有 Evolution"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:322
 msgid "Disable loading of any plugins."
 msgstr "禁止载入任何插件。"
 
-#: ../shell/main.c:319
+#: ../shell/main.c:324
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览面板。"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:328
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "导入 URI 或者给定文件名作为剩余参数。"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:330
 msgid "Request a running Evolution process to quit"
 msgstr "请求正在运行的 Evolution 进程退出"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:407
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
 "System error: %s"
 msgstr "无法启动 Evolution。也许有另外的 Evolution 实例没有响应。系统错误:%s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:501 ../shell/main.c:506
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信息管理和邮件客户"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:573
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20457,7 +20440,7 @@ msgstr ""
 "%s:不能同时使用 --online 和 --offline。\n"
 "  运行 %s --help 了解更多信息。\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:579
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20502,7 +20485,7 @@ msgstr ""
 "Evolution不再支持从版本{0}直接升级。然而您可以尝试先升级到Evolution 2,然后再"
 "升级到Evolution 3。"
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20518,66 +20501,55 @@ msgstr ""
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:81 ../smime/gui/certificate-manager.c:101
 msgid "Issued To Organization"
 msgstr "授予组织"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:82 ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organizational Unit"
 msgstr "授予组织单元"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:83 ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:121
 msgid "Serial Number"
 msgstr "序列号"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:104
 #: ../smime/gui/certificate-manager.c:122
 msgid "Purposes"
 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
 #: ../smime/gui/certificate-manager.c:123
 msgid "Issued By"
 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
 #: ../smime/gui/certificate-manager.c:124
 msgid "Issued By Organization"
 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 "Issued By Organizational Unit"
 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 "Issued"
 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 "Expires"
 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 "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../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 "MD5 Fingerprint"
 msgstr "MD5 指纹"
@@ -20764,7 +20736,7 @@ msgstr "签名"
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:723
 msgid "Certificate already exists"
 msgstr "证书已经存在"
 


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