aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWylmer Wang <wantinghard@gmail.com>2014-02-20 11:20:51 +0800
committerGNOME Translation Robot <gnome-sysadmin@gnome.org>2014-02-20 11:20:51 +0800
commit78961b6fdc333dc70867f894abcfdb7ff4a56fab (patch)
treea0f1f9bd922492e83bfa9344b273d44cb17a3da1
parentef70b5b21c319b9e2621fe3179371c58f6f35617 (diff)
downloadgsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.tar
gsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.tar.gz
gsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.tar.bz2
gsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.tar.lz
gsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.tar.xz
gsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.tar.zst
gsoc2013-evolution-78961b6fdc333dc70867f894abcfdb7ff4a56fab.zip
Updated Chinese (China) translation
-rw-r--r--po/zh_CN.po2609
1 files changed, 1483 insertions, 1126 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bde6c05bf1..6a835546ee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,10 +13,10 @@
# du baodao <centerpoint@139.com>, 2010.
# Tao Wang <dancefire@gmail.com>, 2010.
# 李炜 <lw124124@gmail.com>, 2011.
-# Wylmer Wang <wantinghard@gmail.com>, 2011,2012.
+# Wylmer Wang <wantinghard@gmail.com>, 2011, 2012, 2014.
# tuhaihe <1132321739qq@gmail.com>, 2012.
# 甘露(Gan Lu) <rhythm.gan@gmail.com>,2013
-# Tong Hui <tonghuix@gmail.com>, 2013.
+# Tong Hui <tonghuix@gmail.com>, 2013, 2014.
#
#: ../shell/main.c:554
msgid ""
@@ -24,16 +24,15 @@ 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-01-17 20:40+0000\n"
-"PO-Revision-Date: 2014-01-13 00:28+0800\n"
-"Last-Translator: Tong Hui <tonghuix@gmail.com>\n"
+"POT-Creation-Date: 2014-02-18 15:31+0000\n"
+"PO-Revision-Date: 2014-01-23 21:43+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.5.4\n"
#: ../addressbook/addressbook.error.xml.h:1
msgid "This address book could not be opened."
@@ -189,8 +188,21 @@ msgid ""
msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添加新名片吗?"
#: ../addressbook/addressbook.error.xml.h:33
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/em-vfolder-editor-rule.c:392
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/widgets/eab-contact-merging.c:625
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
+#: ../calendar/gui/dialogs/task-page.ui.h:30 ../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
+#: ../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:100
#: ../modules/mail/em-composer-prefs.c:443
+#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../plugins/templates/templates.c:453
msgid "_Add"
msgstr "添加(_A)"
@@ -299,7 +311,7 @@ msgstr "愿意接收 HTML 邮件(_W)"
#: ../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:965
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
msgid "Email"
msgstr "电子邮件"
@@ -321,9 +333,9 @@ msgid "_Home Page:"
msgstr "主页(_H):"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:710
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1884
+#: ../calendar/gui/dialogs/event-page.c:709
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/itip-formatter/itip-view.c:1891
msgid "_Calendar:"
msgstr "日历(_C):"
@@ -387,21 +399,21 @@ msgid "_Department:"
msgstr "部门(_D):"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "办公室(_O):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
msgid "_Manager:"
msgstr "经理(_M):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
msgid "_Assistant:"
msgstr "助手(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
msgid "Job"
msgstr "工作"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "办公室(_O):"
-
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
msgid "_Spouse:"
msgstr "配偶(_S):"
@@ -415,7 +427,7 @@ msgid "_Anniversary:"
msgstr "周年(_A):"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
#: ../calendar/gui/e-calendar-view.c:2277
msgid "Anniversary"
msgstr "纪念日"
@@ -426,7 +438,7 @@ 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:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
#: ../calendar/gui/e-calendar-view.c:2276 ../shell/main.c:127
msgid "Birthday"
msgstr "生日"
@@ -476,7 +488,7 @@ msgstr "家庭"
#: ../addressbook/gui/widgets/e-contact-map.c:384
#: ../addressbook/gui/widgets/eab-contact-display.c:353
#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
msgid "Work"
msgstr "工作"
@@ -484,7 +496,7 @@ 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:718
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
#: ../calendar/gui/e-cal-model.c:3957
msgid "Other"
msgstr "其它"
@@ -497,6 +509,80 @@ msgstr "邮政地址"
msgid "Notes"
msgstr "笔记"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1337 ../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:1041
+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-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:362
+#: ../addressbook/gui/widgets/eab-contact-merging.c:620
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c: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-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-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:3081 ../e-util/evolution-source-viewer.c:832
+#: ../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:241 ../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/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/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
+#: ../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
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:623
+#: ../calendar/calendar.error.xml.h:47
+#: ../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:3082
+#: ../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
msgid "AIM"
@@ -553,7 +639,7 @@ msgid "Redo"
msgstr "重做"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/widgets/eab-gui-util.c:504
+#: ../addressbook/gui/widgets/eab-gui-util.c:503
msgid "Error adding contact"
msgstr "添加联系人出错"
@@ -571,15 +657,22 @@ msgstr "删除联系人出错"
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3568
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3569
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../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"
+msgid "_Open"
+msgstr "打开(_O)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3927
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -587,31 +680,60 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3933
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3941
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
#, c-format
msgid "'%s' cannot be a future date"
msgstr "“%s”不能是未来的日期"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3949
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3962
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3976
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3991
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
msgid "Invalid contact."
msgstr "无效的联系人。"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
+#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
+#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-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:242
+#: ../mail/em-folder-selector.c:279 ../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
+#: ../smime/gui/smime-ui.ui.h:24
+#| msgid "OK"
+msgid "_OK"
+msgstr "确定(_O)"
+
#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
@@ -681,24 +803,24 @@ msgstr "先生"
msgid "Full Name"
msgstr "全名"
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
msgid "_First:"
msgstr "姓(_F):"
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
msgctxt "FullName"
msgid "_Title:"
msgstr "头衔(_T):"
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
msgid "_Middle:"
msgstr "中间名(_M):"
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
msgid "_Last:"
msgstr "名(_L):"
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
msgid "_Suffix:"
msgstr "后缀(_S):"
@@ -727,18 +849,58 @@ msgstr "在往该列表发送邮件时隐藏地址(_H)"
msgid "Add an email to the List"
msgstr "将电子邮件添加到列表"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
msgid "Remove an email address from the List"
msgstr "从列表中删除电子邮件地址"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/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-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:101
+#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
msgid "Insert email addresses from Address Book"
msgstr "从地址簿中插入电子邮件地址"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
msgid "_Select..."
msgstr "选择(_S)..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr "顶部(_T)"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+#: ../e-util/filter.ui.h:20
+#| msgid "_Update"
+msgid "_Up"
+msgstr "上(_U)"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../e-util/filter.ui.h:21
+#| msgid "Move _Down"
+msgid "_Down"
+msgstr "下(_D)"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr "底部(_B)"
+
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
msgid "Contact List Members"
msgstr "联系人列表成员"
@@ -759,55 +921,61 @@ msgstr "修改列表出错"
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:1
-msgid "Duplicate Contact Detected"
-msgstr "复制检测到的联系人"
-
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:2
-msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
-msgstr "此联系人的姓名或邮箱地址已经在本文件夹中了。您仍要保存更改吗?"
-
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "冲突的联系人:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "已取消"
-#: ../addressbook/gui/widgets/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "更改了的联系人:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+msgid "Merge Contact"
+msgstr "合并联系人"
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:2
#: ../addressbook/gui/widgets/eab-contact-merging.c:363
+#: ../addressbook/gui/widgets/eab-contact-merging.c:626
msgid "_Merge"
msgstr "合并(_M)"
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:615
+msgid "Duplicate Contact Detected"
+msgstr "复制检测到的联系人"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:670
+#| msgid ""
+#| "The name or email of this contact already exists in this folder. Would "
+#| "you like to save the changes anyway?"
msgid ""
"The name or email address of this contact already exists\n"
-"in this folder. Would you like to add it anyway?"
+"in this folder. Would you like to save the changes anyway?"
+msgstr "此联系人的姓名或邮箱地址已经在本文件夹中了。\n"
+"您仍要保存更改吗?"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:673
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder. Would you like to add it anyway?"
+msgid ""
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to add it anyway?"
msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
-"您一定要添加吗?"
+"您仍然要添加它吗?"
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "原联系人:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:687
+msgid "Changed Contact:"
+msgstr "更改了的联系人:"
-#: ../addressbook/gui/widgets/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:689
msgid "New Contact:"
msgstr "新联系人:"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "已取消"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:725
+msgid "Conflicting Contact:"
+msgstr "冲突的联系人:"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
-msgid "Merge Contact"
-msgstr "合并联系人"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:727
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "以前联系人:"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
#: ../modules/addressbook/e-book-shell-view-actions.c:1150
@@ -898,6 +1066,19 @@ msgstr "您确定要删除这些联系人吗?"
msgid "Are you sure you want to delete this contact (%s)?"
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/evolution-source-viewer.c:803
+#: ../mail/e-mail-account-manager.c:737
+#: ../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:899 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "删除(_D)"
+
#. Translators: This is shown for > 5 contacts.
#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
#, c-format
@@ -989,7 +1170,7 @@ msgid "ISDN Phone"
msgstr "ISDN 电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
msgid "Mobile Phone"
msgstr "移动电话"
@@ -1037,6 +1218,7 @@ msgid "Unit"
msgstr "单位"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
msgid "Office"
msgstr "办公室"
@@ -1051,12 +1233,12 @@ msgid "Role"
msgstr "角色"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
msgid "Manager"
msgstr "经理"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
msgid "Assistant"
msgstr "助手"
@@ -1077,19 +1259,38 @@ msgid "Categories"
msgstr "类别"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
msgid "Spouse"
msgstr "配偶"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:740
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
msgid "Note"
msgstr "注释"
-#: ../addressbook/gui/widgets/e-contact-map-window.c:373
+#: ../addressbook/gui/widgets/e-contact-map-window.c:375
msgid "Contacts Map"
msgstr "联系人地图"
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "放大(_I)"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:418
+#: ../mail/e-mail-reader.c:2226
+msgid "Zoom _Out"
+msgstr "缩小(_O)"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:448
+#: ../shell/e-shell-window-actions.c:976
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "查找(_F)"
+
#: ../addressbook/gui/widgets/e-minicard-view.c:190
msgid ""
"\n"
@@ -1234,19 +1435,19 @@ msgstr "列出成员:"
msgid "Department"
msgstr "部门"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
msgid "Profession"
msgstr "职业"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
msgid "Position"
msgstr "位置"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
msgid "Video Chat"
msgstr "视频聊天"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
#: ../e-util/e-send-options.c:545
#: ../modules/calendar/e-cal-shell-view-actions.c:215
#: ../modules/calendar/e-cal-shell-view-actions.c:244
@@ -1255,57 +1456,57 @@ msgstr "视频聊天"
msgid "Calendar"
msgstr "日历"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
#: ../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:653
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
msgid "Phone"
msgstr "电话"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
msgid "Fax"
msgstr "传真"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:708
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
msgid "Address"
msgstr "地址"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:678
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
msgid "Home Page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
msgid "Web Log"
msgstr "Web 日志"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
msgid "Personal"
msgstr "个人"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:929
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
msgid "List Members"
msgstr "列出成员"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:950
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
msgid "Job Title"
msgstr "职称"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:991
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
msgid "Home page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1001
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
msgid "Blog"
msgstr "Blog"
-#: ../addressbook/gui/widgets/eab-gui-util.c:122
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
msgid ""
"This address book cannot be opened. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1314,14 +1515,14 @@ msgstr ""
"无法打开此地址簿。这可能意味着此地址簿没有标为可离线使用,或者尚未下载完成以"
"供离线使用。请在在线模式中载入此地址簿以便下载其内容。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:141
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
#, c-format
msgid ""
"This address book cannot be opened. Please check that the path %s exists "
"and that permissions are set to access it."
msgstr "无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. To "
"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1329,7 +1530,7 @@ msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
msgid ""
"This address book cannot be opened. This either means that an incorrect URI "
"was entered, or the server is unreachable."
@@ -1337,11 +1538,11 @@ msgstr ""
"无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经关"
"闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
msgid "Detailed error message:"
msgstr "详细错误信息:"
-#: ../addressbook/gui/widgets/eab-gui-util.c:212
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1352,7 +1553,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:219
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"configured for this address book. Please make your search\n"
@@ -1364,50 +1565,50 @@ msgstr ""
"中将时间限制调高。"
#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:227
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
#, c-format
msgid "The backend for this address book was unable to parse this query. %s"
msgstr "此地址簿的后端无法解析此查询。%s"
#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:232
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
#, c-format
msgid "The backend for this address book refused to perform this query. %s"
msgstr "此地址簿的后端拒绝执行此查询。%s"
#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:238
-#: ../addressbook/gui/widgets/eab-gui-util.c:244
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
#, c-format
msgid "This query did not complete successfully. %s"
msgstr "此查询未成功完成。%s"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:266
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:317
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:590
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:595
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
msgid "Copy contacts to"
msgstr "将联系人复制到"
@@ -1545,30 +1746,54 @@ msgstr "全部错过(_A)"
msgid "_Snooze"
msgstr "午睡(_S)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../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
+#: ../mail/e-mail-label-manager.c:382
+#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../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:1027
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#| msgid "Print"
+msgid "_Print"
+msgstr "打印(_P)"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
msgid "_Dismiss"
msgstr "错过(_D)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../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:240
-#: ../modules/itip-formatter/itip-view.c:1496
-#: ../modules/itip-formatter/itip-view.c:1607
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:250
+#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:1614
msgid "Location:"
msgstr "位置:"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
msgid "Snooze _time:"
msgstr "午睡时间(_T):"
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../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
#: ../modules/calendar/e-cal-shell-view-actions.c:351
@@ -1576,14 +1801,14 @@ msgstr "午睡时间(_T):"
msgid "days"
msgstr "天"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../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
msgid "hours"
msgstr "小时"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../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
@@ -1621,6 +1846,17 @@ msgstr[0] "您有 %d 条提醒"
msgid "Warning"
msgstr "警告"
+#: ../calendar/alarm-notify/alarm-queue.c:1966 ../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
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "是(_Y)"
+
#: ../calendar/alarm-notify/alarm-queue.c:1971
#, c-format
msgid ""
@@ -1647,7 +1883,7 @@ 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/gui/misc.c:95
+#: ../calendar/gui/misc.c:103
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -1655,7 +1891,7 @@ 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/gui/misc.c:101
+#: ../calendar/gui/misc.c:109
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -1665,7 +1901,7 @@ msgstr[0] "%d 分钟"
#. 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/gui/misc.c:105
+#: ../calendar/gui/misc.c:113
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -1877,10 +2113,6 @@ msgid ""
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:296
-msgid "_Save"
-msgstr "保存(_S)"
-
#: ../calendar/calendar.error.xml.h:48
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
@@ -2100,18 +2332,18 @@ msgid "Summary"
msgstr "概要"
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
msgid "contains"
msgstr "含有"
#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
msgid "does not contain"
msgstr "不含有"
#: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
#: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
#: ../modules/plugin-manager/evolution-plugin-manager.c:68
msgid "Description"
msgstr "描述"
@@ -2126,12 +2358,12 @@ msgid "Classification"
msgstr "分类"
#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
msgid "is"
msgstr "是"
#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
msgid "is not"
msgstr "不是"
@@ -2190,12 +2422,12 @@ msgid "Attachments"
msgstr "附件"
#: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
msgid "Exist"
msgstr "存在"
#: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
msgid "Do Not Exist"
msgstr "不存在"
@@ -2288,57 +2520,57 @@ msgstr "天"
msgid "Add Reminder"
msgstr "添加提醒"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
#: ../calendar/gui/dialogs/event-editor.c:352
msgid "Reminder"
msgstr "提醒"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
msgid "Repeat"
msgstr "重复"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
msgid "_Repeat the reminder"
msgstr "重复提醒(_R)"
#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
msgid "extra times every"
msgstr "每个额外时间"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
msgid "Options"
msgstr "选项"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
msgid "Custom _message"
msgstr "自定义信息(_M)"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
msgid "Mes_sage:"
msgstr "信息(_S):"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
msgid "Custom reminder sound"
msgstr "自定义提醒声音"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
msgid "_Sound:"
msgstr "声音(_S):"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
msgid "Select A File"
msgstr "选择一个文件"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
msgid "_Program:"
msgstr "程序(_P):"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
msgid "_Arguments:"
msgstr "参数(_A):"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
msgid "Send To:"
msgstr "发送至:"
@@ -2347,15 +2579,11 @@ msgid "Action/Trigger"
msgstr "动作/触发器"
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:28
#: ../modules/calendar/e-calendar-preferences.ui.h:62
msgid "Reminders"
msgstr "提醒"
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "添加(_D)"
-
#: ../calendar/gui/dialogs/changed-comp.c:59
msgid "This event has been deleted."
msgstr "此事件已经被删除。"
@@ -2450,10 +2678,32 @@ msgstr "保留原始条目?"
msgid "Unable to synchronize with the server"
msgstr "无法与服务器同步"
+#: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../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
+#: ../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:416 ../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:864
+#: ../smime/gui/certificate-manager.c:1182
+msgid "_Close"
+msgstr "关闭(_C)"
+
#: ../calendar/gui/dialogs/comp-editor.c:1224
msgid "Close the current window"
msgstr "关闭当前窗口"
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-text.c:2084
+#: ../mail/e-mail-browser.c:133 ../shell/e-shell-window-actions.c:885
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "复制(_C)"
+
#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:733
#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
@@ -2462,6 +2712,12 @@ msgstr "关闭当前窗口"
msgid "Copy the selection"
msgstr "复制选中内容"
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-text.c:2071
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:892
+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:224 ../e-util/e-focus-tracker.c:728
#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1296
@@ -2479,6 +2735,13 @@ msgstr "删除选中内容"
msgid "View help"
msgstr "查看帮助"
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:920
+#| msgid "_Pascal"
+msgid "_Paste"
+msgstr "粘贴(_P)"
+
#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:738
#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1308
@@ -2486,6 +2749,22 @@ msgstr "查看帮助"
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
+#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
+#: ../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
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "预览(_V)..."
+
#: ../calendar/gui/dialogs/comp-editor.c:1280
msgid "Save current changes"
msgstr "保存当前更改"
@@ -2499,6 +2778,13 @@ msgstr "保存并关闭"
msgid "Save current changes and close editor"
msgstr "保存当前更改并关闭编辑器"
+#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../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:997
+#| msgid "Select All"
+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:252 ../e-util/e-focus-tracker.c:748
#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:999
@@ -2509,25 +2795,12 @@ msgstr "选中所有文字"
msgid "_Classification"
msgstr "分类(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1323
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-browser.c:170
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1027
-msgid "_Edit"
-msgstr "编辑(_E)"
-
#: ../calendar/gui/dialogs/comp-editor.c:1330
#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
#: ../shell/e-shell-window-actions.c:1034
msgid "_File"
msgstr "文件(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1337
-#: ../shell/e-shell-window-actions.c:1041
-msgid "_Help"
-msgstr "帮助(_H)"
-
#: ../calendar/gui/dialogs/comp-editor.c:1344
msgid "_Insert"
msgstr "插入(_I)"
@@ -2741,11 +3014,11 @@ msgstr "由于错误,无法删除项目:%s"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
msgid "Delegate To:"
msgstr "授权给:"
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
msgid "Contacts..."
msgstr "联系人..."
@@ -2803,7 +3076,7 @@ msgid "Appointment"
msgstr "约会"
#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:27
#: ../calendar/gui/e-meeting-list-view.c:164
msgid "Attendees"
msgstr "出席者"
@@ -2812,97 +3085,97 @@ msgstr "出席者"
msgid "Print this event"
msgstr "打印此事件"
-#: ../calendar/gui/dialogs/event-page.c:558
+#: ../calendar/gui/dialogs/event-page.c:557
msgid "Event's start time is in the past"
msgstr "事件开始时间在过去"
-#: ../calendar/gui/dialogs/event-page.c:635
+#: ../calendar/gui/dialogs/event-page.c:634
msgid "Event cannot be edited, because the selected calendar is read only"
msgstr "因所选的日程为只读,您无法编辑该事件。"
-#: ../calendar/gui/dialogs/event-page.c:639
+#: ../calendar/gui/dialogs/event-page.c:638
msgid "Event cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者,因此无法编辑全部事件。"
-#: ../calendar/gui/dialogs/event-page.c:651
-#: ../calendar/gui/dialogs/event-page.c:3173
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3171
msgid "This event has reminders"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:718
+#: ../calendar/gui/dialogs/event-page.c:717
#: ../calendar/gui/dialogs/event-page.ui.h:13
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1302
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1306
+#: ../calendar/gui/dialogs/event-page.c:1305
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1484
-#: ../calendar/gui/dialogs/memo-page.c:727
-#: ../calendar/gui/dialogs/task-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../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:1495
+#: ../calendar/gui/dialogs/event-page.c:1494
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1519
+#: ../calendar/gui/dialogs/event-page.c:1518
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1527
+#: ../calendar/gui/dialogs/event-page.c:1526
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1691
-#: ../calendar/gui/dialogs/memo-page.c:766
-#: ../calendar/gui/dialogs/task-page.c:1085
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../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:1726
-#: ../calendar/gui/dialogs/task-page.c:1120
+#: ../calendar/gui/dialogs/event-page.c:1725
+#: ../calendar/gui/dialogs/task-page.c:1119
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1932
+#: ../calendar/gui/dialogs/event-page.c:1931
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:1934
+#: ../calendar/gui/dialogs/event-page.c:1933
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:3453
+#: ../calendar/gui/dialogs/event-page.c:3451
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:3459
+#: ../calendar/gui/dialogs/event-page.c:3457
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:3465
+#: ../calendar/gui/dialogs/event-page.c:3463
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:3486
+#: ../calendar/gui/dialogs/event-page.c:3484
msgid "Customize"
msgstr "自定义"
#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3493
+#: ../calendar/gui/dialogs/event-page.c:3491
msgctxt "cal-reminders"
msgid "None"
msgstr "无"
@@ -2965,17 +3238,17 @@ msgstr "概要(_S):"
msgid "Event Description"
msgstr "事件描述"
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:30
-#: ../calendar/gui/e-meeting-time-sel.c:546
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/e-meeting-time-sel.c:547
msgid "Atte_ndees..."
msgstr "出席者(_N)..."
-#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/event-page.ui.h:30
msgid "_Reminder"
msgstr "提醒(_R)"
-#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/event-page.ui.h:31
msgid "Custom Reminder:"
msgstr "自定义提醒:"
@@ -3056,22 +3329,22 @@ msgstr "因所选的备忘列表为只读,您无法编辑该备忘。"
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者,因此无法编辑全部备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1161
+#: ../calendar/gui/dialogs/memo-page.c:1166
#: ../em-format/e-mail-formatter-utils.c:201
#: ../em-format/e-mail-formatter-utils.c:218
-#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:78
+#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
msgid "To"
msgstr "收件人"
#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:427
-#: ../calendar/gui/dialogs/task-page.ui.h:31
+#: ../calendar/gui/dialogs/task-page.c:426
+#: ../calendar/gui/dialogs/task-page.ui.h:34
msgid "_List:"
msgstr "列表(_L):"
#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:435
+#: ../calendar/gui/dialogs/task-page.c:434
#: ../calendar/gui/dialogs/task-page.ui.h:24
msgid "Organi_zer:"
msgstr "组织者(_Z):"
@@ -3343,7 +3616,7 @@ msgstr "每"
msgid "Exceptions"
msgstr "例外"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
msgid "Preview"
msgstr "预览"
@@ -3371,34 +3644,34 @@ msgstr "任务"
msgid "Print this task"
msgstr "打印此任务"
-#: ../calendar/gui/dialogs/task-page.c:331
+#: ../calendar/gui/dialogs/task-page.c:330
msgid "Task's start date is in the past"
msgstr "任务的开始日期是在过去"
-#: ../calendar/gui/dialogs/task-page.c:332
+#: ../calendar/gui/dialogs/task-page.c:331
msgid "Task's due date is in the past"
msgstr "任务的到期时间是在过去"
-#: ../calendar/gui/dialogs/task-page.c:365
+#: ../calendar/gui/dialogs/task-page.c:364
msgid "Task cannot be edited, because the selected task list is read only"
msgstr "任务不能被编辑,因为选择的任务列表是只读的"
-#: ../calendar/gui/dialogs/task-page.c:369
+#: ../calendar/gui/dialogs/task-page.c:368
msgid "Task cannot be fully edited, because you are not the organizer"
msgstr "无法完全编辑任务,因为您不是组织者"
-#: ../calendar/gui/dialogs/task-page.c:373
+#: ../calendar/gui/dialogs/task-page.c:372
msgid ""
"Task cannot be edited, because the selected task list does not support "
"assigned tasks"
msgstr "任务无法编辑,因为选定的任务列表不支持分配的任务"
-#: ../calendar/gui/dialogs/task-page.c:1012
+#: ../calendar/gui/dialogs/task-page.c:1011
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1180
-#: ../calendar/gui/dialogs/task-page.c:1205
+#: ../calendar/gui/dialogs/task-page.c:1179
+#: ../calendar/gui/dialogs/task-page.c:1204
msgid "Completed date is wrong"
msgstr "完成日期有错"
@@ -3474,7 +3747,7 @@ msgstr "已完成"
#: ../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:859
+#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
msgid "Canceled"
msgstr "已取消"
@@ -3486,27 +3759,27 @@ msgstr "到期日期(_U):"
msgid "Time zone:"
msgstr "时区:"
-#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../calendar/gui/dialogs/task-page.ui.h:35
msgid "_Status:"
msgstr "状态(_S):"
-#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/dialogs/task-page.ui.h:36
msgid "Date _completed:"
msgstr "完成日期(_C):"
-#: ../calendar/gui/dialogs/task-page.ui.h:34
+#: ../calendar/gui/dialogs/task-page.ui.h:37
msgid "_Percent complete:"
msgstr "完成百分比(_P):"
-#: ../calendar/gui/dialogs/task-page.ui.h:35
+#: ../calendar/gui/dialogs/task-page.ui.h:38
msgid "Priorit_y:"
msgstr "优先级(_Y):"
-#: ../calendar/gui/dialogs/task-page.ui.h:36
+#: ../calendar/gui/dialogs/task-page.ui.h:39
msgid "C_lassification:"
msgstr "分类(_L):"
-#: ../calendar/gui/dialogs/task-page.ui.h:37
+#: ../calendar/gui/dialogs/task-page.ui.h:40
msgid "_Web Page:"
msgstr "网页(_W):"
@@ -3659,7 +3932,7 @@ 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/e-alarm-list.c:357 ../calendar/gui/misc.c:97
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -3742,7 +4015,7 @@ msgstr "月日历视图"
msgid "calendar view for one or more weeks"
msgstr "一周或多周的日历视图"
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:753
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
#: ../mail/e-mail-config-page.c:125
msgid "Untitled"
msgstr "无标题"
@@ -3768,8 +4041,8 @@ msgid "Due Date:"
msgstr "到期日期:"
#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1499
-#: ../modules/itip-formatter/itip-view.c:1616
+#: ../modules/itip-formatter/itip-view.c:1506
+#: ../modules/itip-formatter/itip-view.c:1623
msgid "Status:"
msgstr "状态:"
@@ -3819,7 +4092,7 @@ msgstr "类型"
msgid "Completion date"
msgstr "完成日期"
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:861
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
msgid "Complete"
msgstr "完成"
@@ -3844,7 +4117,7 @@ msgstr "优先级"
#: ../calendar/gui/e-cal-model.c:4011
#: ../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:75
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
#: ../mail/message-list.etspec.h:1
msgid "Status"
msgstr "状态"
@@ -3908,7 +4181,7 @@ msgstr "组织者:%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
#: ../calendar/gui/e-calendar-view.c:2103
-#: ../calendar/gui/e-meeting-time-sel.c:2667 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
@@ -3933,8 +4206,8 @@ msgstr "结束日期"
#: ../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
-#: ../modules/itip-formatter/itip-view.c:3503
-#: ../modules/itip-formatter/itip-view.c:6090
+#: ../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 "未知"
@@ -3963,28 +4236,28 @@ msgstr "否"
#: ../calendar/gui/e-cal-model.c:3952
#: ../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:6078
+#: ../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-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6084
+#: ../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-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:525
+#: ../calendar/gui/e-meeting-time-sel.c:527
msgid "Tentative"
msgstr "暂时的"
#: ../calendar/gui/e-cal-model.c:3955
#: ../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:6087
+#: ../modules/itip-formatter/itip-view.c:6094
msgid "Delegated"
msgstr "被委任的"
@@ -3998,7 +4271,7 @@ msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:526 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
msgid "Busy"
msgstr "繁忙"
@@ -4038,14 +4311,14 @@ 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:1540
+#: ../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
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:1543
+#: ../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
msgid "pm"
@@ -4063,7 +4336,7 @@ 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:3437
+#: ../calendar/gui/e-day-view.c:3442
#, c-format
msgid "Week %d"
msgstr "第%d周"
@@ -4122,7 +4395,7 @@ 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:5
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
msgid "Group"
msgstr "组"
@@ -4197,67 +4470,67 @@ msgstr "失败原因:%s"
msgid "Enter password"
msgstr "输入密码"
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:566
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:589
+#: ../calendar/gui/e-meeting-time-sel.c:586
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:599
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:617
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:637
+#: ../calendar/gui/e-meeting-time-sel.c:634
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:657
+#: ../calendar/gui/e-meeting-time-sel.c:654
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:674
+#: ../calendar/gui/e-meeting-time-sel.c:671
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:695
+#: ../calendar/gui/e-meeting-time-sel.c:692
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:703
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:717
+#: ../calendar/gui/e-meeting-time-sel.c:714
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:727
+#: ../calendar/gui/e-meeting-time-sel.c:724
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:766
+#: ../calendar/gui/e-meeting-time-sel.c:763
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:795
+#: ../calendar/gui/e-meeting-time-sel.c:792
msgid "_End time:"
msgstr "结束时间(_E):"
-#: ../calendar/gui/e-meeting-time-sel.c:2663
+#: ../calendar/gui/e-meeting-time-sel.c:2660
#, c-format
msgid ""
"Summary: %s\n"
@@ -4266,7 +4539,7 @@ msgstr ""
"简要:%s\n"
"位置:%s"
-#: ../calendar/gui/e-meeting-time-sel.c:2665 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
@@ -4756,11 +5029,11 @@ msgstr "进行中"
msgid "% Completed"
msgstr "% 完成"
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
msgid "is greater than"
msgstr "大于"
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
msgid "is less than"
msgstr "小于"
@@ -6494,11 +6767,6 @@ msgstr "太平洋/雅浦"
msgid "Save as..."
msgstr "另存为..."
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
-msgid "_Close"
-msgstr "关闭(_C)"
-
#: ../composer/e-composer-actions.c:277
msgid "Close the current file"
msgstr "关闭当前文件"
@@ -6511,6 +6779,11 @@ msgstr "新建信息(_M)"
msgid "Open New Message window"
msgstr "打开新建信息窗口"
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:934
+#| msgid "Mail Preferences"
+msgid "_Preferences"
+msgstr "首选项(_P)"
+
#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:936
msgid "Configure Evolution"
msgstr "配置 Evolution"
@@ -6531,10 +6804,6 @@ msgstr "用不同的文件名保存当前文件"
msgid "Character _Encoding"
msgstr "字符编码(_E)"
-#: ../composer/e-composer-actions.c:329
-msgid "_Print..."
-msgstr "打印(_P)..."
-
#: ../composer/e-composer-actions.c:336
msgid "Print Pre_view"
msgstr "打印预览(_V)"
@@ -6892,7 +7161,7 @@ msgstr ""
"进行顺利集成。"
#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
-#: ../modules/mailto-handler/evolution-mailto-handler.c:211
+#: ../modules/mailto-handler/evolution-mailto-handler.c:210
#: ../shell/e-shell-window-private.c:242
msgid "Evolution"
msgstr "Evolution"
@@ -9112,7 +9381,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:271
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:272
#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
msgid "From"
msgstr "发件人"
@@ -9145,7 +9414,7 @@ msgstr "将部分格式化为 RFC822 信息"
#: ../em-format/e-mail-formatter-print.c:53
#: ../e-util/gal-view-instance-save-as-dialog.c:94
#: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1323
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
#: ../modules/cal-config-google/e-google-chooser.c:236
#: ../modules/plugin-manager/evolution-plugin-manager.c:66
msgid "Name"
@@ -9173,15 +9442,15 @@ msgid "S/MIME encrpyted"
msgstr "已经 S/MIME 加密"
#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:644
+#: ../mail/e-mail-config-security-page.c:645
#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
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:276
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:277
+#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
#: ../modules/mail/em-mailer-prefs.c:68
msgid "Subject"
msgstr "主题"
@@ -9320,7 +9589,7 @@ msgstr ""
"量时间进行暴力破解,这十分困难。"
#: ../em-format/e-mail-formatter-secure-button.c:186
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:22
msgid "_View Certificate"
msgstr "查看证书(_V)"
@@ -9488,7 +9757,7 @@ msgstr "天"
msgid "_When convenient"
msgstr "方便时(_W)"
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:843
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
msgid "Replies"
msgstr "回复"
@@ -9579,63 +9848,70 @@ msgstr "返回通知"
msgid "Sta_tus Tracking"
msgstr "状态跟踪(_T)"
-#: ../e-util/e-table-config.ui.h:1
+#: ../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
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: ../e-util/e-table-config.ui.h:4
msgid "_Sort..."
msgstr "排序(_S)..."
-#: ../e-util/e-table-config.ui.h:2
+#: ../e-util/e-table-config.ui.h:5
msgid "_Group By..."
msgstr "分组依据(_G)..."
-#: ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-table-config.ui.h:6
msgid "_Fields Shown..."
msgstr "显示的域(_F)..."
-#: ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-table-config.ui.h:9
msgid "Clear _All"
msgstr "全部清除(_A)"
-#: ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-table-config.ui.h:10
msgid "_Show field in View"
msgstr "在视图中显示域(_S)"
-#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
msgid "Ascending"
msgstr "升序"
-#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
msgid "Descending"
msgstr "降序"
-#: ../e-util/e-table-config.ui.h:10
+#: ../e-util/e-table-config.ui.h:13
msgid "Group Items By"
msgstr "分组依据"
-#: ../e-util/e-table-config.ui.h:11
+#: ../e-util/e-table-config.ui.h:14
msgid "Show _field in View"
msgstr "在视图中显示域(_F)"
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:15
msgid "Then By"
msgstr "然后按"
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:16
msgid "Show field i_n View"
msgstr "在视图中显示域(_N)"
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:17
msgid "Show field in _View"
msgstr "在视图中显示域(_V)"
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:18
msgid "Sort"
msgstr "排序"
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:19
msgid "Clear All"
msgstr "全部清除"
-#: ../e-util/e-table-config.ui.h:17
+#: ../e-util/e-table-config.ui.h:20
msgid "Sort Items By"
msgstr "排序依据"
@@ -9643,7 +9919,7 @@ msgstr "排序依据"
msgid "Select a Time Zone"
msgstr "选择一个时区"
-#: ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-timezone-dialog.ui.h:4
msgid ""
"Use the left mouse button to zoom in on an area of the map and select a time "
"zone.\n"
@@ -9652,19 +9928,19 @@ msgstr ""
"用鼠标左键放大地图的某个区域并选择时区。\n"
"用鼠标右键缩小。"
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../e-util/e-timezone-dialog.ui.h:6
msgid "Time Zones"
msgstr "时区"
-#: ../e-util/e-timezone-dialog.ui.h:5
+#: ../e-util/e-timezone-dialog.ui.h:7
msgid "_Selection"
msgstr "选择(_S)"
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../e-util/e-timezone-dialog.ui.h:8
msgid "Timezone drop-down combination box"
msgstr "时区下拉组合框"
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1242
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
#: ../mail/em-utils.c:230
msgid "Incoming"
msgstr "接收"
@@ -9681,7 +9957,7 @@ msgstr "您指定的时间"
msgid "a time relative to the current time"
msgstr "相对于当前时间的时间"
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:76
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
msgid "seconds"
msgstr "秒"
@@ -9714,23 +9990,23 @@ msgstr "显示邮件过滤器:"
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
-#: ../e-util/filter.ui.h:17
+#: ../e-util/filter.ui.h:23
msgid "Compare against"
msgstr "比较对象"
-#: ../e-util/filter.ui.h:18
+#: ../e-util/filter.ui.h:24
msgid ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
-#: ../e-util/filter.ui.h:20
+#: ../e-util/filter.ui.h:26
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
msgstr "信息的日期将会与指定日期的午夜12:00进行比较。"
-#: ../e-util/filter.ui.h:22
+#: ../e-util/filter.ui.h:28
msgid ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
@@ -9751,7 +10027,7 @@ msgstr "名称(_N):"
msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
-#: ../e-util/e-activity-proxy.c:309
+#: ../e-util/e-activity-proxy.c:308
#: ../modules/mail/e-mail-shell-view-actions.c:1724
msgid "Cancel"
msgstr "取消"
@@ -9792,7 +10068,7 @@ msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
#. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:120
+#: ../e-util/e-alert-bar.c:118
msgid "Close this message (Escape)"
msgstr "关闭该信息 (Escape 键)"
@@ -9808,7 +10084,7 @@ msgstr "列表视图"
msgid "Attachment Properties"
msgstr "附件属性"
-#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:272
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
msgid "F_ilename:"
msgstr "文件名(_I):"
@@ -9873,10 +10149,33 @@ msgstr "用其他应用程序打开..."
msgid "S_ave All"
msgstr "全部保存(_A)"
+#: ../e-util/e-attachment-view.c:391
+#| msgid "Sa_ve"
+msgid "Sa_ve As"
+msgstr "另存为(_V)"
+
+#: ../e-util/e-attachment-view.c:400
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "另存为(_A)"
+
#: ../e-util/e-attachment-view.c:410
msgid "A_dd Attachment..."
msgstr "添加附件(_D)..."
+#: ../e-util/e-attachment-view.c:417
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../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
+msgid "_Properties"
+msgstr "属性(_P)"
+
#: ../e-util/e-attachment-view.c:434
msgid "_Hide"
msgstr "隐藏(_H)"
@@ -10036,14 +10335,20 @@ msgstr "下一年"
msgid "Month Calendar"
msgstr "月历"
-#: ../e-util/e-categories-editor.c:222
+#: ../e-util/e-categories-editor.c:223
msgid "Currently _used categories:"
msgstr "当前使用的分类(_U):"
-#: ../e-util/e-categories-editor.c:233
+#: ../e-util/e-categories-editor.c:234
msgid "_Available Categories:"
msgstr "可用类别(_A):"
+#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../plugins/mail-to-task/mail-to-task.c:595
+#: ../shell/e-shell-window-actions.c:1055
+msgid "_New"
+msgstr "新建(_N)"
+
#: ../e-util/e-categories-selector.c:321
msgid "Icon"
msgstr "图标"
@@ -10053,27 +10358,27 @@ msgstr "图标"
msgid "Create category \"%s\""
msgstr "创建分类 \"%s\""
-#: ../e-util/e-category-editor.c:135
+#: ../e-util/e-category-editor.c:136
msgid "Category Icon"
msgstr "类别图标"
-#: ../e-util/e-category-editor.c:139
+#: ../e-util/e-category-editor.c:140
msgid "_No Image"
msgstr "无图像(_N)"
-#: ../e-util/e-category-editor.c:176
+#: ../e-util/e-category-editor.c:173
msgid "Category _Name"
msgstr "类别名字(_N)"
-#: ../e-util/e-category-editor.c:188
+#: ../e-util/e-category-editor.c:185
msgid "Category _Icon"
msgstr "类别图标(_I)"
-#: ../e-util/e-category-editor.c:214
+#: ../e-util/e-category-editor.c:211
msgid "Category Properties"
msgstr "类别属性"
-#: ../e-util/e-category-editor.c:275
+#: ../e-util/e-category-editor.c:272
#, c-format
msgid ""
"There is already a category '%s' in the configuration. Please use another "
@@ -10091,7 +10396,7 @@ msgstr "现在"
#. strftime format of a weekday and a date.
#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
#: ../modules/calendar/e-cal-shell-view-actions.c:1899
-#: ../modules/itip-formatter/itip-view.c:225
+#: ../modules/itip-formatter/itip-view.c:223
msgid "Today"
msgstr "今天"
@@ -10102,7 +10407,7 @@ msgctxt "table-date"
msgid "None"
msgstr "无"
-#: ../e-util/e-cell-date-edit.c:324
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
msgid "OK"
msgstr "确定"
@@ -10127,7 +10432,7 @@ msgstr "字符编码"
msgid "Enter the character set to use"
msgstr "输入要使用的字符集"
-#: ../e-util/e-charset-combo-box.c:341
+#: ../e-util/e-charset-combo-box.c:368
msgid "Other..."
msgstr "其它..."
@@ -10264,7 +10569,7 @@ msgid "Invalid Time Value"
msgstr "无效的时间值"
#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:253
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
msgid "Tomorrow"
msgstr "明天"
@@ -10462,23 +10767,23 @@ msgstr "选择用于比较的时间"
msgid "Choose a File"
msgstr "选择文件"
-#: ../e-util/e-filter-rule.c:746
+#: ../e-util/e-filter-rule.c:750
msgid "R_ule name:"
msgstr "规则名(_U):"
-#: ../e-util/e-filter-rule.c:796
+#: ../e-util/e-filter-rule.c:800
msgid "all the following conditions"
msgstr "下列所有条件"
-#: ../e-util/e-filter-rule.c:797
+#: ../e-util/e-filter-rule.c:801
msgid "any of the following conditions"
msgstr "下列条件之一"
-#: ../e-util/e-filter-rule.c:803
+#: ../e-util/e-filter-rule.c:807
msgid "_Find items which match:"
msgstr "查找匹配的项目(_F):"
-#: ../e-util/e-filter-rule.c:826
+#: ../e-util/e-filter-rule.c:830
msgid "Find items that meet the following conditions"
msgstr "查找符合下列条件的项目"
@@ -10486,7 +10791,7 @@ msgstr "查找符合下列条件的项目"
#. * part of "Include threads: None"
#. protocol:
#. name:
-#: ../e-util/e-filter-rule.c:841 ../e-util/e-mail-identity-combo-box.c:473
+#: ../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
#: ../libemail-engine/camel-null-store.c:27
#: ../mail/e-mail-config-summary-page.c:138
@@ -10494,66 +10799,66 @@ msgstr "查找符合下列条件的项目"
msgid "None"
msgstr "无"
-#: ../e-util/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:846
msgid "All related"
msgstr "相关的全部"
-#: ../e-util/e-filter-rule.c:844
+#: ../e-util/e-filter-rule.c:848
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:849
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:852
msgid "I_nclude threads:"
msgstr "包含线索(_N):"
-#: ../e-util/e-filter-rule.c:925
+#: ../e-util/e-filter-rule.c:929
msgid "A_dd Condition"
msgstr "添加动作(_D)"
-#: ../e-util/e-filter-rule.c:1242 ../mail/em-utils.c:231
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:231
msgid "Outgoing"
msgstr "寄出"
-#: ../e-util/e-import-assistant.c:255
+#: ../e-util/e-import-assistant.c:256
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list."
msgstr "选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。"
-#: ../e-util/e-import-assistant.c:282
+#: ../e-util/e-import-assistant.c:283
msgid "Select a file"
msgstr "选择一个文件"
-#: ../e-util/e-import-assistant.c:296 ../e-util/e-import-assistant.c:471
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../e-util/e-import-assistant.c:339 ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../e-util/e-import-assistant.c:364
+#: ../e-util/e-import-assistant.c:365
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: ../e-util/e-import-assistant.c:372
+#: ../e-util/e-import-assistant.c:373
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../e-util/e-import-assistant.c:380
+#: ../e-util/e-import-assistant.c:381
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: ../e-util/e-import-assistant.c:402
+#: ../e-util/e-import-assistant.c:403
#: ../modules/startup-wizard/e-mail-config-import-page.c:201
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
-#: ../e-util/e-import-assistant.c:532
+#: ../e-util/e-import-assistant.c:533
msgid ""
"Evolution checked for settings to import from the following applications: "
"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -10562,40 +10867,40 @@ msgstr ""
"Evolution 检查了从以下程序导入的设置:Pine、Netscape、Elm、iCalendar。并未发"
"现可导入的设置。如果您想要再试一次,请单击“上一步”按钮。"
-#: ../e-util/e-import-assistant.c:558
+#: ../e-util/e-import-assistant.c:559
#: ../modules/startup-wizard/e-mail-config-import-page.c:230
#, c-format
msgid "From %s:"
msgstr "从 %s:"
#. Install a custom "Cancel Import" button.
-#: ../e-util/e-import-assistant.c:774
+#: ../e-util/e-import-assistant.c:775
msgid "_Cancel Import"
msgstr "取消导入(_C)"
-#: ../e-util/e-import-assistant.c:919
+#: ../e-util/e-import-assistant.c:916
msgid "Preview data to be imported"
msgstr "预览要导入的信息"
-#: ../e-util/e-import-assistant.c:925 ../e-util/e-import-assistant.c:938
-#: ../e-util/e-import-assistant.c:1291 ../e-util/e-import-assistant.c:1367
-#: ../e-util/e-import-assistant.c:1376
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
+#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
+#: ../e-util/e-import-assistant.c:1373
msgid "Import Data"
msgstr "导入数据"
-#: ../e-util/e-import-assistant.c:933
+#: ../e-util/e-import-assistant.c:930
msgid "Select what type of file you want to import from the list."
msgstr "选择您想从列表导入的类型"
-#: ../e-util/e-import-assistant.c:1281 ../e-util/e-import-assistant.c:1316
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
msgid "Evolution Import Assistant"
msgstr "Evolution 导入助手"
-#: ../e-util/e-import-assistant.c:1298 ../e-util/e-import-assistant.c:1354
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
msgid "Import Location"
msgstr "导入位置"
-#: ../e-util/e-import-assistant.c:1309
+#: ../e-util/e-import-assistant.c:1306
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of importing "
@@ -10604,19 +10909,19 @@ msgstr ""
"欢迎使用 Evolution 导入助手。\n"
"本助手将全程指导您将外部文件导入 Evolution。"
-#: ../e-util/e-import-assistant.c:1326
+#: ../e-util/e-import-assistant.c:1323
msgid "Importer Type"
msgstr "导入器类型"
-#: ../e-util/e-import-assistant.c:1336
+#: ../e-util/e-import-assistant.c:1333
msgid "Select Information to Import"
msgstr "选择要导入的信息"
-#: ../e-util/e-import-assistant.c:1345
+#: ../e-util/e-import-assistant.c:1342
msgid "Select a File"
msgstr "选择一个文件"
-#: ../e-util/e-import-assistant.c:1362
+#: ../e-util/e-import-assistant.c:1359
msgid "Click \"Apply\" to begin importing the file into Evolution."
msgstr "单击“应用”以便开始将文件导入到 Evolution。"
@@ -10644,15 +10949,15 @@ msgstr "签名(_S):"
msgid "Unnamed"
msgstr "未命名"
-#: ../e-util/e-mail-signature-manager.c:336
+#: ../e-util/e-mail-signature-manager.c:337
msgid "Add _Script"
msgstr "添加脚本(_S)"
-#: ../e-util/e-mail-signature-manager.c:421
+#: ../e-util/e-mail-signature-manager.c:419
msgid "Add Signature Script"
msgstr "添加签名脚本"
-#: ../e-util/e-mail-signature-manager.c:491
+#: ../e-util/e-mail-signature-manager.c:489
msgid "Edit Signature Script"
msgstr "编辑签名脚本"
@@ -10685,11 +10990,11 @@ msgstr ""
"基于鼠标交互的地图部件,可用来选择时区。键盘用户可以从下方的组合框中选择时"
"区。"
-#: ../e-util/e-misc-utils.c:242
+#: ../e-util/e-misc-utils.c:246
msgid "Could not open the link."
msgstr "无法打开链接。"
-#: ../e-util/e-misc-utils.c:289
+#: ../e-util/e-misc-utils.c:293
msgid "Could not display help for Evolution."
msgstr "无法显示 Evolution 的帮助。"
@@ -10741,10 +11046,6 @@ msgstr "联系人"
msgid "Select Contacts from Address Book"
msgstr "从地址簿选择联系人"
-#: ../e-util/e-name-selector-dialog.c:999
-msgid "_Remove"
-msgstr "删除(_R)"
-
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
#: ../e-util/e-name-selector-entry.c:3038
#, c-format
@@ -10810,7 +11111,7 @@ msgstr "记住该密码(_R)"
msgid "_Remember this password for the remainder of this session"
msgstr "在该会话内记住该提醒器的密码(_R)"
-#: ../e-util/e-preferences-window.c:317
+#: ../e-util/e-preferences-window.c:318
msgid "Evolution Preferences"
msgstr "Evolution 首选项"
@@ -10909,48 +11210,48 @@ msgstr "添加规则"
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../e-util/e-search-bar.c:80
+#: ../e-util/e-search-bar.c:82
#, c-format
msgid "Matches: %u"
msgstr "匹配:%u"
-#: ../e-util/e-search-bar.c:564
+#: ../e-util/e-search-bar.c:566
msgid "Close the find bar"
msgstr "关闭查找栏"
-#: ../e-util/e-search-bar.c:572
+#: ../e-util/e-search-bar.c:574
msgid "Fin_d:"
msgstr "查找(_D):"
-#: ../e-util/e-search-bar.c:584
+#: ../e-util/e-search-bar.c:586
msgid "Clear the search"
msgstr "清除搜索"
-#: ../e-util/e-search-bar.c:608
+#: ../e-util/e-search-bar.c:610
msgid "_Previous"
msgstr "上一项(_P)"
-#: ../e-util/e-search-bar.c:614
+#: ../e-util/e-search-bar.c:613
msgid "Find the previous occurrence of the phrase"
msgstr "寻找该词句出现的前一个位置"
-#: ../e-util/e-search-bar.c:623
+#: ../e-util/e-search-bar.c:622
msgid "_Next"
msgstr "下一项(_N)"
-#: ../e-util/e-search-bar.c:629
+#: ../e-util/e-search-bar.c:625
msgid "Find the next occurrence of the phrase"
msgstr "寻找该词句出现的下一个位置"
-#: ../e-util/e-search-bar.c:638
+#: ../e-util/e-search-bar.c:634
msgid "Mat_ch case"
msgstr "大小写匹配(_C)"
-#: ../e-util/e-search-bar.c:666
+#: ../e-util/e-search-bar.c:662
msgid "Reached bottom of page, continued from top"
msgstr "到达页面底部,移到顶部继续"
-#: ../e-util/e-search-bar.c:688
+#: ../e-util/e-search-bar.c:684
msgid "Reached top of page, continued from bottom"
msgstr "到达页面顶部,移到底部继续"
@@ -11161,7 +11462,7 @@ msgstr "未分组"
msgid "Show Fields"
msgstr "显示域"
-#: ../e-util/e-table-config.c:561
+#: ../e-util/e-table-config.c:559
msgid "Choose the order of information to appear in the message list."
msgstr "选择显示在信息列表的信息顺序。"
@@ -11244,11 +11545,11 @@ msgstr "排序方式(_S)"
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../e-util/e-text.c:2101
+#: ../e-util/e-text.c:2107
msgid "Select All"
msgstr "全选"
-#: ../e-util/e-text.c:2114
+#: ../e-util/e-text.c:2120
msgid "Input Methods"
msgstr "输入法"
@@ -11366,20 +11667,20 @@ msgstr "日历:从 %s 到 %s"
msgid "evolution calendar item"
msgstr "Evolution 日历项目"
-#: ../e-util/evolution-source-viewer.c:634
+#: ../e-util/evolution-source-viewer.c:636
msgid "Evolution Source Viewer"
msgstr "Evolution 源查看器"
#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:664
+#: ../e-util/evolution-source-viewer.c:666
msgid "Display Name"
msgstr "显示名称"
-#: ../e-util/evolution-source-viewer.c:673
+#: ../e-util/evolution-source-viewer.c:675
msgid "Flags"
msgstr "标志"
-#: ../e-util/evolution-source-viewer.c:725
+#: ../e-util/evolution-source-viewer.c:727
#: ../mail/e-mail-config-identity-page.c:677
msgid "Identity"
msgstr "标识"
@@ -11428,6 +11729,23 @@ msgstr "名称“{0}”已使用。"
msgid "Please choose another name."
msgstr "请另选一个名称。"
+#: ../e-util/filter.error.xml.h:12
+msgid "Missing condition."
+msgstr "缺少条件。"
+
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr "过滤器至少应有一个筛选条件。"
+
+#: ../e-util/filter.error.xml.h:14
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "缺少值。"
+
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr "一个或多个值不能为空。"
+
#. Translators: description of a "popup" action
#: ../e-util/gal-a11y-e-cell-popup.c:127
msgid "popup a child"
@@ -11533,31 +11851,31 @@ msgstr[0] "收取 %d 封信"
msgid "Scanning messages for duplicates"
msgstr "扫描信息中的重复信息?"
-#: ../libemail-engine/e-mail-folder-utils.c:1182
+#: ../libemail-engine/e-mail-folder-utils.c:1145
#, c-format
msgid "Removing folder '%s'"
msgstr "删除文件夹 %s"
-#: ../libemail-engine/e-mail-folder-utils.c:1319
+#: ../libemail-engine/e-mail-folder-utils.c:1325
#, c-format
msgid "File \"%s\" has been removed."
msgstr "已经删除了“%s”文件。"
-#: ../libemail-engine/e-mail-folder-utils.c:1323
+#: ../libemail-engine/e-mail-folder-utils.c:1329
msgid "File has been removed."
msgstr "文件已移除。"
-#: ../libemail-engine/e-mail-folder-utils.c:1382
+#: ../libemail-engine/e-mail-folder-utils.c:1388
msgid "Removing attachments"
msgstr "正在移除附件"
-#: ../libemail-engine/e-mail-folder-utils.c:1546
+#: ../libemail-engine/e-mail-folder-utils.c:1552
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "保存 %d 封信"
-#: ../libemail-engine/e-mail-folder-utils.c:1924
+#: ../libemail-engine/e-mail-folder-utils.c:1930
#, c-format
msgid "Invalid folder URI '%s'"
msgstr "无效的文件夹 URI:“%s”"
@@ -11567,13 +11885,13 @@ msgid "No mail transport service available"
msgstr "没有可用的邮件传送服务"
#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:711
+#: ../libemail-engine/mail-ops.c:707
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:755
+#: ../libemail-engine/mail-ops.c:750
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -11583,47 +11901,47 @@ msgstr ""
"转而追加到本地“已发”文件夹。"
#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../libemail-engine/mail-ops.c:779
+#: ../libemail-engine/mail-ops.c:774
#, 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:910 ../libemail-engine/mail-ops.c:1012
+#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
msgid "Sending message"
msgstr "发送信息"
#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:408
#: ../mail/em-folder-tree-model.c:1138
-#: ../modules/mail/e-mail-shell-view-private.c:1072
-#: ../modules/mail/e-mail-shell-view-private.c:1083
+#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1068
msgid "Inbox"
msgstr "收件箱"
#. E_MAIL_LOCAL_FOLDER_INBOX
#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1131
-#: ../modules/mail/e-mail-shell-view-private.c:1070
+#: ../modules/mail/e-mail-shell-view-private.c:1055
msgid "Drafts"
msgstr "草稿"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1142
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1059
msgid "Outbox"
msgstr "发件箱"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1146
-#: ../modules/mail/e-mail-shell-view-private.c:1076
+#: ../modules/mail/e-mail-shell-view-private.c:1061
msgid "Sent"
msgstr "已发箱"
#. E_MAIL_LOCAL_FOLDER_SENT
#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1134
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../modules/mail/e-mail-shell-view-private.c:1063
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1078 ../plugins/templates/templates.c:1377
-#: ../plugins/templates/templates.c:1387
+#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
+#: ../plugins/templates/templates.c:1389
msgid "Templates"
msgstr "模板"
@@ -11690,7 +12008,7 @@ msgstr ""
msgid "Fetching mail from '%s'"
msgstr "正在从 '%s' 收取邮件"
-#: ../libemail-engine/mail-ops.c:705
+#: ../libemail-engine/mail-ops.c:701
#, c-format
msgid ""
"Failed to apply outgoing filters. One reason can be that folder location set "
@@ -11702,51 +12020,51 @@ msgstr ""
"过“编辑”->“信息过滤器”检查您的过滤器。\n"
"原错误为:%s"
-#: ../libemail-engine/mail-ops.c:921
+#: ../libemail-engine/mail-ops.c:917
#, c-format
msgid "Sending message %d of %d"
msgstr "正在发送第 %d 封信,共 %d 封"
-#: ../libemail-engine/mail-ops.c:973
+#: ../libemail-engine/mail-ops.c:969
#, 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:979
+#: ../libemail-engine/mail-ops.c:975
msgid "Canceled."
msgstr "已取消。"
-#: ../libemail-engine/mail-ops.c:981
+#: ../libemail-engine/mail-ops.c:977
msgid "Complete."
msgstr "完成。"
-#: ../libemail-engine/mail-ops.c:1093
+#: ../libemail-engine/mail-ops.c:1089
#, c-format
msgid "Moving messages to '%s'"
msgstr "正在移动信息至 %s"
-#: ../libemail-engine/mail-ops.c:1094
+#: ../libemail-engine/mail-ops.c:1090
#, c-format
msgid "Copying messages to '%s'"
msgstr "把信息复制到 %s"
-#: ../libemail-engine/mail-ops.c:1213
+#: ../libemail-engine/mail-ops.c:1209
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../libemail-engine/mail-ops.c:1341
+#: ../libemail-engine/mail-ops.c:1337
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储帐号“%s”"
-#: ../libemail-engine/mail-ops.c:1342
+#: ../libemail-engine/mail-ops.c:1338
#, c-format
msgid "Storing account '%s'"
msgstr "存储帐号“%s”"
-#: ../libemail-engine/mail-ops.c:1417
+#: ../libemail-engine/mail-ops.c:1413
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的废件箱"
@@ -11800,23 +12118,23 @@ msgstr[0] ""
"%s 已经修改,以用于删除文件夹\n"
"“%s”。"
-#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
msgid "Open _Online Accounts"
msgstr "打开在线帐号(_O)"
-#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
msgid "This account was created through the Online Accounts service."
msgstr "该帐号通过在线帐号服务创建"
-#: ../mail/e-mail-account-manager.c:689
+#: ../mail/e-mail-account-manager.c:690
msgid "_Reset Order"
msgstr "重置顺序(_R)"
-#: ../mail/e-mail-account-manager.c:702
+#: ../mail/e-mail-account-manager.c:703
msgid "You can drag and drop account names to reorder them."
msgstr "您可以拖放帐号名来重新排序。"
-#: ../mail/e-mail-account-manager.c:745
+#: ../mail/e-mail-account-manager.c:746
msgid "De_fault"
msgstr "默认(_F)"
@@ -11832,9 +12150,9 @@ msgid "Account Name"
msgstr "帐号名"
#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:334
-#: ../mail/e-mail-config-security-page.c:474 ../mail/e-mail-reader.c:3533
-#: ../mail/mail-config.ui.h:59
+#: ../mail/e-mail-config-security-page.c:335
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3601
+#: ../mail/mail-config.ui.h:61
msgid "Default"
msgstr "默认"
@@ -11846,7 +12164,7 @@ msgstr "没有提供电子邮件地址"
msgid "Missing domain in email address"
msgstr "电子邮件地址中缺少域"
-#: ../mail/e-mail-backend.c:734
+#: ../mail/e-mail-backend.c:815
msgid "Unknown background operation"
msgstr "未知的后台操作"
@@ -11859,15 +12177,26 @@ msgstr "关闭此窗口"
msgid "(No Subject)"
msgstr "(无主题)"
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "后退(_B)"
+
#. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:101
+#: ../mail/e-mail-config-assistant.c:114
msgid "_Skip Lookup"
msgstr "跳过查找(_S)"
-#: ../mail/e-mail-config-assistant.c:561
+#: ../mail/e-mail-config-assistant.c:648
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
+#: ../mail/e-mail-config-assistant.c:929
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "核实详细信息(_R)"
+
#: ../mail/e-mail-config-auth-check.c:350
msgid "Check for Supported Types"
msgstr "检查支持的类型"
@@ -12042,8 +12371,8 @@ msgstr "接收选项"
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/e-mail-config-security-page.c:259
-#: ../mail/em-folder-properties.c:332 ../mail/mail-config.ui.h:24
+#: ../mail/e-mail-config-security-page.c:260
+#: ../mail/em-folder-properties.c:332 ../mail/mail-config.ui.h:26
#: ../modules/addressbook/autocompletion-config.c:113
#: ../modules/calendar/e-calendar-preferences.ui.h:47
#: ../modules/itip-formatter/plugin/config-ui.c:90
@@ -12051,84 +12380,91 @@ msgstr "接收电子邮件"
msgid "General"
msgstr "常规"
-#: ../mail/e-mail-config-security-page.c:268
+#: ../mail/e-mail-config-security-page.c:269
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/e-mail-config-security-page.c:290
+#: ../mail/e-mail-config-security-page.c:291
msgid "Pretty Good Privacy (OpenPGP)"
msgstr "GNU 安全卫士(OpenPGP)"
-#: ../mail/e-mail-config-security-page.c:299
+#: ../mail/e-mail-config-security-page.c:300
msgid "OpenPGP _Key ID:"
msgstr "OpenPGP _Key ID:"
-#: ../mail/e-mail-config-security-page.c:321
+#: ../mail/e-mail-config-security-page.c:322
msgid "Si_gning algorithm:"
msgstr "签名函数(_N):"
-#: ../mail/e-mail-config-security-page.c:337
-#: ../mail/e-mail-config-security-page.c:477 ../mail/mail-config.ui.h:60
+#: ../mail/e-mail-config-security-page.c:338
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:62
msgid "SHA1"
msgstr "SHA1"
-#: ../mail/e-mail-config-security-page.c:340
-#: ../mail/e-mail-config-security-page.c:480 ../mail/mail-config.ui.h:61
+#: ../mail/e-mail-config-security-page.c:341
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:63
msgid "SHA256"
msgstr "SHA256"
-#: ../mail/e-mail-config-security-page.c:343
-#: ../mail/e-mail-config-security-page.c:483 ../mail/mail-config.ui.h:62
+#: ../mail/e-mail-config-security-page.c:344
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:64
msgid "SHA384"
msgstr "SHA384"
-#: ../mail/e-mail-config-security-page.c:346
-#: ../mail/e-mail-config-security-page.c:486 ../mail/mail-config.ui.h:63
+#: ../mail/e-mail-config-security-page.c:347
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:65
msgid "SHA512"
msgstr "SHA512"
-#: ../mail/e-mail-config-security-page.c:362
+#: ../mail/e-mail-config-security-page.c:363
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息(_W)"
-#: ../mail/e-mail-config-security-page.c:374
+#: ../mail/e-mail-config-security-page.c:375
msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/e-mail-config-security-page.c:386
+#: ../mail/e-mail-config-security-page.c:387
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/e-mail-config-security-page.c:410
+#: ../mail/e-mail-config-security-page.c:411
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME(S/MIME)"
-#: ../mail/e-mail-config-security-page.c:419
+#: ../mail/e-mail-config-security-page.c:420
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/e-mail-config-security-page.c:443
-#: ../mail/e-mail-config-security-page.c:549
+#: ../mail/e-mail-config-security-page.c:444
+#: ../mail/e-mail-config-security-page.c:550
msgid "Select"
msgstr "选择"
-#: ../mail/e-mail-config-security-page.c:461
+#: ../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:962
+#| msgid "Clea_r"
+msgid "_Clear"
+msgstr "清除(_C)"
+
+#: ../mail/e-mail-config-security-page.c:462
msgid "Signing _algorithm:"
msgstr "签名函数(_A):"
-#: ../mail/e-mail-config-security-page.c:502
+#: ../mail/e-mail-config-security-page.c:503
msgid "Always sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息"
-#: ../mail/e-mail-config-security-page.c:525
+#: ../mail/e-mail-config-security-page.c:526
msgid "Encryption certificate:"
msgstr "加密证书:"
-#: ../mail/e-mail-config-security-page.c:567
+#: ../mail/e-mail-config-security-page.c:568
msgid "Always encrypt outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息"
-#: ../mail/e-mail-config-security-page.c:587
+#: ../mail/e-mail-config-security-page.c:588
msgid "Always encrypt to myself when sending encrypted messages"
msgstr "当发送加密信息时总是对自身加密"
@@ -12272,16 +12608,16 @@ msgstr "待办(_T)"
msgid "_Later"
msgstr "稍候(_L)"
-#: ../mail/e-mail-label-manager.c:169
+#: ../mail/e-mail-label-manager.c:171
#: ../modules/mail/e-mail-shell-view-actions.c:1028
msgid "Add Label"
msgstr "添加标签"
-#: ../mail/e-mail-label-manager.c:220
+#: ../mail/e-mail-label-manager.c:222
msgid "Edit Label"
msgstr "编辑标签"
-#: ../mail/e-mail-label-manager.c:352
+#: ../mail/e-mail-label-manager.c:354
msgid ""
"Note: Underscore in the label name is used\n"
"as mnemonic identifier in menu."
@@ -12319,7 +12655,7 @@ msgstr "信头名称"
msgid "Header Value"
msgstr "信头值"
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:99
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:103
msgid "Headers"
msgstr "信头"
@@ -12328,583 +12664,579 @@ msgstr "信头"
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/e-mail-reader.c:343 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: ../mail/e-mail-reader.c:343 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
msgid "C_opy"
msgstr "复制(_O)"
-#: ../mail/e-mail-reader.c:843 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
msgid "Move to Folder"
msgstr "移至文件夹"
-#: ../mail/e-mail-reader.c:843 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
msgid "_Move"
msgstr "移动(_M)"
-#: ../mail/e-mail-reader.c:1169 ../mail/e-mail-reader.c:1381
-#: ../mail/e-mail-reader.c:1421
+#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1426
msgid "_Do not ask me again."
msgstr "不再询问(_D)。"
-#: ../mail/e-mail-reader.c:1427
+#: ../mail/e-mail-reader.c:1432
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
-#: ../mail/e-mail-reader.c:1629
+#: ../mail/e-mail-reader.c:1634
msgid "Failed to retrieve message:"
msgstr "获取信息失败:"
-#: ../mail/e-mail-reader.c:1669 ../mail/e-mail-reader.c:2775
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
#, c-format
msgid "Retrieving message '%s'"
msgstr "收取信息 %s"
-#: ../mail/e-mail-reader.c:1857
+#: ../mail/e-mail-reader.c:1862
msgid "A_dd Sender to Address Book"
msgstr "将发件人添加到地址簿(_D)"
-#: ../mail/e-mail-reader.c:1859
+#: ../mail/e-mail-reader.c:1864
msgid "Add sender to address book"
msgstr "将发件人添加到地址簿"
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1869
msgid "Check for _Junk"
msgstr "检查垃圾信息(_J)"
-#: ../mail/e-mail-reader.c:1866
+#: ../mail/e-mail-reader.c:1871
msgid "Filter the selected messages for junk status"
msgstr "把选中的信息标记为垃圾信息"
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1876
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/e-mail-reader.c:1873
+#: ../mail/e-mail-reader.c:1878
msgid "Copy selected messages to another folder"
msgstr "把选中的信息复制到其它文件夹"
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1883
msgid "_Delete Message"
msgstr "删除信息(_D)"
-#: ../mail/e-mail-reader.c:1880
+#: ../mail/e-mail-reader.c:1885
msgid "Mark the selected messages for deletion"
msgstr "为选中信息做删除标记"
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1890
msgid "Create a Filter Rule for Mailing _List..."
msgstr "为邮件列表创建一条过滤规则(_L)..."
-#: ../mail/e-mail-reader.c:1887
+#: ../mail/e-mail-reader.c:1892
msgid "Create a rule to filter messages to this mailing list"
msgstr "创建可过滤寄往此邮件列表的信息的规则"
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1897
msgid "Create a Filter Rule for _Recipients..."
msgstr "为收件人创建一条过滤规则(_R)..."
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1899
msgid "Create a rule to filter messages to these recipients"
msgstr "创建可过滤寄往这些收件人的信息的规则"
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1904
msgid "Create a Filter Rule for Se_nder..."
msgstr "为发件人创建一条过滤规则(_N)..."
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1906
msgid "Create a rule to filter messages from this sender"
msgstr "创建可过滤此人寄来的信息的规则"
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1911
msgid "Create a Filter Rule for _Subject..."
msgstr "为主题创建一条过滤规则(_S)..."
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1913
msgid "Create a rule to filter messages with this subject"
msgstr "创建可过滤此主题信息的规则"
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1918
msgid "A_pply Filters"
msgstr "应用过滤规则(_P)"
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1920
msgid "Apply filter rules to the selected messages"
msgstr "应用过滤规则到选中的信息"
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1925
msgid "_Find in Message..."
msgstr "在信息中查找(_F)..."
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1927
msgid "Search for text in the body of the displayed message"
msgstr "在显示信息的主体中搜索文本"
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1932
msgid "_Clear Flag"
msgstr "清除标志(_C)"
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:1934
msgid "Remove the follow-up flag from the selected messages"
msgstr "删除选中信息的跟随标志"
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1939
msgid "_Flag Completed"
msgstr "标志为已完成(_F)"
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:1941
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "设置选中信息的跟随标志为已完成"
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1946
msgid "Follow _Up..."
msgstr "跟随(_U)..."
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:1948
msgid "Flag the selected messages for follow-up"
msgstr "为选中信息添加跟随标志"
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1953
msgid "_Attached"
msgstr "附件(_A)"
-#: ../mail/e-mail-reader.c:1950 ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
msgid "Forward the selected message to someone as an attachment"
msgstr "把选中信息作为附件转发给某人"
-#: ../mail/e-mail-reader.c:1955
+#: ../mail/e-mail-reader.c:1960
msgid "Forward As _Attached"
msgstr "作为附件转发(_A)"
-#: ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1967
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ../mail/e-mail-reader.c:1964 ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
msgid "Forward the selected message in the body of a new message"
msgstr "在新信体中转发选中信息"
-#: ../mail/e-mail-reader.c:1969
+#: ../mail/e-mail-reader.c:1974
msgid "Forward As _Inline"
msgstr "嵌入正文转发(_I)"
-#: ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:1981
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ../mail/e-mail-reader.c:1978 ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
msgid "Forward the selected message quoted like a reply"
msgstr "以类似于回复的引用方式转发选中的信息"
-#: ../mail/e-mail-reader.c:1983
+#: ../mail/e-mail-reader.c:1988
msgid "Forward As _Quoted"
msgstr "作文引用转发(_Q)"
-#: ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:1995
msgid "_Load Images"
msgstr "载入图像(_L)"
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:1997
msgid "Force images in HTML mail to be loaded"
msgstr "强制载入 HTML 邮件中的图像"
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2002
msgid "_Important"
msgstr "重要(_I)"
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2004
msgid "Mark the selected messages as important"
msgstr "把选中信息标记为重要邮件"
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2009
msgid "_Junk"
msgstr "垃圾(_J)"
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2011
msgid "Mark the selected messages as junk"
msgstr "把选中信息标记为垃圾信息"
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2016
msgid "_Not Junk"
msgstr "非垃圾(_N)"
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2018
msgid "Mark the selected messages as not being junk"
msgstr "把选中信息标记为非垃圾信息"
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2023
msgid "_Read"
msgstr "读取(_R)"
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2025
msgid "Mark the selected messages as having been read"
msgstr "把选中信息标记为已读"
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2030
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2032
msgid "Mark the selected messages as unimportant"
msgstr "把选中信息标记为不重要"
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2037
msgid "_Unread"
msgstr "未读(_U)"
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2039
msgid "Mark the selected messages as not having been read"
msgstr "把选中信息标记为未读"
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2044
msgid "_Edit as New Message..."
msgstr "作为新信息进行编辑(_E)..."
-#: ../mail/e-mail-reader.c:2041
+#: ../mail/e-mail-reader.c:2046
msgid "Open the selected messages in the composer for editing"
msgstr "在编辑器中打开选中的信息以便编辑"
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2051
msgid "Compose _New Message"
msgstr "撰写新信息(_N)"
-#: ../mail/e-mail-reader.c:2048
+#: ../mail/e-mail-reader.c:2053
msgid "Open a window for composing a mail message"
msgstr "打开窗口以撰写信息"
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2058
msgid "_Open in New Window"
msgstr "在新窗口中打开(_O)"
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2060
msgid "Open the selected messages in a new window"
msgstr "在新窗口中打开选中的信息"
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2065
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2067
msgid "Move selected messages to another folder"
msgstr "把选中的信息移至其它文件夹"
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2072
msgid "_Next Message"
msgstr "下一封信(_N)"
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2074
msgid "Display the next message"
msgstr "显示下一封信息"
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2079
msgid "Next _Important Message"
msgstr "下一封重要信息(_I)"
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2081
msgid "Display the next important message"
msgstr "显示下一封重要信息"
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2086
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ../mail/e-mail-reader.c:2083
+#: ../mail/e-mail-reader.c:2088
msgid "Display the next thread"
msgstr "显示下一条线索"
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2093
msgid "Next _Unread Message"
msgstr "下一封未读信息(_U)"
-#: ../mail/e-mail-reader.c:2090
+#: ../mail/e-mail-reader.c:2095
msgid "Display the next unread message"
msgstr "显示下一封未读信息"
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2100
msgid "_Previous Message"
msgstr "上一封信(_P)"
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2102
msgid "Display the previous message"
msgstr "显示上一封信息"
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2107
msgid "Pr_evious Important Message"
msgstr "上一封重要信息(_E)"
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2109
msgid "Display the previous important message"
msgstr "显示上一封重要信息"
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2114
msgid "Previous T_hread"
msgstr "上一条线索(_H)"
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2116
msgid "Display the previous thread"
msgstr "显示上一条线索"
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2121
msgid "P_revious Unread Message"
msgstr "上一封未读信息(_R)"
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2123
msgid "Display the previous unread message"
msgstr "显示上一封未读信息"
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2130
msgid "Print this message"
msgstr "打印该信息"
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2137
msgid "Preview the message to be printed"
msgstr "预览要打印的信息"
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2142
msgid "Re_direct"
msgstr "重发(_D)"
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2144
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选中信息重发(退回)给某人"
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2149
msgid "Remo_ve Attachments"
msgstr "移除附件(_V)"
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2151
msgid "Remove attachments"
msgstr "移除附件"
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2156
msgid "Remove Du_plicate Messages"
msgstr "移除重复的信息(_P)"
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2158
msgid "Checks selected messages for duplicates"
msgstr "检查所选信息中的重复信息?"
-#: ../mail/e-mail-reader.c:2158 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2163 ../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:2160
+#: ../mail/e-mail-reader.c:2165
msgid "Compose a reply to all the recipients of the selected message"
msgstr "为选中信息的所有收件人撰写回复"
-#: ../mail/e-mail-reader.c:2165 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2172
msgid "Compose a reply to the mailing list of the selected message"
msgstr "为选中信息的邮件列表撰写回复"
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2177
#: ../modules/mail/e-mail-attachment-handler.c:220
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2179
msgid "Compose a reply to the sender of the selected message"
msgstr "为选中信息的发件人撰写回复"
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2184
msgid "_Save as mbox..."
msgstr "另存为 mbox 格式(_S)..."
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2186
msgid "Save selected messages as an mbox file"
msgstr "把选中信息另存为 mbox 格式文件"
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2191
msgid "_Message Source"
msgstr "信息源代码(_M)"
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2193
msgid "Show the raw email source of the message"
msgstr "显示信息的原始邮件源代码"
-#: ../mail/e-mail-reader.c:2200
+#: ../mail/e-mail-reader.c:2205
msgid "_Undelete Message"
msgstr "取消删除信息(_U)"
-#: ../mail/e-mail-reader.c:2202
+#: ../mail/e-mail-reader.c:2207
msgid "Undelete the selected messages"
msgstr "取消选中信息的删除"
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2212
msgid "_Normal Size"
msgstr "普通大小(_N)"
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2214
msgid "Reset the text to its original size"
msgstr "把文本重新设置为原来的大小"
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2219
msgid "_Zoom In"
msgstr "放大(_Z)"
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2221
msgid "Increase the text size"
msgstr "增加文本大小"
-#: ../mail/e-mail-reader.c:2221
-msgid "Zoom _Out"
-msgstr "缩小(_O)"
-
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2228
msgid "Decrease the text size"
msgstr "减少文本大小"
-#: ../mail/e-mail-reader.c:2230
+#: ../mail/e-mail-reader.c:2235
msgid "Cre_ate"
msgstr "创建(_A)"
-#: ../mail/e-mail-reader.c:2237
+#: ../mail/e-mail-reader.c:2242
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../mail/e-mail-reader.c:2244
+#: ../mail/e-mail-reader.c:2249
msgid "F_orward As"
msgstr "转发为(_O)"
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2256
msgid "_Group Reply"
msgstr "回复全部(_G)"
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2263
msgid "_Go To"
msgstr "转到(_G)"
-#: ../mail/e-mail-reader.c:2265
+#: ../mail/e-mail-reader.c:2270
msgid "Mar_k As"
msgstr "标记为(_K)"
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2277
msgid "_Message"
msgstr "信息(_M)"
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2284
msgid "_Zoom"
msgstr "缩放(_Z)"
-#: ../mail/e-mail-reader.c:2289
+#: ../mail/e-mail-reader.c:2294
msgid "Create a Search Folder from Mailing _List..."
msgstr "从邮件列表创建搜索文件夹(_L)..."
-#: ../mail/e-mail-reader.c:2291
+#: ../mail/e-mail-reader.c:2296
msgid "Create a search folder for this mailing list"
msgstr "为此邮件列表创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2301
msgid "Create a Search Folder from Recipien_ts..."
msgstr "从收件人创建搜索文件夹(_T)..."
-#: ../mail/e-mail-reader.c:2298
+#: ../mail/e-mail-reader.c:2303
msgid "Create a search folder for these recipients"
msgstr "为这些收件人创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2308
msgid "Create a Search Folder from Sen_der..."
msgstr "从发件人创建搜索文件夹(_D)..."
-#: ../mail/e-mail-reader.c:2305
+#: ../mail/e-mail-reader.c:2310
msgid "Create a search folder for this sender"
msgstr "为该发件人创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2315
msgid "Create a Search Folder from S_ubject..."
msgstr "从主题创建搜索文件夹(_U)..."
-#: ../mail/e-mail-reader.c:2312
+#: ../mail/e-mail-reader.c:2317
msgid "Create a search folder for this subject"
msgstr "为该主题创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2335
+#: ../mail/e-mail-reader.c:2340
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2348
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/e-mail-reader.c:2347
+#: ../mail/e-mail-reader.c:2352
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2356
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2360
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/e-mail-reader.c:2359
+#: ../mail/e-mail-reader.c:2364
msgid "Mark as Uni_mportant"
msgstr "标记为不重要(_M)"
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2368
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/e-mail-reader.c:2407
+#: ../mail/e-mail-reader.c:2412
msgid "_Caret Mode"
msgstr "光标模式(_C)"
-#: ../mail/e-mail-reader.c:2409
+#: ../mail/e-mail-reader.c:2414
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信息的信体中显示闪烁光标"
-#: ../mail/e-mail-reader.c:2415
+#: ../mail/e-mail-reader.c:2420
msgid "All Message _Headers"
msgstr "全部信头(_H)"
-#: ../mail/e-mail-reader.c:2417
+#: ../mail/e-mail-reader.c:2422
msgid "Show messages with all email headers"
msgstr "显示信息时显示所有信头"
-#: ../mail/e-mail-reader.c:2781
+#: ../mail/e-mail-reader.c:2849
msgid "Retrieving message"
msgstr "正在获取信息"
-#: ../mail/e-mail-reader.c:3703
+#: ../mail/e-mail-reader.c:3771
#: ../modules/mail/e-mail-attachment-handler.c:206
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/e-mail-reader.c:3704
+#: ../mail/e-mail-reader.c:3772
msgid "Forward the selected message to someone"
msgstr "把选中信息转发给某人"
-#: ../mail/e-mail-reader.c:3723
+#: ../mail/e-mail-reader.c:3791
msgid "Group Reply"
msgstr "回复全部"
-#: ../mail/e-mail-reader.c:3724
+#: ../mail/e-mail-reader.c:3792
msgid "Reply to the mailing list, or to all recipients"
msgstr "为选中信息的邮件列表或全部收件人撰写回复"
-#: ../mail/e-mail-reader.c:3790 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3858 ../mail/em-filter-i18n.h:14
msgid "Delete"
msgstr "删除"
-#: ../mail/e-mail-reader.c:3802
+#: ../mail/e-mail-reader.c:3870
#: ../modules/calendar/e-cal-shell-view-actions.c:1371
msgid "Next"
msgstr "下一项"
-#: ../mail/e-mail-reader.c:3806
+#: ../mail/e-mail-reader.c:3874
#: ../modules/calendar/e-cal-shell-view-actions.c:1364
msgid "Previous"
msgstr "上一项"
-#: ../mail/e-mail-reader.c:3815 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3883 ../mail/mail-dialogs.ui.h:16
msgid "Reply"
msgstr "回复"
@@ -12912,18 +13244,18 @@ msgstr "回复"
msgid "Do not warn me again"
msgstr "不要再警告我"
-#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
#: ../smime/gui/certificate-manager.c:329
msgid "Unknown error"
msgstr "未知错误"
-#: ../mail/e-mail-reader-utils.c:975
+#: ../mail/e-mail-reader-utils.c:976
msgid "Printing"
msgstr "正在打印"
#. Translators: %s is replaced with a folder
#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1210
+#: ../mail/e-mail-reader-utils.c:1211
#, c-format
msgid ""
"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12933,7 +13265,7 @@ msgid_plural ""
"them?"
msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗?"
-#: ../mail/e-mail-reader-utils.c:2025
+#: ../mail/e-mail-reader-utils.c:2026
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "保存信息"
@@ -12943,12 +13275,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:2046
+#: ../mail/e-mail-reader-utils.c:2047
msgid "Message"
msgid_plural "Messages"
msgstr[0] "信息"
-#: ../mail/e-mail-reader-utils.c:2415
+#: ../mail/e-mail-reader-utils.c:2416
msgid "Parsing message"
msgstr "正在解析信息"
@@ -13029,237 +13361,237 @@ msgstr "CC"
msgid "Completed On"
msgstr "完成于"
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:12
msgid "Date received"
msgstr "接收日期"
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:13
msgid "Date sent"
msgstr "发送日期"
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:15
msgid "Deleted"
msgstr "已删除"
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "不结尾于"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "不存在"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "不包含词语"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "不含有"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "发音不像"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "不开始于"
-
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:17
msgid "Draft"
msgstr "草稿"
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "结束于"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "存在"
-
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:19
msgid "Expression"
msgstr "表达式"
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:20
msgid "Follow Up"
msgstr "跟随"
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:21
msgid "Forward to"
msgstr "转发至"
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "包含词语"
-
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:22
msgid "Important"
msgstr "重要"
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "之后"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "之前"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "已标志"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "未标志"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "未设置"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "已设置"
+#: ../mail/em-filter-i18n.h:23
+msgid "Junk Test"
+msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:106
+#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:110
msgid "Junk"
msgstr "垃圾"
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "垃圾测试"
-
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:25
msgid "Label"
msgstr "标签"
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:26
msgid "Mailing list"
msgstr "邮件列表"
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:27
msgid "Match All"
msgstr "全部匹配"
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:28
msgid "Message Body"
msgstr "信体"
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:29
msgid "Message Header"
msgstr "信头"
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:30
+msgid "Message Location"
+msgstr "信息位置"
+
+#: ../mail/em-filter-i18n.h:31
msgid "Message is Junk"
msgstr "是垃圾信息"
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:32
msgid "Message is not Junk"
msgstr "不是垃圾信息"
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "信息位置"
-
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:34
msgid "Pipe to Program"
msgstr "管道到程序"
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:35
msgid "Play Sound"
msgstr "播放声音"
#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
msgid "Read"
msgstr "已读"
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
msgid "Recipients"
msgstr "收件人"
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:38
msgid "Regex Match"
msgstr "正则表达式匹配"
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:39
msgid "Replied to"
msgstr "已回复到"
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "返回"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "返回大于"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "返回小于"
-
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:40
msgid "Run Program"
msgstr "运行程序"
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
msgid "Score"
msgstr "分数"
-#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "发送者"
-
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:42
msgid "Sender or Recipients"
msgstr "发送者或接收者"
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "发送者"
+
+#: ../mail/em-filter-i18n.h:44
msgid "Set Label"
msgstr "设置标签"
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:45
msgid "Set Status"
msgstr "设置状态"
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:46
msgid "Size (kB)"
msgstr "大小(kB)"
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "发音类似"
-
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:47
msgid "Source Account"
msgstr "来源帐号"
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:48
msgid "Specific header"
msgstr "指定信头"
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "开始于"
-
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:50
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:53
msgid "Unset Color"
msgstr "取消颜色"
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:54
msgid "Unset Status"
msgstr "取消状态"
+#: ../mail/em-filter-i18n.h:57
+msgid "does not end with"
+msgstr "不结尾于"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "does not exist"
+msgstr "不存在"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "does not have words"
+msgstr "不包含词语"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "does not return"
+msgstr "不含有"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "does not sound like"
+msgstr "发音不像"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "does not start with"
+msgstr "不开始于"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "ends with"
+msgstr "结束于"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "exists"
+msgstr "存在"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "has words"
+msgstr "包含词语"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "is Flagged"
+msgstr "已标志"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "is after"
+msgstr "之后"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "is before"
+msgstr "之前"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "is not Flagged"
+msgstr "未标志"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "is not set"
+msgstr "未设置"
+
+#: ../mail/em-filter-i18n.h:74
+msgid "is set"
+msgstr "已设置"
+
+#: ../mail/em-filter-i18n.h:76
+msgid "returns greater than"
+msgstr "返回大于"
+
+#: ../mail/em-filter-i18n.h:77
+msgid "returns less than"
+msgstr "返回小于"
+
+#: ../mail/em-filter-i18n.h:78
+msgid "returns"
+msgstr "返回"
+
+#: ../mail/em-filter-i18n.h:79
+msgid "sounds like"
+msgstr "发音类似"
+
+#: ../mail/em-filter-i18n.h:80
+msgid "starts with"
+msgstr "开始于"
+
#. and now for the action area
-#: ../mail/em-filter-rule.c:585
+#: ../mail/em-filter-rule.c:587
msgid "Then"
msgstr "然后"
-#: ../mail/em-filter-rule.c:650
+#: ../mail/em-filter-rule.c:652
msgid "Add Ac_tion"
msgstr "添加动作(_T)"
@@ -13303,41 +13635,41 @@ msgstr "创建(_R)"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: ../mail/em-folder-tree.c:627
+#: ../mail/em-folder-tree.c:668
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../mail/em-folder-tree.c:764
+#: ../mail/em-folder-tree.c:805
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1587
+#: ../mail/em-folder-tree.c:1654
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2202 ../mail/em-folder-utils.c:100
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:2138 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2205 ../mail/em-folder-utils.c:102
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:2145 ../mail/message-list.c:2268
+#: ../mail/em-folder-tree.c:2212 ../mail/message-list.c:2268
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信息移至文件夹 %s"
-#: ../mail/em-folder-tree.c:2149 ../mail/message-list.c:2270
+#: ../mail/em-folder-tree.c:2216 ../mail/message-list.c:2270
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信息复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:2168
+#: ../mail/em-folder-tree.c:2235
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信息放到顶级文件夹存储"
@@ -13441,10 +13773,21 @@ msgstr "全部展开(_X)"
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
+msgid "_Refresh"
+msgstr "刷新(_R)"
+
#: ../mail/em-subscription-editor.c:1940
msgid "Stop the current operation"
msgstr "停止当前操作"
+#: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "_Stop"
+msgstr "停止(_S)"
+
#. Translators: This message is shown only for ten or more
#. * messages to be opened. The %d is replaced with the actual
#. * count of messages. If you need a '%' in your text, then
@@ -13456,7 +13799,7 @@ msgid_plural "Are you sure you want to open %d messages at once?"
msgstr[0] "您确定要一次打开 %d 封信吗?"
#: ../mail/em-utils.c:132
-#: ../modules/mailto-handler/evolution-mailto-handler.c:149
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
msgid "_Do not show this message again"
msgstr "不再显示此信息(_D)"
@@ -13553,19 +13896,19 @@ msgstr "Berkeley 邮箱(mbox)"
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入 Berkeley 邮箱格式文件夹"
-#: ../mail/importers/mail-importer.c:55
+#: ../mail/importers/mail-importer.c:54
msgid "Importing mailbox"
msgstr "导入邮箱"
#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:145
+#: ../mail/importers/mail-importer.c:144
#: ../plugins/dbx-import/dbx-importer.c:609
#: ../plugins/pst-import/pst-importer.c:760
#, c-format
msgid "Importing '%s'"
msgstr "正在导入“%s”"
-#: ../mail/importers/mail-importer.c:310
+#: ../mail/importers/mail-importer.c:309
#, c-format
msgid "Scanning %s"
msgstr "正在扫描 %s"
@@ -13629,209 +13972,209 @@ msgstr[0] ""
msgid "Set custom junk header"
msgstr "设置自定义垃圾信息头"
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.ui.h:4
msgid ""
"All new emails with header that matches given content will be automatically "
"filtered as junk"
msgstr "所有信头与所给内容匹配的新邮件将被自动按垃圾邮件过滤掉"
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
msgid "Header name"
msgstr "信头名称"
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
msgid "Header content"
msgstr "信头内容"
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
msgid "Default Behavior"
msgstr "默认行为"
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
msgid "For_mat messages in HTML"
msgstr "以 HTML 方式格式化信息(_M)"
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:9
msgid "Automatically insert _emoticon images"
msgstr "自动插入表情图像(_E)"
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:10
msgid "Always request rea_d receipt"
msgstr "请求阅读收条(_D)"
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:11
msgid "Encode filenames in an _Outlook/GMail way"
msgstr "使用 _Outlook/Gmail 的方式编码文件名"
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:12
msgid "Ch_aracter encoding:"
msgstr "字符编码(_A):"
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
msgid "Replies and Forwards"
msgstr "回复和转发"
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
msgid "Start _typing at the bottom on replying"
msgstr "回复时在底部开始打字(_T)"
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
msgid "_Keep signature above the original message on replying"
msgstr "回复时保留原始信息的签名(_K)"
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
msgid "Ig_nore Reply-To: for mailing lists"
msgstr "忽略邮件列表的“Reply-To”(_N)"
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
msgid "Gro_up Reply goes only to mailing list, if possible"
msgstr "如果可能,组回复只回复给邮件列表(_U)"
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
msgstr "在原信息签名时自动对信息进行数字签名(PGP 或 _S/MIME)"
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
msgctxt "ReplyForward"
msgid "Attachment"
msgstr "附件"
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
msgctxt "ReplyForward"
msgid "Inline (Outlook style)"
msgstr "内嵌(Outlook 风格)"
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
msgctxt "ReplyForward"
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
msgctxt "ReplyForward"
msgid "Do Not Quote"
msgstr "不引用"
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
msgctxt "ReplyForward"
msgid "Inline"
msgstr "内嵌"
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
msgid "Sig_natures"
msgstr "签名(_N)"
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
msgid "_Languages"
msgstr "语言(_L)"
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词着色(_M):"
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
#: ../modules/calendar/e-calendar-preferences.ui.h:58
msgid "Pick a color"
msgstr "选取一种颜色"
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
msgid ""
"To help avoid email accidents and embarrassments, ask for confirmation "
"before taking the following checkmarked actions:"
msgstr "为了帮助避免电子邮件意外和问题,在采取以下勾选的操作前请求确认:"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
msgid "Sending a message with an _empty subject line"
msgstr "发送带空主题行的信息时(_E)"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
msgid "Sending a message with only _Bcc recipients defined"
msgstr "发送只填写了密件抄送收件人的信息时(_B)"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
msgid "Sending a _private reply to a mailing list message"
msgstr "向邮件列表邮箱发送私人回复时(_P)"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
msgid "Sending a reply to a large _number of recipients"
msgstr "向很多收件人发送回复时(_N)"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
msgid "Allowing a _mailing list to redirect a private reply to the list"
msgstr "允许邮件列表将私人回复重定向到列表(_M)"
#. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
msgid "Sending a message with _recipients not entered as mail addresses"
msgstr "发送只填写了密件抄送收件人的信息时(_B)"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
msgid "Confirmations"
msgstr "配置"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:51
msgid "Add"
msgstr "添加"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:52
msgid "Remove"
msgstr "删除"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:53
msgid " Use for Folders "
msgstr " 用于文件夹 "
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:54
msgid "Edit"
msgstr "编辑"
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:55
msgid " Use for Recipients "
msgstr " 用于接收者 "
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:56
msgid " Account "
msgstr " 帐号 "
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
msgid "Send account overrides"
msgstr "发送帐户覆盖"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:58
msgid ""
"Assign which account should be used as a send account for respective folders "
"or recipients, an override for usual send account detection. List of "
@@ -13841,184 +14184,184 @@ msgstr ""
"针对某些文件夹或收件人指定发送帐户,而不是通常检测的发送帐户。收件人列表可以"
"包含部分地址或姓名。姓名和地址将分别比较。"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
msgid "Folder override has precedence over Recipient override"
msgstr "文件夹覆盖 比 收件人覆盖 优先"
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:60
msgid "Send Account"
msgstr "发送帐号"
-#: ../mail/mail-config.ui.h:64 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:66 ../smime/gui/smime-ui.ui.h:1
msgid "a"
msgstr "a"
-#: ../mail/mail-config.ui.h:65 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:67 ../smime/gui/smime-ui.ui.h:2
msgid "b"
msgstr "b"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:68
msgid "Start up"
msgstr "启动"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:69
msgid "Check for new _messages on start"
msgstr "启动时自动检查新信息(_M)"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:70
msgid "Check for new messa_ges in all active accounts"
msgstr "检查所有活动帐号的新信息(_G)"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:71
msgid "Message Display"
msgstr "信息显示"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:72
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:73
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:74
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
msgid "Fix_ed Width Font:"
msgstr "等宽字体(_E):"
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
msgid "_Mark messages as read after"
msgstr "把信息标记为已读前等(_M)"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N):"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
msgid "Apply the same _view settings to all folders"
msgstr "应用同样的查看设置到所有文件夹(_v)"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
msgid "F_all back to threading messages by subject"
msgstr "默认按照主题对线索中的信息排序(_A)"
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
msgid "Delete Mail"
msgstr "删除邮件"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:85
msgid "Empty _trash folders"
msgstr "清空已删除邮件(_T)"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:88
msgid "_Show animated images"
msgstr "显示动态图像(_S)"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:89
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:90
msgid "Loading Images"
msgstr "载入图像"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:91
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 载入图像(_N)"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:92
msgid "_Load images only in messages from contacts"
msgstr "载入来自联系人的邮件中的图像(_L)"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:93
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上载入图像(_A)"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:94
msgid "HTML Messages"
msgstr "HTML 信息"
-#: ../mail/mail-config.ui.h:93 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
msgid "Labels"
msgstr "标签"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
msgid "Sender Photograph"
msgstr "发送者照片"
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:97
msgid "_Show the photograph of sender in the message preview"
msgstr "在信息预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:98
msgid "Displayed Message Headers"
msgstr "显示信头"
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:99
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:102
#: ../modules/addressbook/autocompletion-config.c:116
#: ../modules/calendar/e-calendar-preferences.ui.h:54
msgid "Date/Time Format"
msgstr "日期/时间格式"
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:104
msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾信息(_M)"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:105
msgid "_Delete junk messages"
msgstr "删除垃圾信息(_D)"
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:106
msgid "Check cu_stom headers for junk"
msgstr "检查自定义信头以判别垃圾信息(_S)"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:107
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:108
msgid "_Lookup in local address book only"
msgstr "仅在本地地址簿中查阅(_L)"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:109
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:111
#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
msgid "No encryption"
msgstr "不加密"
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:112
msgid "TLS encryption"
msgstr "TLS 加密"
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:113
msgid "SSL encryption"
msgstr "SSL 加密"
@@ -14039,63 +14382,63 @@ msgid "_Due By:"
msgstr "延期人(_D):"
#. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
msgid "Co_mpleted"
msgstr "已完成(_M)"
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
msgid "Call"
msgstr "呼叫"
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
msgid "Do Not Forward"
msgstr "不要转发"
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
msgid "Follow-Up"
msgstr "跟随"
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
msgid "For Your Information"
msgstr "给您的信息"
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
msgid "Forward"
msgstr "转发"
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
msgid "Reply to All"
msgstr "全部回复"
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
msgid "Review"
msgstr "回顾"
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
msgid "License Agreement"
msgstr "许可协议"
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
msgid "Security Information"
msgstr "安全信息"
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
msgid "Digital Signature"
msgstr "数字签名"
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
msgid "Encryption"
msgstr "加密"
@@ -14680,14 +15023,6 @@ msgstr "复制文件夹树中的文件夹。"
msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
msgstr "您确定要将文件夹“{0}”复制到文件夹“{1}”吗?"
-#: ../mail/mail.error.xml.h:138
-msgid "_Yes"
-msgstr "是(_Y)"
-
-#: ../mail/mail.error.xml.h:139
-msgid "_No"
-msgstr "否(_N)"
-
#: ../mail/mail.error.xml.h:140
msgid "_Always"
msgstr "总是(_A)"
@@ -14833,15 +15168,15 @@ msgstr "发送和接收邮件"
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:636 ../mail/mail-send-recv.c:1028
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:636 ../mail/mail-send-recv.c:718
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:1001
+#: ../mail/mail-send-recv.c:997
#, c-format
msgid "Checking for new mail at '%s'"
msgstr "正在检查 '%s' 处的新邮件"
@@ -14898,13 +15233,13 @@ msgstr "较高"
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:455 ../mail/message-list.c:5705
+#: ../mail/message-list.c:455 ../mail/message-list.c:5716
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:239
+#: ../mail/message-list.c:1846 ../modules/itip-formatter/itip-view.c:237
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
@@ -14933,11 +15268,11 @@ msgid "Messages"
msgstr "信息"
#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4749
+#: ../mail/message-list.c:4759
msgid "Follow-up"
msgstr "跟随"
-#: ../mail/message-list.c:5643
+#: ../mail/message-list.c:5654
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 "
@@ -14948,7 +15283,7 @@ msgstr ""
"示”信息过滤器;或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
"索。"
-#: ../mail/message-list.c:5651
+#: ../mail/message-list.c:5662
msgid "There are no messages in this folder."
msgstr "此文件夹中没有信息。"
@@ -15244,18 +15579,6 @@ msgstr "操作(_A)"
msgid "_Preview"
msgstr "预览(_P)"
-#: ../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
-msgid "_Delete"
-msgstr "删除(_D)"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-msgid "_Properties"
-msgstr "属性(_P)"
-
#: ../modules/addressbook/e-book-shell-view-actions.c:1034
msgid "Address Book Map"
msgstr "地址簿地图"
@@ -15502,23 +15825,23 @@ msgstr "Evolution 恢复"
msgid "Restoring from the folder %s"
msgstr "正在从文件夹 %s 中恢复"
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:991
msgid "Backing up Evolution Data"
msgstr "正在备份 Evolution 数据"
-#: ../modules/backup-restore/evolution-backup-tool.c:993
+#: ../modules/backup-restore/evolution-backup-tool.c:992
msgid "Please wait while Evolution is backing up your data."
msgstr "请稍候,Evolution 正在备份您的数据。"
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:994
msgid "Restoring Evolution Data"
msgstr "正在恢复 Evolution 数据"
-#: ../modules/backup-restore/evolution-backup-tool.c:996
+#: ../modules/backup-restore/evolution-backup-tool.c:995
msgid "Please wait while Evolution is restoring your data."
msgstr "请稍候,Evolution 正在恢复您的数据。"
-#: ../modules/backup-restore/evolution-backup-tool.c:1018
+#: ../modules/backup-restore/evolution-backup-tool.c:1017
msgid "This may take a while depending on the amount of data in your account."
msgstr "这可能要花一点时间,取决于您帐号中的数据总量。"
@@ -15681,23 +16004,23 @@ msgstr "搜索"
msgid "Search Base:"
msgstr "搜索基础:"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:748
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
msgid "Find Possible Search Bases"
msgstr "查找可能的搜索基础"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
msgid "One Level"
msgstr "一级"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:775
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
msgid "Subtree"
msgstr "子树"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
msgid "Search Scope:"
msgstr "搜索范围:"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
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 "
@@ -15708,23 +16031,23 @@ msgstr ""
"搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:791
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
msgid "Search Filter:"
msgstr "搜索过滤器:"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:803
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
msgid "Downloading"
msgstr "下载"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:824
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
msgid "Limit:"
msgstr "限制:"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
msgid "contacts"
msgstr "联系人"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:840
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
msgid "Browse until limit is reached"
msgstr "浏览直到达到极限"
@@ -15738,28 +16061,28 @@ msgstr "URL:"
msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:442
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
#, c-format
msgid "HTTP Error: %s"
msgstr "HTTP 错误:%s"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:470
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
msgid "Could not parse response"
msgstr "无法解析响应"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:479
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
msgid "Empty response"
msgstr "空响应"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:487
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
msgid "Unexpected reply from server"
msgstr "服务器响应异常"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1119
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
msgid "Could not locate user's calendars"
msgstr "无法定位用户的日历"
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1343
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
msgid "Path"
msgstr "路径"
@@ -15837,24 +16160,37 @@ 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
+#| msgid "Default"
+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:250
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:260
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:255
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:265
msgid "Centigrade (°C)"
msgstr "摄氏(°C)"
#. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
msgid "Kelvin (K)"
msgstr "开氏(K)"
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:261
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:271
msgid "Units:"
msgstr "单位:"
@@ -16444,6 +16780,18 @@ msgstr "描述含有"
msgid "Summary contains"
msgstr "概要含有"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "打印..."
+
#: ../modules/calendar/e-cal-shell-view-actions.c:1796
msgid "Print this calendar"
msgstr "打印此日历"
@@ -16896,662 +17244,662 @@ msgstr "以邀请方式显示部分"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../modules/itip-formatter/itip-view.c:228
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:234
+#: ../modules/itip-formatter/itip-view.c:232
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:243
+#: ../modules/itip-formatter/itip-view.c:241
msgid "Today %l:%M:%S %p"
msgstr "今天%p%l:%M:%S"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:258
+#: ../modules/itip-formatter/itip-view.c:256
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:262
+#: ../modules/itip-formatter/itip-view.c:260
msgid "Tomorrow %H:%M:%S"
msgstr "明天 %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:267
+#: ../modules/itip-formatter/itip-view.c:265
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:271
+#: ../modules/itip-formatter/itip-view.c:269
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:290
+#: ../modules/itip-formatter/itip-view.c:288
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:293
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:299
+#: ../modules/itip-formatter/itip-view.c:297
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:304
+#: ../modules/itip-formatter/itip-view.c:302
msgid "%A %l:%M %p"
msgstr "%A%p%l:%M"
#. strftime format of a weekday and a
#. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:308
+#: ../modules/itip-formatter/itip-view.c:306
msgid "%A %l:%M:%S %p"
msgstr "%A%p%l:%M:%S"
#. strftime format of a weekday and a date
#. * without a year.
-#: ../modules/itip-formatter/itip-view.c:317
+#: ../modules/itip-formatter/itip-view.c:315
msgid "%A, %B %e"
msgstr "%-m月%-d日%A"
#. strftime format of a weekday, a date
#. * without a year and a time,
#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:323
+#: ../modules/itip-formatter/itip-view.c:321
msgid "%A, %B %e %H:%M"
msgstr "%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date without a year
#. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:327
+#: ../modules/itip-formatter/itip-view.c:325
msgid "%A, %B %e %H:%M:%S"
msgstr "%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date without a year
#. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:332
+#: ../modules/itip-formatter/itip-view.c:330
msgid "%A, %B %e %l:%M %p"
msgstr "%-m月%-d日%A%p%l:%M"
#. strftime format of a weekday, a date without a year
#. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:336
+#: ../modules/itip-formatter/itip-view.c:334
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%-m月%-d日%A%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:342
+#: ../modules/itip-formatter/itip-view.c:340
msgid "%A, %B %e, %Y"
msgstr "%Y年%-m月%-d日%A"
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:347
+#: ../modules/itip-formatter/itip-view.c:345
msgid "%A, %B %e, %Y %H:%M"
msgstr "%Y年%-m月%-d日%A %H:%M"
#. strftime format of a weekday, a date and a
#. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:351
+#: ../modules/itip-formatter/itip-view.c:349
msgid "%A, %B %e, %Y %H:%M:%S"
msgstr "%Y年%-m月%-d日%A %H:%M:%S"
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:356
+#: ../modules/itip-formatter/itip-view.c:354
msgid "%A, %B %e, %Y %l:%M %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M"
#. strftime format of a weekday, a date and a
#. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:360
+#: ../modules/itip-formatter/itip-view.c:358
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../modules/itip-formatter/itip-view.c:398
-#: ../modules/itip-formatter/itip-view.c:399
-#: ../modules/itip-formatter/itip-view.c:488
-#: ../modules/itip-formatter/itip-view.c:489
-#: ../modules/itip-formatter/itip-view.c:578
+#: ../modules/itip-formatter/itip-view.c:396
+#: ../modules/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:486
+#: ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
msgid "An unknown person"
msgstr "未知的人"
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:582
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
#, c-format
msgid "Please respond on behalf of %s"
msgstr "请以 %s 的身份回应"
-#: ../modules/itip-formatter/itip-view.c:405
-#: ../modules/itip-formatter/itip-view.c:495
-#: ../modules/itip-formatter/itip-view.c:584
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:582
#, c-format
msgid "Received on behalf of %s"
msgstr "以 %s 的身份接收"
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:408
#, c-format
msgid "%s through %s has published the following meeting information:"
msgstr "%s 通过 %s 发布了会议信息:"
-#: ../modules/itip-formatter/itip-view.c:412
+#: ../modules/itip-formatter/itip-view.c:410
#, c-format
msgid "%s has published the following meeting information:"
msgstr "%s 发布了会议信息:"
-#: ../modules/itip-formatter/itip-view.c:417
+#: ../modules/itip-formatter/itip-view.c:415
#, c-format
msgid "%s has delegated the following meeting to you:"
msgstr "%s 为您代理了下列会议:"
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:418
#, c-format
msgid "%s through %s requests your presence at the following meeting:"
msgstr "%s 通过 %s 请求您参加下列会议:"
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:420
#, c-format
msgid "%s requests your presence at the following meeting:"
msgstr "%s 请求您参加下列会议:"
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:426
#, c-format
msgid "%s through %s wishes to add to an existing meeting:"
msgstr "%s 通过 %s 希望加入到已有的会议:"
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:428
#, c-format
msgid "%s wishes to add to an existing meeting:"
msgstr "%s 希望加入到已有的会议:"
-#: ../modules/itip-formatter/itip-view.c:434
+#: ../modules/itip-formatter/itip-view.c:432
#, c-format
msgid ""
"%s through %s wishes to receive the latest information for the following "
"meeting:"
msgstr "%s 通过 %s 希望接收到下列会议的最新信息:"
-#: ../modules/itip-formatter/itip-view.c:436
+#: ../modules/itip-formatter/itip-view.c:434
#, c-format
msgid "%s wishes to receive the latest information for the following meeting:"
msgstr "%s 希望接收到下列会议的最新信息:"
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:438
#, c-format
msgid "%s through %s has sent back the following meeting response:"
msgstr "%s 通过 %s 发回了下列会议请求的响应:"
-#: ../modules/itip-formatter/itip-view.c:442
+#: ../modules/itip-formatter/itip-view.c:440
#, c-format
msgid "%s has sent back the following meeting response:"
msgstr "%s 发回了下列会议请求的响应:"
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
#, c-format
msgid "%s through %s has canceled the following meeting:"
msgstr "%s 通过 %s 取消了下列会议:"
-#: ../modules/itip-formatter/itip-view.c:448
+#: ../modules/itip-formatter/itip-view.c:446
#, c-format
msgid "%s has canceled the following meeting:"
msgstr "%s 已取消下列会议:"
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:450
#, c-format
msgid "%s through %s has proposed the following meeting changes."
msgstr "%s 通过 %s 提议了下列会议变更。"
-#: ../modules/itip-formatter/itip-view.c:454
+#: ../modules/itip-formatter/itip-view.c:452
#, c-format
msgid "%s has proposed the following meeting changes:"
msgstr "%s 已提议了下列会议变更:"
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:456
#, c-format
msgid "%s through %s has declined the following meeting changes:"
msgstr "%s 通过 %s 拒绝了下列会议变更:"
-#: ../modules/itip-formatter/itip-view.c:460
+#: ../modules/itip-formatter/itip-view.c:458
#, c-format
msgid "%s has declined the following meeting changes:"
msgstr "%s 拒绝了下列会议变更:"
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:498
#, c-format
msgid "%s through %s has published the following task:"
msgstr "%s 通过 %s 发布了下列任务:"
-#: ../modules/itip-formatter/itip-view.c:502
+#: ../modules/itip-formatter/itip-view.c:500
#, c-format
msgid "%s has published the following task:"
msgstr "%s 发布了下列任务:"
-#: ../modules/itip-formatter/itip-view.c:507
+#: ../modules/itip-formatter/itip-view.c:505
#, c-format
msgid "%s requests the assignment of %s to the following task:"
msgstr "%s 请求给 %s 分配下列任务:"
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
#, c-format
msgid "%s through %s has assigned you a task:"
msgstr "%s 通过 %s 为您分配了下列任务:"
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:510
#, c-format
msgid "%s has assigned you a task:"
msgstr "%s 为您分配了一个任务:"
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:516
#, c-format
msgid "%s through %s wishes to add to an existing task:"
msgstr "%s 通过 %s 希望加入到已有的任务:"
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:518
#, c-format
msgid "%s wishes to add to an existing task:"
msgstr "%s 希望加入到已存在的任务:"
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../modules/itip-formatter/itip-view.c:522
#, c-format
msgid ""
"%s through %s wishes to receive the latest information for the following "
"assigned task:"
msgstr "%s 通过 %s 想要收到所分配的下列任务的最新信息:"
-#: ../modules/itip-formatter/itip-view.c:526
+#: ../modules/itip-formatter/itip-view.c:524
#, c-format
msgid ""
"%s wishes to receive the latest information for the following assigned task:"
msgstr "%s 想要收到所分配的下列任务的最新信息:"
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:528
#, c-format
msgid "%s through %s has sent back the following assigned task response:"
msgstr "%s 通过 %s 发回了下列分配任务的回应:"
-#: ../modules/itip-formatter/itip-view.c:532
+#: ../modules/itip-formatter/itip-view.c:530
#, c-format
msgid "%s has sent back the following assigned task response:"
msgstr "%s 发回了下列分配任务的回应:"
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:534
#, c-format
msgid "%s through %s has canceled the following assigned task:"
msgstr "%s 通过 %s 取消了下列任务分配:"
-#: ../modules/itip-formatter/itip-view.c:538
+#: ../modules/itip-formatter/itip-view.c:536
#, c-format
msgid "%s has canceled the following assigned task:"
msgstr "%s 取消分配的下列任务:"
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:540
#, c-format
msgid "%s through %s has proposed the following task assignment changes:"
msgstr "%s 通过 %s 提议了下列任务分配变更:"
-#: ../modules/itip-formatter/itip-view.c:544
+#: ../modules/itip-formatter/itip-view.c:542
#, c-format
msgid "%s has proposed the following task assignment changes:"
msgstr "%s 提议了下列任务分配变更:"
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:546
#, c-format
msgid "%s through %s has declined the following assigned task:"
msgstr "%s 通过 %s 拒绝了下列任务分配:"
-#: ../modules/itip-formatter/itip-view.c:550
+#: ../modules/itip-formatter/itip-view.c:548
#, c-format
msgid "%s has declined the following assigned task:"
msgstr "%s 拒绝了分配的下列任务:"
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:587
#, c-format
msgid "%s through %s has published the following memo:"
msgstr "%s 通过 %s 发布了下列备忘:"
-#: ../modules/itip-formatter/itip-view.c:591
+#: ../modules/itip-formatter/itip-view.c:589
#, c-format
msgid "%s has published the following memo:"
msgstr "%s 发布了下列备忘:"
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:594
#, c-format
msgid "%s through %s wishes to add to an existing memo:"
msgstr "%s 通过 %s 希望加入到已有的备忘:"
-#: ../modules/itip-formatter/itip-view.c:598
+#: ../modules/itip-formatter/itip-view.c:596
#, c-format
msgid "%s wishes to add to an existing memo:"
msgstr "%s 希望加入到已有的备忘中:"
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../modules/itip-formatter/itip-view.c:600
#, c-format
msgid "%s through %s has canceled the following shared memo:"
msgstr "%s 通过 %s 取消了下列共享备忘:"
-#: ../modules/itip-formatter/itip-view.c:604
+#: ../modules/itip-formatter/itip-view.c:602
#, c-format
msgid "%s has canceled the following shared memo:"
msgstr "%s 取消了下列共享备忘:"
-#: ../modules/itip-formatter/itip-view.c:677
+#: ../modules/itip-formatter/itip-view.c:675
msgid "All day:"
msgstr "全天:"
-#: ../modules/itip-formatter/itip-view.c:683
+#: ../modules/itip-formatter/itip-view.c:681
msgid "Start day:"
msgstr "开始日期:"
-#: ../modules/itip-formatter/itip-view.c:683
-#: ../modules/itip-formatter/itip-view.c:1497
+#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:1504
msgid "Start time:"
msgstr "开始时间:"
-#: ../modules/itip-formatter/itip-view.c:692
+#: ../modules/itip-formatter/itip-view.c:690
msgid "End day:"
msgstr "结束日期:"
-#: ../modules/itip-formatter/itip-view.c:692
-#: ../modules/itip-formatter/itip-view.c:1498
+#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:1505
msgid "End time:"
msgstr "结束时间:"
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1030
msgid "Ope_n Calendar"
msgstr "打开日历(_N)"
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1033
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1036
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1039
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1042
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1045
msgid "Acce_pt all"
msgstr "全部接受(_P)"
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1048
msgid "Acce_pt"
msgstr "接受(_P)"
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1051
msgid "Send _Information"
msgstr "发送信息(_I)"
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1054
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../modules/itip-formatter/itip-view.c:1050
+#: ../modules/itip-formatter/itip-view.c:1057
msgid "_Update"
msgstr "更新(_U)"
-#: ../modules/itip-formatter/itip-view.c:1500
-#: ../modules/itip-formatter/itip-view.c:1548
-#: ../modules/itip-formatter/itip-view.c:1619
+#: ../modules/itip-formatter/itip-view.c:1507
+#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1626
msgid "Comment:"
msgstr "注释:"
#. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1536
+#: ../modules/itip-formatter/itip-view.c:1543
msgid "Send reply to sender"
msgstr "回复发件人"
#. Updates
-#: ../modules/itip-formatter/itip-view.c:1551
+#: ../modules/itip-formatter/itip-view.c:1558
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
#. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1561
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1562
msgid "Show time as _free"
msgstr "将时间显示为空闲(_F)"
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1563
msgid "_Preserve my reminder"
msgstr "保留我的提醒(_P)"
-#: ../modules/itip-formatter/itip-view.c:1557
+#: ../modules/itip-formatter/itip-view.c:1564
msgid "_Inherit reminder"
msgstr "继承提醒(_I)"
-#: ../modules/itip-formatter/itip-view.c:1887
+#: ../modules/itip-formatter/itip-view.c:1894
msgid "_Tasks:"
msgstr "任务(_T):"
-#: ../modules/itip-formatter/itip-view.c:1890
+#: ../modules/itip-formatter/itip-view.c:1897
msgid "_Memos:"
msgstr "备忘(_M):"
-#: ../modules/itip-formatter/itip-view.c:3118
+#: ../modules/itip-formatter/itip-view.c:3125
msgid "Sa_ve"
msgstr "保存(_V)"
-#: ../modules/itip-formatter/itip-view.c:3578
-#: ../modules/itip-formatter/itip-view.c:5025
+#: ../modules/itip-formatter/itip-view.c:3585
+#: ../modules/itip-formatter/itip-view.c:5032
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../modules/itip-formatter/itip-view.c:3757
+#: ../modules/itip-formatter/itip-view.c:3764
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../modules/itip-formatter/itip-view.c:3786
+#: ../modules/itip-formatter/itip-view.c:3793
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../modules/itip-formatter/itip-view.c:3899
+#: ../modules/itip-formatter/itip-view.c:3906
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../modules/itip-formatter/itip-view.c:3907
+#: ../modules/itip-formatter/itip-view.c:3914
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../modules/itip-formatter/itip-view.c:3912
+#: ../modules/itip-formatter/itip-view.c:3919
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../modules/itip-formatter/itip-view.c:3917
+#: ../modules/itip-formatter/itip-view.c:3924
msgid "Unable to find this memo in any memo list"
msgstr "无法在任何备忘列表中找到此备忘"
-#: ../modules/itip-formatter/itip-view.c:4261
+#: ../modules/itip-formatter/itip-view.c:4268
msgid "Opening the calendar. Please wait..."
msgstr "正在打开日历,请稍候..."
-#: ../modules/itip-formatter/itip-view.c:4266
+#: ../modules/itip-formatter/itip-view.c:4273
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../modules/itip-formatter/itip-view.c:4661
+#: ../modules/itip-formatter/itip-view.c:4668
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../modules/itip-formatter/itip-view.c:4676
+#: ../modules/itip-formatter/itip-view.c:4683
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../modules/itip-formatter/itip-view.c:4681
+#: ../modules/itip-formatter/itip-view.c:4688
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../modules/itip-formatter/itip-view.c:4687
+#: ../modules/itip-formatter/itip-view.c:4694
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../modules/itip-formatter/itip-view.c:4693
+#: ../modules/itip-formatter/itip-view.c:4700
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../modules/itip-formatter/itip-view.c:4714
-#: ../modules/itip-formatter/itip-view.c:5171
-#: ../modules/itip-formatter/itip-view.c:5277
+#: ../modules/itip-formatter/itip-view.c:4721
+#: ../modules/itip-formatter/itip-view.c:5178
+#: ../modules/itip-formatter/itip-view.c:5284
msgid "Saving changes to the calendar. Please wait..."
msgstr "正在保存日历更改,请稍候..."
-#: ../modules/itip-formatter/itip-view.c:4755
+#: ../modules/itip-formatter/itip-view.c:4762
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../modules/itip-formatter/itip-view.c:4948
+#: ../modules/itip-formatter/itip-view.c:4955
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../modules/itip-formatter/itip-view.c:4965
+#: ../modules/itip-formatter/itip-view.c:4972
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../modules/itip-formatter/itip-view.c:4969
+#: ../modules/itip-formatter/itip-view.c:4976
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../modules/itip-formatter/itip-view.c:5017
+#: ../modules/itip-formatter/itip-view.c:5024
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../modules/itip-formatter/itip-view.c:5060
+#: ../modules/itip-formatter/itip-view.c:5067
msgid "The meeting is invalid and cannot be updated"
msgstr "会议无效,无法更新"
-#: ../modules/itip-formatter/itip-view.c:5136
+#: ../modules/itip-formatter/itip-view.c:5143
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新,原因是状态无效"
-#: ../modules/itip-formatter/itip-view.c:5208
-#: ../modules/itip-formatter/itip-view.c:5247
+#: ../modules/itip-formatter/itip-view.c:5215
+#: ../modules/itip-formatter/itip-view.c:5254
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../modules/itip-formatter/itip-view.c:5310
+#: ../modules/itip-formatter/itip-view.c:5317
msgid "Meeting information sent"
msgstr "会议信息已发送"
-#: ../modules/itip-formatter/itip-view.c:5315
+#: ../modules/itip-formatter/itip-view.c:5322
msgid "Task information sent"
msgstr "任务信息已发送"
-#: ../modules/itip-formatter/itip-view.c:5320
+#: ../modules/itip-formatter/itip-view.c:5327
msgid "Memo information sent"
msgstr "备忘信息已发送"
-#: ../modules/itip-formatter/itip-view.c:5331
+#: ../modules/itip-formatter/itip-view.c:5338
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "无法发送会议信息,会议不存在"
-#: ../modules/itip-formatter/itip-view.c:5336
+#: ../modules/itip-formatter/itip-view.c:5343
msgid "Unable to send task information, the task does not exist"
msgstr "无法发送任务信息,任务不存在"
-#: ../modules/itip-formatter/itip-view.c:5341
+#: ../modules/itip-formatter/itip-view.c:5348
msgid "Unable to send memo information, the memo does not exist"
msgstr "无法发送备忘信息,备忘不存在"
#. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5406
+#: ../modules/itip-formatter/itip-view.c:5413
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../modules/itip-formatter/itip-view.c:5411
+#: ../modules/itip-formatter/itip-view.c:5418
msgid "Save Calendar"
msgstr "保存日历"
-#: ../modules/itip-formatter/itip-view.c:5460
-#: ../modules/itip-formatter/itip-view.c:5473
+#: ../modules/itip-formatter/itip-view.c:5467
+#: ../modules/itip-formatter/itip-view.c:5480
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../modules/itip-formatter/itip-view.c:5461
-#: ../modules/itip-formatter/itip-view.c:5474
+#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5481
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信息声明其包含日历,但日历不是有效的 iCalendar。"
-#: ../modules/itip-formatter/itip-view.c:5516
-#: ../modules/itip-formatter/itip-view.c:5546
-#: ../modules/itip-formatter/itip-view.c:5647
+#: ../modules/itip-formatter/itip-view.c:5523
+#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5654
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../modules/itip-formatter/itip-view.c:5517
-#: ../modules/itip-formatter/itip-view.c:5547
-#: ../modules/itip-formatter/itip-view.c:5648
+#: ../modules/itip-formatter/itip-view.c:5524
+#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5655
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
msgstr "信息的确包含日历,但是日历不包含事件、任务或忙/闲信息"
-#: ../modules/itip-formatter/itip-view.c:5562
+#: ../modules/itip-formatter/itip-view.c:5569
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../modules/itip-formatter/itip-view.c:5563
+#: ../modules/itip-formatter/itip-view.c:5570
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
-#: ../modules/itip-formatter/itip-view.c:6065
+#: ../modules/itip-formatter/itip-view.c:6072
msgctxt "cal-itip"
msgid "None"
msgstr "无"
-#: ../modules/itip-formatter/itip-view.c:6081
+#: ../modules/itip-formatter/itip-view.c:6088
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../modules/itip-formatter/itip-view.c:6241
+#: ../modules/itip-formatter/itip-view.c:6248
msgid "This meeting recurs"
msgstr "此会议重现"
-#: ../modules/itip-formatter/itip-view.c:6244
+#: ../modules/itip-formatter/itip-view.c:6251
msgid "This task recurs"
msgstr "此任务重现"
-#: ../modules/itip-formatter/itip-view.c:6247
+#: ../modules/itip-formatter/itip-view.c:6254
msgid "This memo recurs"
msgstr "此备忘重现"
@@ -17807,10 +18155,6 @@ msgstr "永久删除所有文件夹中的所有已删除的信息"
msgid "Edit properties of this account"
msgstr "编辑该帐号的属性"
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-msgid "_Refresh"
-msgstr "刷新(_R)"
-
#: ../modules/mail/e-mail-shell-view-actions.c:1535
msgid "Refresh list of folders of this account"
msgstr "刷新该帐号的文件夹列表"
@@ -18103,61 +18447,61 @@ msgstr "全部帐号搜索"
msgid "Account Search"
msgstr "帐号搜索"
-#: ../modules/mail/e-mail-shell-view-private.c:984
+#: ../modules/mail/e-mail-shell-view-private.c:969
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "已选中 %d 个,"
-#: ../modules/mail/e-mail-shell-view-private.c:993
-#: ../modules/mail/e-mail-shell-view-private.c:1010
+#: ../modules/mail/e-mail-shell-view-private.c:978
+#: ../modules/mail/e-mail-shell-view-private.c:995
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../modules/mail/e-mail-shell-view-private.c:1019
-#: ../modules/mail/e-mail-shell-view-private.c:1025
+#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:1010
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1017
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../modules/mail/e-mail-shell-view-private.c:1023
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1029
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../modules/mail/e-mail-shell-view-private.c:1056
+#: ../modules/mail/e-mail-shell-view-private.c:1041
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] ",%d 封未读,"
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/mail/e-mail-shell-view-private.c:1044
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1065
msgid "Trash"
msgstr "回收站"
-#: ../modules/mail/e-mail-shell-view-private.c:1517
+#: ../modules/mail/e-mail-shell-view-private.c:1502
msgid "Send / Receive"
msgstr "发送/接收"
@@ -18218,7 +18562,7 @@ msgstr "日期头:(_D)"
msgid "Show _original header value"
msgstr "显示原始邮件头值(_o)"
-#: ../modules/mailto-handler/evolution-mailto-handler.c:141
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
msgid "Do you want to make Evolution your default email client?"
msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端?"
@@ -18412,15 +18756,15 @@ msgstr "SpamAssassin"
#. 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:341
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
msgid "Importing Files"
msgstr "导入文件"
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
msgid "Import cancelled."
msgstr "导入已取消。"
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:277
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
msgid "Import complete."
msgstr "导入完成。"
@@ -18707,12 +19051,12 @@ msgstr "将该部分显示为地址簿联系人"
msgid "Evolution Web Inspector"
msgstr "Evolution 网络审查器"
-#: ../plugins/attachment-reminder/attachment-reminder.c:120
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
msgid "_Do not show this message again."
msgstr "不再显示此信息(_D)。"
-#: ../plugins/attachment-reminder/attachment-reminder.c:582
-#: ../plugins/templates/templates.c:476
+#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/templates/templates.c:478
msgid "Keywords"
msgstr "关键字"
@@ -18807,52 +19151,52 @@ msgstr "Outlook 个人文件夹(.dbx)"
msgid "Import Outlook Express messages from DBX file"
msgstr "从 DBX 文件中导入 Outlook 邮件"
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:293
msgctxt "email-custom-header-Security"
msgid "Security:"
msgstr "安全:"
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:297
msgctxt "email-custom-header-Security"
msgid "Personal"
msgstr "个人"
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:298
msgctxt "email-custom-header-Security"
msgid "Unclassified"
msgstr "未分类"
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:299
msgctxt "email-custom-header-Security"
msgid "Protected"
msgstr "受保护的"
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:300
msgctxt "email-custom-header-Security"
msgid "Confidential"
msgstr "机密"
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:301
msgctxt "email-custom-header-Security"
msgid "Secret"
msgstr "机密"
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:302
msgctxt "email-custom-header-Security"
msgid "Top secret"
msgstr "绝密"
-#: ../plugins/email-custom-header/email-custom-header.c:360
+#: ../plugins/email-custom-header/email-custom-header.c:362
msgctxt "email-custom-header"
msgid "None"
msgstr "无"
-#: ../plugins/email-custom-header/email-custom-header.c:536
+#: ../plugins/email-custom-header/email-custom-header.c:538
msgid "_Custom Header"
msgstr "自定义信头(_C)"
#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:806
+#: ../plugins/email-custom-header/email-custom-header.c:808
msgid ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by \";\"."
@@ -18860,12 +19204,12 @@ msgstr ""
"指定头和头值的格式为:\n"
"自定义头的名称,值,头与头之间以“;”分割。"
-#: ../plugins/email-custom-header/email-custom-header.c:859
+#: ../plugins/email-custom-header/email-custom-header.c:861
msgid "Key"
msgstr "键"
-#: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:485
+#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/templates/templates.c:487
msgid "Values"
msgstr "值"
@@ -19409,7 +19753,7 @@ msgid "Mount of %s failed:"
msgstr "加载 %s 失败:"
#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.ui.h:35
msgid "E_nable"
msgstr "启用(_N)"
@@ -19420,11 +19764,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:1144
+#: ../plugins/publish-calendar/publish-calendar.c:1142
msgid "Could not create publish thread."
msgstr "无法创建发布索引。"
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1152
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
@@ -19626,11 +19970,11 @@ msgstr "保存一个日历或者任务到磁盘。"
#. * It lets you define the formatting of the date in the rdf-file.
#. * Also check out http://www.w3.org/2002/12/cal/tzd
#. *
-#: ../plugins/save-calendar/rdf-format.c:146
+#: ../plugins/save-calendar/rdf-format.c:147
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:384
+#: ../plugins/save-calendar/rdf-format.c:385
msgid "RDF (.rdf)"
msgstr "RDF (.rdf)"
@@ -19642,6 +19986,11 @@ msgstr "格式(_F):"
msgid "Select destination file"
msgstr "选择目的文件"
+#: ../plugins/save-calendar/save-calendar.c:190
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "另存为(_S)"
+
#: ../plugins/save-calendar/save-calendar.c:347
msgid "Save the selected calendar to disk"
msgstr "保存选中的日历到磁盘"
@@ -19663,15 +20012,15 @@ msgstr ""
"基于草稿的模板插件。您可以使用 $ORIG[subject]、$ORIG[from]、$ORIG[to] 或 "
"$ORIG[body] 这样的变量,它们将替换为您所回复邮件中对应的值。"
-#: ../plugins/templates/templates.c:1144
+#: ../plugins/templates/templates.c:1146
msgid "No Title"
msgstr "无标题"
-#: ../plugins/templates/templates.c:1253
+#: ../plugins/templates/templates.c:1255
msgid "Save as _Template"
msgstr "另存为模板(_T)"
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1257
msgid "Save as Template"
msgstr "另存为模板"
@@ -19762,6 +20111,10 @@ msgstr "未安装 Bug Buddy。"
msgid "Bug Buddy could not be run."
msgstr "无法运行 Bug Buddy。"
+#: ../shell/e-shell-window-actions.c:850
+msgid "_About"
+msgstr "关于(_A)"
+
#: ../shell/e-shell-window-actions.c:852
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
@@ -19810,6 +20163,11 @@ msgstr "快速首选项(_Q)"
msgid "Show Evolution's shortcut keys"
msgstr "显示 Evolution 的快捷键"
+#: ../shell/e-shell-window-actions.c:948
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "退出(_Q)"
+
#: ../shell/e-shell-window-actions.c:950
msgid "Exit the program"
msgstr "退出程序"
@@ -19842,7 +20200,6 @@ msgstr "单击此处更改搜索类型"
msgid "_Find Now"
msgstr "立即查找(_F)"
-#. Block the default Ctrl+F.
#: ../shell/e-shell-window-actions.c:985
msgid "Execute the current search parameters"
msgstr "执行当前搜索参数"
@@ -19883,10 +20240,6 @@ msgstr "将 Evolution 转入在线模式"
msgid "Lay_out"
msgstr "布局(_O)"
-#: ../shell/e-shell-window-actions.c:1055
-msgid "_New"
-msgstr "新建(_N)"
-
#: ../shell/e-shell-window-actions.c:1062
msgid "_Search"
msgstr "搜索(_S)"
@@ -19987,6 +20340,10 @@ msgstr "当前视图"
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
+#: ../shell/e-shell-window-actions.c:1227
+msgid "Page Set_up..."
+msgstr "页面设置(_U)..."
+
#: ../shell/e-shell-window-actions.c:1229
msgid "Change the page settings for your current printer"
msgstr "更改当前打印机的页面设置"
@@ -20354,70 +20711,70 @@ msgstr "备份(_B)"
msgid "Backup _All"
msgstr "全部备份(_A)"
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
msgid "Your Certificates"
msgstr "您的证书"
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
msgid "You have certificates on file that identify these people:"
msgstr "您拥有证明这些人的文件型证书:"
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:14
msgid "Contact Certificates"
msgstr "联系人证书"
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:15
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr "您拥有证明这些颁发机构的文件型证书:"
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:16
msgid "Authorities"
msgstr "证书颁发机构"
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
msgid "Certificate Authority Trust"
msgstr "证书颁发机构信任"
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
msgid "Trust this CA to identify _websites."
msgstr "信任此颁发机构标识的网站(_W)。"
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
msgid "Trust this CA to identify _email users."
msgstr "信任此颁发机构标识的电子邮件用户(_E)。"
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
msgid "Trust this CA to identify _software developers."
msgstr "信任此颁发机构标识的软件开发者(_S)。"
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:21
msgid ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
msgstr "在信任此 CA 的任何用途之前,您应该先检查该证书及其策略和过程(若可用)。"
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:25
msgid "Certificate"
msgstr "证书"
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:26
msgid "Certificate details"
msgstr "证书细节"
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:27
msgid "Email Certificate Trust Settings"
msgstr "电子邮件证书信任设置"
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:28
msgid "Trust the authenticity of this certificate"
msgstr "信任此证书的颁发机构"
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:29
msgid "Do not trust the authenticity of this certificate"
msgstr "不信任此证书的颁发机构"
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:30
msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
@@ -20522,6 +20879,12 @@ msgstr "到期日期(_D)"
msgid "With _Status"
msgstr "状态(_S)"
+#~ msgid "Original Contact:"
+#~ msgstr "原联系人:"
+
+#~ msgid "A_dd"
+#~ msgstr "添加(_D)"
+
#~ msgid "Pinging %s"
#~ msgstr "查验 %s"
@@ -21453,9 +21816,6 @@ msgstr "状态(_S)"
#~ msgid "Move _Up"
#~ msgstr "上移(_U)"
-#~ msgid "Move _Down"
-#~ msgstr "下移(_D)"
-
#~ msgid "Some features may not work properly with your current server"
#~ msgstr "某些特性可能无法在您目前的服务器下工作"
@@ -21954,9 +22314,6 @@ msgstr "状态(_S)"
#~ msgid "S_elect..."
#~ msgstr "选择(_E)..."
-#~ msgid "Clea_r"
-#~ msgstr "清除(_R)"
-
#~ msgid "Cle_ar"
#~ msgstr "清除(_A)"