[evolution] Update zh_CN translation
- From: YunQiang Su <yqsu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] Update zh_CN translation
- Date: Tue, 5 Apr 2016 08:46:42 +0000 (UTC)
commit 9e5f0f74e4a9cf24cc625044f9b50b8431bf3209
Author: Mingye Wang <arthur200126 gmail com>
Date: Tue Apr 5 16:45:42 2016 +0800
Update zh_CN translation
po/zh_CN.po |13839 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 8768 insertions(+), 5071 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 839c00f..0931a9f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,23 +16,23 @@
# Wylmer Wang <wantinghard gmail com>, 2011, 2012, 2014.
# tuhaihe <1132321739qq gmail com>, 2012.
# 甘露(Gan Lu) <rhythm gan gmail com>，2013
-# Tong Hui <tonghuix gmail com>, 2013, 2014.
-#
-#: ../shell/main.c:554
+# Tong Hui <tonghuix gmail com>, 2013, 2014, 2015.
+# Mingye Wang (Arthur2e5) <arthur200126 gmail com>, 2015.
msgid ""
msgstr ""
"Project-Id-Version: evolution master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-03-08 05:29+0000\n"
-"PO-Revision-Date: 2014-01-23 21:43+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2016-02-22 09:12+0000\n"
+"PO-Revision-Date: 2016-04-05 16:40+0800\n"
+"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126 gmail com>\n"
"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.8.7.1\n"
#: ../addressbook/addressbook.error.xml.h:1
msgid "This address book could not be opened."
@@ -46,7 +46,7 @@ msgstr "此地址簿服务器不可达，或服务器名称拼错，又或者您
#: ../addressbook/addressbook.error.xml.h:3
msgid "Failed to authenticate with LDAP server."
-msgstr "认证到 IMAP 服务器失败。"
+msgstr "使用 LDAP 服务器认证失败。"
#: ../addressbook/addressbook.error.xml.h:4
msgid ""
@@ -94,8 +94,8 @@ msgstr "删除地址簿“{0}”吗？"
msgid "This address book will be removed permanently."
msgstr "此地址簿即将被永久删除。"
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:69
msgid "Do _Not Delete"
msgstr "不删除(_N)"
@@ -120,31 +120,35 @@ msgstr "类别编辑器不可用。"
#: ../addressbook/addressbook.error.xml.h:18
msgid "Unable to open address book '{0}'"
-msgstr "无法打开地址簿 '{0}'"
+msgstr "无法打开地址簿“{0}”"
#: ../addressbook/addressbook.error.xml.h:19
msgid "Unable to perform search."
msgstr "无法执行搜索。"
#: ../addressbook/addressbook.error.xml.h:20
+msgid "Failed to refresh address book '{0}'"
+msgstr "刷新地址簿“{0}”失败"
+
+#: ../addressbook/addressbook.error.xml.h:21
msgid "Would you like to save your changes?"
msgstr "您希望保存更改吗？"
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "您已对此联系人作出了修改。您想要保存这些更改吗？"
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
msgid "_Discard"
msgstr "丢弃(_D)"
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
msgid "Cannot move contact."
msgstr "无法移动联系人。"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
msgid ""
"You are attempting to move a contact from one address book to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
@@ -152,115 +156,115 @@ msgstr ""
"您即将把联系人从一个地址簿移至另外一个地址簿，但是无法从源地址簿删除该联系"
"人。您想要换作复制联系人吗？"
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr "您所选择的图像太大。您是否想要缩放并存储？"
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
msgid "_Resize"
msgstr "缩放(_R)"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
msgid "_Use as it is"
msgstr "原样使用(_U)"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
msgid "_Do not save"
msgstr "不保存(_D)"
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to save {0}."
msgstr "无法保存 {0}。"
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Error saving {0} to {1}: {2}"
msgstr "将{0}保存到 {1} 出错：{2}"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
msgid "Address '{0}' already exists."
msgstr "地址“{0}”已经存在。"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
msgid ""
"A contact already exists with this address. Would you like to add a new card "
"with the same address anyway?"
msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添加新名片吗？"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
#: ../calendar/gui/dialogs/event-page.ui.h:22
#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
#: ../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:51
-#: ../modules/mail/em-composer-prefs.c:443
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
+#: ../mail/mail-config.ui.h:57 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../plugins/email-custom-header/email-custom-header.c:839
#: ../plugins/publish-calendar/publish-calendar.ui.h:32
#: ../plugins/templates/templates.c:453
msgid "_Add"
msgstr "添加(_A)"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
msgid "Some addresses already exist in this contact list."
msgstr "有些地址已经在此联系人列表中。"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"You are trying to add addresses that are part of this list already. Would "
"you like to add them anyway?"
msgstr "您正在试图添加已经属于此列表的地址。您仍要添加它们吗？"
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
msgid "Skip duplicates"
msgstr "跳过重复"
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
msgid "Add with duplicates"
msgstr "重复添加"
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
msgid "List '{0}' is already in this contact list."
msgstr "列表“{0}”已在联系人列表中。"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
msgid ""
"A contact list named '{0}' is already in this contact list. Would you like "
"to add it anyway?"
msgstr "一条名为“{0}”的联系人记录已经在此联系人列表中了。您仍要添加它吗？"
-#: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
msgid "Failed to delete contact"
msgstr "删除联系人失败"
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
msgid "You do not have permission to delete contacts in this address book."
msgstr "您没有足够的权限从地址簿中删除联系人。"
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
msgid "Cannot add new contact"
msgstr "无法添加新联系人"
#. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
msgid ""
"'{0}' is a read-only address book and cannot be modified. Please select a "
"different address book from the side bar in the Contacts view."
msgstr ""
"“{0}”是只读的地址簿，无法修改。请从联系人视图的侧边栏中选择另外一个地址簿。"
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
msgid "Cannot save a contact, address book is still opening"
msgstr "无法保存联系人，地址簿仍在打开中"
#. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
msgid ""
"Cannot save a contact to the address book '{0}', because it is still "
"opening. Either wait till it's opened, or select a different address book."
@@ -269,9 +273,9 @@ msgstr ""
"簿。"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -304,81 +308,80 @@ msgid "Full _Name..."
msgstr "全名(_N)..."
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "愿意接收 HTML 邮件(_W)"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:589
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:966
msgid "Email"
msgstr "电子邮件"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "愿意接收 HTML 邮件(_W)"
+
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
msgid "Telephone"
msgstr "电话"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "SIP Address"
+msgstr "SIP 地址"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
msgid "Instant Messaging"
msgstr "即时通讯"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/importers/evolution-vcard-importer.c:979
msgid "Contact"
msgstr "联系人"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
msgid "_Home Page:"
msgstr "主页(_H)："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
#: ../calendar/gui/dialogs/event-page.c:709
#: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../modules/itip-formatter/itip-view.c:1905
msgid "_Calendar:"
msgstr "日历(_C)："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
msgid "_Free/Busy:"
msgstr "忙/闲(_F)："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
msgid "_Video Chat:"
msgstr "视频聊天(_V)："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
msgid "Home Page:"
msgstr "主页："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:92
msgid "Calendar:"
msgstr "日历："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
msgid "Free/Busy:"
msgstr "闲/忙："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
msgid "Video Chat:"
msgstr "视频聊天："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
msgid "_Blog:"
msgstr "博客(_N)："
#. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
msgid "Blog:"
msgstr "博客："
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "网络地址"
-
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
msgstr "网络地址"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -427,19 +430,16 @@ msgid "_Anniversary:"
msgstr "周年(_A)："
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2277
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2049
msgid "Anniversary"
msgstr "纪念日"
-#. XXX Allow the category icons to be referenced as named
-#. * icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category. Doesn't matter
-#. * which, so long as it has an icon. We're just interested in
-#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
-#: ../calendar/gui/e-calendar-view.c:2276 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2048
msgid "Birthday"
msgstr "生日"
@@ -472,32 +472,30 @@ msgid "_PO Box:"
msgstr "邮政邮箱(_P)："
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
msgid "_Address:"
msgstr "地址(_A)："
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
#: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
msgid "Home"
msgstr "家庭"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
#: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
msgid "Work"
msgstr "工作"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3791
msgid "Other"
msgstr "其它"
@@ -510,167 +508,288 @@ 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:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+msgid "Add _PGP"
+msgstr "添加 _PGP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+msgstr "添加 _X.509"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:475
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:58
+#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../plugins/email-custom-header/email-custom-header.c:849
+#: ../plugins/publish-calendar/publish-calendar.c:791
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr "加载 P_GP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr "加载 X.509 (_L)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3507
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
+#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
+#: ../e-util/e-attachment-store.c:641
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:137
+#: ../smime/gui/certificate-manager.c:655
+#: ../smime/gui/certificate-manager.c:732
+msgid "_Save"
+msgstr "保存(_S)"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+msgid "Certificates"
+msgstr "证书"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell.c:1222 ../shell/e-shell-window-actions.c:955
msgid "_Help"
msgstr "帮助(_H)"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
+msgid "Options"
+msgstr "选项"
+
#. 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/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
#: ../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:621
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1365
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c: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
+#: ../calendar/gui/dialogs/recurrence-page.c:2339
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:359
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:496
+#: ../e-util/e-attachment-store.c:640 ../e-util/e-attachment-view.c:421
+#: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
+#: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
+#: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:593 ../e-util/e-html-editor-actions.c:688
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3088 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:372 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
#: ../e-util/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
-#: ../mail/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
+#: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
+#: ../mail/mail-config.ui.h:2 ../mail/mail.error.xml.h:18
+#: ../mail/mail-send-recv.c:743 ../mail/mail-send-recv.c:825
+#: ../mail/mail-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:899
+#: ../modules/calendar/e-cal-attachment-handler.c:285
#: ../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/face/face.c:297
+#: ../plugins/publish-calendar/publish-calendar.c:790
#: ../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
+#: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:72
+#: ../shell/e-shell-utils.c:136 ../smime/gui/certificate-manager.c:654
+#: ../smime/gui/certificate-manager.c:731
+#: ../smime/gui/certificate-manager.c:955
+#: ../smime/gui/certificate-manager.c:1337 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
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:624
-#: ../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:3089
-#: ../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/contact-editor.ui.h:62
+msgid "Show Telephone"
+msgstr "显示电话"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show SIP Address"
+msgstr "显示 SIP 地址"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Instant Messaging"
+msgstr "显示即时通讯"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
-msgid "Yahoo"
-msgstr "雅虎"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Web Addresses"
+msgstr "显示网络地址"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
+msgid "Show Job section"
+msgstr "显示工作职位"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
+msgid "Show Miscellaneous"
+msgstr "显示杂项"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
+msgid "Show Home Mailing Address"
+msgstr "显示家庭邮政地址"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
+msgid "Show Work Mailing Address"
+msgstr "显示工作邮政地址"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
+msgid "Show Other Mailing Address"
+msgstr "显示其他邮政地址"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "Twitter"
-msgstr "Twitter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
+msgid "Show Notes"
+msgstr "显示备注 %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+msgid "Show Certificates"
+msgstr "显示证书"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:262
+#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../e-util/e-html-editor-actions.c:1111
+msgid "_Undo"
+msgstr "撤消(_U)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
msgid "Undo"
msgstr "撤消"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../e-util/e-html-editor-actions.c:1097
+msgid "_Redo"
+msgstr "重做(_R)"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
msgid "Redo"
msgstr "重做"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
#: ../addressbook/gui/widgets/eab-gui-util.c:503
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../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:3240
+msgid "X.509 certificates"
+msgstr "X.509 证书"
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr "PGP 密钥"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3251
+#: ../smime/gui/certificate-manager.c:678
+#: ../smime/gui/certificate-manager.c:967
+msgid "All files"
+msgstr "全部文件"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open PGP key"
+msgstr "打开 PGP 密钥"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open X.509 certificate"
+msgstr "打开 X.509 证书"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3274
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4322
+#: ../e-util/e-attachment-store.c:494 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:594 ../e-util/e-html-editor-actions.c:689
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:298
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
msgid "_Open"
msgstr "打开(_O)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+msgid "Chosen file is not a local file."
+msgstr "已选取的文件不是本地文件。"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, c-format
+msgid "Failed to load certificate: %s"
+msgstr "无法加载证书：%s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr "X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr "PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr "保存 PGP 密钥"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save X.509 certificate"
+msgstr "保存 X.509 证书"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, c-format
+msgid "Failed to save certificate: %s"
+msgstr "保存证书失败：%s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "请选择此联系人的图像"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -678,56 +797,57 @@ msgstr ""
"联系人数据无效：\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
#, c-format
msgid "'%s' cannot be a future date"
msgstr "“%s”不能是未来的日期"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
#: ../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:243
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2340
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:436 ../e-util/e-passwords.c:471
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../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
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
msgid "_OK"
msgstr "确定(_O)"
@@ -739,15 +859,15 @@ msgstr "快速添加联系人"
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
@@ -850,24 +970,6 @@ msgstr "将电子邮件添加到列表"
msgid "Remove an email address from the List"
msgstr "从列表中删除电子邮件地址"
-#: ../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:52
-#: ../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 "从地址簿中插入电子邮件地址"
@@ -900,41 +1002,254 @@ msgstr "底部(_B)"
msgid "Contact List Members"
msgstr "联系人列表成员"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
msgid "_Members"
msgstr "成员(_M)"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+msgid "Name contains"
+msgstr "姓名含有"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+msgid "Email begins with"
+msgstr "邮件以此开头"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "任何域含有"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "evolution 地址簿"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "复制电子邮件地址(_E)"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:340
+msgid "Copy the email address to the clipboard"
+msgstr "复制电子邮件地址到剪贴板"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:352
+msgid "_Send New Message To..."
+msgstr "把新信息发送到(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:354
+msgid "Send a mail message to this address"
+msgstr "发送一个邮件信息到这个地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:1069
+#, c-format
+msgid "Click to mail %s"
+msgstr "单击以给 %s 发送邮件"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "打开地图"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "列出成员："
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "昵称"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "雅虎"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "公司"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "部门"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "办公室"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "职业"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "位置"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "经理"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "助手"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "视频聊天"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:572
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "日历"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "忙/闲"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "电话"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "传真"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "地址"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "主页"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Web 日志"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "移动电话"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "配偶"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "个人"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "注释"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "列出成员"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "职称"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "主页"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
#: ../calendar/gui/tasktypes.xml.h:14
msgid "Cancelled"
msgstr "已取消"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
msgid "Merge Contact"
msgstr "合并联系人"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
msgid "_Merge"
msgstr "合并(_M)"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
msgid "Duplicate Contact Detected"
msgstr "复制检测到的联系人"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to save the changes anyway?"
@@ -942,7 +1257,7 @@ msgstr ""
"此联系人的姓名或邮箱地址已经在本文件夹中了。\n"
"您仍要保存更改吗？"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
@@ -950,41 +1265,127 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您仍然要添加它吗？"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
msgid "Changed Contact:"
msgstr "更改了的联系人："
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
msgid "New Contact:"
msgstr "新联系人："
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
msgid "Conflicting Contact:"
msgstr "冲突的联系人："
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
msgid "Old Contact:"
msgstr "以前联系人："
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "姓名含有"
+#: ../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 "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"无法打开此地址簿。这可能意味着此地址簿没有标为可离线使用，或者尚未下载完成以"
+"供离线使用。请在在线模式中载入此地址簿以便下载其内容。"
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "邮件以此开头"
+#: ../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/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "任何域含有"
+#: ../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."
+msgstr ""
+"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
+"LDAP，就必须安装启用了 LDAP 的 Evolution 包。"
+
+#: ../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."
+msgstr ""
+"无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经关"
+"闭。"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "详细错误信息："
+
+#: ../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"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"匹配此查询的名片数超过了服务器配置的返回数目，或者超过了\n"
+"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
+"搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
+
+#: ../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"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"执行此查询的时间超过了服务器限制，或者超过了为此地址簿配置的限制。\n"
+"请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
+"中将时间限制调高。"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../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: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: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:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "选择地址簿"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "列表"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "将联系人移至"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "将联系人复制到"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "将联系人移至"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "将联系人复制到"
#: ../addressbook/gui/widgets/e-addressbook-model.c:162
msgid "No contacts"
@@ -1004,73 +1405,72 @@ msgstr "获取名簿视图出错"
msgid "Search Interrupted"
msgstr "搜索中断了"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
msgid "Cut selected contacts to the clipboard"
msgstr "将选联系人剪切到剪贴板"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
msgid "Copy selected contacts to the clipboard"
msgstr "将选中联系人复制到剪贴板"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
msgid "Paste contacts from the clipboard"
msgstr "从剪贴板中粘贴联系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
msgid "Delete selected contacts"
msgstr "删除选中的联系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
msgid "Select all visible contacts"
msgstr "选中全部可见联系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
msgid "Are you sure you want to delete these contact lists?"
msgstr "您确定要删除这些联系人列表吗？"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
msgid "Are you sure you want to delete this contact list?"
msgstr "您确定要删除这些联系人列表吗？"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
#, c-format
msgid "Are you sure you want to delete this contact list (%s)?"
msgstr "您确定要删除联系人列表(%s)吗？"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
msgid "Are you sure you want to delete these contacts?"
msgstr "您确定要删除这些联系人吗？"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
msgid "Are you sure you want to delete this contact?"
msgstr "您确定要删除这些联系人吗？"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
#, c-format
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/e-focus-tracker.c:740
-#: ../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:944 ../smime/gui/smime-ui.ui.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805 ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
+#: ../shell/e-shell-window-actions.c:813
+#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
msgid "_Delete"
msgstr "删除(_D)"
#. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -1082,11 +1482,11 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗？"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
msgid "_Don't Display"
msgstr "不显示(_D)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
msgid "Display _All Contacts"
msgstr "显示全部联系人(_A)"
@@ -1102,11 +1502,6 @@ msgstr "名"
msgid "Family Name"
msgstr "姓"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:591
-msgid "Nickname"
-msgstr "昵称"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
msgid "Email 2"
msgstr "电子邮件 2"
@@ -1159,11 +1554,6 @@ msgstr "家庭传真"
msgid "ISDN Phone"
msgstr "ISDN 电话"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
-msgid "Mobile Phone"
-msgstr "移动电话"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
msgid "Other Phone"
msgstr "其它电话"
@@ -1198,40 +1588,20 @@ msgstr "电传"
msgid "TTYTDD"
msgstr "TTYTDD"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:644
-msgid "Company"
-msgstr "公司"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
msgid "Unit"
msgstr "单位"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
-msgid "Office"
-msgstr "办公室"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
msgid "Title"
msgstr "头衔"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-list-view.c:659
#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
msgid "Role"
msgstr "角色"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../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:650
-msgid "Assistant"
-msgstr "助手"
-
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
msgid "Web Site"
msgstr "网站"
@@ -1248,38 +1618,60 @@ msgstr "日记"
msgid "Categories"
msgstr "类别"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Spouse"
-msgstr "配偶"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "打开"
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-msgid "Note"
-msgstr "注释"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "联系人列表："
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "联系人："
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "新建联系人"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
msgid "Contacts Map"
msgstr "联系人地图"
#. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
msgid "Zoom _In"
msgstr "放大(_I)"
#. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2293
msgid "Zoom _Out"
msgstr "缩小(_O)"
#. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:1021
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:2090
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:890
msgid "_Find"
msgstr "查找(_F)"
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
msgid ""
"\n"
"\n"
@@ -1289,7 +1681,7 @@ msgstr ""
"\n"
"正在搜索联系人..."
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
msgid ""
"\n"
"\n"
@@ -1303,7 +1695,7 @@ msgstr ""
"\n"
"或在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
msgid ""
"\n"
"\n"
@@ -1317,7 +1709,7 @@ msgstr ""
"\n"
"请在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
msgid ""
"\n"
"\n"
@@ -1327,7 +1719,7 @@ msgstr ""
"\n"
"搜索联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
msgid ""
"\n"
"\n"
@@ -1337,359 +1729,96 @@ msgstr ""
"\n"
"本视图中没有可显示的项。"
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "工作电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "家庭电子邮件"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "其它电子邮件"
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "evolution 地址簿"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "新建联系人"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "新建联系人列表"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "打开"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "联系人列表："
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "联系人："
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "复制电子邮件地址(_E)"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
-msgid "Copy the email address to the clipboard"
-msgstr "复制电子邮件地址到剪贴板"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
-msgid "_Send New Message To..."
-msgstr "把新信息发送到(_S)..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
-msgid "Send a mail message to this address"
-msgstr "发送一个邮件信息到这个地址"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
-#, c-format
-msgid "Click to mail %s"
-msgstr "单击以给 %s 发送邮件"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "打开地图"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:528
-msgid "List Members:"
-msgstr "列出成员："
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
-msgid "Department"
-msgstr "部门"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
-msgid "Profession"
-msgstr "职业"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
-msgid "Position"
-msgstr "位置"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Video Chat"
-msgstr "视频聊天"
-
-#: ../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
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "日历"
-
-#: ../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:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
-msgid "Phone"
-msgstr "电话"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Fax"
-msgstr "传真"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:709
-msgid "Address"
-msgstr "地址"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
-msgid "Home Page"
-msgstr "主页"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
-msgid "Web Log"
-msgstr "Web 日志"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
-msgid "Personal"
-msgstr "个人"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:930
-msgid "List Members"
-msgstr "列出成员"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:951
-msgid "Job Title"
-msgstr "职称"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:992
-msgid "Home page"
-msgstr "主页"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1002
-msgid "Blog"
-msgstr "Blog"
-
-#: ../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 "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"无法打开此地址簿。这可能意味着此地址簿没有标为可离线使用，或者尚未下载完成以"
-"供离线使用。请在在线模式中载入此地址簿以便下载其内容。"
-
-#: ../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: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."
-msgstr ""
-"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
-"LDAP，就必须安装启用了 LDAP 的 Evolution 包。"
-
-#: ../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."
-msgstr ""
-"无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经关"
-"闭。"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "详细错误信息："
-
-#: ../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"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"匹配此查询的名片数超过了服务器配置的返回数目，或者超过了\n"
-"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
-"搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
-
-#: ../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"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"执行此查询的时间超过了服务器限制，或者超过了为此地址簿配置的限制。\n"
-"请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
-"中将时间限制调高。"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../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: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: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:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "选择地址簿"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "列表"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "将联系人移至"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "将联系人复制到"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "将联系人移至"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "将联系人复制到"
-
#: ../addressbook/importers/evolution-csv-importer.c:746
#: ../addressbook/importers/evolution-ldif-importer.c:548
#: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:431
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:965 ../shell/shell.error.xml.h:1
msgid "Importing..."
msgstr "正在导入..."
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1089
msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
msgstr "Outlook 联系人 CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1090
msgid "Outlook Contacts CSV and Tab Importer"
msgstr "Outlook 联系人 CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1098
msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
msgstr "Mozilla 联系人 CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1099
msgid "Mozilla Contacts CSV and Tab Importer"
msgstr "Mozilla 联系人 CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1107
msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
msgstr "Evolution 联系人 CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1108
msgid "Evolution Contacts CSV and Tab Importer"
msgstr "Evolution 联系人 CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:814
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:815
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../addressbook/importers/evolution-vcard-importer.c:642
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../addressbook/importers/evolution-vcard-importer.c:643
msgid "Evolution vCard Importer"
msgstr "Evolution vCard 导入器"
#. Uncomment next if it is successful to get total number if pages in list view
#. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
#, c-format
msgid "Page %d"
msgstr "第 %d 页"
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
msgid "Specify the output file instead of standard output"
msgstr "指定用来取代标准输出的输出文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
msgid "OUTPUTFILE"
msgstr "输出文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
msgid "List local address book folders"
msgstr "列出本地地址簿文件夹"
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
msgid "Show cards as vcard or csv file"
msgstr "将名片显示为 vcard 还是 csv 文件"
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
msgid "[vcard|csv]"
msgstr "[vcard|csv]"
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
msgid ""
"Command line arguments error, please use --help option to see the usage."
msgstr "命令行参数错误，请使用 --help 选项查看用法。"
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
msgid "Only support csv or vcard format."
msgstr "仅支持 csv 或 vcard 格式。"
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
msgid "Unhandled error"
msgstr "未处理的错误"
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
msgid "Can not open file"
msgstr "无法打开文件"
@@ -1699,6 +1828,124 @@ msgstr "无法打开文件"
msgid "Failed to open client '%s': %s"
msgstr "打开客户端“%s”失败：%s"
+#: ../addressbook/util/eab-book-util.c:36
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "工作电子邮件"
+
+#: ../addressbook/util/eab-book-util.c:37
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "家庭电子邮件"
+
+#: ../addressbook/util/eab-book-util.c:38
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "其它电子邮件"
+
+#: ../addressbook/util/eab-book-util.c:44
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "工作 SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "家庭 SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "其它 SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "雅虎"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "电子邮件"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "即时通讯"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "电话"
+
#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
msgid "minute"
msgid_plural "minutes"
@@ -1713,16 +1960,17 @@ msgstr[0] "小时"
#. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day'
or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1266
msgid "day"
msgid_plural "days"
msgstr[0] "天"
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
msgid "Start time"
msgstr "开始时间"
#: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1949
msgid "Appointments"
msgstr "约会"
@@ -1732,23 +1980,22 @@ msgstr "全部错过(_A)"
#: ../calendar/alarm-notify/alarm-notify.ui.h:3
msgid "_Snooze"
-msgstr "午睡(_S)"
+msgstr "小睡(_S)"
#: ../calendar/alarm-notify/alarm-notify.ui.h:4
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1349
#: ../calendar/gui/dialogs/event-page.ui.h:24
#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/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 ../mail/mail-config.ui.h:56
-#: ../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
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-html-editor-actions.c:1120
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
+#: ../plugins/attachment-reminder/attachment-reminder.c:443
+#: ../plugins/email-custom-header/email-custom-header.c:844
#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
#: ../smime/gui/smime-ui.ui.h:13
msgid "_Edit"
msgstr "编辑(_E)"
@@ -1757,16 +2004,16 @@ msgstr "编辑(_E)"
msgid "_Print"
msgstr "打印(_P)"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
msgid "_Dismiss"
msgstr "错过(_D)"
#: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:250
-#: ../modules/itip-formatter/itip-view.c:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1916
+#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1514
+#: ../modules/itip-formatter/itip-view.c:1625
msgid "Location:"
msgstr "位置："
@@ -1776,75 +2023,74 @@ msgstr "约会位置"
#: ../calendar/alarm-notify/alarm-notify.ui.h:9
msgid "Snooze _time:"
-msgstr "午睡时间(_T)："
+msgstr "小睡时间(_T)："
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
#: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "days"
msgstr "天"
#: ../calendar/alarm-notify/alarm-notify.ui.h:11
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
msgid "hours"
msgstr "小时"
#: ../calendar/alarm-notify/alarm-notify.ui.h:12
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
#: ../mail/e-mail-config-provider-page.c:526
msgid "minutes"
msgstr "分钟"
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../calendar/alarm-notify/alarm-queue.c:1896
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1723
+#: ../calendar/alarm-notify/alarm-queue.c:1725
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1733
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1738
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../calendar/alarm-notify/alarm-queue.c:2240
msgid "Evolution Reminders"
msgstr "Evolution 提醒器"
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1782
#, c-format
msgid "You have %d reminder"
msgid_plural "You have %d reminders"
msgstr[0] "您有 %d 条提醒"
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:2058
msgid "Warning"
msgstr "警告"
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
-#: ../mail/mail.error.xml.h:139
+#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
#: ../modules/mailto-handler/evolution-mailto-handler.c:114
msgid "_No"
msgstr "否(_N)"
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:2060
#: ../modules/mailto-handler/evolution-mailto-handler.c:115
msgid "_Yes"
msgstr "是(_Y)"
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:2064
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1860,7 +2106,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗？"
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:2079
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -1869,7 +2115,7 @@ msgid "invalid time"
msgstr "无效时间"
#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
#: ../calendar/gui/misc.c:103
#, c-format
msgid "%d hour"
@@ -1877,7 +2123,7 @@ msgid_plural "%d hours"
msgstr[0] "%d 小时"
#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
#: ../calendar/gui/misc.c:109
#, c-format
msgid "%d minute"
@@ -1887,7 +2133,7 @@ msgstr[0] "%d 分钟"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
#. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
#: ../calendar/gui/misc.c:113
#, c-format
msgid "%d second"
@@ -1912,8 +2158,7 @@ msgstr "不发送(_N)"
msgid "_Send Notice"
msgstr "发送通知(_S)"
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/dialogs/delete-comp.c:192
#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗？"
@@ -1929,8 +2174,7 @@ msgid ""
"the task has been deleted."
msgstr "如果您不发送取消通知，其他出席者可能不知道任务已经删除。"
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/dialogs/delete-comp.c:195
#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗？"
@@ -2026,8 +2270,7 @@ msgstr "您已经对此会议做出了更改，但尚未保存。"
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:16
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
@@ -2064,8 +2307,8 @@ msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr "将会向全部出席者发送电子邮件邀请，并允许他们答复。"
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:13
+#: ../mail/mail.error.xml.h:8
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "发送(_S)"
@@ -2082,13 +2325,13 @@ msgstr "发送更新的信息将允许其他出席者使他们的日历保持最
#: ../calendar/calendar.error.xml.h:43
msgid "Would you like to send this task to participants?"
-msgstr "您是否想要将此任务发送给出席者？"
+msgstr "您是否想要给出席者发送此任务？"
#: ../calendar/calendar.error.xml.h:44
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
-msgstr "将会向全部出席者发送电子邮件邀请，并允许他们接受此任务。"
+msgstr "将会向全部出席者发送电子邮件邀请，并使他们可以接受此任务。"
#: ../calendar/calendar.error.xml.h:45
msgid "Download in progress. Do you want to save the task?"
@@ -2142,11 +2385,11 @@ msgstr "此任务列表将被永久删除。"
#: ../calendar/calendar.error.xml.h:57
msgid "Delete memo list '{0}'?"
-msgstr "删除备忘列表“{0}”吗？"
+msgstr "删除备忘录列表“{0}”吗？"
#: ../calendar/calendar.error.xml.h:58
msgid "This memo list will be removed permanently."
-msgstr "此备忘列表将被永久删除。"
+msgstr "此备忘录列表将被永久删除。"
#: ../calendar/calendar.error.xml.h:59
msgid "Delete remote calendar '{0}'?"
@@ -2170,13 +2413,13 @@ msgstr "这将从服务器永久删除任务列表“{0}”。您确定要继续
#: ../calendar/calendar.error.xml.h:64
msgid "Delete remote memo list '{0}'?"
-msgstr "删除远端备忘列表“{0}”吗？"
+msgstr "删除远端备忘录列表“{0}”吗？"
#: ../calendar/calendar.error.xml.h:65
msgid ""
"This will permanently remove the memo list '{0}' from the server. Are you "
"sure you want to proceed?"
-msgstr "这将从服务器永久删除备忘列表“{0}”。您确定要继续吗？"
+msgstr "这将从服务器永久删除备忘录列表“{0}”。您确定要继续吗？"
#: ../calendar/calendar.error.xml.h:66
msgid "Are you sure you want to save the appointment without a summary?"
@@ -2205,7 +2448,7 @@ msgstr "您确定想要保存没有摘要的备忘吗？"
#. Translators: {0} is the name of the calendar.
#: ../calendar/calendar.error.xml.h:72
msgid "Error loading calendar '{0}'"
-msgstr "载入日历 '{0}' 时出错"
+msgstr "载入日历“{0}”时出错"
#: ../calendar/calendar.error.xml.h:73
msgid "The calendar is not marked for offline usage."
@@ -2235,7 +2478,7 @@ msgstr "“{0}”不支持分配的任务，请另选一个任务列表。"
#. Translators: {0} is the name of the task list.
#: ../calendar/calendar.error.xml.h:81
msgid "Error loading task list '{0}'"
-msgstr "载入任务列表 '{0}' 出错"
+msgstr "载入任务列表“{0}”出错"
#: ../calendar/calendar.error.xml.h:82
msgid "The task list is not marked for offline usage."
@@ -2244,74 +2487,197 @@ msgstr "任务列表未标为离线使用。"
#. Translators: {0} is the name of the memo list.
#: ../calendar/calendar.error.xml.h:84
msgid "Error loading memo list '{0}'"
-msgstr "载入备忘列表 '{0}' 出错"
+msgstr "载入备忘录列表“{0}”出错"
#: ../calendar/calendar.error.xml.h:85
msgid "The memo list is not marked for offline usage."
-msgstr "备忘列表未标为离线使用。"
+msgstr "备忘录列表未标为离线使用。"
#. Translators: {0} is the name of the calendar.
#: ../calendar/calendar.error.xml.h:87
+msgid "Failed to open calendar '{0}'"
+msgstr "打开日历“{0}”失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to open memo list '{0}'"
+msgstr "打开备忘录列表“{0}”失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to open task list '{0}'"
+msgstr "打开任务列表“{0}”失败"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "在日历“{0}”里创建活动失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "在备忘录列表“{0}”里创建备忘失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "在任务列表“{0}”里创建任务失败"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "修改日历“{0}”里的活动失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "修改备忘录列表“{0}”里的备忘录失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "修改任务列表“{0}”里的任务失败"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "删除日历“{0}”里的活动失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "删除备忘录列表“{0}”里的备忘录失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Failed to delete a task in the task list '{0}'"
+msgstr "删除任务列表“{0}”里的任务失败"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "更新日历“{0}”里的活动失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "更新备忘录列表“{0}”里的备忘录失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "更新任务列表“{0}”里的任务失败"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "发送活动到日历“{0}”失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "发送备忘录到备忘录列表“{0}”失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+msgid "Failed to send a task to the task list '{0}'"
+msgstr "发送任务到任务列表“{0}”失败"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+msgid "Error creating view for the calendar '{0}'"
+msgstr "创建日历“{0}”视图时出错"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+msgid "Error creating view for the task list '{0}'"
+msgstr "创建任务列表“{0}”视图时出错"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+msgid "Error creating view for the memo list '{0}'"
+msgstr "创建备忘录列表“{0}”视图时出错"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "无法将事件复制到日历 '{0}'"
+msgstr "无法将事件复制到日历“{0}”"
#. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
msgid "Failed to copy a task into the task list '{0}'"
-msgstr "无法将任务复制到任务列表 '{0}'"
+msgstr "无法将任务复制到任务列表“{0}”"
#. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "无法将备忘录复制到备忘录列表 '{0}'"
+msgstr "无法将备忘录复制到备忘录列表“{0}”"
#. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
msgid "Failed to move an event into the calendar '{0}'"
-msgstr "无法将事件移动到日历 '{0}'"
+msgstr "无法将事件移动到日历“{0}”"
#. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
msgid "Failed to move a task into the task list '{0}'"
-msgstr "无法将任务移动到任务列表 '{0}'"
+msgstr "无法将任务移动到任务列表“{0}”"
#. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
msgid "Failed to move a memo into the memo list '{0}'"
-msgstr "无法将备忘录移动到备忘录列表 '{0}'"
+msgstr "无法将备忘录移动到备忘录列表“{0}”"
#. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
msgid "Copying an event into the calendar '{0}'"
-msgstr "正在将事件复制到日历 '{0}'"
+msgstr "正在将事件复制到日历“{0}”"
#. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
msgid "Copying a task into the task list '{0}'"
-msgstr "正在将任务复制到任务列表 '{0}'"
+msgstr "正在将任务复制到任务列表“{0}”"
#. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
msgid "Copying a memo into the memo list '{0}'"
msgstr "正在将一条备忘录复制到备忘录列表“{0}”"
#. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
msgid "Moving an event into the calendar '{0}'"
-msgstr "正在将事件移动到日历 '{0}'"
+msgstr "正在将事件移动到日历“{0}”"
#. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
msgid "Moving a task into the task list '{0}'"
-msgstr "正在将任务移动到任务列表 '{0}'"
+msgstr "正在将任务移动到任务列表“{0}”"
#. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
msgid "Moving a memo into the memo list '{0}'"
-msgstr "正在将备忘移动到备忘列表“{0}”"
+msgstr "正在将备忘录移动到备忘录列表“{0}”"
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to refresh calendar '{0}'"
+msgstr "刷新日历“{0}”失败"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+msgid "Failed to refresh task list '{0}'"
+msgstr "刷新任务列表“{0}”失败"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+msgid "Failed to refresh memo list '{0}'"
+msgstr "刷新备忘录列表“{0}”失败"
+
+#: ../calendar/calendar.error.xml.h:158
+msgid "Failed to make an occurrence movable"
+msgstr "将事件标示成可移动失败"
+
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-calendar-table.etspec.h:4
#: ../calendar/gui/e-cal-list-view.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
@@ -2319,18 +2685,20 @@ 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:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
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:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
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:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
#: ../modules/plugin-manager/evolution-plugin-manager.c:68
msgid "Description"
msgstr "描述"
@@ -2345,35 +2713,37 @@ 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:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
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:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
msgid "is not"
msgstr "不是"
#. To Translators: This is task classification
#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306
+#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
#: ../calendar/gui/memotypes.xml.h:10
msgid "Public"
msgstr "公开"
#. To Translators: This is task classification
#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
msgid "Private"
msgstr "保密"
#. To Translators: This is task classification
#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
msgid "Confidential"
msgstr "机密"
@@ -2388,42 +2758,44 @@ msgstr "组织者"
msgid "Attendee"
msgstr "出席者"
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:14
+#: ../plugins/publish-calendar/publish-calendar.c:862
#: ../plugins/publish-calendar/publish-calendar.ui.h:22
#: ../plugins/save-calendar/csv-format.c:389
msgid "Location"
msgstr "位置"
#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
msgid "Category"
msgstr "类别"
#: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
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:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
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:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
msgid "Do Not Exist"
msgstr "不存在"
-#: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/caltypes.xml.h:19 ../calendar/gui/dialogs/event-editor.c:309
#: ../calendar/gui/dialogs/event-editor.c:330
#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
msgid "Recurrence"
-msgstr "再现"
+msgstr "重复"
#: ../calendar/gui/caltypes.xml.h:20
msgid "Occurs"
@@ -2456,22 +2828,22 @@ msgid "Edit Reminder"
msgstr "编辑提醒"
#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/e-alarm-list.c:424
msgid "Pop up an alert"
msgstr "弹出警告"
#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
+#: ../calendar/gui/e-alarm-list.c:420
msgid "Play a sound"
msgstr "播放声音"
#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
+#: ../calendar/gui/e-alarm-list.c:432
msgid "Run a program"
msgstr "运行程序"
#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:428
msgid "Send an email"
msgstr "发送电子邮件"
@@ -2520,15 +2892,11 @@ msgstr "重复"
msgid "_Repeat the reminder"
msgstr "重复提醒(_R)"
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#. This is part of the sentence:
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
msgid "extra times every"
msgstr "每个额外时间"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "选项"
-
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
msgid "Custom _message"
msgstr "自定义信息(_M)"
@@ -2567,7 +2935,7 @@ msgstr "动作/触发器"
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
msgid "Reminders"
msgstr "提醒"
@@ -2615,292 +2983,297 @@ msgstr "%s 您已经做出了修改。放弃这些修改并更新编辑器吗
msgid "%s You have made no changes, update the editor?"
msgstr "%s 您还没有进行修改，更新编辑器吗？"
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
msgid "Could not save attachments"
msgstr "不能保存附件"
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:653
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:787
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:794
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:796
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:802
#, c-format
msgid "Assigned Task - %s"
msgstr "分配的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:804
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:809
#, c-format
msgid "Memo - %s"
msgstr "备忘 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:825
msgid "No Summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:946
msgid "Keep original item?"
msgstr "保留原始条目？"
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1137
msgid "Unable to synchronize with the server"
msgstr "无法与服务器同步"
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1249
#: ../calendar/gui/dialogs/event-editor.c:116
#: ../calendar/gui/dialogs/event-editor.c:310
#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:295
#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
-#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
+#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:280 ../shell/e-shell-window-actions.c:778
+#: ../smime/gui/certificate-manager.c:2066
msgid "_Close"
msgstr "关闭(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1251
msgid "Close the current window"
msgstr "关闭当前窗口"
#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
-#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:1076 ../e-util/e-text.c:2109
+#: ../e-util/e-web-view.c:379 ../mail/e-mail-browser.c:134
+#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
msgid "_Copy"
msgstr "复制(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
-#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:381
+#: ../e-util/e-web-view.c:1420 ../mail/e-mail-browser.c:136
+#: ../shell/e-shell-window-actions.c:801
msgid "Copy the selection"
msgstr "复制选中内容"
#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
+#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
msgid "Cu_t"
msgstr "剪切(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:1265 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1414
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
msgid "Cut the selection"
msgstr "剪切选中内容"
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
-#: ../shell/e-shell-window-actions.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:1272 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:815
msgid "Delete the selection"
msgstr "删除选中内容"
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1279
msgid "View help"
msgstr "查看帮助"
#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
-#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:965
+#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
+#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
msgid "_Paste"
msgstr "粘贴(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1286 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1426
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
-#: ../calendar/gui/dialogs/comp-editor.c: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
+#: ../calendar/gui/dialogs/comp-editor.c:1291
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
msgid "_Print..."
msgstr "打印(_P)..."
-#: ../calendar/gui/dialogs/comp-editor.c: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
+#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
msgid "Pre_view..."
msgstr "预览(_V)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1307
msgid "Save current changes"
msgstr "保存当前更改"
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../e-util/e-mail-signature-editor.c:304
msgid "Save and Close"
msgstr "保存并关闭"
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1314
msgid "Save current changes and close editor"
msgstr "保存当前更改并关闭编辑器"
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:389
+#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
msgid "Select _All"
msgstr "全选(_A)"
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:1321 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:913
msgid "Select all text"
msgstr "选中所有文字"
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1342
msgid "_Classification"
msgstr "分类(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
+#: ../shell/e-shell-window-actions.c:948
msgid "_File"
msgstr "文件(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../e-util/e-html-editor-actions.c:1148
msgid "_Insert"
msgstr "插入(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:378
msgid "_Options"
msgstr "选项(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1384
+#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:991
+#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
msgid "_View"
msgstr "查看(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../composer/e-composer-actions.c:327
msgid "_Attachment..."
msgstr "附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
msgid "Attach a file"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1404
msgid "_Categories"
msgstr "类别(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1406
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1412
msgid "Time _Zone"
msgstr "时区(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1414
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1423
msgid "Pu_blic"
msgstr "公开(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1425
msgid "Classify as public"
msgstr "分类为公开"
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1430
msgid "_Private"
msgstr "私人(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1432
msgid "Classify as private"
msgstr "分类为私人"
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1437
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1439
msgid "Classify as confidential"
msgstr "分类为机密"
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1447
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1449
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1455
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1457
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1463
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1465
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1471
msgid "_Type Field"
msgstr "类型域(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1473
msgid "Toggles whether the Attendee Type is displayed"
msgstr "切换是否显示出席者类型域"
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2596
+#: ../composer/e-composer-actions.c:612
msgid "Attach"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../calendar/gui/dialogs/comp-editor.c:2926
+#: ../calendar/gui/dialogs/comp-editor.c:3512
+#: ../calendar/gui/dialogs/comp-editor.c:4525
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话，对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../calendar/gui/dialogs/comp-editor.c:4487
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
msgid "Unable to use current version!"
msgstr "无法使用当前版本！"
@@ -2909,21 +3282,25 @@ msgstr "无法使用当前版本！"
msgid "Validation error: %s"
msgstr "校验错误：%s"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "无法打开目的"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1968
msgid "Destination is read only"
msgstr "目的只读"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "无法创建对象"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "正在将活动复制到日历“%s”"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "无法打开源"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "正在将备忘录复制到备忘录列表“%s”"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "正在将任务复制到任务列表“%s”"
#: ../calendar/gui/dialogs/delete-comp.c:215
msgid "_Delete this item from all other recipient's mailboxes?"
@@ -2933,70 +3310,6 @@ msgstr "从全部其它收件人的邮箱中删除此项吗？(_D)"
msgid "_Retract comment"
msgstr "撤销评论(_R)："
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "由于 dbus 错误 %s，无法删除该事件。"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "由于 dbus 错误 %s，无法该删除任务。"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "由于 dbus 错误 %s，无法该删除备忘。"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "由于 dbus 错误 %s，无法删除该项目。"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "无法删除事件，原因是权限被禁止"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "无法删除任务，原因是权限被禁止"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "无法删除备忘，原因是权限被禁止"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "无法删除项目，原因是权限被禁止"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "由于错误，无法删除事件：%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "由于错误，无法删除任务：%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "由于错误，无法删除备忘：%s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "由于错误，无法删除项目：%s"
-
#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
msgid "Enter Delegate"
msgstr "输入代表"
@@ -3015,7 +3328,7 @@ msgstr "提醒(_R)"
#: ../calendar/gui/dialogs/event-editor.c:206
msgid "Set or unset reminders for this event"
-msgstr "设置或取消此事件的提醒"
+msgstr "设置或取消此活动的提醒"
#: ../calendar/gui/dialogs/event-editor.c:214
msgid "Show Time as _Busy"
@@ -3058,7 +3371,7 @@ msgstr "忙/闲(_F)"
msgid "Query free / busy information for the attendees"
msgstr "查询出席者的忙闲信息"
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
msgid "Appointment"
msgstr "约会"
@@ -3074,7 +3387,7 @@ msgstr "打印此事件"
#: ../calendar/gui/dialogs/event-page.c:557
msgid "Event's start time is in the past"
-msgstr "事件开始时间在过去"
+msgstr "活动开始时间在过去"
#: ../calendar/gui/dialogs/event-page.c:634
msgid "Event cannot be edited, because the selected calendar is read only"
@@ -3085,7 +3398,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者，因此无法编辑全部事件。"
#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
+#: ../calendar/gui/dialogs/event-page.c:3198
msgid "This event has reminders"
msgstr "此事件有提醒"
@@ -3094,104 +3407,104 @@ msgstr "此事件有提醒"
msgid "Or_ganizer:"
msgstr "组织者(_G)："
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1543
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1551
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1715
#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/event-page.c:1750
+#: ../calendar/gui/dialogs/task-page.c:1121
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1931
+#: ../calendar/gui/dialogs/event-page.c:1956
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1958
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3478
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../calendar/gui/dialogs/event-page.c:3484
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:3463
+#: ../calendar/gui/dialogs/event-page.c:3490
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
+#: ../calendar/gui/dialogs/event-page.c:3511
+msgid "Custom"
msgstr "自定义"
#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3518
msgctxt "cal-reminders"
msgid "None"
msgstr "无"
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ]
minutes
+#. TRANSLATORS:
#: ../calendar/gui/dialogs/event-page.ui.h:2
msgctxt "eventpage"
msgid "for"
msgstr "持续时间"
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS:
#: ../calendar/gui/dialogs/event-page.ui.h:4
msgctxt "eventpage"
msgid "until"
msgstr "直到"
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
#: ../calendar/gui/dialogs/event-page.ui.h:6
msgctxt "eventpage"
msgid "15 minutes before appointment"
msgstr "约会前 15 分钟"
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
#: ../calendar/gui/dialogs/event-page.ui.h:8
msgctxt "eventpage"
msgid "1 hour before appointment"
msgstr "约会前 1 小时"
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
#: ../calendar/gui/dialogs/event-page.ui.h:10
msgctxt "eventpage"
msgid "1 day before appointment"
@@ -3205,6 +3518,8 @@ msgstr "位置(_L)："
#: ../calendar/gui/dialogs/memo-page.ui.h:2
#: ../calendar/gui/dialogs/task-page.ui.h:29
#: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:422
msgid "_Description:"
msgstr "描述(_D)："
@@ -3227,7 +3542,7 @@ msgstr "事件描述"
#: ../calendar/gui/dialogs/event-page.ui.h:26
#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:555
msgid "Atte_ndees..."
msgstr "出席者(_N)..."
@@ -3235,10 +3550,6 @@ msgstr "出席者(_N)..."
msgid "_Reminder"
msgstr "提醒(_R)"
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "自定义提醒："
-
#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
msgid "January"
msgstr "一月"
@@ -3292,11 +3603,11 @@ msgid "Select Date"
msgstr "选择日期"
#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
msgid "Select _Today"
msgstr "选择今天(_T)"
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
msgid "Memo"
msgstr "备忘"
@@ -3316,11 +3627,12 @@ msgstr "因所选的备忘列表为只读，您无法编辑该备忘。"
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者，因此无法编辑全部备忘。"
-#: ../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:52
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
+#: ../calendar/gui/dialogs/memo-page.c:1168
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
msgid "To"
msgstr "收件人"
@@ -3390,17 +3702,17 @@ msgstr "所有各次"
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的再现。"
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
msgid "Recurrence date is invalid"
msgstr "再现日期无效"
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1062
msgid "End time of the recurrence was before event's start"
-msgstr "重复事件条目的结束时间小于开始时间"
+msgstr "重复活动条目的结束时间小于开始时间"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday]
[forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day
always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1091
msgid "on"
msgstr "在"
@@ -3408,7 +3720,7 @@ msgstr "在"
#. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/dialogs/recurrence-page.c:1172
msgid "first"
msgstr "第一个"
@@ -3417,7 +3729,7 @@ msgstr "第一个"
#. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/dialogs/recurrence-page.c:1178
msgid "second"
msgstr "第二"
@@ -3425,7 +3737,7 @@ msgstr "第二"
#. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1183
msgid "third"
msgstr "第三个"
@@ -3433,7 +3745,7 @@ msgstr "第三个"
#. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/dialogs/recurrence-page.c:1188
msgid "fourth"
msgstr "第四个"
@@ -3441,7 +3753,7 @@ msgstr "第四个"
#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string
'day' or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1193
msgid "fifth"
msgstr "第五个"
@@ -3449,13 +3761,13 @@ msgstr "第五个"
#. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day'
or
#. * the name of a week day (like 'Monday' or 'Friday') always follow.
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/dialogs/recurrence-page.c:1198
msgid "last"
msgstr "最后一个"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date]
[11th to 20th] [17th] [forever]'
#. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1222
msgid "Other Date"
msgstr "其它日期"
@@ -3463,7 +3775,7 @@ msgstr "其它日期"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment
recurs/Every [x] month(s)
#. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/dialogs/recurrence-page.c:1228
msgid "1st to 10th"
msgstr "上旬"
@@ -3471,7 +3783,7 @@ msgstr "上旬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment
recurs/Every [x] month(s)
#. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/dialogs/recurrence-page.c:1234
msgid "11th to 20th"
msgstr "中旬"
@@ -3479,41 +3791,41 @@ msgstr "中旬"
#. * the month to setup an appointment recurrence. The entire string is for example: This appointment
recurs/Every [x] month(s)
#. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
msgid "21st to 31st"
msgstr "下旬"
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1267
#: ../modules/calendar/e-calendar-preferences.ui.h:25
msgid "Monday"
msgstr "星期一"
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1268
#: ../modules/calendar/e-calendar-preferences.ui.h:28
msgid "Tuesday"
msgstr "星期二"
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1269
#: ../modules/calendar/e-calendar-preferences.ui.h:31
msgid "Wednesday"
msgstr "星期三"
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1270
#: ../modules/calendar/e-calendar-preferences.ui.h:34
msgid "Thursday"
msgstr "星期四"
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1271
#: ../modules/calendar/e-calendar-preferences.ui.h:37
msgid "Friday"
msgstr "星期五"
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1272
#: ../modules/calendar/e-calendar-preferences.ui.h:40
msgid "Saturday"
msgstr "星期六"
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../calendar/gui/dialogs/recurrence-page.c:1273
#: ../modules/calendar/e-calendar-preferences.ui.h:43
msgid "Sunday"
msgstr "星期日"
@@ -3521,71 +3833,71 @@ msgstr "星期日"
#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second]
[Tuesday] [forever]'
#. * (dropdown menu options are in [square brackets])."
#.
-#: ../calendar/gui/dialogs/recurrence-page.c:1387
+#: ../calendar/gui/dialogs/recurrence-page.c:1404
msgid "on the"
msgstr "在"
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1589
msgid "occurrences"
-msgstr "循环"
+msgstr "事件"
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2359
msgid "Add exception"
msgstr "添加例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2401
msgid "Could not get a selection to modify."
msgstr "无法获得要修改的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2407
msgid "Modify exception"
msgstr "修改例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2453
msgid "Could not get a selection to delete."
msgstr "无法获得要删除的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2594
msgid "Date/Time"
msgstr "日期/时间"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
msgctxt "recurrpage"
msgid "day(s)"
msgstr "天"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
msgctxt "recurrpage"
msgid "week(s)"
msgstr "周"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
msgctxt "recurrpage"
msgid "month(s)"
msgstr "月"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
msgctxt "recurrpage"
msgid "year(s)"
msgstr "年"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
msgctxt "recurrpage"
msgid "for"
msgstr "持续时间"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
msgctxt "recurrpage"
msgid "until"
msgstr "直到"
-#. TRANSLATORS: Entire string is for example: 'This appointment
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
msgctxt "recurrpage"
msgid "forever"
@@ -3622,8 +3934,8 @@ msgstr "只通知新的出席者(_O)"
msgid "_Send Options"
msgstr "发送选项(_S)"
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
msgid "Task"
msgstr "任务"
@@ -3653,88 +3965,86 @@ msgid ""
"assigned tasks"
msgstr "任务无法编辑，因为选定的任务列表不支持分配的任务"
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
msgid "Completed date is wrong"
msgstr "完成日期有错"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-cal-component-preview.c:327
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
msgid "High"
msgstr "高"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1856 ../calendar/gui/e-task-table.c:525
#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
msgid "Normal"
msgstr "中"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-cal-component-preview.c:331
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
msgid "Low"
msgstr "低"
#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:14 ../calendar/gui/e-task-table.c:527
+#: ../calendar/gui/tasktypes.xml.h:22 ../e-util/e-send-options.ui.h:1
msgid "Undefined"
msgstr "未定义"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:312
#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
msgid "Not Started"
-msgstr "尚未开始"
+msgstr "未开始"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:302
#: ../calendar/gui/e-cal-model-tasks.c:312
#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
msgid "In Progress"
msgstr "进行中"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:305
#: ../calendar/gui/e-cal-model-tasks.c:314
#: ../calendar/gui/e-cal-model-tasks.c:556
#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
msgid "Completed"
msgstr "已完成"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:308
#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:963
msgid "Canceled"
msgstr "已取消"
@@ -3770,56 +4080,56 @@ msgstr "分类(_L)："
msgid "_Web Page:"
msgstr "网页(_W)："
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:284
msgid "New Appointment"
msgstr "新建约会"
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:285
msgid "New All Day Event"
msgstr "新建全天事件"
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:286
msgid "New Meeting"
msgstr "新会议"
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:287
msgid "Go to Today"
msgstr "转到今天"
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:288
msgid "Go to Date"
msgstr "转到日期"
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
msgid "It has reminders."
msgstr "有提醒。"
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
msgid "It has recurrences."
msgstr "有再现。"
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
msgid "It is a meeting."
msgstr "为会议。"
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "日历事件：摘要为 %s。"
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
msgid "Calendar Event: It has no summary."
msgstr "日历事件：无摘要。"
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
msgid "calendar view event"
msgstr "日历视图事件"
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
msgid "Grab Focus"
msgstr "获得焦点"
-#: ../calendar/gui/ea-day-view.c:153 ../calendar/gui/ea-week-view.c:153
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -3827,89 +4137,33 @@ msgstr[0] "有 %d 个事件。"
#. To translators: Here, "It" is either like "Work Week View: July
#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:160 ../calendar/gui/ea-week-view.c:156
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
msgid "It has no events."
msgstr "无事件。"
-#: ../calendar/gui/ea-day-view.c:168
+#: ../calendar/gui/ea-day-view.c:121
#, c-format
msgid "Work Week View: %s. %s"
msgstr "工作日视图：%s。%s"
-#: ../calendar/gui/ea-day-view.c:175
+#: ../calendar/gui/ea-day-view.c:128
#, c-format
msgid "Day View: %s. %s"
msgstr "日视图：%s。%s"
-#: ../calendar/gui/ea-day-view.c:209
+#: ../calendar/gui/ea-day-view.c:157
msgid "calendar view for a work week"
msgstr "工作日的日历视图"
-#: ../calendar/gui/ea-day-view.c:211
+#: ../calendar/gui/ea-day-view.c:159
msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
-#: ../calendar/gui/ea-day-view-main-item.c:326
-#: ../calendar/gui/ea-week-view-main-item.c:353
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:295
msgid "a table to view and select the current time range"
msgstr "可查看并选择当前时间范围的表"
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "Gnome 日历"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2795
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%-m月%-d日%A"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%Y年%-m月%-d日"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2811
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%B%-d日"
-
#: ../calendar/gui/ea-jump-button.c:150
msgid "Jump button"
msgstr "跳转按钮"
@@ -3919,144 +4173,147 @@ msgid "Click here, you can find more events."
msgstr "单击此处可查找更多事件。"
#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d 天"
#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../calendar/gui/e-alarm-list.c:376
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d 周"
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
msgid "Unknown action to be performed"
msgstr "执行未知的动作"
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
#, c-format
msgid "%s %s before the start of the appointment"
msgstr "在约会开始之前 %s %s"
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
#, c-format
msgid "%s %s after the start of the appointment"
msgstr "在约会开始之后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
#, c-format
msgid "%s at the start of the appointment"
msgstr "在约会开始时 %s"
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
#, c-format
msgid "%s %s before the end of the appointment"
msgstr "在约会结束之前 %s %s"
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
#, c-format
msgid "%s %s after the end of the appointment"
msgstr "在约会结束之后 %s %s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
#, c-format
msgid "%s at the end of the appointment"
msgstr "在约会结束时 %s"
#. Translator: The first %s refers to the base, which would be actions like
#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:515
#, c-format
msgid "%s at %s"
msgstr "在 %2$s 时 %1$s"
#. Translator: The %s refers to the base, which would be actions like
#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:523
#, c-format
msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
-#: ../calendar/gui/ea-week-view.c:162
+#: ../calendar/gui/ea-week-view.c:114
#, c-format
msgid "Month View: %s. %s"
msgstr "月视图：%s。%s"
-#: ../calendar/gui/ea-week-view.c:167
+#: ../calendar/gui/ea-week-view.c:119
#, c-format
msgid "Week View: %s. %s"
msgstr "周视图：%s。%s"
-#: ../calendar/gui/ea-week-view.c:201
+#: ../calendar/gui/ea-week-view.c:148
msgid "calendar view for a month"
msgstr "月日历视图"
-#: ../calendar/gui/ea-week-view.c:203
+#: ../calendar/gui/ea-week-view.c:150
msgid "calendar view for one or more weeks"
msgstr "一周或多周的日历视图"
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
#: ../mail/e-mail-config-page.c:125
msgid "Untitled"
msgstr "无标题"
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:222
msgid "Categories:"
msgstr "类别："
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:256
msgid "Summary:"
msgstr "概要："
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:264
msgid "Start Date:"
msgstr "开始日期："
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:275
msgid "End Date:"
msgstr "结束日期："
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:286
msgid "Due Date:"
msgstr "到期日期："
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:298
+#: ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:1634
msgid "Status:"
msgstr "状态："
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:325
msgid "Priority:"
msgstr "优先级："
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../mail/e-mail-config-service-page.c:670
msgid "Description:"
msgstr "描述："
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:381
msgid "Web Page:"
msgstr "网页："
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1633
#, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "正在将事件复制到日历 %s"
+msgid "Creating view for calendar '%s'"
+msgstr "正在创建日历“%s”视图"
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1637
#, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "正在将事件移动到日历 %s"
+msgid "Creating view for task list '%s'"
+msgstr "正在创建任务列表“%s”视图"
+
+#: ../calendar/gui/e-cal-data-model.c:1641
+#, c-format
+msgid "Creating view for memo list '%s'"
+msgstr "正在创建备忘录列表“%s”的视图"
#: ../calendar/gui/e-calendar-table.etspec.h:1
msgid "Click to add a task"
@@ -4067,11 +4324,11 @@ msgid "Start date"
msgstr "开始日期"
#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../calendar/gui/e-meeting-list-view.c:645
#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../e-util/e-attachment-tree-view.c:591
+#: ../mail/e-mail-account-tree-view.c:157
msgid "Type"
msgstr "类型"
@@ -4079,7 +4336,7 @@ msgstr "类型"
msgid "Completion date"
msgstr "完成日期"
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
msgid "Complete"
msgstr "完成"
@@ -4093,19 +4350,18 @@ msgid "% Complete"
msgstr "% 完成"
#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/tasktypes.xml.h:18 ../plugins/save-calendar/csv-format.c:386
msgid "Priority"
msgstr "优先级"
#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
#. * Status: Accepted: X Declined: Y ...
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4011
-#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../calendar/gui/e-cal-model.c:3845 ../calendar/gui/e-meeting-list-view.c:688
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
msgid "Status"
msgstr "状态"
@@ -4122,37 +4378,51 @@ msgstr "创建时间"
msgid "Last modified"
msgstr "上次修改"
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:459
msgid "Cut selected events to the clipboard"
msgstr "将选中事件剪切到剪贴板"
-#: ../calendar/gui/e-calendar-view.c:451
+#: ../calendar/gui/e-calendar-view.c:465
msgid "Copy selected events to the clipboard"
msgstr "将选中事件复制到剪贴板"
-#: ../calendar/gui/e-calendar-view.c:457
+#: ../calendar/gui/e-calendar-view.c:471
msgid "Paste events from the clipboard"
msgstr "从剪贴板中粘贴事件"
-#: ../calendar/gui/e-calendar-view.c:463
+#: ../calendar/gui/e-calendar-view.c:477
msgid "Delete selected events"
msgstr "删除选中的事件"
-#: ../calendar/gui/e-calendar-view.c:483 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
-msgid "Deleting selected objects"
-msgstr "删除选中的对象"
+#: ../calendar/gui/e-calendar-view.c:859
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr "粘贴文本中没有有效的 iCalendar 数据"
+
+#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
+msgid "Default calendar not found"
+msgstr "默认日历未找到"
+
+#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
+msgid "Default memo list not found"
+msgstr "默认备忘录列表未找到"
+
+#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
+msgid "Default task list not found"
+msgstr "默认任务列表未找到"
+
+#: ../calendar/gui/e-calendar-view.c:969
+msgid "No suitable component found"
+msgstr "找不到合适的组件"
-#: ../calendar/gui/e-calendar-view.c:645 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "更新对象"
+#: ../calendar/gui/e-calendar-view.c:1039
+msgid "Pasting iCalendar data"
+msgstr "粘贴 iCalendar 数据"
#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
#. To Translators: It will display
#. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2083 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-task-table.c:794
#, c-format
msgid "Organizer: %s <%s>"
msgstr "组织者：%s <%s>"
@@ -4160,25 +4430,65 @@ msgstr "组织者：%s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
#. With SunOne accounts, there may be no ':' in
#. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2087 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-task-table.c:798
#, c-format
msgid "Organizer: %s"
msgstr "组织者：%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2103
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1862
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
#, c-format
msgid "Location: %s"
msgstr "位置：%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2134
+#: ../calendar/gui/e-calendar-view.c:1902
#, c-format
msgid "Time: %s %s"
msgstr "时间：%s %s"
+#: ../calendar/gui/e-calendar-view.c:2281
+#: ../calendar/gui/e-calendar-view.c:2288
+#: ../calendar/gui/e-calendar-view.c:2295
+#: ../calendar/gui/e-calendar-view.c:2298
+msgid "%d %b %Y"
+msgstr "%Y年%-m月%-d日"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2286 ../calendar/gui/e-day-view.c:3052
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%B%-d日"
+
+#: ../calendar/gui/e-calendar-view.c:2308
+msgid "%A %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2312 ../calendar/gui/e-day-view.c:3036
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%-m月%-d日%A"
+
+#: ../calendar/gui/e-calendar-view.c:2315
+#: ../calendar/gui/e-calendar-view.c:2321
+#: ../calendar/gui/e-calendar-view.c:2324
+msgid "%a %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
+
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Start Date"
@@ -4188,77 +4498,95 @@ msgstr "开始日期"
msgid "End Date"
msgstr "结束日期"
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
#: ../calendar/gui/e-meeting-list-view.c:198
#: ../calendar/gui/e-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:3510
-#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/itip-formatter/itip-view.c:3604
+#: ../modules/itip-formatter/itip-view.c:6218
#: ../modules/plugin-manager/evolution-plugin-manager.c:99
msgid "Unknown"
msgstr "未知"
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
+#: ../calendar/gui/e-cal-ops.c:1232
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr "未找到 UID 为 %s 的源"
+
+#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
+#: ../calendar/gui/e-cal-ops.c:1349
+msgid "Creating an event"
+msgstr "正在创建活动"
+
+#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
+#: ../calendar/gui/e-cal-ops.c:1353
+msgid "Creating a memo"
+msgstr "正在创建备忘"
+
+#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
+#: ../calendar/gui/e-cal-ops.c:1357
+msgid "Creating a task"
+msgstr "正在创建任务"
+
+#: ../calendar/gui/e-cal-model.c:1858
msgid "Recurring"
msgstr "重复"
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1860
msgid "Assigned"
msgstr "已分配"
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
#: ../calendar/gui/e-meeting-list-view.c:208
#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
#: ../calendar/gui/e-meeting-store.c:1023
msgid "Yes"
msgstr "是"
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
#: ../calendar/gui/e-meeting-list-view.c:209
#: ../calendar/gui/e-meeting-store.c:188
msgid "No"
msgstr "否"
-#: ../calendar/gui/e-cal-model.c:3952
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3786 ../calendar/gui/e-meeting-list-view.c:220
#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6085
+#: ../modules/itip-formatter/itip-view.c:6206
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-cal-model.c:3953
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3787 ../calendar/gui/e-meeting-list-view.c:221
#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6091
+#: ../modules/itip-formatter/itip-view.c:6212
msgid "Declined"
msgstr "拒绝"
-#: ../calendar/gui/e-cal-model.c:3954
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3788 ../calendar/gui/e-meeting-list-view.c:222
#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:535
msgid "Tentative"
msgstr "暂时的"
-#: ../calendar/gui/e-cal-model.c:3955
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3789 ../calendar/gui/e-meeting-list-view.c:223
#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6094
+#: ../modules/itip-formatter/itip-view.c:6215
msgid "Delegated"
msgstr "被委任的"
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3790
msgid "Needs action"
msgstr "需要动作"
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:151
+#: ../calendar/gui/e-task-table.c:582
msgid "Free"
msgstr "空闲"
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
msgid "Busy"
msgstr "繁忙"
@@ -4278,17 +4606,171 @@ msgctxt "cal-task-status"
msgid "None"
msgstr "无"
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying an event"
+msgstr "修改一个事件"
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a memo"
+msgstr "修改备忘"
+
+#: ../calendar/gui/e-cal-ops.c:295
+msgid "Modifying a task"
+msgstr "修改任务"
+
+#: ../calendar/gui/e-cal-ops.c:394
+msgid "Removing an event"
+msgstr "正在移除活动"
+
+#: ../calendar/gui/e-cal-ops.c:398
+msgid "Removing a memo"
+msgstr "正在移除备忘"
+
+#: ../calendar/gui/e-cal-ops.c:402
+msgid "Removing a task"
+msgstr "正在移除任务"
+
+#: ../calendar/gui/e-cal-ops.c:493
+#, c-format
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "正在删除 %d 件活动"
+
+#: ../calendar/gui/e-cal-ops.c:497
+#, c-format
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "正在删除 %d 个备忘"
+
+#: ../calendar/gui/e-cal-ops.c:501
+#, c-format
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "正在删除 %d 项任务"
+
+#: ../calendar/gui/e-cal-ops.c:704
+#, c-format
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "正在粘贴 %d 件活动"
+
+#: ../calendar/gui/e-cal-ops.c:719
+#, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "正在粘贴 %d 个备忘"
+
+#: ../calendar/gui/e-cal-ops.c:734
+#, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "正在粘贴 %d 项任务"
+
+#: ../calendar/gui/e-cal-ops.c:833
+msgid "Updating an event"
+msgstr "更新活动"
+
+#: ../calendar/gui/e-cal-ops.c:837
+msgid "Updating a memo"
+msgstr "更新备忘"
+
+#: ../calendar/gui/e-cal-ops.c:841
+msgid "Updating a task"
+msgstr "更新任务"
+
+#: ../calendar/gui/e-cal-ops.c:949
+#, c-format
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "正在获取日历“%s”里要清除的活动"
+
+#: ../calendar/gui/e-cal-ops.c:953
+#, c-format
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "正在获取备忘录列表“%s”里要清除的备忘录"
+
+#: ../calendar/gui/e-cal-ops.c:957
+#, c-format
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "正在获取任务列表“%s”里要清除的任务"
+
+#: ../calendar/gui/e-cal-ops.c:983
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "正在清除日历“%s”里的活动"
+
+#: ../calendar/gui/e-cal-ops.c:987
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "正在清除备忘录列表“%s”里的备忘录"
+
+#: ../calendar/gui/e-cal-ops.c:991
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "正在清除任务列表“%s”里的任务"
+
+#: ../calendar/gui/e-cal-ops.c:1091
+msgid "Purging events"
+msgstr "正在清除活动"
+
+#: ../calendar/gui/e-cal-ops.c:1095
+msgid "Purging memos"
+msgstr "正在清除备忘"
+
+#: ../calendar/gui/e-cal-ops.c:1099
+msgid "Purging tasks"
+msgstr "正在清除任务"
+
+#: ../calendar/gui/e-cal-ops.c:1201
+msgid "Expunging completed tasks"
+msgstr "删掉已完成的任务"
+
+#: ../calendar/gui/e-cal-ops.c:2062
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "正在移动 %d 件活动"
+
+#: ../calendar/gui/e-cal-ops.c:2063
+#, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "正在复制 %d 件活动"
+
+#: ../calendar/gui/e-cal-ops.c:2069
+#, c-format
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "正在移动 %d 个备忘"
+
+#: ../calendar/gui/e-cal-ops.c:2070
+#, c-format
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "正在复制 %d 个备忘"
+
+#: ../calendar/gui/e-cal-ops.c:2076
+#, c-format
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "正在移动 %d 项任务"
+
+#: ../calendar/gui/e-cal-ops.c:2077
+#, c-format
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "正在复制 %d 项任务"
+
#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
+#: ../calendar/gui/e-cell-date-edit-text.c:165
msgid "%a %m/%d/%Y %H:%M:%S"
msgstr "%Y年%m月%d日%A%H:%M:%S"
#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
+#: ../calendar/gui/e-cell-date-edit-text.c:168
msgid "%a %m/%d/%Y %I:%M:%S %p"
msgstr "%Y-%m-%d %A %p%I:%M:%S"
-#: ../calendar/gui/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:176
#, c-format
msgid ""
"The date must be entered in the format: \n"
@@ -4298,16 +4780,16 @@ msgstr ""
"%s"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1985 ../calendar/gui/e-week-view.c:1539
+#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1706
#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1988 ../calendar/gui/e-week-view.c:1542
+#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1709
#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
msgid "pm"
msgstr "下午"
@@ -4317,13 +4799,13 @@ msgstr "下午"
#. * month, %B = full month name. You can change the
#. * order but don't change the specifiers or add
#. * anything.
-#: ../calendar/gui/e-day-view.c:2778 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3019 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
msgid "%A %d %B"
msgstr "%B%d日%A"
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3442
+#: ../calendar/gui/e-day-view.c:3744
#, c-format
msgid "Week %d"
msgstr "第%d周"
@@ -4334,27 +4816,27 @@ msgstr "第%d周"
#. * day view, e.g. a day is displayed in
#. * 24 "60 minute divisions" or
#. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:800
+#: ../calendar/gui/e-day-view-time-item.c:806
#, c-format
msgid "%02i minute divisions"
msgstr "%02i 分钟分割"
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:831
msgid "Show the second time zone"
msgstr "显示第二时区"
#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:848
+#: ../modules/calendar/e-calendar-preferences.c:308
+#: ../modules/calendar/e-calendar-preferences.c:360
#: ../modules/calendar/e-calendar-preferences.ui.h:11
msgctxt "cal-second-zone"
msgid "None"
msgstr "无"
-#: ../calendar/gui/e-day-view-time-item.c:876
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../calendar/gui/e-day-view-time-item.c:882
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:391
msgid "Select..."
msgstr "选择..."
@@ -4428,11 +4910,11 @@ msgstr "不参加"
msgid "Needs Action"
msgstr "需要动作"
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:619
msgid "Attendee "
msgstr "出席者 "
-#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-list-view.c:674
#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
msgid "RSVP"
msgstr "请回复"
@@ -4441,83 +4923,83 @@ msgstr "请回复"
msgid "In Process"
msgstr "处理中"
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../calendar/gui/e-meeting-store.c:1881
#, c-format
msgid "Enter password to access free/busy information on server %s as user %s"
msgstr "输入密码来作为用户 %2$s 访问服务器 %1$s 上的忙/闲信息"
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
#, c-format
msgid "Failure reason: %s"
msgstr "失败原因：%s"
-#: ../calendar/gui/e-meeting-store.c:1924
+#: ../calendar/gui/e-meeting-store.c:1896
#: ../plugins/publish-calendar/publish-calendar.c:351
#: ../smime/gui/component.c:63
msgid "Enter password"
msgstr "输入密码"
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:537
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:539
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:574
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:594
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:607
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:625
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:642
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:662
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:679
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:700
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:711
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:722
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:732
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:771
msgid "_Start time:"
msgstr "开始时间(_S)："
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:800
msgid "_End time:"
msgstr "结束时间(_E)："
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2721
#, c-format
msgid ""
"Summary: %s\n"
@@ -4526,7 +5008,7 @@ msgstr ""
"简要：%s\n"
"位置：%s"
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
#, c-format
msgid "Summary: %s"
msgstr "概要：%s"
@@ -4555,46 +5037,46 @@ msgstr "通用名"
msgid "Language"
msgstr "语言"
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1631
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
msgid "Memos"
msgstr "备忘"
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
msgid "* No Summary *"
msgstr "* 没有概要 *"
#. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:540 ../calendar/gui/e-task-table.c:839
msgid "Start: "
msgstr "开始："
#. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
msgid "Due: "
msgstr "到期："
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:683
msgid "Cut selected memos to the clipboard"
msgstr "将选中备忘剪切到剪贴板"
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:689
msgid "Copy selected memos to the clipboard"
msgstr "将选中备忘复制到剪贴板"
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:695
msgid "Paste memos from the clipboard"
msgstr "从剪贴板中粘贴备忘"
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
msgid "Delete selected memos"
msgstr "删除选中的备忘"
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:707
msgid "Select all visible memos"
msgstr "选中所有可见的备忘"
@@ -4606,58 +5088,54 @@ msgstr "单击以添加备忘"
#. * %d is the actual value, %% is replaced with a percent sign.
#. * Result values will be 0%, 10%, 20%, ... 100%
#.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:555
#, c-format
msgid "%d%%"
msgstr "%d%%"
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1063
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1591
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
msgid "Tasks"
msgstr "任务"
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:998
msgid "Cut selected tasks to the clipboard"
msgstr "将选中任务剪切到剪贴板"
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1004
msgid "Copy selected tasks to the clipboard"
msgstr "将选中任务复制到剪贴板"
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1010
msgid "Paste tasks from the clipboard"
msgstr "从剪贴板中粘贴任务"
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:656
msgid "Delete selected tasks"
msgstr "删除选中的任务"
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1022
msgid "Select all visible tasks"
msgstr "选中所有可见的任务"
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
msgid "Select Timezone"
msgstr "选择时区"
#. strftime format %d = day of month, %B = full
#. * month name. You can change the order but don't
#. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "销毁"
-
#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
#: ../calendar/gui/itip-utils.c:841
msgid "An organizer must be set."
@@ -4767,140 +5245,152 @@ msgstr "忙闲信息 (%s 到 %s)"
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
msgid "Unable to book a resource, the new event collides with some other."
msgstr "无法预约资源，新事件与其它事件冲突。"
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "无法预约资源，错误：%s"
+#: ../calendar/gui/itip-utils.c:1153
+msgid "Unable to book a resource, error: "
+msgstr "无法预约资源，错误："
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1918
+msgid "Sending an event"
+msgstr "正在发送活动"
+
+#: ../calendar/gui/itip-utils.c:1922
+msgid "Sending a memo"
+msgstr "正在发送备忘"
+
+#: ../calendar/gui/itip-utils.c:1926
+msgid "Sending a task"
+msgstr "正在发送任务"
+
+#: ../calendar/gui/print.c:664
msgid "1st"
msgstr "1日"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
msgid "2nd"
msgstr "2日"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
msgid "3rd"
msgstr "3日"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
msgid "4th"
msgstr "4日"
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
msgid "5th"
msgstr "5日"
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
msgid "6th"
msgstr "6日"
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
msgid "7th"
msgstr "7日"
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
msgid "8th"
msgstr "8日"
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
msgid "9th"
msgstr "9日"
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
msgid "10th"
msgstr "10日"
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
msgid "11th"
msgstr "11日"
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
msgid "12th"
msgstr "12日"
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
msgid "13th"
msgstr "13日"
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
msgid "14th"
msgstr "14日"
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
msgid "15th"
msgstr "15日"
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
msgid "16th"
msgstr "16日"
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
msgid "17th"
msgstr "17日"
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
msgid "18th"
msgstr "18日"
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
msgid "19th"
msgstr "19日"
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
msgid "20th"
msgstr "20日"
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
msgid "21st"
msgstr "21日"
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
msgid "22nd"
msgstr "22日"
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
msgid "23rd"
msgstr "23日"
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
msgid "24th"
msgstr "24日"
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
msgid "25th"
msgstr "25日"
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
msgid "26th"
msgstr "26日"
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
msgid "27th"
msgstr "27日"
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
msgid "28th"
msgstr "28日"
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
msgid "29th"
msgstr "29日"
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
msgid "30th"
msgstr "30日"
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
msgid "31st"
msgstr "31日"
@@ -4908,102 +5398,102 @@ msgstr "31日"
#. * e.g. Su=Sunday and Th=thursday
#. G_DATE_BAD_WEEKDAY
#. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
msgid "Mo"
msgstr "一"
#. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
msgid "Tu"
msgstr "二"
#. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
msgid "We"
msgstr "三"
#. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
msgid "Th"
msgstr "四"
#. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
msgid "Fr"
msgstr "五"
#. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
msgid "Sa"
msgstr "六"
#. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
msgid "Su"
msgstr "日"
#. Translators: This is part of "START to END" text,
#. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3309
msgid " to "
msgstr " 到 "
#. Translators: This is part of "START to END
#. * (Completed COMPLETED)", where COMPLETED is a
#. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3319
msgid " (Completed "
msgstr " (完成 "
#. Translators: This is part of "Completed COMPLETED",
#. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
msgid "Completed "
msgstr "已完成 "
#. Translators: This is part of "START (Due DUE)",
#. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
msgid " (Due "
msgstr " (预定 "
#. Translators: This is part of "Due DUE",
#. * where DUE is a date/time due the event
#. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3342
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
msgid "Attendees: "
msgstr "出席者："
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
#, c-format
msgid "Status: %s"
msgstr "状态：%s"
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
#, c-format
msgid "Priority: %s"
msgstr "优先级：%s"
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率：%i"
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
#, c-format
msgid "Categories: %s"
msgstr "类别：%s"
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
msgid "Contacts: "
msgstr "联系人："
@@ -5016,189 +5506,195 @@ msgstr "进行中"
msgid "% Completed"
msgstr "% 完成"
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
msgid "is greater than"
msgstr "大于"
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
msgid "is less than"
msgstr "小于"
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../calendar/importers/icalendar-importer.c:78
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:453
+#: ../calendar/importers/icalendar-importer.c:892
msgid "Opening calendar"
msgstr "打开日历"
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:601
msgid "iCalendar files (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:602
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:694
msgid "Reminder!"
msgstr "提醒!!"
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:778
msgid "vCalendar files (.vcs)"
msgstr "vCalendar 文件(.vcs)"
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:779
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1056
msgid "Calendar Events"
msgstr "日历事件"
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1099
+msgid "Gnome Calendar"
+msgstr "Gnome 日历"
+
+#: ../calendar/importers/icalendar-importer.c:1100
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution 日历智能导入器"
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1485
msgctxt "iCalImp"
msgid "Meeting"
msgstr "会议"
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1171
+#: ../calendar/importers/icalendar-importer.c:1485
msgctxt "iCalImp"
msgid "Event"
msgstr "事件"
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1174
+#: ../calendar/importers/icalendar-importer.c:1486
msgctxt "iCalImp"
msgid "Task"
msgstr "任务"
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1177
+#: ../calendar/importers/icalendar-importer.c:1487
msgctxt "iCalImp"
msgid "Memo"
msgstr "备忘"
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1186
msgctxt "iCalImp"
msgid "has recurrences"
msgstr "有再现"
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1191
msgctxt "iCalImp"
msgid "is an instance"
msgstr "本次和以前各次"
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1196
msgctxt "iCalImp"
msgid "has reminders"
msgstr "有提醒"
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1201
msgctxt "iCalImp"
msgid "has attachments"
msgstr "有附件"
#. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1214
msgctxt "iCalImp"
msgid "Public"
msgstr "公开"
#. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1217
msgctxt "iCalImp"
msgid "Private"
msgstr "保密"
#. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1220
msgctxt "iCalImp"
msgid "Confidential"
msgstr "机密"
#. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1224
msgctxt "iCalImp"
msgid "Classification"
msgstr "分类"
#. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1529
msgctxt "iCalImp"
msgid "Summary"
msgstr "概要"
#. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1235
msgctxt "iCalImp"
msgid "Location"
msgstr "位置"
#. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1524
msgctxt "iCalImp"
msgid "Start"
msgstr "开始"
#. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1254
msgctxt "iCalImp"
msgid "Due"
msgstr "到期"
#. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1266
msgctxt "iCalImp"
msgid "End"
msgstr "结束"
#. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1276
msgctxt "iCalImp"
msgid "Categories"
msgstr "类别"
#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1308
+#: ../calendar/importers/icalendar-importer.c:1300
msgctxt "iCalImp"
msgid "Completed"
msgstr "已完成"
#. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1308
msgctxt "iCalImp"
msgid "URL"
msgstr "URL"
#. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1319
+#: ../calendar/importers/icalendar-importer.c:1322
msgctxt "iCalImp"
msgid "Organizer"
msgstr "组织者"
#. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1342
+#: ../calendar/importers/icalendar-importer.c:1345
msgctxt "iCalImp"
msgid "Attendees"
msgstr "出席者"
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1359
msgctxt "iCalImp"
msgid "Description"
msgstr "描述"
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1519
msgctxt "iCalImp"
msgid "Type"
msgstr "类型"
@@ -5452,7 +5948,7 @@ msgstr "美洲/安提瓜"
#: ../calendar/zones.h:81
msgid "America/Araguaina"
-msgstr "美洲/Araguaina"
+msgstr "美洲/阿拉瓜伊纳"
#: ../calendar/zones.h:82
msgid "America/Aruba"
@@ -5496,7 +5992,7 @@ msgstr "美洲/剑桥湾"
#: ../calendar/zones.h:92
msgid "America/Cancun"
-msgstr "美洲/Cancun"
+msgstr "美洲/坎昆"
#: ../calendar/zones.h:93
msgid "America/Caracas"
@@ -5712,7 +6208,7 @@ msgstr "美洲/Mazatlan"
#: ../calendar/zones.h:146
msgid "America/Mendoza"
-msgstr "美洲/Mendoza"
+msgstr "美洲/门多萨"
#: ../calendar/zones.h:147
msgid "America/Menominee"
@@ -6095,7 +6591,7 @@ msgid "Asia/Kashgar"
msgstr "亚洲/喀什葛尔"
#: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
msgstr "亚洲/加德满都"
#: ../calendar/zones.h:243
@@ -6750,150 +7246,179 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:212
msgid "Save as..."
msgstr "另存为..."
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:336
msgid "Close the current file"
msgstr "关闭当前文件"
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:341
msgid "New _Message"
msgstr "新建信息(_M)"
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:343
msgid "Open New Message window"
msgstr "打开新建信息窗口"
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1215
+#: ../shell/e-shell-window-actions.c:848
msgid "_Preferences"
msgstr "首选项(_P)"
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
msgid "Configure Evolution"
msgstr "配置 Evolution"
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:357
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:362
msgid "Save _As..."
msgstr "另存为(_A)..."
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:364
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:371
msgid "Character _Encoding"
msgstr "字符编码(_E)"
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:395
msgid "Print Pre_view"
msgstr "打印预览(_V)"
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:402
msgid "Save as _Draft"
msgstr "另存为草稿(_D)"
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:404
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:409
msgid "S_end"
msgstr "发送(_E)"
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:411
msgid "Send this message"
msgstr "发送这条信息"
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:419
msgid "PGP _Encrypt"
msgstr "PGP 加密(_E)"
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:421
msgid "Encrypt this message with PGP"
msgstr "用 PGP 加密该信息"
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:427
msgid "PGP _Sign"
msgstr "PGP 签名(_S)"
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:429
msgid "Sign this message with your PGP key"
msgstr "用您的 PGP 密钥签名该信息"
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:435
msgid "_Picture Gallery"
msgstr "图片画廊(_P)"
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:437
msgid "Show a collection of pictures that you can drag to your message"
msgstr "显示一组图片，您可以将它们拖放到您的信息中"
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:443
msgid "_Prioritize Message"
msgstr "标为优先(_P)"
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:445
msgid "Set the message priority to high"
msgstr "将信息设定为高优先级"
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:451
msgid "Re_quest Read Receipt"
msgstr "请求已读回执(_Q)"
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:453
msgid "Get delivery notification when your message is read"
msgstr "当您的信息被阅读时得到投递通知"
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:459
msgid "S/MIME En_crypt"
msgstr "S/MIME 加密(_C)"
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:461
msgid "Encrypt this message with your S/MIME Encryption Certificate"
msgstr "用您的 S/MIME 加密证书加密该信息"
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:467
msgid "S/MIME Sig_n"
msgstr "S/MIME 签名(_N)"
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:469
msgid "Sign this message with your S/MIME Signature Certificate"
msgstr "用您的 S/MIME 签名认证签名该信息"
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Unicode smileys"
+msgstr "Unicode 表情"
+
+#: ../composer/e-composer-actions.c:525
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr "用 Unicode 中的表情字符。"
+
+#: ../composer/e-composer-actions.c:531
msgid "_Bcc Field"
msgstr "密件抄送域(_B)"
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:533
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示密件抄送域"
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:539
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:541
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示抄送域"
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:547
+msgid "_From Override Field"
+msgstr "发件人覆盖字段(_F)"
+
+#: ../composer/e-composer-actions.c:549
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "切换发件人覆盖字段是否改变姓名或电子邮件的显示"
+
+#: ../composer/e-composer-actions.c:555
msgid "_Reply-To Field"
msgstr "回复至域(_R)"
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:557
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:618
msgid "Save Draft"
msgstr "保存草稿"
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
+msgid "_Name:"
+msgstr "名称(_N)："
+
#: ../composer/e-composer-header-table.c:38
msgid "Enter the recipients of the message"
msgstr "输入信息的收件人"
@@ -6908,72 +7433,68 @@ msgid ""
"appearing in the recipient list of the message"
msgstr "输入将接收该信息副本，但不出现在收件人列表中的收件人地址"
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:829
msgid "Fr_om:"
msgstr "发件人(_O)："
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:836
msgid "_Reply-To:"
msgstr "回复到(_R)："
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:841
msgid "_To:"
msgstr "收件人(_T)："
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:847
msgid "_Cc:"
msgstr "抄送(_C)："
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:853
msgid "_Bcc:"
msgstr "密件抄送(_B)："
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:858
msgid "_Post To:"
msgstr "投递到(_P)："
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:862
msgid "S_ubject:"
msgstr "主题(_U)："
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:504
msgid "Si_gnature:"
msgstr "签名(_G)："
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
msgid "Click here for the address book"
msgstr "单击此处以使用地址簿"
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:872
#, c-format
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信息签名：未对此帐号设置签名证书"
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:881
#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信息加密：未对此帐号设置加密证书"
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1588 ../composer/e-msg-composer.c:2614
msgid "Compose Message"
msgstr "新建消息"
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4964
msgid "The composer contains a non-text message body, which cannot be edited."
msgstr "编写器含有不可编辑的非文本信体。"
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "无标题信息"
-
#: ../composer/mail-composer.error.xml.h:1
msgid "You cannot attach the file "{0}" to this message."
msgstr "您无法将文件“{0}”作为这条信息的附件。"
@@ -7051,68 +7572,72 @@ msgid "_Save Draft"
msgstr "保存草稿(_S)"
#: ../composer/mail-composer.error.xml.h:20
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "您确定想要丢弃您正在编写的信息吗？"
+
+#: ../composer/mail-composer.error.xml.h:21
msgid "Could not create message."
msgstr "无法创建信息。"
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
msgid "Because "{0}", you may need to select different mail options."
msgstr "由于“{0}”，您可能要选择不同的邮件选项。"
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
msgid "Could not read signature file "{0}"."
msgstr "无法读取签名文件“{0}”。"
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
msgid "All accounts have been removed."
msgstr "已经删除了全部帐号。"
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
msgid "You need to configure an account before you can compose mail."
msgstr "在您可以撰写邮件之前您需要配置一个帐号。"
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
msgid "An error occurred while saving to your Outbox folder."
msgstr "在保存到您的发件箱文件夹时出现了一个错误。"
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
msgid "The reported error was "{0}". The message has not been sent."
msgstr "报告的错误为“{0}”。信息很可能没有发送。"
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
msgid "An error occurred while saving to your Drafts folder."
msgstr "在保存到您的草稿文件夹时出现了一个错误。"
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
msgid ""
"The reported error was "{0}". The message has most likely not been "
"saved."
msgstr "报告的错误为“{0}”。信息很可能没有保存。"
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
msgid "An error occurred while sending. How do you want to proceed?"
msgstr "在发送时出错了错误。您想继续吗？"
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
msgid "The reported error was "{0}"."
msgstr "报告的错误为“{0}”。"
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
msgid "_Save to Outbox"
msgstr "保存到发件箱(_S)"
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
msgid "_Try Again"
msgstr "重试(_T)"
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
msgid "Your message was sent, but an error occurred during post-processing."
msgstr "您的消息已发送，但在处理时出现了一个错误。"
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
msgid "Saving message to Outbox."
msgstr "把信息保存到发件箱中。"
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
msgid ""
"The message will be saved to your local Outbox folder, because the "
"destination service is currently unavailable. You can send the message by "
@@ -7121,6 +7646,36 @@ msgstr ""
"由于目标服务当前不可用，信息将保存到您的本地发件箱文件夹。在上线后，您可以通"
"过点击 Evolution 工具栏上的 发送/接收 按钮发送这条信息。"
+#: ../composer/mail-composer.error.xml.h:37
+msgid "Are you sure you want to send the message?"
+msgstr "您确定要发送信息吗？"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr ""
+"发送信息的键盘快捷键已经被按下。要么取消发送信息（如果是误操作），要么是发送"
+"信息。"
+
+#: ../composer/mail-composer.error.xml.h:39
+msgid "Are you sure you want to change the composer mode?"
+msgstr "您确定要改变编辑器模式？"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr "关闭 HTML 模式会使文本丢弃所有格式。您想继续吗？"
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr "不要丢弃格式(_D)"
+
+#: ../composer/mail-composer.error.xml.h:42
+msgid "Lose _formatting"
+msgstr "丢失格式(_F)"
+
#: ../data/evolution-alarm-notify.desktop.in.in.h:1
msgid "Evolution Alarm Notify"
msgstr "Evolution 提醒通知"
@@ -7129,30 +7684,13 @@ msgstr "Evolution 提醒通知"
msgid "Calendar event notifications"
msgstr "日历事件信息"
-#: ../data/evolution.appdata.xml.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr "Evolution 是一款个人信息管理应用，提供集成的邮件、日历和地址簿功能。"
-
-#: ../data/evolution.appdata.xml.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution 支持众多的工业标准数据格式和信息交换的网络协议，并强化了标准兼容性"
-"和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
-"进行顺利集成。"
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
#: ../modules/mailto-handler/evolution-mailto-handler.c:210
#: ../shell/e-shell-window-private.c:242
msgid "Evolution"
msgstr "Evolution"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-utils.c:418
msgid "Groupware Suite"
msgstr "Groupwise 套件"
@@ -7262,6 +7800,54 @@ msgstr "显示预览面板"
msgid "Whether to show the preview pane."
msgstr "是否显示预览面板。"
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "为真"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "是否在编辑器中显示电话号码"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "是否在编辑器中显示 SIP 地址"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "是否在编辑器中显示即时通讯地址"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "是否在编辑器中显示家庭邮政地址"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "是否在编辑器中显示工作邮政地址"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "是否在编辑器中显示其他邮政地址"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "是否在编辑器中显示网络地址"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "是否在编辑器中显示工作信息"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "是否在编辑器中显示杂项"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "是否在编辑器中显示备注"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+msgid "Whether to show Certificates tab in the editor"
+msgstr "是否在编辑器中显示证书标签页"
+
#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
msgid "Convert mail messages to Unicode"
msgstr "将邮件信息转换为 Unicode"
@@ -7273,6 +7859,19 @@ msgid ""
msgstr ""
"将信息文本转换到 Unicode UTF-8 以一致化来自于不同字符集的垃圾信息特征。"
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr "运行 Bogofilter 命令的完整路径"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+"运行 Bogofilter 命令的完整路径。如果未设置，使用编译时路径，通常是 /usr/bin/"
+"bogofilter 。命令不该包含任何其他参数。"
+
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
msgid "Save directory for reminder audio"
msgstr "保存提醒音频的目录"
@@ -7368,272 +7967,362 @@ msgid "Minute the workday starts on, 0 to 59."
msgstr "工作日开始的分钟，0 到 59。"
#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr "工作日星期一开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"or -1 to use day-start-hour and day-start-minute"
+msgstr ""
+"工作日开始于何时，使用 24 小时格式 HHMM (0000~2359)，或填入 -1 以采用 day-"
+"start-hour 与 day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr "工作日星期一结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-end-hour and day-end-minute"
+msgstr ""
+"工作日结束于何时，使用 24 小时格式 HHMM (0000~2359)，或填入 -1 以采用 day-"
+"end-hour 与 day-end-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr "工作日星期二开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-1 to use day-start-hour and day-start-minute"
+msgstr ""
+"工作日结束于何时，使用 24 小时格式 HHMM (0000~2359)，或填入 -1 以采用 day-"
+"start-hour 与 day-start-minute"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr "工作日星期二结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr "工作日星期三开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr "工作日星期三结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr "工作日星期四开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr "工作日星期四结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr "工作日星期五开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr "工作日星期五结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr "工作日星期六开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr "工作日星期六结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr "工作日星期日开始时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr "工作日星期日结束时刻"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
msgid "The second timezone for a Day View"
msgstr "日视图的第二时区"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
msgid ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a 'timezone' key"
msgstr "如果被设定，在日视图中显示第二时区。值和用于 'timezone' 中的键值类似"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
msgid "Recently used second time zones in a Day View"
msgstr "日视图中最近是用过的第二时区"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
msgid "List of recently used second time zones in a Day View"
msgstr "在日视图中最近使用过的第二时区列表"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
msgid "Maximum number of recently used timezones to remember"
msgstr "最近使用过的时区最大记忆数目"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
msgid ""
"Maximum number of recently used timezones to remember in a 'day-second-"
"zones' list"
msgstr "在 'day_second_zones' 列表中所记忆的最近用过时区的最大数目"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
msgid "Default reminder value"
msgstr "默认提醒值"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
msgid "Number of units for determining a default reminder"
msgstr "确定默认提醒的单位数量"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
msgid "Default reminder units"
msgstr "默认提醒单位"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
-msgstr "默认提醒的单位，可为“分钟“，“小时” 或 “天”。"
+msgstr "默认提醒的单位，可为“分钟“，“小时”或“天”。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Default reminder snooze interval, in minutes"
+msgstr "预览提醒的小睡间隔，以分钟计"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr "预览提醒的小睡间隔，以分钟计，会用于提醒通知对话盒中"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
msgid "Show categories field in the event/meeting/task editor"
msgstr "在事件/会议/任务编辑器中显示分类域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
msgid "Whether to show categories field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示分类域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
msgid "Show Role field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示角色域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议中显示角色域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
msgid "Show RSVP field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示请回复域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
msgid "Show status field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示状态域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示状态域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
msgid "Show timezone field in the event/meeting editor"
msgstr "在事件/会议编辑器中显示时区域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示时区域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
msgid "Show type field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示类型域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示类型域"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
msgid "Hide completed tasks"
msgstr "隐藏已完成的任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
msgid "Whether to hide completed tasks in the tasks view"
msgstr "是否在任务视图中隐藏已完成的任务。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
msgid "Hide task units"
msgstr "隐藏任务单位"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
-msgstr "决定何时隐藏任务的单位，可为 “分钟”，“小时” 或 “天”。"
+msgstr "决定何时隐藏任务的单位，可为“分钟”，“小时”或“天”。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
msgid "Hide task value"
msgstr "隐藏任务值"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
msgid "Number of units for determining when to hide tasks"
msgstr "决定何时隐藏任务的单位数"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
msgid "Horizontal pane position"
msgstr "水平面板位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
msgid ""
"Position of the horizontal pane, between the date navigator calendar and the "
"task list when not in the month view, in pixels"
msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置，以像素计。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
msgid "Last reminder time"
msgstr "上次提醒时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
msgid "Time the last reminder ran, in time_t"
msgstr "提醒上次运行的时间，time_t 格式。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
msgid "Marcus Bains Line Color - Day View"
msgstr "Marcus Bains 线颜色 - 日视图"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
msgid "Color to draw the Marcus Bains line in the Day View"
msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
msgid "Marcus Bains Line Color - Time bar"
msgstr "Marcus Bains 线颜色 - 日期栏"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)"
msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
msgid "Marcus Bains Line"
msgstr "Marcus Bains 线"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar"
msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
msgid "Memo preview pane position (horizontal)"
msgstr "备忘预览面板的水平位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
msgid "Position of the task preview pane when oriented horizontally"
msgstr "当水平时，任务预览面板的位置。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
msgid "Memo layout style"
msgstr "备忘外观风格"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the memo list. \"0\" (Classic View) places the preview pane below the memo "
"list. \"1\" (Vertical View) places the preview pane next to the memo list"
msgstr ""
-"布局样式决定了在哪里放置备忘列表的预览面板。“0”(经典视图)会把预览面板放置在备"
-"忘列表下面。“1”(竖直视图)会把预览面板放置在备忘列表旁边。"
+"布局样式决定了在哪里放置备忘录列表的预览面板。“0”(经典视图)会把预览面板放置在"
+"备忘录列表下面。“1”(竖直视图)会把预览面板放置在备忘录列表旁边。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
msgid "Memo preview pane position (vertical)"
msgstr "备忘预览面板的竖直位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
msgid "Position of the memo preview pane when oriented vertically"
msgstr "当竖直时，备忘预览面板的位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
msgid "Month view horizontal pane position"
msgstr "月视图水平面板的位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
msgid ""
"Position of the horizontal pane, between the view and the date navigator "
"calendar and task list in the month view, in pixels"
msgstr ""
"月视图中视图、日期导航器日历及任务列表之间水平面板的位置，以像素为单位。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
msgid "Scroll Month View by a week, not by a month"
msgstr "按星期滚动月视图，而不是按照月份滚动。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
msgid "Whether to scroll a Month View by a week, not by a month"
msgstr "是否按星期滚动月视图，而不是按照月份滚动。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
msgid "Reminder programs"
msgstr "提醒程序"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
msgid "Programs that are allowed to be run by reminders"
msgstr "允许提醒运行的程序。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
msgid "Show display reminders in notification tray"
msgstr "在通知托盘中显示提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
msgid "Whether or not to use the notification tray for display reminders"
msgstr "是否使用通知托盘来显示提醒。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
msgid "Preferred New button item"
msgstr "首选的“新建”按钮项目"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
msgid "Name of the preferred New toolbar button item"
msgstr "首选的“新建”工具栏按钮项目的名称"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
msgid "Primary calendar"
msgstr "首选日历"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
msgid ""
"The UID of the selected (or \"primary\") calendar in the sidebar of the "
"\"Calendar\" view"
msgstr "在“日历”视图侧边栏中选定的(或“主”)日历的 UID"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
msgid "Primary memo list"
-msgstr "首选备忘列表"
+msgstr "首选备忘录列表"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
msgid ""
"The UID of the selected (or \"primary\") memo list in the sidebar of the "
"\"Memos\" view"
-msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘列表的 UID"
+msgstr "在“备忘”视图侧边栏中选定的(或“主”)备忘录列表的 UID"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
msgid "Primary task list"
msgstr "首选任务列表"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
msgid ""
"The UID of the selected (or \"primary\") task list in the sidebar of the "
"\"Tasks\" view"
msgstr "在“任务”视图侧边栏中选定的(或“主”)任务列表的 UID"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
msgid "Free/busy template URL"
msgstr "忙/闲模板 URL"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -7642,90 +8331,90 @@ msgstr ""
"用作忙/闲数据退却的 URL 模板，%u 将替换为电子邮件的用户部分，而 %d 将替换为域"
"名。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
msgid "Recurrent Events in Italic"
msgstr "以斜体显示重复事件"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
msgid "Show days with recurrent events in italic font in bottom left calendar"
msgstr "在底部左侧日历中以斜体显示有重复事件的日期。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
msgid "Search range for time-based searching in years"
msgstr "基于时间搜索的年份搜索范围"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
msgid ""
"How many years can the time-based search go forward or backward from "
"currently selected day when searching for another occurrence; default is ten "
"years"
msgstr "基于时间的搜索在查找另一次发生时可向前或向后追溯多少年；默认为10年"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
msgid "Show appointment end times in week and month views"
msgstr "在周视图和月视图中显示约会结束时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
msgid "Whether to display the end time of events in the week and month views"
msgstr "是否在周视图和月视图中显示事件的结束时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
msgid "Show the memo preview pane"
msgstr "显示“备忘预览”面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
msgid "If \"true\", show the memo preview pane in the main window"
-msgstr "如果 “true”，在主窗口中显示备忘预览面板"
+msgstr "如果“true”，在主窗口中显示备忘预览面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
msgid "Show the task preview pane"
msgstr "显示“任务预览”面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
msgid "If \"true\", show the task preview pane in the main window"
-msgstr "如果 “true”，在主窗口中显示任务预览面板"
+msgstr "如果“true”，在主窗口中显示任务预览面板"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
msgstr "在日视图、工作日视图和日期导航中显示周数"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
msgid "Whether to show week numbers in various places in the Calendar"
msgstr "是否在日历中显示周数。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
msgid "Vertical position for the tag pane"
msgstr "标签面板的竖直位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
msgid "Highlight tasks due today"
msgstr "高亮今天到期的任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
msgid ""
"Whether highlight tasks due today with a special color (task-due-today-color)"
msgstr "是否以特殊颜色高亮显示今天到期的任务(task-due-today-color)"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
msgid "Tasks due today color"
msgstr "今天到期的任务颜色"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
msgid ""
"Background color of tasks that are due today, in \"#rrggbb\" format. Used "
"together with task-due-today-highlight"
msgstr ""
"今天到期任务的背景颜色，“#rrggbb”格式；与 task-due-today-highlight 一起使用"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
msgid "Task preview pane position (horizontal)"
msgstr "任务预览面板的水平位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
msgid "Task layout style"
msgstr "任务外观风格"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -7734,28 +8423,38 @@ msgstr ""
"布局样式决定了在哪里放置任务列表的预览面板。“0”(经典视图)会把预览面板放置在任"
"务列表下面。“1”(竖直视图)会把预览面板放置在任务列表旁边。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
msgid "Task preview pane position (vertical)"
msgstr "任务预览面板的竖直位置"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
msgid "Position of the task preview pane when oriented vertically"
msgstr "当竖直时，任务预览面板的位置。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+msgid "Show reminders for completed tasks"
+msgstr "显示已完成任务的提醒"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr "是否显示已完成工作的提醒。设置为 false 时，会抑制已完成工作的提醒。"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
msgid "Highlight overdue tasks"
msgstr "高亮延期任务"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
msgid ""
"Whether highlight overdue tasks with a special color (task-overdue-color)"
msgstr "是否用特殊颜色高亮显示延期任务(task-overdue-color)"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
msgid "Overdue tasks color"
msgstr "延期任务的颜色"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
msgid ""
"Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
"together with task-overdue-highlight."
@@ -7763,19 +8462,19 @@ msgstr ""
"延期任务的背景颜色，以“#rrggbb”格式。与 task-overdue-highlight(任务延期高亮)"
"一道使用。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
msgid "Time divisions"
msgstr "时间分割"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
msgid "Intervals shown in Day and Work Week views, in minutes"
msgstr "日视图和工作周视图中显示的间隔，以分钟计。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
msgid "Timezone"
msgstr "时区"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olson timezone database location like \"America/New York\""
@@ -7783,86 +8482,86 @@ msgstr ""
"日历中日期和时间所使用的默认时区，以未翻译的 Olson 时区数据库位置表示，"
"如“Asia/Chongqing”。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
msgid "Twenty four hour time format"
msgstr "二十四小时时间格式"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
msgid "Whether to show times in twenty four hour format instead of using am/pm"
msgstr "是以 24 小时格式还是以上午/下午格式显示时间"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
msgid "Birthday and anniversary reminder"
msgstr "生日和纪念日提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
msgid "Whether to set a reminder for birthdays and anniversaries"
msgstr "是否为生日或周年纪念日设置提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
msgid "Default appointment reminder"
msgstr "默认约会提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
msgid "Whether to set a default reminder for appointments"
msgstr "是否为约会设置默认提醒"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
msgid "Use system timezone"
msgstr "使用系统时区"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
msgid "Use the system timezone instead of the timezone selected in Evolution"
msgstr "使用系统时区而不是在 Evolution 中选择的时区。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
msgid "First day of the week"
msgstr "本周第一天"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
msgid "Monday is a work day"
msgstr "周一为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
msgid "Tuesday is a work day"
msgstr "周二为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
msgid "Wednesday is a work day"
msgstr "周三为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
msgid "Thursday is a work day"
msgstr "周四为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
msgid "Friday is a work day"
msgstr "周五为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
msgid "Saturday is a work day"
msgstr "周六为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
msgid "Sunday is a work day"
msgstr "周日为工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
msgstr "(已弃用)一周开始的日子，从星期日(0)到星期六(6)"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"\"week-start-day-name\" instead."
msgstr ""
"该键值已在版本 3.10 中弃用，不应当再使用。请使用 \"week-start-day-name\"。"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
msgid "(Deprecated) Work days"
msgstr "(已弃用)工作日"
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
msgid ""
"Days on which the start and end of work hours should be indicated. (This key "
"was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -7979,44 +8678,46 @@ msgid "Automatic emoticon recognition"
msgstr "自动识别表情图标"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "识别文本中的表情，并将其替换为图像。"
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr "识别文本中的表情，并将其替换为图像或者 Unicode 字符。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
msgid "Attribute message"
msgstr "附属的信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
msgid ""
"The text that is inserted when replying to a message, attributing the "
"message to the original author"
msgstr "在回复信息时插入的文本，附于原作者的信息之上"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
msgid "Forward message"
msgstr "转发信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
msgid ""
"The text that is inserted when forwarding a message, saying that the "
"forwarded message follows"
msgstr "在转发信息时插入的文本，写着下面是转发的信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
msgid "Original message"
msgstr "原始信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
msgid ""
"The text that is inserted when replying to a message (top posting), saying "
"that the original message follows"
msgstr "在回复一封信时插入的文本(顶部回帖)，写着下面是原始信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
msgid "Group Reply replies to list"
msgstr "“组回复”是回复到邮件列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
msgid ""
"Instead of the normal \"Reply to All\" behaviour, this option will make the "
"'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8026,11 +8727,11 @@ msgstr ""
"与普通的“回复全部”行为不同，这个选项使“组回复”工具按钮通过您正在回复的刚收到"
"的信息只回复给邮件列表。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
msgid "Put the cursor at the bottom of replies"
msgstr "将光标置于回复底部"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
msgid ""
"Users get all up in arms over where the cursor should go when replying to a "
"message. This determines whether the cursor is placed at the top of the "
@@ -8039,30 +8740,22 @@ msgstr ""
"用户常为回复信息时光标位置不定而恼火。这个选项决定了回复时光标位于消息顶部还"
"是底部。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
msgid "Always request read receipt"
msgstr "总是请求阅读收条"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
msgid "Whether a read receipt request gets added to every message by default."
msgstr "是否默认对所有信息添加阅读收条请求。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "拼写检查颜色"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "当使用行内拼写检查时，错误拼写单词的下划线的颜色。"
-
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
msgid "Spell checking languages"
msgstr "拼写检查语言"
@@ -8096,10 +8789,22 @@ msgstr ""
"能。"
#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Show \"From\" override field when sending a mail message"
+msgstr "在发送邮件信息时显示“发件人”覆盖域"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"在发送邮件信息时显示“发件人”覆盖域。在选定了一个邮件帐号时可以在查看菜单中控"
+"制此功能。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
msgid "Show \"Reply To\" field when sending a mail message"
msgstr "发送邮件时显示“Reply To”(回复至)域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
msgid ""
"Show the \"Reply To\" field when sending a mail message. This is controlled "
"from the View menu when a mail account is chosen."
@@ -8107,11 +8812,11 @@ msgstr ""
"在发送邮件信息时显示“Reply To”域。在选定了一个邮件帐号时可以在查看菜单中控制"
"此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
msgid "Show \"From\" field when posting to a newsgroup"
msgstr "在发送内容到新闻组时显示发件人域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
msgid ""
"Show the \"From\" field when posting to a newsgroup. This is controlled from "
"the View menu when a news account is chosen."
@@ -8119,11 +8824,11 @@ msgstr ""
"在发送内容到新闻组时显示发件人域。在选定了一个新闻组帐号时可以在查看菜单中控"
"制此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
msgid "Show \"Reply To\" field when posting to a newsgroup"
msgstr "在发送内容到新闻组时显示“Reply To”(回复至)域"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
msgid ""
"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
"from the View menu when a news account is chosen."
@@ -8131,21 +8836,21 @@ msgstr ""
"在发送内容到新闻组时显示“Reply To”域。在选定了一个新闻组帐号时可以在查看菜单"
"中控制此功能。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
msgid "Digitally sign replies when the original message is signed"
msgstr "若原信息已签名，回复时添加数字签名"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
msgid ""
"Automatically enable PGP or S/MIME signatures when replying to a message "
"which is also PGP or S/MIME signed."
msgstr "在回复带 PGP 或 S/MIME 签名的信息时，自动启动 PGP 或 S/MIME 签名。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
msgid "Encode filenames in an Outlook/GMail way"
msgstr "使用 Outlook/Gmail 方式编码文件名"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
msgid ""
"Encode filenames in the mail headers same as Outlook or GMail do, to let "
"them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8156,11 +8861,21 @@ msgstr ""
"发送的邮件带有的 UTF-8 字符的文件名，因为它们不符合 RFC 2231，而是使用了不正"
"确的 RFC 2047 标准。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+msgid "Send messages through Outbox folder"
+msgstr "通过发件箱文件夹发送邮件"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr "发送邮件时必须保存到发件箱文件夹，让用户选择信息发送时间。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
msgid "Put personalized signatures at the top of replies"
msgstr "在回复的顶部添加个性签名"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
msgid ""
"Users get all up in arms over where their signature should go when replying "
"to a message. This determines whether the signature is placed at the top of "
@@ -8169,21 +8884,21 @@ msgstr ""
"用户常为回复信息时签名位置不定而恼火。这个选项决定了回复时签名位于消息顶部还"
"是底部。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
msgid "Do not add signature delimiter"
msgstr "不添加签名分隔符"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
msgid ""
"Set to TRUE in case you do not want to add signature delimiter before your "
"signature when composing a mail."
msgstr "如果您不想在您写邮件时签名以前添加签名分隔符，那么设置为真"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
msgid "Ignore list Reply-To:"
msgstr "忽略邮件列表“回复至”域："
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
msgid ""
"Some mailing lists set a Reply-To: header to trick users into sending "
"replies to the list, even when they ask Evolution to make a private reply. "
@@ -8199,32 +8914,72 @@ msgstr ""
"作，它会进行私人的回复；而如果您使用“回复到列表”行为，它就会回复到列表。如果"
"存在的话，它会比较 Reply-To: 和 List-Post: 来完成该目的。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
msgid "List of localized 'Re'"
msgstr "本地化的“Re”列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
msgid ""
"Comma-separated list of localized 'Re' abbreviations to skip in a subject "
"text when replying to a message, as an addition to the standard \"Re\" "
"prefix. An example is 'SV,AV'."
msgstr ""
-"当回复某个信息时，在主题中跳过的本地化的 “回复”缩写 列表，以逗号分隔。它们是"
-"标准 \"Re\" 前缀的补充。例如 'SV,AV'。"
+"当回复某个信息时，在主题中跳过的本地化的“回复”缩写 列表，以逗号分隔。它们是标"
+"准 \"Re\" 前缀的补充。例如 'SV,AV'。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+msgid "Enable developer mode"
+msgstr "启用开发模式"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
+msgstr "启用为开发和调试一些隐藏的操作和工具。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid "Number of characters for wrapping"
+msgstr "换行字符数"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Will autowrap lines after given number of characters."
+msgstr "超出给定的字符数后自动换行。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+msgstr "询问“prompt-on-many-to-cc-recips”的收件人与抄送数目"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr "当收件人与抄送数目达到这个数值时，是否要询问。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr "是否在工具栏中显示签名与加密按钮"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid ""
+"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
+"always shown in the composer's toolbar. Otherwise they are shown only when "
+"being used."
+msgstr ""
+"如果启用，PGP 或 S/MIME 的签名与加密按钮会永远显示在编辑器的工具栏上。否则它"
+"们只会在被使用时才显示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
msgid "Save file format for drag-and-drop operation"
msgstr "拖放操作时保存文件类型"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
msgid "Can be either 'mbox' or 'pdf'."
msgstr "可以是“mbox”或“pdf”。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
msgid "Show image animations"
msgstr "显示图像动画"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
msgid ""
"Enable animated images in HTML mail. Many users find animated images "
"annoying and prefer to see a static image instead."
@@ -8232,91 +8987,91 @@ msgstr ""
"在 HTML 邮件中启用动画图像。很多用户感觉动画图像很烦人并且喜欢看静态图像而不"
"是动态的。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
msgid "Enable or disable type ahead search feature"
msgstr "启用或禁用自动前进功能"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
msgid ""
"Enable the side bar search feature to allow interactive searching of folder "
"names."
msgstr "启用侧边栏搜索功能来实现文件夹名称的互动搜索"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
msgid "Enable or disable magic space bar"
msgstr "启用或禁用魔术空格键"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
msgid ""
"Enable this to use Space bar key to scroll in message preview, message list "
"and folders."
msgstr "启用以在信息预览、信息列表和文件夹中使用空格键。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
msgid "Enable to use a similar message list view settings for all folders"
msgstr "启用以在所有文件夹中使用相似的信息列表视图设置"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
msgid "Enable to use a similar message list view settings for all folders."
msgstr "启用以在所有文件夹中使用相似的信息列表视图设置。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
msgid "Mark citations in the message \"Preview\""
msgstr "在信息“预览”中标出引用"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
msgid "Mark citations in the message \"Preview\"."
msgstr "在信息“预览”中标出引用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
msgid "Citation highlight color"
msgstr "引用突出颜色"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
msgid "Citation highlight color."
msgstr "引用突出颜色。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "启用光标模式，这样您在读取邮件时就能看到光标了。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
msgid "Default charset in which to display messages"
msgstr "显示信息的默认字符集"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
msgid "Default charset in which to display messages."
msgstr "显示信息的默认字符集。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
msgid "Automatically load images for HTML messages over HTTP"
msgstr "自动在 HTML 信息中载入 HTTP 图像"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
msgid "Show Animations"
msgstr "显示动画"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
msgid "Show all message headers"
msgstr "显示全部信头"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
msgid "Show all the headers when viewing a messages."
msgstr "查看信息时显示全部信头。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
msgid "List of headers to show when viewing a message."
msgstr "要在查看信息时显示的信头列表。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
msgid ""
"Each header is represented as a pair: the header name, and a boolean "
"indicating whether the header is enabled. Disabled headers are not shown "
@@ -8325,75 +9080,81 @@ msgstr ""
"每个信头都成对出现：信头名，指示该信头是否启用的布尔值。当查看某个信息时，禁"
"用的信头将不会显示，但仍然会列在“首选项”中。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
msgid "Show photo of the sender"
msgstr "显示发件人照片"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
msgid "Show the photo of the sender in the message reading pane."
msgstr "在信息阅读面板中显示发件人照片。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid "Search gravatar.com for photo of the sender"
+msgstr "从 gravatar.com 搜索发件人照片"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr "允许搜索发件人照片并在 gravatar.com 里搜索"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+msgid "Mark as Seen always after specified timeout"
+msgstr "总是在指定的时限过后标示成已阅"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr "如果启用，选取的邮件会在超时时间或改变文件夹时设置为未读。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
msgid "Timeout for marking messages as seen"
msgstr "将信息标为已看的超时时长"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
msgid "Timeout in milliseconds for marking messages as seen."
msgstr "将信息标为已看的超时时长，单位为毫秒。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
msgid "Sender email-address column in the message list"
msgstr "在信息列表中显示 email 地址列"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
msgstr "在信息列表的以另外的列显示电子邮件的发送者。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
msgid "Show deleted messages in the message-list"
msgstr "在信息列表中显示删除了的信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信息列表中显示删除了的信息(带有删除线)。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
msgid "Enable Unmatched search folder"
msgstr "启用“无匹配”搜索文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
msgid ""
"Enable Unmatched search folder within Search Folders. It does nothing if "
"Search Folders are disabled."
msgstr "启用搜索文件夹内的“无匹配”搜索文件夹。它在禁用搜索文件夹时不起作用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
msgid "Hides the per-folder preview and removes the selection"
msgstr "隐藏单文件夹预览并移除选择"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
"the mail in the list and removes the preview for that folder."
@@ -8401,31 +9162,31 @@ msgstr ""
"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
"件夹的预览。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
msgid "Height of the message-list pane"
msgstr "信息列表面板的高度"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
msgid "Height of the message-list pane."
msgstr "信息列表面板的高度。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
msgid "Whether message headers are collapsed in the user interface"
msgstr "是否在用户界面中折叠信息头"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
msgid "Width of the message-list pane"
msgstr "信息列表面板的高度"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
msgid "Width of the message-list pane."
msgstr "信息列表面板的高度。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
msgid "Layout style"
msgstr "布局样式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
msgid ""
"The layout style determines where to place the preview pane in relation to "
"the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8435,75 +9196,75 @@ msgstr ""
"布局样式决定了在哪里放置信息列表的预览面板。“0”(经典视图)会把预览面板放置在消"
"息列表下面。“1”(竖直视图)会把预览面板放置在信息列表旁边。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
msgid "Variable width font"
msgstr "变宽字体"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
msgid "The variable width font for mail display."
msgstr "用于显示邮件的变宽字体。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
msgid "Terminal font"
msgstr "终端字体"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
msgid "The terminal font for mail display."
msgstr "邮件显示用的终端字体。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
msgid "Use custom fonts for displaying mail."
msgstr "使用自定义字体显示邮件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "压缩 TO/CC/BCC 中地址的显示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
msgstr "设定默认信息视图中要显示的地址数，超过的部分显示为“...”。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信息列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
msgid ""
"Whether or not to fall back on threading by subjects when the messages do "
"not contain In-Reply-To or References headers."
msgstr "是否在信息不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
msgid "Default value for thread expand state"
-msgstr "话题的默认展开状态"
+msgstr "线索的默认展开状态"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
msgstr "此设置指定了默认情况下线索是展开还是折叠。此设置需要重启 Evolution。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
msgid "Whether sort threads based on latest message in that thread"
msgstr "是否以线索中的最新信息来排序线索"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
msgid ""
"This setting specifies whether the threads should be sorted based on latest "
"message in each thread, rather than by message's date. Evolution requires a "
@@ -8512,11 +9273,23 @@ msgstr ""
"此设置指定了默认情况下是否将线索按线索中的最新信息而不是信息日期排序。需要重"
"启 Evolution。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+msgid "Whether sort thread children always ascending"
+msgstr "是否永远递增排序相关邮件线索子项"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+msgid ""
+"This setting specifies whether the thread children should be sorted always "
+"ascending, rather than using the same sort order as in the thread root level."
+msgstr ""
+"这个设置值指定相关邮件的子项是否永远递增排序，而非依照相关邮件同样的排序顺"
+"序。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
msgid "Sort accounts alphabetically in a folder tree"
msgstr "在文件夹树中按字母顺序排列帐号"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
msgid ""
"Tells how to sort accounts in a folder tree used in a Mail view. When set to "
"true accounts are sorted alphabetically, with an exception of On This "
@@ -8524,29 +9297,29 @@ msgid ""
"given by a user"
msgstr ""
"指出在邮件视图的文件夹树里如何排序帐号。若设为 true，帐号按字母顺序排列，“在"
-"此计算机上”和“搜索”文件夹除外；否则帐号按用户指定的顺序排列"
+"此计算机中”和“搜索”文件夹除外；否则帐号按用户指定的顺序排列"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
msgid "Flush Outbox after filtering"
msgstr "在过滤之后清空输出窗口"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
msgid ""
"Whether to flush Outbox after filtering is done. Outbox flush will happen "
"only when there was used any 'Forward to' filter action and approximately "
@@ -8555,90 +9328,100 @@ msgstr ""
"在过滤结束后是否刷新发件箱。仅在使用过任何“转发给”过滤器行为并且在上次调用大"
"约一分钟后进行发件箱刷新。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "使用 键盘快捷键(Ctrl+Enter) 发送时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+msgstr "用户试图通过键盘快捷键发送信息时提示。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的信息时提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
msgid "Prompt when emptying the trash"
msgstr "清空废件箱时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
msgid "Prompt the user when he or she tries to empty the trash."
msgstr "在用户试图清空废件箱时提示他/她。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户试图销毁文件夹时提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
msgid "Prompt before sending to recipients not entered as mail addresses"
msgstr "下列接收者不能被识别为有效的电子邮件地址"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
msgid ""
"It disables/enables the repeated prompts to warn that you are trying to send "
"a message to recipients not entered as mail addresses"
msgstr "禁用/启用以在您将信息的私人回复发送至邮件列表时发出警告。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入密件抄送时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有收件人或抄送的信息时提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
msgid ""
"If a user tries to open 10 or more messages at one time, ask the user if "
"they really want to do it."
msgstr "如果用户试图一次打开的信息大于等于十封，将会询问用户是否真的要这么做。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
msgid "Prompt while marking multiple messages"
msgstr "标记多封信息时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
msgid "Enable or disable the prompt whilst marking multiple messages."
msgstr "禁用/启用对多条信息标记时的提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
msgid "Prompt when deleting messages in search folder"
msgstr "删除搜索文件夹中的信息时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
msgid ""
"It disables/enables the repeated prompts to warn that deleting messages from "
"a search folder permanently deletes the message, not simply removing it from "
@@ -8646,49 +9429,49 @@ msgid ""
msgstr ""
"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
msgid "Asks whether to copy a folder by drag & drop in the folder tree"
msgstr "询问是否通过文件夹树的拖放操作复制文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
msgid ""
"Possible values are: 'never' - do not allow copy with drag & drop of "
"folders in folder tree, 'always' - allow copy with drag & drop of "
"folders in folder tree without asking, or 'ask' - (or any other value) will "
"ask user."
msgstr ""
-"可取的值有：“never” - 不允许在文件夹树中拖放复制文件夹；“always” - 允许复制，"
-"无须询问；“ask” - (或其他任意值) 询问用户。"
+"可取的值有：“never”- 不允许在文件夹树中拖放复制文件夹；“always”- 允许复制，无"
+"须询问；“ask”- (或其他任意值) 询问用户。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
msgid "Asks whether to move a folder by drag & drop in the folder tree"
msgstr "询问是否通过文件夹树的拖放操作移动文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
msgid ""
"Possible values are: 'never' - do not allow move with drag & drop of "
"folders in folder tree, 'always' - allow move with drag & drop of "
"folders in folder tree without asking, or 'ask' - (or any other value) will "
"ask user."
msgstr ""
-"可取的值有：“never” - 不允许在文件夹树中拖放移动文件夹；“always” - 允许移动，"
-"无须询问；“ask” - (或其他任意值) 询问用户。"
+"可取的值有：“never”- 不允许在文件夹树中拖放移动文件夹；“always”- 允许移动，无"
+"须询问；“ask”- (或其他任意值) 询问用户。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
msgid "Prompt when replying privately to list messages"
msgstr "当对邮件列表作私人回复时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
msgid ""
"It disables/enables the repeated prompts to warn that you are sending a "
"private reply to a message which arrived via a mailing list."
msgstr "禁用/启用以在您将信息的私人回复发送至邮件列表时发出警告。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
msgid "Prompt when mailing list hijacks private replies"
msgstr "当邮件列表劫持私人回复时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
msgid ""
"It disables/enables the repeated prompts to warn that you are trying sending "
"a private reply to a message which arrived via a mailing list, but the list "
@@ -8697,79 +9480,104 @@ msgstr ""
"当您正要发送一个通过邮件列表收到的信息的私人回复，而邮件头的 Reply-To: 重定向"
"到了列表时，禁用或启用反复的警告提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
msgid "Prompt when replying to many recipients"
msgstr "当向多个收件人回复时提示"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
msgid ""
"It disables/enables the repeated prompts to warn that you are sending a "
"reply to many people."
msgstr "禁用或启用当您发送回复给许多人的时候的反复的警告提示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
+msgstr "是否在切换编辑器模式会导致内容失去现有格式时先提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+"它会停用/启用重复提示警告您正在切换编辑器模式而其中内容会失去先前的格式。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+msgid "Prompt when sending to many To and CC recipients"
+msgstr "当回复给许多收件人与抄送时提示"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"'composer-many-to-cc-recips-num' defines the threshold."
+msgstr ""
+"当寄信给许多收件人与抄送时启用或停用提示。“composer-many-to-cc-recips-num”定"
+"义了这个界限值。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
msgid ""
"Policy for automatically closing the message browser window when forwarding "
"or replying to the displayed message."
msgstr "当转发或回复当前显示的信息时，自动关闭信息浏览器窗口的策略。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
msgid "Empty Trash folders on exit"
msgstr "退出时清空废件箱"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出 Evolution 时清空废件箱。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空废件箱的最少天数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空废件箱的最少天数。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
msgid "Last time Empty Trash was run"
msgstr "上次清空废件箱的时间为："
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
msgid ""
"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
msgstr "上次清空废件箱的时间，以新纪元后的天数显示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr "在状态栏中显示错误的时间秒数。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
msgid "Level beyond which the message should be logged."
msgstr "大于此级别的信息会被记录。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
msgid ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
msgstr "此选项有三种可能值：0－错误，1－警告，2－调试信息。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
msgid "Show original \"Date\" header value."
msgstr "显示原始的邮件头日期值。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
msgid ""
"Show the original \"Date\" header (with a local time only if the time zone "
"differs). Otherwise always show \"Date\" header value in a user preferred "
"format and local time zone."
msgstr ""
-"显示原始的邮件头“Date” 值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
-"式和本地时区显示邮件头“Date” 值。"
+"显示原始的邮件头“Date”值(如果时区不同附上本地时间)。否则总是按照用户偏好的格"
+"式和本地时区显示邮件头“Date”值。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
msgid ""
"List of labels known to the mail component of Evolution. The list contains "
"strings containing name:color where color uses the HTML hex encoding."
@@ -8777,44 +9585,44 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”，其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
msgid "Check incoming mail being junk"
msgstr "检查收到的邮件是否是垃圾信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
msgid "Run junk test on incoming mail."
msgstr "对收到的邮件运行垃圾信息测试。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
msgid "Empty Junk folders on exit"
msgstr "退出时清空垃圾信息文件夹"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
msgid "Empty all Junk folders when exiting Evolution."
msgstr "退出 Evolution 时清空垃圾信息。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
msgid "Minimum days between emptying the junk on exit"
msgstr "退出时清空垃圾信息的最少天数"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "退出时清空垃圾信息的最少时间，以天计。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
msgid "Last time Empty Junk was run"
msgstr "上次清空垃圾信息的时间为："
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
msgid ""
"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
msgstr "上次清空垃圾信息的时间，以自新纪元后的天数显示。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
msgid "The default plugin for Junk hook"
msgstr "默认的垃圾信息钩子插件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
"enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -8823,11 +9631,11 @@ msgstr ""
"这是默认的垃圾信息插件，即使启用了多个插件。如果默认列出的插件被禁用，它不会"
"缺省到其它可用的插件。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
msgid "Determines whether to lookup in address book for sender email"
msgstr "决定是否在地址簿中查找发件人电子邮件"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
msgid ""
"Determines whether to lookup the sender email in address book. If found, it "
"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8838,13 +9646,13 @@ msgstr ""
"为自动补全的地址簿中查找，如果远程地址簿(如 LDAP)被标记为自动补全的话，可能会"
"比较慢。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
msgid ""
"Determines whether to look up addresses for junk filtering in local address "
"book only"
msgstr "决定是否仅在本地地址簿中查找地址进行垃圾信息过滤"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
msgid ""
"This option is related to the key lookup_addressbook and is used to "
"determine whether to look up addresses in local address book only to exclude "
@@ -8853,11 +9661,11 @@ msgstr ""
"此选项与 lookup_addressbook 键值相关，用于决定是否查询本地地址簿以避免您认识"
"的人给您发邮件而被垃圾邮件过滤器给过滤掉。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
msgid "Determines whether to use custom headers to check for junk"
msgstr "决定是否使用自定义信头检测垃圾信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
msgid ""
"Determines whether to use custom headers to check for junk. If this option "
"is enabled and the headers are mentioned, it will be improve the junk "
@@ -8866,51 +9674,51 @@ msgstr ""
"决定是否使用自定义信头检测垃圾信息。如果此选项被启用且信头被设置的话，将提高"
"垃圾信息检测速度。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
msgid "Custom headers to use while checking for junk."
msgstr "自定义用以检查垃圾信息的信头。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
msgid ""
"Custom headers to use while checking for junk. The list elements are string "
"in the format \"headername=value\"."
msgstr "自定义用以检查垃圾信息的信头。列表元素的字符串格式为“信头名=值”。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
msgid "UID string of the default account."
msgstr "默认帐号的 UID 字符串。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
msgid "Save directory"
msgstr "保存目录"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
msgid "Directory for saving mail component files."
msgstr "保存邮件组件文件的目录。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
msgid "Composer load/attach directory"
msgstr "编辑器加载/附件目录"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
msgid "Directory for loading/attaching files to composer."
msgstr "邮件写作器用来加载/附加文件的目录"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
msgid "Check for new messages on start"
msgstr "启动时检查新信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
msgid ""
"Whether to check for new messages when Evolution is started. This includes "
"also sending messages from Outbox."
msgstr "是否在 Evolution 启动时检查新信息。也包括发送发件箱中的信息。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
msgid "Check for new messages in all active accounts"
msgstr "检查所有活动帐号的新信息"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
msgid ""
"Whether to check for new messages in all active accounts regardless of the "
"account \"Check for new messages every X minutes\" option when Evolution is "
@@ -8919,64 +9727,100 @@ msgstr ""
"在 Evolution 启动时，是不是检查所有活动帐号的新信息而不管帐号的“每隔 X 分钟自"
"动检查新信息”选项如何设置。该选项仅与“send_recv_on_start”选项一起使用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
msgid "Server synchronization interval"
msgstr "服务器同步间隔"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
msgid ""
"Controls how frequently local changes are synchronized with the remote mail "
"server. The interval must be at least 30 seconds."
msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+msgid "Allow expunge in virtual folders"
+msgstr "允许在虚拟文件夹中销毁"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder->Expunge "
+"will be callable in virtual folders, while the expunge itself will be done "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+"启用在虚拟文件夹中销毁，意味着可以在虚拟文件夹里调用 文件夹->销毁 ，这时销毁"
+"虚拟文件夹中信息的操作会在所有文件夹中进行，而不仅仅是只删除属于虚拟文件夹中"
+"的信息。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML mode"
+msgstr "在 HTML 模式中继承主题的颜色"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr "当启用时，背景、文本与链接的主题颜色会一并送出，产生 HTML 格式的邮件。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+msgid "An Archive folder for On This Computer folders."
+msgstr "一个对应于“在此计算机中”文件夹的归档文件夹。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr "在“在此计算机中”文件夹里使用 信息|分类… 功能的归档文件夹。"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
msgid "(Deprecated) Default forward style"
msgstr "(已弃用) 默认转发方式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"\"forward-style-name\" instead."
msgstr "该键已在 3.10 版本中弃用，不应再使用。请转用 \"forward-style-name\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
msgid "(Deprecated) Default reply style"
msgstr "(已弃用) 默认回复样式"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"\"reply-style-name\" instead."
msgstr "该键已在 3.10 版本中弃用，不应再使用。请转用 \"reply-style-name\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
msgid "(Deprecated) List of custom headers and whether they are enabled."
msgstr "(已弃用)自定义信头及是否启用。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"\"show-headers\" instead."
msgstr "该键已在 3.10 版本中弃用，不应再使用。请转用 \"show-headers\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
msgid "(Deprecated) Load images for HTML messages over HTTP"
msgstr "(已弃用) 在 HTML 信息中载入 HTTP 图像"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"\"image-loading-policy\" instead."
msgstr ""
"该键已在 3.10 版本中弃用，不应再使用。请转用 \"image-loading-policy\"。"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
msgid ""
"(Deprecated) Asks whether to close the message window when the user forwards "
"or replies to the message shown in the window"
msgstr "(已弃用) 在用户转发或回复显示在窗口中的信息时，询问是否关闭信息窗口"
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
msgid ""
"This key was deprecated in version 3.10 and should no longer be used. Use "
"\"browser-close-on-reply-policy\" instead."
@@ -9256,7 +10100,7 @@ msgstr "初始文件选择器文件夹"
msgid "Initial folder for GtkFileChooser dialogs."
msgstr "GtkFileChooser 对话框的起始文件夹。"
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
msgid "Start in offline mode"
msgstr "以离线模式启动"
@@ -9346,15 +10190,41 @@ msgstr "只使用本地垃圾信息测试。"
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾信息测试(无 DNS)。"
-#: ../em-format/e-mail-formatter-attachment.c:407
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr "运行 SpamAssassin 命令的完整路径"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+"运行 SpamAssassin 命令的完整路径。如果未设置，使用编译时路径，通常是 /usr/"
+"bin/spamassassin 。命令不该包含任何其他参数。"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr "运行 sa-learn 命令的完整路径"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+"运行 sa-learn 命令的完整路径。如果未设置，使用编译时路径，通常是 /usr/bin/sa-"
+"learn 。命令不该包含任何其他参数。"
+
+#: ../em-format/e-mail-formatter-attachment.c:424
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
#: ../mail/message-list.etspec.h:4
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "附件"
-#: ../em-format/e-mail-formatter-attachment.c:408
+#: ../em-format/e-mail-formatter-attachment.c:425
msgid "Display as attachment"
msgstr "以附件显示"
@@ -9367,8 +10237,8 @@ msgid "Play the attachment in embedded audio player"
msgstr "在嵌入式音乐播放器中播放附件"
#: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
msgid "From"
msgstr "发件人"
@@ -9376,7 +10246,7 @@ msgstr "发件人"
msgid "(no subject)"
msgstr "(无主题)"
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
#, c-format
msgid "This message was sent by %s on behalf of %s"
msgstr "此信息由 %s 代表 %s 的身份发送"
@@ -9400,81 +10270,58 @@ 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:1322
-#: ../modules/cal-config-google/e-google-chooser.c:236
#: ../modules/plugin-manager/evolution-plugin-manager.c:66
msgid "Name"
msgstr "姓名"
#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
msgid "Size"
msgstr "大小"
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "已经 GPG 签名"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "已经 GPG 加密"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "已经 S/MIME 签名"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "已经 S/MIME 加密"
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../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:278
-#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-quote-headers.c:180
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
+#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
+#: ../modules/mail/em-mailer-prefs.c:67 ../smime/gui/certificate-manager.c:1632
msgid "Subject"
msgstr "主题"
#. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/e-mail-formatter-quote-headers.c:199
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1484
msgid "Mailer"
msgstr "邮件程序"
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
-#: ../em-format/e-mail-formatter-text-enriched.c:96
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
+#: ../em-format/e-mail-formatter-text-enriched.c:102
msgid "Richtext"
msgstr "富文本"
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:93
-#: ../em-format/e-mail-formatter-text-enriched.c:97
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
+#: ../em-format/e-mail-formatter-text-enriched.c:103
msgid "Display part as enriched text"
msgstr "以富文本显示部分"
-#: ../em-format/e-mail-formatter-quote-text-html.c:93
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:385
msgid "HTML"
msgstr "HTML"
-#: ../em-format/e-mail-formatter-quote-text-html.c:94
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:386
msgid "Format part as HTML"
msgstr "将部分格式化为 HTML"
-#: ../em-format/e-mail-formatter-quote-text-plain.c:117
-#: ../em-format/e-mail-formatter-text-plain.c:195
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1526
msgid "Plain Text"
msgstr "纯文字"
-#: ../em-format/e-mail-formatter-quote-text-plain.c:118
-#: ../em-format/e-mail-formatter-text-plain.c:196
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:199
msgid "Format part as plain text"
msgstr "将部分格式化为纯文字"
@@ -9575,7 +10422,7 @@ msgstr ""
"量时间进行暴力破解，这十分困难。"
#: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
msgid "_View Certificate"
msgstr "查看证书(_V)"
@@ -9583,26 +10430,49 @@ msgstr "查看证书(_V)"
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../em-format/e-mail-formatter-source.c:118
+#: ../em-format/e-mail-formatter-source.c:120
msgid "Source"
msgstr "来源"
-#: ../em-format/e-mail-formatter-source.c:119
+#: ../em-format/e-mail-formatter-source.c:121
msgid "Display source of a MIME part"
msgstr "显示 MIME 部分的源内容"
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
msgid "Cc"
msgstr "抄送"
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
msgid "Bcc"
msgstr "密件抄送"
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "已经 GPG 签名"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+msgid "GPG encrypted"
+msgstr "已经 GPG 加密"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr "已经 S/MIME 签名"
+
+#: ../em-format/e-mail-formatter-utils.c:582
+msgid "S/MIME encrypted"
+msgstr "已经 S/MIME 加密"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:748
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "安全"
+
#: ../em-format/e-mail-parser-application-mbox.c:87
#, c-format
msgid "Error parsing MBOX part: %s"
@@ -9613,12 +10483,12 @@ msgstr "解析 MBOX 部分出错：%s"
msgid "Could not parse S/MIME message: %s"
msgstr "无法解析 S/MIME 信息：%s"
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
#, c-format
msgid "Could not parse PGP message: %s"
msgstr "无法解析 PGP 信息：%s"
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
#: ../em-format/e-mail-parser-multipart-signed.c:135
#, c-format
msgid "Error verifying signature: %s"
@@ -9671,351 +10541,42 @@ msgstr "无法解析 PGP/MIME 信息：%s"
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
msgid "Reply-To"
msgstr "回复至"
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
+#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:68
msgid "Date"
msgstr "日期"
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
msgid "Newsgroups"
msgstr "新闻组"
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
#: ../plugins/face/org-gnome-face.eplug.xml.h:1
msgid "Face"
msgstr "头像"
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "标准"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "优先级"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "机密"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "绝密"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "独家"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "无"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "已读回执"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "请求回复(_E)"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "少于(_T)"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "天"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "方便时(_W)"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "回复"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "推迟信息投递(_D)"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "经过(_A)"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "天"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "设置过期时间(_S)"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "直到(_U)"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "发送选项"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "优先级(_P)："
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "分类(_C)："
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "常规选项(_R)"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "创建一个已发送项以跟踪信息(_E)"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "已投递(_D)"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "已发送和已打开(_V)"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "全部信息(_A)"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "自动删除已发项目(_U)"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "状态跟踪"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "打开时(_W)："
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "拒绝时(_N)："
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "完成时(_M)："
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "接受时(_P)："
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "返回通知"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "状态跟踪(_T)"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-msgid "_Apply"
-msgstr "应用(_A)"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "排序(_S)..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "分组依据(_G)..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "显示的域(_F)..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "全部清除(_A)"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "在视图中显示域(_S)"
-
-#: ../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:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "降序"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "分组依据"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "在视图中显示域(_F)"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "然后按"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "在视图中显示域(_N)"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "在视图中显示域(_V)"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "排序"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "全部清除"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "排序依据"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "选择一个时区"
-
-#: ../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"
-"Use the right mouse button to zoom out."
-msgstr ""
-"用鼠标左键放大地图的某个区域并选择时区。\n"
-"用鼠标右键缩小。"
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "时区"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "选择(_S)"
-
-#: ../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:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "接收"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "当前时间"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "您指定的时间"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "秒"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "周"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "月"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "年"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "过去"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "未来"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "显示邮件过滤器："
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "过滤规则(_F)"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "比较对象"
-
-#: ../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: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:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "创建新视图(_C)"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "名称(_N)："
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%Y年%-m月%-d日"
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "替换现有视图(_R)"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "日历：从 %s 到 %s"
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "取消"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "Evolution 日历项目"
#. Translators: This is a cancelled activity.
#: ../e-util/e-activity.c:258
@@ -10047,24 +10608,95 @@ msgstr "%s (正在取消)"
msgid "%s"
msgstr "%s"
+#. Translators: This is a running activity whose percent complete is known.
#: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
+msgid "Cancel"
+msgstr "取消"
+
#. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
msgid "Close this message (Escape)"
msgstr "关闭该信息 (Escape 键)"
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-alert-sink.c:246
+msgid "Failed to create a thread: "
+msgstr "创建线索失败："
+
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
msgid "Icon View"
msgstr "图标视图"
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
msgid "List View"
msgstr "列表视图"
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1223
+msgid "Attached message"
+msgstr "附加的信息"
+
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+msgid "Operation was cancelled"
+msgstr "操作已取消"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
+#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:696
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+msgid "A load operation is already in progress"
+msgstr "一个已经加载的操作正在进行"
+
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+msgid "A save operation is already in progress"
+msgstr "个已经保存的操作正在进行"
+
+#: ../e-util/e-attachment.c:2521
+#, c-format
+msgid "Could not load '%s'"
+msgstr "不能加载“%s”"
+
+#: ../e-util/e-attachment.c:2524
+#, c-format
+msgid "Could not load the attachment"
+msgstr "不能加载附件"
+
+#: ../e-util/e-attachment.c:2809
+#, c-format
+msgid "Could not open '%s'"
+msgstr "不能打开“%s”"
+
+#: ../e-util/e-attachment.c:2812
+#, c-format
+msgid "Could not open the attachment"
+msgstr "不能打开附件"
+
+#: ../e-util/e-attachment.c:3459
+msgid "Attachment contents not loaded"
+msgstr "附件内容未载入"
+
+#: ../e-util/e-attachment.c:3550
+#, c-format
+msgid "Could not save '%s'"
+msgstr "不能保存“%s”"
+
+#: ../e-util/e-attachment.c:3553
+#, c-format
+msgid "Could not save the attachment"
+msgstr "无法保存附件"
+
#: ../e-util/e-attachment-dialog.c:317
msgid "Attachment Properties"
msgstr "附件属性"
@@ -10077,163 +10709,139 @@ msgstr "文件名(_I)："
msgid "MIME Type:"
msgstr "MIME 类型："
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
msgid "_Suggest automatic display of attachment"
msgstr "建议自动显示附件(_S)"
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
msgid "Could not set as background"
msgstr "不能设置为背景"
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: ../e-util/e-attachment-icon-view.c:165
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../e-util/e-attachment-icon-view.c:168
+#: ../e-util/e-attachment-tree-view.c:554
msgid "Loading"
msgstr "载入"
-#: ../e-util/e-attachment-icon-view.c:177
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../e-util/e-attachment-icon-view.c:180
+#: ../e-util/e-attachment-tree-view.c:566
msgid "Saving"
msgstr "保存"
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:491
msgid "Add Attachment"
msgstr "添加附件"
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
msgid "A_ttach"
msgstr "附件(_T)"
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:538
+msgid "Archive selected directories using this format:"
+msgstr "归档选定文件夹格式："
+
+#: ../e-util/e-attachment-store.c:631
msgid "Save Attachment"
msgid_plural "Save Attachments"
msgstr[0] "保存附件"
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:658
+msgid "Do _not extract files from the attachment"
+msgstr "不要从附件里提取文件(_N)"
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files _only"
+msgstr "只保存提取文件(_O)"
+
+#: ../e-util/e-attachment-store.c:668
+msgid "Save extracted files and the original _archive"
+msgstr "保存提取文件和原始存档(_A)"
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:428
msgid "Open With Other Application..."
msgstr "用其他应用程序打开..."
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:442
msgid "Sa_ve As"
msgstr "另存为(_V)"
-#: ../e-util/e-attachment-view.c:400
+#: ../e-util/e-attachment-view.c:451
#: ../plugins/save-calendar/save-calendar.c:349
#: ../plugins/save-calendar/save-calendar.c:380
#: ../plugins/save-calendar/save-calendar.c:411
msgid "Save _As"
msgstr "另存为(_A)"
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:461
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
+#: ../e-util/e-attachment-view.c:468
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
msgid "_Properties"
msgstr "属性(_P)"
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:485
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
msgid "Hid_e All"
msgstr "全部隐藏(_E)"
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
msgid "_View Inline"
msgstr "嵌入查看(_V)"
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
msgid "Vie_w All Inline"
msgstr "嵌入查看(_W)"
-#: ../e-util/e-attachment-view.c:785
-#, c-format
-msgid "Open With \"%s\""
-msgstr "使用“%s”打开"
-
-#: ../e-util/e-attachment-view.c:788
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "在 %s 中打开附件"
-
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1108
-msgid "Attached message"
-msgstr "附加的信息"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "一个已经加载的操作正在进行"
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "个已经保存的操作正在进行"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "不能加载“%s”"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "不能加载附件"
+#: ../e-util/e-attachment-view.c:513
+msgid "_Zoom to 100%"
+msgstr "缩放到 100% (_Z)"
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "不能打开“%s”"
+#: ../e-util/e-attachment-view.c:515
+msgid "Zoom the image to its natural size"
+msgstr "缩放图像到原始尺寸"
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "不能打开附件"
+#: ../e-util/e-attachment-view.c:520
+msgid "_Zoom to window"
+msgstr "缩放到窗口(_Z)"
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "附件内容未载入"
+#: ../e-util/e-attachment-view.c:522
+msgid "Zoom large images to not be wider than the window width"
+msgstr "缩小较大图像以免宽于窗口宽度"
-#: ../e-util/e-attachment.c:3124
+#: ../e-util/e-attachment-view.c:880
#, c-format
-msgid "Could not save '%s'"
-msgstr "不能保存“%s”"
+msgid "Open With \"%s\""
+msgstr "使用“%s”打开"
-#: ../e-util/e-attachment.c:3127
+#: ../e-util/e-attachment-view.c:883
#, c-format
-msgid "Could not save the attachment"
-msgstr "无法保存附件"
+msgid "Open this attachment in %s"
+msgstr "在 %s 中打开附件"
#: ../e-util/e-book-source-config.c:97
msgid "Mark as default address book"
@@ -10248,75 +10856,75 @@ msgid "Copy book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行离线操作"
#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:407
+#: ../e-util/e-buffer-tagger.c:412
msgid "Ctrl-click to open a link"
msgstr "Ctrl 加单击来打开一个链接"
-#: ../e-util/e-cal-source-config.c:169
-msgid "Mark as default calendar"
-msgstr "标为默认日历"
-
-#: ../e-util/e-cal-source-config.c:172
-msgid "Mark as default task list"
-msgstr "标为默认任务列表"
-
-#: ../e-util/e-cal-source-config.c:175
-msgid "Mark as default memo list"
-msgstr "标为默认备忘列表"
+#: ../e-util/e-calendar.c:207
+msgid "Previous month"
+msgstr "上个月"
-#: ../e-util/e-cal-source-config.c:200
-msgid "Color:"
-msgstr "颜色："
+#: ../e-util/e-calendar.c:232
+msgid "Next month"
+msgstr "下个月"
-#: ../e-util/e-cal-source-config.c:405
-msgid "Copy calendar contents locally for offline operation"
-msgstr "将日历内容复制到本地以进行离线操作"
+#: ../e-util/e-calendar.c:258
+msgid "Previous year"
+msgstr "上一年"
-#: ../e-util/e-cal-source-config.c:409
-msgid "Copy task list contents locally for offline operation"
-msgstr "将任务列表内容复制到本地以进行离线操作"
+#: ../e-util/e-calendar.c:283
+msgid "Next year"
+msgstr "下一年"
-#: ../e-util/e-cal-source-config.c:413
-msgid "Copy memo list contents locally for offline operation"
-msgstr "将备忘列表内容复制到本地以进行离线操作"
+#: ../e-util/e-calendar.c:307
+msgid "Month Calendar"
+msgstr "月历"
#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
+#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
msgctxt "CalItem"
msgid "%B"
msgstr "%B"
#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
+#: ../e-util/e-calendar-item.c:1339
msgctxt "CalItem"
msgid "%Y"
msgstr "%Y"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
+#: ../e-util/e-calendar-item.c:1376
msgctxt "CalItem"
msgid "%B %Y"
msgstr "%Y %B"
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "上个月"
+#: ../e-util/e-cal-source-config.c:169
+msgid "Mark as default calendar"
+msgstr "标为默认日历"
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "下个月"
+#: ../e-util/e-cal-source-config.c:172
+msgid "Mark as default task list"
+msgstr "标为默认任务列表"
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "上一年"
+#: ../e-util/e-cal-source-config.c:175
+msgid "Mark as default memo list"
+msgstr "标为默认备忘录列表"
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "下一年"
+#: ../e-util/e-cal-source-config.c:200
+msgid "Color:"
+msgstr "颜色："
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "月历"
+#: ../e-util/e-cal-source-config.c:428
+msgid "Copy calendar contents locally for offline operation"
+msgstr "将日历内容复制到本地以进行离线操作"
+
+#: ../e-util/e-cal-source-config.c:432
+msgid "Copy task list contents locally for offline operation"
+msgstr "将任务列表内容复制到本地以进行离线操作"
+
+#: ../e-util/e-cal-source-config.c:436
+msgid "Copy memo list contents locally for offline operation"
+msgstr "将备忘录列表内容复制到本地以进行离线操作"
#: ../e-util/e-categories-editor.c:223
msgid "Currently _used categories:"
@@ -10326,17 +10934,26 @@ msgstr "当前使用的分类(_U)："
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:1100
+#: ../e-util/e-categories-editor.c:274
+msgctxt "category"
msgid "_New"
msgstr "新建(_N)"
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-editor.c:278
+msgctxt "category"
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../e-util/e-categories-editor.c:282
+msgctxt "category"
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: ../e-util/e-categories-selector.c:322
msgid "Icon"
msgstr "图标"
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
#, c-format
msgid "Create category \"%s\""
msgstr "创建分类 \"%s\""
@@ -10372,53 +10989,42 @@ msgstr "在配置中已经有分类 '%s' 。请尝试用另外的名字。"
msgid "popup list"
msgstr "弹出列表"
-#: ../e-util/e-cell-date-edit.c:298
+#: ../e-util/e-cell-date.c:51 ../e-util/e-cell-date.c:139
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2034
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-date-edit.c:303
msgid "Now"
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:223
+#: ../e-util/e-cell-date-edit.c:311 ../e-util/e-datetime-format.c:208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/itip-formatter/itip-view.c:221
msgid "Today"
msgstr "今天"
#. Translators: "None" as a label of a button to unset date in a
#. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../e-util/e-cell-date-edit.c:321
msgctxt "table-date"
msgid "None"
msgstr "无"
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
msgid "OK"
msgstr "确定"
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:878
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必须采用格式：%s"
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1839
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间，含 0 和 100"
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "字符编码"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "输入要使用的字符集"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "其它..."
-
#: ../e-util/e-charset.c:52
msgid "Arabic"
msgstr "阿拉伯语"
@@ -10496,63 +11102,245 @@ msgstr "乌克兰语"
msgid "Visual"
msgstr "可视"
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "字符编码"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "输入要使用的字符集"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "其它..."
+
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
#, c-format
msgid "Cannot create a client object from extension name '%s'"
msgstr "无法从名为 '%s' 的扩展创建客户端对象"
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-color-chooser-widget.c:124
+msgid "Choose custom color"
+msgstr "选择自定义颜色"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "黑色"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "浅棕"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "金棕"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "深绿 #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "海军蓝"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "深蓝"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "紫色 #2"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "非常深的灰"
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "深红"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "橙红"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "金色"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "深绿"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "淡蓝"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "蓝色"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "淡紫"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "深灰"
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "红色"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "橙色"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "灰色"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "淡绿"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "淡蓝 #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "天蓝 #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "紫色"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "灰色"
+
+#: ../e-util/e-color-combo.c:108
+msgid "magenta"
+msgstr "品红"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "亮橙"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "黄"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "绿"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "青色"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "亮蓝"
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr "紫红"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "浅灰"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "粉色"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "浅橙"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "浅黄"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "浅绿"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "浅青"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "浅蓝"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "浅紫"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr "白色"
+
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:426
+#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3899
+#: ../mail/mail-config.ui.h:72
+msgid "Default"
+msgstr "默认"
+
+#: ../e-util/e-dateedit.c:526
msgid "Date and Time"
msgstr "日期和时间"
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
msgid "Drop-down combination box to select time"
msgstr "选择时间的组合框"
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
msgid "Time"
msgstr "时间"
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
msgid "No_w"
msgstr "现在(_W)"
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
msgid "_Today"
msgstr "今天(_T)"
#. Note that we don't show this here, since by default a 'None' date
#. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:719
msgid "_None"
msgstr "无(_N)"
#. Translators: "None" for date field of a date edit, shown when
#. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
msgctxt "date"
msgid "None"
msgstr "无"
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
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:251
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
msgid "Tomorrow"
msgstr "明天"
@@ -10616,15 +11404,120 @@ msgctxt "DateFmt"
msgid "Next Sun"
msgstr "下周日"
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
msgid "Use locale default"
msgstr "使用本地默认值"
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
msgid "Format:"
msgstr "格式："
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr "微笑(_S)"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr "悲伤(_A)"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+msgid "_Wink"
+msgstr "眨眼(_W)"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr "吐舌头(_G)"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr "笑脸(_H)"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+msgid "_Plain"
+msgstr "平白(_P)"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr "傻笑(_R)"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
+msgstr "尴尬(_E)"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr "大笑(_B)"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr "不确定(_T)"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr "惊讶(_U)"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr "担忧(_O)"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr "亲吻(_K)"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr "愤怒(_N)"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr "酷(_C)"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr "天使(_L)"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr "大哭(_Y)"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr "生病(_I)"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr "疲劳(_D)"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr "恶魔(_V)"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+msgid "_Monkey"
+msgstr "猴子(_M)"
+
#: ../e-util/e-file-utils.c:120
msgid "(Unknown Filename)"
msgstr "(未知文件名)"
@@ -10750,23 +11643,23 @@ msgstr "选择用于比较的时间"
msgid "Choose a File"
msgstr "选择文件"
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:761
msgid "R_ule name:"
msgstr "规则名(_U)："
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:811
msgid "all the following conditions"
msgstr "下列所有条件"
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:812
msgid "any of the following conditions"
msgstr "下列条件之一"
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:818
msgid "_Find items which match:"
msgstr "查找匹配的项目(_F)："
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:841
msgid "Find items that meet the following conditions"
msgstr "查找符合下列条件的项目"
@@ -10774,48 +11667,1034 @@ msgstr "查找符合下列条件的项目"
#. * part of "Include threads: None"
#. protocol:
#. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:856 ../e-util/e-html-editor-page-dialog.c:63
+#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-signature-combo-box.c:367
#: ../libemail-engine/camel-null-store.c:27
#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
msgid "None"
msgstr "无"
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:857
msgid "All related"
msgstr "相关的全部"
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "回复"
+
+#: ../e-util/e-filter-rule.c:859
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:860
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:863
msgid "I_nclude threads:"
msgstr "包含线索(_N)："
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:942
msgid "A_dd Condition"
msgstr "添加动作(_D)"
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1256 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:165
+msgid "Incoming"
+msgstr "接收"
+
+#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
msgid "Outgoing"
msgstr "寄出"
+#: ../e-util/e-html-editor-actions.c:58
+msgid "Failed to insert HTML file."
+msgstr "插入 HTML 文件失败。"
+
+#: ../e-util/e-html-editor-actions.c:95
+msgid "Failed to insert text file."
+msgstr "插入文本文件失败。"
+
+#: ../e-util/e-html-editor-actions.c:591
+msgid "Insert HTML File"
+msgstr "插入 HTML 文件"
+
+#: ../e-util/e-html-editor-actions.c:597
+msgid "HTML file"
+msgstr "HTML 文件"
+
+#: ../e-util/e-html-editor-actions.c:624
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "插入图像"
+
+#: ../e-util/e-html-editor-actions.c:686
+msgid "Insert text file"
+msgstr "插入文本文件"
+
+#: ../e-util/e-html-editor-actions.c:692
+msgid "Text file"
+msgstr "文本文件"
+
+#: ../e-util/e-html-editor-actions.c:1078
+msgid "Copy selected text to the clipboard"
+msgstr "将选中文本复制到剪贴板"
+
+#: ../e-util/e-html-editor-actions.c:1085
+msgid "Cut selected text to the clipboard"
+msgstr "将选中文本剪切到剪贴板"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:1092
+msgid "Paste text from the clipboard"
+msgstr "从剪贴板中粘贴文本"
+
+#: ../e-util/e-html-editor-actions.c:1099
+msgid "Redo the last undone action"
+msgstr "重做上次操作"
+
+#: ../e-util/e-html-editor-actions.c:1113
+msgid "Undo the last action"
+msgstr "撤消上次操作"
+
+#: ../e-util/e-html-editor-actions.c:1134
+msgid "For_mat"
+msgstr "格式(_M)"
+
+#: ../e-util/e-html-editor-actions.c:1141
+msgid "_Paragraph Style"
+msgstr "段落样式(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1155
+#: ../e-util/e-html-editor-image-dialog.c:635
+msgid "_Alignment"
+msgstr "对齐(_A)"
+
+#: ../e-util/e-html-editor-actions.c:1162
+msgid "Current _Languages"
+msgstr "当前语言(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1179
+msgid "_Increase Indent"
+msgstr "增加缩进(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1181
+msgid "Increase Indent"
+msgstr "增加缩进"
+
+#: ../e-util/e-html-editor-actions.c:1186
+msgid "_HTML File..."
+msgstr "HTML 文件(_H)..."
+
+#: ../e-util/e-html-editor-actions.c:1193
+msgid "Te_xt File..."
+msgstr "文本文件(_X)..."
+
+#: ../e-util/e-html-editor-actions.c:1200
+msgid "Paste _Quotation"
+msgstr "粘贴引用(_Q)"
+
+#: ../e-util/e-html-editor-actions.c:1207
+msgid "_Find..."
+msgstr "查找(_F)..."
+
+#: ../e-util/e-html-editor-actions.c:1209
+msgid "Search for text"
+msgstr "搜索文本"
+
+#: ../e-util/e-html-editor-actions.c:1214
+msgid "Find A_gain"
+msgstr "再查找一遍(_G)"
+
+#: ../e-util/e-html-editor-actions.c:1221
+msgid "Re_place..."
+msgstr "替换(_R)..."
+
+#: ../e-util/e-html-editor-actions.c:1223
+msgid "Search for and replace text"
+msgstr "搜索和替换文本"
+
+#: ../e-util/e-html-editor-actions.c:1228
+msgid "Check _Spelling..."
+msgstr "检查拼写(_S)..."
+
+#: ../e-util/e-html-editor-actions.c:1235
+msgid "_Decrease Indent"
+msgstr "减小缩进(_D)"
+
+#: ../e-util/e-html-editor-actions.c:1237
+msgid "Decrease Indent"
+msgstr "减小缩进"
+
+#: ../e-util/e-html-editor-actions.c:1242
+msgid "_Wrap Lines"
+msgstr "自动换行(_W)"
+
+#: ../e-util/e-html-editor-actions.c:1249
+msgid "Open Inspector"
+msgstr "打开检查器"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "中间(_C)"
+
+#: ../e-util/e-html-editor-actions.c:1261
+msgid "Center Alignment"
+msgstr "中间对齐"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "左(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1268
+msgid "Left Alignment"
+msgstr "左对齐"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "右(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1275
+msgid "Right Alignment"
+msgstr "右对齐"
+
+#: ../e-util/e-html-editor-actions.c:1283
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1285
+msgid "HTML editing mode"
+msgstr "编辑 HTML 模式"
+
+#: ../e-util/e-html-editor-actions.c:1290
+msgid "Plain _Text"
+msgstr "纯文字(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1292
+msgid "Plain text editing mode"
+msgstr "纯文字编辑模式"
+
+#: ../e-util/e-html-editor-actions.c:1300
+msgid "_Normal"
+msgstr "中(_N)"
+
+#: ../e-util/e-html-editor-actions.c:1307
+msgid "Header _1"
+msgstr "标题 _1"
+
+#: ../e-util/e-html-editor-actions.c:1314
+msgid "Header _2"
+msgstr "标题 _2"
+
+#: ../e-util/e-html-editor-actions.c:1321
+msgid "Header _3"
+msgstr "标题 _3"
+
+#: ../e-util/e-html-editor-actions.c:1328
+msgid "Header _4"
+msgstr "标题 _4"
+
+#: ../e-util/e-html-editor-actions.c:1335
+msgid "Header _5"
+msgstr "标题 _5"
+
+#: ../e-util/e-html-editor-actions.c:1342
+msgid "Header _6"
+msgstr "标题 _6"
+
+#: ../e-util/e-html-editor-actions.c:1349
+msgid "_Preformatted"
+msgstr "预格式化(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1356
+msgid "A_ddress"
+msgstr "地址(_D)"
+
+#: ../e-util/e-html-editor-actions.c:1363
+msgid "_Blockquote"
+msgstr "块引用(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1370
+msgid "_Bulleted List"
+msgstr "项目符号列表(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1377
+msgid "_Roman Numeral List"
+msgstr "罗马数字列表(_R)"
+
+#: ../e-util/e-html-editor-actions.c:1384
+msgid "Numbered _List"
+msgstr "编号列表(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1391
+msgid "_Alphabetical List"
+msgstr "字母列表(_A)"
+
+#: ../e-util/e-html-editor-actions.c:1407
+#: ../e-util/e-html-editor-actions.c:1445
+msgid "_Image..."
+msgstr "图像(_I)..."
+
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1410
+msgid "Insert Image"
+msgstr "插入图像"
+
+#: ../e-util/e-html-editor-actions.c:1415
+#: ../e-util/e-html-editor-actions.c:1452
+msgid "_Link..."
+msgstr "链接(_L)…"
+
+#: ../e-util/e-html-editor-actions.c:1417
+msgid "Insert Link"
+msgstr "插入链接"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1423
+#: ../e-util/e-html-editor-actions.c:1467
+msgid "_Rule..."
+msgstr "横线(_R)..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1426
+msgid "Insert Rule"
+msgstr "插入横线"
+
+#: ../e-util/e-html-editor-actions.c:1431
+#: ../e-util/e-html-editor-actions.c:1474
+msgid "_Table..."
+msgstr "表格(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1433
+msgid "Insert Table"
+msgstr "插入表格"
+
+#: ../e-util/e-html-editor-actions.c:1438
+msgid "_Cell..."
+msgstr "单元格(_C)…"
+
+#: ../e-util/e-html-editor-actions.c:1459
+msgid "Pa_ge..."
+msgstr "页面(_G)..."
+
+#: ../e-util/e-html-editor-actions.c:1483
+msgid "Font _Size"
+msgstr "字体大小(_S)"
+
+#: ../e-util/e-html-editor-actions.c:1490
+msgid "_Font Style"
+msgstr "字体样式(_F)"
+
+#: ../e-util/e-html-editor-actions.c:1497
+msgid "Paste As _Text"
+msgstr "以文本粘贴(_T)"
+
+#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr "粗体(_B)"
+
+#: ../e-util/e-html-editor-actions.c:1510
+msgid "Bold"
+msgstr "粗体"
+
+#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "斜体(_I)"
+
+#: ../e-util/e-html-editor-actions.c:1518
+msgid "Italic"
+msgstr "斜体"
+
+#: ../e-util/e-html-editor-actions.c:1524
+msgid "_Plain Text"
+msgstr "纯文字(_P)"
+
+#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr "删除线(_S)"
+
+#: ../e-util/e-html-editor-actions.c:1534
+msgid "Strikethrough"
+msgstr "删除线"
+
+#: ../e-util/e-html-editor-actions.c:1540
+#: ../e-util/e-html-editor-text-dialog.c:236
+msgid "_Underline"
+msgstr "下划线(_U)"
+
+#: ../e-util/e-html-editor-actions.c:1542
+msgid "Underline"
+msgstr "下划线"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1552
+msgid "-2"
+msgstr "-2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1560
+msgid "-1"
+msgstr "-1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1568
+msgid "+0"
+msgstr "+0"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1576
+msgid "+1"
+msgstr "+1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1584
+msgid "+2"
+msgstr "+2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1592
+msgid "+3"
+msgstr "+3"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1600
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1619
+msgid "Cell Contents"
+msgstr "单元格内容"
+
+#: ../e-util/e-html-editor-actions.c:1626
+msgid "Column"
+msgstr "列"
+
+#: ../e-util/e-html-editor-actions.c:1633
+msgid "Row"
+msgstr "行"
+
+#: ../e-util/e-html-editor-actions.c:1640
+#: ../e-util/e-html-editor-actions.c:1725
+msgid "Table"
+msgstr "表格"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1650
+msgid "Table Delete"
+msgstr "表格删除"
+
+#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
+msgid "Input Methods"
+msgstr "输入法"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1665
+msgid "Table Insert"
+msgstr "表格插入"
+
+#: ../e-util/e-html-editor-actions.c:1672
+msgid "Properties"
+msgstr "属性"
+
+#: ../e-util/e-html-editor-actions.c:1690
+msgid "Column After"
+msgstr "列后"
+
+#: ../e-util/e-html-editor-actions.c:1697
+msgid "Column Before"
+msgstr "列前"
+
+#: ../e-util/e-html-editor-actions.c:1704
+msgid "Insert _Link"
+msgstr "插入链接(_L)"
+
+#: ../e-util/e-html-editor-actions.c:1711
+msgid "Row Above"
+msgstr "行上"
+
+#: ../e-util/e-html-editor-actions.c:1718
+msgid "Row Below"
+msgstr "行下"
+
+#: ../e-util/e-html-editor-actions.c:1732
+msgid "Cell..."
+msgstr "单元格…"
+
+#: ../e-util/e-html-editor-actions.c:1739
+msgid "Image..."
+msgstr "图像…"
+
+#: ../e-util/e-html-editor-actions.c:1746
+msgid "Link..."
+msgstr "链接…"
+
+#: ../e-util/e-html-editor-actions.c:1753
+msgid "Page..."
+msgstr "页面…"
+
+#: ../e-util/e-html-editor-actions.c:1760
+msgid "Paragraph..."
+msgstr "段落…"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1768
+msgid "Rule..."
+msgstr "横线..."
+
+#: ../e-util/e-html-editor-actions.c:1775
+msgid "Table..."
+msgstr "表格…"
+
+#: ../e-util/e-html-editor-actions.c:1782
+msgid "Text..."
+msgstr "文字…"
+
+#: ../e-util/e-html-editor-actions.c:1789
+msgid "Remove Link"
+msgstr "删除链接"
+
+#: ../e-util/e-html-editor-actions.c:1806
+msgid "Add Word to Dictionary"
+msgstr "添加词语到字典"
+
+#: ../e-util/e-html-editor-actions.c:1813
+msgid "Ignore Misspelled Word"
+msgstr "忽略拼错词语"
+
+#: ../e-util/e-html-editor-actions.c:1820
+msgid "Add Word To"
+msgstr "添加词语到"
+
+#: ../e-util/e-html-editor-actions.c:1829
+msgid "More Suggestions"
+msgstr "更多建议"
+
+#. Translators: %s will be replaced with the actual dictionary
+#. * name, where a user can add a word to. This is part of an
+#. * "Add Word To" submenu.
+#: ../e-util/e-html-editor-actions.c:1937
+#, c-format
+msgid "%s Dictionary"
+msgstr "%s 字典"
+
+#: ../e-util/e-html-editor-actions.c:2024
+msgid "_Emoticon"
+msgstr "表情(_E)"
+
+#: ../e-util/e-html-editor-actions.c:2025
+msgid "Insert Emoticon"
+msgstr "插入表情"
+
+#: ../e-util/e-html-editor-actions.c:2093
+msgid "Re_place"
+msgstr "替换(_P)"
+
+#: ../e-util/e-html-editor-actions.c:2096
+msgid "_Image"
+msgstr "图像(_I)"
+
+#: ../e-util/e-html-editor-actions.c:2099
+msgid "_Link"
+msgstr "链接(_L)"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:2103
+msgid "_Rule"
+msgstr "横线(_R)"
+
+#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-cell-dialog.c:738
+msgid "_Table"
+msgstr "表格(_T)"
+
+#: ../e-util/e-html-editor.c:704
+msgid "Paragraph Style"
+msgstr "段落样式"
+
+#: ../e-util/e-html-editor.c:718
+msgid "Editing Mode"
+msgstr "编辑模式"
+
+#: ../e-util/e-html-editor.c:730
+msgid "Font Color"
+msgstr "字体颜色"
+
+#: ../e-util/e-html-editor.c:748
+msgid "Font Size"
+msgstr "字体大小"
+
+#: ../e-util/e-html-editor-cell-dialog.c:698
+msgid "<b>Scope</b>"
+msgstr "<b>范围</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:712
+msgid "C_ell"
+msgstr "单元格(_E)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:725
+msgid "_Row"
+msgstr "行(_R)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:751
+msgid "Col_umn"
+msgstr "列(_U)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:761
+msgid "<b>Alignment & Behavior</b>"
+msgstr "<b>对齐 & 行为</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:774
+#: ../e-util/e-html-editor-hrule-dialog.c:413
+#: ../e-util/e-html-editor-table-dialog.c:900
+msgid "Left"
+msgstr "左对齐"
+
+#: ../e-util/e-html-editor-cell-dialog.c:775
+#: ../e-util/e-html-editor-hrule-dialog.c:415
+#: ../e-util/e-html-editor-table-dialog.c:901
+msgid "Center"
+msgstr "居中"
+
+#: ../e-util/e-html-editor-cell-dialog.c:776
+#: ../e-util/e-html-editor-hrule-dialog.c:417
+#: ../e-util/e-html-editor-table-dialog.c:902
+msgid "Right"
+msgstr "高度右对齐"
+
+#: ../e-util/e-html-editor-cell-dialog.c:784
+msgid "_Horizontal:"
+msgstr "水平(_H)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:792
+#: ../e-util/e-html-editor-image-dialog.c:625
+msgid "Top"
+msgstr "顶部"
+
+#: ../e-util/e-html-editor-cell-dialog.c:793
+#: ../e-util/e-html-editor-image-dialog.c:626
+msgid "Middle"
+msgstr "中间"
+
+#: ../e-util/e-html-editor-cell-dialog.c:794
+#: ../e-util/e-html-editor-image-dialog.c:627
+msgid "Bottom"
+msgstr "底部"
+
+#: ../e-util/e-html-editor-cell-dialog.c:802
+msgid "_Vertical:"
+msgstr "垂直(_V)"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:808
+msgid "_Wrap Text"
+msgstr "自动换行(_W)"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:816
+msgid "_Header Style"
+msgstr "表头样式(_H)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:830
+#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-table-dialog.c:812
+msgid "<b>Layout</b>"
+msgstr "<b>版面</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:841
+msgid "_Width"
+msgstr "宽度(_W)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:880
+msgid "Row S_pan:"
+msgstr "行间距(_P)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:894
+msgid "Co_lumn Span:"
+msgstr "列宽(_L)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:901
+#: ../e-util/e-html-editor-table-dialog.c:916
+msgid "<b>Background</b>"
+msgstr "<b>背景</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:914
+#: ../e-util/e-html-editor-table-dialog.c:929
+msgid "Transparent"
+msgstr "透明"
+
+#: ../e-util/e-html-editor-cell-dialog.c:922
+msgid "C_olor:"
+msgstr "颜色(_O)："
+
+#: ../e-util/e-html-editor-cell-dialog.c:930
+#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-table-dialog.c:945
+msgid "Choose Background Image"
+msgstr "选择背景图像"
+
+#: ../e-util/e-html-editor-cell-dialog.c:935
+#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-table-dialog.c:950
+msgid "Images"
+msgstr "图像"
+
+#: ../e-util/e-html-editor-cell-dialog.c:948
+msgid "_Image:"
+msgstr "图像(_I)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:955
+#: ../e-util/e-html-editor-page-dialog.c:660
+#: ../e-util/e-html-editor-table-dialog.c:970
+msgid "_Remove image"
+msgstr "删除图像(_R)"
+
+#: ../e-util/e-html-editor-cell-dialog.c:975
+msgid "Cell Properties"
+msgstr "单元格属性"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr "未找到匹配项"
+
+#: ../e-util/e-html-editor-find-dialog.c:160
+#: ../e-util/e-html-editor-replace-dialog.c:247
+msgid "Search _backwards"
+msgstr "向后搜索(_B)"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr "区分大小写(_S)"
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+msgid "_Wrap Search"
+msgstr "循环搜索(_W)"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+msgid "Find"
+msgstr "查找"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:348
+msgid "<b>Size</b>"
+msgstr "<b>大小</b>"
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:368
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:823
+msgid "_Width:"
+msgstr "宽度(_W)"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:393
+msgid "_Size:"
+msgstr "大小(_S)"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:400
+msgid "<b>Style</b>"
+msgstr "<b>样式</b>"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-table-dialog.c:909
+msgid "_Alignment:"
+msgstr "对齐(_A)："
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:431
+msgid "S_haded"
+msgstr "阴影(_H)"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:448
+msgid "Rule properties"
+msgstr "横线属性"
+
+#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:766
+msgid "<b>General</b>"
+msgstr "<b>常规</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:544
+msgid "_Source:"
+msgstr "来源(_S)："
+
+#: ../e-util/e-html-editor-image-dialog.c:607
+msgid "_Height:"
+msgstr "高度(_H)："
+
+#: ../e-util/e-html-editor-image-dialog.c:648
+msgid "_X-Padding:"
+msgstr "X-边距(_X)："
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+msgid "_Y-Padding:"
+msgstr "Y-边距(_Y)："
+
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:890
+msgid "_Border:"
+msgstr "边框(_B)："
+
+#: ../e-util/e-html-editor-image-dialog.c:690
+msgid "<b>Link</b>"
+msgstr "<b>链接</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:400
+msgid "_URL:"
+msgstr "_URL："
+
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:405
+msgid "_Test URL..."
+msgstr "测试 URL(_T):"
+
+#: ../e-util/e-html-editor-image-dialog.c:730
+msgid "Image Properties"
+msgstr "图像属性"
+
+#: ../e-util/e-html-editor-link-dialog.c:429
+msgid "_Remove Link"
+msgstr "删除链接(_R)"
+
+#: ../e-util/e-html-editor-link-dialog.c:454
+msgid "Link Properties"
+msgstr "链接属性"
+
+#: ../e-util/e-html-editor-page-dialog.c:72
+msgid "Perforated Paper"
+msgstr "穿孔纸"
+
+#: ../e-util/e-html-editor-page-dialog.c:81
+msgid "Blue Ink"
+msgstr "蓝墨水"
+
+#: ../e-util/e-html-editor-page-dialog.c:90
+msgid "Paper"
+msgstr "纸张"
+
+#: ../e-util/e-html-editor-page-dialog.c:99
+msgid "Ribbon"
+msgstr "功能区"
+
+#: ../e-util/e-html-editor-page-dialog.c:108
+msgid "Midnight"
+msgstr "午夜"
+
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+msgid "Draft"
+msgstr "草稿"
+
+#: ../e-util/e-html-editor-page-dialog.c:135
+msgid "Graph Paper"
+msgstr "方格纸"
+
+#: ../e-util/e-html-editor-page-dialog.c:544
+msgid "<b>Colors</b>"
+msgstr "<b>颜色</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:563
+msgid "_Text:"
+msgstr "文字(_T)："
+
+#: ../e-util/e-html-editor-page-dialog.c:578
+msgid "_Link:"
+msgstr "链接(_L)："
+
+#: ../e-util/e-html-editor-page-dialog.c:593
+msgid "_Visited Link:"
+msgstr "已浏览链接(_V)："
+
+#: ../e-util/e-html-editor-page-dialog.c:608
+msgid "_Background:"
+msgstr "背景(_B)："
+
+#: ../e-util/e-html-editor-page-dialog.c:616
+msgid "<b>Background Image</b>"
+msgstr "<b>背景图像</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
+msgid "_Template:"
+msgstr "模板(_T)："
+
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "选择一个文件"
+
+#: ../e-util/e-html-editor-page-dialog.c:653
+msgid "_Custom:"
+msgstr "自定义(_C)："
+
+#: ../e-util/e-html-editor-page-dialog.c:680
+msgid "Page Properties"
+msgstr "页面属性"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+msgid "_Style:"
+msgstr "样式(_S)："
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+msgid "<b>Alignment</b>"
+msgstr "<b>对齐</b>"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+msgid "Paragraph Properties"
+msgstr "段落属性"
+
+#: ../e-util/e-html-editor-replace-dialog.c:163
+#, c-format
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
+msgstr[0] "已替换 %d 次出现处"
+
+#: ../e-util/e-html-editor-replace-dialog.c:227
+msgid "R_eplace:"
+msgstr "替换(_R)："
+
+#: ../e-util/e-html-editor-replace-dialog.c:239
+msgid "_With:"
+msgstr "替换为(_W)："
+
+#: ../e-util/e-html-editor-replace-dialog.c:251
+msgid "_Case sensitive"
+msgstr "区分大小写(_C)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+msgid "Wra_p search"
+msgstr "循环搜索(_P)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:265
+msgid "_Skip"
+msgstr "跳过(_S)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "替换(_R)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:281
+msgid "Replace _All"
+msgstr "替换全部(_A)"
+
+#: ../e-util/e-html-editor-replace-dialog.c:301
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "替换"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>“%s”建议</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:520
+msgid "<b>Suggestions</b>"
+msgstr "<b>建议</b>"
+
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:555
+msgid "Replace"
+msgstr "替换"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:564
+msgid "Replace All"
+msgstr "替换全部"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:573
+#: ../mail/mail.error.xml.h:112
+msgid "Ignore"
+msgstr "忽略"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
+msgid "Skip"
+msgstr "跳过"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
+msgid "Back"
+msgstr "后退"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:600
+msgid "<b>Dictionary</b>"
+msgstr "<b>字典</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:620
+msgid "Add word"
+msgstr "添加词语"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:38
+msgid "Spell Checking"
+msgstr "拼写检查"
+
+#: ../e-util/e-html-editor-table-dialog.c:788
+msgid "_Rows:"
+msgstr "行(_R)："
+
+#: ../e-util/e-html-editor-table-dialog.c:805
+msgid "C_olumns:"
+msgstr "列(_O)："
+
+#: ../e-util/e-html-editor-table-dialog.c:856
+msgid "_Spacing:"
+msgstr "间距(_S)："
+
+#: ../e-util/e-html-editor-table-dialog.c:873
+msgid "_Padding:"
+msgstr "边距(_P)："
+
+#: ../e-util/e-html-editor-table-dialog.c:937
+#: ../e-util/e-html-editor-text-dialog.c:261
+msgid "_Color:"
+msgstr "颜色(_C)："
+
+#: ../e-util/e-html-editor-table-dialog.c:963
+msgid "Image:"
+msgstr "图像："
+
+#: ../e-util/e-html-editor-table-dialog.c:990
+msgid "Table Properties"
+msgstr "表格属性"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr "大小(_Z)："
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+msgid "Text Properties"
+msgstr "文本属性"
+
+#: ../e-util/e-html-editor-view.c:6298
+msgid "Changed property"
+msgstr "变更属性"
+
+#: ../e-util/e-html-editor-view.c:6299
+msgid "Whether editor changed"
+msgstr "编辑器是否已变更"
+
#: ../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:283
-msgid "Select a file"
-msgstr "选择一个文件"
-
#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
msgid "File _type:"
msgstr "文件类型(_T)："
@@ -10837,7 +12716,7 @@ msgid "Import a _single file"
msgstr "导入单个文件(_S)"
#: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息："
@@ -10851,7 +12730,7 @@ msgstr ""
"现可导入的设置。如果您想要再试一次，请单击“上一步”按钮。"
#: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
#, c-format
msgid "From %s:"
msgstr "从 %s："
@@ -10908,27 +12787,27 @@ msgstr "选择一个文件"
msgid "Click \"Apply\" to begin importing the file into Evolution."
msgstr "单击“应用”以便开始将文件导入到 Evolution。"
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
msgid "Close"
msgstr "关闭"
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
msgid "_Save and Close"
msgstr "保存并关闭(_S)"
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:529
msgid "Edit Signature"
msgstr "编辑签名"
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:562
msgid "_Signature Name:"
msgstr "签名(_S)："
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:598
msgid "Unnamed"
msgstr "未命名"
@@ -10936,15 +12815,15 @@ msgstr "未命名"
msgid "Add _Script"
msgstr "添加脚本(_S)"
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
msgid "Add Signature Script"
msgstr "添加签名脚本"
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
msgid "Edit Signature Script"
msgstr "编辑签名脚本"
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -10953,11 +12832,11 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
msgid "S_cript:"
msgstr "脚本(_C)："
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
msgid "Script file must be executable."
msgstr "脚本文件必须可执行。"
@@ -10973,14 +12852,39 @@ msgstr ""
"基于鼠标交互的地图部件，可用来选择时区。键盘用户可以从下方的组合框中选择时"
"区。"
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:251
msgid "Could not open the link."
msgstr "无法打开链接。"
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:334
msgid "Could not display help for Evolution."
msgstr "无法显示 Evolution 的帮助。"
+#: ../e-util/e-misc-utils.c:2387
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "打开日历“%s”"
+
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "打开备忘录列表“%s”"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "正在打开任务列表“%s”"
+
+#: ../e-util/e-misc-utils.c:2396
+#, c-format
+msgid "Opening address book '%s'"
+msgstr "正在打开地址簿“%s”"
+
+#: ../e-util/e-misc-utils.c:3138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "不再显示此信息(_D)"
+
#: ../e-util/e-name-selector-dialog.c:277
msgid "Show Contacts"
msgstr "显示联系人"
@@ -10999,10 +12903,10 @@ msgstr "搜索(_S)："
#: ../e-util/e-name-selector-dialog.c:366
#: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
msgid "Any Category"
msgstr "任何类别"
@@ -11014,14 +12918,13 @@ msgstr "联系人(_N)"
msgid "Search"
msgstr "搜索"
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
msgid "Address Book"
msgstr "地址簿"
#: ../e-util/e-name-selector-dialog.c:451
#: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
msgid "Contacts"
msgstr "联系人"
@@ -11030,67 +12933,67 @@ msgid "Select Contacts from Address Book"
msgstr "从地址簿选择联系人"
#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3186
#, c-format
msgid "E_xpand %s Inline"
msgstr "在行内展开 %s (_X)"
#. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3202
#, c-format
msgid "Cop_y %s"
msgstr "复制 %s (_Y）"
#. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3213
#, c-format
msgid "C_ut %s"
msgstr "剪切 %s (_U)"
#. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3231
#, c-format
msgid "_Edit %s"
msgstr "编辑 %s(_E)"
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
#, c-format
msgid "_Delete %s"
msgstr "删除 %s(_D)"
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
msgid "Evolution is currently online. Click this button to work offline."
msgstr "Evolution 目前在线。单击该按钮可离线工作。"
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
msgid "Evolution is currently offline. Click this button to work online."
msgstr "Evolution 目前离线。单击该按钮可在线工作。"
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
msgid "Evolution is currently offline because the network is unavailable."
msgstr "因为网络不可用，所以 Evolution 目前离线。"
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
msgid "Keyring key is unusable: no user or host name"
msgstr "密匙环键不可用：无用户或主机名"
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
msgid "You have the Caps Lock key on."
msgstr "您的大写锁定键打开着。"
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
msgid "_Remember this passphrase"
msgstr "记住该密码短语(_R)"
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
msgid "_Remember this passphrase for the remainder of this session"
msgstr "在该会话内记住该提醒器的密码短语(_R)"
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
msgid "_Remember this password"
msgstr "记住该密码(_R)"
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
msgid "_Remember this password for the remainder of this session"
msgstr "在该会话内记住该提醒器的密码(_R)"
@@ -11111,63 +13014,67 @@ msgid ""
"The printing system did not report any additional details about the error."
msgstr "打印系统未报告关于错误的任何额外细节。"
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
msgid "_Method:"
msgstr "方法(_M)："
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
msgid "Defer to Desktop Settings"
msgstr "随桌面设置"
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
msgid "_Open Desktop Settings"
msgstr "打开桌面设置(_O)"
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
msgid "Manual"
msgstr "手册"
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
msgid "_HTTP Proxy:"
msgstr "_HTTP 代理："
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
msgid "H_TTPS Proxy:"
msgstr "H_TTPS 代理："
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
msgid "_Socks Proxy:"
msgstr "_Socks 代理："
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
msgid "_Ignore Hosts:"
msgstr "忽略 Hosts(_I)："
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
msgid "Automatic"
msgstr "自动"
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
msgid "Configuration _URL:"
msgstr "配置 _URL："
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:560
+msgid "No proxy"
+msgstr "没有代理服务器"
+
+#: ../e-util/e-proxy-editor.c:563
msgid "Use a direct connection, no proxying required."
msgstr "直接连接，不需要代理。"
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
msgid "Switch to Basic Proxy Preferences"
msgstr "切换到基本代理首选项"
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
msgid "Switch to Advanced Proxy Preferences"
msgstr "切换到高级代理首选项"
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
msgid "Apply custom proxy settings to these accounts:"
msgstr "将自定义代理设置应用到这些帐户："
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
msgid ""
"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
"and apply them to specific accounts"
@@ -11193,116 +13100,267 @@ msgstr "添加规则"
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
#, c-format
msgid "Matches: %u"
msgstr "匹配：%u"
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:569
msgid "Close the find bar"
msgstr "关闭查找栏"
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:577
msgid "Fin_d:"
msgstr "查找(_D)："
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:589
msgid "Clear the search"
msgstr "清除搜索"
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:613
msgid "_Previous"
msgstr "上一项(_P)"
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
msgid "Find the previous occurrence of the phrase"
msgstr "寻找该词句出现的前一个位置"
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:625
msgid "_Next"
msgstr "下一项(_N)"
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
msgid "Find the next occurrence of the phrase"
msgstr "寻找该词句出现的下一个位置"
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:637
msgid "Mat_ch case"
msgstr "大小写匹配(_C)"
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:665
msgid "Reached bottom of page, continued from top"
msgstr "到达页面底部，移到顶部继续"
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:687
msgid "Reached top of page, continued from bottom"
msgstr "到达页面顶部，移到底部继续"
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:329
+#: ../mail/importers/kmail-importer.c:253 ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1172
+#: ../smime/gui/certificate-manager.c:1671
msgid "Mail"
msgstr "邮件"
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
msgid "When de_leted:"
msgstr "删除时(_L)："
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "标准"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "优先级"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "机密"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "绝密"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "独家"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "无"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "已读回执"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "请求回复(_E)"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "少于(_T)"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "天"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "方便时(_W)"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "推迟信息投递(_D)"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "经过(_A)"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "天"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "设置过期时间(_S)"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "直到(_U)"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "发送选项"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "优先级(_P)："
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "分类(_C)："
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "常规选项(_R)"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "创建一个已发送项以跟踪信息(_E)"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "已投递(_D)"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "已发送和已打开(_V)"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "全部信息(_A)"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "自动删除已发项目(_U)"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "状态跟踪"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "打开时(_W)："
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "拒绝时(_N)："
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "完成时(_M)："
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "接受时(_P)："
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "返回通知"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "状态跟踪(_T)"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
msgid "Type:"
msgstr "类型："
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
msgid "Name:"
msgstr "名称："
#. Translators: This is the first of a sequence of widgets:
#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1301
+#: ../e-util/e-source-config.c:1311
msgid "Refresh every"
msgstr "刷新间隔"
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
msgid "Use a secure connection"
msgstr "使用安全连接"
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1437
msgid "Unset _trust for SSL certificate"
msgstr "不再信任 SSL 证书(_T)"
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1473
msgid "User"
msgstr "用户"
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:236
msgid "_Destination"
msgstr "目标位置(_D)"
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:364
msgid "Select destination"
msgstr "选择目标位置"
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "未知 (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
#. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:457
msgid "(no suggestions)"
msgstr "(无建议)"
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:481
msgid "More..."
msgstr "更多..."
#. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:566
#, c-format
msgid "Add \"%s\" to Dictionary"
-msgstr "添加 “%s” 到字典"
+msgstr "添加“%s”到字典"
#. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:615
msgid "Ignore All"
msgstr "忽略全部"
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:647
msgid "Spelling Suggestions"
msgstr "拼写建议"
@@ -11315,10 +13373,6 @@ msgid ""
"The file already exists in \"{0}\". Replacing it will overwrite its contents."
msgstr "文件已存在于“{0}”中。若替换它会覆盖其内容。"
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "替换(_R)"
-
#: ../e-util/e-system.error.xml.h:4
msgid "Cannot save file \"{0}\"."
msgstr "无法保存文件“{0}”。"
@@ -11335,7 +13389,7 @@ msgstr "无法打开文件“{0}”。"
msgid "Failed to remove data source "{0}"."
msgstr "无法移除数据源“{0}”。"
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:64
msgid "The reported error was "{1}"."
msgstr "报告的错误为“{1}”。"
@@ -11364,7 +13418,7 @@ msgstr "日历后端服务 "{0}" 异常退出。"
#: ../e-util/e-system.error.xml.h:14
msgid ""
"Some of your appointments may not be available until Evolution is restarted."
-msgstr "在您重新启动 Evolution 之前某些备忘录可能无法使用。"
+msgstr "在您重新启动 Evolution 之前某些备忘可能无法使用。"
#: ../e-util/e-system.error.xml.h:15
msgid "The memo list backend servicing "{0}" has quit unexpectedly."
@@ -11372,7 +13426,7 @@ msgstr "备忘录列表后端服务 "{0}" 异常退出。"
#: ../e-util/e-system.error.xml.h:16
msgid "Some of your memos may not be available until Evolution is restarted."
-msgstr "在您重新启动 Evolution 之前某些备忘录可能无法使用。"
+msgstr "在您重新启动 Evolution 之前某些备忘可能无法使用。"
#: ../e-util/e-system.error.xml.h:17
msgid "The task list backend servicing "{0}" has quit unexpectedly."
@@ -11399,29 +13453,29 @@ msgstr "备忘录列表后端服务 "{0}" 遇到一个错误。"
msgid "The task list backend servicing "{0}" encountered an error."
msgstr "任务列表后端服务 "{0}" 遇到一个错误。"
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:689
#: ../e-util/gal-a11y-e-table-click-to-add.c:61
#: ../e-util/gal-a11y-e-table-click-to-add.c:142
msgid "click to add"
msgstr "单击可添加"
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
msgid "Move selected column names to top"
msgstr "把选定的栏名移至顶端"
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
msgid "Move selected column names up one row"
msgstr "把选中的栏名上移一行"
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
msgid "Move selected column names down one row"
msgstr "把选中的联系人移至其它地址簿"
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
msgid "Move selected column names to bottom"
msgstr "把选定的栏名移至底端"
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
msgid "Select all column names"
msgstr "选中所有栏名"
@@ -11449,9 +13503,69 @@ msgstr "显示域"
msgid "Choose the order of information to appear in the message list."
msgstr "选择显示在信息列表的信息顺序。"
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "添加一列"
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Apply"
+msgstr "应用(_A)"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "排序(_S)..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "分组依据(_G)..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "显示的域(_F)..."
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "全部清除(_A)"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "在视图中显示域(_S)"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "升序"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "降序"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "分组依据"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "在视图中显示域(_F)"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "然后按"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "在视图中显示域(_N)"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "在视图中显示域(_V)"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "排序"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "全部清除"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "排序依据"
#: ../e-util/e-table-field-chooser.c:166
msgid ""
@@ -11459,6 +13573,10 @@ msgid ""
"the location in which you want it to appear."
msgstr "要在您的表格中添加列，请将其拖曳到您想要其出现的位置。"
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "添加一列"
+
#: ../e-util/e-table-group-container.c:368
#, c-format
msgid "%s: %s (%d item)"
@@ -11471,71 +13589,67 @@ msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
msgid "_Unsort"
msgstr "未排序(_U)"
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
msgid "Add a C_olumn..."
msgstr "添加一列(_O)..."
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
msgid "Format Column_s..."
msgstr "格式化列(_S)..."
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
msgid "Custo_mize Current View..."
msgstr "自定义当前视图(_M)..."
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
msgid "_Sort By"
msgstr "排序方式(_S)"
#. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2134
msgid "Select All"
msgstr "全选"
-#: ../e-util/e-text.c:2123
-msgid "Input Methods"
-msgstr "输入法"
-
#. Put the "UTC" entry at the top of the combo's list.
#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
@@ -11543,6 +13657,31 @@ msgstr "输入法"
msgid "UTC"
msgstr "UTC"
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "选择一个时区"
+
+#: ../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"
+"Use the right mouse button to zoom out."
+msgstr ""
+"用鼠标左键放大地图的某个区域并选择时区。\n"
+"用鼠标右键缩小。"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "时区"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "选择(_S)"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "时区下拉组合框"
+
#: ../e-util/e-url-entry.c:108
msgid "Click here to open the URL"
msgstr "单击此处打开该 URL 地址"
@@ -11551,123 +13690,124 @@ msgstr "单击此处打开该 URL 地址"
msgid "Enter a URL here"
msgstr "在此输入 URL 地址"
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Evolution 源查看器"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "显示名称"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "标志"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:721
+msgid "Identity"
+msgstr "标识"
+
+#: ../e-util/e-web-view.c:318
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:320
msgid "Copy the link to the clipboard"
msgstr "将链接复制到剪贴板"
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:328
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:330
msgid "Open the link in a web browser"
msgstr "在浏览器中打开链接"
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:338
msgid "_Copy Email Address"
msgstr "复制电子邮件地址(_C)"
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:345
+msgid "Copy _Raw Email Address"
+msgstr "复制原始电子邮件地址(_R)"
+
+#: ../e-util/e-web-view.c:347
+msgid "Copy the raw email address to the clipboard"
+msgstr "复制原始电子邮件地址到剪贴板"
+
+#: ../e-util/e-web-view.c:362
msgid "_Copy Image"
msgstr "复制图像(_C)"
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:364
msgid "Copy the image to the clipboard"
msgstr "将图像复制到剪贴板"
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
+#: ../e-util/e-web-view.c:369
+msgid "Save _Image..."
+msgstr "保存图像(_I)..."
+
+#: ../e-util/e-web-view.c:371
+msgid "Save the image to a file"
+msgstr "保存该图像为文件"
+
+#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
msgid "Select all text and images"
msgstr "选中全部文本和图像"
-#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
-#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view.c:1074
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view.c:1076
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1087
#, c-format
-msgid "Click to open %s"
-msgstr "单击以打开 %s"
+msgid "Go to the section %s of the message"
+msgstr "转到信息的 %s 部分"
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "保存图像(_I)..."
+#: ../e-util/e-web-view.c:1089
+msgid "Go to the beginning of the message"
+msgstr "转到信息的开头"
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "保存该图像为文件"
+#: ../e-util/e-web-view.c:1093
+#, c-format
+msgid "Click to open %s"
+msgstr "单击以打开 %s"
-#: ../e-util/e-web-view.c:2898
+#: ../e-util/e-web-view.c:3127
msgid "Copying image to clipboard"
msgstr "正在将图像复制到剪贴板"
-#: ../e-util/e-web-view.c:3086
+#: ../e-util/e-web-view.c:3315
msgid "Save Image"
msgstr "保存图像"
-#: ../e-util/e-web-view.c:3122
+#: ../e-util/e-web-view.c:3351
#, c-format
msgid "Saving image to '%s'"
msgstr "正在保存图像至 %s"
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
msgid "Undo 'Insert text'"
-msgstr "撤消 “插入文字”"
+msgstr "撤消“插入文字”"
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
msgid "Redo 'Insert text'"
-msgstr "重做 “插入文字”"
+msgstr "重做“插入文字”"
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
msgid "Undo 'Delete text'"
msgstr "撤消 ”删除文字“"
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
msgid "Redo 'Delete text'"
msgstr "重做“删除文字”"
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%Y年%-m月%-d日"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "日历：从 %s 到 %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "Evolution 日历项目"
-
-#: ../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:666
-msgid "Display Name"
-msgstr "显示名称"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "标志"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "标识"
-
#: ../e-util/filter.error.xml.h:1
msgid "Missing date."
msgstr "缺少日期。"
@@ -11696,7 +13836,7 @@ msgstr "无效的正则表达式“{0}”。"
msgid "Could not compile regular expression "{1}"."
msgstr "无法编译正则表达式“{1}”。"
-#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
msgid "Missing name."
msgstr "缺少名称。"
@@ -11728,13 +13868,88 @@ msgstr "缺少值。"
msgid "One or more values cannot be empty."
msgstr "一个或多个值不能为空。"
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "当前时间"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
+msgid "seconds"
+msgstr "秒"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "周"
+
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "月"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "年"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "过去"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "未来"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "显示邮件过滤器："
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "过滤规则(_F)"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "比较对象"
+
+#: ../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: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:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
+
+#: ../e-util/gal-a11y-e-cell.c:130
+msgid "Table Cell"
+msgstr "表格单元格"
+
#. Translators: description of a "popup" action
#: ../e-util/gal-a11y-e-cell-popup.c:127
msgid "popup a child"
msgstr "弹出子对象"
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:631
+msgid "begin editing this cell"
+msgstr "开始编辑此单元格"
+
#. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
msgid "toggle the cell"
msgstr "切换单元格"
@@ -11748,10 +13963,6 @@ msgstr "在包含此单元格的 ETree 中展开行"
msgid "collapses the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中折叠行"
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "表格单元格"
-
#: ../e-util/gal-a11y-e-table-click-to-add.c:71
msgid "click"
msgstr "单击"
@@ -11764,6 +13975,14 @@ msgstr "排序"
msgid "Save Current View"
msgstr "保存当前视图"
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "创建新视图(_C)"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "替换现有视图(_R)"
+
#: ../e-util/widgets.error.xml.h:1
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗？"
@@ -11800,6 +14019,23 @@ msgstr "无法加载签名。"
msgid "Could not save signature."
msgstr "无法保存签名。"
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr "Evolution 是一款个人信息管理应用，提供集成的邮件、日历和地址簿功能。"
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution 支持众多的工业标准数据格式和信息交换的网络协议，并强化了标准兼容性"
+"和安全。Evolution 也能与 Microsoft Exchange 通过“Exchange 网络服务”(EWS) 扩展"
+"进行顺利集成。"
+
#: ../libemail-engine/camel-sasl-xoauth2.c:26
msgid "OAuth2"
msgstr "OAuth2"
@@ -11808,152 +14044,160 @@ msgstr "OAuth2"
msgid "This option will use an OAuth 2.0 access token to connect to the server"
msgstr "该选项将使用 OAuth 2.0 访问令牌连接到服务器。"
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "无效的认证结果代码(%d)"
-
-#: ../libemail-engine/e-mail-folder-utils.c:113
+#: ../libemail-engine/e-mail-folder-utils.c:115
#, c-format
msgid "Saving message to folder '%s'"
msgstr "把信息保存到文件夹 %s 中"
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../libemail-engine/e-mail-folder-utils.c:574
msgid "Forwarded messages"
msgstr "转发的信息"
-#: ../libemail-engine/e-mail-folder-utils.c:681
-#: ../libemail-engine/e-mail-folder-utils.c:932
+#: ../libemail-engine/e-mail-folder-utils.c:684
+#: ../libemail-engine/e-mail-folder-utils.c:935
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../libemail-engine/e-mail-folder-utils.c:778
msgid "Scanning messages for duplicates"
msgstr "扫描信息中的重复信息？"
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../libemail-engine/e-mail-folder-utils.c:1148
#, c-format
msgid "Removing folder '%s'"
msgstr "删除文件夹 %s"
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1328
#, c-format
msgid "File \"%s\" has been removed."
msgstr "已经删除了“%s”文件。"
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../libemail-engine/e-mail-folder-utils.c:1332
msgid "File has been removed."
msgstr "文件已移除。"
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../libemail-engine/e-mail-folder-utils.c:1391
msgid "Removing attachments"
msgstr "正在移除附件"
-#: ../libemail-engine/e-mail-folder-utils.c:1552
+#: ../libemail-engine/e-mail-folder-utils.c:1555
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "保存 %d 封信"
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../libemail-engine/e-mail-folder-utils.c:1933
#, c-format
msgid "Invalid folder URI '%s'"
msgstr "无效的文件夹 URI：“%s”"
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "没有可用的邮件传送服务"
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../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:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"追加到 %s：%s 失败\n"
-"转而追加到本地“已发”文件夹。"
-
-#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../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:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "发送信息"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1057
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../mail/em-folder-tree-model.c:1229 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1049
+#: ../modules/mail/e-mail-shell-view-private.c:1060
msgid "Inbox"
msgstr "收件箱"
#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1047
msgid "Drafts"
msgstr "草稿"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1051
msgid "Outbox"
msgstr "发件箱"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1061
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1053
msgid "Sent"
msgstr "已发箱"
#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1055
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
+#: ../plugins/templates/templates.c:1488
msgid "Templates"
msgstr "模板"
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
#, c-format
msgid "User cancelled operation"
msgstr "用户己取消操作"
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "%s 认证失败"
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "未找到对应 UID “%s”的数据源"
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1318
#, c-format
msgid ""
"No destination address provided, forwarding of the message has been "
"cancelled."
msgstr "缺少发送目标地址，信息转发被取消。"
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1331
#, c-format
msgid "No identity found to use, forwarding of the message has been cancelled."
msgstr "无可用身份，信息转发被取消。"
+#: ../libemail-engine/e-mail-session.c:2360
+#, c-format
+msgid "Waiting for '%s'"
+msgstr "正在等待“%s”"
+
+#: ../libemail-engine/e-mail-session-utils.c:540
+msgid "No mail transport service available"
+msgstr "没有可用的邮件传送服务"
+
+#: ../libemail-engine/e-mail-session-utils.c:630
+#: ../libemail-engine/mail-ops.c:719
+#, c-format
+msgid "Posting message to '%s'"
+msgstr "正在发送信息到“%s”"
+
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "应用寄出过滤器失败：%s"
+
+#: ../libemail-engine/e-mail-session-utils.c:697
+#: ../libemail-engine/e-mail-session-utils.c:732
+#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#, c-format
+msgid "Storing sent message to '%s'"
+msgstr "正在保存已发送信息到“%s”"
+
+#: ../libemail-engine/e-mail-session-utils.c:721
+#: ../libemail-engine/mail-ops.c:803
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"追加到 %s：%s 失败\n"
+"转而追加到本地“已发”文件夹。"
+
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:831
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "追加到本地“已发”文件夹失败：%s"
+
+#: ../libemail-engine/e-mail-session-utils.c:953
+#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
+msgid "Sending message"
+msgstr "发送信息"
+
#: ../libemail-engine/e-mail-store-utils.c:189
#, c-format
msgid "Disconnecting from '%s'"
@@ -11990,7 +14234,7 @@ msgstr ""
msgid "Fetching mail from '%s'"
msgstr "正在从 '%s' 收取邮件"
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:749
#, c-format
msgid ""
"Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12002,55 +14246,60 @@ msgstr ""
"过“编辑”->“信息过滤器”检查您的过滤器。\n"
"原错误为：%s"
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:990
#, c-format
msgid "Sending message %d of %d"
msgstr "正在发送第 %d 封信，共 %d 封"
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1042
#, c-format
msgid "Failed to send a message"
msgid_plural "Failed to send %d of %d messages"
msgstr[0] "无法发送 %d/%d 条信息"
-#: ../libemail-engine/mail-ops.c:975
+#: ../libemail-engine/mail-ops.c:1048
msgid "Canceled."
msgstr "已取消。"
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1050
msgid "Complete."
msgstr "完成。"
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1164
#, c-format
msgid "Moving messages to '%s'"
msgstr "正在移动信息至 %s"
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1165
#, c-format
msgid "Copying messages to '%s'"
msgstr "把信息复制到 %s"
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1284
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1412
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储帐号“%s”"
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1413
#, c-format
msgid "Storing account '%s'"
msgstr "存储帐号“%s”"
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1488
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的废件箱"
+#: ../libemail-engine/mail-ops.c:1580
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "正在处理在“%s”的文件夹变更"
+
#: ../libemail-engine/mail-tools.c:70
#, c-format
msgid "Could not create spool directory '%s': %s"
@@ -12078,7 +14327,7 @@ msgstr "设置搜索文件夹：%s"
#: ../libemail-engine/mail-vfolder.c:304
#, c-format
msgid "Updating Search Folders for '%s' - %s"
-msgstr "更新搜索文件夹：“%s” - %s"
+msgstr "更新搜索文件夹：“%s”- %s"
#. Translators: The first %s is name of the affected
#. * search folder(s), the second %s is the URI of the
@@ -12108,54 +14357,43 @@ msgstr "打开在线帐号(_O)"
msgid "This account was created through the Online Accounts service."
msgstr "该帐号通过在线帐号服务创建"
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
msgid "_Reset Order"
msgstr "重置顺序(_R)"
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
msgid "You can drag and drop account names to reorder them."
msgstr "您可以拖放帐号名来重新排序。"
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
msgid "De_fault"
msgstr "默认(_F)"
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
-#: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:855
msgid "Enabled"
msgstr "已启用"
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
msgid "Account Name"
msgstr "帐号名"
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "默认"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
msgid "No email address provided"
msgstr "没有提供电子邮件地址"
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
msgid "Missing domain in email address"
msgstr "电子邮件地址中缺少域"
-#: ../mail/e-mail-backend.c:841
-msgid "Unknown background operation"
-msgstr "未知的后台操作"
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../shell/e-shell-window-actions.c:780 ../shell/e-shell-window-actions.c:787
msgid "Close this window"
msgstr "关闭此窗口"
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
msgid "(No Subject)"
msgstr "(无主题)"
@@ -12165,23 +14403,23 @@ msgid "Go _Back"
msgstr "后退(_B)"
#. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
msgid "_Skip Lookup"
msgstr "跳过查找(_S)"
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
-#: ../mail/e-mail-config-assistant.c:936
+#: ../mail/e-mail-config-assistant.c:952
msgid "_Revise Details"
msgstr "核实详细信息(_R)"
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:339
msgid "Check for Supported Types"
msgstr "检查支持的类型"
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -12195,7 +14433,7 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
msgid "Done"
msgstr "完成"
@@ -12224,62 +14462,71 @@ msgid "S_ave replies in the folder of the message being replied to"
msgstr "将回复邮件保存在被回复信息所在的文件夹"
#: ../mail/e-mail-config-defaults-page.c:628
+msgid "Archi_ve Folder:"
+msgstr "归档文件夹(_V)："
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1397
+msgid "Choose a folder to archive messages to."
+msgstr "选择要将信息归档到哪个文件夹。"
+
+#: ../mail/e-mail-config-defaults-page.c:652
msgid "_Restore Defaults"
msgstr "恢复默认值(_R)"
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
msgid "Use a Real Folder for _Trash:"
msgstr "使用真实文件夹作为废件箱(_T)："
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
msgid "Choose a folder for deleted messages."
msgstr "选择已删除信息的文件夹。"
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
msgid "Use a Real Folder for _Junk:"
msgstr "使用真实文件夹存放垃圾信息(_J)："
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
msgid "Choose a folder for junk messages."
msgstr "选择垃圾信息的文件夹。"
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
msgid "Composing Messages"
msgstr "撰写信息"
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
msgid "Alway_s carbon-copy (cc) to:"
msgstr "总是抄送到(_S)："
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是密件抄送到(_B)："
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
msgid "Message Receipts"
msgstr "已读回执"
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
msgid "S_end message receipts:"
msgstr "发送信息收条(_E)："
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
msgid "Never"
msgstr "从不"
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
msgid "Always"
msgstr "总是"
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
msgid "Ask for each message"
msgstr "每条信息都询问"
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
msgid "Defaults"
msgstr "默认值"
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
msgid ""
"Please enter your name and email address below. The \"optional\" fields "
"below do not need to be filled in, unless you wish to include this "
@@ -12288,50 +14535,54 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
msgid "Account Information"
msgstr "帐号信息"
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:346
+#: ../mail/e-mail-config-summary-page.c:352
msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
msgstr ""
-"输入您想要给此帐号起的名字。\n"
-"如：“工作”或“私人”。"
+"上述名称用来代表这个帐号。\n"
+"例如：“工作”或“个人”。"
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:363
msgid "Required Information"
msgstr "需要的信息"
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:372
msgid "Full Nam_e:"
msgstr "全名(_E)："
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:399
msgid "Email _Address:"
msgstr "电子邮件地址(_A)："
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:446
#: ../plugins/publish-calendar/publish-calendar.ui.h:26
msgid "Optional Information"
msgstr "可选信息"
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:455
msgid "Re_ply-To:"
msgstr "回复到(_P)："
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:482
msgid "Or_ganization:"
msgstr "组织(_G)："
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:537
msgid "Add Ne_w Signature..."
msgstr "添加新签名(_W)..."
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:555
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr "根据输入的电子邮件地址搜寻邮件服务器详情"
+
+#: ../mail/e-mail-config-lookup-page.c:70
msgid "Looking up account details..."
msgstr "正在查找帐号详情..."
@@ -12343,7 +14594,7 @@ msgstr "检查新邮件"
msgid "Check for _new messages every"
msgstr "自动检查新信息的间隔(_N)"
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
msgid "Receiving Options"
msgstr "接收选项"
@@ -12351,99 +14602,111 @@ msgstr "接收选项"
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, c-format
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/mail-config.ui.h:30
#: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:90
+#: ../modules/calendar/e-calendar-preferences.c:625
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
#: ../plugins/publish-calendar/publish-calendar.ui.h:16
msgid "General"
msgstr "常规"
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
msgid "Pretty Good Privacy (OpenPGP)"
msgstr "GNU 安全卫士(OpenPGP)"
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
msgid "OpenPGP _Key ID:"
msgstr "OpenPGP _Key ID："
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
msgid "Si_gning algorithm:"
msgstr "签名函数(_N)："
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
msgid "SHA1"
msgstr "SHA1"
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
msgid "SHA256"
msgstr "SHA256"
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
msgid "SHA384"
msgstr "SHA384"
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
msgid "SHA512"
msgstr "SHA512"
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息(_W)"
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "使用此帐号时永远加密外发邮件(_R)"
+
+#: ../mail/e-mail-config-security-page.c:478
msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:490
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:514
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME(S/MIME)"
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:523
msgid "Sig_ning certificate:"
msgstr "签名证书(_N)："
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:653
msgid "Select"
msgstr "选择"
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1007
+#: ../mail/e-mail-config-security-page.c:556
+#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:876
msgid "_Clear"
msgstr "清除(_C)"
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:565
msgid "Signing _algorithm:"
msgstr "签名函数(_A)："
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:606
msgid "Always sign outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息"
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:629
msgid "Encryption certificate:"
msgstr "加密证书："
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:671
msgid "Always encrypt outgoing messages when using this account"
msgstr "当使用该帐号时总是发送签名信息"
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:691
msgid "Always encrypt to myself when sending encrypted messages"
msgstr "当发送加密信息时总是对自身加密"
@@ -12451,7 +14714,7 @@ msgstr "当发送加密信息时总是对自身加密"
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
msgid "Server _Type:"
msgstr "服务器类型(_T)："
@@ -12463,50 +14726,50 @@ msgstr "SSL"
msgid "TLS"
msgstr "TLS"
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
msgid ""
"This is a summary of the settings which will be used to access your mail."
msgstr "这是将用于访问您邮件的设置汇总。"
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:369
msgid "Personal Details"
msgstr "个人详细信息"
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:378
msgid "Full Name:"
msgstr "全名："
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:392
msgid "Email Address:"
msgstr "电子邮件地址："
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:406
msgid "Receiving"
msgstr "接收"
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:418
msgid "Sending"
msgstr "发送"
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:430
msgid "Server Type:"
msgstr "服务器类型："
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:451
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
msgid "Server:"
msgstr "服务器："
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:472
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
msgid "Username:"
msgstr "用户名："
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:493
msgid "Security:"
msgstr "安全："
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:784
msgid "Account Summary"
msgstr "帐号摘要"
@@ -12514,48 +14777,104 @@ msgstr "帐号摘要"
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
msgstr ""
"欢迎使用 Evolution 邮件程序配置助手。\n"
"\n"
-"单击“继续”开始。"
+"单击“前进”开始。"
#: ../mail/e-mail-config-welcome-page.c:166
#: ../modules/startup-wizard/e-startup-assistant.c:151
msgid "Welcome"
msgstr "欢迎"
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
msgid "Account Editor"
msgstr "帐号编辑器"
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:103
msgid "_Add to Address Book..."
msgstr "添加到地址簿(_A)..."
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:110
msgid "_To This Address"
msgstr "到此地址(_T)"
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:117
msgid "_From This Address"
msgstr "自此地址(_F)"
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:124
msgid "Send _Reply To..."
msgstr "发送回复给(_R)..."
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:126
msgid "Send a reply message to this address"
msgstr "发送一条回复信息到这个地址"
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:133
msgid "Create Search _Folder"
msgstr "创建搜索文件夹(_F)"
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "创建文件夹"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "指定在哪里创建文件夹："
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "创建(_R)"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "文件夹名称(_N)："
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:236
+msgctxt "ffe"
+msgid "Answered"
+msgstr "已回复"
+
+#: ../mail/e-mail-free-form-exp.c:237
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "已删除"
+
+#: ../mail/e-mail-free-form-exp.c:238
+msgctxt "ffe"
+msgid "Draft"
+msgstr "草稿"
+
+#: ../mail/e-mail-free-form-exp.c:239
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "已标记"
+
+#: ../mail/e-mail-free-form-exp.c:240
+msgctxt "ffe"
+msgid "Seen"
+msgstr "已读"
+
+#: ../mail/e-mail-free-form-exp.c:241
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "附件"
+
+#: ../mail/e-mail-free-form-exp.c:489
+msgctxt "ffe"
+msgid "no"
+msgstr "no"
+
+#: ../mail/e-mail-free-form-exp.c:490
+msgctxt "ffe"
+msgid "false"
+msgstr "false"
+
+#: ../mail/e-mail-junk-options.c:295
msgid "Junk filtering software:"
msgstr "垃圾过滤软件："
@@ -12563,32 +14882,32 @@ msgstr "垃圾过滤软件："
msgid "_Label name:"
msgstr "标签名称(_L)："
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
msgid "I_mportant"
msgstr "重要(_M)"
#. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
msgid "_Work"
msgstr "工作(_W)"
#. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
msgid "_Personal"
msgstr "个人(_P)"
#. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
msgid "_To Do"
msgstr "待办(_T)"
#. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
msgid "_Later"
msgstr "稍候(_L)"
#: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
msgid "Add Label"
msgstr "添加标签"
@@ -12606,635 +14925,716 @@ msgstr "注意：标签名中的下划线被用作菜单中的助记符。"
msgid "Color"
msgstr "颜色"
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
msgid "Move selected headers to top"
msgstr "把选中的信头移到顶部"
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
msgid "Move selected headers up one row"
msgstr "把选中的信头上移一行"
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
msgid "Move selected headers down one row"
msgstr "把选中的信头下移一行"
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
msgid "Move selected headers to bottom"
msgstr "把选中的信头移到底部"
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
msgid "Select all headers"
msgstr "选中所有信头"
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
msgid "Header Name"
msgstr "信头名称"
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
msgid "Header Value"
msgstr "信头值"
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:121
msgid "Headers"
msgstr "信头"
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:155
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页，共 %d 页"
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "复制到文件夹"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "复制(_O)"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
msgid "Move to Folder"
msgstr "移至文件夹"
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+msgid "Copy to Folder"
+msgstr "复制到文件夹"
+
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:147
msgid "_Move"
msgstr "移动(_M)"
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "复制(_O)"
+
+#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
+#: ../mail/e-mail-reader.c:1452
msgid "_Do not ask me again."
msgstr "不再询问(_D)。"
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1458
msgid "_Always ignore Reply-To: for mailing lists."
msgstr "总是忽略对于邮件列表的“回复至”域(_A)。"
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1661
msgid "Failed to retrieve message:"
msgstr "获取信息失败："
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
#, c-format
msgid "Retrieving message '%s'"
msgstr "收取信息 %s"
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1894
msgid "A_dd Sender to Address Book"
msgstr "将发件人添加到地址簿(_D)"
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1896
msgid "Add sender to address book"
msgstr "将发件人添加到地址簿"
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1901
+msgid "_Archive..."
+msgstr "归档(_A)…"
+
+#: ../mail/e-mail-reader.c:1903
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "把选中的信息移至账户的归档文件夹"
+
+#: ../mail/e-mail-reader.c:1908
msgid "Check for _Junk"
msgstr "检查垃圾信息(_J)"
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1910
msgid "Filter the selected messages for junk status"
msgstr "把选中的信息标记为垃圾信息"
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1915
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1917
msgid "Copy selected messages to another folder"
msgstr "把选中的信息复制到其它文件夹"
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1922
msgid "_Delete Message"
msgstr "删除信息(_D)"
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1924
msgid "Mark the selected messages for deletion"
msgstr "为选中信息做删除标记"
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1929
msgid "Create a Filter Rule for Mailing _List..."
msgstr "为邮件列表创建一条过滤规则(_L)..."
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1931
msgid "Create a rule to filter messages to this mailing list"
msgstr "创建可过滤寄往此邮件列表的信息的规则"
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1936
msgid "Create a Filter Rule for _Recipients..."
msgstr "为收件人创建一条过滤规则(_R)..."
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1938
msgid "Create a rule to filter messages to these recipients"
msgstr "创建可过滤寄往这些收件人的信息的规则"
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1943
msgid "Create a Filter Rule for Se_nder..."
msgstr "为发件人创建一条过滤规则(_N)..."
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1945
msgid "Create a rule to filter messages from this sender"
msgstr "创建可过滤此人寄来的信息的规则"
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1950
msgid "Create a Filter Rule for _Subject..."
msgstr "为主题创建一条过滤规则(_S)..."
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1952
msgid "Create a rule to filter messages with this subject"
msgstr "创建可过滤此主题信息的规则"
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1957
msgid "A_pply Filters"
msgstr "应用过滤规则(_P)"
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1959
msgid "Apply filter rules to the selected messages"
msgstr "应用过滤规则到选中的信息"
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1964
msgid "_Find in Message..."
msgstr "在信息中查找(_F)..."
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1966
msgid "Search for text in the body of the displayed message"
msgstr "在显示信息的主体中搜索文本"
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1971
msgid "_Clear Flag"
msgstr "清除标志(_C)"
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1973
msgid "Remove the follow-up flag from the selected messages"
msgstr "删除选中信息的跟随标志"
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1978
msgid "_Flag Completed"
msgstr "标志为已完成(_F)"
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1980
msgid "Set the follow-up flag to completed on the selected messages"
msgstr "设置选中信息的跟随标志为已完成"
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1985
msgid "Follow _Up..."
msgstr "跟随(_U)..."
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1987
msgid "Flag the selected messages for follow-up"
msgstr "为选中信息添加跟随标志"
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1992
msgid "_Attached"
msgstr "附件(_A)"
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
msgid "Forward the selected message to someone as an attachment"
msgstr "把选中信息作为附件转发给某人"
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1999
msgid "Forward As _Attached"
msgstr "作为附件转发(_A)"
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2006
msgid "_Inline"
msgstr "嵌入(_I)"
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
msgid "Forward the selected message in the body of a new message"
msgstr "在新信体中转发选中信息"
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2013
msgid "Forward As _Inline"
msgstr "嵌入正文转发(_I)"
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2020
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
msgid "Forward the selected message quoted like a reply"
msgstr "以类似于回复的引用方式转发选中的信息"
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2027
msgid "Forward As _Quoted"
msgstr "作文引用转发(_Q)"
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2034
msgid "_Load Images"
msgstr "载入图像(_L)"
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2036
msgid "Force images in HTML mail to be loaded"
msgstr "强制载入 HTML 邮件中的图像"
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+msgid "_Ignore Subthread"
+msgstr "忽略子线索(_I)"
+
+#: ../mail/e-mail-reader.c:2043
+msgid "Mark new mails in a subthread as read automatically"
+msgstr "标记此子线索的新邮件为自动阅读"
+
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
+msgid "_Ignore Thread"
+msgstr "忽略线索(_I)"
+
+#: ../mail/e-mail-reader.c:2050
+msgid "Mark new mails in this thread as read automatically"
+msgstr "标记此线索的新邮件为自动阅读"
+
+#: ../mail/e-mail-reader.c:2055
msgid "_Important"
msgstr "重要(_I)"
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2057
msgid "Mark the selected messages as important"
msgstr "把选中信息标记为重要邮件"
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2062
msgid "_Junk"
msgstr "垃圾(_J)"
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2064
msgid "Mark the selected messages as junk"
msgstr "把选中信息标记为垃圾信息"
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2069
msgid "_Not Junk"
msgstr "非垃圾(_N)"
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2071
msgid "Mark the selected messages as not being junk"
msgstr "把选中信息标记为非垃圾信息"
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2076
msgid "_Read"
msgstr "读取(_R)"
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2078
msgid "Mark the selected messages as having been read"
msgstr "把选中信息标记为已读"
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
+msgid "Do not _Ignore Subthread"
+msgstr "不要忽略子线索(_I)"
+
+#: ../mail/e-mail-reader.c:2085
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr "不要标记此子线索的新邮件为自动阅读"
+
+#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
+msgid "Do not _Ignore Thread"
+msgstr "不要忽略线索(_I)"
+
+#: ../mail/e-mail-reader.c:2092
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr "不要标记此线索中的新邮件为自动阅读"
+
+#: ../mail/e-mail-reader.c:2097
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2099
msgid "Mark the selected messages as unimportant"
msgstr "把选中信息标记为不重要"
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2104
msgid "_Unread"
msgstr "未读(_U)"
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2106
msgid "Mark the selected messages as not having been read"
msgstr "把选中信息标记为未读"
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2111
msgid "_Edit as New Message..."
msgstr "作为新信息进行编辑(_E)..."
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2113
msgid "Open the selected messages in the composer for editing"
msgstr "在编辑器中打开选中的信息以便编辑"
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2118
msgid "Compose _New Message"
msgstr "撰写新信息(_N)"
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2120
msgid "Open a window for composing a mail message"
msgstr "打开窗口以撰写信息"
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2125
msgid "_Open in New Window"
msgstr "在新窗口中打开(_O)"
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2127
msgid "Open the selected messages in a new window"
msgstr "在新窗口中打开选中的信息"
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2132
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2134
msgid "Move selected messages to another folder"
msgstr "把选中的信息移至其它文件夹"
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2139
msgid "_Next Message"
msgstr "下一封信(_N)"
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2141
msgid "Display the next message"
msgstr "显示下一封信息"
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2146
msgid "Next _Important Message"
msgstr "下一封重要信息(_I)"
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2148
msgid "Display the next important message"
msgstr "显示下一封重要信息"
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2153
msgid "Next _Thread"
msgstr "下一条线索(_T)"
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2155
msgid "Display the next thread"
msgstr "显示下一条线索"
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2160
msgid "Next _Unread Message"
msgstr "下一封未读信息(_U)"
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2162
msgid "Display the next unread message"
msgstr "显示下一封未读信息"
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2167
msgid "_Previous Message"
msgstr "上一封信(_P)"
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2169
msgid "Display the previous message"
msgstr "显示上一封信息"
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2174
msgid "Pr_evious Important Message"
msgstr "上一封重要信息(_E)"
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2176
msgid "Display the previous important message"
msgstr "显示上一封重要信息"
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2181
msgid "Previous T_hread"
msgstr "上一条线索(_H)"
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2183
msgid "Display the previous thread"
msgstr "显示上一条线索"
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2188
msgid "P_revious Unread Message"
msgstr "上一封未读信息(_R)"
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2190
msgid "Display the previous unread message"
msgstr "显示上一封未读信息"
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2197
msgid "Print this message"
msgstr "打印该信息"
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2204
msgid "Preview the message to be printed"
msgstr "预览要打印的信息"
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2209
msgid "Re_direct"
msgstr "重发(_D)"
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2211
msgid "Redirect (bounce) the selected message to someone"
msgstr "将选中信息重发(退回)给某人"
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2216
msgid "Remo_ve Attachments"
msgstr "移除附件(_V)"
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2218
msgid "Remove attachments"
msgstr "移除附件"
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2223
msgid "Remove Du_plicate Messages"
msgstr "移除重复的信息(_P)"
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2225
msgid "Checks selected messages for duplicates"
msgstr "检查所选信息中的重复信息？"
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
#: ../modules/mail/e-mail-attachment-handler.c:213
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2232
msgid "Compose a reply to all the recipients of the selected message"
msgstr "为选中信息的所有收件人撰写回复"
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2239
msgid "Compose a reply to the mailing list of the selected message"
msgstr "为选中信息的邮件列表撰写回复"
-#: ../mail/e-mail-reader.c:2177
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2244 ../modules/mail/e-mail-attachment-handler.c:220
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2246
msgid "Compose a reply to the sender of the selected message"
msgstr "为选中信息的发件人撰写回复"
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2251
msgid "_Save as mbox..."
msgstr "另存为 mbox 格式(_S)..."
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2253
msgid "Save selected messages as an mbox file"
msgstr "把选中信息另存为 mbox 格式文件"
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2258
msgid "_Message Source"
msgstr "信息源代码(_M)"
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2260
msgid "Show the raw email source of the message"
msgstr "显示信息的原始邮件源代码"
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2272
msgid "_Undelete Message"
msgstr "取消删除信息(_U)"
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2274
msgid "Undelete the selected messages"
msgstr "取消选中信息的删除"
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2279
msgid "_Normal Size"
msgstr "普通大小(_N)"
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2281
msgid "Reset the text to its original size"
msgstr "把文本重新设置为原来的大小"
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2286
msgid "_Zoom In"
msgstr "放大(_Z)"
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2288
msgid "Increase the text size"
msgstr "增加文本大小"
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2295
msgid "Decrease the text size"
msgstr "减少文本大小"
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2302
msgid "Cre_ate"
msgstr "创建(_A)"
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2309
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2316
msgid "F_orward As"
msgstr "转发为(_O)"
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2323
msgid "_Group Reply"
msgstr "回复全部(_G)"
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2330
msgid "_Go To"
msgstr "转到(_G)"
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2337
msgid "Mar_k As"
msgstr "标记为(_K)"
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2344
msgid "_Message"
msgstr "信息(_M)"
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2351
msgid "_Zoom"
msgstr "缩放(_Z)"
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2361
msgid "Create a Search Folder from Mailing _List..."
msgstr "从邮件列表创建搜索文件夹(_L)..."
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2363
msgid "Create a search folder for this mailing list"
msgstr "为此邮件列表创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2368
msgid "Create a Search Folder from Recipien_ts..."
msgstr "从收件人创建搜索文件夹(_T)..."
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2370
msgid "Create a search folder for these recipients"
msgstr "为这些收件人创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2375
msgid "Create a Search Folder from Sen_der..."
msgstr "从发件人创建搜索文件夹(_D)..."
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2377
msgid "Create a search folder for this sender"
msgstr "为该发件人创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2382
msgid "Create a Search Folder from S_ubject..."
msgstr "从主题创建搜索文件夹(_U)..."
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2384
msgid "Create a search folder for this subject"
msgstr "为该主题创建搜索文件夹"
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2411
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2427
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2431
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2435
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2439
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2451
msgid "Mark as Uni_mportant"
msgstr "标记为不重要(_M)"
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2455
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2499
msgid "_Caret Mode"
msgstr "光标模式(_C)"
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2501
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信息的信体中显示闪烁光标"
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2507
msgid "All Message _Headers"
msgstr "全部信头(_H)"
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2509
msgid "Show messages with all email headers"
msgstr "显示信息时显示所有信头"
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:3047
msgid "Retrieving message"
msgstr "正在获取信息"
-#: ../mail/e-mail-reader.c:3772
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4078 ../modules/mail/e-mail-attachment-handler.c:206
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:4079
msgid "Forward the selected message to someone"
msgstr "把选中信息转发给某人"
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:4098
msgid "Group Reply"
msgstr "回复全部"
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:4099
msgid "Reply to the mailing list, or to all recipients"
msgstr "为选中信息的邮件列表或全部收件人撰写回复"
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
msgid "Delete"
msgstr "删除"
-#: ../mail/e-mail-reader.c:3871
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4177
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
msgid "Next"
msgstr "下一项"
-#: ../mail/e-mail-reader.c:3875
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
msgid "Previous"
msgstr "上一项"
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
msgid "Reply"
msgstr "回复"
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader.c:5240
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "允许任何发件人为 %s 的远程内容"
+
+#: ../mail/e-mail-reader.c:5242
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "允许任何收件人为 %s 的远程内容"
+
+#: ../mail/e-mail-reader.c:5259
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "允许任何发件人为 %s 的远程内容"
+
+#: ../mail/e-mail-reader.c:5316
+msgid "Load remote content"
+msgstr "加载远程内容"
+
+#: ../mail/e-mail-reader-utils.c:146
msgid "Do not warn me again"
msgstr "不要再警告我"
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../mail/e-mail-reader-utils.c:572
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "刷新文件夹 %s"
+
+#: ../mail/e-mail-reader-utils.c:650 ../mail/mail-send-recv.c:486
+#: ../mail/mail-send-recv.c:1285 ../plugins/face/face.c:176
+#: ../shell/e-shell.c:990 ../shell/e-shell.c:1012
+#: ../smime/gui/certificate-manager.c:346
msgid "Unknown error"
msgstr "未知错误"
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1165
+msgid "Marking thread to be ignored"
+msgstr "正在标记线索为忽略"
+
+#: ../mail/e-mail-reader-utils.c:1169
+msgid "Unmarking thread from being ignored"
+msgstr "正在去掉线索的忽略标记"
+
+#: ../mail/e-mail-reader-utils.c:1173
+msgid "Marking subthread to be ignored"
+msgstr "标记子线索为忽略"
+
+#: ../mail/e-mail-reader-utils.c:1177
+msgid "Unmarking subthread from being ignored"
+msgstr "正在去掉子线索的忽略标记"
+
+#: ../mail/e-mail-reader-utils.c:1417
msgid "Printing"
msgstr "正在打印"
#. Translators: %s is replaced with a folder
#. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1654
#, c-format
msgid ""
"Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13244,7 +15644,7 @@ msgid_plural ""
"them?"
msgstr[0] "“%s”文件夹中包含 %u 条重复信息。您确定想删除吗？"
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2485
msgid "Save Message"
msgid_plural "Save Messages"
msgstr[0] "保存信息"
@@ -13254,16 +15654,16 @@ msgstr[0] "保存信息"
#. * mbox format, when the first message doesn't have a
#. * subject. The extension ".mbox" is appended to the
#. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2047
+#: ../mail/e-mail-reader-utils.c:2506
msgid "Message"
msgid_plural "Messages"
msgstr[0] "信息"
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2879
msgid "Parsing message"
msgstr "正在解析信息"
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:207
msgid "The message has no text content."
msgstr "该信息没有文本内容。"
@@ -13271,35 +15671,46 @@ msgstr "该信息没有文本内容。"
msgid "Flag to Follow Up"
msgstr "跟随的标志"
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "%s 认证失败"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "未找到对应 UID“%s”的数据源"
+
#. Note to translators: this is the attribution string used
#. * when quoting messages. Each ${Variable} gets replaced
#. * with a value. To see a full list of available variables,
#. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1454
+#: ../mail/em-composer-utils.c:1603
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
msgstr ""
-"在 ${Year}-${Month}-${Day}${WeekdayName}的 ${24Hour}:${Minute} "
+"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone}，${Sender}写道："
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1609
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信息 --------"
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1614
msgid "-----Original Message-----"
msgstr "-------- 原始信息 --------"
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2901
msgid "an unknown sender"
msgstr "未知发件人"
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3339
msgid "Posting destination"
msgstr "投递目的"
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3344
msgid "Choose folders to post the message to."
msgstr "选择要将信息投递到哪个文件夹。"
@@ -13307,264 +15718,6 @@ msgstr "选择要将信息投递到哪个文件夹。"
msgid "Select Folder"
msgstr "选择文件夹"
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "调整计分"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "任意信头"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "分配颜色"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "分配计分"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "BCC"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "响铃"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "CC"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "完成于"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "接收日期"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "发送日期"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "已删除"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "草稿"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "表达式"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "跟随"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "转发至"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "重要"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "垃圾测试"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "垃圾"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "标签"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "邮件列表"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "全部匹配"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "信体"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "信头"
-
-#: ../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:32
-msgid "Message is not Junk"
-msgstr "不是垃圾信息"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "管道到程序"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "播放声音"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "已读"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "收件人"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "正则表达式匹配"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "已回复到"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "运行程序"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "分数"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "发送者或接收者"
-
-#: ../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:45
-msgid "Set Status"
-msgstr "设置状态"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "大小(kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "来源帐号"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "指定信头"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "停止处理"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "取消颜色"
-
-#: ../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:587
msgid "Then"
@@ -13574,33 +15727,85 @@ msgstr "然后"
msgid "Add Ac_tion"
msgstr "添加动作(_T)"
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
msgid "Unread messages:"
msgid_plural "Unread messages:"
msgstr[0] "未读信息数："
-#: ../mail/em-folder-properties.c:188
+#: ../mail/em-folder-properties.c:189
msgid "Total messages:"
msgid_plural "Total messages:"
msgstr[0] "总信息数："
-#: ../mail/em-folder-properties.c:209
+#: ../mail/em-folder-properties.c:210
#, c-format
msgid "Quota usage (%s):"
msgstr "配额使用(%s)："
-#: ../mail/em-folder-properties.c:211
+#: ../mail/em-folder-properties.c:212
#, c-format
msgid "Quota usage"
msgstr "配额使用"
#. Translators: Label of a combo with a list of configured accounts where a user can
#. choose which account to use as the sender when composing a message in this folder
-#: ../mail/em-folder-properties.c:286
+#: ../mail/em-folder-properties.c:287
msgid "_Send Account Override:"
msgstr "发送帐户覆盖(_S)："
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+msgid "_Archive this folder using these settings:"
+msgstr "使用这些设置归档这个文件夹(_A)："
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:500
+msgctxt "autoarchive"
+msgid "_Cleanup messages older than"
+msgstr "清理早于这个时间的邮件(_C)"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:516
+msgctxt "autoarchive"
+msgid "days"
+msgstr "天"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:518
+msgctxt "autoarchive"
+msgid "weeks"
+msgstr "周"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:520
+msgctxt "autoarchive"
+msgid "months"
+msgstr "月"
+
+#: ../mail/em-folder-properties.c:526
+msgid "Move old messages to the default archive _folder"
+msgstr "将旧的邮件移至默认的归档文件夹(_F)"
+
+#: ../mail/em-folder-properties.c:537
+msgid "_Move old messages to:"
+msgstr "移动旧的邮件到(_M)："
+
+#: ../mail/em-folder-properties.c:541
+msgid "AutoArchive folder"
+msgstr "自动归档文件夹"
+
+#: ../mail/em-folder-properties.c:541
+msgid "Select folder to use for AutoArchive"
+msgstr "选择用于自动归档的文件夹"
+
+#: ../mail/em-folder-properties.c:547
+msgid "_Delete old messages"
+msgstr "删除旧的邮件(_D)"
+
+#: ../mail/em-folder-properties.c:606
+msgid "AutoArchive"
+msgstr "自动归档"
+
+#: ../mail/em-folder-properties.c:685
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -13608,78 +15813,66 @@ msgstr "文件夹属性"
msgid "<click here to select a folder>"
msgstr "<单击此处以选择文件夹>"
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "创建(_R)"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "文件夹名称(_N)："
+#: ../mail/em-folder-selector.c:398
+msgid "Create a new folder"
+msgstr "创建新文件夹"
#: ../mail/em-folder-tree.c:682
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../mail/em-folder-tree.c:819
+#: ../mail/em-folder-tree.c:845
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1661
+#: ../mail/em-folder-tree.c:1703
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2268
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2468
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信息移至文件夹 %s"
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2270
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2470
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信息复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2284
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信息放到顶级文件夹存储"
#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
msgid "Loading..."
msgstr "正在载入..."
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
msgid "Move Folder To"
msgstr "移动文件夹到"
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
msgid "Copy Folder To"
msgstr "复制文件夹到"
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "创建文件夹"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "指定在哪里创建文件夹："
-
#: ../mail/em-subscription-editor.c:855
msgid "_Subscribe"
msgstr "订阅(_S)"
@@ -13692,80 +15885,94 @@ msgstr "要显示的订阅(_B)"
msgid "Subscribe To _All"
msgstr "订阅全部(_A)"
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
msgid "Unsu_bscribe From Hidden"
msgstr "退订隐藏列表(_B)"
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
msgid "Unsubscribe From _All"
msgstr "退订全部(_A)"
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1026
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "，%d 封未读，"
+
+#: ../mail/em-subscription-editor.c:1343
+#: ../modules/mail/e-mail-shell-view-private.c:1036
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "总共 %d 封"
+
+#: ../mail/em-subscription-editor.c:1749
msgid "Folder Subscriptions"
msgstr "文件夹订阅"
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1788
msgid "_Account:"
msgstr "帐号(_A)："
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1801
msgid "Clear Search"
msgstr "清除搜索"
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1818
msgid "Sho_w items that contain:"
msgstr "显示包含以下内容的项目(_W)："
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1865
msgid "Subscribe to the selected folder"
msgstr "订阅选定的文件夹"
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1866
msgid "Su_bscribe"
msgstr "订阅(_B)"
-#: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../mail/em-subscription-editor.c:1911
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
msgid "Unsubscribe from the selected folder"
msgstr "取消对选定文件夹的订阅"
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1951
msgid "Collapse all folders"
msgstr "折叠所有文件夹"
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1952
msgid "C_ollapse All"
msgstr "全部折叠(_O)"
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1962
msgid "Expand all folders"
msgstr "展开所有文件夹"
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1963
msgid "E_xpand All"
msgstr "全部展开(_X)"
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1973
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
+#: ../mail/em-subscription-editor.c:1974
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
msgid "_Refresh"
msgstr "刷新(_R)"
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1985
msgid "Stop the current operation"
msgstr "停止当前操作"
-#: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../mail/em-subscription-editor.c:1986
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
msgid "_Stop"
msgstr "停止(_S)"
@@ -13773,26 +15980,25 @@ msgstr "停止(_S)"
#. * messages to be opened. The %d is replaced with the actual
#. * count of messages. If you need a '%' in your text, then
#. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../mail/em-utils.c:76
#, c-format
msgid "Are you sure you want to open %d message at once?"
msgid_plural "Are you sure you want to open %d messages at once?"
msgstr[0] "您确定要一次打开 %d 封信吗？"
-#: ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "不再显示此信息(_D)"
-
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:923
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信息"
+#: ../mail/em-utils.c:1680
+msgid "Deleting old messages"
+msgstr "删除旧的邮件"
+
#: ../mail/em-vfolder-editor.c:104
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
@@ -13801,95 +16007,409 @@ msgstr "搜索文件夹(_F)"
msgid "Add Folder"
msgstr "添加文件夹"
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
msgid "Search Folder Sources"
msgstr "搜索文件夹来源"
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
msgid "Automatically update on any _source folder change"
msgstr "在源文件夹更改时自动更新(_S)"
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
msgid "All local folders"
msgstr "全部本地文件夹"
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
msgid "All active remote folders"
msgstr "全部活跃远程文件夹"
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
msgid "All local and active remote folders"
msgstr "全部本地和活跃远程文件夹"
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
msgid "Specific folders"
msgstr "指定文件夹"
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
msgid "include subfolders"
msgstr "包括子文件夹"
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "发送者"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "开始于"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "不开始于"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "结束于"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "不结尾于"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "发音类似"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "发音不像"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "收件人"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "抄送"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "密件抄送"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "发送者或接收者"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "包含词语"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "不包含词语"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "指定信头"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "存在"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "不存在"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "信体"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "表达式"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+msgid "Free Form Expression"
+msgstr "自由表达式"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "发送日期"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "之前"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "之后"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "接收日期"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "标签"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "分数"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "大小(kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "已回复到"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "重要"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "已读"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "垃圾"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "跟随"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "已标志"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
+msgstr "未标志"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+msgid "is Completed"
+msgstr "已完成 "
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+msgid "is not Completed"
+msgstr "未完成 "
+
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
+msgid "Mailing list"
+msgstr "邮件列表"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Regex Match"
+msgstr "正则表达式匹配"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Message Header"
+msgstr "信头"
+
+#: ../mail/filtertypes.xml.in.h:51
+msgid "Source Account"
+msgstr "来源帐号"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Pipe to Program"
+msgstr "管道到程序"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "returns"
+msgstr "返回"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "does not return"
+msgstr "不含有"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "returns greater than"
+msgstr "返回大于"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns less than"
+msgstr "返回小于"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "Junk Test"
+msgstr "垃圾测试"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Message is Junk"
+msgstr "是垃圾信息"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is not Junk"
+msgstr "不是垃圾信息"
+
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Location"
+msgstr "信息位置"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
+msgid "Match All"
+msgstr "全部匹配"
+
+#: ../mail/filtertypes.xml.in.h:65
+msgid "Stop Processing"
+msgstr "停止处理"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Set Label"
+msgstr "设置标签"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Assign Color"
+msgstr "分配颜色"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Unset Color"
+msgstr "取消颜色"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Assign Score"
+msgstr "分配计分"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Adjust Score"
+msgstr "调整计分"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Set Status"
+msgstr "设置状态"
+
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "已删除"
+
+#: ../mail/filtertypes.xml.in.h:73
+msgid "Unset Status"
+msgstr "取消状态"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Beep"
+msgstr "响铃"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Play Sound"
+msgstr "播放声音"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Run Program"
+msgstr "运行程序"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Forward to"
+msgstr "转发至"
+
#: ../mail/importers/elm-importer.c:173
msgid "Importing Elm data"
msgstr "导入 Elm 数据"
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导入器"
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
#: ../plugins/dbx-import/dbx-importer.c:246
msgid "_Destination folder:"
msgstr "目的文件夹(_D)："
#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
#: ../plugins/dbx-import/dbx-importer.c:252
#: ../plugins/pst-import/pst-importer.c:541
msgid "Select folder"
msgstr "选择文件夹"
#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
#: ../plugins/dbx-import/dbx-importer.c:253
#: ../plugins/pst-import/pst-importer.c:542
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
msgctxt "mboxImp"
msgid "Subject"
msgstr "主题"
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
msgctxt "mboxImp"
msgid "From"
msgstr "来自"
-#: ../mail/importers/evolution-mbox-importer.c:493
-#: ../shell/e-shell-utils.c:171
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley 邮箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入 Berkeley 邮箱格式文件夹"
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "%d 个地址"
+
+#: ../mail/importers/kmail-importer.c:354
+msgid "Evolution KMail importer"
+msgstr "Evolution KMail 导入器"
+
+#: ../mail/importers/kmail-importer.c:355
+msgid "Import mail and contacts from KMail."
+msgstr "从 KMail 导入邮件和联系人。"
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1057
+msgid "Trash"
+msgstr "回收站"
+
#: ../mail/importers/mail-importer.c:54
msgid "Importing mailbox"
msgstr "导入邮箱"
+#: ../mail/importers/mail-importer.c:60
+msgid "Importing mail and contacts from KMail"
+msgstr "正在从 KMail 导入邮件和联系人。"
+
#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
#: ../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:309
+#: ../mail/importers/mail-importer.c:555
#, c-format
msgid "Scanning %s"
msgstr "正在扫描 %s"
@@ -13898,11 +16418,11 @@ msgstr "正在扫描 %s"
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导入器"
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
msgid "Import mail from Pine."
msgstr "从 Pine 导入邮件。"
@@ -13975,189 +16495,195 @@ msgstr "默认行为"
msgid "For_mat messages in HTML"
msgstr "以 HTML 方式格式化信息(_M)"
-#: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
-msgstr "自动插入表情图像(_E)"
-
#: ../mail/mail-config.ui.h:10
+msgid "Automatically insert _emoticons"
+msgstr "自动插入表情(_E)"
+
+#: ../mail/mail-config.ui.h:11
+msgid "Use Unicode characters for smile_ys"
+msgstr "使用 Unicode 字符作表情(_Y)"
+
+#: ../mail/mail-config.ui.h:12
msgid "Always request rea_d receipt"
msgstr "请求阅读收条(_D)"
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
msgid "Encode filenames in an _Outlook/GMail way"
msgstr "使用 _Outlook/Gmail 的方式编码文件名"
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
+msgid "Send messages through Outbo_x folder"
+msgstr "通过发件箱文件夹发送信息(_X)"
+
+#: ../mail/mail-config.ui.h:15
+msgid "Number of characters for word w_rapping:"
+msgstr "自动换行字符数(_R)："
+
+#: ../mail/mail-config.ui.h:16
msgid "Ch_aracter encoding:"
msgstr "字符编码(_A)："
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:17
msgid "Replies and Forwards"
msgstr "回复和转发"
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:18
msgid "_Reply style:"
msgstr "回复风格(_R)："
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:19
msgid "_Forward style:"
msgstr "转发方式(_F)："
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:20
msgid "Start _typing at the bottom on replying"
msgstr "回复时在底部开始打字(_T)"
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:21
msgid "_Keep signature above the original message on replying"
msgstr "回复时保留原始信息的签名(_K)"
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:22
msgid "Ig_nore Reply-To: for mailing lists"
msgstr "忽略邮件列表的“Reply-To”(_N)"
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:23
msgid "Gro_up Reply goes only to mailing list, if possible"
msgstr "如果可能，组回复只回复给邮件列表(_U)"
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:24
msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
msgstr "在原信息签名时自动对信息进行数字签名(PGP 或 _S/MIME)"
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:25
msgctxt "ReplyForward"
msgid "Attachment"
msgstr "附件"
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:26
msgctxt "ReplyForward"
msgid "Inline (Outlook style)"
msgstr "内嵌(Outlook 风格)"
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:27
msgctxt "ReplyForward"
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:28
msgctxt "ReplyForward"
msgid "Do Not Quote"
msgstr "不引用"
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:29
msgctxt "ReplyForward"
msgid "Inline"
msgstr "内嵌"
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:31
msgid "Sig_natures"
msgstr "签名(_N)"
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:32
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:33
msgid "_Languages"
msgstr "语言(_L)"
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:34
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:35
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:37
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "给错误拼写的单词着色(_M)："
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "拼写检查"
-
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
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:39
+#: ../mail/mail-config.ui.h:41
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:41
+#: ../mail/mail-config.ui.h:43
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:43
+#: ../mail/mail-config.ui.h:45
+msgid "Sending a message to many _To and CC recipients"
+msgstr "发送邮件给大量收件人与抄送(_T)"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:47
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:45
+#: ../mail/mail-config.ui.h:49
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:47
+#: ../mail/mail-config.ui.h:51
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:49
+#: ../mail/mail-config.ui.h:53
msgid "Sending a message with _recipients not entered as mail addresses"
msgstr "发送只填写了密件抄送收件人的信息时(_B)"
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:55
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "正在使用加速键(Ctrl+Enter) 发送信息(_K)"
+
+#: ../mail/mail-config.ui.h:56
msgid "Confirmations"
msgstr "配置"
#. Translators: Label of a frame with a list of folders for which to use selected account in Send account
overrides
-#: ../mail/mail-config.ui.h:54
-#| msgid " Use for Folders "
+#: ../mail/mail-config.ui.h:60
msgid "Use for Folders"
msgstr "用于文件夹 "
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:61
msgid "A_dd"
msgstr "添加(_D)"
-#: ../mail/mail-config.ui.h:57
-#| msgid "Remove"
+#: ../mail/mail-config.ui.h:63
msgid "Re_move"
msgstr "删除(_M)"
#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account
overrides
-#: ../mail/mail-config.ui.h:59
-#| msgid " Use for Recipients "
+#: ../mail/mail-config.ui.h:65
msgid "Use for Recipients"
msgstr "用于接收者"
#. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+#: ../mail/mail-config.ui.h:67 ../modules/mail/em-composer-prefs.c:864
msgid "Account"
msgstr "帐号"
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:68
msgid "Send account overrides"
msgstr "发送帐户覆盖"
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:69
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 "
@@ -14167,185 +16693,221 @@ msgstr ""
"针对某些文件夹或收件人指定发送帐户，而不是通常检测的发送帐户。收件人列表可以"
"包含部分地址或姓名。姓名和地址将分别比较。"
-#: ../mail/mail-config.ui.h:64
-#| msgid "Folder override has precedence over Recipient override"
+#: ../mail/mail-config.ui.h:70
msgid "_Folder override has precedence over Recipient override"
msgstr "文件夹覆盖 比 收件人覆盖 优先(_F)"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:71
msgid "Send Account"
msgstr "发送帐号"
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
msgid "a"
msgstr "a"
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
msgid "b"
msgstr "b"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:79
msgid "Start up"
msgstr "启动"
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:80
msgid "Check for new _messages on start"
msgstr "启动时自动检查新信息(_M)"
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:81
msgid "Check for new messa_ges in all active accounts"
msgstr "检查所有活动帐号的新信息(_G)"
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:82
msgid "Message Display"
msgstr "信息显示"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:83
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:84
msgid "S_tandard Font:"
msgstr "标准字体(_T)："
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:85
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:86
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:87
msgid "Fix_ed Width Font:"
msgstr "等宽字体(_E)："
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:88
msgid "_Mark messages as read after"
msgstr "把信息标记为已读前等(_M)"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:90
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:91
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "选取一种颜色"
+
+#: ../mail/mail-config.ui.h:92
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:93
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N)："
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:94
msgid "Apply the same _view settings to all folders"
msgstr "应用同样的查看设置到所有文件夹(_v)"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:95
msgid "F_all back to threading messages by subject"
msgstr "默认按照主题对线索中的信息排序(_A)"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:96
msgid "Delete Mail"
msgstr "删除邮件"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:97
msgid "Empty _trash folders"
msgstr "清空已删除邮件(_T)"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:98
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
+#: ../mail/mail-config.ui.h:99
+msgid "Archive Mail"
+msgstr "归档电子邮件"
+
+#: ../mail/mail-config.ui.h:100
+msgid "On This Computer A_rchive folder:"
+msgstr "“在此计算机中”分类文件夹："
+
+#: ../mail/mail-config.ui.h:101
+msgid "Archive folder to use for On This Computer messages"
+msgstr "用于“在此计算机中”信息的归档文件夹"
+
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:103
msgid "_Show animated images"
msgstr "显示动态图像(_S)"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:104
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.ui.h:95
-msgid "Loading Images"
-msgstr "载入图像"
+#: ../mail/mail-config.ui.h:105
+msgid "Loading Remote Content"
+msgstr "加载远程内容"
-#: ../mail/mail-config.ui.h:96
-msgid "_Never load images from the Internet"
-msgstr "绝不从 Internet 载入图像(_N)"
+#: ../mail/mail-config.ui.h:106
+msgid "_Never load remote content from the Internet"
+msgstr "永不从互联网加载远程内容(_N)"
-#: ../mail/mail-config.ui.h:97
-msgid "_Load images only in messages from contacts"
-msgstr "载入来自联系人的邮件中的图像(_L)"
+#: ../mail/mail-config.ui.h:107
+msgid "_Load remote content only in messages from contacts"
+msgstr "只加载由连络人寄出邮件中的远程内容(_L)"
-#: ../mail/mail-config.ui.h:98
-msgid "_Always load images from the Internet"
-msgstr "总是从 Internet 上载入图像(_A)"
+#: ../mail/mail-config.ui.h:108
+msgid "_Always load remote content from the Internet"
+msgstr "永远从互联网加载远程内容(_A)"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:109
+msgid "Add"
+msgstr "添加"
+
+#: ../mail/mail-config.ui.h:110
+msgid "Remove"
+msgstr "移除"
+
+#: ../mail/mail-config.ui.h:111
+msgid "Allow for sites:"
+msgstr "允许网站："
+
+#: ../mail/mail-config.ui.h:112
+msgid "Allow for senders:"
+msgstr "允许发件人："
+
+#: ../mail/mail-config.ui.h:113
msgid "HTML Messages"
msgstr "HTML 信息"
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
msgid "Labels"
msgstr "标签"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:115
msgid "Sender Photograph"
msgstr "发送者照片"
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:116
msgid "_Show the photograph of sender in the message preview"
msgstr "在信息预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:117
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr "在 gravatar.com 中搜索发件人的照片"
+
+#: ../mail/mail-config.ui.h:118
msgid "Displayed Message Headers"
msgstr "显示信头"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:119
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:120
#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
msgid "Date/Time Format"
msgstr "日期/时间格式"
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:122
msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾信息(_M)"
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:123
msgid "_Delete junk messages"
msgstr "删除垃圾信息(_D)"
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "检查自定义信头以判别垃圾信息(_S)"
+#: ../mail/mail-config.ui.h:124
+msgid "Junk Test Options"
+msgstr "垃圾过滤测试选项"
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:125
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:126
msgid "_Lookup in local address book only"
msgstr "仅在本地地址簿中查阅(_L)"
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "如果找到匹配的自定义垃圾信头，此选项将被覆盖。"
+#: ../mail/mail-config.ui.h:127
+msgid "Check cu_stom headers for junk"
+msgstr "检查自定义信头以判别垃圾信息(_S)"
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:129
#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
msgid "No encryption"
msgstr "不加密"
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
msgid "TLS encryption"
msgstr "TLS 加密"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
msgid "SSL encryption"
msgstr "SSL 加密"
@@ -14502,10 +17064,26 @@ msgstr ""
"一个 To: 或 CC: 收件人。"
#: ../mail/mail.error.xml.h:16
+msgid "Are you sure you want to send a message with {0} To and CC recipients?"
+msgstr "您确定要寄信给 {0} 个收件人与抄送？"
+
+#: ../mail/mail.error.xml.h:17
+msgid ""
+"You are trying to send a message to {0} recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr ""
+"您正在尝试寄信给 {0} 位收件人和抄送。这会导致所有收件人看到对方的电子邮件地"
+"址。这种行为在某些情况下不受欢迎，特别是如果收件者们不认识对方或注重隐私时。"
+"请考虑将收件人加入到密件副本字段。"
+
+#: ../mail/mail.error.xml.h:19
msgid "Are you sure you want to send a message with invalid address?"
msgstr "您确信您要发送收件人地址无效的信息吗？"
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:20
msgid ""
"The following recipient was not recognized as a valid mail address:\n"
"{0}"
@@ -14513,11 +17091,11 @@ msgstr ""
"下列接收者不能被识别为有效的电子邮件地址：\n"
"{0}"
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:22
msgid "Are you sure you want to send a message with invalid addresses?"
msgstr "您确信您要发送收件人地址无效的信息吗？"
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
msgid ""
"The following recipients were not recognized as valid mail addresses:\n"
"{0}"
@@ -14525,11 +17103,11 @@ msgstr ""
"下列接收者不能被识别为有效的电子邮件地址：\n"
"{0}"
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
msgid "Send private reply?"
msgstr "发送私人回复？"
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
msgid ""
"You are replying privately to a message which arrived via a mailing list, "
"but the list is trying to redirect your reply to go back to the list. Are "
@@ -14538,11 +17116,11 @@ msgstr ""
"您正在给一封通过邮件列表收到的邮件发送一个私下的回复，而邮件列表正试图重定向"
"您的回复回邮件列表。您确定要继续么？"
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
msgid "Reply _Privately"
msgstr "私人回复(_P)"
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
msgid ""
"You are replying to a message which arrived via a mailing list, but you are "
"replying privately to the sender; not to the list. Are you sure you want to "
@@ -14551,22 +17129,22 @@ msgstr ""
"您正在回复一封通过邮件列表收到的邮件，但是您正私下的回复给发件人，而不是邮件"
"列表。您确定要这么做么？"
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
msgid "Send reply to all recipients?"
msgstr "发送回复给所有收件人？"
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
msgid ""
"You are replying to a message which was sent to many recipients. Are you "
"sure you want to reply to ALL of them?"
msgstr "您正要向多个收件人回复信息，您确定要回复其中的所有人吗？"
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
msgid ""
"This message cannot be sent because you have not specified any recipients"
msgstr "无法发送此信息，因为您没有指定任何收件人"
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:34
msgid ""
"Please enter a valid email address in the To: field. You can search for "
"email addresses by clicking on the To: button next to the entry box."
@@ -14574,58 +17152,57 @@ msgstr ""
"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
"邮件地址。"
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
msgid "Use default drafts folder?"
msgstr "使用默认的草稿文件夹吗？"
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
msgstr "无法打开此帐号的草稿文件夹。使用系统的草稿文件夹吗？"
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
msgid "Use _Default"
msgstr "使用默认值(_D)"
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
"folder \"{0}\"?"
msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信息吗？"
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
msgid "If you continue, you will not be able to recover these messages."
msgstr "如果您继续的话，您将无法恢复这些信息。"
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
msgid ""
"Are you sure you want to permanently remove all the deleted messages in all "
"folders?"
msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗？"
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../mail/mail.error.xml.h:42 ../modules/mail/e-mail-shell-view-actions.c:1638
msgid "_Empty Trash"
msgstr "清空废件箱(_E)"
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
msgid "_Open Messages"
msgstr "打开信息(_O)"
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:45
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您有未发送信息，您仍然想要退出吗？"
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:46
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
@@ -14634,96 +17211,96 @@ msgstr "如果您退出，这些信息将会等到 Evolution 下次启动才会
#. Translators: the {0} is replaced with an operation name, which failed.
#. It can be basically anything run asynchronously, like "Fetching Mail",
#. "Sending message" and others, mostly from mail-ops.c file.
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
msgid "Error while {0}."
msgstr "{0} 时出错。"
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
msgid "Error while performing operation."
msgstr "执行操作时出错。"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
msgid "Enter password."
msgstr "输入密码。"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
msgid "Error loading filter definitions."
msgstr "载入过滤器定义错误。"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
msgid "Cannot save to directory \"{0}\"."
msgstr "无法保存到目录“{0}”。"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
msgid "Cannot save to file \"{0}\"."
msgstr "无法保存到文件“{0}”。"
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
msgid "Cannot create the save directory, because \"{1}\""
msgstr "无法创建保存目录，原因是“{1}”"
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
msgid "Cannot create temporary save directory."
msgstr "无法创建临时保存目录。"
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
msgid "File exists but cannot overwrite it."
msgstr "文件存在但无法覆盖。"
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
msgid "File exists but is not a regular file."
msgstr "文件存在但不是普通文件。"
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
msgid "Cannot delete folder \"{0}\"."
msgstr "无法删除文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
msgid "Cannot delete system folder \"{0}\"."
msgstr "无法删除系统文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
msgid ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
msgid "Failed to expunge folder "{0}"."
msgstr "擦除文件夹“{0}”失败。"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
msgid "Failed to refresh folder "{0}"."
msgstr "刷新文件夹“{0}”失败。"
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
msgid "Cannot rename or move system folder \"{0}\"."
msgstr "无法重命名或移动系统文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗？"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
msgid ""
"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
msgstr "如果您删除文件夹，其中的全部内容及其子文件夹内容将被永久删除。"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
msgid "Really delete folder \"{0}\"?"
msgstr "真要删除文件夹“{0}”？"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
msgid ""
"If you delete the folder, all of its contents will be deleted permanently."
msgstr "如果您删除文件夹，其中的全部内容将被永久删除。"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
msgid "These messages are not copies."
msgstr "这些信息不是副本。"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
msgid ""
"Messages shown in Search Folders are not copies. Deleting them from a Search "
"Folder will delete the actual messages from the folder or folders in which "
@@ -14732,130 +17309,129 @@ msgstr ""
"搜索文件夹中所显示的信息不是副本。从搜索文件夹删除他们将删除其所在文件夹中的"
"实际信息。您真的要删除这些信息吗？"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "无法将“{0}”重命名为“{1}”。"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "已经存在名为“{1}”的文件夹。请使用不同的名称。"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:76
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”移至“{1}”。"
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
msgid "Cannot open source folder. Error: {2}"
msgstr "无法打开源文件夹。错误：{2}"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
msgid "Cannot open target folder. Error: {2}"
msgstr "无法打开目标文件夹。错误：{2}"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”复制到“{1}”。"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
msgid "Cannot create folder \"{0}\"."
msgstr "无法创建文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
msgid "Cannot open folder. Error: {1}"
msgstr "无法打开文件夹。错误：{1}"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
msgid "Cannot save changes to account."
msgstr "无法将更改保存到帐号。"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
msgid "You have not filled in all of the required information."
msgstr "您没有填入所需的全部信息。"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
msgid "You may not create two accounts with the same name."
msgstr "您不能创建两个同名帐号。"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
msgid "Are you sure you want to delete this account?"
msgstr "您确定要删除此帐号吗？"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
msgid "If you proceed, the account information will be deleted permanently."
msgstr "如果您继续的话，帐号信息将被永久删除。"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
msgid "Are you sure you want to delete this account and all its proxies?"
msgstr "您确定要删除此帐号及其全部代理服务器吗？"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
msgstr "如果您继续的话，帐号信息及其全部代理服务器信息将被永久删除。"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
msgid ""
"Are you sure you want to disable this account and delete all its proxies?"
msgstr "您确定要禁用此帐号及其全部代理服务器吗？"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "如果您继续的话，全部代理服务器帐号都将被永久删除。"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
msgid "Do _Not Disable"
msgstr "不禁用(_N)"
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../mail/mail.error.xml.h:93
msgid "_Disable"
msgstr "禁用(_D)"
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgstr "无法编辑搜索文件夹“{0}”，原因是该文件夹不存在。"
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
msgid ""
"This folder may have been added implicitly,\n"
"go to the Search Folder editor to add it explicitly, if required."
msgstr ""
"此文件夹可能已经隐式添加了。如果需要的话，请转到搜索文件夹编辑器显式添加。"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
msgid "Cannot add Search Folder \"{0}\"."
msgstr "无法添加搜索文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
msgid "A folder named \"{0}\" already exists. Please use a different name."
msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
msgid "Search Folders automatically updated."
msgstr "搜索文件夹已自动更新。"
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:100
msgid "Mail filters automatically updated."
msgstr "邮件过滤器已自动更新。"
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:104
msgid "You must name this Search Folder."
msgstr "您必须为此搜索文件夹命名。"
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
msgid "No folder selected."
msgstr "没有选定文件夹。"
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14864,11 +17440,11 @@ msgstr ""
"您必须一次至少指定一个文件夹作为源。\n"
"或者逐一选择文件夹，或者选中全部本地文件夹和/或全部远程文件夹。"
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -14879,23 +17455,19 @@ msgstr ""
"\n"
"您可以选择忽略此文件夹，覆盖或追加其内容，或者退出。"
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "忽略"
-
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
msgid "_Append"
msgstr "追加(_A)"
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
msgid "Evolution's local mail format has changed."
msgstr "Evolution 的本地邮件格式已更改。"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
msgid ""
"Evolution's local mail format has changed from mbox to Maildir. Your local "
"mail must be migrated to the new format before Evolution can proceed. Do you "
@@ -14910,19 +17482,19 @@ msgstr ""
"将会创建一个 mbox 帐号来保留旧的 mbox 文件夹。在确信数据已经安全迁移后，您可"
"以删除它。要迁移，请先确保有足够的磁盘空间。"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
msgid "_Exit Evolution"
msgstr "退出 Evolution(_E)"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
msgid "_Migrate Now"
msgstr "迁移 Now(_M)"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
msgid "Unable to read license file."
msgstr "无法读取许可文件。"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
msgid ""
"Cannot read the license file \"{0}\", due to an installation problem. You "
"will not be able to use this provider until you can accept its license."
@@ -14930,241 +17502,334 @@ msgstr ""
"无法读取许可文件“{0}”，原因是安装有问题。您将无法使用此提供者，除非您接受其许"
"可协议。"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
msgid "Please wait."
msgstr "请稍候。"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证算法列表。"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
msgid ""
"Failed to query server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证方法列表失败。"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
msgid "Synchronize folders locally for offline usage?"
msgstr "同步文件夹到本地以离线使用吗？"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
msgstr "您想要同步那些标记为离线使用的文件夹吗？"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
msgid "Do _Not Synchronize"
msgstr "不同步(_D)"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
msgid "_Synchronize"
msgstr "同步(_S)"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
msgid "Do you want to mark all messages as read?"
msgstr "您是否想要把所有信息标记为已读？"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
msgid "This will mark all messages as read in the selected folder."
msgstr "这将把选中文件夹中的全部信息标记为已读。"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
msgid "Also mark messages in subfolders?"
msgstr "也标记的子文件夹中的信息吗？"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
msgid ""
"Do you want to mark messages as read in the current folder only, or in the "
"current folder as well as all subfolders?"
msgstr "您是想要只标记当前文件夹中的信息，还是也包括子文件夹中的信息？"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
msgid "In Current Folder and _Subfolders"
msgstr "在当前文件夹和子文件夹(_S)"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
msgid "In Current _Folder Only"
msgstr "只在当前文件夹(_F)"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
msgid "Should Evolution close this window when replying or forwarding?"
msgstr "当回复或转发时 Evolution 是否关闭该窗口？"
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
msgid "_Yes, Always"
msgstr "是，总是如此(_Y)"
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
msgid "_No, Never"
msgstr "不，永不(_N)"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
msgid "Copy folder in folder tree."
msgstr "复制文件夹树中的文件夹。"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
msgstr "您确定要将文件夹“{0}”复制到文件夹“{1}”吗？"
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
-msgstr "总是(_A)"
+#: ../mail/mail.error.xml.h:142
+msgid "Do _not copy"
+msgstr "不要复制(_N)"
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
-msgstr "从不(_E)"
+#: ../mail/mail.error.xml.h:143
+msgid "_Always copy"
+msgstr "永远复制(_A)"
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
+msgid "N_ever copy"
+msgstr "永不复制(_E)"
+
+#: ../mail/mail.error.xml.h:145
msgid "Move folder in folder tree."
msgstr "移动文件夹树中的文件夹。"
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
msgstr "您确定要将文件夹“{0}”移动到文件夹“{1}”中吗？"
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
+msgid "Do _not move"
+msgstr "不要移动(_N)"
+
+#: ../mail/mail.error.xml.h:149
+msgid "_Always move"
+msgstr "永远移动(_A)"
+
+#: ../mail/mail.error.xml.h:150
+msgid "N_ever move"
+msgstr "永不移动(_E)"
+
+#: ../mail/mail.error.xml.h:151
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "无法发送此信息，因为您所选择用来发送的帐号未启用"
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:152
msgid "Please enable the account or send using another account."
msgstr "请启用帐号或者使用其它帐号发送。"
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
msgid "\"Check Junk\" Failed"
msgstr "检查垃圾信息失败"
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:156
msgid "\"Report Junk\" Failed"
msgstr "报告垃圾信息失败"
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
msgid "\"Report Not Junk\" Failed"
msgstr "报告非垃圾信息失败"
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:158
msgid "Remove duplicate messages?"
msgstr "移除重复的信息？"
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
msgid "No duplicate messages found."
msgstr "没有找到重复信息。"
#. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
msgid "Folder '{0}' doesn't contain any duplicate message."
msgstr "“{0}”文件夹中没有重复信息。"
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
+msgid "Failed to connect account "{0}"."
+msgstr "连接帐号“{0}”失败。"
+
+#: ../mail/mail.error.xml.h:163
msgid "Failed to disconnect account "{0}"."
msgstr "断开帐号“{0}”失败。"
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:164
msgid "Failed to unsubscribe from folder "{0}"."
msgstr "无法退订文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:165
msgid "Unable to retrieve message."
msgstr "无法获取信息。"
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
msgid "{0}"
msgstr "{0}"
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
+msgid "Message is not available in offline mode."
+msgstr "脱机模式下信息不可用。"
+
+#: ../mail/mail.error.xml.h:168
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File->Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+"这可能是由于信息还没有被下载。文件夹或账户可以标记为离线同步。然后一旦帐号再"
+"次上线，使用 文件->下载信息 来离线使用，当文件夹被选中，可以确保这个文件夹"
+"里的所有信息在脱机模式下可用。"
+
+#: ../mail/mail.error.xml.h:169
msgid "Failed to open folder."
msgstr "打开文件夹失败。"
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:171
msgid "Failed to find duplicate messages."
msgstr "查找重复信息失败。"
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:172
msgid "Failed to retrieve messages."
msgstr "获取信息失败。"
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:173
msgid "Failed to mark messages as read."
msgstr "无法将信息标记为已读。"
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:174
msgid "Failed to remove attachments from messages."
msgstr "移除信息里的附件失败。"
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:175
msgid "Failed to download messages for offline viewing."
msgstr "无法下载信息以离线查看。"
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:176
msgid "Failed to save messages to disk."
msgstr "保存信息到磁盘失败。"
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:177
msgid "Hidden file is attached."
msgstr "附加了隐藏文件。"
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:178
msgid ""
"The attachment named {0} is a hidden file and may contain sensitive data. "
"Please review it before sending."
msgstr "名为 {0} 的附件是隐藏文件，可能包含敏感数据。请在发送前核查一下它。"
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:179
msgid "Printing failed."
msgstr "打印失败。"
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:180
msgid "The printer replied "{0}"."
msgstr "打印机返回 "{0}"。"
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:181
msgid "Could not perform this operation on {0}."
msgstr "无法对 {0} 执行该操作。"
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:182
msgid "You must be working online to complete this operation."
msgstr "您必须上线以完成此操作。"
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:183
msgid "Message from "{0}" account:"
msgstr "来自“{0}”账户的信息："
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:184
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "标记文件夹“{0}”中线索为忽略失败"
+
+#: ../mail/mail.error.xml.h:185
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr "去掉文件夹“{0}“ 中线索的忽略标志失败"
+
+#: ../mail/mail.error.xml.h:186
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr "标记文件夹“{0}”中子线索为忽略失败"
+
+#: ../mail/mail.error.xml.h:187
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr "去掉文件夹“{0}“ 中子线索的忽略标志失败"
+
+#: ../mail/mail.error.xml.h:188
+msgid "Remote content download had been blocked for this message."
+msgstr "已阻挡这封邮件的远程内容下载。"
+
+#: ../mail/mail.error.xml.h:189
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"您可以手动下载远程内容，或设置为记住下载这个发件人或使用过网站的远程内容。"
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:191
+msgid "{0}, Completed on {1}"
+msgstr "{0} ，完成于 {1} "
+
+#. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:193
+msgid "{0} by {1}"
+msgstr "{0} 自 {1}"
+
+#. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:195
+msgid "Overdue: {0} by {1}"
+msgstr "逾期：{0} 自 {1}"
+
+#: ../mail/mail-send-recv.c:191
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:636
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:650
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1225
#, c-format
msgid "Checking for new mail at '%s'"
msgstr "正在检查 '%s' 处的新邮件"
+#: ../mail/mail-send-recv.c:1452
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr "正在删除“%s”中的垃圾邮件并清空废件箱"
+
+#: ../mail/mail-send-recv.c:1454
+#, c-format
+msgid "Deleting junk at '%s'"
+msgstr "正在删除“%s”中的垃圾邮件"
+
+#: ../mail/mail-send-recv.c:1456
+#, c-format
+msgid "Expunging trash at '%s'"
+msgstr "正在清空“%s”中的废件箱"
+
#: ../mail/mail-vfolder-ui.c:66
msgid "Search Folders"
msgstr "搜索文件夹"
@@ -15177,86 +17842,86 @@ msgstr "编辑搜索文件夹"
msgid "New Search Folder"
msgstr "新建搜索文件夹"
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
msgid "Answered"
msgstr "已答复"
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
msgid "Forwarded"
msgstr "已转发"
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
msgid "Multiple Unseen Messages"
msgstr "多封未看信息"
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
msgid "Multiple Messages"
msgstr "多封信"
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
msgid "Lowest"
msgstr "最低"
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
msgid "Lower"
msgstr "较低"
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
msgid "Higher"
msgstr "较高"
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:455 ../mail/message-list.c:5719
+#: ../mail/message-list.c:459 ../mail/message-list.c:6042
msgid "Generating message list"
msgstr "生成信息列表"
#. strftime format of a time,
#. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1846 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2042 ../modules/itip-formatter/itip-view.c:235
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../mail/message-list.c:1855
+#: ../mail/message-list.c:2051
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:2063
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1875
+#: ../mail/message-list.c:2071
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../mail/message-list.c:1877
+#: ../mail/message-list.c:2073
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2755
+#: ../mail/message-list.c:2958
msgid "Select all visible messages"
msgstr "选中所有可见的信息"
-#: ../mail/message-list.c:3383 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3623 ../mail/message-list.etspec.h:17
msgid "Messages"
msgstr "信息"
#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4690
+#: ../mail/message-list.c:4979
msgid "Follow-up"
msgstr "跟随"
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5981
msgid ""
"No message satisfies your search criteria. Change search criteria by "
"selecting a new Show message filter from the drop down list above or by "
@@ -15267,7 +17932,7 @@ msgstr ""
"示”信息过滤器；或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
"索。"
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5989
msgid "There are no messages in this folder."
msgstr "此文件夹中没有信息。"
@@ -15299,38 +17964,47 @@ msgstr "发信息给"
msgid "Subject - Trimmed"
msgstr "主题 - 被截断"
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "任意信头"
+
+#: ../mail/searchtypes.xml.in.h:54
msgid "Subject or Addresses contains"
msgstr "主题或地址包含"
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
msgid "Recipients contain"
msgstr "收件人含有"
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
msgid "Message contains"
msgstr "信息含有"
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
msgid "Subject contains"
msgstr "主题含有"
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
msgid "Sender contains"
msgstr "发件人含有"
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2115
msgid "Body contains"
msgstr "邮件体含有"
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
+msgid "Free form expression"
+msgstr "自由表达式"
+
#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a
date in message list
#: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/mail/em-mailer-prefs.c:1552
msgid "_Table column:"
msgstr "表列(T)："
@@ -15381,7 +18055,7 @@ msgid "_Contact"
msgstr "联系人(_C)"
#: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
msgid "Create a new contact"
msgstr "创建一个新联系人"
@@ -15391,7 +18065,7 @@ msgid "Contact _List"
msgstr "联系人列表(_L)"
#: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
@@ -15401,277 +18075,273 @@ msgid "Address _Book"
msgstr "地址簿(_B)"
#: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
msgid "Create a new address book"
msgstr "创建新地址簿"
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "证书"
-
#: ../modules/addressbook/e-book-shell-view-actions.c:197
msgid "Address Book Properties"
msgstr "地址簿属性"
#. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
msgid "Save as vCard"
msgstr "另存为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
msgid "Co_py All Contacts To..."
msgstr "将全部联系人复制到(_P)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
msgid "Copy the contacts of the selected address book to another"
msgstr "把选中地址簿中的联系人复制到其它地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
msgid "D_elete Address Book"
msgstr "删除地址簿(_E)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
msgid "Delete the selected address book"
msgstr "删除选中的地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
msgid "Mo_ve All Contacts To..."
msgstr "将全部联系人移至(_V)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
msgid "Move the contacts of the selected address book to another"
msgstr "把选中的地址簿中的联系人移至其它地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
msgid "Address _Book Properties"
msgstr "地址簿属性(_B)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
msgid "Show properties of the selected address book"
msgstr "显示选中地址簿的属性"
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
msgid "Re_fresh"
msgstr "刷新(_F)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
msgid "Refresh the selected address book"
msgstr "重命名选中地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
msgid "Address Book _Map"
msgstr "地址簿地图(_M)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
msgid "Show map with all contacts from selected address book"
msgstr "显示选中地址簿中所有联系人的地图"
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
msgid "Rename the selected address book"
msgstr "重命名选中的地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
msgid "Stop loading"
msgstr "停止载入"
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
msgid "_Copy Contact To..."
msgstr "复制联系人到(_C)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
msgid "Copy selected contacts to another address book"
msgstr "把选中的联系人复制到其它地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
msgid "_Delete Contact"
msgstr "删除联系人(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
msgid "_Find in Contact..."
msgstr "在联系人查找(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
msgid "Search for text in the displayed contact"
msgstr "在显示的联系人中搜索文本"
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
msgid "_Forward Contact..."
msgstr "转发联系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
msgid "Send selected contacts to another person"
msgstr "把选中的联系人发送给其他人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
msgid "_Move Contact To..."
msgstr "移动联系人至(_M)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
msgid "Move selected contacts to another address book"
msgstr "把选中的联系人移至其它地址簿"
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
msgid "_Open Contact"
msgstr "打开联系人(_O)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
msgid "_Send Message to Contact..."
msgstr "给联系人发送信息(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
msgid "Send a message to the selected contacts"
msgstr "给选中的联系人发送信息"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
msgid "_Actions"
msgstr "操作(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
msgid "_Preview"
msgstr "预览(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
msgid "Address Book Map"
msgstr "地址簿地图"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
msgid "Contact _Preview"
msgstr "联系人预览(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
msgid "Show contact preview window"
msgstr "显示联系人预览窗口"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
msgid "Show _Maps"
msgstr "显示地图(_M)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
msgid "Show maps in contact preview window"
msgstr "在联系人预览窗口中显示地图"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
msgid "_Classic View"
msgstr "分类视图(_C)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
msgid "Show contact preview below the contact list"
msgstr "在联系人列表下方显示联系人预览"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/calendar/e-memo-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
msgid "_Vertical View"
msgstr "竖直视图(_V)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
msgid "Show contact preview alongside the contact list"
msgstr "在联系人列表旁显示联系人预览"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
msgid "Unmatched"
msgstr "无匹配"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
#: ../shell/e-shell-content.c:657
msgid "Advanced Search"
msgstr "高级搜索"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
msgid "Print all shown contacts"
msgstr "打印全部显示的联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
msgid "Preview the contacts to be printed"
msgstr "预览将要打印的联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
msgid "Print selected contacts"
msgstr "打印选中的联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
msgid "S_ave Address Book as vCard"
msgstr "保存地址簿为 VCard(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
msgid "Save the contacts of the selected address book as a vCard"
msgstr "把选中地址簿中的的联系人保存为 VCard"
#. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
msgid "_Save as vCard..."
msgstr "另存为 vCard(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
msgid "Save selected contacts as a vCard"
msgstr "把选中的联系人保存为 vCard"
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
msgid "_Send Message to Contacts"
msgstr "给联系人发送信息(_S)"
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
msgid "_Send Message to List"
msgstr "给列表发送信息(_S)"
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
msgid "_Send Message to Contact"
msgstr "给联系人发送信息(_M)"
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
msgid ""
"You can restore Evolution from a backup file.\n"
"\n"
@@ -15681,151 +18351,156 @@ msgstr ""
"\n"
"这会恢复您所有的个人数据、设置、邮件过滤器等。"
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
msgid "_Restore from a backup file:"
msgstr "从备份文件恢复(_R)："
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
msgid "Choose a backup file to restore"
msgstr "选择要恢复的备份文件"
#. Keep the title identical to EMailConfigRestorePage
#. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
msgid "Restore from Backup"
msgstr "从备份中恢复"
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../modules/backup-restore/evolution-backup-restore.c:217
msgid "Select name of the Evolution backup file"
msgstr "选择 Evolution 备份文件名称"
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
msgid "_Restart Evolution after backup"
msgstr "备份后重新启动 Evolution(_R)"
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr "恢复后重新启动 Evolution(_S)"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
msgid "Select name of the Evolution backup file to restore"
msgstr "选择要恢复的 Evolution 备份文件名称"
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
-msgstr "恢复后重新启动 Evolution(_R)"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
+msgstr "检查备份文件“%s”的内容，请稍候…"
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
msgid "_Back up Evolution Data..."
msgstr "备份 Evolution 数据(_B)..."
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../modules/backup-restore/evolution-backup-restore.c:359
msgid "Back up Evolution data and settings to an archive file"
msgstr "备份 Evolution 的数据和设置到一个归档文件"
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
msgid "R_estore Evolution Data..."
msgstr "恢复 Evolution 数据(_E)..."
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../modules/backup-restore/evolution-backup-restore.c:366
msgid "Restore Evolution data and settings from an archive file"
msgstr "从归档文件备份及恢复 Evolution 的数据和设置"
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
msgid "Back up Evolution directory"
msgstr "备份 Evolution 目录"
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
msgid "Restore Evolution directory"
msgstr "恢复 Evolution 目录"
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
msgid "Check Evolution Back up"
msgstr "检查 Evolution 备份"
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
msgid "Restart Evolution"
msgstr "重新启动 Evolution"
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
msgid "With Graphical User Interface"
msgstr "带图形用户界面"
#. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
msgid "Shutting down Evolution"
msgstr "关闭 Evolution"
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
msgid "Backing Evolution accounts and settings"
msgstr "备份 Evolution 的帐号及设置"
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
msgstr "备份 Evolution 数据(邮件、联系人、日历、任务、备忘)"
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
msgid "Back up complete"
msgstr "备份完成"
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
msgid "Restarting Evolution"
msgstr "重新启动 Evolution"
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:491
msgid "Back up current Evolution data"
msgstr "备份当前 Evolution 数据"
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:498
msgid "Extracting files from back up"
msgstr "从备份中提取文件"
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:580
msgid "Loading Evolution settings"
msgstr "载入 Evolution 的设置"
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:650
msgid "Removing temporary back up files"
msgstr "删除临时备份文件"
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:664
msgid "Reloading registry service"
msgstr "重新加载注册服务"
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:866
msgid "Evolution Back Up"
msgstr "Evolution 备份"
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:867
#, c-format
msgid "Backing up to the folder %s"
msgstr "正在备份到文件夹 %s"
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:871
msgid "Evolution Restore"
msgstr "Evolution 恢复"
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:872
#, c-format
msgid "Restoring from the folder %s"
msgstr "正在从文件夹 %s 中恢复"
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:941
msgid "Backing up Evolution Data"
msgstr "正在备份 Evolution 数据"
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:942
msgid "Please wait while Evolution is backing up your data."
msgstr "请稍候，Evolution 正在备份您的数据。"
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:944
msgid "Restoring Evolution Data"
msgstr "正在恢复 Evolution 数据"
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:945
msgid "Please wait while Evolution is restoring your data."
msgstr "请稍候，Evolution 正在恢复您的数据。"
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:967
msgid "This may take a while depending on the amount of data in your account."
msgstr "这可能要花一点时间，取决于您帐号中的数据总量。"
@@ -15834,8 +18509,8 @@ msgid "Invalid Evolution backup file"
msgstr "无效的 Evolution 备份文件"
#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "请选择一个有效的备份文件进行恢复。"
+msgid "File '{0}' is not a valid Evolution backup file."
+msgstr "文件“{0}”不是有效的 Evolution 备份文件。"
#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
msgid "Are you sure you want to close Evolution?"
@@ -15850,8 +18525,8 @@ msgstr ""
"存的数据。"
#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "关闭并备份 Evolution"
+msgid "Close and _Back up Evolution"
+msgstr "关闭并备份 Evolution (_B)"
#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
msgid ""
@@ -15869,8 +18544,8 @@ msgstr ""
"存的数据。这会删除所有您当前 Evolution 的数据和设置，并从您的备份中恢复。"
#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "关闭并恢复 Evolution"
+msgid "Close and _Restore Evolution"
+msgstr "关闭并恢复 Evolution (_R)"
#: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
msgid "Insufficient Permissions"
@@ -15880,92 +18555,97 @@ msgstr "权限不够"
msgid "The selected folder is not writable."
msgstr "选中的文件夹不可写。"
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:160
#, c-format
msgid "Failed to spawn Bogofilter (%s): "
msgstr "无法生成 Bogofilter (%s)："
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:178
msgid "Failed to stream mail message content to Bogofilter: "
msgstr "无法将邮件信息内容通过流传送给 Bogofilter："
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:227
msgid "Bogofilter either crashed or failed to process a mail message"
msgstr "Bogofilter 可能崩溃了或无法处理邮件信息"
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:372
msgid "Bogofilter Options"
msgstr "Bogofilter 选项"
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:381
msgid "Convert message text to _Unicode"
msgstr "将信息文本转换为 _Unicode"
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:539
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
msgid "Bogofilter"
msgstr "Bogofilter"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
+msgstr "使用 Bogofilter 过滤垃圾"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
msgid "Standard LDAP Port"
msgstr "标准 LDAP 端口"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
msgid "LDAP over SSL (deprecated)"
msgstr "通过 SSL 的 LDAP(已废弃)"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
msgid "Microsoft Global Catalog"
msgstr "Microsoft 全局目录服务"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
msgid "Microsoft Global Catalog over SSL"
msgstr "通过 SSL 的 Microsoft 全局目录服务"
#. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
msgid "Connecting to LDAP"
msgstr "重新连接到 LDAP"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
msgid "Server Information"
msgstr "服务器信息"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
msgid "Port:"
msgstr "端口："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
msgid "StartTLS (recommended)"
msgstr "StartTLS (推荐)"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
msgid "Encryption:"
msgstr "加密："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
msgid "Authentication"
msgstr "身份验证"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
msgid "Anonymous"
msgstr "匿名"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名(DN)"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
msgid "Method:"
msgstr "方法："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to \"Using email address\" requires anonymous access to your "
@@ -15975,36 +18655,36 @@ msgstr ""
"LDAP 服务器匿名访问。"
#. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
msgid "Using LDAP"
msgstr "使用 LDAP"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/mail/e-mail-shell-view.c:120
msgid "Searching"
msgstr "搜索"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
msgid "Search Base:"
msgstr "搜索基础："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
msgid "Find Possible Search Bases"
msgstr "查找可能的搜索基础"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
msgid "One Level"
msgstr "一级"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
msgid "Subtree"
msgstr "子树"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
msgid "Search Scope:"
msgstr "搜索范围："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of \"Subtree\" will include all entries "
@@ -16015,28 +18695,28 @@ msgstr ""
"搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
msgid "Search Filter:"
msgstr "搜索过滤器："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
msgid "Downloading"
msgstr "下载"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
msgid "Limit:"
msgstr "限制："
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
msgid "contacts"
msgstr "联系人"
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
msgid "Browse until limit is reached"
msgstr "浏览直到达到极限"
#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
msgid "URL:"
msgstr "URL："
@@ -16045,61 +18725,38 @@ 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:441
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP 错误：%s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-msgid "Could not parse response"
-msgstr "无法解析响应"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
-msgid "Empty response"
-msgstr "空响应"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
-msgid "Unexpected reply from server"
-msgstr "服务器响应异常"
-
-#: ../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:1342
-msgid "Path"
-msgstr "路径"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:213
msgid "Choose a Calendar"
msgstr "选择日历"
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:217
msgid "Choose a Memo List"
-msgstr "选择备忘列表"
+msgstr "选择备忘录列表"
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-google/e-google-chooser-button.c:221
msgid "Choose a Task List"
msgstr "选择一个任务列表"
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
msgid "Find Calendars"
msgstr "查找日历"
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
msgid "Find Memo Lists"
-msgstr "查找备忘列表"
+msgstr "查找备忘录列表"
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
msgid "Find Task Lists"
msgstr "查找任务列表"
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
msgid "Email:"
msgstr "电子邮件："
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
msgid "Server handles meeting invitations"
msgstr "服务器处理会议邀请"
@@ -16107,106 +18764,191 @@ msgstr "服务器处理会议邀请"
msgid "Choose which address books to use."
msgstr "选择使用哪个地址簿。"
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
msgid "Use in Birthdays & Anniversaries calendar"
msgstr "在生日和纪念日日历中使用"
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
msgid "Default User Calendar"
msgstr "删除用户日历"
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "输入“%s”的 Google 密码。"
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "用户拒绝提供密码"
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
msgid "Use an existing iCalendar (ics) file"
msgstr "使用已有的 iCalendar (ics) 文件"
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
msgid "iCalendar File"
msgstr "iCalendar 文件"
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
msgid "Choose an iCalendar file"
msgstr "选择 iCalendar 文件"
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
msgid "File:"
msgstr "文件："
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
msgid "Allow Evolution to update the file"
msgstr "允许 Evolution 更新该文件"
-#. Translators: Translate to the default units to use for presenting
-#. * temperature units to the user. The value can be only "default:inch"
-#. * or "default:mm", any other value is treated as "default:mm" (quotes
-#. * for clarity only). Note the value is used only if the system this
-#. * is running on doesn't provide other ways for figuring out temperature
-#. * units for the current locale.
-#.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:188
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
msgctxt "locale-metric"
msgid "default:mm"
-msgstr "default:mm"
+msgstr "默认：毫米"
#. Translators: This is the temperature in degrees
#. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:260
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
msgid "Fahrenheit (°F)"
msgstr "华氏(°F)"
#. Translators: This is the temperature in degrees
#. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:265
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
msgid "Centigrade (°C)"
msgstr "摄氏(°C)"
#. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
msgid "Kelvin (K)"
msgstr "开氏(K)"
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:271
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
msgid "Units:"
msgstr "单位："
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
#: ../smime/gui/smime-ui.ui.h:9
msgid "I_mport"
msgstr "导入(_M)"
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "正在导入活动"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "正在导入备忘"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "正在导入任务"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
msgid "Select a Calendar"
msgstr "选择一个日历"
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "选择一个备忘录列表"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
msgid "Select a Task List"
msgstr "选择一个任务列表"
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
msgid "I_mport to Calendar"
msgstr "导入到日历(_M)"
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "导入到任务(_M)"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "导入到备忘录列表(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "导入到任务列表(_M)"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "新建日历"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "新建备忘录列表"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "新建任务列表"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
+#, c-format
+msgid "Copying an event into the calendar '%s'"
+msgstr "正在将活动复制到日历“%s”"
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "正在将活动移至日历“%s”"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "正在将备忘录复制到备忘录列表“%s”"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "正在将备忘录移至备忘录列表“%s”"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
+#, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "正在将任务复制到任务列表“%s”"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
+#, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "正在将任务移至任务列表“%s”"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
+msgid "Calendar Selector"
+msgstr "日历选择器"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+msgid "Memo List Selector"
+msgstr "备忘录列表选择器"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+msgid "Task List Selector"
+msgstr "任务列表选择器"
+
+#: ../modules/calendar/e-calendar-preferences.c:520
msgid "Selected Calendars for Alarms"
msgstr "已选择用于提醒的日历"
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:616
+msgid "Meeting Invitations"
+msgstr "会议邀请"
+
+#: ../modules/calendar/e-calendar-preferences.c:642
+msgid "_Delete message after acting"
+msgstr "操作后删除信息(_D)"
+
+#: ../modules/calendar/e-calendar-preferences.c:656
+#: ../modules/calendar/e-calendar-preferences.c:687
+msgid "Conflict Search"
+msgstr "冲突搜索"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:671
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "选择要搜索冲突会议的日历"
+
+#: ../modules/calendar/e-calendar-preferences.c:1057
msgid "Ti_me and date:"
msgstr "时间和日期(_M)："
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:1058
msgid "_Date only:"
msgstr "仅日期(_D)："
@@ -16267,7 +19009,7 @@ msgid "_24 hour"
msgstr "_24 小时"
#: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
msgid "Work Week"
msgstr "工作日"
@@ -16323,13 +19065,9 @@ msgstr "周日(_U)"
msgid "Day _ends:"
msgstr "一天结束(_E)："
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "提醒"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "删除项时要求确认(_A)"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "视图选项"
#: ../modules/calendar/e-calendar-preferences.ui.h:48
msgid "_Time divisions:"
@@ -16355,137 +19093,134 @@ msgstr "在底部左侧的日历中以斜体显示重复发生的事件(_E)"
msgid "Sc_roll Month View by a week"
msgstr "通过一个周来滚动月视图(_R)"
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "提醒"
+
#: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "删除项时要求确认(_A)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
msgid "Display"
msgstr "显示"
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
msgid "Task List"
msgstr "任务列表"
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
msgid "Highlight t_asks due today"
msgstr "高亮今天到期的任务(_A)"
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
msgid "Highlight _overdue tasks"
msgstr "高亮延期任务(_O)"
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
msgid "Display reminders in _notification area only"
msgstr "只在通知区域显示提醒(_O)"
-#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
#: ../modules/calendar/e-calendar-preferences.ui.h:65
+msgid "Display reminders for completed _tasks"
+msgstr "显示已完成工作的提醒(_T)"
+
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../modules/calendar/e-calendar-preferences.ui.h:67
msgid "Sh_ow a reminder"
msgstr "显示一条提醒(_O)"
#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
msgid "before every appointment"
msgstr "在每次约会前"
#. This is the first half of a user preference. "Show a reminder [time-period] before every
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
msgid "Show a _reminder"
msgstr "显示一条提醒(_R)"
#. This is the last half of a user preference. "Show a reminder [time-period] before every
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
msgid "before every anniversary/birthday"
msgstr "在每个周年/生日前"
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Default _snooze time (in minutes)"
+msgstr "默认小睡时间 [以分钟计] (_S)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
msgid "Select the calendars for reminder notification"
msgstr "选择用于提醒通知的日历"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
msgid "Default Free/Busy Server"
msgstr "默认闲/忙服务器"
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "Template:"
-msgstr "模板："
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
#, no-c-format
msgid "%u and %d will be replaced by user and domain from the email address."
msgstr "%u 和 %d 将被替换为电子邮件地址中的用户和域名。"
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
msgid "Publishing Information"
msgstr "发布信息"
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "新建日历"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
msgctxt "New"
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
msgctxt "New"
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
msgctxt "New"
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
msgid "Create a new calendar"
msgstr "创建新日历"
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
msgid "Calendar and Tasks"
msgstr "日历和任务"
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "打开日历“%s”"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "日历选择器"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
msgid "Print"
msgstr "打印"
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
msgid ""
"This operation will permanently erase all events older than the selected "
"amount of time. If you continue, you will not be able to recover these "
@@ -16495,367 +19230,363 @@ msgstr ""
#. Translators: This is the first part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
msgid "Purge events older than"
msgstr "销毁较早的事件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "复制项目"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "移动项目"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+msgid "Making an occurrence movable"
+msgstr "将事件标示成可移动"
#. Translators: Default filename part saving an event to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
msgid "event"
msgstr "事件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
msgid "Save as iCalendar"
msgstr "保存为 iCalendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
msgid "D_elete Calendar"
msgstr "删除日历(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
msgid "Delete the selected calendar"
msgstr "删除选中的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
msgid "Go Back"
msgstr "后退"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
msgid "Go Forward"
msgstr "前进"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
msgid "Select today"
msgstr "选择今天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
msgid "Select _Date"
msgstr "选择日期(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
msgid "Select a specific date"
msgstr "选择特定日期"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
msgid "Purg_e"
msgstr "销毁(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
msgid "Purge old appointments and meetings"
msgstr "销毁旧约会和会议"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
msgid "Refresh the selected calendar"
msgstr "刷新选中的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
msgid "Rename the selected calendar"
msgstr "重命名选中的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
msgid "Find _Next"
msgstr "查找下一个(_N)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
msgid "Find next occurrence of the current search string"
msgstr "寻找搜索字符串出现的下一个位置"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
msgid "Find _Previous"
msgstr "查找上一个(_P)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
msgid "Find previous occurrence of the current search string"
msgstr "寻找该搜索字符串出现的上一个位置"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
msgid "Stop _Running Search"
msgstr "停止正在运行的搜索(_R)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
msgid "Stop currently running search"
msgstr "停止当前正在运行的搜索"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
msgid "Show _Only This Calendar"
msgstr "只显示此日历(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
msgid "_Delete Appointment"
msgstr "删除约会(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
msgid "Delete selected appointments"
msgstr "删除选中的约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
msgid "Delete This _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
msgid "Delete this occurrence"
msgstr "删除此次发生"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
msgid "Delete All Occ_urrences"
msgstr "删除所有出现(_U)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
msgid "Delete all occurrences"
msgstr "删除全部发生"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
msgid "New All Day _Event..."
msgstr "新建全天事件(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
msgid "Create a new all day event"
msgstr "创建一个新的全天事件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
msgid "New _Meeting..."
msgstr "新建会议(_M)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
msgid "Create a new meeting"
msgstr "创建一个新的会议"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
msgid "_Open Appointment"
msgstr "打开约会(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
msgid "_Reply"
msgstr "回复(_R)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
msgid "Converts an appointment to a meeting"
msgstr "转换约会为会议"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
msgid "Conv_ert to Appointment..."
msgstr "转换到约会(_E)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
msgid "Converts a meeting to an appointment"
msgstr "转换会议为约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
msgid "Quit"
msgstr "退出"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
msgid "Day"
msgstr "天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
msgid "Show one day"
msgstr "显示一天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
msgid "List"
msgstr "列表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
msgid "Show as list"
msgstr "显示为列表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
msgid "Month"
msgstr "月"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
msgid "Show one month"
msgstr "显示一个月"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
msgid "Week"
msgstr "周"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
msgid "Show one week"
msgstr "显示一周"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
msgid "Show one work week"
msgstr "显示一个工作周"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
msgid "Active Appointments"
msgstr "活动约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
msgid "Next 7 Days' Appointments"
msgstr "下一周的约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
msgid "Occurs Less Than 5 Times"
msgstr "发生不到 5 次"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
msgid "Description contains"
msgstr "描述含有"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
msgid "Print..."
msgstr "打印..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
msgid "Print this calendar"
msgstr "打印此日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
msgid "Preview the calendar to be printed"
msgstr "预览将要打印的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
msgid "_Save as iCalendar..."
msgstr "保存为 iCalendar(_S)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
msgid "Go To"
msgstr "转到"
#. Translators: Default filename part saving a memo to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
msgid "memo"
msgstr "备忘"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
msgid "New _Memo"
msgstr "新建备忘(_M)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
msgid "_Open Memo"
msgstr "打开备忘(_O)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
msgid "View the selected memo"
msgstr "查看选中的备忘"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
msgid "Print the selected memo"
msgstr "打印选中的备忘"
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
msgid "Searching next matching event"
msgstr "正在搜索下一个匹配的事件"
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
msgid "Searching previous matching event"
msgstr "正在搜索上一个匹配的事件"
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
#, c-format
msgid "Cannot find matching event in the next %d year"
msgid_plural "Cannot find matching event in the next %d years"
msgstr[0] "无法在接下来的 %d 年中找到匹配的事件"
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
#, c-format
msgid "Cannot find matching event in the previous %d year"
msgid_plural "Cannot find matching event in the previous %d years"
msgstr[0] "无法在过去的 %d 年中找到匹配的事件"
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
msgid "Cannot search with no active calendar"
msgstr "无活动日历，无法搜索"
@@ -16863,236 +19594,208 @@ msgstr "无活动日历，无法搜索"
#. * no summary is filed, the '.ics' extension is concatenated to it.
#. Translators: Default filename part saving a task to a file when
#. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
msgid "task"
msgstr "任务"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
msgid "Mark selected tasks as complete"
msgstr "把选中任务标记为完成"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
msgid "Mark selected tasks as incomplete"
msgstr "把选中任务标记为未完成"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
msgid "Create a new task"
msgstr "创建新任务"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
msgid "_Open Task"
msgstr "打开任务(_O)"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
msgid "View the selected task"
msgstr "查看选中的任务"
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
msgid "Print the selected task"
msgstr "打印选中的任务"
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "新建备忘列表"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
msgctxt "New"
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
msgctxt "New"
msgid "_Shared Memo"
msgstr "共享的备忘(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
msgid "Create a new shared memo"
msgstr "创建一个新的共享备忘"
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
msgctxt "New"
msgid "Memo Li_st"
-msgstr "备忘列表(_S)"
+msgstr "备忘录列表(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
msgid "Create a new memo list"
-msgstr "创建新备忘列表"
+msgstr "创建新备忘录列表"
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "打开备忘列表“%s”"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "备忘列表选择器"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
msgid "Print Memos"
msgstr "打印备忘"
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
msgid "Memo List Properties"
-msgstr "备忘列表属性"
+msgstr "备忘录列表属性"
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
msgid "_Delete Memo"
msgstr "删除备忘(_D)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
msgid "_Find in Memo..."
msgstr "在备忘中查找(_F)..."
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
msgid "Search for text in the displayed memo"
msgstr "在显示备忘的主体中搜索文本"
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
msgid "D_elete Memo List"
-msgstr "删除备忘列表(_D)"
+msgstr "删除备忘录列表(_D)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
msgid "Delete the selected memo list"
-msgstr "重命名选中备忘列表"
+msgstr "重命名选中备忘录列表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
msgid "_New Memo List"
-msgstr "新建备忘列表(_N)"
+msgstr "新建备忘录列表(_N)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
msgid "Refresh the selected memo list"
-msgstr "重命名选中备忘列表"
+msgstr "重命名选中备忘录列表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
msgid "Rename the selected memo list"
-msgstr "重命名选中备忘列表"
+msgstr "重命名选中备忘录列表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
msgid "Show _Only This Memo List"
-msgstr "只显示此备忘列表(_O)"
+msgstr "只显示此备忘录列表(_O)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
msgid "Memo _Preview"
msgstr "备忘预览(_P)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
msgid "Show memo preview pane"
msgstr "显示备忘预览面板"
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
msgid "Show memo preview below the memo list"
-msgstr "在备忘列表下方显示备忘预览"
+msgstr "在备忘录列表下方显示备忘录预览"
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
msgid "Show memo preview alongside the memo list"
-msgstr "在备忘列表下方显示备忘预览"
+msgstr "在备忘录列表下方显示备忘录预览"
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
msgid "Print the list of memos"
-msgstr "打印备忘列表"
+msgstr "打印备忘录列表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
msgid "Preview the list of memos to be printed"
-msgstr "预览要打印的备忘列表"
+msgstr "预览要打印的备忘录列表"
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
msgid "Delete Memos"
msgstr "删除备忘"
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
msgid "Delete Memo"
msgstr "删除备忘"
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
#, c-format
msgid "%d selected"
msgstr "选中 %d 个"
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "新建任务列表"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
msgctxt "New"
msgid "_Task"
msgstr "任务(_T)"
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
msgctxt "New"
msgid "Assigne_d Task"
msgstr "分配的任务(_D)"
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
msgid "Create a new assigned task"
msgstr "创建新分配的任务"
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
msgctxt "New"
msgid "Tas_k List"
msgstr "任务列表(_K)"
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "正在打开任务列表“%s”"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "任务列表选择器"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
msgid "Print Tasks"
msgstr "打印任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -17103,111 +19806,107 @@ msgstr ""
"\n"
"确实删除这些任务吗？"
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
msgid "Do not ask me again"
msgstr "不要再次询问"
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
msgid "_Delete Task"
msgstr "删除任务(_D)"
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
msgid "_Find in Task..."
msgstr "在任务中查找(_F)..."
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
msgid "Search for text in the displayed task"
msgstr "在显示的任务中搜索文本"
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
msgid "D_elete Task List"
msgstr "删除任务列表(_D)"
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
msgid "Delete the selected task list"
msgstr "重命名选中任务列表"
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
msgid "Refresh the selected task list"
msgstr "更新选中任务列表"
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
msgid "Rename the selected task list"
msgstr "重命名选中任务列表"
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
msgid "Show _Only This Task List"
msgstr "只显示此任务列表(_O)"
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
msgid "Mar_k as Incomplete"
msgstr "标记为未完成(_K)"
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
msgid "Delete completed tasks"
msgstr "删除已完成的任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
msgid "Task _Preview"
msgstr "任务预览(_P)"
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
msgid "Show task preview pane"
msgstr "显示任务预览面板"
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
msgid "Show task preview below the task list"
msgstr "在任务列表下方显示任务预览"
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
msgid "Show task preview alongside the task list"
msgstr "在任务列表下方显示任务预览"
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
msgid "Active Tasks"
msgstr "活动任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
msgid "Next 7 Days' Tasks"
msgstr "下一周的任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
msgid "Print the list of tasks"
msgstr "打印任务列表"
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
msgid "Preview the list of tasks to be printed"
msgstr "预览要打印的任务列表"
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
msgid "Delete Tasks"
msgstr "删除任务"
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
msgid "Delete Task"
msgstr "删除任务"
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "销毁"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
@@ -17223,662 +19922,663 @@ msgstr "以邀请方式显示部分"
#. strftime format of a time,
#. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/itip-formatter/itip-view.c:226
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../modules/itip-formatter/itip-view.c:230
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:241
+#: ../modules/itip-formatter/itip-view.c:239
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:256
+#: ../modules/itip-formatter/itip-view.c:254
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:260
+#: ../modules/itip-formatter/itip-view.c:258
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:265
+#: ../modules/itip-formatter/itip-view.c:263
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:269
+#: ../modules/itip-formatter/itip-view.c:267
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../modules/itip-formatter/itip-view.c:286
#, 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:293
+#: ../modules/itip-formatter/itip-view.c:291
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:297
+#: ../modules/itip-formatter/itip-view.c:295
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:302
+#: ../modules/itip-formatter/itip-view.c:300
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:306
+#: ../modules/itip-formatter/itip-view.c:304
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:315
+#: ../modules/itip-formatter/itip-view.c:313
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:321
+#: ../modules/itip-formatter/itip-view.c:319
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:325
+#: ../modules/itip-formatter/itip-view.c:323
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:330
+#: ../modules/itip-formatter/itip-view.c:328
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:334
+#: ../modules/itip-formatter/itip-view.c:332
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:340
+#: ../modules/itip-formatter/itip-view.c:338
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:345
+#: ../modules/itip-formatter/itip-view.c:343
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:349
+#: ../modules/itip-formatter/itip-view.c:347
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:354
+#: ../modules/itip-formatter/itip-view.c:352
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:358
+#: ../modules/itip-formatter/itip-view.c:356
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../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
+#: ../modules/itip-formatter/itip-view.c:394
+#: ../modules/itip-formatter/itip-view.c:395
+#: ../modules/itip-formatter/itip-view.c:484
+#: ../modules/itip-formatter/itip-view.c:485
+#: ../modules/itip-formatter/itip-view.c:574
msgid "An unknown person"
msgstr "未知的人"
-#: ../modules/itip-formatter/itip-view.c:401
-#: ../modules/itip-formatter/itip-view.c:491
-#: ../modules/itip-formatter/itip-view.c:580
+#: ../modules/itip-formatter/itip-view.c:399
+#: ../modules/itip-formatter/itip-view.c:489
+#: ../modules/itip-formatter/itip-view.c:578
#, c-format
msgid "Please respond on behalf of %s"
msgstr "请以 %s 的身份回应"
-#: ../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 "Received on behalf of %s"
msgstr "以 %s 的身份接收"
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:406
#, c-format
msgid "%s through %s has published the following meeting information:"
msgstr "%s 通过 %s 发布了会议信息："
-#: ../modules/itip-formatter/itip-view.c:410
+#: ../modules/itip-formatter/itip-view.c:408
#, c-format
msgid "%s has published the following meeting information:"
msgstr "%s 发布了会议信息："
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:413
#, c-format
msgid "%s has delegated the following meeting to you:"
msgstr "%s 为您代理了下列会议："
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:416
#, c-format
msgid "%s through %s requests your presence at the following meeting:"
msgstr "%s 通过 %s 请求您参加下列会议："
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:418
#, c-format
msgid "%s requests your presence at the following meeting:"
msgstr "%s 请求您参加下列会议："
-#: ../modules/itip-formatter/itip-view.c:426
+#: ../modules/itip-formatter/itip-view.c:424
#, c-format
msgid "%s through %s wishes to add to an existing meeting:"
msgstr "%s 通过 %s 希望加入到已有的会议："
-#: ../modules/itip-formatter/itip-view.c:428
+#: ../modules/itip-formatter/itip-view.c:426
#, c-format
msgid "%s wishes to add to an existing meeting:"
msgstr "%s 希望加入到已有的会议："
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:430
#, 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:434
+#: ../modules/itip-formatter/itip-view.c:432
#, c-format
msgid "%s wishes to receive the latest information for the following meeting:"
msgstr "%s 希望接收到下列会议的最新信息："
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:436
#, c-format
msgid "%s through %s has sent back the following meeting response:"
msgstr "%s 通过 %s 发回了下列会议请求的响应："
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:438
#, c-format
msgid "%s has sent back the following meeting response:"
msgstr "%s 发回了下列会议请求的响应："
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:442
#, c-format
msgid "%s through %s has canceled the following meeting:"
msgstr "%s 通过 %s 取消了下列会议："
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
#, c-format
msgid "%s has canceled the following meeting:"
msgstr "%s 已取消下列会议："
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:448
#, c-format
msgid "%s through %s has proposed the following meeting changes."
msgstr "%s 通过 %s 提议了下列会议变更。"
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:450
#, c-format
msgid "%s has proposed the following meeting changes:"
msgstr "%s 已提议了下列会议变更："
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:454
#, c-format
msgid "%s through %s has declined the following meeting changes:"
msgstr "%s 通过 %s 拒绝了下列会议变更："
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:456
#, c-format
msgid "%s has declined the following meeting changes:"
msgstr "%s 拒绝了下列会议变更："
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:496
#, c-format
msgid "%s through %s has published the following task:"
msgstr "%s 通过 %s 发布了下列任务："
-#: ../modules/itip-formatter/itip-view.c:500
+#: ../modules/itip-formatter/itip-view.c:498
#, c-format
msgid "%s has published the following task:"
msgstr "%s 发布了下列任务："
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:503
#, c-format
msgid "%s requests the assignment of %s to the following task:"
msgstr "%s 请求给 %s 分配下列任务："
-#: ../modules/itip-formatter/itip-view.c:508
+#: ../modules/itip-formatter/itip-view.c:506
#, c-format
msgid "%s through %s has assigned you a task:"
msgstr "%s 通过 %s 为您分配了下列任务："
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
#, c-format
msgid "%s has assigned you a task:"
msgstr "%s 为您分配了一个任务："
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:514
#, c-format
msgid "%s through %s wishes to add to an existing task:"
msgstr "%s 通过 %s 希望加入到已有的任务："
-#: ../modules/itip-formatter/itip-view.c:518
+#: ../modules/itip-formatter/itip-view.c:516
#, c-format
msgid "%s wishes to add to an existing task:"
msgstr "%s 希望加入到已存在的任务："
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:520
#, 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:524
+#: ../modules/itip-formatter/itip-view.c:522
#, c-format
msgid ""
"%s wishes to receive the latest information for the following assigned task:"
msgstr "%s 想要收到所分配的下列任务的最新信息："
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:526
#, c-format
msgid "%s through %s has sent back the following assigned task response:"
msgstr "%s 通过 %s 发回了下列分配任务的回应："
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:528
#, c-format
msgid "%s has sent back the following assigned task response:"
msgstr "%s 发回了下列分配任务的回应："
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:532
#, c-format
msgid "%s through %s has canceled the following assigned task:"
msgstr "%s 通过 %s 取消了下列任务分配："
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:534
#, c-format
msgid "%s has canceled the following assigned task:"
msgstr "%s 取消分配的下列任务："
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:538
#, c-format
msgid "%s through %s has proposed the following task assignment changes:"
msgstr "%s 通过 %s 提议了下列任务分配变更："
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:540
#, c-format
msgid "%s has proposed the following task assignment changes:"
msgstr "%s 提议了下列任务分配变更："
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:544
#, c-format
msgid "%s through %s has declined the following assigned task:"
msgstr "%s 通过 %s 拒绝了下列任务分配："
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:546
#, c-format
msgid "%s has declined the following assigned task:"
msgstr "%s 拒绝了分配的下列任务："
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:585
#, c-format
msgid "%s through %s has published the following memo:"
msgstr "%s 通过 %s 发布了下列备忘："
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:587
#, c-format
msgid "%s has published the following memo:"
msgstr "%s 发布了下列备忘："
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:592
#, c-format
msgid "%s through %s wishes to add to an existing memo:"
msgstr "%s 通过 %s 希望加入到已有的备忘："
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:594
#, c-format
msgid "%s wishes to add to an existing memo:"
msgstr "%s 希望加入到已有的备忘中："
-#: ../modules/itip-formatter/itip-view.c:600
+#: ../modules/itip-formatter/itip-view.c:598
#, c-format
msgid "%s through %s has canceled the following shared memo:"
msgstr "%s 通过 %s 取消了下列共享备忘："
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../modules/itip-formatter/itip-view.c:600
#, c-format
msgid "%s has canceled the following shared memo:"
msgstr "%s 取消了下列共享备忘："
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:674
msgid "All day:"
msgstr "全天："
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:680
msgid "Start day:"
msgstr "开始日期："
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:1515
msgid "Start time:"
msgstr "开始时间："
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:689
msgid "End day:"
msgstr "结束日期："
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:1516
msgid "End time:"
msgstr "结束时间："
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1039
msgid "Ope_n Calendar"
msgstr "打开日历(_N)"
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1042
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1045
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1048
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1051
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1054
msgid "Acce_pt all"
msgstr "全部接受(_P)"
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1057
msgid "Acce_pt"
msgstr "接受(_P)"
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1060
msgid "Send _Information"
msgstr "发送信息(_I)"
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1063
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1066
+#: ../smime/gui/certificate-manager.c:1666
msgid "_Update"
msgstr "更新(_U)"
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1566
+#: ../modules/itip-formatter/itip-view.c:1637
msgid "Comment:"
msgstr "注释："
#. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1554
msgid "Send reply to sender"
msgstr "回复发件人"
#. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1569
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
#. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1572
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1573
msgid "Show time as _free"
msgstr "将时间显示为空闲(_F)"
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1574
msgid "_Preserve my reminder"
msgstr "保留我的提醒(_P)"
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1575
msgid "_Inherit reminder"
msgstr "继承提醒(_I)"
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1908
msgid "_Tasks:"
msgstr "任务(_T)："
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1911
msgid "_Memos:"
msgstr "备忘(_M)："
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3217
msgid "Sa_ve"
msgstr "保存(_V)"
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:5151
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3859
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3889
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:4024
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4032
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../modules/itip-formatter/itip-view.c:3919
+#: ../modules/itip-formatter/itip-view.c:4037
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../modules/itip-formatter/itip-view.c:3924
+#: ../modules/itip-formatter/itip-view.c:4042
msgid "Unable to find this memo in any memo list"
-msgstr "无法在任何备忘列表中找到此备忘"
+msgstr "无法在任何备忘录列表中找到此备忘录"
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../modules/itip-formatter/itip-view.c:4387
msgid "Opening the calendar. Please wait..."
msgstr "正在打开日历，请稍候..."
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4392
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../modules/itip-formatter/itip-view.c:4668
+#: ../modules/itip-formatter/itip-view.c:4787
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../modules/itip-formatter/itip-view.c:4683
+#: ../modules/itip-formatter/itip-view.c:4802
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4807
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4813
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4819
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4840
+#: ../modules/itip-formatter/itip-view.c:5298
+#: ../modules/itip-formatter/itip-view.c:5404
msgid "Saving changes to the calendar. Please wait..."
msgstr "正在保存日历更改，请稍候..."
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4881
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:5074
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:5091
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:5095
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../modules/itip-formatter/itip-view.c:5024
+#: ../modules/itip-formatter/itip-view.c:5143
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5187
msgid "The meeting is invalid and cannot be updated"
msgstr "会议无效，无法更新"
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5263
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新，原因是状态无效"
-#: ../modules/itip-formatter/itip-view.c:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5335
+#: ../modules/itip-formatter/itip-view.c:5374
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5437
msgid "Meeting information sent"
msgstr "会议信息已发送"
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5442
msgid "Task information sent"
msgstr "任务信息已发送"
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5447
msgid "Memo information sent"
msgstr "备忘信息已发送"
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5458
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "无法发送会议信息，会议不存在"
-#: ../modules/itip-formatter/itip-view.c:5343
+#: ../modules/itip-formatter/itip-view.c:5463
msgid "Unable to send task information, the task does not exist"
msgstr "无法发送任务信息，任务不存在"
-#: ../modules/itip-formatter/itip-view.c:5348
+#: ../modules/itip-formatter/itip-view.c:5468
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:5413
+#: ../modules/itip-formatter/itip-view.c:5533
msgid "calendar.ics"
msgstr "calendar.ics"
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5538
msgid "Save Calendar"
msgstr "保存日历"
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5587
+#: ../modules/itip-formatter/itip-view.c:5600
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5588
+#: ../modules/itip-formatter/itip-view.c:5601
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信息声明其包含日历，但日历不是有效的 iCalendar。"
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5643
+#: ../modules/itip-formatter/itip-view.c:5673
+#: ../modules/itip-formatter/itip-view.c:5774
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5674
+#: ../modules/itip-formatter/itip-view.c:5775
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:5569
+#: ../modules/itip-formatter/itip-view.c:5689
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5690
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目，应该保存文件并导入日历"
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../modules/itip-formatter/itip-view.c:6193
msgctxt "cal-itip"
msgid "None"
msgstr "无"
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6209
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6369
msgid "This meeting recurs"
msgstr "此会议重现"
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6372
msgid "This task recurs"
msgstr "此任务重现"
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6375
msgid "This memo recurs"
msgstr "此备忘重现"
@@ -17895,45 +20595,19 @@ msgstr "该会议已被代理"
msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”？"
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "会议邀请"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "操作后删除信息(_D)"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr "冲突搜索"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "选择要搜索冲突会议的日历"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip 格式化"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
msgid "Google Features"
msgstr "Google 特性"
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
msgid "Add Google Ca_lendar to this account"
msgstr "添加 Google Ca_lendar 到此帐。"
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
msgid "Add Google Con_tacts to this account"
msgstr "添加 Google Con_tacts 到此帐号"
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:286
msgid "You may need to enable IMAP access"
msgstr "您可能需要启用 IMAP 访问"
@@ -17975,60 +20649,60 @@ msgid "Choose a mbox spool directory"
msgstr "选择 mbox 池目录"
#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
#: ../modules/plugin-manager/evolution-plugin-manager.c:158
msgid "Configuration"
msgstr "配置"
#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
#: ../plugins/publish-calendar/publish-calendar.ui.h:24
msgid "_Server:"
msgstr "服务器(_S)："
#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
msgid "_Port:"
msgstr "端口(_P)："
#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
msgid "User_name:"
msgstr "用户名(_N)："
#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
msgid "Encryption _method:"
msgstr "加密方法(_M)："
#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
msgid "STARTTLS after connecting"
msgstr "连接后进行 STARTTLS"
#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
msgid "SSL on a dedicated port"
msgstr "专用端口上的 SSL"
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
msgid "_Use custom binary, instead of 'sendmail'"
msgstr "使用自定义二进制程序，而不是 'sendmail' (_U)"
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
msgid "_Custom binary:"
msgstr "自定义命令(_C)："
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
msgid "U_se custom arguments"
msgstr "使用自定义参数(_S)"
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
msgid "Cus_tom arguments:"
msgstr "自定义参数(_T)："
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
msgid ""
"Default arguments are '-i -f %F -- %R', where\n"
" %F - stands for the From address\n"
@@ -18038,502 +20712,521 @@ msgstr ""
" %F - 表示来源地址\n"
" %R - 表示收件人地址"
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
msgid "Send mail also when in offline _mode"
msgstr "脱机模式下也可发送邮件(_M)"
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
msgid "T_ype:"
msgstr "类型(_Y)："
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
msgid "Yahoo! Features"
msgstr "Yahoo! 特性"
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
msgid "Add Yahoo! Ca_lendar and Tasks to this account"
msgstr "添加 Yahoo! 日历和任务到此帐号(_L) "
-#: ../modules/mail/e-mail-attachment-handler.c:424
+#: ../modules/mail/e-mail-attachment-handler.c:440
#, c-format
msgid "%d attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 个附加的信息"
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:353
msgctxt "New"
msgid "_Mail Message"
msgstr "信息(_M)"
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:355
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:363
msgctxt "New"
msgid "Mail Acco_unt"
msgstr "邮件帐号(_U)"
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:365
msgid "Create a new mail account"
msgstr "创建新邮件帐号"
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:370
msgctxt "New"
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:372
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:687
msgid "Mail Accounts"
msgstr "邮件帐号"
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:696
msgid "Mail Preferences"
msgstr "邮件首选项"
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:705
msgid "Composer Preferences"
msgstr "编写器首选项"
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:715
msgid "Network Preferences"
msgstr "网络首选项"
#. Translators: The first item in the list, to be
#. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:964
+#: ../modules/mail/e-mail-shell-backend.c:1007
msgctxt "label"
msgid "None"
msgstr "无"
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:713
msgid "Marking messages as read..."
msgstr "正在把信息标记为已读..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+msgid "Go to Folder"
+msgstr "前往文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "_Select"
+msgstr "选择(_S)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
msgid "_Disable Account"
msgstr "禁用帐号(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
msgid "Disable this account"
msgstr "禁用这个帐号"
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
msgid "Permanently remove all the deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
msgid "Edit properties of this account"
msgstr "编辑该帐号的属性"
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
msgid "Refresh list of folders of this account"
msgstr "刷新该帐号的文件夹列表"
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
msgid "_Download Messages for Offline Usage"
msgstr "下载信息以离线使用(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
msgid "Download messages of accounts and folders marked for offline usage"
msgstr "下载标记为离线使用的帐号和文件夹的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
msgid "Fl_ush Outbox"
msgstr "清空发件箱(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
msgid "Copy the selected folder into another folder"
msgstr "把选中的文件夹复制到其它文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
msgid "E_xpunge"
msgstr "销毁(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
msgid "Permanently remove all deleted messages from this folder"
msgstr "从该文件夹永久删除所有已删除的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
msgid "Mar_k All Messages as Read"
msgstr "把全部信息标记为已读(_K)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
msgid "Mark all messages in the folder as read"
msgstr "将此文件夹中的所有信息标记为已读"
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
msgid "_Move Folder To..."
msgstr "文件夹移至(_M)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
msgid "Move the selected folder into another folder"
msgstr "把选中的文件夹移至其它文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
msgid "_New..."
msgstr "新建(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
msgid "Create a new folder for storing mail"
msgstr "创建存储邮件的新文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
msgid "Change the properties of this folder"
msgstr "更改此文件夹的属性"
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
msgid "Refresh the folder"
msgstr "刷新文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
msgid "Change the name of this folder"
msgstr "更改此文件夹的名称"
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
msgid "Select Message _Thread"
msgstr "选择信息线索(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
msgid "Select all messages in the same thread as the selected message"
msgstr "把同一线索中的所有信息选择为选中信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
msgid "Select Message S_ubthread"
msgstr "选择信息子线索(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
msgid "Select all replies to the currently selected message"
msgstr "选择当前选中信息的所有回复"
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
msgid "Empty _Trash"
msgstr "清空废件箱(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
msgid "Permanently remove all the deleted messages from all accounts"
msgstr "永久删除所有帐号中的所有已删除的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+msgid "Go to _Folder"
+msgstr "前往文件夹(_F)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+msgid "Opens a dialog to select a folder to go to"
+msgstr "打开对话框选取要移至的文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
msgid "_New Label"
msgstr "新建标签(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
msgid "N_one"
msgstr "无(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
msgid "_Manage Subscriptions"
msgstr "管理订阅(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或退订远程服务器上的文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
msgid "Send / _Receive"
msgstr "发送/接收(_R)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
msgid "R_eceive All"
msgstr "全部接收(_E)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
msgid "Receive new items from all accounts"
msgstr "接收所有帐号中的新条目"
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
msgid "_Send All"
msgstr "全部发送(_S)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
msgid "Send queued items in all accounts"
msgstr "发送所有帐号的队列中的条目"
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
msgid "Cancel the current mail operation"
msgstr "取消当前邮件操作"
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
msgid "Collapse All _Threads"
msgstr "折叠全部线索(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
msgid "Collapse all message threads"
msgstr "折叠全部信息线索"
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
msgid "E_xpand All Threads"
msgstr "展开全部线索(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
msgid "Expand all message threads"
msgstr "展开全部信息线索"
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
msgid "_Message Filters"
msgstr "信息过滤(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
msgid "Create or edit rules for filtering new mail"
msgstr "创建或编辑过滤新邮件的规则"
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
msgid "_Subscriptions..."
msgstr "订阅(_S)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
msgid "F_older"
msgstr "文件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
msgid "_Label"
msgstr "标签(_L)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
msgid "Create or edit search folder definitions"
msgstr "创建或编辑搜索文件夹定义"
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
msgid "Show Message _Preview"
msgstr "显示信息预览(_P)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
msgid "Show message preview pane"
msgstr "显示信息预览窗口"
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
msgid "Show _Deleted Messages"
msgstr "显示删除的信息(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
msgid "Show deleted messages with a line through them"
msgstr "在信息列表中显示删除了的信息(带有删除线)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
msgid "_Group By Threads"
msgstr "按线索分组(_G)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
msgid "Threaded message list"
msgstr "按线索排列信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
msgid "_Unmatched Folder Enabled"
msgstr "“未匹配”文件夹已启用(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
msgid "Toggles whether Unmatched search folder is enabled"
msgstr "开关“未匹配”搜索文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
msgid "Show message preview below the message list"
msgstr "在信息列表下方显示信息预览"
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
msgid "Show message preview alongside the message list"
msgstr "在信息列表旁显示信息预览"
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
msgid "All Messages"
msgstr "全部信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
msgid "Important Messages"
msgstr "重要信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
msgid "Last 5 Days' Messages"
msgstr "前五天的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
msgid "Messages Not Junk"
msgstr "不是垃圾信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
msgid "Messages with Attachments"
msgstr "有附件的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
msgid "No Label"
msgstr "无标签"
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
msgid "Read Messages"
msgstr "已读信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
msgid "Unread Messages"
msgstr "未读信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
msgid "Subject or Addresses contain"
msgstr "主题或地址含有"
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
msgid "All Accounts"
msgstr "全部帐号"
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
msgid "Current Account"
msgstr "当前帐号"
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
msgid "Current Folder"
msgstr "当前文件夹"
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
msgid "All Account Search"
msgstr "全部帐号搜索"
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
msgid "Account Search"
msgstr "帐号搜索"
-#: ../modules/mail/e-mail-shell-view-private.c:969
+#: ../modules/mail/e-mail-shell-view-private.c:954
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "已选中 %d 个，"
-#: ../modules/mail/e-mail-shell-view-private.c:978
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../modules/mail/e-mail-shell-view-private.c:980
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../modules/mail/e-mail-shell-view-private.c:1004
-#: ../modules/mail/e-mail-shell-view-private.c:1010
+#: ../modules/mail/e-mail-shell-view-private.c:989
+#: ../modules/mail/e-mail-shell-view-private.c:995
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../modules/mail/e-mail-shell-view-private.c:1017
+#: ../modules/mail/e-mail-shell-view-private.c:1002
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:1008
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1014
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../modules/mail/e-mail-shell-view-private.c:1041
+#: ../modules/mail/e-mail-shell-view-private.c:1031
#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "，%d 封未读，"
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d 封未读"
-#: ../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:1065
-msgid "Trash"
-msgstr "回收站"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1502
+#: ../modules/mail/e-mail-shell-view-private.c:1549
msgid "Send / Receive"
msgstr "发送/接收"
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/mail/em-composer-prefs.c:414
msgid "Select Folder to Add"
msgstr "选择要添加的文件夹"
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:884
msgid "Folder"
msgstr "文件夹"
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:920
msgid "Recipient"
msgstr "收件人"
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1205
+msgid "Keep in Outbox"
+msgstr "保留在发件箱"
+
+#: ../modules/mail/em-composer-prefs.c:1206
+msgid "Send immediately"
+msgstr "立即发送"
+
+#: ../modules/mail/em-composer-prefs.c:1207
+msgid "Send after 5 minutes"
+msgstr "5 分钟后发送"
+
+#: ../modules/mail/em-composer-prefs.c:1280
msgid "Language(s)"
msgstr "语言"
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
msgid "On exit, every time"
msgstr "退出时，每次"
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "Once per day"
+msgstr "每天一次"
+
#: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
-msgstr "退出时，每天一次"
+msgid "Once per week"
+msgstr "每周一次"
#: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
-msgstr "退出时，每周一次"
+msgid "Once per month"
+msgstr "每月一次"
#: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "退出时，每月一次"
-
-#: ../modules/mail/em-mailer-prefs.c:84
msgid "Immediately, on folder leave"
msgstr "立即，一离开文件夹"
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:420
msgid "Header"
msgstr "页眉"
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:424
msgid "Contains Value"
msgstr "包含值"
#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1214
+#: ../modules/mail/em-mailer-prefs.c:1554
msgid "_Date header:"
msgstr "日期头：(_D)"
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1555
msgid "Show _original header value"
msgstr "显示原始邮件头值(_o)"
@@ -18543,24 +21236,24 @@ msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端
#. Translators: First %s is an email address, second %s
#. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
#, c-format
msgid "Your message to %s about \"%s\" on %s has been read."
msgstr "您在 %3$s 上给 %1$s 发送的关于“%2$s”的信息已被阅读。"
#. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
#, c-format
msgid "Delivery Notification for \"%s\""
msgstr "“%s”的邮件通知"
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
#, c-format
msgid "Send a read receipt to '%s'"
msgstr "向“%s”发送回执"
#. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
msgid "_Notify Sender"
msgstr "通知发件人(_N)"
@@ -18602,20 +21295,20 @@ msgstr "插件管理器"
msgid "Note: Some changes will not take effect until restart"
msgstr "注意：某些更改直到重新启动后才生效"
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
msgid "Overview"
msgstr "概览"
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
msgid "Plugin"
msgstr "插件"
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
msgid "_Plugins"
msgstr "插件(_P)"
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
msgid "Enable and disable plugins"
msgstr "启用和禁用插件"
@@ -18635,34 +21328,34 @@ msgstr "显示 HTML 版本"
msgid "Display HTML version of multipart/alternative message"
msgstr "显示多部分/可选信息的 HTML 版本"
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
#: ../modules/prefer-plain/plugin/config-ui.c:43
msgid "Show HTML if present"
msgstr "首选 HTML"
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
#: ../modules/prefer-plain/plugin/config-ui.c:44
msgid "Let Evolution choose the best part to show."
msgstr "让Evolution选择最好的部分显示。"
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
#: ../modules/prefer-plain/plugin/config-ui.c:47
msgid "Show plain text if present"
msgstr "如果可用则显示纯文本"
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
#: ../modules/prefer-plain/plugin/config-ui.c:48
msgid ""
"Show plain text part, if present, otherwise let Evolution choose the best "
"part to show."
msgstr "如果提出，那么显示纯文本部分，否则让Evolution选择好的部分显示，"
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
#: ../modules/prefer-plain/plugin/config-ui.c:52
msgid "Only ever show plain text"
msgstr "仅显示纯文本"
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
#: ../modules/prefer-plain/plugin/config-ui.c:53
msgid ""
"Always show plain text part and make attachments from other parts, if "
@@ -18690,56 +21383,61 @@ msgstr "纯文字模式"
msgid "View mail messages as plain text, even if they contain HTML content."
msgstr "作为纯文本来查看邮件信息，甚至在它们包含 HTML 内容时。"
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
#, c-format
msgid "Failed to spawn SpamAssassin (%s): "
msgstr "无法生成 SpamAssassin (%s)："
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
msgid "Failed to stream mail message content to SpamAssassin: "
msgstr "无法将邮件信息内容通过流传送给 SpamAssassin："
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
#, c-format
msgid "Failed to write '%s' to SpamAssassin: "
msgstr "无法将“%s”写入 SpamAssassin："
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
msgid "Failed to read output from SpamAssassin: "
msgstr "读取 SpamAssassin 输出失败："
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
msgid "SpamAssassin either crashed or failed to process a mail message"
msgstr "SpamAssassin 崩溃了，或无法处理邮件信息"
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
msgid "SpamAssassin Options"
msgstr "垃圾克星选项"
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
msgid "I_nclude remote tests"
msgstr "包含远程测试(_N)"
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
msgid "This will make SpamAssassin more reliable, but slower."
msgstr "这将让 SpamAssassin 更可靠，但稍慢。"
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
msgid "SpamAssassin"
msgstr "SpamAssassin"
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
+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:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
msgid "Importing Files"
msgstr "导入文件"
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
msgid "Import cancelled."
msgstr "导入已取消。"
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
msgid "Import complete."
msgstr "导入完成。"
@@ -18766,11 +21464,11 @@ msgstr "格式化为(_F)..."
msgid "_Other languages"
msgstr "其他语言(_O)"
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
msgid "Text Highlight"
msgstr "文字高度"
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
msgid "Syntax highlighting of mail parts"
msgstr "邮件部分的语法高亮"
@@ -18798,10 +21496,6 @@ msgstr "_C#"
msgid "_Cascade Style Sheet"
msgstr "层叠样式表(_CSS)"
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
#: ../modules/text-highlight/languages.c:80
msgid "_Java"
msgstr "_Java"
@@ -18963,30 +21657,26 @@ msgid "_Prolog"
msgstr "_Prolog"
#: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_PostScript"
-
-#: ../modules/text-highlight/languages.c:328
msgid "_R"
msgstr "_R"
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
msgid "_RPM Spec"
msgstr "_RPM Spec"
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
msgid "_Scala"
msgstr "_Scala"
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
msgid "_Smalltalk"
msgstr "_Smalltalk"
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
msgid "_TCSH"
msgstr "_TCSH"
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
msgid "_VHDL"
msgstr "_VHDL"
@@ -19026,11 +21716,11 @@ msgstr "将该部分显示为地址簿联系人"
msgid "Evolution Web Inspector"
msgstr "Evolution 网络审查器"
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
msgid "_Do not show this message again."
msgstr "不再显示此信息(_D)。"
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:465
#: ../plugins/templates/templates.c:478
msgid "Keywords"
msgstr "关键字"
@@ -19061,35 +21751,35 @@ msgstr "附件提醒"
msgid "Reminds you when you forgot to add an attachment to a mail message."
msgstr "当您忘记为邮件信息添加附件时提醒您。"
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:739
msgid "Create _address book entries when sending mails"
msgstr "回复邮件时自动在地址簿中创建联系人项(_a)"
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:749
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:769
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:784
msgid "_Synchronize contact info and images from Pidgin buddy list"
msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像(_S)"
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:794
msgid "Select Address book for Pidgin buddy list"
msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:810
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
@@ -19166,12 +21856,12 @@ msgctxt "email-custom-header"
msgid "None"
msgstr "无"
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
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:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
msgid ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by \";\"."
@@ -19179,11 +21869,11 @@ msgstr ""
"指定头和头值的格式为：\n"
"自定义头的名称，值，头与头之间以“;”分割。"
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
msgid "Key"
msgstr "键"
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
#: ../plugins/templates/templates.c:487
msgid "Values"
msgstr "值"
@@ -19217,8 +21907,8 @@ msgstr ""
msgid "_Automatically launch when a new mail is edited"
msgstr "在编辑新邮件时自动启动(_A)"
-#: ../plugins/external-editor/external-editor.c:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:530
+#: ../plugins/external-editor/external-editor.c:532
msgid "Compose in External Editor"
msgstr "在外部编辑器中写作"
@@ -19260,23 +21950,27 @@ msgid ""
"closed as long as the editor is active."
msgstr "外部编辑器仍在运行。邮件编辑器窗口无法在外部文本编辑器活动时关闭。"
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
msgid "Select a Face Picture"
msgstr "选择一个文件"
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
msgid "Image files"
msgstr "图像文件"
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
msgid "_Insert Face picture by default"
msgstr "按默认方式插入头像图片(_I)"
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
msgid "Load new _Face picture"
msgstr "加载新头像图片(_F)"
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+msgid "Change Face Image"
+msgstr "改变头像"
+
+#: ../plugins/face/face.c:537
msgid "Include _Face"
msgstr "包含头像(_F)"
@@ -19297,24 +21991,31 @@ msgid "Invalid Image Size"
msgstr "无效的图像大小"
#: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "请选择一个 48x48 的图像"
+msgid ""
+"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"exceed 723 bytes."
+msgstr "请选择尺寸为 48 * 48 像素的 PNG 图像，整个文件容量不超过 723 字节。"
#: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "不是一个图像"
+msgid "Incorrect Face Image Byte Size"
+msgstr "不正确的头像字节容量"
#: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
-msgstr "您选择的文件好象不是有效的 PNG 图像。错误：{0}"
+msgid ""
+"The Face image size is {0} bytes, while it should not be more than 723 "
+"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
+"doesn't exceed 723 bytes."
+msgstr ""
+"头像图像容量为 {0} 字节，但它不能超过 723 字节。请选择尺寸为 48 * 48 像素的 "
+"PNG 图像，整个文件容量不超过 723 字节。"
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "嵌入图像"
+#: ../plugins/face/org-gnome-face.error.xml.h:7
+msgid "Not an image"
+msgstr "不是一个图像"
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "直接在邮件信息里查看图像附件"
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+msgid "The file you selected does not look like a valid PNG image. Error: {0}"
+msgstr "您选取的文件似乎不是有效的 PNG 图像。错误：{0}"
#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
msgid "Get List _Archive"
@@ -19409,7 +22110,7 @@ msgid ""
"You should receive an answer from the mailing list shortly after the message "
"has been sent."
msgstr ""
-"将向 URL “{0}”发送电子邮件。您可以自动发送此信息，或者先看看再改改。\n"
+"将向 URL“{0}”发送电子邮件。您可以自动发送此信息，或者先看看再改改。\n"
"\n"
"稍后这封信发出之后，您应该能够从邮件列表收到响应。"
@@ -19450,8 +22151,8 @@ msgstr ""
"\n"
"头：{0}"
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:436
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
@@ -19459,54 +22160,54 @@ msgstr[0] "您收到了 %d 封新邮件。"
#. Translators: "From:" is preceding a new mail
#. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:411
#, c-format
msgid "From: %s"
msgstr "来自：%s"
#. Translators: "Subject:" is preceding a new mail
#. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:425
#, c-format
msgid "Subject: %s"
msgstr "主题：%s"
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:442
msgid "New email in Evolution"
msgstr "Evolution 中有新邮件"
#. Translators: The '%s' is a mail
#. * folder name. (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:483
#, c-format
msgid "Show %s"
msgstr "显示 %s"
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:687
msgid "_Play sound when a new message arrives"
msgstr "新信息到达时播放声音(_P)"
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:719
msgid "_Beep"
msgstr "响铃(_B)"
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:732
msgid "Use sound _theme"
msgstr "使用声音主题(_T)"
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:751
msgid "Play _file:"
msgstr "播放文件(_F)："
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:760
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:837
msgid "Notify new messages for _Inbox only"
msgstr "只通知收件箱中的新信息(_I)"
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:853
msgid "Show _notification when a new message arrives"
msgstr "新信息到达时在通知区显示通知(_N)"
@@ -19524,28 +22225,46 @@ msgstr "当新的邮件信息到达时提示您。"
msgid "Created from a mail by %s"
msgstr "被%s从邮件创建"
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "取消(_C)"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "新建(_N)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
#, c-format
msgid ""
"Selected calendar contains event '%s' already. Would you like to edit the "
"old event?"
msgstr "选定的日历已经包含“%s”事件。您想编辑旧的事件吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
#, c-format
msgid ""
"Selected task list contains task '%s' already. Would you like to edit the "
"old task?"
msgstr "选定的任务列表已经包含“%s”任务。您想编辑旧的任务吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
#, c-format
msgid ""
"Selected memo list contains memo '%s' already. Would you like to edit the "
"old memo?"
-msgstr "选定的备忘列表已经包含“%s”备忘。您想编辑旧的备忘吗？"
+msgstr "选定的备忘录列表已经包含“%s”备忘录。您想编辑旧的备忘录吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:642
#, c-format
msgid ""
"You have selected %d mails to be converted to events. Do you really want to "
@@ -19555,7 +22274,7 @@ msgid_plural ""
"add them all?"
msgstr[0] "您选择了将 %d 封邮件转换为事件。您真的要全部添加它们吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:649
#, c-format
msgid ""
"You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19565,7 +22284,7 @@ msgid_plural ""
"add them all?"
msgstr[0] "您选择了将 %d 封邮件转换为任务。您真的要全部添加它们吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:656
#, c-format
msgid ""
"You have selected %d mails to be converted to memos. Do you really want to "
@@ -19575,76 +22294,76 @@ msgid_plural ""
"add them all?"
msgstr[0] "您选择了将 %d 封邮件转换为备忘。您真的要全部添加它们吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:677
msgid "Do you wish to continue converting remaining mails?"
msgstr "您想继续转换剩下的邮件吗？"
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
msgid "[No Summary]"
msgstr "[没有概要]"
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
msgid "Invalid object returned from a server"
msgstr "从一个服务器上返回了无效的对象"
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:821
#, c-format
msgid "An error occurred during processing: %s"
msgstr "在处理时出现了一个错误：%s"
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:857
#, c-format
msgid "Cannot open calendar. %s"
msgstr "无法打开日历。%s"
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:861
msgid ""
"Selected calendar is read only, thus cannot create event there. Select other "
"calendar, please."
msgstr "选中的日历是只读的，因此不能在此创建事件。请选择其它的日历。"
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:864
msgid ""
"Selected task list is read only, thus cannot create task there. Select other "
"task list, please."
msgstr "选中的任务列表是只读的，因此不能在此创建任务。请选择其它的任务列表。"
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:867
msgid ""
"Selected memo list is read only, thus cannot create memo there. Select other "
"memo list, please."
msgstr ""
"选中的备忘录列表是只读的，因此不能在此创建备忘录。请选择其它的备忘录列表。"
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1269
msgid "Create an _Appointment"
msgstr "创建新约会(_A)"
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1271
msgid "Create a new event from the selected message"
msgstr "从选择的信息中创建一个新的事件"
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1276
msgid "Create a Mem_o"
msgstr "创建一个备忘(_O)"
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1278
msgid "Create a new memo from the selected message"
msgstr "用所选邮件创建新备忘"
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1283
msgid "Create a _Task"
msgstr "创建一个任务(_T)"
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1285
msgid "Create a new task from the selected message"
msgstr "用所选邮件创建新任务"
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1293
msgid "Create a _Meeting"
msgstr "创建一个会议(_M)"
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1295
msgid "Create a new meeting from the selected message"
msgstr "用所选邮件创建新会议"
@@ -19727,23 +22446,18 @@ msgstr "发布到%s成功完成"
msgid "Mount of %s failed:"
msgstr "加载 %s 失败："
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "启用(_N)"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
msgid "Are you sure you want to remove this location?"
msgstr "您确定您想要删除此位置吗？"
#. To Translators: This is shown to a user when creation of a new thread,
#. * where the publishing should be done, fails. Basically, this shouldn't
#. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1097
msgid "Could not create publish thread."
msgstr "无法创建发布索引。"
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1107
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
@@ -19824,6 +22538,7 @@ msgid "_Username:"
msgstr "用户名(_U)："
#: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:774
msgid "_Password:"
msgstr "密码(_P)："
@@ -19835,11 +22550,11 @@ msgstr "记住密码(_R)"
msgid "Publishing Location"
msgstr "发布位置"
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:84
+#: ../plugins/publish-calendar/publish-format-ical.c:104
#, c-format
msgid "Invalid source UID '%s'"
-msgstr "无效的源 UID “%s”"
+msgstr "无效的源 UID“%s”"
#: ../plugins/publish-calendar/url-editor-dialog.c:544
msgid "New Location"
@@ -19928,7 +22643,7 @@ msgstr "封装数值使用(_E)："
msgid "Comma separated values (.csv)"
msgstr "逗号分隔的值(.csv)"
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:179
msgid "iCalendar (.ics)"
msgstr "iCalendar (.ics)"
@@ -19953,15 +22668,15 @@ msgstr "%FT%T"
msgid "RDF (.rdf)"
msgstr "RDF (.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
msgid "_Format:"
msgstr "格式(_F)："
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
msgid "Select destination file"
msgstr "选择目的文件"
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
msgid "_Save As"
msgstr "另存为(_S)"
@@ -19971,7 +22686,7 @@ msgstr "保存选中的日历到磁盘"
#: ../plugins/save-calendar/save-calendar.c:378
msgid "Save the selected memo list to disk"
-msgstr "保存选中的备忘列表到磁盘"
+msgstr "保存选中的备忘录列表到磁盘"
#: ../plugins/save-calendar/save-calendar.c:409
msgid "Save the selected task list to disk"
@@ -19986,34 +22701,54 @@ msgstr ""
"基于草稿的模板插件。您可以使用 $ORIG[subject]、$ORIG[from]、$ORIG[to] 或 "
"$ORIG[body] 这样的变量，它们将替换为您所回复邮件中对应的值。"
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1245
msgid "No Title"
msgstr "无标题"
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1354
msgid "Save as _Template"
msgstr "另存为模板(_T)"
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1356
msgid "Save as Template"
msgstr "另存为模板"
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:379
msgid "Preparing to go offline..."
msgstr "正在准备离线..."
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:408
msgid "Preparing to go online..."
msgstr "正在准备上线..."
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:519
msgid "Preparing to quit"
msgstr "正在准备退出"
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:525
msgid "Preparing to quit..."
msgstr "正在准备退出..."
+#: ../shell/e-shell.c:1042
+msgid "Credentials are required to connect to the destination host."
+msgstr "需要凭证来连接到目的主机"
+
+#: ../shell/e-shell.c:1210 ../shell/e-shell-window-actions.c:827
+msgid "New _Window"
+msgstr "新建窗口(_W)"
+
+#: ../shell/e-shell.c:1221
+msgid "Quick _Reference"
+msgstr "速查表(_R)"
+
+#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:764
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:862
+msgid "_Quit"
+msgstr "退出(_Q)"
+
#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
msgid "Searches"
msgstr "搜索"
@@ -20026,38 +22761,34 @@ msgstr "保存搜索"
#. * allows the user to filter the current view. Examples of
#. * items that appear in the combo box are "Unread Messages",
#. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:937
+#: ../shell/e-shell-searchbar.c:926
msgid "Sho_w:"
msgstr "显示(_W)："
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:962
+#: ../shell/e-shell-searchbar.c:951
msgid "Sear_ch:"
msgstr "搜索(_C)："
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1019
msgid "i_n"
msgstr "在(_N) "
-#: ../shell/e-shell-utils.c:174
+#: ../shell/e-shell-utils.c:176
msgid "vCard (.vcf)"
msgstr "vCard (.vff)"
-#: ../shell/e-shell-utils.c:198
+#: ../shell/e-shell-utils.c:200
msgid "All Files (*)"
msgstr "全部文件(*)"
-#: ../shell/e-shell-view.c:291
-msgid "Saving user interface state"
-msgstr "保存用户界面状态"
-
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-utils.c:409
msgid "translator-credits"
msgstr ""
"Wang Li <charles linux net cn>, 2002, 2003\n"
@@ -20067,291 +22798,291 @@ msgstr ""
"Funda Wang <fundawang0zheng gmail com>, 2010\n"
"Aron Xu <aronxu gnome org>, 2010\n"
"du baodao <centerpoint 139 com>, 2010\n"
-"Tong Hui <tonghuix gmail com>, 2014"
+"Tong Hui <tonghuix gmail com>, 2014, 2015"
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-utils.c:420
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-view.c:292
+msgid "Saving user interface state"
+msgstr "保存用户界面状态"
+
+#: ../shell/e-shell-window-actions.c:277
msgid "Categories Editor"
msgstr "类别编辑器"
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:585
msgid "Bug Buddy is not installed."
msgstr "未安装 Bug Buddy。"
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:586
msgid "Bug Buddy could not be run."
msgstr "无法运行 Bug Buddy。"
-#: ../shell/e-shell-window-actions.c:895
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:766
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:771 ../shell/e-shell-window-actions.c:785
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:792
msgid "_Contents"
msgstr "目录(_C)"
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:794
msgid "Open the Evolution User Guide"
msgstr "打开 Evolution 用户指南"
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:820
msgid "I_mport..."
msgstr "导入(_M)..."
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:822
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../shell/e-shell-window-actions.c:958
-msgid "New _Window"
-msgstr "新建窗口(_W)"
-
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:829
msgid "Create a new window displaying this view"
msgstr "创建一个新窗口来显示这个视图"
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:841
msgid "Available Cate_gories"
msgstr "可用类别(_G)"
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:843
msgid "Manage available categories"
msgstr "管理可用类别"
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:855
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:857
msgid "Show Evolution's shortcut keys"
msgstr "显示 Evolution 的快捷键"
-#: ../shell/e-shell-window-actions.c:993
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:864
msgid "Exit the program"
msgstr "退出程序"
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:869
msgid "_Advanced Search..."
msgstr "高级搜索(_A)..."
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:871
msgid "Construct a more advanced search"
msgstr "构造一个更高级的搜索"
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:878
msgid "Clear the current search parameters"
msgstr "清除当前搜索参数"
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:883
msgid "_Edit Saved Searches..."
msgstr "编辑保存的搜索(_E)..."
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:885
msgid "Manage your saved searches"
msgstr "管理您保存的搜索"
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:892
msgid "Click here to change the search type"
msgstr "单击此处更改搜索类型"
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:897
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:899
msgid "Execute the current search parameters"
msgstr "执行当前搜索参数"
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:904
msgid "_Save Search..."
msgstr "保存搜索(_S)..."
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:906
msgid "Save the current search parameters"
msgstr "保存当前搜索参数"
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:918
msgid "Submit _Bug Report..."
msgstr "提交错误报告(_B)..."
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:920
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:925
msgid "_Work Offline"
msgstr "离线工作(_W)"
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:927
msgid "Put Evolution into offline mode"
msgstr "将 Evolution 转入离线模式"
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:932
msgid "_Work Online"
msgstr "在线工作(_W)"
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:934
msgid "Put Evolution into online mode"
msgstr "将 Evolution 转入在线模式"
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:962
msgid "Lay_out"
msgstr "布局(_O)"
-#: ../shell/e-shell-window-actions.c:1107
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:970
+msgid "_New"
+msgstr "新建(_N)"
+
+#: ../shell/e-shell-window-actions.c:977
msgid "_Search"
msgstr "搜索(_S)"
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:984
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:998
msgid "_Window"
msgstr "窗口(_W)"
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1027
msgid "Show Side _Bar"
msgstr "显示侧边栏(_B)"
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1029
msgid "Show the side bar"
msgstr "显示侧边栏"
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1035
msgid "Show _Buttons"
msgstr "显示按钮(_B)"
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1037
msgid "Show the switcher buttons"
msgstr "显示切换器按钮"
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1043
msgid "Show _Status Bar"
msgstr "显示状态栏(_S)"
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1045
msgid "Show the status bar"
msgstr "显示状态栏"
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1051
msgid "Show _Tool Bar"
msgstr "显示工具栏(_T)"
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1053
msgid "Show the tool bar"
msgstr "显示工具栏"
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1075
msgid "_Icons Only"
msgstr "只有图标(_I)"
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1077
msgid "Display window buttons with icons only"
msgstr "显示只有图标的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1082
msgid "_Text Only"
msgstr "只有文字(_T)"
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1084
msgid "Display window buttons with text only"
msgstr "显示只有文字的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1089
msgid "Icons _and Text"
msgstr "图标和文字(_A)"
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1091
msgid "Display window buttons with icons and text"
msgstr "显示带图标和文字的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1096
msgid "Tool_bar Style"
msgstr "工具栏样式(_B)"
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1098
msgid "Display window buttons using the desktop toolbar setting"
msgstr "使用桌面工具栏设置显示窗口按钮"
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1106
msgid "Delete Current View"
msgstr "保存当前视图"
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1113
msgid "Save Custom View..."
msgstr "保存当前视图..."
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1115
msgid "Save current custom view"
msgstr "保存当前自定义视图"
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1122
msgid "C_urrent View"
msgstr "当前视图(_U)"
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1132
msgid "Custom View"
msgstr "当前视图"
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1134
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1142
msgid "Page Set_up..."
msgstr "页面设置(_U)..."
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1144
msgid "Change the page settings for your current printer"
msgstr "更改当前打印机的页面设置"
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1507
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1630
#, c-format
msgid "Select view: %s"
msgstr "选择视图：%s"
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1647
#, c-format
msgid "Delete view: %s"
msgstr "删除视图：%s"
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1741
msgid "Execute these search parameters"
msgstr "执行这些搜索参数"
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:555
+msgctxt "toolbar-button"
msgid "New"
msgstr "新建"
#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
+#: ../shell/e-shell-window-private.c:632
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:195
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -20383,7 +23114,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
-#: ../shell/main.c:206
+#: ../shell/main.c:219
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -20391,13 +23122,13 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:212
+#: ../shell/main.c:225
msgid "Do not tell me again"
msgstr "不要再通知我"
#. Translators: Do NOT translate the five component
#. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:314
msgid ""
"Start Evolution showing the specified component. Available options are "
"'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20405,50 +23136,50 @@ msgstr ""
"启动 Evolution 后显示特定组件。可用的选项"
"有“mail”、“calendar”、“contacts”、“tasks”和“memos”"
-#: ../shell/main.c:305
+#: ../shell/main.c:318
msgid "Apply the given geometry to the main window"
msgstr "应用给定的几何参数到主窗口"
-#: ../shell/main.c:309
+#: ../shell/main.c:322
msgid "Start in online mode"
msgstr "以在线模式启动"
-#: ../shell/main.c:311
+#: ../shell/main.c:324
msgid "Ignore network availability"
msgstr "忽略网络是否可用"
-#: ../shell/main.c:314
+#: ../shell/main.c:327
msgid "Forcibly shut down Evolution"
msgstr "强制关闭所有 Evolution"
-#: ../shell/main.c:317
+#: ../shell/main.c:330
msgid "Disable loading of any plugins."
msgstr "禁止载入任何插件。"
-#: ../shell/main.c:319
+#: ../shell/main.c:332
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "禁用邮件、联系人和任务的预览面板。"
-#: ../shell/main.c:323
+#: ../shell/main.c:336
msgid "Import URIs or filenames given as rest of arguments."
msgstr "导入 URI 或者给定文件名作为剩余参数。"
-#: ../shell/main.c:325
+#: ../shell/main.c:338
msgid "Request a running Evolution process to quit"
msgstr "请求正在运行的 Evolution 进程退出"
-#: ../shell/main.c:402
+#: ../shell/main.c:415
#, c-format
msgid ""
"Cannot start Evolution. Another Evolution instance may be unresponsive. "
"System error: %s"
msgstr "无法启动 Evolution。也许有另外的 Evolution 实例没有响应。系统错误：%s"
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:469 ../shell/main.c:474
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:568
+#: ../shell/main.c:536
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -20457,7 +23188,7 @@ msgstr ""
"%s：不能同时使用 --online 和 --offline。\n"
" 运行 %s --help 了解更多信息。\n"
-#: ../shell/main.c:574
+#: ../shell/main.c:542
#, c-format
msgid ""
"%s: --force-online and --offline cannot be used together.\n"
@@ -20502,7 +23233,100 @@ msgstr ""
"Evolution不再支持从版本{0}直接升级。然而您可以尝试先升级到Evolution 2，然后再"
"升级到Evolution 3。"
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "等待后台操作后关闭 Evolution ？"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evolution 关闭时间太长，很可能是因为网络连接原因。您想要取消所有等候操作并立"
+"即关闭，或者保持等待？"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "立即关闭(_C)"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "保持等待(_W)"
+
+#: ../shell/shell.error.xml.h:15
+msgid "Failed to get values from '{0}'"
+msgstr "从“{0}\" 获取数值失败"
+
+#: ../shell/shell.error.xml.h:16
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "为 ”{0}“ 调用认证失败 "
+
+#: ../shell/shell.error.xml.h:17
+msgid "Failed to connect '{0}'"
+msgstr "无法连接至“{0}”"
+
+#: ../shell/shell.error.xml.h:18
+msgid "_Reconnect"
+msgstr "重新连接(_R)"
+
+#: ../shell/shell.error.xml.h:19
+msgid "Failed to connect address book '{0}'"
+msgstr "无法连接至通讯录“{0}”"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to connect calendar '{0}'"
+msgstr "无法连接至日历“{0}”"
+
+#: ../shell/shell.error.xml.h:21
+msgid "Failed to connect mail account '{0}'"
+msgstr "无法连接至帐号“{0}”"
+
+#: ../shell/shell.error.xml.h:22
+msgid "Failed to connect memo list '{0}'"
+msgstr "无法连接至备忘录列表“{0}”"
+
+#: ../shell/shell.error.xml.h:23
+msgid "Failed to connect task list '{0}'"
+msgstr "无法连接至任务列表“{0}”"
+
+#: ../shell/shell.error.xml.h:24
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "无法提示获得“{0}”的证书"
+
+#: ../shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "无法结束“{0}”的信任提示"
+
+#: ../shell/shell.error.xml.h:26
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr "为“{0}”的 SSL 认证未被信任。"
+
+#: ../shell/shell.error.xml.h:27
+msgid "Reason: {1}"
+msgstr "原因：{1}"
+
+#: ../shell/shell.error.xml.h:29
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "通讯录“{0}”的 SSL 证书不受信任。"
+
+#: ../shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "日历“{0}”的 SSL 证书不受信任。"
+
+#: ../shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "邮件帐号“{0}”的 SSL 证书不受信任。"
+
+#: ../shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "备忘录列表“{0}”的 SSL 证书不受信任。"
+
+#: ../shell/shell.error.xml.h:33
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "任务列表“{0}”的 SSL 证书不受信任。"
+
+#: ../smime/gui/ca-trust-dialog.c:106
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -20513,101 +23337,259 @@ msgstr ""
"\n"
"编辑信任设置："
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
msgid "Certificate Name"
msgstr "证书名称"
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
msgid "Issued To Organization"
msgstr "授予组织"
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
msgid "Issued To Organizational Unit"
msgstr "授予组织单元"
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
msgid "Serial Number"
msgstr "序列号"
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
msgid "Purposes"
msgstr "用途"
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
msgid "Issued By"
msgstr "颁发者"
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
msgid "Issued By Organization"
msgstr "颁发组织"
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
msgid "Issued By Organizational Unit"
msgstr "颁发组织单元"
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
msgid "Issued"
msgstr "已颁发"
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
msgid "Expires"
msgstr "到期时间"
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
msgid "SHA1 Fingerprint"
msgstr "SHA1 指纹"
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
msgid "MD5 Fingerprint"
msgstr "MD5 指纹"
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
msgid "Email Address"
msgstr "电子邮件地址"
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:652
+msgid "Select a file to backup your key and certificate..."
+msgstr "选择一个文件来备份密钥和证书…"
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:664
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-备份.p12"
+
+#: ../smime/gui/certificate-manager.c:730
+msgid "Backup Certificate"
+msgstr "备份证书"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:744
+msgid "_File name:"
+msgstr "文件名(_F)："
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:749
+msgid "Please select a file..."
+msgstr "请选择一个文件…"
+
+#: ../smime/gui/certificate-manager.c:763
+msgid "_Include certificate chain in the backup"
+msgstr "在备份里包含证书链(_I)"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:769
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+"您在这里设置的证书备份密码保护您将要创建的备份文件。\n"
+"继续进行备份必须要你设置这个密码。"
+
+#: ../smime/gui/certificate-manager.c:788
+msgid "_Repeat Password:"
+msgstr "重复密码(_P)："
+
+#: ../smime/gui/certificate-manager.c:807
+msgid "Passwords do not match"
+msgstr "密码不匹配"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:815
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+"重要：\n"
+"如果您忘记您的证书备份密码，你今后就不能还原备份。\n"
+"请将它记录在安全的地方。"
+
+#: ../smime/gui/certificate-manager.c:860
+msgid "No file name provided"
+msgstr "没有提供文件名"
+
+#: ../smime/gui/certificate-manager.c:864
+msgid "Failed to backup key and certificate"
+msgstr "备份密钥和证书失败"
+
+#: ../smime/gui/certificate-manager.c:953
msgid "Select a certificate to import..."
msgstr "选择要导入的证书..."
-#: ../smime/gui/certificate-manager.c:635
-msgid "All files"
-msgstr "全部文件"
-
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:1003
msgid "Failed to import certificate"
msgstr "导入证书失败"
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "使用时询问"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "从不"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Marginally"
+msgstr "勉强的"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "完整"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Ultimately"
+msgstr "彻底的"
+
+#: ../smime/gui/certificate-manager.c:1129
+msgctxt "CamelTrust"
+msgid "Temporarily"
+msgstr "暂时的"
+
+#: ../smime/gui/certificate-manager.c:1335
+msgid "Change certificate trust"
+msgstr "变更证书信任"
+
+#: ../smime/gui/certificate-manager.c:1347
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "对主机“%s”变更信任："
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "使用时询问(_A)"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Never trust this certificate"
+msgstr "永不信任此证书(_N)"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Temporarily trusted (this session only)"
+msgstr "暂时信任（仅此会话）(_T)"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Marginally trusted"
+msgstr "勉强信任(_M)"
+
+#: ../smime/gui/certificate-manager.c:1375
+msgctxt "CamelTrust"
+msgid "_Fully trusted"
+msgstr "完全信任(_F)"
+
+#: ../smime/gui/certificate-manager.c:1376
+msgctxt "CamelTrust"
+msgid "_Ultimately trusted"
+msgstr "绝对信任(_U)"
+
+#: ../smime/gui/certificate-manager.c:1380
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr "在信任此网站之前，您应该先检查该证书及其策略和过程(若可用)。"
+
+#: ../smime/gui/certificate-manager.c:1395
+msgid "_Display certificate"
+msgstr "查看证书(_D)"
+
+#: ../smime/gui/certificate-manager.c:1600
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "您拥有证明这些邮件服务器的证书："
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Host name"
+msgstr "主机名称"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Issuer"
+msgstr "发行者"
+
+#: ../smime/gui/certificate-manager.c:1634
+msgid "Fingerprint"
+msgstr "指纹"
+
+#: ../smime/gui/certificate-manager.c:1635
+msgid "Trust"
+msgstr "信任"
+
+#: ../smime/gui/certificate-manager.c:1656
+msgid "_Edit Trust"
+msgstr "编辑信任(_E)"
+
+#: ../smime/gui/certificate-manager.c:1975
msgid "All PKCS12 files"
msgstr "全部 PKCS12 文件"
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1992
msgid "All email certificate files"
msgstr "所有电子邮件证书文件"
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2009
msgid "All CA certificate files"
msgstr "全部颁证机构文件"
@@ -20644,26 +23626,7 @@ msgstr "输入证书数据库的新密码"
msgid "Enter new password"
msgstr "输入新密码"
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-" Subject: %s\n"
-msgstr ""
-"发行给：\n"
-" 主题：%s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-" Subject: %s\n"
-msgstr ""
-"发行者：\n"
-" 主题：%s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
msgid "Select certificate"
msgstr "选择证书"
@@ -20728,26 +23691,22 @@ msgid ""
msgstr "在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
#: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "证书"
+msgid "C_ertificate:"
+msgstr "证书(_E)："
#: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "证书细节"
-
-#: ../smime/gui/smime-ui.ui.h:27
msgid "Email Certificate Trust Settings"
msgstr "电子邮件证书信任设置"
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
msgid "Trust the authenticity of this certificate"
msgstr "信任此证书的颁发机构"
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
msgid "Do not trust the authenticity of this certificate"
msgstr "不信任此证书的颁发机构"
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
@@ -20764,19 +23723,45 @@ msgstr "签名"
msgid "Encrypt"
msgstr "加密"
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
msgid "Certificate already exists"
msgstr "证书已经存在"
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
msgid "PKCS12 File Password"
msgstr "PKCS12 文件密码"
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
msgid "Enter password for PKCS12 file:"
msgstr "输入 PKCS12 文件的密码："
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:328
+#, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "无法创建导出环境，错误码：%i"
+
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "无法设置密码的完整性，错误码：%i"
+
+# PKCS12 safe bag
+#: ../smime/lib/e-pkcs12.c:345
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "创建安全袋（safe bag）失败，错误码 %i"
+
+#: ../smime/lib/e-pkcs12.c:363
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "无法添加密钥/证书到存储，错误码：%i"
+
+#: ../smime/lib/e-pkcs12.c:381
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "无法写存储到磁盘，错误码：%i"
+
+#: ../smime/lib/e-pkcs12.c:408
msgid "Imported Certificate"
msgstr "导入的证书"
@@ -20852,8 +23837,874 @@ msgstr "到期日期(_D)"
msgid "With _Status"
msgstr "状态(_S)"
-#~ msgid "Add"
-#~ msgstr "添加"
+#~ msgid "Would you like to send this memo to participants?"
+#~ msgstr "您是否想要给出席者发送此备忘？"
+
+#~ msgid ""
+#~ "Email invitations will be sent to all participants and allow them to "
+#~ "accept this memo."
+#~ msgstr "将会向全部出席者发送电子邮件邀请，并使他们可以接受此备忘。"
+
+#~ msgid "Would you like to send updated memo information to participants?"
+#~ msgstr "您是否想要给出席者发送更新的备忘？"
+
+#~ msgid ""
+#~ "Sending updated information allows other participants to keep their memo "
+#~ "lists up to date."
+#~ msgstr "发送更新的信息允许其他出席者使他们的备忘录保持最新。"
+
+#~ msgid "Failed to add timezone to '{0}'"
+#~ msgstr "向“{0}”添加时区失败"
+
+#~ msgid "Failed to save attachments"
+#~ msgstr "保存附件失败"
+
+#~ msgid "Failed to get an event from the calendar '{0}'"
+#~ msgstr "无法从日历“{0}”中获取事件"
+
+#~ msgid "Failed to get a task from the task list '{0}'"
+#~ msgstr "无法从任务列表“{0}”中获取任务"
+
+#~ msgid "Failed to get a memo from the memo list '{0}'"
+#~ msgstr "无法从留言列表“{0}”中获取留言"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Play a sound"
+#~ msgstr "播放声音"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Pop up an alert"
+#~ msgstr "弹出警报"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Send an email"
+#~ msgstr "发送邮件"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Run a program"
+#~ msgstr "运行程序"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Unknown action to be performed"
+#~ msgstr "即将进行一项未知的操作"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s %s before the start"
+#~ msgstr "开始前 %s%s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s %s after the start"
+#~ msgstr "开始后 %s %s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s at the start"
+#~ msgstr "开始时 %s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s %s before the end"
+#~ msgstr "结束前 %s%s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s %s after the end"
+#~ msgstr "结束后 %s %s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s at the end"
+#~ msgstr "结束时 %s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s at %s"
+#~ msgstr "%s 在 %s"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "%s for an unknown trigger type"
+#~ msgstr "对于未知触发类型，%s"
+
+#~ msgid "Event's time is in the past"
+#~ msgstr "事件来自过去的时间点"
+
+#~ msgid ""
+#~ "Event cannot be edited, because the selected calendar could not be opened"
+#~ msgstr "任务不能被编辑，因为选择的日历无法被打开"
+
+#~ msgid "Start date is not a valid date"
+#~ msgstr "起始日期无效"
+
+#~ msgid "Start time is not a valid time"
+#~ msgstr "起始时间无效"
+
+#~ msgid "End date is not a valid date"
+#~ msgstr "结束日期无效"
+
+#~ msgid "End time is not a valid time"
+#~ msgstr "结束时间无效"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Start time:"
+#~ msgstr "开始时间(_S)："
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_End time:"
+#~ msgstr "结束时间(_E)："
+
+#~ msgctxt "ECompEditor"
+#~ msgid "All da_y event"
+#~ msgstr "所有当日事件"
+
+#~ msgctxt "ECompEditorPage"
+#~ msgid "General"
+#~ msgstr "常规"
+
+#~ msgctxt "ECompEditorPage"
+#~ msgid "Reminders"
+#~ msgstr "提醒"
+
+#~ msgctxt "ECompEditorPage"
+#~ msgid "Recurrence"
+#~ msgstr "再现"
+
+#~ msgctxt "ECompEditorPage"
+#~ msgid "Attachments"
+#~ msgstr "附件"
+
+#~ msgctxt "ECompEditorPage"
+#~ msgid "Schedule"
+#~ msgstr "日程"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Sta_rt date:"
+#~ msgstr "起始日期："
+
+#~ msgid "Assigned Memo - %s"
+#~ msgstr "已分配留言 - %s"
+
+#~ msgid ""
+#~ "Some attachments are still being downloaded. Please wait until the "
+#~ "download is finished."
+#~ msgstr "仍在下载一部分附件。请等待下载完成。"
+
+#~ msgid "Attachment '%s' cannot be found, remove it from the list, please"
+#~ msgstr "找不到附件“%s”，请将其从列表移除"
+
+#~ msgid ""
+#~ "Attachment '%s' doesn't have valid URI, remove it from the list, please"
+#~ msgstr "附件“%s”不具有有效的 URI，请将其从列表移除"
+
+#~ msgid "_Attachments"
+#~ msgstr "附件(_A)"
+
+#~ msgid "Show attachments"
+#~ msgstr "显示附件"
+
+#~ msgid "Cannot find attendee '%s' in the list of attendees"
+#~ msgstr "无法从参与者列表中找到参与者 '%s'"
+
+#~ msgid "Not enough rights to delete attendee '%s'"
+#~ msgstr "没有足够权力来删除参与者 '%s'"
+
+#~ msgid "Failed to delete selected attendee"
+#~ msgid_plural "Failed to delete selected attendees"
+#~ msgstr[0] "删除选中参与者失败"
+
+#~ msgid "A_ttendees"
+#~ msgstr "参与者(_T)"
+
+#~ msgid "Toggles whether the Attendees are displayed"
+#~ msgstr "切换是否显示与会者"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "出席者(_N)..."
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "first"
+#~ msgstr "第一"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "second"
+#~ msgstr "第二"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "third"
+#~ msgstr "第三"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "fourth"
+#~ msgstr "第四"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "fifth"
+#~ msgstr "第五"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "last"
+#~ msgstr "最后"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Other Date"
+#~ msgstr "其他日期"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "1st to 10th"
+#~ msgstr "上旬"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "11th to 20th"
+#~ msgstr "中旬"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "21st to 31st"
+#~ msgstr "下旬"
+
+# DIRTY HACK: 配上前面的就是上旬，中旬，下旬
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "day"
+#~ msgstr "天"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Monday"
+#~ msgstr "星期一"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Tuesday"
+#~ msgstr "星期二"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Wednesday"
+#~ msgstr "星期三"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Thursday"
+#~ msgstr "星期四"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Friday"
+#~ msgstr "星期五"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Saturday"
+#~ msgstr "星期六"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Sunday"
+#~ msgstr "星期日"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "on the"
+#~ msgstr "在"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "occurrences"
+#~ msgstr "发生"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "This appointment rec_urs"
+#~ msgstr "会议再现周期(_U)"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "This task rec_urs"
+#~ msgstr "任务再现周期(_U)"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "This memo rec_urs"
+#~ msgstr "备忘再现周期(_U)"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "This component rec_urs"
+#~ msgstr "组件再现周期(_U)"
+
+#~ msgid "Recurrence exception date is invalid"
+#~ msgstr "重复例外日期无效"
+
+#~ msgid "End time of the recurrence is before the start"
+#~ msgstr "再现的结束时间早于开始时间"
+
+#~ msgid "R_ecurrence"
+#~ msgstr "重复"
+
+#~ msgid "Set or unset recurrence"
+#~ msgstr "设置或取消事件重复"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "Every"
+#~ msgstr "每"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "day(s)"
+#~ msgstr "日"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "week(s)"
+#~ msgstr "周"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "month(s)"
+#~ msgstr "月"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "year(s)"
+#~ msgstr "年"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "for"
+#~ msgstr "共"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "until"
+#~ msgstr "直到"
+
+#~ msgctxt "ECompEditorPageRecur"
+#~ msgid "forever"
+#~ msgstr "永远"
+
+#~ msgid "Send To"
+#~ msgstr "发送到"
+
+#~ msgid "Set or unset reminders"
+#~ msgstr "设置或取消提醒"
+
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d 天前"
+
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d 时前"
+
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d 分前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "一刻钟前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "一小时前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "一天前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Custom"
+#~ msgstr "自定义"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "minute(s)"
+#~ msgstr "分"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "hour(s)"
+#~ msgstr "时"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "day(s)"
+#~ msgstr "日"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "before"
+#~ msgstr "之前"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "after"
+#~ msgstr "后"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "start"
+#~ msgstr "开始"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "end"
+#~ msgstr "结束"
+
+#~ msgid "Re_peat the reminder"
+#~ msgstr "重复提醒"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "extra times every"
+#~ msgstr "重复一次，每隔"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "minutes"
+#~ msgstr "分"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "hours"
+#~ msgstr "时"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "days"
+#~ msgstr "天"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Custom _message"
+#~ msgstr "自定义消息"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "Custom reminder _sound"
+#~ msgstr "自定义提醒声音"
+
+#~ msgid "Select a sound file"
+#~ msgstr "选择一个音频文件"
+
+#~ msgid "_Send To:"
+#~ msgstr "发送到：(_S)"
+
+#~ msgid "_Schedule"
+#~ msgstr "日程(_S)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Summary:"
+#~ msgstr "概要：(_S)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Location:"
+#~ msgstr "位置(_L)："
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "类别...(_C)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Description:"
+#~ msgstr "描述(_D)："
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Web page:"
+#~ msgstr "网页：(_W)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "D_ue date:"
+#~ msgstr "截止日期：(_U)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Date _completed:"
+#~ msgstr "完成日期：(_C)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Public"
+#~ msgstr "公开"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Private"
+#~ msgstr "保密"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Confidential"
+#~ msgstr "机密"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "C_lassification:"
+#~ msgstr "分类：(_L)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "未开始"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "进行中"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "已完成"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Canceled"
+#~ msgstr "已取消"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Status:"
+#~ msgstr "状态：(_S)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Undefined"
+#~ msgstr "未定义"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "High"
+#~ msgstr "高"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Normal"
+#~ msgstr "中"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Low"
+#~ msgstr "低"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Priorit_y:"
+#~ msgstr "优先级：(_Y)"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Percent complete:"
+#~ msgstr "完成百分比："
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Time _zone:"
+#~ msgstr "时区(_Z)："
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Show time as _busy"
+#~ msgstr "将时间显示为忙(_B)"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list could not be opened"
+#~ msgstr "任务不能被编辑，因为选择的任务列表无法被打开"
+
+#~ msgid "Due date is not a valid date"
+#~ msgstr "截止日期无效"
+
+#~ msgid "Completed date is not a valid date"
+#~ msgstr "完成日期无效"
+
+#~ msgid "Completed date cannot be in the future"
+#~ msgstr "完成日期不能在将来"
+
+#~ msgid "Sending notifications to attendees..."
+#~ msgstr "正向参与者发送通知…"
+
+#~ msgid "Saving changes..."
+#~ msgstr "正保存更改…"
+
+#~ msgid "Cre_ate new calendar"
+#~ msgstr "创建新日历(_A)"
+
+#~ msgid "Cre_ate new task list"
+#~ msgstr "创建新任务列表(_A)"
+
+#~ msgid "GNOME Calendar"
+#~ msgstr "GNOME 日历"
+
+#~ msgid "Wrap quoted text in replies"
+#~ msgstr "为回复中引用的文本换行"
+
+#~ msgid "If set to 'true' quoted text in replies will be wrapped."
+#~ msgstr "如设置为 true，则将为回复中引用的文本换行"
+
+#~ msgid "Show notification about missing remote content"
+#~ msgstr "显示关于远程内容缺失的通知"
+
+#~ msgid ""
+#~ "When the message preview shows a message which requires to download "
+#~ "remote content, while the download is not allowed for the user or the "
+#~ "site, then show a notification about it on top of the preview panel."
+#~ msgstr ""
+#~ "当信息预览显示了一封需要下载远程内容的邮件而从此用户或站点下载又被禁止时，"
+#~ "在预览面板顶层显示相应通知。"
+
+#~ msgid "Show junk messages in the message-list"
+#~ msgstr "在消息列表中显示垃圾信息"
+
+#~ msgid "Show junk messages (with a red strike-through) in the message-list."
+#~ msgstr "在信息列表中显示垃圾信息（带有红色删除线）。"
+
+#~ msgid "Show"
+#~ msgstr "显示"
+
+#~ msgid "Group name"
+#~ msgstr "组名"
+
+#~ msgid "_Show"
+#~ msgstr "显示(_S)"
+
+#~ msgid "Manage Groups"
+#~ msgstr "管理群组"
+
+#~ msgid "Available Groups:"
+#~ msgstr "可用组："
+
+#~ msgid "OAuth2 Google"
+#~ msgstr "OAuth2 Google"
+
+#~ msgid ""
+#~ "This option will use an OAuth 2.0 access token to connect to the Google "
+#~ "server"
+#~ msgstr "该选项将使用 OAuth 2.0 访问令牌连接到谷歌服务器。"
+
+#~ msgid "Querying authentication types..."
+#~ msgstr "正在查询认证类型"
+
+#~ msgctxt "ReplyForward"
+#~ msgid "Use global setting"
+#~ msgstr "使用全局设置"
+
+#~ msgid "Re_ply style:"
+#~ msgstr "回复风格：(_P)"
+
+#~ msgid "Message Note"
+#~ msgstr "消息附带的便笺"
+
+#~ msgid "Cannot find message in its folder summary"
+#~ msgstr "未在所在文件夹的摘要中找到邮件"
+
+#~ msgid "Storing changes..."
+#~ msgstr "存储更改..."
+
+#~ msgid "Edit Message Note"
+#~ msgstr "编辑消息附带的便笺"
+
+#~ msgid "Retrieving message..."
+#~ msgstr "正在收取信息..."
+
+#~ msgid "Deleting message note..."
+#~ msgstr "删除消息附带的便笺"
+
+#~ msgid "_Add note..."
+#~ msgstr "添加便笺...(_A)"
+
+#~ msgid "Add a note for the selected message"
+#~ msgstr "为选中消息添加便笺"
+
+#~ msgid "Delete no_te"
+#~ msgstr "删除便笺(_T)"
+
+#~ msgid "Delete the note for the selected message"
+#~ msgstr "为选中消息删除便笺"
+
+#~ msgid "_Edit note..."
+#~ msgstr "编辑便笺...(_E)"
+
+#~ msgid "Edit a note for the selected message"
+#~ msgstr "编辑选中消息的便笺"
+
+#~ msgid "Do not show this message again"
+#~ msgstr "不再显示该信息"
+
+#~ msgid "Waiting for attachments to load..."
+#~ msgstr "正在等待附件载入..."
+
+#~ msgid "is greater than or equal to"
+#~ msgstr "大于或等于"
+
+#~ msgid "is less than or equal to"
+#~ msgstr "小于或等于"
+
+#~ msgid "_Wrap quoted text in replies"
+#~ msgstr "为回复中引用的文本换行(_W)"
+
+#~ msgid "Notify about _missing remote content in the message preview"
+#~ msgstr "在邮件预览中显示关于远程内容缺失的通知(_M)"
+
+#~ msgid "This message note has been changed, but has not been saved."
+#~ msgstr "邮件笔记已更改，但尚未保存。"
+
+#~ msgid "Failed to delete message note in folder '{0}'"
+#~ msgstr "未能删除文件夹“{0}”中的邮件笔记"
+
+#~ msgid "Failed to store message note in folder '{0}'"
+#~ msgstr "未能存储文件夹“{0}”中的邮件笔记"
+
+#~ msgid "_Manage Address Book groups..."
+#~ msgstr "管理通信录组...(_M)"
+
+#~ msgid "Manage task list groups order and visibility"
+#~ msgstr "管理任务列表排序及可见性"
+
+#~ msgid "_Manage groups..."
+#~ msgstr "管理群组...(_M)"
+
+#~ msgid "_Manage Calendar groups..."
+#~ msgstr "管理日历组...(_M)"
+
+#~ msgid "Manage Calendar groups order and visibility"
+#~ msgstr "管理日历组排序及可见性"
+
+#~ msgid "_Manage Memo List groups..."
+#~ msgstr "管理留言列表组...(_M)"
+
+#~ msgid "Manage Memo List groups order and visibility"
+#~ msgstr "管理备忘录排序及可见性"
+
+#~ msgid "_Manage Task List groups..."
+#~ msgstr "管理任务列表组...(_M)"
+
+#~ msgid "Show _Junk Messages"
+#~ msgstr "显示垃圾信息(_J)"
+
+#~ msgid "Show junk messages with a red line through them"
+#~ msgstr "使用红色删除线标记垃圾消息"
+
+#~ msgid "Messages with Notes"
+#~ msgstr "带有便笺的消息"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "Marginal"
+#~ msgstr "勉强"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "Ultimate"
+#~ msgstr "完全"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+#~ msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+#~ msgstr "决定是否在竖直视图中对“信息”列的“发件人”和“主题”行使用相同的字体。"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Itip 格式化"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Never"
+#~ msgstr "从不(_N)"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Fully"
+#~ msgstr "完整(_F)"
+
+#~ msgid "Web addresses"
+#~ msgstr "网络地址"
+
+#~ msgid "Could not open destination"
+#~ msgstr "无法打开目的"
+
+#~ msgid "Cannot create object"
+#~ msgstr "无法创建对象"
+
+#~ msgid "Could not open source"
+#~ msgstr "无法打开源"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "由于 dbus 错误 %s，无法删除该事件。"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "由于 dbus 错误 %s，无法该删除任务。"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "由于 dbus 错误 %s，无法该删除备忘。"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "由于 dbus 错误 %s，无法删除该项目。"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "无法删除事件，原因是权限被禁止"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "无法删除任务，原因是权限被禁止"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "无法删除备忘，原因是权限被禁止"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "无法删除项目，原因是权限被禁止"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "由于错误，无法删除事件：%s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "由于错误，无法删除任务：%s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "由于错误，无法删除备忘：%s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "由于错误，无法删除项目：%s"
+
+#~ msgid "Customize"
+#~ msgstr "自定义"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "自定义提醒："
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "删除选中的对象"
+
+#~ msgid "Untitled Message"
+#~ msgstr "无标题信息"
+
+#~ msgid "Spell checking color"
+#~ msgstr "拼写检查颜色"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr "当使用行内拼写检查时，错误拼写单词的下划线的颜色。"
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "无效的认证结果代码(%d)"
+
+#~ msgid "Completed On"
+#~ msgstr "完成于"
+
+#~ msgid "is not set"
+#~ msgstr "未设置"
+
+#~ msgid "is set"
+#~ msgstr "已设置"
+
+#~ msgid "Loading Images"
+#~ msgstr "载入图像"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr "如果找到匹配的自定义垃圾信头，此选项将被覆盖。"
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "请选择一个有效的备份文件进行恢复。"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP 错误：%s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "无法解析响应"
+
+#~ msgid "Empty response"
+#~ msgstr "空响应"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "服务器响应异常"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "无法定位用户的日历"
+
+#~ msgid "Path"
+#~ msgstr "路径"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "输入“%s”的 Google 密码。"
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "用户拒绝提供密码"
+
+#~ msgid "Expunging"
+#~ msgstr "销毁"
+
+#~ msgid "_PostScript"
+#~ msgstr "_PostScript"
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "请选择一个 48x48 的图像"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "直接在邮件信息里查看图像附件"
+
+#~ msgid "E_nable"
+#~ msgstr "启用(_N)"
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ " Subject: %s\n"
+#~ msgstr ""
+#~ "发行给：\n"
+#~ " 主题：%s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ " Subject: %s\n"
+#~ msgstr ""
+#~ "发行者：\n"
+#~ " 主题：%s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "证书细节"
#~ msgid "Edit"
#~ msgstr "编辑"
@@ -20870,7 +24721,6 @@ msgstr "状态(_S)"
#~ msgid "Pinging %s"
#~ msgstr "查验 %s"
-#~| msgid "Disable or enable ellipsizing of folder names in side bar"
#~ msgid "Ellipsize mode for folder names in side bar"
#~ msgstr "侧边栏中文件夹名的省略显示模式"
@@ -20892,9 +24742,6 @@ msgstr "状态(_S)"
#~ msgid "_Secure HTTP Proxy:"
#~ msgstr "安全 HTTP 代理(_S)："
-#~ msgid "No _Proxy for:"
-#~ msgstr "不使用代理的情况(_P)："
-
#~ msgid "Use Authe_ntication"
#~ msgstr "使用身份验证(_N)"
@@ -20910,7 +24757,6 @@ msgstr "状态(_S)"
#~ msgid "Could not open %s: Unknown error"
#~ msgstr "无法打开 %s：未知错误"
-#~| msgid "<Not Part of Certificate>"
#~ msgid "Not part of certificate"
#~ msgstr "非证书的一部分"
@@ -20950,9 +24796,6 @@ msgstr "状态(_S)"
#~ msgid "Expires On"
#~ msgstr "到期"
-#~ msgid "Fingerprints"
-#~ msgstr "指纹"
-
#~ msgid "Certificate Hierarchy"
#~ msgstr "证书层次"
@@ -21073,9 +24916,6 @@ msgstr "状态(_S)"
#~ msgid "Certificate Signature Algorithm"
#~ msgstr "证书签名算法"
-#~ msgid "Issuer"
-#~ msgstr "发行者"
-
#~ msgid "Issuer Unique ID"
#~ msgstr "发行者唯一 ID"
@@ -21128,15 +24968,12 @@ msgstr "状态(_S)"
#~ msgid "The Evolution calendars have quit unexpectedly."
#~ msgstr "Evolution 日历异常退出。"
-#~| msgid "The reported error was "{0}"."
#~ msgid "Delete remote calendar "{0}"?"
#~ msgstr "删除远程日历“{0}”吗？"
-#~| msgid "Delete task list '{0}'?"
#~ msgid "Delete remote task list "{0}"?"
#~ msgstr "删除远程任务列表“{0}”吗？"
-#~| msgid "The reported error was "{0}"."
#~ msgid "Delete remote memo list "{0}"?"
#~ msgstr "删除远程备忘列表”{0}“吗？"
@@ -21216,9 +25053,6 @@ msgstr "状态(_S)"
#~ msgid "CalDAV"
#~ msgstr "CalDAV"
-#~ msgid "Google"
-#~ msgstr "Google"
-
#~ msgid "Always (SSL)"
#~ msgstr "总是(SSL)"
@@ -21301,9 +25135,6 @@ msgstr "状态(_S)"
#~ msgid "Back - Receiving mail"
#~ msgstr "后退 - 接收电子邮件"
-#~ msgid "Sending mail"
-#~ msgstr "发送电子邮件"
-
#~ msgid "Next - Review account"
#~ msgstr "前进 - 检查帐号"
@@ -21479,16 +25310,12 @@ msgstr "状态(_S)"
#~ msgid "SpamAssassin daemon binary"
#~ msgstr "垃圾克星守护程序二进制文件"
-#~ msgid "Cannot get transport for account '%s'"
-#~ msgstr "无法完成帐号“%s”的传输"
-
#~ msgid "No mail exchanger record for '%s'"
#~ msgstr "没有对应“%s”的邮件往来记录"
#~ msgid "Temporarily unable to resolve '%s'"
#~ msgstr "暂时无法解析“%s”"
-#~| msgid "Error removing list"
#~ msgid "Error resolving '%s'"
#~ msgstr "解析“%s”出错"
@@ -21498,9 +25325,6 @@ msgstr "状态(_S)"
#~ msgid "Unable to create local mail folders at '%s': %s"
#~ msgstr "无法在“%s”创建本地邮件文件夹：%s"
-#~ msgid "Please select a folder"
-#~ msgstr "请选择一个文件夹"
-
#~ msgid "_Switch to Folder"
#~ msgstr "切换到文件夹(_S)"
@@ -21575,9 +25399,6 @@ msgstr "状态(_S)"
#~ msgid "Lo_gin:"
#~ msgstr "登录(_G)："
-#~ msgid "Search _base:"
-#~ msgstr "搜索基础(_B)："
-
#~ msgid "_Search scope:"
#~ msgstr "搜索范围(_S)："
@@ -21597,9 +25418,6 @@ msgstr "状态(_S)"
#~ "搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话，默认情况下搜"
#~ "索将会在“个人”类型的对象类型。"
-#~ msgid "1"
-#~ msgstr "1"
-
#~ msgid "5"
#~ msgstr "5"
@@ -21612,19 +25430,12 @@ msgstr "状态(_S)"
#~ msgid "B_rowse this book until limit reached"
#~ msgstr "浏览此地址簿直到达到极限(_R)"
-#~| msgid "_Path:"
#~ msgid "Path:"
#~ msgstr "路径："
#~ msgid "Loading calendars"
#~ msgstr "载入日历"
-#~ msgid "Loading memos"
-#~ msgstr "载入备忘"
-
-#~ msgid "Loading tasks"
-#~ msgstr "载入任务"
-
#~ msgid "IMAP Headers"
#~ msgstr "IMAP 信头"
@@ -21638,17 +25449,12 @@ msgstr "状态(_S)"
#~ msgid "_Fetch All Headers"
#~ msgstr "获取全部信头(_F)"
-#~| msgid "Mail Headers Table"
#~ msgid "_Basic Headers (fastest)"
#~ msgstr "基本信头(最快)(_B)"
-#~| msgid ""
-#~| "_Basic Headers (Fastest) \n"
-#~| "Use this if you do not have filters based on mailing lists"
#~ msgid "Use this if you are not filtering any mailing lists."
#~ msgstr "如果您没有基于邮件列表的过滤器，请使用此项。"
-#~| msgid "Basic and _Mailing List Headers (Default)"
#~ msgid "Basic and _Mailing List Headers (default)"
#~ msgstr "基本和邮件列表信头(默认)(_M)"
@@ -21707,9 +25513,6 @@ msgstr "状态(_S)"
#~ msgid "Create a new test source"
#~ msgstr "创建一个新的测试来源"
-#~ msgid "File is not a valid .desktop file"
-#~ msgstr "文件不是一个有效的 .desktop 文件"
-
#~ msgid "Unrecognized desktop file Version '%s'"
#~ msgstr "无法识别的桌面文件版本“%s”"
@@ -21761,9 +25564,6 @@ msgstr "状态(_S)"
#~ msgid "Define Views for \"%s\""
#~ msgstr "定义“%s”的视图"
-#~ msgid "Table"
-#~ msgstr "表格"
-
#~ msgid "Define New View"
#~ msgstr "定义新视图"
@@ -21789,9 +25589,6 @@ msgstr "状态(_S)"
#~ msgid "Available Fields"
#~ msgstr "可用域"
-#~ msgid "A_vailable Fields:"
-#~ msgstr "可用域(_V)："
-
#~ msgid "_Show these fields in order:"
#~ msgstr "按顺序显示这些域(_S)："
@@ -21844,21 +25641,6 @@ msgstr "状态(_S)"
#~ msgid "You are acting on behalf of %s"
#~ msgstr "您正在以 %s 的身份行动"
-#~ msgid "On This Computer"
-#~ msgstr "在此计算机中"
-
-#~ msgid "Undo the last action"
-#~ msgstr "撤消上次操作"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "重做上次操作"
-
-#~ msgid "Search for text"
-#~ msgstr "搜索文本"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "搜索和替换文本"
-
#~ msgid "List of selected calendars"
#~ msgstr "已选中的日历列表"
@@ -21930,9 +25712,6 @@ msgstr "状态(_S)"
#~ msgid "Unsubscribing from folder '%s'"
#~ msgstr "正在退订文件夹“%s”"
-#~ msgid "Refreshing folder '%s'"
-#~ msgstr "刷新文件夹 %s"
-
#~ msgid "Expunging folder '%s'"
#~ msgstr "销毁文件夹 %s"
@@ -21995,9 +25774,6 @@ msgstr "状态(_S)"
#~ msgid "Create R_ule"
#~ msgstr "创建规则(_U)"
-#~ msgid "Completed on"
-#~ msgstr "完成于"
-
#~ msgid "Overdue:"
#~ msgstr "延期："
@@ -22048,9 +25824,6 @@ msgstr "状态(_S)"
#~ "这个值可以是空字符串，表示将使用系统图片文件夹，通常设为 ~/图片。在设置的"
#~ "路径指向的文件夹不存在时也将使用该文件夹。"
-#~ msgid "Whether to show local folders (On This Computer) in a folder tree."
-#~ msgstr "是否在文件夹树中显示本地文件夹(位于本机)。"
-
#~ msgid "Display only message texts not exceeding certain size"
#~ msgstr "仅显示不超过某一大小的文本信息"
@@ -22272,9 +26045,6 @@ msgstr "状态(_S)"
#~ msgid "Drafts _Folder:"
#~ msgstr "草稿文件夹(_F)："
-#~ msgid "_Trash Folder:"
-#~ msgstr "废件箱文件夹(_T)："
-
#~ msgid "_Junk Folder:"
#~ msgstr "垃圾信息文件夹(_J)："
@@ -22311,9 +26081,6 @@ msgstr "状态(_S)"
#~ msgid "SSL is not supported in this build of Evolution"
#~ msgstr "此次编译的 Evolution 不支持 SSL"
-#~ msgid "_Authentication Type"
-#~ msgstr "身份验证类型(_A)"
-
#~ msgid "Re_member password"
#~ msgstr "记住密码(_M)"
@@ -22633,9 +26400,6 @@ msgstr "状态(_S)"
#~ msgid "Birthdays & Anniversaries"
#~ msgstr "生日和纪念日"
-#~ msgid "_New Calendar..."
-#~ msgstr "新建日历(_N)..."
-
#~ msgid "Recent Messages"
#~ msgstr "最近信息"
@@ -22697,9 +26461,6 @@ msgstr "状态(_S)"
#~ msgid "User's calendars"
#~ msgstr "用户的日历"
-#~ msgid "Failed to get server URL."
-#~ msgstr "获得服务器 URL 失败。"
-
#~ msgid "Searching for user's calendars..."
#~ msgstr "搜索用户的日历..."
@@ -22727,18 +26488,12 @@ msgstr "状态(_S)"
#~ msgid "User e_mail:"
#~ msgstr "用户电子邮箱(_M)："
-#~ msgid "Failed to create thread: %s"
-#~ msgstr "创建本地邮件线索失败：%s"
-
#~ msgid "Server URL '%s' is not a valid URL"
#~ msgstr "服务器 URL %s 不是有效的 URL"
#~ msgid "Browse for a CalDAV calendar"
#~ msgstr "浏览以查找 CalDAV 日历"
-#~ msgid "_URL:"
-#~ msgstr "_URL："
-
#~ msgid "Brows_e server for a calendar"
#~ msgstr "浏览服务器以查找日历(_E)"
@@ -22849,9 +26604,6 @@ msgstr "状态(_S)"
#~ msgid "Cal_endar:"
#~ msgstr "日历(_E)："
-#~ msgid "Retrieve _List"
-#~ msgstr "获取列表(_L)"
-
#~ msgid "Google Calendars"
#~ msgstr "Google 日历"
@@ -22905,9 +26657,6 @@ msgstr "状态(_S)"
#~ msgid "Cannot get source list. %s"
#~ msgstr "能获取源列表。 %s"
-#~ msgid "Create an _Event"
-#~ msgstr "创建一个事件(_E)"
-
#~ msgid "TNEF Decoder"
#~ msgstr "TNEF 解码器"
@@ -23155,9 +26904,6 @@ msgstr "状态(_S)"
#~ "\n"
#~ "请稍候，Evolution 正在升迁您的文件夹..."
-#~ msgid "Formatting Message..."
-#~ msgstr "正在格式化信息..."
-
#~ msgid "Retrieving '%s'"
#~ msgstr "收取“%s”"
@@ -23171,15 +26917,9 @@ msgstr "状态(_S)"
#~ "Evolution 无法渲染此电子邮件，原因是该邮件太大。您可以以无格式方式查看该邮"
#~ "件，或者使用外部文本编辑器查看。"
-#~ msgid "View _Unformatted"
-#~ msgstr "无格式查看(_U)"
-
#~ msgid "Hide _Unformatted"
#~ msgstr "无格式隐藏(_U)"
-#~ msgid "O_pen With"
-#~ msgstr "打开方式(_P)"
-
#~ msgid "C_haracter set:"
#~ msgstr "字符集(_H)："
@@ -23217,9 +26957,6 @@ msgstr "状态(_S)"
#~ msgid "Protocol"
#~ msgstr "协议"
-#~ msgid "_Filename:"
-#~ msgstr "文件名(_F)："
-
#~ msgid "Invalid object"
#~ msgstr "无效的对象"
@@ -23285,24 +27022,15 @@ msgstr "状态(_S)"
#~ msgid "Scanning folders in \"%s\""
#~ msgstr "在“%s”中扫描文件夹"
-#~ msgid "Creating folder '%s'"
-#~ msgstr "创建文件夹“%s”"
-
#~ msgid "_Default junk plugin:"
#~ msgstr "默认的垃圾信息插件(_D)："
#~ msgid "_Use Secure Connection:"
#~ msgstr "使用安全连接(_U)："
-#~ msgid "Scanning folders in '%s'"
-#~ msgstr "在“%s”中扫描文件夹"
-
#~ msgid "Retrieving quota information for folder '%s'"
#~ msgstr "正在获取文件加 %s 的配额信息"
-#~ msgid "Opening store '%s'"
-#~ msgstr "打开存储 %s"
-
#~ msgid "Local Folders"
#~ msgstr "本地文件夹"
@@ -23380,9 +27108,6 @@ msgstr "状态(_S)"
#~ msgid "Enter password for %s (user %s)"
#~ msgstr "输入 %s 的密码(用户 %s)"
-#~ msgid "Failed to authenticate.\n"
-#~ msgstr "认证失败。\n"
-
#~ msgid "New _Shared Folder..."
#~ msgstr "新建共享文件夹(_S)..."
@@ -23462,9 +27187,6 @@ msgstr "状态(_S)"
#~ msgid "Message retracted successfully"
#~ msgstr "邮件成功收回"
-#~ msgid "Insert Send options"
-#~ msgstr "插入发送选项"
-
#~ msgid "The participants will receive the following notification.\n"
#~ msgstr "收件人将接收到下列通知。\n"
@@ -23784,9 +27506,6 @@ msgstr "状态(_S)"
#~ msgid "Event Gradient"
#~ msgstr "事件渐变"
-#~ msgid "Event Transparency"
-#~ msgstr "事件透明度"
-
#~ msgid "Gradient of the events in calendar views."
#~ msgstr "日历视图中事件的渐变。"
@@ -23810,10 +27529,6 @@ msgstr "状态(_S)"
#~ msgid "Yes. (Complex Recurrence)"
#~ msgstr "是(复杂重现)"
-#~ msgid "Every day"
-#~ msgid_plural "Every %d days"
-#~ msgstr[0] "每 %d 天"
-
#~ msgid "Every week"
#~ msgid_plural "Every %d weeks"
#~ msgstr[0] "每 %d 周"
@@ -23984,9 +27699,6 @@ msgstr "状态(_S)"
#~ msgid "The message contains only unsupported requests."
#~ msgstr "信息只含有不支持的请求。"
-#~ msgid "The attachment does not contain a valid calendar message"
-#~ msgstr "附件中没有有效的日历信息"
-
#~ msgid "The attachment has no viewable calendar items"
#~ msgstr "附件中没有可查看的日历项目"
@@ -24032,9 +27744,6 @@ msgstr "状态(_S)"
#~ msgid "Date:"
#~ msgstr "日期："
-#~ msgid "Loading Calendar"
-#~ msgstr "载入日历"
-
#~ msgid "Loading calendar..."
#~ msgstr "正在载入日历..."
@@ -24044,7 +27753,6 @@ msgstr "状态(_S)"
#~ msgid "Server Message:"
#~ msgstr "服务器信息："
-#~| msgid "An error occurred while printing"
#~ msgid "An error occurred while sending."
#~ msgstr "发送时出现了一个错误。"
@@ -24052,10 +27760,6 @@ msgstr "状态(_S)"
#~ msgid_plural "%d days from now"
#~ msgstr[0] "距现在有 %d 天"
-#~ msgid "%d day ago"
-#~ msgid_plural "%d days ago"
-#~ msgstr[0] "%d 天前"
-
#~ msgid "Debug Logs"
#~ msgstr "调试日志"
@@ -24100,9 +27804,6 @@ msgstr "状态(_S)"
#~ "Prompt when replying or forwarding from a mail browser whether close it"
#~ msgstr "在从邮件浏览器中回复或转发时，提示是否关闭它"
-#~| msgid ""
-#~| "Error on %s\n"
-#~| "%s"
#~ msgid ""
#~ "Error on %s: %s\n"
#~ "%s"
@@ -24117,17 +27818,14 @@ msgstr "状态(_S)"
#~ "%s 错误：\n"
#~ " %s"
-#~| msgid "Are you sure you want to delete this memo?"
#~ msgid ""
#~ "Folder '%s' contains %d duplicate messages. Are you sure you want to "
#~ "delete them?"
#~ msgstr "“%s”文件夹包含 %d 封重复信息。您确定要删除它们吗？"
-#~| msgid "_Edit message"
#~ msgid "Remo_ve duplicate messages"
#~ msgstr "移除重复信息(_V)"
-#~| msgid "Select all visible messages"
#~ msgid "Remove all duplicate messages"
#~ msgstr "移除所有重复消息"
@@ -24140,9 +27838,6 @@ msgstr "状态(_S)"
#~ msgid "Start Evolution activating the specified component"
#~ msgstr "启动 Evolution 并激活指定组件"
-#~ msgid "begin editing this cell"
-#~ msgstr "开始编辑此单元格"
-
#~ msgid "Unable to reconstruct message from autosave file"
#~ msgstr "无法从自动保存的文件重建信息"
@@ -24227,15 +27922,9 @@ msgstr "状态(_S)"
#~ msgid "Fi_xed-width:"
#~ msgstr "等宽(_X)："
-#~ msgid "Font Properties"
-#~ msgstr "字体属性"
-
#~ msgid "KB"
#~ msgstr "KB"
-#~ msgid "Message Fonts"
-#~ msgstr "信息字体"
-
#~ msgid ""
#~ "Note: you will not be prompted for a password until you connect for the "
#~ "first time"
@@ -24387,9 +28076,6 @@ msgstr "状态(_S)"
#~ msgid "Required Fields"
#~ msgstr "必需域"
-#~ msgid "Changed"
-#~ msgstr "已更改"
-
#~ msgid "Shell"
#~ msgstr "外壳"
@@ -24411,12 +28097,6 @@ msgstr "状态(_S)"
#~ msgid "Shell View"
#~ msgstr "外壳视图"
-#~ msgid "Width"
-#~ msgstr "宽度"
-
-#~ msgid "Height"
-#~ msgstr "高度"
-
#~ msgid "Has Focus"
#~ msgstr "有焦点"
@@ -24432,9 +28112,6 @@ msgstr "状态(_S)"
#~ msgid "Max field name length"
#~ msgstr "最大域名长度"
-#~ msgid "Column Width"
-#~ msgstr "列宽"
-
#~ msgid "Adapter"
#~ msgstr "适配器"
@@ -24603,9 +28280,6 @@ msgstr "状态(_S)"
#~ msgid "_Select Today"
#~ msgstr "选择今天(_S)"
-#~ msgid "_From Field"
-#~ msgstr "发件人域(_F)"
-
#~ msgid "Hide"
#~ msgstr "隐藏"
@@ -24632,10 +28306,6 @@ msgstr "状态(_S)"
#~ msgid "Could not parse PGP message: Unknown error"
#~ msgstr "无法解析 PGP 信息：未知错误"
-#, fuzzy
-#~ msgid "Shell Module"
-#~ msgstr "选择模式"
-
#~ msgid "Show Deleted"
#~ msgstr "显示删除的"
@@ -24645,9 +28315,6 @@ msgstr "状态(_S)"
#~ msgid "Later"
#~ msgstr "稍候"
-#~ msgid "Unable to create new folder `%s': %s"
-#~ msgstr "无法创建新文件夹“%s”：%s"
-
#~ msgid "Unable to copy folder `%s' to `%s': %s"
#~ msgstr "无法将文件夹“%s”复制为“%s”：%s"
@@ -24831,18 +28498,10 @@ msgstr "状态(_S)"
#~ msgid "Unable to migrate calendar `%s'"
#~ msgstr "无法升迁日历“%s”"
-#~| msgid "Default Mail Client"
-#~ msgid "Default Calendar Client"
-#~ msgstr "默认邮件客户端"
-
#, fuzzy
#~ msgid "The memo table model"
#~ msgstr "表格模型"
-#~| msgid "Default Mail Client"
-#~ msgid "Default Memo Client"
-#~ msgstr "默认邮件客户端"
-
#, fuzzy
#~ msgid "The task table model"
#~ msgstr "表格模型"
@@ -24860,15 +28519,9 @@ msgstr "状态(_S)"
#~ msgid "Unable to migrate tasks `%s'"
#~ msgstr "无法升迁任务“%s”"
-#~| msgid "Default Mail Client"
-#~ msgid "Default Task Client"
-#~ msgstr "默认邮件客户端"
-
-#~| msgid "Default value for thread expand state"
#~ msgid "Default client for task operations"
#~ msgstr "话题的默认展开状态"
-#~| msgid "_Group By Threads"
#~ msgid "Group by Threads"
#~ msgstr "按线索分组(_G)"
@@ -24884,9 +28537,6 @@ msgstr "状态(_S)"
#~ msgid "Temporarily hide the selected messages"
#~ msgstr "暂时隐藏选中信息"
-#~ msgid "Show Hidde_n Messages"
-#~ msgstr "显示隐藏的信息(_N)"
-
#~ msgid "Show messages that have been temporarily hidden"
#~ msgstr "显示暂时被隐藏的信息"
@@ -24903,15 +28553,6 @@ msgstr "状态(_S)"
#~ msgid "Default Mail Client"
#~ msgstr "默认邮件客户端"
-#~ msgid "<b>Server</b>"
-#~ msgstr "<b>服务器</b>"
-
-#~ msgid "<b>Users:</b>"
-#~ msgstr "<b>用户数：</b>"
-
-#~ msgid "<b>Account Name</b>"
-#~ msgstr "<b>帐号名</b>"
-
#~ msgid "Hula Support"
#~ msgstr "Hula 支持"
@@ -24924,9 +28565,6 @@ msgstr "状态(_S)"
#~ msgid "Setup Assistant"
#~ msgstr "设置助手"
-#~ msgid "Importing data."
-#~ msgstr "正在导入数据。"
-
#~ msgid "Please wait"
#~ msgstr "请稍候"
@@ -24949,7 +28587,6 @@ msgstr "状态(_S)"
#~ msgid "Page Number"
#~ msgstr "页码"
-#~| msgid "Search Filter"
#~ msgid "Search Rule"
#~ msgstr "搜索过滤器"
@@ -25000,30 +28637,24 @@ msgstr "状态(_S)"
#~ msgid "Whether the shell window is in safe mode"
#~ msgstr "插件是否已启用"
-#~| msgid "Sidebar is visible"
#~ msgid "Sidebar Visible"
#~ msgstr "侧边栏可见"
-#~| msgid "Whether the switcher is visible"
#~ msgid "Whether the shell window's side bar is visible"
#~ msgstr "切换器是否可见"
-#~| msgid "Sidebar is visible"
#~ msgid "Switcher Visible"
#~ msgstr "侧边栏可见"
-#~| msgid "Whether the window buttons should be visible."
#~ msgid "Whether the shell window's switcher buttons are visible"
#~ msgstr "窗口按钮是否可见。"
#~ msgid "Taskbar Visible"
#~ msgstr "任务栏可见"
-#~| msgid "Whether the switcher is visible"
#~ msgid "Whether the shell window's task bar is visible"
#~ msgstr "切换器是否可见"
-#~| msgid "Whether the switcher is visible"
#~ msgid "Whether the shell window's tool bar is visible"
#~ msgstr "切换器是否可见"
@@ -25144,21 +28775,12 @@ msgstr "状态(_S)"
#~ msgid "Minimum Width"
#~ msgstr "最小宽度"
-#~ msgid "Spacing"
-#~ msgstr "间距"
-
#~ msgid "The button state is online"
#~ msgstr "按钮状态为在线"
-#, fuzzy
-#~ msgid "Horizontal Position"
-#~ msgstr "水平面板位置"
-
-#~| msgid "Position"
#~ msgid "Proportion"
#~ msgstr "位置"
-#~| msgid "_Resize"
#~ msgid "Fixed Resize"
#~ msgstr "缩放(_R)"
@@ -25198,9 +28820,6 @@ msgstr "状态(_S)"
#~ msgid "Underline Column"
#~ msgstr "给列加下划线"
-#~ msgid "Bold Column"
-#~ msgstr "给列加粗"
-
#~ msgid "Color Column"
#~ msgstr "给列着色"
@@ -25246,9 +28865,6 @@ msgstr "状态(_S)"
#~ msgid "Sort Info"
#~ msgstr "排序信息"
-#~ msgid "Always search"
-#~ msgstr "总是搜索"
-
#~ msgid "Use click to add"
#~ msgstr "单击可添加"
@@ -25286,15 +28902,6 @@ msgstr "状态(_S)"
#~ msgid "Event Processor"
#~ msgstr "事件处理器"
-#~ msgid "Text"
-#~ msgstr "文字"
-
-#~ msgid "Bold"
-#~ msgstr "粗体"
-
-#~ msgid "Strikeout"
-#~ msgstr "删除线"
-
#~ msgid "Anchor"
#~ msgstr "锚点"
@@ -25334,18 +28941,9 @@ msgstr "状态(_S)"
#~ msgid "Break characters"
#~ msgstr "换行字符"
-#~ msgid "Max lines"
-#~ msgstr "最多行数"
-
#~ msgid "Draw borders"
#~ msgstr "绘制边框"
-#~ msgid "Allow newlines"
-#~ msgstr "允许新行"
-
-#~ msgid "Draw background"
-#~ msgstr "绘制背景"
-
#~ msgid "Draw button"
#~ msgstr "绘制按钮"
@@ -25357,3 +28955,102 @@ msgstr "状态(_S)"
#~ msgid "Handle Popup"
#~ msgstr "处理弹出"
+
+#~ msgid "Asia/Katmandu"
+#~ msgstr "亚洲/加德满都"
+
+#~ msgid "%d occurence replaced"
+#~ msgid_plural "%d occurences replaced"
+#~ msgstr[0] "%d 项查找项被替换"
+
+#~ msgid "_Lose formatting"
+#~ msgstr "丢弃格式(_L)"
+
+#~ msgid ""
+#~ "Type the name by which you would like to refer to this account.\n"
+#~ "For example, \"Work\" or \"Personal\"."
+#~ msgstr ""
+#~ "输入您想要给此帐号起的名字。\n"
+#~ "如：“工作”或“私人”。"
+
+#~ msgid "_Never load images from the Internet"
+#~ msgstr "绝不从 Internet 载入图像(_N)"
+
+#~ msgid "_Load images only in messages from contacts"
+#~ msgstr "载入来自联系人的邮件中的图像(_L)"
+
+#~ msgid "_Always load images from the Internet"
+#~ msgstr "总是从 Internet 上载入图像(_A)"
+
+#~ msgid "_Always"
+#~ msgstr "总是(_A)"
+
+#~ msgid "N_ever"
+#~ msgstr "从不(_E)"
+
+#~ msgid "Template:"
+#~ msgstr "模板："
+
+#~ msgid ""
+#~ "The file you selected does not look like a valid .png image. Error: {0}"
+#~ msgstr "您选择的文件好象不是有效的 PNG 图像。错误：{0}"
+
+#~ msgid "Failed to connect to '{0}'"
+#~ msgstr "连接到 “{0}” 失败"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "Temporary"
+#~ msgstr "临时"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Temporary (this session only)"
+#~ msgstr "临时(限本此会话)(_T)"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Marginal"
+#~ msgstr "轻微(_M)"
+
+#~ msgctxt "CamelTrust"
+#~ msgid "_Ultimate"
+#~ msgstr "极限(_U)"
+
+#~ msgid "Certificate"
+#~ msgstr "证书"
+
+#~ msgid "No _Proxy for:"
+#~ msgstr "不使用代理的情况(_P)："
+
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "文件不是一个有效的 .desktop 文件"
+
+#~ msgid "A_vailable Fields:"
+#~ msgstr "可用域(_V)："
+
+#~ msgid "Completed on"
+#~ msgstr "完成于"
+
+#~ msgid "_Authentication Type"
+#~ msgstr "身份验证类型(_A)"
+
+#~ msgid "_New Calendar..."
+#~ msgstr "新建日历(_N)..."
+
+#~ msgid "Formatting Message..."
+#~ msgstr "正在格式化信息..."
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天前"
+
+#~ msgid "Message Fonts"
+#~ msgstr "信息字体"
+
+#, fuzzy
+#~ msgid "Shell Module"
+#~ msgstr "选择模式"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "显示隐藏的信息(_N)"
+
+#~ msgid "Allow newlines"
+#~ msgstr "允许新行"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
