aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/zh_CN.po11317
1 files changed, 5629 insertions, 5688 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1a7e749259..97705535fe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,16 +7,17 @@
# Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
# Tao Wei <weitao1979@gmail.com>, 2009.
# Andrew Zheng <andrew0zheng@gmail.com>, 2009.
+# Funda Wang <fundawang0zheng@gmail.com>, 2010.
+# Aron Xu <aronxu@gnome.org>, 2010.
#
-#: ../shell/main.c:479
+#: ../shell/main.c:519
msgid ""
msgstr ""
"Project-Id-Version: evolution master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution\n"
-"POT-Creation-Date: 2010-04-17 11:48+0000\n"
-"PO-Revision-Date: 2010-04-18 00:27+0800\n"
-"Last-Translator: Funda Wang <fundawang0zheng@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-14 14:27+0800\n"
+"PO-Revision-Date: 2010-07-14 15:31+0800\n"
+"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroup.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -84,41 +85,46 @@ msgid "Delete address book '{0}'?"
msgstr "删除地址簿“{0}”吗?"
#: ../addressbook/addressbook.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:34 ../mail/mail.error.xml.h:45
+msgid "Do _Not Delete"
+msgstr "不删除(_N)"
+
+#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
msgstr "将{0}保存到 {1} 出错:{2}"
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
msgid "Failed to authenticate with LDAP server."
msgstr "认证到 IMAP 服务器失败。"
#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:15
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1265
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1273
msgid "Failed to delete contact"
msgstr "删除联系人失败"
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
msgid "GroupWise Address book creation:"
msgstr "GroupWise 地址簿创建:"
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP 服务器无法响应有效的大纲信息。"
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
msgid "Some features may not work properly with your current server"
msgstr "某些特性可能无法在您目前的服务器下工作"
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
msgid "The Evolution address book has quit unexpectedly."
msgstr "Evolution 地址簿异常退出。"
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
msgstr "您所选择的图像太大。您是否想要缩放并存储?"
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
msgid ""
"This LDAP server may use an older version of LDAP, which does not support "
"this functionality or it may be misconfigured. Ask your administrator for "
@@ -127,45 +133,45 @@ msgstr ""
"此 LDAP 服务器可能使用较早版本的 LDAP,所以无法支持此功能,或者是配置错误。请"
"询问您的管理员有关支持的搜索基础一事。"
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
msgid "This address book could not be opened."
msgstr "无法打开此地址簿。"
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
msgid "This address book server does not have any suggested search bases."
msgstr "此地址簿服务器不支持任何建议的搜索基础。"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
msgid ""
"This address book server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
msgstr "此地址簿服务器不可达,或者服务器名称拼错,又或者您的网络连接已断。"
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This address book will be removed permanently."
msgstr "此地址簿即将被永久删除。"
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
msgid "This server does not support LDAPv3 schema information."
msgstr "此服务器不支持 LDAPv3 大纲信息。"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
msgid "Unable to open address book"
msgstr "无法打开地址簿"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
msgid "Unable to perform search."
msgstr "无法执行搜索。"
-#: ../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 "Would you like to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
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?"
@@ -173,7 +179,7 @@ msgstr ""
"您即将把联系人从一个地址簿移至另外一个地址簿,但是无法从源地址簿删除该联系"
"人。您想要换作复制联系人吗?"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -182,71 +188,47 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到 Evolution 支持的版本"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
msgid "You do not have permission to delete contacts in this address book."
msgstr "您没有足够的权限从地址簿中删除联系人。"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "您已对此联系人作出了修改。您想要保存这些更改吗?"
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: ../addressbook/addressbook.error.xml.h:36 ../mail/em-vfolder-rule.c:522
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:525
#: ../plugins/groupwise-features/junk-settings.ui.h:4
#: ../plugins/groupwise-features/properties.ui.h:10
#: ../widgets/table/e-table-config.ui.h:18
msgid "_Add"
msgstr "添加(_A)"
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
msgid "_Discard"
msgstr "丢弃(_D)"
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
msgid "_Do not save"
msgstr "不保存(_D)"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
msgid "_Resize"
msgstr "缩放(_R)"
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
msgid "_Use as it is"
msgstr "原样使用(_U)"
-#. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:42 ../mail/mail.error.xml.h:145
-msgid "{0}"
-msgstr "{0}"
-
-#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:44
-msgid "{1}"
-msgstr "{1}"
-
-#: ../addressbook/conduit/address-conduit.c:597
-msgid "Default Sync Address:"
-msgstr "默认同步地址:"
-
-#: ../addressbook/conduit/address-conduit.c:1631
-#: ../addressbook/conduit/address-conduit.c:1632
-msgid "Could not load address book"
-msgstr "无法装入地址簿"
-
-#: ../addressbook/conduit/address-conduit.c:1709
-#: ../addressbook/conduit/address-conduit.c:1712
-msgid "Could not read pilot's Address application block"
-msgstr "无法读入 Pilot 的地址应用程序块"
-
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../calendar/gui/e-calendar-view.c:1987
+#: ../calendar/gui/e-calendar-view.c:2022
msgid "Anniversary"
msgstr "纪念日"
@@ -257,260 +239,235 @@ msgstr "纪念日"
#. * the directory components.
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1986 ../capplet/anjal-settings-main.c:118
-#: ../shell/main.c:112
+#: ../calendar/gui/e-calendar-view.c:2021 ../capplet/anjal-settings-main.c:118
+#: ../shell/main.c:118
msgid "Birthday"
msgstr "生日"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
-#: ../calendar/gui/dialogs/event-page.ui.h:7
+#. Translators: an accessibility name
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Blog:"
+msgstr "博客:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:10
#: ../calendar/gui/dialogs/memo-page.ui.h:1
msgid "Ca_tegories..."
msgstr "类别(_T)..."
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
msgid "Calendar:"
msgstr "日历:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1247
-#: ../addressbook/gui/widgets/e-minicard.c:198
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/importers/evolution-vcard-importer.c:934
msgid "Contact"
msgstr "联系人"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
#: ../addressbook/gui/contact-editor/e-contact-editor.c:590
#: ../addressbook/gui/contact-editor/e-contact-editor.c:605
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2498
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2584
msgid "Contact Editor"
msgstr "联系人编辑器"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
-#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/merging/eab-contact-merging.c:295
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
#: ../addressbook/gui/widgets/eab-contact-display.c:517
#: ../addressbook/gui/widgets/eab-contact-display.c:525
#: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:823
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:832
msgid "Email"
msgstr "电子邮件"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
msgid "Free/Busy:"
msgstr "闲/忙:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
msgid "Full _Name..."
msgstr "全名(_N)..."
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:70
msgid "Home"
msgstr "家庭"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
msgid "Home Page:"
msgstr "主页:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
msgid "Image"
msgstr "图像"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
msgid "Instant Messaging"
msgstr "即时通讯"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
msgid "Job"
msgstr "工作"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
msgid "Mailing Address"
msgstr "邮政地址"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
#: ../calendar/gui/dialogs/task-details-page.ui.h:11
msgid "Miscellaneous"
msgstr "杂项"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
msgid "Nic_kname:"
msgstr "昵称(_K):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
#: ../modules/calendar/e-memo-shell-migrate.c:250
-#: ../plugins/groupwise-features/camel-gw-listener.c:422
-#: ../plugins/groupwise-features/camel-gw-listener.c:447
-#: ../plugins/groupwise-features/camel-gw-listener.c:562
+#: ../plugins/groupwise-features/camel-gw-listener.c:423
+#: ../plugins/groupwise-features/camel-gw-listener.c:448
+#: ../plugins/groupwise-features/camel-gw-listener.c:563
msgid "Notes"
msgstr "笔记"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
#: ../addressbook/gui/widgets/eab-contact-display.c:71
#: ../addressbook/gui/widgets/eab-contact-display.c:460
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1725
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
msgid "Personal Information"
msgstr "个人信息"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
msgid "Telephone"
msgstr "电话"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
msgid "Video Chat:"
msgstr "视频聊天:"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
msgid "Web Addresses"
msgstr "网络地址"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Log:"
-msgstr "网络日志:"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+msgid "Web addresses"
+msgstr "网络地址"
-#. red
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:69
#: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../mail/e-mail-migrate.c:961
msgid "Work"
msgstr "工作"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
msgid "_Address:"
msgstr "地址(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
msgid "_Anniversary:"
msgstr "周年(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
msgid "_Assistant:"
msgstr "助手(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
msgid "_Birthday:"
msgstr "生日(_B):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../calendar/gui/dialogs/event-page.c:823
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../plugins/itip-formatter/itip-view.c:1913
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+msgid "_Blog:"
+msgstr "博客(_N):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/itip-formatter/itip-view.c:1921
msgid "_Calendar:"
msgstr "日历(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
msgid "_City:"
msgstr "城市(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
msgid "_Company:"
msgstr "公司(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
msgid "_Country:"
msgstr "国家/地区(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
msgid "_Department:"
msgstr "部门(_D):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
msgid "_File under:"
msgstr "存档为(_F):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
msgid "_Free/Busy:"
msgstr "忙/闲(_F):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
msgid "_Home Page:"
msgstr "主页(_H):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
msgid "_Manager:"
msgstr "经理(_M):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
msgid "_Office:"
msgstr "办公室(_O):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
msgid "_PO Box:"
msgstr "邮政邮箱(_P):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
msgid "_Profession:"
msgstr "职业(_P):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
msgid "_Spouse:"
msgstr "配偶(_S):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
msgid "_State/Province:"
msgstr "州/省(_S):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
#: ../addressbook/gui/contact-editor/fullname.ui.h:17
msgid "_Title:"
msgstr "头衔(_T):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
msgid "_Video Chat:"
msgstr "视频聊天(_V):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
msgid "_Wants to receive HTML mail"
msgstr "愿意接收 HTML 邮件(_W)"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-msgid "_Web Log:"
-msgstr "_Web 日志:"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:50
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
msgid "_Where:"
msgstr "何处(_W):"
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
msgid "_Zip/Postal Code:"
msgstr "邮政编码(_Z):"
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
-#: ../e-util/e-logger.c:174 ../mail/e-mail-label-tree-view.c:96
-#: ../plugins/caldav/caldav-browse-server.c:1159
-#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
-#: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:320
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:60
-msgid "Name"
-msgstr "姓名"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1267
-#: ../addressbook/gui/widgets/e-addressbook-model.c:522
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:427
-#: ../addressbook/gui/widgets/e-minicard-label.c:164
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
-#: ../addressbook/gui/widgets/e-minicard-view.c:548
-#: ../addressbook/gui/widgets/e-minicard.c:191
-#: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1659 ../widgets/text/e-text.c:3441
-#: ../widgets/text/e-text.c:3442
-msgid "Editable"
-msgstr "可编辑"
-
#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
#: ../addressbook/gui/widgets/eab-contact-display.c:539
msgid "AIM"
@@ -552,7 +509,7 @@ msgid "Skype"
msgstr "Skype"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:209
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
+#: ../addressbook/gui/widgets/eab-gui-util.c:353
msgid "Error adding contact"
msgstr "添加联系人出错"
@@ -564,45 +521,21 @@ msgstr "修改联系人出错"
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
-msgid "Source Book"
-msgstr "来源地址簿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-msgid "Target Book"
-msgstr "目标地址簿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:317
-msgid "Is New Contact"
-msgstr "为新联系人"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:324
-msgid "Writable Fields"
-msgstr "可写域"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:331
-msgid "Required Fields"
-msgstr "必需域"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:345
-msgid "Changed"
-msgstr "已更改"
-
#: ../addressbook/gui/contact-editor/e-contact-editor.c:600
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2493
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2579
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2987
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2988
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3164
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3261
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -610,56 +543,46 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3168
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3265
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3272
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3190
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3298
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3215
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3312
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:355
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:358
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:433
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:444
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
-#: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:218 ../shell/e-shell-window.c:678
-msgid "Shell"
-msgstr "外壳"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:219 ../shell/e-shell-window.c:679
-msgid "The EShell singleton"
-msgstr "EShell 的一个"
-
#: ../addressbook/gui/contact-editor/fullname.ui.h:1
msgid "Dr."
msgstr "博士"
@@ -726,7 +649,7 @@ msgid "_Suffix:"
msgstr "后缀(_S):"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:672
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
@@ -743,7 +666,7 @@ msgid "_List name:"
msgstr "列表名称(_L):"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
-#: ../mail/mail-config.ui.h:154
+#: ../mail/mail-config.ui.h:168
msgid "_Select..."
msgstr "选择(_S)..."
@@ -751,39 +674,27 @@ msgstr "选择(_S)..."
msgid "_Type an email address or drag a contact into the list below:"
msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T):"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:765
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:760
msgid "Contact List Members"
msgstr "联系人列表成员"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:913
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1326
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:911
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1328
msgid "_Members"
msgstr "成员(_M)"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1165
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1179
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1180
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1193
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1194
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
-#: ../addressbook/gui/widgets/e-addressbook-model.c:512
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:413
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
-#: ../addressbook/gui/widgets/e-minicard-view.c:534
-msgid "Book"
-msgstr "地址簿"
-
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1257
-msgid "Is New List"
-msgstr "为新列表"
-
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
msgid "Changed Contact:"
msgstr "更改了的联系人:"
@@ -820,133 +731,110 @@ msgstr ""
"您一定要添加吗?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:231
+#: ../addressbook/gui/merging/eab-contact-merging.c:241
msgid "_Merge"
msgstr "合并(_M)"
-#: ../addressbook/gui/merging/eab-contact-merging.c:216
+#: ../addressbook/gui/merging/eab-contact-merging.c:166
+#: ../addressbook/util/addressbook.c:245 ../calendar/gui/tasktypes.xml.h:7
+#, c-format
+msgid "Cancelled"
+msgstr "已取消"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:224
msgid "Merge Contact"
msgstr "合并联系人"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
#: ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
-#: ../modules/calendar/e-cal-shell-view-actions.c:1626
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:967
msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:911
msgid "Email begins with"
msgstr "邮件以此开头"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:918
msgid "Name contains"
msgstr "姓名含有"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:142
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
msgid "No contacts"
msgstr "无联系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
#, c-format
msgid "%d contact"
msgid_plural "%d contacts"
msgstr[0] "%d 个联系人"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-model.c:309
msgid "Error getting book view"
msgstr "获取名簿视图出错"
-#: ../addressbook/gui/widgets/e-addressbook-model.c:532
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:420
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
-#: ../addressbook/gui/widgets/e-minicard-view.c:541
-msgid "Query"
-msgstr "查询"
-
-#: ../addressbook/gui/widgets/e-addressbook-model.c:706
+#: ../addressbook/gui/widgets/e-addressbook-model.c:708
msgid "Search Interrupted"
msgstr "搜索中断了"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:434
-#: ../addressbook/gui/widgets/e-addressbook-view.c:758
-#: ../calendar/gui/e-memo-table.c:1053 ../calendar/gui/e-task-table.c:1352
-#: ../modules/calendar/e-memo-shell-content.c:607
-#: ../modules/calendar/e-task-shell-content.c:629
-#: ../widgets/table/e-table-click-to-add.c:511
-#: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3367
-#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3308
-#: ../widgets/text/e-text.c:3309
-msgid "Model"
-msgstr "模型"
-
#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:150
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:616
+#: ../addressbook/gui/widgets/e-addressbook-view.c:622
msgid "Cut selected contacts to the clipboard"
msgstr "将选联系人剪切到剪贴板"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:622
+#: ../addressbook/gui/widgets/e-addressbook-view.c:628
msgid "Copy selected contacts to the clipboard"
msgstr "将选中联系人复制到剪贴板"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:628
+#: ../addressbook/gui/widgets/e-addressbook-view.c:634
msgid "Paste contacts from the clipboard"
msgstr "从剪贴板中粘贴联系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:634
-#: ../modules/addressbook/e-book-shell-view-actions.c:727
+#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../modules/addressbook/e-book-shell-view-actions.c:729
msgid "Delete selected contacts"
msgstr "删除选中的联系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:640
+#: ../addressbook/gui/widgets/e-addressbook-view.c:646
msgid "Select all visible contacts"
msgstr "选中全部可见联系人"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:774
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-task-table.c:1369
-msgid "Shell View"
-msgstr "外壳视图"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:785
-msgid "Source"
-msgstr "来源"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1283
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
msgid "Are you sure you want to delete these contact lists?"
msgstr "您确定要删除这些联系人列表吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1287
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1295
msgid "Are you sure you want to delete this contact list?"
msgstr "您确定要删除这些联系人列表吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1291
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
#, c-format
msgid "Are you sure you want to delete this contact list (%s)?"
msgstr "您确定要删除联系人列表(%s)吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1297
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
msgid "Are you sure you want to delete these contacts?"
msgstr "您确定要删除这些联系人吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1301
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1309
msgid "Are you sure you want to delete this contact?"
msgstr "您确定要删除这些联系人吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1305
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
#, c-format
msgid "Are you sure you want to delete this contact (%s)?"
msgstr "您确定要删除联系人(%s)吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1460
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1468
#, c-format
msgid ""
"Opening %d contacts will open %d new windows as well.\n"
@@ -955,11 +843,11 @@ msgstr ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1465
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1473
msgid "_Don't Display"
msgstr "不显示(_D)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1466
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1474
msgid "Display _All Contacts"
msgstr "显示全部联系人(_A)"
@@ -993,7 +881,7 @@ msgid "Car Phone"
msgstr "车载电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:11
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -1094,7 +982,7 @@ msgid "Radio"
msgstr "收音机"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:578
+#: ../calendar/gui/e-meeting-list-view.c:569
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
msgid "Role"
msgstr "角色"
@@ -1119,7 +1007,6 @@ msgid "Telex"
msgstr "电传"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:825
msgid "Title"
msgstr "头衔"
@@ -1131,59 +1018,7 @@ msgstr "单位"
msgid "Web Site"
msgstr "网站"
-#: ../addressbook/gui/widgets/e-minicard-label.c:115
-#: ../addressbook/gui/widgets/e-minicard.c:154
-#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
-#: ../widgets/table/e-table-click-to-add.c:525
-#: ../widgets/table/e-table-col.c:121
-#: ../widgets/table/e-table-group-container.c:1002
-#: ../widgets/table/e-table-group-container.c:1003
-#: ../widgets/table/e-table-group-leaf.c:642
-#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:2891 ../widgets/table/e-table-item.c:2892
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
-msgid "Width"
-msgstr "宽度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:122
-#: ../addressbook/gui/widgets/e-minicard.c:161
-#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/table/e-table-click-to-add.c:532
-#: ../widgets/table/e-table-group-container.c:995
-#: ../widgets/table/e-table-group-container.c:996
-#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:2897 ../widgets/table/e-table-item.c:2898
-#: ../widgets/text/e-text.c:3490 ../widgets/text/e-text.c:3491
-msgid "Height"
-msgstr "高度"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:129
-#: ../addressbook/gui/widgets/e-minicard.c:169
-msgid "Has Focus"
-msgstr "有焦点"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "域"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "域名"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "文字模型"
-
-#: ../addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "最大域名长度"
-
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
-msgid "Column Width"
-msgstr "列宽"
-
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:183
msgid ""
"\n"
"\n"
@@ -1193,7 +1028,7 @@ msgstr ""
"\n"
"正在搜索联系人..."
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:186
msgid ""
"\n"
"\n"
@@ -1207,7 +1042,7 @@ msgstr ""
"\n"
"或在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:187
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
msgid ""
"\n"
"\n"
@@ -1221,7 +1056,7 @@ msgstr ""
"\n"
"请在此双击以创建新联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
msgid ""
"\n"
"\n"
@@ -1231,7 +1066,7 @@ msgstr ""
"\n"
"搜索联系人。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:195
msgid ""
"\n"
"\n"
@@ -1241,10 +1076,6 @@ msgstr ""
"\n"
"本视图中没有可显示的项。"
-#: ../addressbook/gui/widgets/e-minicard-view.c:527
-msgid "Adapter"
-msgstr "适配器"
-
#: ../addressbook/gui/widgets/e-minicard.c:99
msgid "Work Email"
msgstr "工作电子邮件"
@@ -1254,21 +1085,13 @@ msgid "Home Email"
msgstr "家庭电子邮件"
#: ../addressbook/gui/widgets/e-minicard.c:101
-#: ../addressbook/gui/widgets/e-minicard.c:797
+#: ../addressbook/gui/widgets/e-minicard.c:807
msgid "Other Email"
msgstr "其它电子邮件"
-#: ../addressbook/gui/widgets/e-minicard.c:177
-msgid "Selected"
-msgstr "已选择"
-
-#: ../addressbook/gui/widgets/e-minicard.c:184
-msgid "Has Cursor"
-msgstr "有光标"
-
#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
-#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+#: ../addressbook/gui/widgets/ea-minicard-view.c:184
msgid "evolution address book"
msgstr "evolution 地址簿"
@@ -1280,7 +1103,7 @@ msgstr "新建联系人"
msgid "New Contact List"
msgstr "新建联系人列表"
-#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#: ../addressbook/gui/widgets/ea-minicard-view.c:167
#, c-format
msgid "current address book folder %s has %d card"
msgid_plural "current address book folder %s has %d cards"
@@ -1307,17 +1130,17 @@ msgid "Copy _Email Address"
msgstr "复制电子邮件地址(_E)"
#: ../addressbook/gui/widgets/eab-contact-display.c:176
-#: ../widgets/misc/e-web-view.c:370
+#: ../widgets/misc/e-web-view.c:391
msgid "Copy the email address to the clipboard"
msgstr "复制电子邮件地址到剪贴板"
#: ../addressbook/gui/widgets/eab-contact-display.c:181
-#: ../widgets/misc/e-web-view.c:375
+#: ../widgets/misc/e-web-view.c:396
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
#: ../addressbook/gui/widgets/eab-contact-display.c:183
-#: ../widgets/misc/e-web-view.c:377
+#: ../widgets/misc/e-web-view.c:398
msgid "Send a mail message to this address"
msgstr "发送一个邮件信息到这个地址"
@@ -1353,22 +1176,22 @@ msgid "Video Chat"
msgstr "视频聊天"
#: ../addressbook/gui/widgets/eab-contact-display.c:562
-#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../calendar/gui/dialogs/calendar-setup.c:370
#: ../modules/calendar/e-cal-shell-view-actions.c:218
#: ../modules/calendar/e-cal-shell-view-actions.c:247
-#: ../modules/calendar/e-cal-shell-view.c:465
-#: ../plugins/groupwise-features/camel-gw-listener.c:420
-#: ../plugins/groupwise-features/camel-gw-listener.c:445
-#: ../plugins/groupwise-features/camel-gw-listener.c:560
-#: ../plugins/hula-account-setup/camel-hula-listener.c:371
-#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../modules/calendar/e-cal-shell-view.c:488
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:561
#: ../plugins/publish-calendar/publish-calendar.ui.h:1
+#: ../widgets/misc/e-send-options.c:498
msgid "Calendar"
msgstr "日历"
#: ../addressbook/gui/widgets/eab-contact-display.c:563
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
-#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:355
#: ../plugins/publish-calendar/publish-calendar.ui.h:6
msgid "Free/Busy"
msgstr "忙/闲"
@@ -1396,21 +1219,19 @@ msgid "Web Log"
msgstr "Web 日志"
#. Create the default Person addressbook
-#. orange
-#. Create the default Person addressbook
#. Create the default Person calendar
#. Create the default Person memo list
#. Create the default Person task list
#: ../addressbook/gui/widgets/eab-contact-display.c:586
-#: ../capplet/settings/mail-capplet-shell.c:346 ../mail/e-mail-migrate.c:962
-#: ../modules/addressbook/e-book-shell-backend.c:175
-#: ../modules/addressbook/e-book-shell-migrate.c:507
-#: ../modules/calendar/e-cal-shell-backend.c:171
-#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../capplet/settings/mail-capplet-shell.c:350
+#: ../modules/addressbook/e-book-shell-backend.c:176
+#: ../modules/addressbook/e-book-shell-migrate.c:138
+#: ../modules/calendar/e-cal-shell-backend.c:181
+#: ../modules/calendar/e-cal-shell-migrate.c:151
#: ../modules/calendar/e-memo-shell-backend.c:154
#: ../modules/calendar/e-memo-shell-migrate.c:112
#: ../modules/calendar/e-task-shell-backend.c:158
-#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/calendar/e-task-shell-migrate.c:121
#: ../plugins/email-custom-header/email-custom-header.c:320
msgid "Personal"
msgstr "个人"
@@ -1427,119 +1248,13 @@ msgstr "主页"
msgid "Blog"
msgstr "Blog"
-#: ../addressbook/gui/widgets/eab-contact-display.c:1031
-#: ../widgets/misc/e-web-view.c:750
+#: ../addressbook/gui/widgets/eab-contact-display.c:1011
+#: ../widgets/misc/e-web-view.c:848
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Success"
-msgstr "成功"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
-msgid "Backend busy"
-msgstr "后台忙"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
-msgid "Repository offline"
-msgstr "仓库脱机"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Address Book does not exist"
-msgstr "地址簿不存在"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
-msgid "No Self Contact defined"
-msgstr "未定义自身联系人"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
-msgid "Permission denied"
-msgstr "没有权限"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Contact not found"
-msgstr "找不到联系人"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Contact ID already exists"
-msgstr "联系人 ID 已经存在"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Protocol not supported"
-msgstr "不支持的协议"
-
-#. E_BOOK_ERROR_CANCELLED
-#. To Translators: This is task status
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:295
-#: ../calendar/gui/e-cal-model-tasks.c:465
-#: ../calendar/gui/e-cal-model-tasks.c:739 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:584
-#: ../calendar/gui/print.c:2651
-msgid "Canceled"
-msgstr "已取消"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-msgid "Could not cancel"
-msgstr "无法取消"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
-msgid "Authentication Failed"
-msgstr "认证失败"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Authentication Required"
-msgstr "必须认证"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
-msgid "TLS not Available"
-msgstr "TLS 不可用"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
-msgid "No such source"
-msgstr "没有来源"
-
-#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
#: ../addressbook/gui/widgets/eab-gui-util.c:72
-msgid "Not available in offline mode"
-msgstr "脱机模式下不可用"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-msgid "Other error"
-msgstr "其它错误"
-
-#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
-msgid "Invalid server version"
-msgstr "无效的服务器版本"
-
-#. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:75
-msgid "Unsupported authentication method"
-msgstr "不支持的认证方式"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:107
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 "
@@ -1548,14 +1263,14 @@ msgstr ""
"无法打开此地址簿。这可能意味着此地址簿没有标为可脱机使用,或者尚未下载完成以"
"供脱机使用。请在联机模式中载入此地址簿以便下载其内容。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:116
+#: ../addressbook/gui/widgets/eab-gui-util.c:81
#, 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:128
+#: ../addressbook/gui/widgets/eab-gui-util.c:93
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."
@@ -1563,7 +1278,7 @@ msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#: ../addressbook/gui/widgets/eab-gui-util.c:102
msgid ""
"This address book cannot be opened. This either means that an incorrect URI "
"was entered, or the server is unreachable."
@@ -1571,11 +1286,11 @@ msgstr ""
"无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经关"
"闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:145
+#: ../addressbook/gui/widgets/eab-gui-util.c:110
msgid "Detailed error message:"
msgstr "错误细节消息:"
-#: ../addressbook/gui/widgets/eab-gui-util.c:168
+#: ../addressbook/gui/widgets/eab-gui-util.c:134
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -1586,7 +1301,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:141
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"
@@ -1597,44 +1312,50 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:180
-msgid "The backend for this address book was unable to parse this query."
-msgstr "此地址簿的后端无法解析此查询。"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:149
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "此地址簿的后端无法解析此查询。%s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
-msgid "The backend for this address book refused to perform this query."
-msgstr "此地址簿的后端拒绝执行此查询。"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "此地址簿的后端拒绝执行此查询。%s"
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
-msgid "This query did not complete successfully."
-msgstr "此查询未成功完成。"
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#, 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:208
+#: ../addressbook/gui/widgets/eab-gui-util.c:184
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:247
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:310
+#: ../addressbook/gui/widgets/eab-gui-util.c:287
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:437
+#: ../addressbook/gui/widgets/eab-gui-util.c:414
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:439
+#: ../addressbook/gui/widgets/eab-gui-util.c:416
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:442
+#: ../addressbook/gui/widgets/eab-gui-util.c:419
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:444
+#: ../addressbook/gui/widgets/eab-gui-util.c:421
msgid "Copy contacts to"
msgstr "将联系人复制到"
@@ -1642,54 +1363,61 @@ msgstr "将联系人复制到"
msgid "Card View"
msgstr "名片视图"
-#: ../addressbook/importers/evolution-csv-importer.c:654
+#: ../addressbook/importers/evolution-csv-importer.c:720
#: ../addressbook/importers/evolution-ldif-importer.c:516
-#: ../addressbook/importers/evolution-vcard-importer.c:253
-#: ../calendar/importers/icalendar-importer.c:310
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
+#: ../addressbook/importers/evolution-vcard-importer.c:264
+#: ../calendar/importers/icalendar-importer.c:325
+#: ../calendar/importers/icalendar-importer.c:764 ../shell/shell.error.xml.h:6
msgid "Importing..."
msgstr "正在导入..."
-#: ../addressbook/importers/evolution-csv-importer.c:858
+#: ../addressbook/importers/evolution-csv-importer.c:1008
msgid "Outlook CSV or Tab (.csv, .tab)"
msgstr "Outlook CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:859
+#: ../addressbook/importers/evolution-csv-importer.c:1009
msgid "Outlook CSV and Tab Importer"
msgstr "Outlook CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-csv-importer.c:867
+#: ../addressbook/importers/evolution-csv-importer.c:1017
msgid "Mozilla CSV or Tab (.csv, .tab)"
msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:868
+#: ../addressbook/importers/evolution-csv-importer.c:1018
msgid "Mozilla CSV and Tab Importer"
msgstr "Mozilla CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-csv-importer.c:876
+#: ../addressbook/importers/evolution-csv-importer.c:1026
msgid "Evolution CSV or Tab (.csv, .tab)"
msgstr "Evolution CSV 或 Tab (.csv, .tab)"
-#: ../addressbook/importers/evolution-csv-importer.c:877
+#: ../addressbook/importers/evolution-csv-importer.c:1027
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-ldif-importer.c:689
+#: ../addressbook/importers/evolution-ldif-importer.c:742
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:690
+#: ../addressbook/importers/evolution-ldif-importer.c:743
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
-#: ../addressbook/importers/evolution-vcard-importer.c:556
+#: ../addressbook/importers/evolution-vcard-importer.c:623
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:557
+#: ../addressbook/importers/evolution-vcard-importer.c:624
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:746
+#, c-format
+msgid "Page %d"
+msgstr "第 %d 页"
+
#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
@@ -1763,21 +1491,21 @@ msgstr "未处理的错误"
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: ../addressbook/util/addressbook.c:210
-#: ../plugins/groupwise-features/camel-gw-listener.c:525
+#: ../addressbook/util/addressbook.c:215
+#: ../plugins/groupwise-features/camel-gw-listener.c:526
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: ../addressbook/util/addressbook.c:217
-#: ../plugins/groupwise-features/camel-gw-listener.c:505
+#: ../addressbook/util/addressbook.c:222
+#: ../plugins/groupwise-features/camel-gw-listener.c:506
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "输入 %s 的密码(用户 %s)"
-#: ../addressbook/util/addressbook.c:225
-#: ../calendar/common/authentication.c:51
-#: ../plugins/caldav/caldav-browse-server.c:809
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../addressbook/util/addressbook.c:230
+#: ../calendar/common/authentication.c:55
+#: ../plugins/caldav/caldav-browse-server.c:813
+#: ../plugins/google-account-setup/google-source.c:438
#: ../plugins/publish-calendar/publish-calendar.c:328
#: ../smime/gui/component.c:49
msgid "Enter password"
@@ -1800,14 +1528,14 @@ msgstr "“{0}”是只读日历,无法修改。请另选一个可接受约会
#: ../calendar/calendar.error.xml.h:5
msgid ""
-"Adding a meaningful summary to your appointment will give your recipients an "
-"idea of what your appointment is about."
+"Adding a meaningful summary to your appointment will give you an idea of "
+"what your appointment is about."
msgstr "在您的约会中添加有意义的摘要可以让您的收件人更容易明白您约会的内容。"
#: ../calendar/calendar.error.xml.h:6
msgid ""
-"Adding a meaningful summary to your task will give your recipients an idea "
-"of what your task is about."
+"Adding a meaningful summary to your task will give you an idea of what your "
+"task is about."
msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
#: ../calendar/calendar.error.xml.h:7
@@ -1897,38 +1625,34 @@ msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
#: ../calendar/calendar.error.xml.h:26
-msgid "Are you sure you want to save the memo without a summary?"
-msgstr "您确定想要保存没有摘要的备忘吗?"
+msgid "Are you sure you want to save the appointment without a summary?"
+msgstr "您确定想要发送没有摘要的约会吗?"
#: ../calendar/calendar.error.xml.h:27
-msgid "Are you sure you want to send the appointment without a summary?"
-msgstr "您确定想要发送没有摘要的约会吗?"
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "您确定想要保存没有摘要的备忘吗?"
#: ../calendar/calendar.error.xml.h:28
-msgid "Are you sure you want to send the task without a summary?"
+msgid "Are you sure you want to save the task without a summary?"
msgstr "您确定想要发送没有摘要的任务吗?"
#: ../calendar/calendar.error.xml.h:29
-msgid "Calendar repository is offline."
-msgstr "日历仓库脱机。"
-
-#: ../calendar/calendar.error.xml.h:30
msgid "Cannot create a new event"
msgstr "无法创建新事件"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:30
msgid "Cannot save event"
msgstr "无法保存事件"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:31
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:32
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:33
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
@@ -1946,7 +1670,7 @@ msgstr "下载进行中。您想要保存任务吗?"
#: ../calendar/calendar.error.xml.h:38
msgid "Editor could not be loaded."
-msgstr "无法装入编辑器。"
+msgstr "无法载入编辑器。"
#: ../calendar/calendar.error.xml.h:39
msgid ""
@@ -1961,156 +1685,143 @@ msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复
#: ../calendar/calendar.error.xml.h:41
msgid "Error loading calendar"
-msgstr "装入日历时出错"
+msgstr "载入日历时出错"
#: ../calendar/calendar.error.xml.h:42
msgid "Error loading memo list"
-msgstr "装入备忘列表出错"
+msgstr "载入备忘列表出错"
#: ../calendar/calendar.error.xml.h:43
msgid "Error loading task list"
-msgstr "装入任务列表出错"
-
-#. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:45
-msgid "Error on '{0}'"
-msgstr "{0} 出错"
+msgstr "载入任务列表出错"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the meeting is canceled."
msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the memo has been deleted."
msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:46
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
"the task has been deleted."
msgstr "如果您不发送取消通知,其他出席者可能不知道任务已经删除。"
-#: ../calendar/calendar.error.xml.h:49
-msgid "No response from the server."
-msgstr "服务器无响应。"
-
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:47
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:48
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:49
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:50
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:51
msgid "Some features may not work properly with your current server."
msgstr "某些特性可能无法在您目前的服务器下工作。"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:52
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:53
msgid "The Evolution calendars have quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:54
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution 备忘异常退出。"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:55
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:56
msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:57
msgid "The memo list is not marked for offline usage."
msgstr "备忘列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:58
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:59
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:60
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:61
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:65
-msgid "Unable to load the calendar"
-msgstr "无法装入日历"
-
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to save your changes to this meeting?"
msgstr "您想要保存对此会议的更改吗?"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to save your changes to this memo?"
msgstr "您想要保存对此备忘的更改吗?"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:65
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:66
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "您是否想要为此备忘发送取消通知?"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:67
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:68
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:69
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:70
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:71
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:72
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -2119,103 +1830,57 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:73
msgid "You have changed this appointment, but not yet saved it."
msgstr "您已经更改了此约会,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:74
msgid "You have changed this meeting, but not yet saved it."
msgstr "您已经对此会议做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:75
msgid "You have changed this task, but not yet saved it."
msgstr "您已经对此任务做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:76
msgid "You have made changes to this memo, but not yet saved them."
msgstr "您已经对此备忘做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:77
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:78
msgid "Your memos will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:79
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:80
#: ../composer/mail-composer.error.xml.h:24
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
-#: ../calendar/calendar.error.xml.h:85 ../composer/e-composer-actions.c:307
+#: ../calendar/calendar.error.xml.h:81 ../composer/e-composer-actions.c:268
msgid "_Save"
msgstr "保存(_S)"
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:82
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:87
-#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:144
+#: ../calendar/calendar.error.xml.h:83
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:133
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "发送(_S)"
-#: ../calendar/calendar.error.xml.h:88
+#: ../calendar/calendar.error.xml.h:84
msgid "_Send Notice"
msgstr "发送通知(_S)"
-#: ../calendar/calendar.error.xml.h:89
-msgid "{0}."
-msgstr "{0}。"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:252
-msgid "Split Multi-Day Events:"
-msgstr "分割多日事件:"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1532
-#: ../calendar/conduits/calendar/calendar-conduit.c:1533
-#: ../calendar/conduits/memo/memo-conduit.c:821
-#: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1022
-#: ../calendar/conduits/todo/todo-conduit.c:1023
-msgid "Could not start evolution-data-server"
-msgstr "无法启动 evolution-data-server"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:1640
-#: ../calendar/conduits/calendar/calendar-conduit.c:1643
-msgid "Could not read pilot's Calendar application block"
-msgstr "无法读入 Pilot 日历应用程序块"
-
-#: ../calendar/conduits/memo/memo-conduit.c:915
-#: ../calendar/conduits/memo/memo-conduit.c:918
-msgid "Could not read pilot's Memo application block"
-msgstr "无法读入 Pilot 的备忘应用程序块"
-
-#: ../calendar/conduits/memo/memo-conduit.c:962
-#: ../calendar/conduits/memo/memo-conduit.c:965
-msgid "Could not write pilot's Memo application block"
-msgstr "无法写入 Pilot 备忘应用程序块"
-
-#: ../calendar/conduits/todo/todo-conduit.c:231
-msgid "Default Priority:"
-msgstr "默认优先级:"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1109
-msgid "Could not read pilot's ToDo application block"
-msgstr "无法读入 Pilot ToDo 应用程序块"
-
-#: ../calendar/conduits/todo/todo-conduit.c:1151
-#: ../calendar/conduits/todo/todo-conduit.c:1154
-msgid "Could not write pilot's ToDo application block"
-msgstr "无法写入 Pilot ToDo 应用程序块"
-
#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
msgid "minute"
msgid_plural "minutes"
@@ -2226,7 +1891,7 @@ msgid "hour"
msgid_plural "hours"
msgstr[0] "小时"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:288
msgid "Start time"
msgstr "开始时间"
@@ -2241,10 +1906,10 @@ msgstr "全部错过(_A)"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1573
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
-#: ../calendar/gui/e-itip-control.c:1162
-#: ../plugins/itip-formatter/itip-view.c:1035
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1596
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1602
+#: ../calendar/gui/e-itip-control.c:1175
+#: ../plugins/itip-formatter/itip-view.c:1043
msgid "Location:"
msgstr "位置:"
@@ -2257,11 +1922,11 @@ msgid "_Dismiss"
msgstr "错过(_D)"
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1025
+#: ../calendar/gui/dialogs/comp-editor.c:1060
#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
-#: ../mail/e-mail-browser.c:152
+#: ../mail/e-mail-browser.c:153
#: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1607
#: ../widgets/menus/gal-define-views.ui.h:5
msgid "_Edit"
msgstr "编辑(_E)"
@@ -2271,10 +1936,10 @@ msgid "_Snooze"
msgstr "午睡(_S)"
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-#: ../calendar/gui/dialogs/event-page.ui.h:20 ../e-util/e-plugin-util.c:423
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/event-page.ui.h:24 ../e-util/e-plugin-util.c:424
#: ../filter/filter.ui.h:15
-#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-contacts-source.c:335
msgid "hours"
msgstr "小时"
@@ -2282,40 +1947,41 @@ msgstr "小时"
msgid "location of appointment"
msgstr "约会位置"
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-#: ../calendar/gui/dialogs/event-page.ui.h:21 ../e-util/e-plugin-util.c:422
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/event-page.ui.h:25 ../e-util/e-plugin-util.c:423
#: ../filter/filter.ui.h:17 ../modules/addressbook/ldap-config.ui.h:34
-#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-contacts-source.c:334
msgid "minutes"
msgstr "分钟"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1434
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1556
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1457
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1579
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1443
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1468
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1453
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1476
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1496
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1519
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1725
#: ../e-util/e-non-intrusive-error-dialog.h:39
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1672
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -2327,7 +1993,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2343,7 +2009,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1716
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1746
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -2382,7 +2048,7 @@ msgid "Alarm programs"
msgstr "提醒程序"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:11
msgid "Amount of time in seconds the error should be shown on the status bar."
msgstr "在状态栏中显示错误的时间秒数。"
@@ -2508,17 +2174,15 @@ msgid "Last alarm time"
msgstr "上次提醒时间"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Level beyond which the message should be logged."
msgstr "大于此级别的消息会被记录。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
-#, fuzzy
msgid "List of recently used second time zones in a Day View."
msgstr "列出在日视图中最近使用过的第二时区。"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
-#, fuzzy
msgid "List of server URLs for free/busy publishing."
msgstr "列出发表忙/闲的服务器 URL。"
@@ -2695,36 +2359,32 @@ msgid "Show type field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示类型域"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
-msgid "Show week number in Day and Work Week View"
-msgstr "在日和工作日视图中显示周数"
+msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
+msgstr "在日视图、工作日视图和日期导航中显示周数"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
-msgid "Show week numbers in date navigator"
-msgstr "在日期导航器中显示周数"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid ""
"Shows the second time zone in a Day View, if set. Value is similar to one "
"used in a 'timezone' key."
msgstr "如果被设定,在日视图中显示第二时区。值和在 'timezone' 中使用过的键相像"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
msgid "Task layout style"
msgstr "任务外观风格"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
msgid "Task preview pane position (horizontal)"
msgstr "任务预览面板的水平位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
msgid "Task preview pane position (vertical)"
msgstr "任务预览面板的垂直位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
msgid "Tasks due today color"
msgstr "今天到期的任务颜色"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
#, no-c-format
msgid ""
"The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -2733,7 +2393,7 @@ msgstr ""
"用作忙/闲数据发布的 URL 模板,%u 将替换为电子邮件的用户部分,而 %d 将替换为域"
"名。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
msgid ""
"The default timezone to use for dates and times in the calendar, as an "
"untranslated Olsen timezone database location like \"America/New York\"."
@@ -2741,186 +2401,182 @@ msgstr ""
"日历中日期和时间所使用的默认时区,以未翻译的时区数据库位置表示,如“Asia/"
"Shanghai”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
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 ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
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 "
"list. \"1\" (Vertical View) places the preview pane next to the task list."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
msgid "The second timezone for a Day View"
msgstr "日视图的第二时区"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
msgid ""
"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
"debug messages."
msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
msgid "Time divisions"
msgstr "时间分割"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
msgid "Time the last alarm ran, in time_t."
msgstr "提醒上次运行的时间,以 time_t 格式。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
msgid "Timezone"
msgstr "时区"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
msgid ""
"Transparency of the events in calendar views, a value between 0 "
"(transparent) and 1 (opaque)."
msgstr "日历视图中事件的透明度,应该介于 0(透明)和 1(不透明)之间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
msgid "Twenty four hour time format"
msgstr "二十四小时时间格式"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
msgid "URI of the highlighted (\"primary\") calendar"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
msgid "URI of the highlighted (\"primary\") memo list"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
msgid "URI of the highlighted (\"primary\") task list"
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
msgstr "默认提醒的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
msgid ""
"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
msgstr "决定是否隐藏任务的单位,可为“minutes”,“hours”或“days”。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
msgid "Use system timezone"
msgstr "使用系统时区"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
msgid "Use the system timezone instead of the timezone selected in Evolution."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
msgid "Vertical pane position"
msgstr "垂直面板的位置"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
msgid "Week start"
msgstr "一周开始"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
msgstr "一周开始的日子,从星期日(0)到星期六(6)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
msgid "Whether or not to use the notification tray for display alarms."
msgstr "是否使用通知托盘来显示提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
msgid "Whether to ask for confirmation when deleting an appointment or task."
msgstr "删除约会或任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
msgid "Whether to ask for confirmation when expunging appointments and tasks."
msgstr "销毁约会和任务时是否要求确认。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
msgid ""
"Whether to compress weekends in the month view, which puts Saturday and "
"Sunday in the space of one weekday."
msgstr "在月视图中是否压缩周末;压缩时将把周六和周日用一个单元格显示。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
msgid "Whether to display the end time of events in the week and month views."
msgstr "是否在周视图和月视图中显示事件的结束时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
msgid ""
"Whether to draw the Marcus Bains Line (line at current time) in the calendar."
msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
msgid "Whether to hide completed tasks in the tasks view."
msgstr "是否在任务视图中隐藏已完成的任务。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
msgid "Whether to scroll a Month View by a week, not by a month."
msgstr ""
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
msgid "Whether to set a default reminder for appointments."
msgstr "是否为约会设置默认提醒。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
msgid "Whether to show RSVP field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示请回复域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
msgid "Whether to show categories field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示分类域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
msgid "Whether to show role field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议中显示角色域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
msgid "Whether to show status field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示状态域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
msgid ""
"Whether to show times in twenty four hour format instead of using am/pm."
msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
msgid "Whether to show timezone field in the event/meeting editor"
msgstr "是否在事件/会议编辑器中显示时区域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
msgid "Whether to show type field in the event/task/meeting editor"
msgstr "是否在事件/任务/会议编辑器中显示类型域"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
-msgid "Whether to show week number in the Day and Work Week View."
-msgstr "是否在日视图和工作日视图中显示周数。"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
-msgid "Whether to show week numbers in the date navigator."
-msgstr "是否在日期导航器中显示周数。"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
+msgid "Whether to show week numbers in various places in the Calendar."
+msgstr "是否在日历中显示周数。"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
msgid "Work days"
msgstr "工作日"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
msgid "Workday end hour"
msgstr "工作日结束小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
msgid "Workday end minute"
msgstr "工作日结束分钟"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
msgid "Workday start hour"
msgstr "工作日开始小时"
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
msgid "Workday start minute"
msgstr "工作日开始分钟"
@@ -2970,17 +2626,17 @@ msgid "Classification"
msgstr "分类"
#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:235
-#: ../calendar/gui/e-cal-model.c:571 ../calendar/gui/e-task-table.c:488
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-task-table.c:490
#: ../calendar/gui/memotypes.xml.h:6
#: ../plugins/email-custom-header/email-custom-header.c:323
#: ../widgets/misc/e-send-options.ui.h:2
msgid "Confidential"
msgstr "机密"
-#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
-#: ../calendar/gui/tasktypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/memotypes.xml.h:7 ../calendar/gui/tasktypes.xml.h:10
#: ../plugins/plugin-manager/plugin-manager.c:60
-#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/misc/e-attachment-tree-view.c:514
#: ../widgets/table/e-table-config.ui.h:6
msgid "Description"
msgstr "描述"
@@ -3001,7 +2657,7 @@ msgid "Exist"
msgstr "存在"
#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../calendar/gui/e-cal-list-view.etspec.h:6 ../mail/message-list.etspec.h:9
#: ../plugins/publish-calendar/publish-calendar.c:831
#: ../plugins/publish-calendar/publish-calendar.ui.h:8
#: ../plugins/save-calendar/csv-format.c:377
@@ -3014,25 +2670,26 @@ msgid "Organizer"
msgstr "组织者"
#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:234
-#: ../calendar/gui/e-cal-model.c:569 ../calendar/gui/e-task-table.c:487
+#: ../calendar/gui/e-cal-model.c:523 ../calendar/gui/e-task-table.c:489
#: ../calendar/gui/memotypes.xml.h:12
msgid "Private"
msgstr "保密"
#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:233
-#: ../calendar/gui/e-cal-model.c:560 ../calendar/gui/e-cal-model.c:567
-#: ../calendar/gui/e-task-table.c:486 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-cal-model.c:514 ../calendar/gui/e-cal-model.c:521
+#: ../calendar/gui/e-task-table.c:488 ../calendar/gui/memotypes.xml.h:13
msgid "Public"
msgstr "公开"
#: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/event-editor.c:322
+#: ../calendar/gui/dialogs/event-editor.c:343
#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
msgid "Recurrence"
msgstr "再现"
#: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
#: ../calendar/gui/e-calendar-table.etspec.h:13
#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
#: ../calendar/gui/tasktypes.xml.h:22
@@ -3094,6 +2751,7 @@ msgid "Add Alarm"
msgstr "添加提醒"
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+#: ../calendar/gui/dialogs/event-editor.c:360
msgid "Alarm"
msgstr "提醒"
@@ -3109,7 +2767,7 @@ msgstr "自定义提醒声音"
msgid "Mes_sage:"
msgstr "消息(_S):"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:79
msgid "Options"
msgstr "选项"
@@ -3149,18 +2807,20 @@ msgstr "之后"
msgid "before"
msgstr "之前"
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
msgid "day(s)"
msgstr "天"
#. Translators: This is the last part of the sentence:
#. * "Purge events older than <<spin-button>> days"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:424
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../e-util/e-plugin-util.c:425
#: ../filter/filter.ui.h:14 ../modules/calendar/e-cal-shell-view-actions.c:336
-#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-contacts-source.c:336
#: ../plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../widgets/misc/e-send-options.ui.h:39
+#: ../widgets/misc/e-send-options.ui.h:43
msgid "days"
msgstr "天"
@@ -3168,19 +2828,20 @@ msgstr "天"
msgid "end of appointment"
msgstr "约会结束"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#. This is part of the sentence: 'Repeat the alarm %d extra times every %d minutes'. Where %d are numbers.
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
msgid "extra times every"
msgstr "每个额外时间"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
msgid "hour(s)"
msgstr "小时"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
msgid "minute(s)"
msgstr "分钟"
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:25
msgid "start of appointment"
msgstr "约会开始"
@@ -3194,35 +2855,35 @@ msgstr "添加(_D)"
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:7
msgid "Alarms"
msgstr "提醒"
#. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:107
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:156
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:108
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:157
#: ../calendar/gui/e-day-view-time-item.c:797
msgctxt "cal-second-zone"
msgid "None"
msgstr "无"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:183
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:184
#: ../calendar/gui/e-day-view-time-item.c:824
-#: ../calendar/gui/e-timezone-entry.c:343
+#: ../calendar/gui/e-timezone-entry.c:319
msgid "Select..."
msgstr "选择..."
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:496
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:504
msgid "Selected Calendars for Alarms"
msgstr "已选择用于提醒的日历"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:785
-msgid "Time and date:"
-msgstr "时间和日期:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:789
+msgid "Ti_me and date:"
+msgstr "时间和日期(_M):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:786
-msgid "Date only:"
-msgstr "只有日期:"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:790
+msgid "_Date only:"
+msgstr "仅日期(_D):"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
#, no-c-format
@@ -3253,12 +2914,12 @@ msgstr "30 分钟"
msgid "60 minutes"
msgstr "60 分钟"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:7
msgid "Alerts"
msgstr "提醒"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
#: ../modules/addressbook/autocompletion-config.c:153
msgid "Date/Time Format"
msgstr "日期/时间格式"
@@ -3284,20 +2945,20 @@ msgid "Display alarms in _notification area only"
msgstr "只在通知区域显示提醒(_N)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
#: ../calendar/gui/e-itip-control.c:738
msgid "Friday"
msgstr "星期五"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
-#: ../calendar/gui/dialogs/calendar-setup.c:367
-#: ../calendar/gui/dialogs/calendar-setup.c:378
-#: ../calendar/gui/dialogs/calendar-setup.c:389
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
-#: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2666
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:200 ../mail/mail-config.ui.h:56
+#: ../modules/addressbook/addressbook-config.c:1005
+#: ../plugins/itip-formatter/itip-formatter.c:2676
#: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:21
msgid "General"
msgstr "常规"
@@ -3310,7 +2971,7 @@ msgid "Minutes"
msgstr "分钟"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
#: ../calendar/gui/e-itip-control.c:734
msgid "Monday"
msgstr "星期一"
@@ -3324,182 +2985,190 @@ msgid "None"
msgstr "无"
#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
msgid "Pick a color"
msgstr "选取一种颜色"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
+#. Sunday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
msgid "S_un"
msgstr "周日(_U)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
#: ../calendar/gui/e-itip-control.c:739
msgid "Saturday"
msgstr "星期六"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
msgid "Sc_roll Month View by a week"
msgstr "通过一个周来滚动月视图(_R)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
msgid "Se_cond zone:"
msgstr "第二时区(_C):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
msgid "Select the calendars for alarm notification"
msgstr "选择用于提醒的日历"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
+#. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
msgid "Sh_ow a reminder"
msgstr "显示一条提醒(_O)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
+#. This is the first half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
msgid "Show a _reminder"
msgstr "显示一条提醒(_R)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
-msgid "Show week _numbers in date navigator"
-msgstr "在日期浏览器中显示周数(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
-msgid "Show week n_umber in Day and Work Week View"
-msgstr "在日视图和工作日视图中显示周数(_U)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+msgid "Show week _numbers"
+msgstr "显示周数(_N)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#: ../calendar/gui/dialogs/recurrence-page.c:1118
#: ../calendar/gui/e-itip-control.c:733
msgid "Sunday"
msgstr "星期日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
msgid "T_asks due today:"
msgstr "今天到期的任务(_A):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
+#. Thursday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
msgid "T_hu"
msgstr "周四(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
-#: ../calendar/gui/dialogs/calendar-setup.c:379
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/calendar-setup.c:381
msgid "Task List"
msgstr "任务列表"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
msgid "Template:"
msgstr "模板:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
#: ../calendar/gui/e-itip-control.c:737
msgid "Thursday"
msgstr "星期四"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
#: ../e-util/e-non-intrusive-error-dialog.c:287
-#: ../widgets/misc/e-dateedit.c:613
+#: ../widgets/misc/e-dateedit.c:592
msgid "Time"
msgstr "时间"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
-#: ../calendar/gui/dialogs/event-page.ui.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/event-page.ui.h:15
msgid "Time _zone:"
msgstr "时区(_Z):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
msgid "Time format:"
msgstr "时间格式:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
#: ../calendar/gui/e-itip-control.c:735
msgid "Tuesday"
msgstr "星期二"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
msgid "Use s_ystem time zone"
msgstr "显示系统时区(_Y)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
#: ../calendar/gui/e-itip-control.c:736
msgid "Wednesday"
msgstr "星期三"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
+#. A weekday like "Monday" follows
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
msgid "Wee_k starts on:"
msgstr "一周开始于(_K):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../modules/calendar/e-cal-shell-view-actions.c:1639
msgid "Work Week"
msgstr "工作日"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
msgid "Work days:"
msgstr "工作日:"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
msgid "_12 hour (AM/PM)"
msgstr "_12 小时(上/下午)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
msgid "_24 hour"
msgstr "_24 小时"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
msgid "_Ask for confirmation when deleting items"
msgstr "删除项时要求确认(_A)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
msgid "_Compress weekends in month view"
msgstr "不在月视图中显示周末(_C)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
msgid "_Day begins:"
msgstr "一天开始(_D):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
+#. Friday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
msgid "_Fri"
msgstr "周五(_F)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
msgid "_Hide completed tasks after"
msgstr "随后隐藏已完成的任务(_H)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
+#. Monday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
msgid "_Mon"
msgstr "周一(_M)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
msgid "_Overdue tasks:"
msgstr "延期任务(_O):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
+#. Saturday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:65
msgid "_Sat"
msgstr "周六(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:66
msgid "_Show appointment end times in week and month view"
msgstr "在周视图和月视图中显示约会结束时间(_S)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:67
msgid "_Time divisions:"
msgstr "时间分割(_T):"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
+#. Tuesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:69
msgid "_Tue"
msgstr "周二(_T)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
+#. Wednesday
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:71
msgid "_Wed"
msgstr "周三(_W)"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
+#. This is the last half of a user preference. "Show a reminder [time-period] before every anniversary/birthday"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:73
msgid "before every anniversary/birthday"
msgstr "在每个周年/生日前"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
+#. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:75
msgid "before every appointment"
msgstr "在每次约会前"
@@ -3508,12 +3177,12 @@ msgid "Type:"
msgstr "类型:"
#: ../calendar/gui/dialogs/calendar-setup.c:169
-#: ../modules/addressbook/addressbook-config.c:500
+#: ../modules/addressbook/addressbook-config.c:510
msgid "_Type:"
msgstr "类型(_T):"
-#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:160
+#: ../modules/addressbook/ldap-config.ui.h:26
#: ../plugins/groupwise-features/properties.ui.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
#: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3532,35 +3201,35 @@ msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
msgid "Cop_y memo list contents locally for offline operation"
msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:344
+#: ../calendar/gui/dialogs/calendar-setup.c:346
msgid "Colo_r:"
msgstr "颜色(_R):"
-#: ../calendar/gui/dialogs/calendar-setup.c:390
+#: ../calendar/gui/dialogs/calendar-setup.c:392
msgid "Memo List"
msgstr "备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:475
+#: ../calendar/gui/dialogs/calendar-setup.c:477
msgid "New Calendar"
msgstr "新建日历"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:531
+#: ../calendar/gui/dialogs/calendar-setup.c:533
msgid "New Task List"
msgstr "新建任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "Memo List Properties"
msgstr "备忘列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:587
+#: ../calendar/gui/dialogs/calendar-setup.c:589
msgid "New Memo List"
msgstr "新建备忘列表"
@@ -3613,264 +3282,240 @@ msgstr "%s 您还没有进行修改,更新编辑器吗?"
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2418
-msgid " to "
-msgstr " 到 "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2422
-msgid " (Completed "
-msgstr " (完成 "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2424
-msgid "Completed "
-msgstr "已完成 "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2429
-msgid " (Due "
-msgstr " (预定 "
-
-#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2431
-msgid "Due "
-msgstr "预定 "
-
-#: ../calendar/gui/dialogs/comp-editor.c:247
+#: ../calendar/gui/dialogs/comp-editor.c:246
msgid "Could not save attachments"
msgstr "不能保存附件"
-#: ../calendar/gui/dialogs/comp-editor.c:515
+#: ../calendar/gui/dialogs/comp-editor.c:522
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:614
+#: ../calendar/gui/dialogs/comp-editor.c:637
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:621
+#: ../calendar/gui/dialogs/comp-editor.c:644
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:623
+#: ../calendar/gui/dialogs/comp-editor.c:646
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:652
#, c-format
msgid "Assigned Task - %s"
msgstr "分配的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:631
+#: ../calendar/gui/dialogs/comp-editor.c:654
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:636
+#: ../calendar/gui/dialogs/comp-editor.c:659
#, c-format
msgid "Memo - %s"
msgstr "备忘 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:652
+#: ../calendar/gui/dialogs/comp-editor.c:675
msgid "No Summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:786
msgid "Keep original item?"
msgstr "保留原始条目?"
-#: ../calendar/gui/dialogs/comp-editor.c:948
+#: ../calendar/gui/dialogs/comp-editor.c:983
msgid "Click here to close the current window"
msgstr "单击此处可关闭当前窗口"
-#: ../calendar/gui/dialogs/comp-editor.c:955 ../mail/e-mail-browser.c:117
-#: ../shell/e-shell-window-actions.c:1460
+#: ../calendar/gui/dialogs/comp-editor.c:990 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1453
#: ../widgets/misc/e-focus-tracker.c:115 ../widgets/misc/e-focus-tracker.c:550
-#: ../widgets/misc/e-web-view.c:387 ../widgets/misc/e-web-view.c:965
+#: ../widgets/misc/e-web-view.c:408 ../widgets/misc/e-web-view.c:1061
msgid "Copy the selection"
msgstr "复制选中内容"
-#: ../calendar/gui/dialogs/comp-editor.c:962 ../mail/e-mail-browser.c:124
-#: ../shell/e-shell-window-actions.c:1467
+#: ../calendar/gui/dialogs/comp-editor.c:997 ../mail/e-mail-browser.c:125
+#: ../shell/e-shell-window-actions.c:1460
#: ../widgets/misc/e-focus-tracker.c:108 ../widgets/misc/e-focus-tracker.c:545
-#: ../widgets/misc/e-web-view.c:959
+#: ../widgets/misc/e-web-view.c:1055
msgid "Cut the selection"
msgstr "剪切选中内容"
-#: ../calendar/gui/dialogs/comp-editor.c:969
-#: ../shell/e-shell-window-actions.c:1474
+#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../shell/e-shell-window-actions.c:1467
#: ../widgets/misc/e-focus-tracker.c:129 ../widgets/misc/e-focus-tracker.c:560
msgid "Delete the selection"
msgstr "删除选中内容"
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:1011
msgid "Click here to view help available"
msgstr "单击此处可查看可用的帮助"
-#: ../calendar/gui/dialogs/comp-editor.c:983 ../mail/e-mail-browser.c:131
-#: ../shell/e-shell-window-actions.c:1509
+#: ../calendar/gui/dialogs/comp-editor.c:1018 ../mail/e-mail-browser.c:132
+#: ../shell/e-shell-window-actions.c:1502
#: ../widgets/misc/e-focus-tracker.c:122 ../widgets/misc/e-focus-tracker.c:555
-#: ../widgets/misc/e-web-view.c:971
+#: ../widgets/misc/e-web-view.c:1067
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
-#: ../calendar/gui/dialogs/comp-editor.c:1004
+#: ../calendar/gui/dialogs/comp-editor.c:1039
msgid "Click here to save the current window"
msgstr "单击此处可保存当前窗口"
-#: ../calendar/gui/dialogs/comp-editor.c:1011 ../mail/e-mail-browser.c:138
-#: ../shell/e-shell-window-actions.c:1579
+#: ../calendar/gui/dialogs/comp-editor.c:1046 ../mail/e-mail-browser.c:139
+#: ../shell/e-shell-window-actions.c:1572
#: ../widgets/misc/e-focus-tracker.c:136 ../widgets/misc/e-focus-tracker.c:565
msgid "Select all text"
msgstr "选中所有文字"
-#: ../calendar/gui/dialogs/comp-editor.c:1018
+#: ../calendar/gui/dialogs/comp-editor.c:1053
msgid "_Classification"
msgstr "分类(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1032 ../mail/e-mail-browser.c:145
-#: ../shell/e-shell-window-actions.c:1628
+#: ../calendar/gui/dialogs/comp-editor.c:1067 ../mail/e-mail-browser.c:146
+#: ../shell/e-shell-window-actions.c:1614
#: ../widgets/misc/e-signature-editor.c:217
msgid "_File"
msgstr "文件(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1039
-#: ../shell/e-shell-window-actions.c:1635
+#: ../calendar/gui/dialogs/comp-editor.c:1074
+#: ../shell/e-shell-window-actions.c:1621
msgid "_Help"
msgstr "帮助(_H)"
-#: ../calendar/gui/dialogs/comp-editor.c:1046
+#: ../calendar/gui/dialogs/comp-editor.c:1081
msgid "_Insert"
msgstr "插入(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1053
-#: ../composer/e-composer-actions.c:351
+#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../composer/e-composer-actions.c:312
msgid "_Options"
msgstr "选项(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1060 ../mail/e-mail-browser.c:159
-#: ../shell/e-shell-window-actions.c:1670
+#: ../calendar/gui/dialogs/comp-editor.c:1095 ../mail/e-mail-browser.c:160
+#: ../shell/e-shell-window-actions.c:1656 ../smime/gui/smime-ui.ui.h:45
msgid "_View"
msgstr "查看(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1070
-#: ../composer/e-composer-actions.c:279
+#: ../calendar/gui/dialogs/comp-editor.c:1105
+#: ../composer/e-composer-actions.c:240
msgid "_Attachment..."
msgstr "附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1072
+#: ../calendar/gui/dialogs/comp-editor.c:1107
msgid "Click here to attach a file"
msgstr "单击此处可便附加文件"
-#: ../calendar/gui/dialogs/comp-editor.c:1080
+#: ../calendar/gui/dialogs/comp-editor.c:1115
msgid "_Categories"
msgstr "类别(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1117
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../calendar/gui/dialogs/comp-editor.c:1088
+#: ../calendar/gui/dialogs/comp-editor.c:1123
msgid "Time _Zone"
msgstr "时区(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1090
+#: ../calendar/gui/dialogs/comp-editor.c:1125
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../calendar/gui/dialogs/comp-editor.c:1099
+#: ../calendar/gui/dialogs/comp-editor.c:1134
msgid "Pu_blic"
msgstr "公开(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1101
+#: ../calendar/gui/dialogs/comp-editor.c:1136
msgid "Classify as public"
msgstr "分类为公开"
-#: ../calendar/gui/dialogs/comp-editor.c:1106
+#: ../calendar/gui/dialogs/comp-editor.c:1141
msgid "_Private"
msgstr "私人(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1143
msgid "Classify as private"
msgstr "分类为私人"
-#: ../calendar/gui/dialogs/comp-editor.c:1113
+#: ../calendar/gui/dialogs/comp-editor.c:1148
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1115
+#: ../calendar/gui/dialogs/comp-editor.c:1150
msgid "Classify as confidential"
msgstr "分类为机密"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
+#: ../calendar/gui/dialogs/comp-editor.c:1158
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1125
+#: ../calendar/gui/dialogs/comp-editor.c:1160
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../calendar/gui/dialogs/comp-editor.c:1131
+#: ../calendar/gui/dialogs/comp-editor.c:1166
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1133
+#: ../calendar/gui/dialogs/comp-editor.c:1168
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../calendar/gui/dialogs/comp-editor.c:1139
+#: ../calendar/gui/dialogs/comp-editor.c:1174
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1141
+#: ../calendar/gui/dialogs/comp-editor.c:1176
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../calendar/gui/dialogs/comp-editor.c:1147
+#: ../calendar/gui/dialogs/comp-editor.c:1182
msgid "_Type Field"
msgstr "类型域(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1149
+#: ../calendar/gui/dialogs/comp-editor.c:1184
msgid "Toggles whether the Attendee Type is displayed"
msgstr "切换是否显示出席者类型域"
-#: ../calendar/gui/dialogs/comp-editor.c:1173
+#: ../calendar/gui/dialogs/comp-editor.c:1208
#: ../composer/e-composer-private.c:70
msgid "Recent _Documents"
msgstr "最近文档(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:1693
-#: ../composer/e-composer-actions.c:475
+#: ../calendar/gui/dialogs/comp-editor.c:1743
+#: ../composer/e-composer-actions.c:428
msgid "Attach"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1748
-msgid "Save"
-msgstr "保存"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2025
-#: ../calendar/gui/dialogs/comp-editor.c:2074
-#: ../calendar/gui/dialogs/comp-editor.c:2965
+#: ../calendar/gui/dialogs/comp-editor.c:2072
+#: ../calendar/gui/dialogs/comp-editor.c:2121
+#: ../calendar/gui/dialogs/comp-editor.c:3086
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2933
-#: ../plugins/prefer-plain/prefer-plain.c:67
+#: ../calendar/gui/dialogs/comp-editor.c:3050
+#: ../plugins/prefer-plain/prefer-plain.c:64
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2995
+#: ../calendar/gui/dialogs/comp-editor.c:3118
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:91
+#: ../calendar/gui/dialogs/copy-source-dialog.c:92
msgid "Could not open source"
msgstr "无法打开源"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:99
+#: ../calendar/gui/dialogs/copy-source-dialog.c:100
msgid "Could not open destination"
msgstr "无法打开目的"
-#: ../calendar/gui/dialogs/copy-source-dialog.c:108
+#: ../calendar/gui/dialogs/copy-source-dialog.c:109
msgid "Destination is read only"
msgstr "目的只读"
@@ -3878,53 +3523,73 @@ msgstr "目的只读"
msgid "_Delete this item from all other recipient's mailboxes?"
msgstr "从全部其它收件人的邮箱中删除此项吗?(_D)"
-#: ../calendar/gui/dialogs/delete-error.c:55
-msgid "The event could not be deleted due to a corba error"
-msgstr "无法删除事件,原因是 corba 错误"
+#: ../calendar/gui/dialogs/delete-comp.c:217
+msgid "_Retract comment"
+msgstr "撤销评论(_R):"
-#: ../calendar/gui/dialogs/delete-error.c:58
-msgid "The task could not be deleted due to a corba error"
-msgstr "无法删除任务,原因是 corba 错误"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:56
+#, c-format
+msgid "The event could not be deleted due to a dbus error: %s"
+msgstr "由于 dbus 错误 %s,无法删除该事件。"
-#: ../calendar/gui/dialogs/delete-error.c:61
-msgid "The memo could not be deleted due to a corba error"
-msgstr "无法删除备忘,原因是 corba 错误"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:60
+#, 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:64
-msgid "The item could not be deleted due to a corba error"
-msgstr "无法删除项目,原因是 corba 错误"
+#, c-format
+msgid "The memo could not be deleted due to a dbus error: %s"
+msgstr "由于 dbus 错误 %s,无法该删除备忘。"
-#: ../calendar/gui/dialogs/delete-error.c:71
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:68
+#, c-format
+msgid "The item could not be deleted due to a dbus error: %s"
+msgstr "由于 dbus 错误 %s,无法删除该项目。"
+
+#: ../calendar/gui/dialogs/delete-error.c:75
msgid "The event could not be deleted because permission was denied"
msgstr "无法删除事件,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:78
msgid "The task could not be deleted because permission was denied"
msgstr "无法删除任务,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:81
msgid "The memo could not be deleted because permission was denied"
msgstr "无法删除备忘,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:84
msgid "The item could not be deleted because permission was denied"
msgstr "无法删除项目,原因是权限被禁止"
-#: ../calendar/gui/dialogs/delete-error.c:87
-msgid "The event could not be deleted due to an error"
-msgstr "由于错误,无法删除事件"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:92
+#, c-format
+msgid "The event could not be deleted due to an error: %s"
+msgstr "由于错误,无法删除事件:%s"
-#: ../calendar/gui/dialogs/delete-error.c:90
-msgid "The task could not be deleted due to an error"
-msgstr "由于错误,无法删除任务"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:96
+#, c-format
+msgid "The task could not be deleted due to an error: %s"
+msgstr "由于错误,无法删除任务:%s"
-#: ../calendar/gui/dialogs/delete-error.c:93
-msgid "The memo could not be deleted due to an error"
-msgstr "由于错误,无法删除备忘"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:100
+#, c-format
+msgid "The memo could not be deleted due to an error: %s"
+msgstr "由于错误,无法删除备忘:%s"
-#: ../calendar/gui/dialogs/delete-error.c:96
-msgid "The item could not be deleted due to an error"
-msgstr "由于错误,无法删除项目"
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/gui/dialogs/delete-error.c:104
+#, 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 "Contacts..."
@@ -3938,133 +3603,147 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:201
+#: ../calendar/gui/dialogs/event-editor.c:217
msgid "_Alarms"
msgstr "提醒(_A)"
-#: ../calendar/gui/dialogs/event-editor.c:203
+#: ../calendar/gui/dialogs/event-editor.c:219
msgid "Click here to set or unset alarms for this event"
msgstr "单击此处以设定或取消此事件的提醒"
-#: ../calendar/gui/dialogs/event-editor.c:208
+#: ../calendar/gui/dialogs/event-editor.c:227
+msgid "Show Time as _Busy"
+msgstr "将时间显示为忙(_B)"
+
+#: ../calendar/gui/dialogs/event-editor.c:229
+msgid "Toggles whether to show time as busy"
+msgstr "切换是否将时间显示为忙"
+
+#: ../calendar/gui/dialogs/event-editor.c:238
msgid "_Recurrence"
msgstr "再现(_R)"
-#: ../calendar/gui/dialogs/event-editor.c:210
+#: ../calendar/gui/dialogs/event-editor.c:240
msgid "Make this a recurring event"
msgstr "将此事件标为重复发生"
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:245
#: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:211
+#: ../plugins/groupwise-features/send-options.c:210
#: ../widgets/misc/e-send-options.ui.h:19
msgid "Send Options"
msgstr "发送选项"
-#: ../calendar/gui/dialogs/event-editor.c:217
-#: ../calendar/gui/dialogs/task-editor.c:124
+#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/task-editor.c:129
msgid "Insert advanced send options"
msgstr "插入高级发送选项"
-#: ../calendar/gui/dialogs/event-editor.c:225
+#: ../calendar/gui/dialogs/event-editor.c:255
msgid "All _Day Event"
msgstr "全天事件(_D)"
-#: ../calendar/gui/dialogs/event-editor.c:227
+#: ../calendar/gui/dialogs/event-editor.c:257
msgid "Toggles whether to have All Day Event"
msgstr "切换是否有全天事件"
-#: ../calendar/gui/dialogs/event-editor.c:233
-msgid "Show Time as _Busy"
-msgstr "将时间显示为忙(_B)"
-
-#: ../calendar/gui/dialogs/event-editor.c:235
-msgid "Toggles whether to show time as busy"
-msgstr "切换是否将时间显示为忙"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
+#: ../calendar/gui/dialogs/event-editor.c:266
msgid "_Free/Busy"
msgstr "忙/闲(_F)"
-#: ../calendar/gui/dialogs/event-editor.c:246
+#: ../calendar/gui/dialogs/event-editor.c:268
msgid "Query free / busy information for the attendees"
msgstr "查询出席者的忙闲信息"
-#: ../calendar/gui/dialogs/event-editor.c:291
-msgid "Appoint_ment"
-msgstr "约会(_M)"
+#: ../calendar/gui/dialogs/event-editor.c:319 ../calendar/gui/print.c:2588
+msgid "Appointment"
+msgstr "约会"
-#: ../calendar/gui/dialogs/event-page.c:751
+#: ../calendar/gui/dialogs/event-editor.c:385
+#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "出席者"
+
+#: ../calendar/gui/dialogs/event-editor.c:578
+msgid "Print this event"
+msgstr "打印此事件"
+
+#: ../calendar/gui/dialogs/event-page.c:766
+msgid "Event's start time is in the past"
+msgstr "事件开始时间在过去"
+
+#: ../calendar/gui/dialogs/event-page.c:807
msgid "Event cannot be edited, because the selected calendar is read only"
msgstr "因所选的日程为只读,您无法编辑该事件。"
-#: ../calendar/gui/dialogs/event-page.c:755
+#: ../calendar/gui/dialogs/event-page.c:811
msgid "Event cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者,因此无法编辑全部事件。"
-#: ../calendar/gui/dialogs/event-page.c:767
-#: ../calendar/gui/dialogs/event-page.c:2722
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.c:2775
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:830
-#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/event-page.c:890
+#: ../calendar/gui/dialogs/event-page.ui.h:14
#: ../calendar/gui/dialogs/memo-page.ui.h:2
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:877
+#: ../calendar/gui/dialogs/event-page.c:937
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:939
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1154
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1097
+#: ../calendar/gui/dialogs/event-page.c:1157
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1268
-#: ../calendar/gui/dialogs/memo-page.c:655
-#: ../calendar/gui/dialogs/task-page.c:861
+#: ../calendar/gui/dialogs/event-page.c:1328
+#: ../calendar/gui/dialogs/memo-page.c:686
+#: ../calendar/gui/dialogs/task-page.c:907
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1278
+#: ../calendar/gui/dialogs/event-page.c:1338
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1361
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1308
+#: ../calendar/gui/dialogs/event-page.c:1368
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/memo-page.c:696
-#: ../calendar/gui/dialogs/task-page.c:921
+#: ../calendar/gui/dialogs/event-page.c:1530
+#: ../calendar/gui/dialogs/memo-page.c:727
+#: ../calendar/gui/dialogs/task-page.c:967
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1476
-#: ../calendar/gui/dialogs/memo-page.c:702
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:973
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1501
-#: ../calendar/gui/dialogs/task-page.c:951
+#: ../calendar/gui/dialogs/event-page.c:1561
+#: ../calendar/gui/dialogs/task-page.c:997
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:2595
+#: ../calendar/gui/dialogs/event-page.c:2649
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
@@ -4075,127 +3754,137 @@ msgstr "无法打开日历“%s”。"
#. on behalf of some other user
#. Translators: This string is used when we are creating a Task
#. on behalf of some other user
-#: ../calendar/gui/dialogs/event-page.c:2639
-#: ../calendar/gui/dialogs/memo-page.c:914
-#: ../calendar/gui/dialogs/task-page.c:1743
+#: ../calendar/gui/dialogs/event-page.c:2693
+#: ../calendar/gui/dialogs/memo-page.c:946
+#: ../calendar/gui/dialogs/task-page.c:1787
#, c-format
msgid "You are acting on behalf of %s"
msgstr "您正在以 %s 的身份行动"
-#: ../calendar/gui/dialogs/event-page.c:2941
+#: ../calendar/gui/dialogs/event-page.c:2994
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2947
+#: ../calendar/gui/dialogs/event-page.c:3000
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2953
+#: ../calendar/gui/dialogs/event-page.c:3006
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3019
msgid "Customize"
msgstr "自定义"
#. Translators: "None" for "No alarm set"
-#: ../calendar/gui/dialogs/event-page.c:2968
+#: ../calendar/gui/dialogs/event-page.c:3021
msgctxt "cal-alarms"
msgid "None"
msgstr "无"
-#: ../calendar/gui/dialogs/event-page.ui.h:1
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:2
msgid "1 day before appointment"
msgstr "约会的 1 天前"
-#: ../calendar/gui/dialogs/event-page.ui.h:2
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:4
msgid "1 hour before appointment"
msgstr "约会的 1 小时前"
-#: ../calendar/gui/dialogs/event-page.ui.h:3
+#. TRANSLATORS: Predefined alarm's description
+#: ../calendar/gui/dialogs/event-page.ui.h:6
msgid "15 minutes before appointment"
msgstr "约会的 15 分钟前"
-#: ../calendar/gui/dialogs/event-page.ui.h:5
-msgid "Attendee_s..."
-msgstr "出席者(_S)..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-#: ../calendar/gui/e-meeting-list-view.c:148
-msgid "Attendees"
-msgstr "出席者"
+#: ../calendar/gui/dialogs/event-page.ui.h:8
+#: ../calendar/gui/dialogs/task-page.ui.h:1
+#: ../calendar/gui/e-meeting-time-sel.c:578
+msgid "Atte_ndees..."
+msgstr "出席者(_N)..."
-#: ../calendar/gui/dialogs/event-page.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:12
msgid "Custom Alarm:"
msgstr "自定义提醒:"
-#: ../calendar/gui/dialogs/event-page.ui.h:10
+#: ../calendar/gui/dialogs/event-page.ui.h:13
msgid "Event Description"
msgstr "事件描述"
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.ui.h:6
-msgid "Su_mmary:"
-msgstr "概要(_M):"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:14
+#: ../calendar/gui/dialogs/event-page.ui.h:16
msgid "_Alarm"
msgstr "提醒(_A)"
-#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:18
#: ../calendar/gui/dialogs/memo-page.ui.h:6
#: ../calendar/gui/dialogs/task-page.ui.h:8
#: ../widgets/misc/e-attachment-dialog.c:345
msgid "_Description:"
msgstr "描述(_D):"
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-#: ../plugins/calendar-weather/calendar-weather.c:356
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../plugins/calendar-weather/calendar-weather.c:358
msgid "_Location:"
msgstr "位置(_L):"
-#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../calendar/gui/dialogs/event-page.ui.h:20
+msgid "_Summary:"
+msgstr "概要(_S):"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:21
msgid "_Time:"
msgstr "时间(_T):"
-#: ../calendar/gui/dialogs/event-page.ui.h:19
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
+#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] minutes
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
msgid "for"
msgstr "持续时间"
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
+#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
msgid "until"
msgstr "直到"
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2568
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2592
msgid "Memo"
msgstr "备忘"
-#: ../calendar/gui/dialogs/memo-page.c:350
+#: ../calendar/gui/dialogs/memo-editor.c:156
+msgid "Print this memo"
+msgstr "打印此备忘录"
+
+#: ../calendar/gui/dialogs/memo-page.c:338
+msgid "Memo's start date is in the past"
+msgstr "备忘录开始时间在过去"
+
+#: ../calendar/gui/dialogs/memo-page.c:376
msgid "Memo cannot be edited, because the selected memo list is read only"
msgstr "因所选的备忘列表为只读,您无法编辑该备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:354
+#: ../calendar/gui/dialogs/memo-page.c:380
msgid "Memo cannot be fully edited, because you are not the organizer"
msgstr "您并非组织者,因此无法编辑全部备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:875
+#: ../calendar/gui/dialogs/memo-page.c:907
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "无法打开“%s”中的备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1042 ../em-format/em-format-quote.c:223
-#: ../em-format/em-format.c:960 ../mail/em-format-html.c:2246
-#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2329
-#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
+#: ../calendar/gui/dialogs/memo-page.c:1078 ../em-format/em-format-quote.c:215
+#: ../em-format/em-format.c:939 ../mail/em-format-html.c:2284
+#: ../mail/em-format-html.c:2343 ../mail/em-format-html.c:2367
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:80
msgid "To"
msgstr "收件人"
@@ -4204,67 +3893,72 @@ msgstr "收件人"
msgid "Sta_rt date:"
msgstr "开始日期(_R):"
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
+msgid "Su_mmary:"
+msgstr "概要(_M):"
+
#: ../calendar/gui/dialogs/memo-page.ui.h:5
msgid "T_o:"
msgstr "到(_O):"
#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.c:426
#: ../calendar/gui/dialogs/task-page.ui.h:9
msgid "_Group:"
msgstr "组(_G):"
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:54
#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "您即将修改再现事件。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:56
#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "您即将代理再现事件。您想要代理何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:60
#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "您即将修改再现任务。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:64
#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "您即将修改再现备忘。您想要修改何内容?"
-#: ../calendar/gui/dialogs/recur-comp.c:87
+#: ../calendar/gui/dialogs/recur-comp.c:90
msgid "This Instance Only"
msgstr "只是本次"
-#: ../calendar/gui/dialogs/recur-comp.c:91
+#: ../calendar/gui/dialogs/recur-comp.c:94
msgid "This and Prior Instances"
msgstr "本次和以前各次"
-#: ../calendar/gui/dialogs/recur-comp.c:97
+#: ../calendar/gui/dialogs/recur-comp.c:100
msgid "This and Future Instances"
msgstr "本次和以后各次"
-#: ../calendar/gui/dialogs/recur-comp.c:102
+#: ../calendar/gui/dialogs/recur-comp.c:105
msgid "All Instances"
msgstr "所有各次"
-#: ../calendar/gui/dialogs/recurrence-page.c:558
+#: ../calendar/gui/dialogs/recurrence-page.c:560
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的再现。"
-#: ../calendar/gui/dialogs/recurrence-page.c:890
+#: ../calendar/gui/dialogs/recurrence-page.c:892
msgid "Recurrence date is invalid"
msgstr "再现日期无效"
-#: ../calendar/gui/dialogs/recurrence-page.c:934
+#: ../calendar/gui/dialogs/recurrence-page.c:932
msgid "End time of the recurrence was before event's start"
msgstr "重复事件条目的结束时间小于开始时间"
#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
#. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:963
+#: ../calendar/gui/dialogs/recurrence-page.c:961
msgid "on"
msgstr "在"
@@ -4272,7 +3966,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:1020
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
msgid "first"
msgstr "第一个"
@@ -4281,7 +3975,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:1026
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
msgid "second"
msgstr "第二"
@@ -4289,7 +3983,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:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1029
msgid "third"
msgstr "第三个"
@@ -4297,7 +3991,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:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1034
msgid "fourth"
msgstr "第四个"
@@ -4305,7 +3999,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:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1039
msgid "fifth"
msgstr "第五个"
@@ -4313,13 +4007,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:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1044
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:1070
+#: ../calendar/gui/dialogs/recurrence-page.c:1068
msgid "Other Date"
msgstr "其它日期"
@@ -4327,7 +4021,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:1076
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
msgid "1st to 10th"
msgstr "上旬"
@@ -4335,7 +4029,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:1082
+#: ../calendar/gui/dialogs/recurrence-page.c:1080
msgid "11th to 20th"
msgstr "中旬"
@@ -4343,45 +4037,45 @@ 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:1088
+#: ../calendar/gui/dialogs/recurrence-page.c:1086
msgid "21st to 31st"
msgstr "下旬"
#. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
#. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
#. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
msgid "day"
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:1242
+#: ../calendar/gui/dialogs/recurrence-page.c:1240
msgid "on the"
msgstr "在"
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
msgid "occurrences"
msgstr "循环"
-#: ../calendar/gui/dialogs/recurrence-page.c:2122
+#: ../calendar/gui/dialogs/recurrence-page.c:2119
msgid "Add exception"
msgstr "添加例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2163
+#: ../calendar/gui/dialogs/recurrence-page.c:2160
msgid "Could not get a selection to modify."
msgstr "无法获得要修改的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2169
+#: ../calendar/gui/dialogs/recurrence-page.c:2166
msgid "Modify exception"
msgstr "修改例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2213
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
msgid "Could not get a selection to delete."
msgstr "无法获得要删除的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2352
+#: ../calendar/gui/dialogs/recurrence-page.c:2337
msgid "Date/Time"
msgstr "日期/时间"
@@ -4393,7 +4087,7 @@ msgstr "每"
msgid "Exceptions"
msgstr "例外"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:87
msgid "Preview"
msgstr "预览"
@@ -4401,49 +4095,65 @@ msgstr "预览"
msgid "This appointment rec_urs"
msgstr "此约会重现(_U)"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
msgid "forever"
msgstr "永远"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
msgid "month(s)"
msgstr "月"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
msgid "week(s)"
msgstr "周"
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
+#. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
msgid "year(s)"
msgstr "年"
-#: ../calendar/gui/dialogs/send-comp.c:160
+#: ../calendar/gui/dialogs/send-comp.c:162
msgid "Send my alarms with this event"
msgstr "在这个事件里发送我的提醒"
-#: ../calendar/gui/dialogs/send-comp.c:162
-######
+# #####
+#: ../calendar/gui/dialogs/send-comp.c:164
msgid "Notify new attendees _only"
msgstr "只通知新的出席者(_O)"
-#: ../calendar/gui/dialogs/task-details-page.c:379
-#: ../calendar/gui/dialogs/task-details-page.c:399
+#: ../calendar/gui/dialogs/task-details-page.c:350
+#: ../calendar/gui/dialogs/task-details-page.c:372
msgid "Completed date is wrong"
msgstr "完成日期有错"
-#: ../calendar/gui/dialogs/task-details-page.c:485
+#: ../calendar/gui/dialogs/task-details-page.c:483
msgid "Web Page"
msgstr "网页"
#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-model-tasks.c:443
+#: ../calendar/gui/e-cal-model-tasks.c:717 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:588
+#: ../calendar/gui/print.c:2675 ../mail/em-sync-stream.c:151
+#: ../mail/em-sync-stream.c:178 ../mail/em-sync-stream.c:199
+#, c-format
+msgid "Canceled"
+msgstr "已取消"
+
+#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-details-page.ui.h:4
#: ../calendar/gui/e-cal-component-preview.c:292
-#: ../calendar/gui/e-cal-model-tasks.c:463
-#: ../calendar/gui/e-cal-model-tasks.c:737
-#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:190
-#: ../calendar/gui/e-meeting-store.c:213 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:583
-#: ../calendar/gui/print.c:2648 ../calendar/gui/tasktypes.xml.h:9
+#: ../calendar/gui/e-cal-model-tasks.c:441
+#: ../calendar/gui/e-cal-model-tasks.c:715
+#: ../calendar/gui/e-itip-control.c:931 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:220 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:587
+#: ../calendar/gui/print.c:2672 ../calendar/gui/tasktypes.xml.h:9
#: ../plugins/save-calendar/csv-format.c:367
msgid "Completed"
msgstr "已完成"
@@ -4451,35 +4161,35 @@ msgstr "已完成"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:6
#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-task-table.c:508 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1132 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1172 ../widgets/misc/e-send-options.ui.h:8
msgid "High"
msgstr "高"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-details-page.ui.h:8
#: ../calendar/gui/e-cal-component-preview.c:289
-#: ../calendar/gui/e-cal-model-tasks.c:461
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-cal-model-tasks.c:812 ../calendar/gui/e-task-table.c:211
-#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:582
-#: ../calendar/gui/print.c:2645
+#: ../calendar/gui/e-cal-model-tasks.c:439
+#: ../calendar/gui/e-cal-model-tasks.c:713
+#: ../calendar/gui/e-cal-model-tasks.c:790 ../calendar/gui/e-task-table.c:211
+#: ../calendar/gui/e-task-table.c:226 ../calendar/gui/e-task-table.c:586
+#: ../calendar/gui/print.c:2669
msgid "In Progress"
msgstr "进行中"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:10
#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-task-table.c:510 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1130 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-task-table.c:513 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1170 ../widgets/misc/e-send-options.ui.h:9
msgid "Low"
msgstr "低"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:13
#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model.c:1315 ../calendar/gui/e-task-table.c:509
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1131
+#: ../calendar/gui/e-cal-model.c:1269 ../calendar/gui/e-task-table.c:512
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1171
#: ../widgets/misc/e-send-options.ui.h:13
msgid "Normal"
msgstr "中"
@@ -4487,10 +4197,10 @@ msgstr "中"
#. To Translators: This is task status
#: ../calendar/gui/dialogs/task-details-page.ui.h:15
#: ../calendar/gui/e-cal-component-preview.c:299
-#: ../calendar/gui/e-cal-model-tasks.c:459
-#: ../calendar/gui/e-cal-model-tasks.c:733 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:581
-#: ../calendar/gui/print.c:2642 ../calendar/gui/tasktypes.xml.h:18
+#: ../calendar/gui/e-cal-model-tasks.c:437
+#: ../calendar/gui/e-cal-model-tasks.c:711 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:585
+#: ../calendar/gui/print.c:2666 ../calendar/gui/tasktypes.xml.h:18
msgid "Not Started"
msgstr "尚未开始"
@@ -4506,8 +4216,8 @@ msgstr "状态(_U):"
#. Status: Accepted: X Declined: Y ...
#: ../calendar/gui/dialogs/task-details-page.ui.h:18
#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-calendar-view.c:1743
-#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-calendar-view.c:1773
+#: ../calendar/gui/e-meeting-list-view.c:594
#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
#: ../mail/message-list.etspec.h:17
@@ -4516,7 +4226,7 @@ msgstr "状态"
#. To Translators: This is task priority
#: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../calendar/gui/e-task-table.c:511 ../calendar/gui/tasktypes.xml.h:24
+#: ../calendar/gui/e-task-table.c:514 ../calendar/gui/tasktypes.xml.h:24
#: ../widgets/misc/e-send-options.ui.h:24
msgid "Undefined"
msgstr "未定义"
@@ -4526,7 +4236,7 @@ msgid "_Date completed:"
msgstr "完成日期(_D):"
#: ../calendar/gui/dialogs/task-details-page.ui.h:22
-#: ../widgets/misc/e-send-options.ui.h:34
+#: ../widgets/misc/e-send-options.ui.h:36
msgid "_Priority:"
msgstr "优先级(_P):"
@@ -4534,53 +4244,62 @@ msgstr "优先级(_P):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: ../calendar/gui/dialogs/task-editor.c:112
+#: ../calendar/gui/dialogs/task-editor.c:117
msgid "_Status Details"
msgstr "状态细节(_S)"
-#: ../calendar/gui/dialogs/task-editor.c:114
+#: ../calendar/gui/dialogs/task-editor.c:119
msgid "Click to change or view the status details of the task"
msgstr "单击可更改或查看任务的状态细节"
-#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../calendar/gui/dialogs/task-editor.c:127
#: ../plugins/groupwise-features/mail-send-options.c:200
msgid "_Send Options"
msgstr "发送选项(_S)"
-#: ../calendar/gui/dialogs/task-editor.c:334
-msgid "_Task"
-msgstr "任务(_T)"
+#: ../calendar/gui/dialogs/task-editor.c:328 ../calendar/gui/print.c:2590
+#: ../widgets/misc/e-send-options.c:502
+msgid "Task"
+msgstr "任务"
-#: ../calendar/gui/dialogs/task-editor.c:337
+#: ../calendar/gui/dialogs/task-editor.c:331
msgid "Task Details"
msgstr "任务细节"
-#: ../calendar/gui/dialogs/task-page.c:336
+#: ../calendar/gui/dialogs/task-editor.c:373
+msgid "Print this task"
+msgstr "打印此任务"
+
+#: ../calendar/gui/dialogs/task-page.c:343
+msgid "Task's start date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:344
+msgid "Task's due date is in the past"
+msgstr ""
+
+#: ../calendar/gui/dialogs/task-page.c:379
msgid "Task cannot be edited, because the selected task list is read only"
msgstr "任务不能被编辑,因为选择的任务列表是只读的"
-#: ../calendar/gui/dialogs/task-page.c:340
+#: ../calendar/gui/dialogs/task-page.c:383
msgid "Task cannot be fully edited, because you are not the organizer"
msgstr "无法完全编辑任务,因为您不是组织者"
-#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.c:434
#: ../calendar/gui/dialogs/task-page.ui.h:4
msgid "Organi_zer:"
msgstr "组织者(_Z):"
-#: ../calendar/gui/dialogs/task-page.c:834
+#: ../calendar/gui/dialogs/task-page.c:880
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1700
+#: ../calendar/gui/dialogs/task-page.c:1744
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
-#: ../calendar/gui/dialogs/task-page.ui.h:1
-msgid "Atte_ndees..."
-msgstr "出席者(_N)..."
-
#: ../calendar/gui/dialogs/task-page.ui.h:2
msgid "Categor_ies..."
msgstr "类别(_I)..."
@@ -4676,7 +4395,7 @@ msgid "Categories:"
msgstr "类别:"
#: ../calendar/gui/e-cal-component-preview.c:237
-#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1164 ../calendar/gui/e-itip-control.ui.h:9
msgid "Summary:"
msgstr "概要:"
@@ -4691,8 +4410,8 @@ msgstr "到期日期:"
#. Status
#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1176
-#: ../plugins/itip-formatter/itip-view.c:1066
+#: ../calendar/gui/e-itip-control.c:1189
+#: ../plugins/itip-formatter/itip-view.c:1074
msgid "Status:"
msgstr "状态:"
@@ -4701,8 +4420,8 @@ msgid "Priority:"
msgstr "优先级:"
#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
-#: ../mail/mail-config.ui.h:34
+#: ../calendar/gui/e-itip-control.c:1227 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:37
msgid "Description:"
msgstr "描述:"
@@ -4717,32 +4436,32 @@ msgstr "网页:"
msgid "Created"
msgstr "创建时间"
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-cal-list-view.etspec.h:4
msgid "End Date"
msgstr "结束日期"
-#: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:9
#: ../calendar/gui/e-memo-table.etspec.h:4
msgid "Last modified"
msgstr "上次修改"
-#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Start Date"
msgstr "开始日期"
#: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-task-table.c:560
+#: ../calendar/gui/e-task-table.c:563
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-meeting-time-sel.c:543 ../calendar/gui/e-task-table.c:561
+#: ../calendar/gui/e-meeting-time-sel.c:561 ../calendar/gui/e-task-table.c:564
msgid "Busy"
msgstr "繁忙"
-#: ../calendar/gui/e-cal-model-tasks.c:681
+#: ../calendar/gui/e-cal-model-tasks.c:659
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -4753,63 +4472,47 @@ msgstr ""
"45.436845,125.862501"
#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:709
msgctxt "cal-task-status"
msgid "None"
msgstr "无"
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
#: ../calendar/gui/e-meeting-list-view.c:187
-#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
#: ../calendar/gui/e-meeting-store.c:856
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "是"
-#: ../calendar/gui/e-cal-model-tasks.c:1087 ../calendar/gui/e-cal-model.c:1321
+#: ../calendar/gui/e-cal-model-tasks.c:1065 ../calendar/gui/e-cal-model.c:1275
#: ../calendar/gui/e-meeting-list-view.c:188
-#: ../calendar/gui/e-meeting-store.c:174
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
+#: ../calendar/gui/e-meeting-store.c:181
msgid "No"
msgstr "否"
-#: ../calendar/gui/e-cal-model.c:378
-msgid "Default Client"
-msgstr "默认客户端"
-
-#: ../calendar/gui/e-cal-model.c:388 ../calendar/gui/gnome-cal.c:551
-#: ../shell/e-shell.c:868
-msgid "Shell Settings"
-msgstr "外壳设置"
-
-#: ../calendar/gui/e-cal-model.c:389 ../calendar/gui/gnome-cal.c:552
-#: ../shell/e-shell.c:869
-msgid "Application-wide settings"
-msgstr "应用程序级设置"
-
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:573 ../calendar/gui/e-itip-control.c:1197
-#: ../calendar/gui/e-itip-control.c:1336
+#: ../calendar/gui/e-cal-model.c:527 ../calendar/gui/e-itip-control.c:1210
+#: ../calendar/gui/e-itip-control.c:1349
#: ../calendar/gui/e-meeting-list-view.c:163
#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
-#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:972
-#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
-#: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2338
+#: ../calendar/gui/e-meeting-store.c:127 ../calendar/gui/e-meeting-store.c:162
+#: ../calendar/gui/e-meeting-store.c:225 ../calendar/gui/print.c:972
+#: ../calendar/gui/print.c:989 ../e-util/e-charset.c:52 ../mail/em-utils.c:967
+#: ../plugins/itip-formatter/itip-formatter.c:457
+#: ../plugins/itip-formatter/itip-formatter.c:2343
#: ../plugins/plugin-manager/plugin-manager.c:89
msgid "Unknown"
msgstr "未知"
-#: ../calendar/gui/e-cal-model.c:1317
+#: ../calendar/gui/e-cal-model.c:1271
msgid "Recurring"
msgstr "重复"
-#: ../calendar/gui/e-cal-model.c:1319
+#: ../calendar/gui/e-cal-model.c:1273
msgid "Assigned"
msgstr "已分配"
-#: ../calendar/gui/e-cal-model.c:2225
+#: ../calendar/gui/e-cal-model.c:2175
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
@@ -4846,97 +4549,97 @@ msgid "Start date"
msgstr "开始日期"
#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-list-view.c:557
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
#: ../calendar/gui/e-memo-table.etspec.h:7
-#: ../widgets/misc/e-attachment-tree-view.c:554
+#: ../widgets/misc/e-attachment-tree-view.c:572
msgid "Type"
msgstr "类型"
-#: ../calendar/gui/e-calendar-view.c:392
+#: ../calendar/gui/e-calendar-view.c:407
msgid "Cut selected events to the clipboard"
msgstr "将选中事件剪切到剪贴板"
-#: ../calendar/gui/e-calendar-view.c:398
+#: ../calendar/gui/e-calendar-view.c:413
msgid "Copy selected events to the clipboard"
msgstr "将选中事件复制到剪贴板"
-#: ../calendar/gui/e-calendar-view.c:404
+#: ../calendar/gui/e-calendar-view.c:419
msgid "Paste events from the clipboard"
msgstr "从剪贴板中粘贴事件"
-#: ../calendar/gui/e-calendar-view.c:410
+#: ../calendar/gui/e-calendar-view.c:425
msgid "Delete selected events"
msgstr "删除选中的事件"
-#: ../calendar/gui/e-calendar-view.c:429 ../calendar/gui/e-memo-table.c:187
-#: ../calendar/gui/e-task-table.c:265
+#: ../calendar/gui/e-calendar-view.c:444 ../calendar/gui/e-memo-table.c:188
+#: ../calendar/gui/e-task-table.c:266
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-view.c:617 ../calendar/gui/e-memo-table.c:842
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-task-table.c:1068
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-view.c:1690
-#: ../calendar/gui/e-itip-control.c:1182
+#: ../calendar/gui/e-calendar-view.c:1720
+#: ../calendar/gui/e-itip-control.c:1195
#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2326
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
+#: ../plugins/itip-formatter/itip-formatter.c:2331
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-calendar-view.c:1691
-#: ../calendar/gui/e-itip-control.c:1192
+#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-itip-control.c:1205
#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2332
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../plugins/itip-formatter/itip-formatter.c:2337
msgid "Declined"
msgstr "拒绝"
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1722
#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/e-meeting-time-sel.c:542
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-time-sel.c:560
msgid "Tentative"
msgstr "暂时的"
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1723
#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
+#: ../plugins/itip-formatter/itip-formatter.c:2340
msgid "Delegated"
msgstr "被委任的"
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1724
msgid "Needs action"
msgstr "需要动作"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1835 ../calendar/gui/e-memo-table.c:527
-#: ../calendar/gui/e-task-table.c:738
+#: ../calendar/gui/e-calendar-view.c:1869 ../calendar/gui/e-memo-table.c:528
+#: ../calendar/gui/e-task-table.c:743
#, c-format
msgid "Organizer: %s <%s>"
msgstr "组织者:%s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:1839 ../calendar/gui/e-memo-table.c:532
-#: ../calendar/gui/e-task-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1873 ../calendar/gui/e-memo-table.c:533
+#: ../calendar/gui/e-task-table.c:746
#, c-format
msgid "Organizer: %s"
msgstr "组织者:%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1855 ../calendar/gui/print.c:2600
+#: ../calendar/gui/e-calendar-view.c:1889 ../calendar/gui/print.c:2624
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1886
+#: ../calendar/gui/e-calendar-view.c:1920
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
@@ -4979,8 +4682,8 @@ 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-top-item.c:864 ../calendar/gui/e-day-view.c:1883
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1735
+#: ../calendar/gui/e-day-view-top-item.c:897 ../calendar/gui/e-day-view.c:1878
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1744
msgid "%A %d %B"
msgstr "%B%d日%A"
@@ -4990,10 +4693,10 @@ msgstr "%B%d日%A"
#. %d = day of month, %b = abbreviated month name.
#. You can change the order but don't change the
#. specifiers or add anything.
-#: ../calendar/gui/e-day-view-top-item.c:868 ../calendar/gui/e-day-view.c:1900
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../calendar/gui/ea-gnome-calendar.c:200
-#: ../modules/calendar/e-cal-shell-view-private.c:990
+#: ../calendar/gui/e-day-view-top-item.c:901 ../calendar/gui/e-day-view.c:1895
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:202
+#: ../modules/calendar/e-cal-shell-view-private.c:1014
msgid "%a %d %b"
msgstr "%-m月%-d日%A"
@@ -5002,31 +4705,35 @@ msgstr "%-m月%-d日%A"
#. 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-day-view-top-item.c:872 ../calendar/gui/e-day-view.c:1916
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../calendar/gui/ea-gnome-calendar.c:230
-#: ../modules/calendar/e-cal-shell-view-private.c:1026
+#: ../calendar/gui/e-day-view-top-item.c:905 ../calendar/gui/e-day-view.c:1911
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1050
msgid "%d %b"
msgstr "%B%-d日"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1116 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/e-day-view.c:1077 ../calendar/gui/e-week-view.c:749
#: ../calendar/gui/print.c:819
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1119 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/e-day-view.c:1080 ../calendar/gui/e-week-view.c:752
#: ../calendar/gui/print.c:821
msgid "pm"
msgstr "下午"
#. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2613
+#: ../calendar/gui/e-day-view.c:2645
#, c-format
msgid "Week %d"
msgstr "第%d周"
+#: ../calendar/gui/e-itip-control.c:761
+msgid "Recurring:"
+msgstr "重复:"
+
#: ../calendar/gui/e-itip-control.c:765
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
@@ -5102,7 +4809,7 @@ msgstr "结束"
msgid "Due"
msgstr "到期"
-#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1047
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1059
msgid "iCalendar Information"
msgstr "iCalendar 信息"
@@ -5111,303 +4818,303 @@ msgstr "iCalendar 信息"
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: ../calendar/gui/e-itip-control.c:1080 ../calendar/gui/e-itip-control.c:1096
-#: ../calendar/gui/e-itip-control.c:1107 ../calendar/gui/e-itip-control.c:1124
-#: ../plugins/itip-formatter/itip-view.c:350
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:438
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:526
+#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1108
+#: ../calendar/gui/e-itip-control.c:1119 ../calendar/gui/e-itip-control.c:1136
+#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:538
msgid "An unknown person"
msgstr "未知的人"
-#: ../calendar/gui/e-itip-control.c:1132
+#: ../calendar/gui/e-itip-control.c:1145
msgid ""
-"<br> Please review the following information, and then select an action from "
-"the menu below."
-msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
+"Please review the following information, and then select an action from the "
+"menu below."
+msgstr "请查看下列信息,并从下面的菜单中选择一个动作。"
#. Translators: "None" used as a default value for events without Summary received by mail
-#: ../calendar/gui/e-itip-control.c:1147
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1160
+#: ../plugins/itip-formatter/itip-formatter.c:2318
msgctxt "cal-itip"
msgid "None"
msgstr "无"
-#: ../calendar/gui/e-itip-control.c:1187
-#: ../plugins/itip-formatter/itip-formatter.c:2329
+#: ../calendar/gui/e-itip-control.c:1200
+#: ../plugins/itip-formatter/itip-formatter.c:2334
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:1277
+#: ../calendar/gui/e-itip-control.c:1290
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "会议已经被取消,但无法在您的日历中找到该会议"
-#: ../calendar/gui/e-itip-control.c:1279
+#: ../calendar/gui/e-itip-control.c:1292
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr "任务已经被取消,但无法在您的任务列表中找到该任务"
-#: ../calendar/gui/e-itip-control.c:1356
+#: ../calendar/gui/e-itip-control.c:1369
#, c-format
-msgid "<b>%s</b> has published meeting information."
-msgstr "<b>%s</b> 发布了会议信息。"
+msgid "%s has published meeting information."
+msgstr "%s 发布了会议信息。"
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1370
msgid "Meeting Information"
msgstr "会议信息"
-#: ../calendar/gui/e-itip-control.c:1363
+#: ../calendar/gui/e-itip-control.c:1376
#, c-format
-msgid "<b>%s</b> requests the presence of %s at a meeting."
-msgstr "<b>%s</b> 请求 %s 参加一个会议。"
+msgid "%s requests the presence of %s at a meeting."
+msgstr "%s 请求 %s 参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1378
#, c-format
-msgid "<b>%s</b> requests your presence at a meeting."
-msgstr "<b>%s</b> 请求您参加一个会议。"
+msgid "%s requests your presence at a meeting."
+msgstr "%s 邀请您参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1379
msgid "Meeting Proposal"
msgstr "会议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1372
+#: ../calendar/gui/e-itip-control.c:1385
#, c-format
-msgid "<b>%s</b> wishes to be added to an existing meeting."
-msgstr "<b>%s</b> 希望加入到已有的会议。"
+msgid "%s wishes to be added to an existing meeting."
+msgstr "%s 希望加入到已有的会议。"
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1386
msgid "Meeting Update"
msgstr "会议更新"
-#: ../calendar/gui/e-itip-control.c:1377
+#: ../calendar/gui/e-itip-control.c:1390
#, c-format
-msgid "<b>%s</b> wishes to receive the latest meeting information."
-msgstr "<b>%s</b> 希望收到最新的会议信息。"
+msgid "%s wishes to receive the latest meeting information."
+msgstr "%s 希望收到最新的会议信息。"
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1391
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: ../calendar/gui/e-itip-control.c:1385
+#: ../calendar/gui/e-itip-control.c:1398
#, c-format
-msgid "<b>%s</b> has replied to a meeting request."
-msgstr "<b>%s</b> 已回复一个会议请求。"
+msgid "%s has replied to a meeting request."
+msgstr "%s 已回复一个会议请求。"
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1399
msgid "Meeting Reply"
msgstr "会议答复"
-#: ../calendar/gui/e-itip-control.c:1393
+#: ../calendar/gui/e-itip-control.c:1406
#, c-format
-msgid "<b>%s</b> has canceled a meeting."
-msgstr "<b>%s</b> 取消了一个会议。"
+msgid "%s has canceled a meeting."
+msgstr "%s 取消了一个会议。"
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1407
msgid "Meeting Cancelation"
msgstr "会议取消"
-#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
-#: ../calendar/gui/e-itip-control.c:1521
+#: ../calendar/gui/e-itip-control.c:1417 ../calendar/gui/e-itip-control.c:1494
+#: ../calendar/gui/e-itip-control.c:1534
#, c-format
-msgid "<b>%s</b> has sent an unintelligible message."
-msgstr "<b>%s</b> 发送了一个无法理解的信件。"
+msgid "%s has sent an unintelligible message."
+msgstr "%s 发送了一个无法理解的信息。"
-#: ../calendar/gui/e-itip-control.c:1405
+#: ../calendar/gui/e-itip-control.c:1418
msgid "Bad Meeting Message"
-msgstr "错误的会议信件"
+msgstr "错误的会议信息"
-#: ../calendar/gui/e-itip-control.c:1432
+#: ../calendar/gui/e-itip-control.c:1445
#, c-format
-msgid "<b>%s</b> has published task information."
-msgstr "<b>%s</b> 发布了任务信息。"
+msgid "%s has published task information."
+msgstr "%s 发布了任务信息。"
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1446
msgid "Task Information"
msgstr "任务信息"
-#: ../calendar/gui/e-itip-control.c:1440
+#: ../calendar/gui/e-itip-control.c:1453
#, c-format
-msgid "<b>%s</b> requests %s to perform a task."
-msgstr "<b>%s</b> 请求 %s 完成一个任务。"
+msgid "%s requests %s to perform a task."
+msgstr "%s 请求 %s 完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1455
#, c-format
-msgid "<b>%s</b> requests you perform a task."
-msgstr "<b>%s</b> 请求您完成一个任务。"
+msgid "%s requests you perform a task."
+msgstr "%s 请求您完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1456
msgid "Task Proposal"
msgstr "任务建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1449
+#: ../calendar/gui/e-itip-control.c:1462
#, c-format
-msgid "<b>%s</b> wishes to be added to an existing task."
-msgstr "<b>%s<b> 希望加入到已有的任务。"
+msgid "%s wishes to be added to an existing task."
+msgstr "%s 希望加入到已有的任务。"
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1463
msgid "Task Update"
msgstr "任务更新"
-#: ../calendar/gui/e-itip-control.c:1454
+#: ../calendar/gui/e-itip-control.c:1467
#, c-format
-msgid "<b>%s</b> wishes to receive the latest task information."
-msgstr "<b>%s</b> 希望获取最新的任务信息。"
+msgid "%s wishes to receive the latest task information."
+msgstr "%s 希望获取最新的任务信息。"
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1468
msgid "Task Update Request"
msgstr "任务更新请求"
-#: ../calendar/gui/e-itip-control.c:1462
+#: ../calendar/gui/e-itip-control.c:1475
#, c-format
-msgid "<b>%s</b> has replied to a task assignment."
-msgstr "<b>%s</b> 已经回复了任务分配。"
+msgid "%s has replied to a task assignment."
+msgstr "%s 已经回复了任务分配。"
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1476
msgid "Task Reply"
msgstr "任务回复"
-#: ../calendar/gui/e-itip-control.c:1470
+#: ../calendar/gui/e-itip-control.c:1483
#, c-format
-msgid "<b>%s</b> has canceled a task."
-msgstr "<b>%s</b> 取消了任务。"
+msgid "%s has canceled a task."
+msgstr "%s 取消了任务。"
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1484
msgid "Task Cancelation"
msgstr "任务取消"
-#: ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1495
msgid "Bad Task Message"
-msgstr "错误的任务信件"
+msgstr "错误的任务信息"
-#: ../calendar/gui/e-itip-control.c:1506
+#: ../calendar/gui/e-itip-control.c:1519
#, c-format
-msgid "<b>%s</b> has published free/busy information."
-msgstr "<b>%s</b> 发布了忙闲信息。"
+msgid "%s has published free/busy information."
+msgstr "%s 发布了忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1520
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: ../calendar/gui/e-itip-control.c:1511
+#: ../calendar/gui/e-itip-control.c:1524
#, c-format
-msgid "<b>%s</b> requests your free/busy information."
-msgstr "<b>%s</b> 请求您的忙闲信息。"
+msgid "%s requests your free/busy information."
+msgstr "%s 请求您的忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1525
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: ../calendar/gui/e-itip-control.c:1516
+#: ../calendar/gui/e-itip-control.c:1529
#, c-format
-msgid "<b>%s</b> has replied to a free/busy request."
-msgstr "<b>%s</b> 应答了忙闲请求。"
+msgid "%s has replied to a free/busy request."
+msgstr "%s 应答了忙闲请求。"
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1530
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1535
msgid "Bad Free/Busy Message"
-msgstr "错误的忙闲信件"
+msgstr "错误的忙闲信息"
-#: ../calendar/gui/e-itip-control.c:1598
+#: ../calendar/gui/e-itip-control.c:1611
msgid "The message does not appear to be properly formed"
-msgstr "信件的格式可能不正确"
+msgstr "信息的格式可能不正确"
-#: ../calendar/gui/e-itip-control.c:1657
+#: ../calendar/gui/e-itip-control.c:1670
msgid "The message contains only unsupported requests."
-msgstr "信件只含有不支持的请求。"
+msgstr "信息只含有不支持的请求。"
-#: ../calendar/gui/e-itip-control.c:1690
+#: ../calendar/gui/e-itip-control.c:1703
msgid "The attachment does not contain a valid calendar message"
-msgstr "附件中没有有效的日历信件"
+msgstr "附件中没有有效的日历信息"
-#: ../calendar/gui/e-itip-control.c:1728
+#: ../calendar/gui/e-itip-control.c:1741
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: ../calendar/gui/e-itip-control.c:1970
+#: ../calendar/gui/e-itip-control.c:1983
msgid "Update complete\n"
msgstr "更新完成\n"
-#: ../calendar/gui/e-itip-control.c:2004
+#: ../calendar/gui/e-itip-control.c:2017
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2035
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2053
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新出席者状态!\n"
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2077
msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
-#: ../calendar/gui/e-itip-control.c:2071
+#: ../calendar/gui/e-itip-control.c:2084
#: ../plugins/itip-formatter/itip-formatter.c:1421
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2115 ../calendar/gui/e-itip-control.c:2172
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2121 ../calendar/gui/e-itip-control.c:2180
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2273
msgid "Choose an action:"
msgstr "选择一项活动:"
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
-#: ../calendar/gui/e-meeting-list-view.c:591
+#: ../calendar/gui/e-itip-control.c:2302
+#: ../calendar/gui/e-meeting-list-view.c:582
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "请回复"
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2342
msgid "Update"
msgstr "更新"
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2366
#: ../plugins/groupwise-features/gw-ui.c:331
msgid "Accept"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2367
msgid "Tentatively accept"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2368
#: ../plugins/groupwise-features/gw-ui.c:345
msgid "Decline"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2393
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2417
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2441
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1036
-#: ../widgets/misc/e-activity-proxy.c:299
+#: ../calendar/gui/e-itip-control.c:2465
+#: ../modules/mail/e-mail-shell-view-actions.c:976
+#: ../widgets/misc/e-activity-proxy.c:298
msgid "Cancel"
msgstr "取消"
@@ -5417,7 +5124,7 @@ msgstr "--到--"
#: ../calendar/gui/e-itip-control.ui.h:2
msgid "Calendar Message"
-msgstr "日历信件"
+msgstr "日历信息"
#: ../calendar/gui/e-itip-control.ui.h:3
msgid "Date:"
@@ -5425,11 +5132,11 @@ msgstr "日期:"
#: ../calendar/gui/e-itip-control.ui.h:5
msgid "Loading Calendar"
-msgstr "装入日历"
+msgstr "载入日历"
#: ../calendar/gui/e-itip-control.ui.h:6
msgid "Loading calendar..."
-msgstr "正在装入日历..."
+msgstr "正在载入日历..."
#: ../calendar/gui/e-itip-control.ui.h:7
msgid "Organizer:"
@@ -5456,72 +5163,72 @@ msgid "Resources"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:159
-#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:968
msgid "Individual"
msgstr "个人"
#: ../calendar/gui/e-meeting-list-view.c:160
-#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
#: ../calendar/gui/print.c:969 ../widgets/table/e-table-config.ui.h:7
msgid "Group"
msgstr "组"
#: ../calendar/gui/e-meeting-list-view.c:161
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
#: ../calendar/gui/print.c:970
msgid "Resource"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/e-meeting-store.c:108 ../calendar/gui/e-meeting-store.c:125
#: ../calendar/gui/print.c:971
msgid "Room"
msgstr "房间"
#: ../calendar/gui/e-meeting-list-view.c:173
-#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
#: ../calendar/gui/print.c:985
msgid "Chair"
msgstr "主席"
#: ../calendar/gui/e-meeting-list-view.c:174
-#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:986
msgid "Required Participant"
msgstr "必需的出席者"
#: ../calendar/gui/e-meeting-list-view.c:175
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
#: ../calendar/gui/print.c:987
msgid "Optional Participant"
msgstr "可选的出席者"
#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/e-meeting-store.c:143 ../calendar/gui/e-meeting-store.c:160
#: ../calendar/gui/print.c:988
msgid "Non-Participant"
msgstr "不参加"
#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
#: ../calendar/gui/e-meeting-store.c:863
msgid "Needs Action"
msgstr "需要动作"
#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:546
+#: ../calendar/gui/e-meeting-list-view.c:537
msgid "Attendee "
msgstr "出席者 "
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
msgid "In Process"
msgstr "处理中"
#. This is a strftime() format string %A = full weekday name,
#. %B = full month name, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:458
-#: ../calendar/gui/e-meeting-time-sel.c:2300
+#: ../calendar/gui/e-meeting-time-sel.c:2376
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
@@ -5530,7 +5237,7 @@ msgstr "%Y年%m月%d日%A"
#. This is a strftime() format string %a = abbreviated weekday name,
#. %m = month number, %d = month day, %Y = full year.
#: ../calendar/gui/e-meeting-time-sel-item.c:462
-#: ../calendar/gui/e-meeting-time-sel.c:2331
+#: ../calendar/gui/e-meeting-time-sel.c:2407
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
@@ -5540,67 +5247,63 @@ msgstr "%Y年%m月%d日%A"
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:562
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:545
+#: ../calendar/gui/e-meeting-time-sel.c:563
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:560
-msgid "A_ttendees..."
-msgstr "出席者(_T)..."
-
-#: ../calendar/gui/e-meeting-time-sel.c:581
+#: ../calendar/gui/e-meeting-time-sel.c:599
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:598
+#: ../calendar/gui/e-meeting-time-sel.c:617
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:608
+#: ../calendar/gui/e-meeting-time-sel.c:628
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:623
+#: ../calendar/gui/e-meeting-time-sel.c:644
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:659
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:656
+#: ../calendar/gui/e-meeting-time-sel.c:677
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:692
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:688
+#: ../calendar/gui/e-meeting-time-sel.c:710
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:697
+#: ../calendar/gui/e-meeting-time-sel.c:720
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:706
+#: ../calendar/gui/e-meeting-time-sel.c:730
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:739
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:760
+#: ../calendar/gui/e-meeting-time-sel.c:785
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:797
+#: ../calendar/gui/e-meeting-time-sel.c:822
msgid "_End time:"
msgstr "结束时间(_E):"
@@ -5628,45 +5331,47 @@ msgstr "语言"
msgid "Member"
msgstr "成员"
-#: ../calendar/gui/e-memo-table.c:411
-#: ../modules/calendar/e-cal-shell-content.c:456
+#: ../calendar/gui/e-memo-table.c:412
+#: ../modules/calendar/e-cal-shell-content.c:468
#: ../modules/calendar/e-memo-shell-view-actions.c:218
#: ../modules/calendar/e-memo-shell-view-actions.c:233
#: ../modules/calendar/e-memo-shell-view.c:289
-#: ../plugins/caldav/caldav-browse-server.c:432
+#: ../plugins/caldav/caldav-browse-server.c:431
msgid "Memos"
msgstr "备忘"
-#: ../calendar/gui/e-memo-table.c:489 ../calendar/gui/e-task-table.c:702
+#: ../calendar/gui/e-memo-table.c:490 ../calendar/gui/e-task-table.c:707
msgid "* No Summary *"
msgstr "* 没有概要 *"
-#: ../calendar/gui/e-memo-table.c:573 ../calendar/gui/e-task-table.c:782
+#. Translators: This is followed by an event's start date/time
+#: ../calendar/gui/e-memo-table.c:575 ../calendar/gui/e-task-table.c:787
msgid "Start: "
msgstr "开始:"
-#: ../calendar/gui/e-memo-table.c:591 ../calendar/gui/e-task-table.c:800
+#. Translators: This is followed by an event's due date/time
+#: ../calendar/gui/e-memo-table.c:594 ../calendar/gui/e-task-table.c:805
msgid "Due: "
msgstr "到期:"
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:710
msgid "Cut selected memos to the clipboard"
msgstr "将选中备忘剪切到剪贴板"
-#: ../calendar/gui/e-memo-table.c:713
+#: ../calendar/gui/e-memo-table.c:716
msgid "Copy selected memos to the clipboard"
msgstr "将选中备忘复制到剪贴板"
-#: ../calendar/gui/e-memo-table.c:719
+#: ../calendar/gui/e-memo-table.c:722
msgid "Paste memos from the clipboard"
msgstr "从剪贴板中粘贴备忘"
-#: ../calendar/gui/e-memo-table.c:725
-#: ../modules/calendar/e-memo-shell-view-actions.c:556
+#: ../calendar/gui/e-memo-table.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
msgid "Delete selected memos"
msgstr "删除选中的备忘"
-#: ../calendar/gui/e-memo-table.c:731
+#: ../calendar/gui/e-memo-table.c:734
msgid "Select all visible memos"
msgstr "选中所有可见的备忘"
@@ -5674,142 +5379,107 @@ msgstr "选中所有可见的备忘"
msgid "Click to add a memo"
msgstr "单击以添加备忘"
-#: ../calendar/gui/e-task-table.c:530
-msgid "0%"
-msgstr "0%"
-
-#: ../calendar/gui/e-task-table.c:531
-msgid "10%"
-msgstr "10%"
-
-#: ../calendar/gui/e-task-table.c:532
-msgid "20%"
-msgstr "20%"
-
-#: ../calendar/gui/e-task-table.c:533
-msgid "30%"
-msgstr "30%"
-
-#: ../calendar/gui/e-task-table.c:534
-msgid "40%"
-msgstr "40%"
-
-#: ../calendar/gui/e-task-table.c:535
-msgid "50%"
-msgstr "50%"
-
-#: ../calendar/gui/e-task-table.c:536
-msgid "60%"
-msgstr "60%"
-
-#: ../calendar/gui/e-task-table.c:537
-msgid "70%"
-msgstr "70%"
-
-#: ../calendar/gui/e-task-table.c:538
-msgid "80%"
-msgstr "80%"
-
+#. Translators: "%d%%" is the percentage of a task done.
+#. %d is the actual value, %% is replaced with a percent sign.
+#. Result values will be 0%, 10%, 20%, ... 100%
+#.
#: ../calendar/gui/e-task-table.c:539
-msgid "90%"
-msgstr "90%"
-
-#: ../calendar/gui/e-task-table.c:540
-msgid "100%"
-msgstr "100%"
+#, c-format
+msgid "%d%%"
+msgstr "%d%%"
-#: ../calendar/gui/e-task-table.c:624 ../calendar/gui/print.c:2043
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:418
+#: ../calendar/gui/e-task-table.c:629 ../calendar/gui/print.c:2052
+#: ../calendar/importers/icalendar-importer.c:81
+#: ../calendar/importers/icalendar-importer.c:828
+#: ../modules/calendar/e-cal-shell-content.c:429
#: ../modules/calendar/e-task-shell-view-actions.c:241
#: ../modules/calendar/e-task-shell-view-actions.c:256
#: ../modules/calendar/e-task-shell-view.c:437
-#: ../plugins/caldav/caldav-browse-server.c:430
-#: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:561
+#: ../plugins/caldav/caldav-browse-server.c:429
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:562
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
msgid "Tasks"
msgstr "任务"
-#: ../calendar/gui/e-task-table.c:928
+#: ../calendar/gui/e-task-table.c:933
msgid "Cut selected tasks to the clipboard"
msgstr "将选中任务剪切到剪贴板"
-#: ../calendar/gui/e-task-table.c:934
+#: ../calendar/gui/e-task-table.c:939
msgid "Copy selected tasks to the clipboard"
msgstr "将选中任务复制到剪贴板"
-#: ../calendar/gui/e-task-table.c:940
+#: ../calendar/gui/e-task-table.c:945
msgid "Paste tasks from the clipboard"
msgstr "从剪贴板中粘贴任务"
-#: ../calendar/gui/e-task-table.c:946
-#: ../modules/calendar/e-task-shell-view-actions.c:680
+#: ../calendar/gui/e-task-table.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:690
msgid "Delete selected tasks"
msgstr "删除选中的任务"
-#: ../calendar/gui/e-task-table.c:952
+#: ../calendar/gui/e-task-table.c:957
msgid "Select all visible tasks"
msgstr "选中所有可见的任务"
-#: ../calendar/gui/e-timezone-entry.c:354
+#: ../calendar/gui/e-timezone-entry.c:330
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:239 ../calendar/gui/print.c:1716
+#: ../calendar/gui/e-week-view-main-item.c:235 ../calendar/gui/print.c:1725
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/ea-cal-view-event.c:276
+#: ../calendar/gui/ea-cal-view-event.c:286
msgid "It has alarms."
msgstr "有提醒。"
-#: ../calendar/gui/ea-cal-view-event.c:279
+#: ../calendar/gui/ea-cal-view-event.c:289
msgid "It has recurrences."
msgstr "有再现。"
-#: ../calendar/gui/ea-cal-view-event.c:282
+#: ../calendar/gui/ea-cal-view-event.c:292
msgid "It is a meeting."
msgstr "为会议。"
-#: ../calendar/gui/ea-cal-view-event.c:288
+#: ../calendar/gui/ea-cal-view-event.c:298
#, c-format
msgid "Calendar Event: Summary is %s."
msgstr "日历事件:摘要为 %s。"
-#: ../calendar/gui/ea-cal-view-event.c:290
+#: ../calendar/gui/ea-cal-view-event.c:300
msgid "Calendar Event: It has no summary."
msgstr "日历事件:无摘要。"
-#: ../calendar/gui/ea-cal-view-event.c:312
+#: ../calendar/gui/ea-cal-view-event.c:322
msgid "calendar view event"
msgstr "日历视图事件"
-#: ../calendar/gui/ea-cal-view-event.c:540
+#: ../calendar/gui/ea-cal-view-event.c:551
msgid "Grab Focus"
msgstr "获得焦点"
-#: ../calendar/gui/ea-cal-view.c:300
+#: ../calendar/gui/ea-cal-view.c:304
msgid "New Appointment"
msgstr "新建约会"
-#: ../calendar/gui/ea-cal-view.c:301
+#: ../calendar/gui/ea-cal-view.c:305
msgid "New All Day Event"
msgstr "新建全天事件"
-#: ../calendar/gui/ea-cal-view.c:302
+#: ../calendar/gui/ea-cal-view.c:306
msgid "New Meeting"
msgstr "新会议"
-#: ../calendar/gui/ea-cal-view.c:303
+#: ../calendar/gui/ea-cal-view.c:307
msgid "Go to Today"
msgstr "转到今天"
-#: ../calendar/gui/ea-cal-view.c:304
+#: ../calendar/gui/ea-cal-view.c:308
msgid "Go to Date"
msgstr "转到日期"
@@ -5818,7 +5488,7 @@ msgstr "转到日期"
msgid "a table to view and select the current time range"
msgstr "可查看并选择当前时间范围的表"
-#: ../calendar/gui/ea-day-view.c:152 ../calendar/gui/ea-week-view.c:150
+#: ../calendar/gui/ea-day-view.c:150 ../calendar/gui/ea-week-view.c:149
#, c-format
msgid "It has %d event."
msgid_plural "It has %d events."
@@ -5826,14 +5496,14 @@ 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:157 ../calendar/gui/ea-week-view.c:152
+#: ../calendar/gui/ea-day-view.c:155 ../calendar/gui/ea-week-view.c:152
msgid "It has no events."
msgstr "无事件。"
#. To translators: First %s is the week, for example "July 10th -
#. July 14th, 2006". Second %s is the number of events in this work
#. week, for example "It has %d event/events." or "It has no events."
-#: ../calendar/gui/ea-day-view.c:164
+#: ../calendar/gui/ea-day-view.c:162
#, c-format
msgid "Work Week View: %s. %s"
msgstr "工作日视图:%s。%s"
@@ -5841,47 +5511,47 @@ msgstr "工作日视图:%s。%s"
#. To translators: First %s is the day, for example "Thursday July
#. 13th, 2006". Second %s is the number of events on this day, for
#. example "It has %d event/events." or "It has no events."
-#: ../calendar/gui/ea-day-view.c:170
+#: ../calendar/gui/ea-day-view.c:168
#, c-format
msgid "Day View: %s. %s"
msgstr "日视图:%s。%s"
-#: ../calendar/gui/ea-day-view.c:201
+#: ../calendar/gui/ea-day-view.c:202
msgid "calendar view for a work week"
msgstr "工作日的日历视图"
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:204
msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
-#: ../calendar/gui/ea-gnome-calendar.c:46
-#: ../calendar/gui/ea-gnome-calendar.c:54
-#: ../calendar/importers/icalendar-importer.c:780
+#: ../calendar/gui/ea-gnome-calendar.c:48
+#: ../calendar/gui/ea-gnome-calendar.c:56
+#: ../calendar/importers/icalendar-importer.c:860
msgid "Gnome Calendar"
msgstr "Gnome 日历"
-#: ../calendar/gui/ea-gnome-calendar.c:197
-#: ../modules/calendar/e-cal-shell-view-private.c:986
+#: ../calendar/gui/ea-gnome-calendar.c:199
+#: ../modules/calendar/e-cal-shell-view-private.c:1010
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
-#: ../calendar/gui/ea-gnome-calendar.c:202
-#: ../calendar/gui/ea-gnome-calendar.c:207
+#: ../calendar/gui/ea-gnome-calendar.c:204
#: ../calendar/gui/ea-gnome-calendar.c:209
-#: ../modules/calendar/e-cal-shell-view-private.c:993
-#: ../modules/calendar/e-cal-shell-view-private.c:999
-#: ../modules/calendar/e-cal-shell-view-private.c:1002
+#: ../calendar/gui/ea-gnome-calendar.c:211
+#: ../modules/calendar/e-cal-shell-view-private.c:1017
+#: ../modules/calendar/e-cal-shell-view-private.c:1023
+#: ../modules/calendar/e-cal-shell-view-private.c:1026
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
-#: ../calendar/gui/ea-gnome-calendar.c:226
-#: ../calendar/gui/ea-gnome-calendar.c:232
-#: ../calendar/gui/ea-gnome-calendar.c:238
+#: ../calendar/gui/ea-gnome-calendar.c:228
+#: ../calendar/gui/ea-gnome-calendar.c:234
#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../modules/calendar/e-cal-shell-view-private.c:1019
-#: ../modules/calendar/e-cal-shell-view-private.c:1030
-#: ../modules/calendar/e-cal-shell-view-private.c:1037
-#: ../modules/calendar/e-cal-shell-view-private.c:1040
+#: ../calendar/gui/ea-gnome-calendar.c:242
+#: ../modules/calendar/e-cal-shell-view-private.c:1043
+#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1061
+#: ../modules/calendar/e-cal-shell-view-private.c:1064
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -5903,15 +5573,15 @@ msgstr "月视图:%s。%s"
msgid "Week View: %s. %s"
msgstr "周视图:%s。%s"
-#: ../calendar/gui/ea-week-view.c:192
+#: ../calendar/gui/ea-week-view.c:195
msgid "calendar view for a month"
msgstr "月日历视图"
-#: ../calendar/gui/ea-week-view.c:194
+#: ../calendar/gui/ea-week-view.c:197
msgid "calendar view for one or more weeks"
msgstr "一周或多周的日历视图"
-#: ../calendar/gui/gnome-cal.c:2299
+#: ../calendar/gui/gnome-cal.c:2287
msgid "Purging"
msgstr "销毁"
@@ -5964,39 +5634,40 @@ msgid "Select Date"
msgstr "选择日期"
#: ../calendar/gui/goto-dialog.ui.h:13
-msgid "September"
-msgstr "九月"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+msgid "Select _Today"
+msgstr "选择今天(_T)"
#: ../calendar/gui/goto-dialog.ui.h:14
-msgid "_Select Today"
-msgstr "选择今天(_S)"
+msgid "September"
+msgstr "九月"
-#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
-#: ../calendar/gui/itip-utils.c:552
+#: ../calendar/gui/itip-utils.c:408 ../calendar/gui/itip-utils.c:459
+#: ../calendar/gui/itip-utils.c:551
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../calendar/gui/itip-utils.c:452
+#: ../calendar/gui/itip-utils.c:451
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:783
+#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:782
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:786
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:785
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:639 ../calendar/gui/itip-utils.c:789
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:788
msgid "Memo information"
msgstr "备忘信息"
-#: ../calendar/gui/itip-utils.c:642 ../calendar/gui/itip-utils.c:807
+#: ../calendar/gui/itip-utils.c:641 ../calendar/gui/itip-utils.c:806
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../calendar/gui/itip-utils.c:645
+#: ../calendar/gui/itip-utils.c:644
msgid "Calendar information"
msgstr "日历信息"
@@ -6004,7 +5675,7 @@ msgstr "日历信息"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:679
+#: ../calendar/gui/itip-utils.c:678
msgctxt "Meeting"
msgid "Accepted"
msgstr "接受"
@@ -6013,7 +5684,7 @@ msgstr "接受"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:686
+#: ../calendar/gui/itip-utils.c:685
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -6025,7 +5696,7 @@ msgstr "暂时接受"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:741
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:740
msgctxt "Meeting"
msgid "Declined"
msgstr "拒绝"
@@ -6034,7 +5705,7 @@ msgstr "拒绝"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:699
msgctxt "Meeting"
msgid "Delegated"
msgstr "被委任的"
@@ -6042,7 +5713,7 @@ msgstr "被委任的"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:713
+#: ../calendar/gui/itip-utils.c:712
msgctxt "Meeting"
msgid "Updated"
msgstr "更新"
@@ -6050,7 +5721,7 @@ msgstr "更新"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:720
+#: ../calendar/gui/itip-utils.c:719
msgctxt "Meeting"
msgid "Cancel"
msgstr "取消"
@@ -6058,7 +5729,7 @@ msgstr "取消"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:727
+#: ../calendar/gui/itip-utils.c:726
msgctxt "Meeting"
msgid "Refresh"
msgstr "刷新"
@@ -6066,29 +5737,29 @@ msgstr "刷新"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:734
+#: ../calendar/gui/itip-utils.c:733
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:804
+#: ../calendar/gui/itip-utils.c:803
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:812
+#: ../calendar/gui/itip-utils.c:811
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:832
+#: ../calendar/gui/itip-utils.c:831
msgid "Unable to book a resource, the new event collides with some other."
msgstr "无法预约资源,新事件与其它事件冲突。"
-#: ../calendar/gui/itip-utils.c:834
+#: ../calendar/gui/itip-utils.c:833
msgid "Unable to book a resource, error: "
msgstr "无法预约资源,错误:"
-#: ../calendar/gui/itip-utils.c:987
+#: ../calendar/gui/itip-utils.c:986
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
@@ -6244,49 +5915,73 @@ msgstr "五"
msgid "Sa"
msgstr "六"
-#: ../calendar/gui/print.c:2564
-msgid "Appointment"
-msgstr "约会"
+#. Translators: This is part of "START to END" text,
+#. * where START and END are date/times.
+#: ../calendar/gui/print.c:2429
+msgid " to "
+msgstr " 到 "
-#: ../calendar/gui/print.c:2566
-msgid "Task"
-msgstr "任务"
+#. Translators: This is part of "START to END
+#. * (Completed COMPLETED)", where COMPLETED is a
+#. * completed date/time.
+#: ../calendar/gui/print.c:2437
+msgid " (Completed "
+msgstr " (完成 "
-#: ../calendar/gui/print.c:2591
+#. Translators: This is part of "Completed COMPLETED",
+#. * where COMPLETED is a completed date/time.
+#: ../calendar/gui/print.c:2441
+msgid "Completed "
+msgstr "已完成 "
+
+#. Translators: This is part of "START (Due DUE)",
+#. * where START and DUE are dates/times.
+#: ../calendar/gui/print.c:2449
+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:2454
+msgid "Due "
+msgstr "预定 "
+
+#: ../calendar/gui/print.c:2615
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2615
+#: ../calendar/gui/print.c:2639
msgid "Attendees: "
msgstr "出席者:"
-#: ../calendar/gui/print.c:2658
+#: ../calendar/gui/print.c:2682
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2673
+#: ../calendar/gui/print.c:2697
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2691
+#: ../calendar/gui/print.c:2715
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2702
+#: ../calendar/gui/print.c:2726
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2715
+#: ../calendar/gui/print.c:2739
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2726
+#: ../calendar/gui/print.c:2750
msgid "Contacts: "
msgstr "联系人:"
@@ -6295,10 +5990,6 @@ msgstr "联系人:"
msgid "% Completed"
msgstr "% 完成"
-#: ../calendar/gui/tasktypes.xml.h:7
-msgid "Cancelled"
-msgstr "已取消"
-
#: ../calendar/gui/tasktypes.xml.h:15
msgid "In progress"
msgstr "进行中"
@@ -6311,44 +6002,189 @@ msgstr "大于"
msgid "is less than"
msgstr "小于"
-#: ../calendar/importers/icalendar-importer.c:75
+#: ../calendar/importers/icalendar-importer.c:80
msgid "Appointments and Meetings"
msgstr "约会和会议"
-#: ../calendar/importers/icalendar-importer.c:335
-#: ../calendar/importers/icalendar-importer.c:628
+#: ../calendar/importers/icalendar-importer.c:350
+#: ../calendar/importers/icalendar-importer.c:707
#: ../plugins/itip-formatter/itip-formatter.c:1833
msgid "Opening calendar"
msgstr "打开日历"
-#: ../calendar/importers/icalendar-importer.c:442
+#: ../calendar/importers/icalendar-importer.c:493
msgid "iCalendar files (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../calendar/importers/icalendar-importer.c:443
+#: ../calendar/importers/icalendar-importer.c:494
msgid "Evolution iCalendar importer"
msgstr "Evolution iCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:531
+#: ../calendar/importers/icalendar-importer.c:582
msgid "Reminder!"
msgstr "提醒!!"
-#: ../calendar/importers/icalendar-importer.c:583
-msgid "vCalendar files (.vcf)"
-msgstr "vCalendar 文件(.vcf)"
+#: ../calendar/importers/icalendar-importer.c:662
+msgid "vCalendar files (.vcs)"
+msgstr "vCalendar 文件(.vcs)"
-#: ../calendar/importers/icalendar-importer.c:584
+#: ../calendar/importers/icalendar-importer.c:663
msgid "Evolution vCalendar importer"
msgstr "Evolution vCalendar 导入器"
-#: ../calendar/importers/icalendar-importer.c:744
+#: ../calendar/importers/icalendar-importer.c:823
msgid "Calendar Events"
msgstr "日历事件"
-#: ../calendar/importers/icalendar-importer.c:781
+#: ../calendar/importers/icalendar-importer.c:861
msgid "Evolution Calendar intelligent importer"
msgstr "Evolution 日历智能导入器"
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Meeting"
+msgstr "会议"
+
+#: ../calendar/importers/icalendar-importer.c:926
+#: ../calendar/importers/icalendar-importer.c:1243
+msgctxt "iCalImp"
+msgid "Event"
+msgstr "事件"
+
+#: ../calendar/importers/icalendar-importer.c:929
+#: ../calendar/importers/icalendar-importer.c:1244
+msgctxt "iCalImp"
+msgid "Task"
+msgstr "任务"
+
+#: ../calendar/importers/icalendar-importer.c:932
+#: ../calendar/importers/icalendar-importer.c:1245
+msgctxt "iCalImp"
+msgid "Memo"
+msgstr "备忘"
+
+#: ../calendar/importers/icalendar-importer.c:941
+msgctxt "iCalImp"
+msgid "has recurrences"
+msgstr "有再现"
+
+#: ../calendar/importers/icalendar-importer.c:946
+msgctxt "iCalImp"
+msgid "is an instance"
+msgstr "本次和以前各次"
+
+#: ../calendar/importers/icalendar-importer.c:951
+msgctxt "iCalImp"
+msgid "has alarms"
+msgstr "有提醒"
+
+#: ../calendar/importers/icalendar-importer.c:956
+msgctxt "iCalImp"
+msgid "has attachments"
+msgstr "有附件"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:969
+msgctxt "iCalImp"
+msgid "Public"
+msgstr "公开"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:972
+msgctxt "iCalImp"
+msgid "Private"
+msgstr "保密"
+
+#. Translators: Appointment's classification
+#: ../calendar/importers/icalendar-importer.c:975
+msgctxt "iCalImp"
+msgid "Confidential"
+msgstr "机密"
+
+#. Translators: Appointment's classification section name
+#: ../calendar/importers/icalendar-importer.c:979
+msgctxt "iCalImp"
+msgid "Classification"
+msgstr "分类"
+
+#. Translators: Appointment's summary
+#. Translators: Column header for a component summary
+#: ../calendar/importers/icalendar-importer.c:984
+#: ../calendar/importers/icalendar-importer.c:1284
+msgctxt "iCalImp"
+msgid "Summary"
+msgstr "概要"
+
+#. Translators: Appointment's location
+#: ../calendar/importers/icalendar-importer.c:990
+msgctxt "iCalImp"
+msgid "Location"
+msgstr "位置"
+
+#. Translators: Appointment's start time
+#. Translators: Column header for a component start date/time
+#: ../calendar/importers/icalendar-importer.c:998
+#: ../calendar/importers/icalendar-importer.c:1280
+msgctxt "iCalImp"
+msgid "Start"
+msgstr "开始"
+
+#. Translators: 'Due' like the time due a task should be finished
+#: ../calendar/importers/icalendar-importer.c:1009
+msgctxt "iCalImp"
+msgid "Due"
+msgstr "到期"
+
+#. Translators: Appointment's end time
+#: ../calendar/importers/icalendar-importer.c:1021
+msgctxt "iCalImp"
+msgid "End"
+msgstr "结束"
+
+#. Translators: Appointment's categories
+#: ../calendar/importers/icalendar-importer.c:1031
+msgctxt "iCalImp"
+msgid "Categories"
+msgstr "类别"
+
+#. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
+#: ../calendar/importers/icalendar-importer.c:1055
+msgctxt "iCalImp"
+msgid "Completed"
+msgstr "已完成"
+
+#. Translators: Appointment's URL
+#: ../calendar/importers/icalendar-importer.c:1063
+msgctxt "iCalImp"
+msgid "URL"
+msgstr "URL"
+
+#. Translators: Appointment's organizer
+#: ../calendar/importers/icalendar-importer.c:1074
+#: ../calendar/importers/icalendar-importer.c:1077
+msgctxt "iCalImp"
+msgid "Organizer"
+msgstr "组织者"
+
+#. Translators: Appointment's attendees
+#: ../calendar/importers/icalendar-importer.c:1097
+#: ../calendar/importers/icalendar-importer.c:1100
+msgctxt "iCalImp"
+msgid "Attendees"
+msgstr "出席者"
+
+#: ../calendar/importers/icalendar-importer.c:1114
+msgctxt "iCalImp"
+msgid "Description"
+msgstr "描述"
+
+#. Translators: Column header for a component type; it can be Event, Task or Memo
+#: ../calendar/importers/icalendar-importer.c:1276
+msgctxt "iCalImp"
+msgid "Type"
+msgstr "类型"
+
#.
#. *
#. * This program is free software; you can redistribute it and/or
@@ -7898,288 +7734,256 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../composer/e-composer-actions.c:79
-msgid "Untitled Message"
-msgstr "无标题信件"
-
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:163
msgid "Save as..."
msgstr "另存为..."
-#: ../composer/e-composer-actions.c:281
-#: ../widgets/misc/e-attachment-view.c:328
+#: ../composer/e-composer-actions.c:242
+#: ../widgets/misc/e-attachment-view.c:329
msgid "Attach a file"
msgstr "添加附件"
-#: ../composer/e-composer-actions.c:286
+#: ../composer/e-composer-actions.c:247
#: ../widgets/misc/e-signature-editor.c:203
msgid "_Close"
msgstr "关闭(_C)"
-#: ../composer/e-composer-actions.c:288
+#: ../composer/e-composer-actions.c:249
msgid "Close the current file"
msgstr "关闭当前文件"
-#: ../composer/e-composer-actions.c:293
+#: ../composer/e-composer-actions.c:254
msgid "_Print..."
msgstr "打印(_P)..."
-#: ../composer/e-composer-actions.c:300
+#: ../composer/e-composer-actions.c:261
msgid "Print Pre_view"
msgstr "打印预览(_V)"
-#: ../composer/e-composer-actions.c:309
+#: ../composer/e-composer-actions.c:270
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../composer/e-composer-actions.c:314
+#: ../composer/e-composer-actions.c:275
msgid "Save _As..."
msgstr "另存为(_A)..."
-#: ../composer/e-composer-actions.c:316
+#: ../composer/e-composer-actions.c:277
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
-#: ../composer/e-composer-actions.c:321
+#: ../composer/e-composer-actions.c:282
msgid "Save as _Draft"
msgstr "另存为草稿(_D)"
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:284
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:281
+#: ../composer/e-composer-actions.c:289 ../composer/e-composer-private.c:293
msgid "S_end"
msgstr "发送(_E)"
-#: ../composer/e-composer-actions.c:330
+#: ../composer/e-composer-actions.c:291
msgid "Send this message"
msgstr "发送这封信"
-#: ../composer/e-composer-actions.c:335
+#: ../composer/e-composer-actions.c:296
msgid "New _Message"
-msgstr "新建信件(_M)"
+msgstr "新建信息(_M)"
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:298
msgid "Open New Message window"
-msgstr "打开新建信件窗口"
+msgstr "打开新建信息窗口"
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:305
msgid "Character _Encoding"
msgstr "字符编码(_E)"
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:322
msgid "PGP _Encrypt"
msgstr "PGP 加密(_E)"
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:324
msgid "Encrypt this message with PGP"
-msgstr "用 PGP 加密该信件"
+msgstr "用 PGP 加密该信息"
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:330
msgid "PGP _Sign"
msgstr "PGP 签名(_S)"
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:332
msgid "Sign this message with your PGP key"
-msgstr "用您的 PGP 密钥签名该信件"
+msgstr "用您的 PGP 密钥签名该信息"
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:338
msgid "_Prioritize Message"
msgstr "标为优先(_P)"
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:340
msgid "Set the message priority to high"
-msgstr "将信件设定为高优先级"
+msgstr "将信息设定为高优先级"
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:346
msgid "Re_quest Read Receipt"
msgstr "请求阅读收条(_Q)"
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:348
msgid "Get delivery notification when your message is read"
-msgstr "当您的信件被阅读时得到投递通知"
+msgstr "当您的信息被阅读时得到投递通知"
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:354
msgid "S/MIME En_crypt"
msgstr "S/MIME 加密(_C)"
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:356
msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "用您的 S/MIME 加密证书加密该信件"
+msgstr "用您的 S/MIME 加密证书加密该信息"
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:362
msgid "S/MIME Sig_n"
msgstr "S/MIME 签名(_N)"
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:364
msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "用您的 S/MIME 签名认证签名该信件"
+msgstr "用您的 S/MIME 签名认证签名该信息"
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:370
msgid "_Bcc Field"
msgstr "暗送域(_B)"
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:372
msgid "Toggles whether the BCC field is displayed"
msgstr "是否显示暗中转发域"
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:378
msgid "_Cc Field"
msgstr "抄送域(_C)"
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:380
msgid "Toggles whether the CC field is displayed"
msgstr "是否显示转发域"
-#: ../composer/e-composer-actions.c:425
-msgid "_From Field"
-msgstr "发件人域(_F)"
-
-#: ../composer/e-composer-actions.c:427
-msgid "Toggles whether the From chooser is displayed"
-msgstr "是否显示发件人选择器"
-
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:386
msgid "_Reply-To Field"
msgstr "回复域(_R)"
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:388
msgid "Toggles whether the Reply-To field is displayed"
msgstr "是否显示回复域"
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:431
msgid "Save Draft"
msgstr "保存草稿"
-#: ../composer/e-composer-header.c:129
-msgid "Show"
-msgstr "显示"
-
-#: ../composer/e-composer-header.c:137
-msgid "Hide"
-msgstr "隐藏"
-
-#: ../composer/e-composer-header-table.c:42
+#: ../composer/e-composer-header-table.c:41
msgid "Enter the recipients of the message"
-msgstr "输入信件的收件人"
+msgstr "输入信息的收件人"
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "输入将接收该信件副本的收件人地址"
+msgstr "输入将接收该信息副本的收件人地址"
-#: ../composer/e-composer-header-table.c:47
+#: ../composer/e-composer-header-table.c:46
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
"appearing in the recipient list of the message"
-msgstr "输入将接收该信件副本,但不出现在收件人列表中的收件人地址"
+msgstr "输入将接收该信息副本,但不出现在收件人列表中的收件人地址"
-#: ../composer/e-composer-header-table.c:959
+#: ../composer/e-composer-header-table.c:1005
msgid "Fr_om:"
msgstr "发件人(_O):"
-#: ../composer/e-composer-header-table.c:959
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:958
-#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:77
-msgid "From"
-msgstr "发件人"
-
-#: ../composer/e-composer-header-table.c:968
+#: ../composer/e-composer-header-table.c:1014
msgid "_Reply-To:"
msgstr "回复到(_R):"
-#: ../composer/e-composer-header-table.c:973
+#: ../composer/e-composer-header-table.c:1018
msgid "_To:"
msgstr "收信人(_T):"
-#: ../composer/e-composer-header-table.c:979
+#: ../composer/e-composer-header-table.c:1023
msgid "_Cc:"
msgstr "抄送(_C):"
-#: ../composer/e-composer-header-table.c:979 ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "CC"
-
-#: ../composer/e-composer-header-table.c:985
+#: ../composer/e-composer-header-table.c:1028
msgid "_Bcc:"
msgstr "暗送(_B):"
-#: ../composer/e-composer-header-table.c:985 ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "BCC"
-
-#: ../composer/e-composer-header-table.c:990
+#: ../composer/e-composer-header-table.c:1033
msgid "_Post To:"
msgstr "投递到(_P):"
-#: ../composer/e-composer-header-table.c:994
+#: ../composer/e-composer-header-table.c:1037
msgid "S_ubject:"
msgstr "主题(_U):"
-#: ../composer/e-composer-header-table.c:1003
+#: ../composer/e-composer-header-table.c:1046
msgid "Si_gnature:"
msgstr "签名(_G):"
-#: ../composer/e-composer-name-header.c:134
+#: ../composer/e-composer-name-header.c:137
msgid "Click here for the address book"
msgstr "单击此处以使用地址簿"
-#: ../composer/e-composer-post-header.c:116
+#: ../composer/e-composer-post-header.c:126
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../composer/e-composer-private.c:199
+#: ../composer/e-composer-private.c:211
msgid "Undo the last action"
msgstr "撤消上次操作"
-#: ../composer/e-composer-private.c:203
+#: ../composer/e-composer-private.c:215
msgid "Redo the last undone action"
msgstr "重做上次操作"
-#: ../composer/e-composer-private.c:207
+#: ../composer/e-composer-private.c:219
msgid "Search for text"
msgstr "搜索文本"
-#: ../composer/e-composer-private.c:211
+#: ../composer/e-composer-private.c:223
msgid "Search for and replace text"
msgstr "搜索和替换文本"
-#: ../composer/e-composer-private.c:301
+#: ../composer/e-composer-private.c:313
msgid "Save draft"
msgstr "保存草稿"
#. Check buttons
-#: ../composer/e-msg-composer.c:187 ../mail/em-utils.c:149
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../composer/e-msg-composer.c:199
+#: ../plugins/attachment-reminder/attachment-reminder.c:117
msgid "_Do not show this message again."
msgstr "不再显示此信息(_D)。"
-#: ../composer/e-msg-composer.c:983
+#: ../composer/e-msg-composer.c:1029
+#, c-format
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
+msgstr "无法对寄出的信息签名:未对此帐号设置签名证书"
-#: ../composer/e-msg-composer.c:990
+#: ../composer/e-msg-composer.c:1041
+#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
-msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
+msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
-#: ../composer/e-msg-composer.c:1381
-#, fuzzy
+#: ../composer/e-msg-composer.c:1465
msgid "Unable to reconstruct message from autosave file"
-msgstr "无法从编辑器获取信件"
+msgstr "无法从自动保存的文件重建消息"
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:1643
+#: ../composer/e-msg-composer.c:1533 ../composer/e-msg-composer.c:1817
msgid "Compose Message"
-msgstr "撰写新信件"
+msgstr "撰写新信息"
-#: ../composer/e-msg-composer.c:3312
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)</"
-"b>"
-msgstr "<b>(编写器含有不可编辑的非文本信体。)</b>"
+#: ../composer/e-msg-composer.c:3538
+msgid "The composer contains a non-text message body, which cannot be edited."
+msgstr "编写器含有不可编辑的非文本信体。"
+
+#: ../composer/e-msg-composer.c:4144
+msgid "Untitled Message"
+msgstr "无标题信息"
#: ../composer/mail-composer.error.xml.h:1
msgid ""
@@ -8189,13 +7993,13 @@ msgstr "附件正在下载中。发送邮件将使得邮件发送时无法包含
#: ../composer/mail-composer.error.xml.h:2
msgid "All accounts have been removed."
-msgstr "已经删除了全部账户。"
+msgstr "已经删除了全部帐号。"
#: ../composer/mail-composer.error.xml.h:3
msgid ""
"Are you sure you want to discard the message, titled '{0}', you are "
"composing?"
-msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信件吗?"
+msgstr "您确定想要丢弃您正在编写的标题为“{0}”的信息吗?"
#: ../composer/mail-composer.error.xml.h:4
msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -8211,8 +8015,8 @@ msgid ""
"you choose to save the message in your Drafts folder. This will allow you to "
"continue the message at a later date."
msgstr ""
-"关闭此编写窗口将会永久丢弃信件,除非您选择在草稿文件夹中保存这封信。这允许您"
-"在稍后继续编写信件。"
+"关闭此编写窗口将会永久丢弃信息,除非您选择在草稿文件夹中保存这封信。这允许您"
+"在稍后继续编写信息。"
#: ../composer/mail-composer.error.xml.h:7
msgid "Could not create composer window."
@@ -8220,7 +8024,7 @@ msgstr "无法创建撰写器窗口。"
#: ../composer/mail-composer.error.xml.h:8
msgid "Could not create message."
-msgstr "无法创建信件。"
+msgstr "无法创建信息。"
#: ../composer/mail-composer.error.xml.h:9
msgid "Could not read signature file &quot;{0}&quot;."
@@ -8228,7 +8032,7 @@ msgstr "无法读取签名文件“{0}”。"
#: ../composer/mail-composer.error.xml.h:10
msgid "Could not retrieve messages to attach from {0}."
-msgstr "无法从 {0} 获取要附加的信件。"
+msgstr "无法从 {0} 获取要附加的信息。"
#: ../composer/mail-composer.error.xml.h:11
msgid "Could not save to autosave file &quot;{0}&quot;."
@@ -8236,7 +8040,7 @@ msgstr "无法保存到自动保存文件“{0}”。"
#: ../composer/mail-composer.error.xml.h:12
msgid "Do you want to recover unfinished messages?"
-msgstr "您是否想要恢复未完成的信件?"
+msgstr "您是否想要恢复未完成的信息?"
#: ../composer/mail-composer.error.xml.h:13
msgid "Download in progress. Do you want to send the mail?"
@@ -8250,10 +8054,10 @@ msgstr "保存到自动保存出错,原因是“{1}”。"
msgid ""
"Evolution quit unexpectedly while you were composing a new message. "
"Recovering the message will allow you to continue where you left off."
-msgstr "在您上次编写新信件时 Evolution 意外退出。恢复邮件将允许您继续完成。"
+msgstr "在您上次编写新信息时 Evolution 意外退出。恢复邮件将允许您继续完成。"
#: ../composer/mail-composer.error.xml.h:16
-msgid "The file `{0}' is not a regular file and cannot be sent in a message."
+msgid "The file '{0}' is not a regular file and cannot be sent in a message."
msgstr "文件“{0}”不是普通文件,无法在邮件中发送。"
#: ../composer/mail-composer.error.xml.h:17
@@ -8271,8 +8075,8 @@ msgid "Unable to activate the address selector control."
msgstr "无法激活地址选择控制。"
#: ../composer/mail-composer.error.xml.h:21
-msgid "You cannot attach the file `{0}' to this message."
-msgstr "您无法将文件“{0}”作为这封信的附件。"
+msgid "You cannot attach the file n{0}' to this message."
+msgstr "您无法将文件“n{0}”作为这封信的附件。"
#: ../composer/mail-composer.error.xml.h:22
msgid "You need to configure an account before you can compose mail."
@@ -8299,10 +8103,8 @@ msgid "Run Anjal in a window"
msgstr "在新窗口中运行 Anjal"
#: ../capplet/anjal-settings-main.c:200
-#, fuzzy
-#| msgid "Mark as _default memo list"
msgid "Make Anjal the default email client"
-msgstr "标为默认备忘列表(_D)"
+msgstr "将 Anjal 设为默认电子邮件客户端"
#. TRANSLATORS: don't translate the terms in brackets
#: ../capplet/anjal-settings-main.c:207
@@ -8310,287 +8112,278 @@ msgid "ID of the socket to embed in"
msgstr ""
#: ../capplet/anjal-settings-main.c:208
-#, fuzzy
-#| msgid "sort"
msgid "socket"
-msgstr "排序"
+msgstr "套接字"
#: ../capplet/anjal-settings-main.c:221
msgid "Anjal email client"
msgstr "Anjal 邮件客户端"
-#: ../capplet/settings/mail-account-view.c:56
-#, fuzzy
-#| msgid "Please choose another name."
+#: ../capplet/settings/mail-account-view.c:74
msgid "Please enter your full name."
-msgstr "请另选一个名称。"
+msgstr "请输入您的全名。"
-#: ../capplet/settings/mail-account-view.c:57
-#, fuzzy
-#| msgid "Using email address"
+#: ../capplet/settings/mail-account-view.c:75
msgid "Please enter your email address."
-msgstr "使用电子邮件地址"
+msgstr "请输入您的电子邮件地址"
-#: ../capplet/settings/mail-account-view.c:58
+#: ../capplet/settings/mail-account-view.c:76
msgid "The email address you have entered is invalid."
-msgstr ""
+msgstr "您输入的电子邮件地址无效。"
-#: ../capplet/settings/mail-account-view.c:181
-#, fuzzy
-#| msgid "<span weight=\"bold\">Delete Mail</span>"
-msgid "<span size=\"large\" weight=\"bold\">Personal details:</span>"
-msgstr "<span weight=\"bold\">删除邮件</span>"
+#: ../capplet/settings/mail-account-view.c:77
+msgid "Please enter your password."
+msgstr "请输入您的密码。"
-#: ../capplet/settings/mail-account-view.c:186
-#, fuzzy
-#| msgid "_Name:"
+#: ../capplet/settings/mail-account-view.c:256
+#: ../plugins/caldav/caldav-source.c:66
+msgid "CalDAV"
+msgstr "CalDAV"
+
+#: ../capplet/settings/mail-account-view.c:360
+#: ../plugins/google-account-setup/google-contacts-source.c:53
+#: ../plugins/google-account-setup/google-source.c:81
+msgid "Google"
+msgstr "Google"
+
+#: ../capplet/settings/mail-account-view.c:464
+msgid "Personal details:"
+msgstr "个人详细信息:"
+
+#: ../capplet/settings/mail-account-view.c:471
msgid "Name:"
-msgstr "名称(_N):"
+msgstr "名称:"
-#: ../capplet/settings/mail-account-view.c:195
-#, fuzzy
-#| msgid "Email address"
+#: ../capplet/settings/mail-account-view.c:480
msgid "Email address:"
-msgstr "电子邮件地址"
+msgstr "电子邮件地址:"
-#: ../capplet/settings/mail-account-view.c:205
-#, fuzzy
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Receiving details:</span>"
-msgstr "<span weight=\"bold\">常规</span>"
+#: ../capplet/settings/mail-account-view.c:490
+msgid "<span size=\"large\" weight=\"bold\">Details:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">详情:</span>"
-#: ../capplet/settings/mail-account-view.c:210
-#: ../capplet/settings/mail-account-view.c:258
-#, fuzzy
-#| msgid "Server _Type:"
+#: ../capplet/settings/mail-account-view.c:496
+msgid "<span size=\"large\" weight=\"bold\">Receiving</span>"
+msgstr "<span size=\"large\" weight=\"bold\">正在接收</span>"
+
+#: ../capplet/settings/mail-account-view.c:501
msgid "Server type:"
-msgstr "服务器类型(_T):"
+msgstr "服务器类型:"
-#: ../capplet/settings/mail-account-view.c:219
-#: ../capplet/settings/mail-account-view.c:267
-#, fuzzy
-#| msgid "Server Message:"
+#: ../capplet/settings/mail-account-view.c:510
msgid "Server address:"
-msgstr "服务器消息:"
+msgstr "服务器地址:"
-#: ../capplet/settings/mail-account-view.c:228
-#: ../capplet/settings/mail-account-view.c:276
-#, fuzzy
-#| msgid "Us_ername:"
+#: ../capplet/settings/mail-account-view.c:519
msgid "Username:"
-msgstr "用户名(_E):"
+msgstr "用户名:"
-#: ../capplet/settings/mail-account-view.c:237
-#: ../capplet/settings/mail-account-view.c:285
-#, fuzzy
-#| msgid "No encryption"
+#: ../capplet/settings/mail-account-view.c:528
msgid "Use encryption:"
-msgstr "不加密"
+msgstr "使用加密:"
-#: ../capplet/settings/mail-account-view.c:242
-#: ../capplet/settings/mail-account-view.c:290
-#, fuzzy
-#| msgid "Never"
+#: ../capplet/settings/mail-account-view.c:533
+#: ../capplet/settings/mail-account-view.c:566
msgid "never"
msgstr "从不"
-#: ../capplet/settings/mail-account-view.c:253
-#, fuzzy
-#| msgid "<span weight=\"bold\">General</span>"
-msgid "<span size=\"large\" weight=\"bold\">Sending details:</span>"
-msgstr "<span weight=\"bold\">常规</span>"
+#: ../capplet/settings/mail-account-view.c:545
+msgid "<span size=\"large\" weight=\"bold\">Sending</span>"
+msgstr "<span size=\"large\" weight=\"bold\">正在发送</span>"
-#: ../capplet/settings/mail-account-view.c:309
+#: ../capplet/settings/mail-account-view.c:585
msgid ""
"To use the email application you'll need to setup an account. Put your email "
"address and password in below and we'll try and work out all the settings. "
"If we can't do it automatically you'll need your server details as well."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:311
+#: ../capplet/settings/mail-account-view.c:587
msgid ""
"Sorry, we can't work out the settings to get your mail automatically. Please "
"enter them below. We've tried to make a start with the details you just "
"entered but you may need to change them."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:313
+#: ../capplet/settings/mail-account-view.c:589
msgid "You can specify more options to configure the account."
-msgstr ""
+msgstr "您可以指定更多选项以配置此帐号。"
-#: ../capplet/settings/mail-account-view.c:315
+#: ../capplet/settings/mail-account-view.c:591
msgid ""
"Now we need your settings for sending mail. We've tried to make some guesses "
"but you should check them over to make sure."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:316
+#: ../capplet/settings/mail-account-view.c:592
msgid "You can specify your default settings for your account."
-msgstr ""
+msgstr "您可以为您的帐号指定默认设置。"
-#: ../capplet/settings/mail-account-view.c:317
+#: ../capplet/settings/mail-account-view.c:593
msgid ""
"Time to check things over before we try and connect to the server and fetch "
"your mail."
msgstr ""
-#: ../capplet/settings/mail-account-view.c:332
-#: ../mail/em-account-editor.c:2064 ../mail/em-account-editor.c:2196
-#: ../mail/mail-config.ui.h:58
+#: ../capplet/settings/mail-account-view.c:608
+#: ../mail/em-account-editor.c:2098 ../mail/em-account-editor.c:2219
+#: ../mail/mail-config.ui.h:61
msgid "Identity"
msgstr "标识"
-#: ../capplet/settings/mail-account-view.c:332
-#, fuzzy
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:608
msgid "Next - Receiving mail"
-msgstr "接收电子邮件"
+msgstr "前进 - 接收电子邮件"
-#: ../capplet/settings/mail-account-view.c:333
-#, fuzzy
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:609
msgid "Receiving mail"
msgstr "接收电子邮件"
-#: ../capplet/settings/mail-account-view.c:333
-#: ../capplet/settings/mail-account-view.c:334
-#, fuzzy
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:609
+#: ../capplet/settings/mail-account-view.c:610
msgid "Next - Sending mail"
-msgstr "发送电子邮件"
+msgstr "前进 - 发送电子邮件"
-#: ../capplet/settings/mail-account-view.c:333
-#, fuzzy
-#| msgid "Identity"
+#: ../capplet/settings/mail-account-view.c:609
msgid "Back - Identity"
-msgstr "标识"
+msgstr "后退 - 标识"
-#: ../capplet/settings/mail-account-view.c:333
-#, fuzzy
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:609
msgid "Next - Receiving options"
-msgstr "接收选项"
+msgstr "前进 - 接收选项"
-#: ../capplet/settings/mail-account-view.c:334
-#, fuzzy
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:610
msgid "Receiving options"
msgstr "接收选项"
-#: ../capplet/settings/mail-account-view.c:334
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Receiving Email"
+#: ../capplet/settings/mail-account-view.c:610
+#: ../capplet/settings/mail-account-view.c:612
msgid "Back - Receiving mail"
-msgstr "接收电子邮件"
+msgstr "后退 - 接收电子邮件"
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:612
msgid "Sending mail"
msgstr "发送电子邮件"
-#: ../capplet/settings/mail-account-view.c:336
-#: ../capplet/settings/mail-account-view.c:337
-#, fuzzy
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:612
+#: ../capplet/settings/mail-account-view.c:613
msgid "Next - Review account"
-msgstr "删除账户吗?"
+msgstr "前进 - 检查帐号"
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Defaults"
+#: ../capplet/settings/mail-account-view.c:612
msgid "Next - Defaults"
-msgstr "默认"
+msgstr "前进 - 默认值"
-#: ../capplet/settings/mail-account-view.c:336
-#, fuzzy
-#| msgid "Receiving Options"
+#: ../capplet/settings/mail-account-view.c:612
msgid "Back - Receiving options"
-msgstr "接收选项"
+msgstr "后退 - 接收选项"
-#: ../capplet/settings/mail-account-view.c:337
-#: ../mail/em-account-editor.c:2774 ../mail/mail-config.ui.h:31
+#: ../capplet/settings/mail-account-view.c:613
+#: ../mail/em-account-editor.c:2983 ../mail/mail-config.ui.h:34
msgid "Defaults"
-msgstr "默认"
+msgstr "默认值"
-#: ../capplet/settings/mail-account-view.c:337
-#, fuzzy
-#| msgid "Sending Email"
+#: ../capplet/settings/mail-account-view.c:613
msgid "Back - Sending mail"
-msgstr "发送电子邮件"
+msgstr "后退 - 发送电子邮件"
-#: ../capplet/settings/mail-account-view.c:339
-#, fuzzy
-#| msgid "Delete account?"
+#: ../capplet/settings/mail-account-view.c:615
msgid "Review account"
-msgstr "删除账户吗?"
+msgstr "检查帐号"
-#: ../capplet/settings/mail-account-view.c:339
-#, fuzzy
-#| msgid "Fiji"
+#: ../capplet/settings/mail-account-view.c:615
msgid "Finish"
-msgstr "斐济"
+msgstr "完成"
-#: ../capplet/settings/mail-account-view.c:339
-#, fuzzy
-#| msgid "Ascending"
+#: ../capplet/settings/mail-account-view.c:615
msgid "Back - Sending"
-msgstr "升序"
+msgstr "后退 - 发送"
-#: ../capplet/settings/mail-account-view.c:671
-#: ../capplet/settings/mail-settings-view.c:262
-#, fuzzy
-#| msgid "_Close"
+#: ../capplet/settings/mail-account-view.c:719
+msgid "Setup Google contacts with Evolution"
+msgstr "设置 Google 联系人到 Evolution"
+
+#: ../capplet/settings/mail-account-view.c:720
+msgid "Setup Google calendar with Evolution"
+msgstr "添加 Google 日历到 Evolution"
+
+#: ../capplet/settings/mail-account-view.c:725
+msgid "You may need to enable IMAP access."
+msgstr "您可能需要启用 IMAP 访问。"
+
+#: ../capplet/settings/mail-account-view.c:733
+msgid "<span size=\"large\" weight=\"bold\">Google account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Google 帐号设置:</span>"
+
+#: ../capplet/settings/mail-account-view.c:757
+msgid "Setup Yahoo calendar with Evolution"
+msgstr "添加 Yahoo 日历到 Evolution"
+
+#: ../capplet/settings/mail-account-view.c:761
+msgid ""
+"Yahoo calendars are named as firstname_lastname. We have tried to form the "
+"calendar name. So please confirm and re-enter the calendar name if it is not "
+"correct."
+msgstr ""
+
+#: ../capplet/settings/mail-account-view.c:768
+msgid "<span size=\"large\" weight=\"bold\">Yahoo account settings:</span>"
+msgstr "<span size=\"large\" weight=\"bold\">Yahoo 帐号设置:</span>"
+
+#: ../capplet/settings/mail-account-view.c:780
+msgid "Yahoo Calendar name:"
+msgstr "Yahoo 日历名称:"
+
+#: ../capplet/settings/mail-account-view.c:1023
+msgid "Password:"
+msgstr "密码:"
+
+#: ../capplet/settings/mail-account-view.c:1091
+#: ../capplet/settings/mail-settings-view.c:267
msgid "Close Tab"
-msgstr "关闭(_C)"
+msgstr "关闭标签"
-#: ../capplet/settings/mail-account-view.c:681
-#, fuzzy
-#| msgid "Account Editor"
+#: ../capplet/settings/mail-account-view.c:1101
msgid "Account Wizard"
-msgstr "账户编辑器"
+msgstr "帐号向导"
#: ../capplet/settings/mail-capplet-shell.c:208
-#, fuzzy
-#| msgid "Evolution Account Assistant"
msgid "Evolution account assistant"
-msgstr "Evolution 账户助手"
+msgstr "Evolution 帐号助手"
#. create the local source group
-#: ../capplet/settings/mail-capplet-shell.c:338 ../mail/e-mail-migrate.c:2948
-#: ../mail/e-mail-store.c:229 ../mail/em-folder-tree-model.c:150
-#: ../mail/em-folder-tree-model.c:153 ../mail/em-folder-tree-model.c:156
-#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:165
-#: ../mail/em-folder-tree-model.c:167 ../mail/mail-vfolder.c:215
-#: ../mail/message-list.c:1614
+#: ../capplet/settings/mail-capplet-shell.c:342 ../mail/e-mail-migrate.c:664
+#: ../mail/e-mail-store.c:227 ../mail/em-folder-tree-model.c:148
+#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
+#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:165 ../mail/mail-vfolder.c:207
+#: ../mail/message-list.c:1655
#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:121
-#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/addressbook/e-book-shell-migrate.c:130
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-backend.c:134
+#: ../modules/calendar/e-cal-shell-migrate.c:141
#: ../modules/calendar/e-memo-shell-backend.c:108
#: ../modules/calendar/e-memo-shell-migrate.c:102
#: ../modules/calendar/e-task-shell-backend.c:111
-#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/calendar/e-task-shell-migrate.c:111
msgid "On This Computer"
msgstr "在此计算机中"
#: ../capplet/settings/mail-settings-view.c:146
-#: ../plugins/groupwise-features/share-folder.c:747
+#: ../plugins/groupwise-features/share-folder.c:737
msgid "Modify"
msgstr "修改"
#: ../capplet/settings/mail-settings-view.c:148
msgid "Add a new account"
-msgstr "添加新账户"
+msgstr "添加新帐号"
-#: ../capplet/settings/mail-settings-view.c:183
-#, fuzzy
-#| msgid "<span weight=\"bold\">Account Information</span>"
-msgid "<span size=\"large\" weight=\"bold\">Account management</span>"
-msgstr "<span weight=\"bold\">账户信息</span>"
+#: ../capplet/settings/mail-settings-view.c:184
+msgid "Account management"
+msgstr "帐号管理"
-#: ../capplet/settings/mail-settings-view.c:272
+#: ../capplet/settings/mail-settings-view.c:277
msgid "Settings"
msgstr "设置"
@@ -8602,8 +8395,8 @@ msgstr "日历事件信息"
msgid "Evolution Alarm Notify"
msgstr "Evolution 提醒通知"
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:825
-#: ../shell/e-shell-window-private.c:251
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:865
+#: ../shell/e-shell-window-private.c:253
msgid "Evolution"
msgstr "Evolution"
@@ -8621,20 +8414,12 @@ msgstr "配置您的电子邮件,联系人和日程表"
#: ../data/evolution-settings.desktop.in.in.h:1
msgid "Configure email accounts"
-msgstr "配置电子邮件账户"
+msgstr "配置电子邮件帐号"
#: ../data/evolution-settings.desktop.in.in.h:2
msgid "Email Settings"
msgstr "电子邮件设置"
-#: ../data/evolution.keys.in.in.h:1
-msgid "address card"
-msgstr "地址卡"
-
-#: ../data/evolution.keys.in.in.h:2
-msgid "calendar information"
-msgstr "日历信息"
-
#. Translators: This is a cancelled activity.
#: ../e-util/e-activity.c:224
#, c-format
@@ -8659,15 +8444,15 @@ msgstr "%s..."
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
-#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+#: ../e-util/e-alert.c:73 ../e-util/e-alert.c:76
msgid "Evolution Error"
msgstr "Evolution 错误"
-#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+#: ../e-util/e-alert.c:79 ../e-util/e-alert.c:82
msgid "Evolution Warning"
msgstr "Evolution 警告"
-#: ../e-util/e-alert.c:634
+#: ../e-util/e-alert.c:649
#, c-format
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
@@ -8728,33 +8513,37 @@ msgstr "西欧"
msgid "Western European, New"
msgstr "西欧,新"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+#. Translators: Character set "Chinese, Traditional"
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
msgid "Traditional"
msgstr "繁体"
-#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
-#: ../e-util/e-charset.c:91
+#. Translators: Character set "Chinese, Simplified"
+#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
+#: ../e-util/e-charset.c:97
msgid "Simplified"
msgstr "简体"
-#: ../e-util/e-charset.c:94
+#. Translators: Character set "Cyrillic, Ukrainian"
+#: ../e-util/e-charset.c:101
msgid "Ukrainian"
msgstr "乌克兰语"
-#: ../e-util/e-charset.c:97
+#. Translators: Character set "Hebrew, Visual"
+#: ../e-util/e-charset.c:105
msgid "Visual"
msgstr "可视"
#. strftime format of a weekday and a date.
#: ../e-util/e-datetime-format.c:196
-#: ../modules/calendar/e-cal-shell-view-actions.c:1728
-#: ../plugins/itip-formatter/itip-view.c:195
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../plugins/itip-formatter/itip-view.c:191
#: ../widgets/table/e-cell-date-edit.c:311
msgid "Today"
msgstr "今天"
#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:223
+#: ../e-util/e-datetime-format.c:205 ../plugins/itip-formatter/itip-view.c:219
msgid "Tomorrow"
msgstr "明天"
@@ -8762,22 +8551,26 @@ msgstr "明天"
msgid "Yesterday"
msgstr "昨天"
-#: ../e-util/e-datetime-format.c:210
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:211
#, c-format
-msgid "%d days from now"
-msgstr "距现在有 %d 天"
+msgid "%d day from now"
+msgid_plural "%d days from now"
+msgstr[0] "距现在有 %d 天"
-#: ../e-util/e-datetime-format.c:212
+#. Translators: %d is replaced with a number of days. It's always greater than 1
+#: ../e-util/e-datetime-format.c:214
#, c-format
-msgid "%d days ago"
-msgstr "%d 天前"
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天前"
-#: ../e-util/e-datetime-format.c:286 ../e-util/e-datetime-format.c:296
-#: ../e-util/e-datetime-format.c:305
+#: ../e-util/e-datetime-format.c:289 ../e-util/e-datetime-format.c:299
+#: ../e-util/e-datetime-format.c:308
msgid "Use locale default"
msgstr "使用本地默认值"
-#: ../e-util/e-datetime-format.c:499
+#: ../e-util/e-datetime-format.c:502
msgid "Format:"
msgstr "格式:"
@@ -8787,30 +8580,16 @@ msgstr "(未知文件名)"
#. Translators: The string value is the basename of a file.
#: ../e-util/e-file-utils.c:140
-#, fuzzy, c-format
+#, c-format
msgid "Writing \"%s\""
-msgstr "查验 %s"
+msgstr "正在写入 %s"
#. Translators: The first string value is the basename of a
#. * remote file, the second string value is the hostname.
#: ../e-util/e-file-utils.c:145
-#, fuzzy, c-format
+#, c-format
msgid "Writing \"%s\" to %s"
-msgstr "把“%s”复制到 %s"
-
-#: ../e-util/e-logger.c:175
-#, fuzzy
-msgid "Name of the logger"
-msgstr "记录日志的组件名称"
-
-#: ../e-util/e-module.c:188
-msgid "Filename"
-msgstr "文件名"
-
-#: ../e-util/e-module.c:189
-#, fuzzy
-msgid "The filename of the module"
-msgstr "更改此文件夹的名称"
+msgstr "把“%s”写入到 %s"
#: ../e-util/e-non-intrusive-error-dialog.c:194
msgid "Debug Logs"
@@ -8834,13 +8613,15 @@ msgstr "日志消息:"
msgid "Log Level"
msgstr "日志级别"
-#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2687
+#: ../e-util/e-non-intrusive-error-dialog.c:297 ../mail/message-list.c:2741
#: ../mail/message-list.etspec.h:10
msgid "Messages"
-msgstr "信件"
+msgstr "信息"
-#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:110
-#: ../shell/e-shell-window-actions.c:1446
+#: ../e-util/e-non-intrusive-error-dialog.c:306 ../mail/e-mail-browser.c:111
+#: ../shell/e-shell-window-actions.c:1425
+#: ../shell/e-shell-window-actions.c:1432
+#: ../shell/e-shell-window-actions.c:1439
msgid "Close this window"
msgstr "关闭此窗口"
@@ -8864,32 +8645,21 @@ msgstr "调试"
msgid "Error, Warnings and Debug messages"
msgstr "错误,警告和调试信息"
-#: ../e-util/e-plugin.c:295 ../modules/mail/em-composer-prefs.c:469
-#: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:827
-#: ../widgets/misc/e-account-tree-view.c:205
-msgid "Enabled"
-msgstr "已启用"
-
-#: ../e-util/e-plugin.c:296
-msgid "Whether the plugin is enabled"
-msgstr "插件是否已启用"
-
-#: ../e-util/e-plugin-util.c:425 ../filter/filter.ui.h:22
-#: ../plugins/google-account-setup/google-contacts-source.c:334
+#: ../e-util/e-plugin-util.c:426 ../filter/filter.ui.h:22
+#: ../plugins/google-account-setup/google-contacts-source.c:337
#: ../plugins/publish-calendar/publish-calendar.ui.h:33
msgid "weeks"
msgstr "周"
-#: ../e-util/e-print.c:160
+#: ../e-util/e-print.c:161
msgid "An error occurred while printing"
msgstr "打印时发生了错误"
-#: ../e-util/e-print.c:167
+#: ../e-util/e-print.c:168
msgid "The printing system reported the following details about the error:"
msgstr "打印系统报告了下列错误细节:"
-#: ../e-util/e-print.c:173
+#: ../e-util/e-print.c:174
msgid ""
"The printing system did not report any additional details about the error."
msgstr "打印系统未报告关于错误的任何额外细节。"
@@ -8898,7 +8668,7 @@ msgstr "打印系统未报告关于错误的任何额外细节。"
msgid "Autogenerated"
msgstr "自动生成的"
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
+#: ../e-util/e-system.error.xml.h:1
msgid "Because \"{1}\"."
msgstr "原因是“{1}”。"
@@ -8918,226 +8688,233 @@ msgstr "您打算覆盖它吗?"
msgid "File exists \"{0}\"."
msgstr "文件已存在“{0}”。"
-#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:143
+#: ../e-util/e-system.error.xml.h:6 ../mail/mail.error.xml.h:132
msgid "_Overwrite"
msgstr "覆盖(_O)"
-#: ../e-util/e-util.c:140
+#: ../e-util/e-util.c:146
msgid "Could not open the link."
msgstr "无法打开链接。"
-#: ../e-util/e-util.c:190
+#: ../e-util/e-util.c:193
msgid "Could not display help for Evolution."
msgstr "无法显示 Evolution 的帮助。"
-#: ../e-util/gconf-bridge.c:1307
+#: ../e-util/gconf-bridge.c:1281
#, c-format
msgid "GConf error: %s"
msgstr "GConf 错误:%s"
-#: ../e-util/gconf-bridge.c:1318
+#: ../e-util/gconf-bridge.c:1292
msgid "All further errors shown only on terminal."
msgstr "后续所有的错误都只显示在终端。"
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:959
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:937
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
#: ../modules/mail/em-mailer-prefs.c:78
+msgid "From"
+msgstr "发件人"
+
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:938
+#: ../modules/mail/em-mailer-prefs.c:79
msgid "Reply-To"
msgstr "回复至"
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:961
-#: ../mail/em-format-html.c:2247 ../mail/em-format-html.c:2309
-#: ../mail/em-format-html.c:2332 ../modules/mail/em-mailer-prefs.c:80
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:940
+#: ../mail/em-format-html.c:2285 ../mail/em-format-html.c:2347
+#: ../mail/em-format-html.c:2370 ../modules/mail/em-mailer-prefs.c:81
msgid "Cc"
msgstr "抄送"
-#: ../em-format/em-format-quote.c:223 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2313
-#: ../mail/em-format-html.c:2335 ../modules/mail/em-mailer-prefs.c:81
+#: ../em-format/em-format-quote.c:215 ../em-format/em-format.c:941
+#: ../mail/em-format-html.c:2286 ../mail/em-format-html.c:2351
+#: ../mail/em-format-html.c:2373 ../modules/mail/em-mailer-prefs.c:82
msgid "Bcc"
msgstr "密件抄送"
-#: ../em-format/em-format-quote.c:355 ../em-format/em-format.c:963
+#: ../em-format/em-format-quote.c:347 ../em-format/em-format.c:942
#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
-#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:83
+#: ../plugins/groupwise-features/properties.ui.h:6 ../smime/lib/e-cert.c:1140
msgid "Subject"
msgstr "主题"
#. pseudo-header
-#: ../em-format/em-format-quote.c:366 ../mail/em-format-html.c:2429
-#: ../modules/mail/em-mailer-prefs.c:1130
+#: ../em-format/em-format-quote.c:358 ../mail/em-format-html.c:2467
+#: ../modules/mail/em-mailer-prefs.c:1144
msgid "Mailer"
msgstr "邮件程序"
-#: ../em-format/em-format-quote.c:431 ../mail/em-composer-utils.c:1228
+#: ../em-format/em-format-quote.c:423 ../mail/em-composer-utils.c:1190
msgid "-------- Forwarded Message --------"
-msgstr "-------- 转发的信件 --------"
+msgstr "-------- 转发的信息 --------"
-#: ../em-format/em-format.c:964 ../mail/message-list.etspec.h:2
-#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:545
-#: ../widgets/misc/e-dateedit.c:567
+#: ../em-format/em-format.c:943 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:84 ../widgets/misc/e-dateedit.c:524
+#: ../widgets/misc/e-dateedit.c:546
msgid "Date"
msgstr "日期"
-#: ../em-format/em-format.c:965 ../modules/mail/em-mailer-prefs.c:84
+#: ../em-format/em-format.c:944 ../modules/mail/em-mailer-prefs.c:85
msgid "Newsgroups"
msgstr "新闻组"
-#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:85
+#: ../em-format/em-format.c:945 ../modules/mail/em-mailer-prefs.c:86
#: ../plugins/face/org-gnome-face.eplug.xml.h:2
msgid "Face"
msgstr "头像"
-#: ../em-format/em-format.c:1319
+#: ../em-format/em-format.c:1307
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../em-format/em-format.c:1374
+#: ../em-format/em-format.c:1367
msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 S/MIME 信件:未知错误"
+msgstr "无法解析 S/MIME 信息:未知错误"
-#: ../em-format/em-format.c:1512 ../em-format/em-format.c:1674
+#: ../em-format/em-format.c:1522 ../em-format/em-format.c:1696
msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 信件。显示源文本。"
+msgstr "无法解析 MIME 信息。显示源文本。"
-#: ../em-format/em-format.c:1520
+#: ../em-format/em-format.c:1530
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1543
msgid "Could not parse PGP/MIME message"
-msgstr "无法解析 PGP/MIME 信件"
+msgstr "无法解析 PGP/MIME 信息"
-#: ../em-format/em-format.c:1532
+#: ../em-format/em-format.c:1544
msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "无法解析 PGP/MIME 信件:未知错误"
+msgstr "无法解析 PGP/MIME 信息:未知错误"
-#: ../em-format/em-format.c:1698
+#: ../em-format/em-format.c:1720
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1730 ../em-format/em-format.c:1886
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../em-format/em-format.c:1706 ../em-format/em-format.c:1836
-#: ../em-format/em-format.c:1847
+#: ../em-format/em-format.c:1731 ../em-format/em-format.c:1874
+#: ../em-format/em-format.c:1887
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message"
-msgstr "无法分析 PGP 信件"
+#: ../em-format/em-format.c:1967
+msgid "Could not parse PGP message: "
+msgstr "无法解析 PGP 消息:"
-#: ../em-format/em-format.c:1924
-msgid "Could not parse PGP message: Unknown error"
-msgstr "无法解析 PGP 信件:未知错误"
+#: ../em-format/em-format.c:1973 ../plugins/caldav/caldav-browse-server.c:203
+#: ../plugins/caldav/caldav-browse-server.c:1254 ../plugins/face/face.c:169
+#: ../smime/gui/certificate-manager.c:100
+msgid "Unknown error"
+msgstr "未知错误"
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
#, c-format
msgid "1 second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d 秒前"
-#: ../filter/e-filter-datespec.c:71
+#: ../filter/e-filter-datespec.c:74
#, c-format
msgid "1 second in the future"
msgid_plural "%d seconds in the future"
msgstr[0] "%d 秒内"
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
#, c-format
msgid "1 minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟前"
-#: ../filter/e-filter-datespec.c:72
+#: ../filter/e-filter-datespec.c:75
#, c-format
msgid "1 minute in the future"
msgid_plural "%d minutes in the future"
msgstr[0] "%d 分钟内"
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
#, c-format
msgid "1 hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时前"
-#: ../filter/e-filter-datespec.c:73
+#: ../filter/e-filter-datespec.c:76
#, c-format
msgid "1 hour in the future"
msgid_plural "%d hours in the future"
msgstr[0] "%d 小时内"
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
#, c-format
msgid "1 day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../filter/e-filter-datespec.c:74
+#: ../filter/e-filter-datespec.c:77
#, c-format
msgid "1 day in the future"
msgid_plural "%d days in the future"
msgstr[0] "%d 内"
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
#, c-format
msgid "1 week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d 周前"
-#: ../filter/e-filter-datespec.c:75
+#: ../filter/e-filter-datespec.c:78
#, c-format
msgid "1 week in the future"
msgid_plural "%d weeks in the future"
msgstr[0] "%d 周内"
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
#, c-format
msgid "1 month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 个月前"
-#: ../filter/e-filter-datespec.c:76
+#: ../filter/e-filter-datespec.c:79
#, c-format
msgid "1 month in the future"
msgid_plural "%d months in the future"
msgstr[0] "%d 个月内"
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
#, c-format
msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年前"
-#: ../filter/e-filter-datespec.c:77
+#: ../filter/e-filter-datespec.c:80
#, c-format
msgid "1 year in the future"
msgid_plural "%d years in the future"
msgstr[0] "%d 年内"
-#: ../filter/e-filter-datespec.c:116
+#: ../filter/e-filter-datespec.c:119
msgid "<click here to select a date>"
msgstr "<单击此处以选择日期>"
-#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
-#: ../filter/e-filter-datespec.c:141
+#: ../filter/e-filter-datespec.c:122 ../filter/e-filter-datespec.c:133
+#: ../filter/e-filter-datespec.c:144
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:126
+#: ../filter/e-filter-datespec.c:129
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../filter/e-filter-datespec.c:269
+#: ../filter/e-filter-datespec.c:272
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
#: ../filter/e-filter-file.c:184
-#, fuzzy
msgid "Choose a File"
msgstr "选择文件"
@@ -9186,11 +8963,11 @@ msgid "I_nclude threads"
msgstr "包含线索(_N)"
#: ../filter/e-filter-rule.c:1141 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:300
+#: ../mail/em-utils.c:304
msgid "Incoming"
msgstr "接收"
-#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:301
+#: ../filter/e-filter-rule.c:1141 ../mail/em-utils.c:305
msgid "Outgoing"
msgstr "寄出"
@@ -9222,7 +8999,7 @@ msgstr "缺少日期。"
msgid "Missing file name."
msgstr "缺少文件名。"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
msgid "Missing name."
msgstr "缺少名称。"
@@ -9258,21 +9035,21 @@ msgstr "显示邮件过滤器:"
msgid ""
"The message's date will be compared against\n"
"12:00am of the date specified."
-msgstr "信件的日期将会与指定日期的午夜12:00进行比较。"
+msgstr "信息的日期将会与指定日期的午夜12:00进行比较。"
#: ../filter/filter.ui.h:6
msgid ""
"The message's date will be compared against\n"
"a time relative to when filtering occurs."
-msgstr "信件的日期将会在过滤执行时与指定时间进行比较。"
+msgstr "信息的日期将会在过滤执行时与指定时间进行比较。"
#: ../filter/filter.ui.h:8
msgid ""
"The message's date will be compared against\n"
"the current time when filtering occurs."
-msgstr "信件的日期将会在过滤执行时与当前时间进行比较。"
+msgstr "信息的日期将会在过滤执行时与当前时间进行比较。"
-#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:189
msgid "_Filter Rules"
msgstr "过滤规则(_F)"
@@ -9293,7 +9070,7 @@ msgstr "未来"
msgid "months"
msgstr "月"
-#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:185
msgid "seconds"
msgstr "秒"
@@ -9309,44 +9086,27 @@ msgstr "您指定的时间"
msgid "years"
msgstr "年"
-#: ../mail/e-mail-attachment-bar.c:120 ../mail/e-mail-attachment-bar.c:125
-#: ../mail/em-format-html-display.c:1029 ../mail/mail-config.ui.h:13
-#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:148
-#: ../widgets/misc/e-attachment-paned.c:153
+#: ../mail/e-mail-attachment-bar.c:90 ../mail/e-mail-attachment-bar.c:95
+#: ../mail/em-format-html-display.c:1027 ../mail/mail-config.ui.h:15
+#: ../mail/message-list.etspec.h:1 ../widgets/misc/e-attachment-paned.c:118
+#: ../widgets/misc/e-attachment-paned.c:123
msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "附件"
-#: ../mail/e-mail-attachment-bar.c:621
-#: ../widgets/misc/e-attachment-paned.c:612
+#: ../mail/e-mail-attachment-bar.c:586
+#: ../widgets/misc/e-attachment-paned.c:581
msgid "Icon View"
msgstr "图标视图"
-#: ../mail/e-mail-attachment-bar.c:622
-#: ../widgets/misc/e-attachment-paned.c:613
+#: ../mail/e-mail-attachment-bar.c:587
+#: ../widgets/misc/e-attachment-paned.c:582
msgid "List View"
msgstr "列表视图"
-#: ../mail/e-mail-browser.c:769 ../shell/e-shell-window.c:631
-msgid "Focus Tracker"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:779
-#, fuzzy
-msgid "Shell Module"
-msgstr "选择模式"
-
-#: ../mail/e-mail-browser.c:780 ../mail/message-list.c:2580
-msgid "The mail shell backend"
-msgstr ""
-
-#: ../mail/e-mail-browser.c:790
-msgid "Show Deleted"
-msgstr "显示删除的"
-
-#: ../mail/e-mail-browser.c:791
-msgid "Show deleted messages"
-msgstr "显示删除的信件"
+#: ../mail/e-mail-browser.c:266
+msgid "(No Subject)"
+msgstr "(无主题)"
#: ../mail/e-mail-display.c:66
msgid "_Add to Address Book..."
@@ -9361,9 +9121,8 @@ msgid "_From This Address"
msgstr "自此地址(_F)"
#: ../mail/e-mail-display.c:89
-#, fuzzy
msgid "Create Search _Folder"
-msgstr "创建搜索文件夹(_S)"
+msgstr "创建搜索文件夹(_F)"
#: ../mail/e-mail-label-dialog.c:220
msgid "_Label name:"
@@ -9394,7 +9153,7 @@ msgid "_Later"
msgstr "稍候(_L)"
#: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:519
+#: ../modules/mail/e-mail-shell-view-actions.c:478
msgid "Add Label"
msgstr "添加标签"
@@ -9403,7 +9162,6 @@ msgid "Edit Label"
msgstr "编辑标签"
#: ../mail/e-mail-label-manager.c:349
-#, fuzzy
msgid ""
"Note: Underscore in the label name is used\n"
"as mnemonic identifier in menu."
@@ -9413,114 +9171,57 @@ msgstr "注意:标签名中的下划线被用作菜单中的助记符。"
msgid "Color"
msgstr "颜色"
-#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:680 ../mail/em-folder-tree.c:2582
-#: ../modules/mail/e-mail-shell-view-private.c:963
+#: ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1163
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:334
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+msgid "Name"
+msgstr "姓名"
+
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:283
+#: ../mail/em-folder-tree-model.c:700 ../mail/em-folder-tree.c:2759
+#: ../modules/mail/e-mail-shell-view-private.c:959
msgid "Inbox"
msgstr "收件箱"
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:673
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:693
msgid "Drafts"
msgstr "草稿"
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:683
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:703
msgid "Outbox"
msgstr "发件箱"
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:685
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:705
msgid "Sent"
msgstr "已发箱"
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:676
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:696
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:574
+#: ../plugins/templates/templates.c:573
msgid "Templates"
msgstr "模板"
-#: ../mail/e-mail-migrate.c:960 ../mail/em-filter-i18n.h:30
-msgid "Important"
-msgstr "重要"
-
-#. green
-#: ../mail/e-mail-migrate.c:963
-msgid "To Do"
-msgstr "待办"
-
-#. blue
-#: ../mail/e-mail-migrate.c:964
-msgid "Later"
-msgstr "稍候"
-
-#: ../mail/e-mail-migrate.c:1110
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../mail/e-mail-migrate.c:131
msgid "Migrating..."
msgstr "正在升迁..."
-#: ../mail/e-mail-migrate.c:1143
+#: ../mail/e-mail-migrate.c:164
msgid "Migration"
msgstr "迁移"
-#: ../mail/e-mail-migrate.c:1183
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../mail/e-mail-migrate.c:204
#, c-format
msgid "Migrating '%s':"
msgstr "升迁“%s”:"
-#: ../mail/e-mail-migrate.c:1594
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "无法创建新文件夹“%s”:%s"
-
-#: ../mail/e-mail-migrate.c:1622
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "无法将文件夹“%s”复制为“%s”:%s"
-
-#: ../mail/e-mail-migrate.c:1817
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "无法扫描位于“%s”的已有邮箱:%s"
-
-#: ../mail/e-mail-migrate.c:1823 ../mail/e-mail-migrate.c:2932
+#: ../mail/e-mail-migrate.c:649
msgid "Migrating Folders"
msgstr "迁移文件夹"
-#: ../mail/e-mail-migrate.c:1824
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#: ../mail/e-mail-migrate.c:2027
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
-
-#: ../mail/e-mail-migrate.c:2043
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
-
-#: ../mail/e-mail-migrate.c:2075
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
-
-#: ../mail/e-mail-migrate.c:2546 ../mail/e-mail-migrate.c:2560
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "创建本地邮件存储“%s”失败:%s"
-
-#: ../mail/e-mail-migrate.c:2933
+#: ../mail/e-mail-migrate.c:650
msgid ""
"The summary format of the Evolution mailbox folders has been moved to SQLite "
"since Evolution 2.24.\n"
@@ -9531,25 +9232,16 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../mail/e-mail-migrate.c:3030
+#: ../mail/e-mail-migrate.c:739
#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
+msgid "Unable to create local mail folders at '%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/e-mail-migrate.c:3048
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
-"坏。"
-
#. XXX e-error should provide a widget layout and API suitable
#. * for packing additional widgets to the right of the alert
#. * icon. But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:105
-#: ../modules/calendar/e-task-shell-view-actions.c:559
+#: ../mail/e-mail-reader-utils.c:109
+#: ../modules/calendar/e-task-shell-view-actions.c:570
msgid "Do not ask me again"
msgstr "不要再次询问"
@@ -9557,7 +9249,7 @@ msgstr "不要再次询问"
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:264 ../mail/em-folder-utils.c:402
msgid "C_opy"
msgstr "复制(_O)"
@@ -9565,7 +9257,7 @@ msgstr "复制(_O)"
msgid "Move to Folder"
msgstr "移至文件夹"
-#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:385
+#: ../mail/e-mail-reader.c:638 ../mail/em-folder-utils.c:402
msgid "_Move"
msgstr "移动(_M)"
@@ -9580,10 +9272,7 @@ msgstr[0] "保存信息"
#. * Subject. The extension ".mbox" is appended to this
#. * string, thus it will be something like "Message.mbox"
#. * at the end.
-#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:518
-#, fuzzy
-#| msgid "Message"
+#: ../mail/e-mail-reader.c:885 ../plugins/groupwise-features/properties.ui.h:4
msgid "Message"
msgid_plural "Messages"
msgstr[0] "消息"
@@ -9602,7 +9291,7 @@ msgstr "检查垃圾信(_J)"
#: ../mail/e-mail-reader.c:1152
msgid "Filter the selected messages for junk status"
-msgstr "把选中的信件标记为垃圾邮件"
+msgstr "把选中的信息标记为垃圾邮件"
#: ../mail/e-mail-reader.c:1157
msgid "_Copy to Folder..."
@@ -9610,15 +9299,15 @@ msgstr "复制到文件夹(_C)..."
#: ../mail/e-mail-reader.c:1159
msgid "Copy selected messages to another folder"
-msgstr "把选中的信件复制到其它文件夹"
+msgstr "把选中的信息复制到其它文件夹"
#: ../mail/e-mail-reader.c:1164
msgid "_Delete Message"
-msgstr "删除信件(_D)"
+msgstr "删除信息(_D)"
#: ../mail/e-mail-reader.c:1166
msgid "Mark the selected messages for deletion"
-msgstr "为选中信件做删除标记"
+msgstr "为选中信息做删除标记"
#: ../mail/e-mail-reader.c:1171
msgid "Filter on Mailing _List..."
@@ -9626,7 +9315,7 @@ msgstr "根据邮件列表过滤(_L)..."
#: ../mail/e-mail-reader.c:1173
msgid "Create a rule to filter messages to this mailing list"
-msgstr "创建可过滤寄往此邮件列表的信件的规则"
+msgstr "创建可过滤寄往此邮件列表的信息的规则"
#: ../mail/e-mail-reader.c:1178
msgid "Filter on _Recipients..."
@@ -9634,7 +9323,7 @@ msgstr "根据收件人过滤(_R)..."
#: ../mail/e-mail-reader.c:1180
msgid "Create a rule to filter messages to these recipients"
-msgstr "创建可过滤寄往这些收件人的信件的规则"
+msgstr "创建可过滤寄往这些收件人的信息的规则"
#: ../mail/e-mail-reader.c:1185
msgid "Filter on Se_nder..."
@@ -9642,7 +9331,7 @@ msgstr "根据发件人过滤(_N)..."
#: ../mail/e-mail-reader.c:1187
msgid "Create a rule to filter messages from this sender"
-msgstr "创建可过滤此人寄来的信件的规则"
+msgstr "创建可过滤此人寄来的信息的规则"
#: ../mail/e-mail-reader.c:1192
msgid "Filter on _Subject..."
@@ -9650,7 +9339,7 @@ msgstr "根据主题过滤(_S)..."
#: ../mail/e-mail-reader.c:1194
msgid "Create a rule to filter messages with this subject"
-msgstr "创建可过滤此主题信件的规则"
+msgstr "创建可过滤此主题信息的规则"
#: ../mail/e-mail-reader.c:1199
msgid "A_pply Filters"
@@ -9658,42 +9347,39 @@ msgstr "应用过滤规则(_P)"
#: ../mail/e-mail-reader.c:1201
msgid "Apply filter rules to the selected messages"
-msgstr "应用过滤规则到选中的信件"
+msgstr "应用过滤规则到选中的信息"
#: ../mail/e-mail-reader.c:1206
msgid "_Find in Message..."
-msgstr "在信件中查找(_F)..."
+msgstr "在信息中查找(_F)..."
#: ../mail/e-mail-reader.c:1208
msgid "Search for text in the body of the displayed message"
-msgstr "在显示信件的主体中搜索文本"
+msgstr "在显示信息的主体中搜索文本"
#: ../mail/e-mail-reader.c:1213
msgid "_Clear Flag"
msgstr "清除标志(_C)"
#: ../mail/e-mail-reader.c:1215
-#, fuzzy
msgid "Remove the follow-up flag from the selected messages"
-msgstr "取消选中信件的删除"
+msgstr "删除选中信息的跟随标志"
#: ../mail/e-mail-reader.c:1220
msgid "_Flag Completed"
msgstr "标志为已完成(_F)"
#: ../mail/e-mail-reader.c:1222
-#, fuzzy
msgid "Set the follow-up flag to completed on the selected messages"
-msgstr "把同一线索中的所有信件选择为选中信件"
+msgstr "设置选中信息的跟随标志为已完成"
#: ../mail/e-mail-reader.c:1227
msgid "Follow _Up..."
msgstr "跟随(_U)..."
#: ../mail/e-mail-reader.c:1229
-#, fuzzy
msgid "Flag the selected messages for follow-up"
-msgstr "为选中信件做跟随标志"
+msgstr "为选中信息添加跟随标志"
#: ../mail/e-mail-reader.c:1234
msgid "_Attached"
@@ -9701,12 +9387,11 @@ msgstr "附件(_A)"
#: ../mail/e-mail-reader.c:1236 ../mail/e-mail-reader.c:1243
msgid "Forward the selected message to someone as an attachment"
-msgstr "把选中信件作为附件转发给某人"
+msgstr "把选中信息作为附件转发给某人"
#: ../mail/e-mail-reader.c:1241
-#, fuzzy
msgid "Forward As _Attached"
-msgstr "作为 iCalendar 转发(_F)"
+msgstr "作为附件转发(_A)"
#: ../mail/e-mail-reader.c:1248
msgid "_Inline"
@@ -9714,12 +9399,11 @@ msgstr "嵌入(_I)"
#: ../mail/e-mail-reader.c:1250 ../mail/e-mail-reader.c:1257
msgid "Forward the selected message in the body of a new message"
-msgstr "在新信体中转发选中信件"
+msgstr "在新信体中转发选中信息"
#: ../mail/e-mail-reader.c:1255
-#, fuzzy
msgid "Forward As _Inline"
-msgstr "转发方式(_F):"
+msgstr "嵌入正文转发(_I)"
#: ../mail/e-mail-reader.c:1262
msgid "_Quoted"
@@ -9727,20 +9411,19 @@ msgstr "引用(_Q)"
#: ../mail/e-mail-reader.c:1264 ../mail/e-mail-reader.c:1271
msgid "Forward the selected message quoted like a reply"
-msgstr "以类似于回复的引用方式转发选中的信件"
+msgstr "以类似于回复的引用方式转发选中的信息"
#: ../mail/e-mail-reader.c:1269
-#, fuzzy
msgid "Forward As _Quoted"
-msgstr "转发方式(_F):"
+msgstr "作文引用转发(_Q)"
#: ../mail/e-mail-reader.c:1276
msgid "_Load Images"
-msgstr "装入图像(_L)"
+msgstr "载入图像(_L)"
#: ../mail/e-mail-reader.c:1278
msgid "Force images in HTML mail to be loaded"
-msgstr "强制装入 HTML 邮件中的图像"
+msgstr "强制载入 HTML 邮件中的图像"
#: ../mail/e-mail-reader.c:1283
msgid "_Important"
@@ -9748,7 +9431,7 @@ msgstr "重要(_I)"
#: ../mail/e-mail-reader.c:1285
msgid "Mark the selected messages as important"
-msgstr "把选中信件标记为重要邮件"
+msgstr "把选中信息标记为重要邮件"
#: ../mail/e-mail-reader.c:1290
msgid "_Junk"
@@ -9756,7 +9439,7 @@ msgstr "垃圾(_J)"
#: ../mail/e-mail-reader.c:1292
msgid "Mark the selected messages as junk"
-msgstr "把选中信件标记为垃圾邮件"
+msgstr "把选中信息标记为垃圾邮件"
#: ../mail/e-mail-reader.c:1297
msgid "_Not Junk"
@@ -9764,7 +9447,7 @@ msgstr "非垃圾(_N)"
#: ../mail/e-mail-reader.c:1299
msgid "Mark the selected messages as not being junk"
-msgstr "把选中信件标记为非垃圾邮件"
+msgstr "把选中信息标记为非垃圾邮件"
#: ../mail/e-mail-reader.c:1304
msgid "_Read"
@@ -9772,7 +9455,7 @@ msgstr "读取(_R)"
#: ../mail/e-mail-reader.c:1306
msgid "Mark the selected messages as having been read"
-msgstr "把选中信件标记为已读"
+msgstr "把选中信息标记为已读"
#: ../mail/e-mail-reader.c:1311
msgid "Uni_mportant"
@@ -9780,7 +9463,7 @@ msgstr "不重要(_M)"
#: ../mail/e-mail-reader.c:1313
msgid "Mark the selected messages as unimportant"
-msgstr "把选中信件标记为不重要邮件"
+msgstr "把选中信息标记为不重要邮件"
#: ../mail/e-mail-reader.c:1318
msgid "_Unread"
@@ -9788,23 +9471,23 @@ msgstr "未读(_U)"
#: ../mail/e-mail-reader.c:1320
msgid "Mark the selected messages as not having been read"
-msgstr "把选中信件标记为未读"
+msgstr "把选中信息标记为未读"
#: ../mail/e-mail-reader.c:1325
msgid "_Edit as New Message..."
-msgstr "作为新信件进行编辑(_E)..."
+msgstr "作为新信息进行编辑(_E)..."
#: ../mail/e-mail-reader.c:1327
msgid "Open the selected messages in the composer for editing"
-msgstr "在撰写器中打开选中的信件以便编辑"
+msgstr "在撰写器中打开选中的信息以便编辑"
#: ../mail/e-mail-reader.c:1332
msgid "Compose _New Message"
-msgstr "撰写新信件(_N)"
+msgstr "撰写新信息(_N)"
#: ../mail/e-mail-reader.c:1334
msgid "Open a window for composing a mail message"
-msgstr "打开窗口以撰写信件"
+msgstr "打开窗口以撰写信息"
#: ../mail/e-mail-reader.c:1339
msgid "_Open in New Window"
@@ -9812,7 +9495,7 @@ msgstr "在新窗口中打开(_O)"
#: ../mail/e-mail-reader.c:1341
msgid "Open the selected messages in a new window"
-msgstr "在新窗口中打开选中的信件"
+msgstr "在新窗口中打开选中的信息"
#: ../mail/e-mail-reader.c:1346
msgid "_Move to Folder..."
@@ -9820,7 +9503,7 @@ msgstr "移至文件夹(_M)..."
#: ../mail/e-mail-reader.c:1348
msgid "Move selected messages to another folder"
-msgstr "把选中的信件移至其它文件夹"
+msgstr "把选中的信息移至其它文件夹"
#: ../mail/e-mail-reader.c:1353
msgid "_Next Message"
@@ -9828,15 +9511,15 @@ msgstr "下一封信(_N)"
#: ../mail/e-mail-reader.c:1355
msgid "Display the next message"
-msgstr "显示下一封信件"
+msgstr "显示下一封信息"
#: ../mail/e-mail-reader.c:1360
msgid "Next _Important Message"
-msgstr "下一封重要信件(_I)"
+msgstr "下一封重要信息(_I)"
#: ../mail/e-mail-reader.c:1362
msgid "Display the next important message"
-msgstr "显示下一封重要信件"
+msgstr "显示下一封重要信息"
#: ../mail/e-mail-reader.c:1367
msgid "Next _Thread"
@@ -9848,11 +9531,11 @@ msgstr "显示下一条线索"
#: ../mail/e-mail-reader.c:1374
msgid "Next _Unread Message"
-msgstr "下一封未读信件(_U)"
+msgstr "下一封未读信息(_U)"
#: ../mail/e-mail-reader.c:1376
msgid "Display the next unread message"
-msgstr "显示下一封未读信件"
+msgstr "显示下一封未读信息"
#: ../mail/e-mail-reader.c:1381
msgid "_Previous Message"
@@ -9860,31 +9543,31 @@ msgstr "上一封信(_P)"
#: ../mail/e-mail-reader.c:1383
msgid "Display the previous message"
-msgstr "显示上一封信件"
+msgstr "显示上一封信息"
#: ../mail/e-mail-reader.c:1388
msgid "Pr_evious Important Message"
-msgstr "上一封重要信件(_E)"
+msgstr "上一封重要信息(_E)"
#: ../mail/e-mail-reader.c:1390
msgid "Display the previous important message"
-msgstr "显示上一封重要信件"
+msgstr "显示上一封重要信息"
#: ../mail/e-mail-reader.c:1395
msgid "P_revious Unread Message"
-msgstr "上一封未读信件(_R)"
+msgstr "上一封未读信息(_R)"
#: ../mail/e-mail-reader.c:1397
msgid "Display the previous unread message"
-msgstr "显示上一封未读信件"
+msgstr "显示上一封未读信息"
#: ../mail/e-mail-reader.c:1404
msgid "Print this message"
-msgstr "打印该信件"
+msgstr "打印该信息"
#: ../mail/e-mail-reader.c:1411
msgid "Preview the message to be printed"
-msgstr "预览要打印的信件"
+msgstr "预览要打印的信息"
#: ../mail/e-mail-reader.c:1416
msgid "Re_direct"
@@ -9892,18 +9575,17 @@ msgstr "重发(_D)"
#: ../mail/e-mail-reader.c:1418
msgid "Redirect (bounce) the selected message to someone"
-msgstr "将选中信件重发(退回)给某人"
+msgstr "将选中信息重发(退回)给某人"
#: ../mail/e-mail-reader.c:1423
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
-#: ../modules/mail/e-mail-attachment-handler.c:141
+#: ../modules/calendar/e-cal-shell-view-actions.c:1459
+#: ../modules/mail/e-mail-attachment-handler.c:139
msgid "Reply to _All"
msgstr "回复所有人(_A)"
#: ../mail/e-mail-reader.c:1425
-#, fuzzy
msgid "Compose a reply to all the recipients of the selected message"
-msgstr "为选中信件的所有收件人撰写回复"
+msgstr "为选中信息的所有收件人撰写回复"
#: ../mail/e-mail-reader.c:1430
msgid "Reply to _List"
@@ -9911,42 +9593,38 @@ msgstr "回复邮件列表(_L)"
#: ../mail/e-mail-reader.c:1432
msgid "Compose a reply to the mailing list of the selected message"
-msgstr "为选中信件的邮件列表撰写回复"
+msgstr "为选中信息的邮件列表撰写回复"
#: ../mail/e-mail-reader.c:1437
-#: ../modules/mail/e-mail-attachment-handler.c:148
+#: ../modules/mail/e-mail-attachment-handler.c:146
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
#: ../mail/e-mail-reader.c:1439
msgid "Compose a reply to the sender of the selected message"
-msgstr "为选中信件的发件人撰写回复"
+msgstr "为选中信息的发件人撰写回复"
#: ../mail/e-mail-reader.c:1444
-#, fuzzy
msgid "_Save as mbox..."
-msgstr "另存为..."
+msgstr "另存为 mbox 格式(_S)..."
#: ../mail/e-mail-reader.c:1446
-#, fuzzy
msgid "Save selected messages as an mbox file"
-msgstr "把选中信件另存为文本文件"
+msgstr "把选中信息另存为 mbox 格式文件"
#: ../mail/e-mail-reader.c:1451
msgid "Search Folder from Mailing _List..."
msgstr "基于邮件列表的搜索文件夹(_L)..."
#: ../mail/e-mail-reader.c:1453
-#, fuzzy
msgid "Create a search folder for this mailing list"
-msgstr "为该邮件列表创建搜索文件夹"
+msgstr "为此邮件列表创建搜索文件夹"
#: ../mail/e-mail-reader.c:1458
msgid "Search Folder from Recipien_ts..."
msgstr "基于收件人的搜索文件夹(_T)..."
#: ../mail/e-mail-reader.c:1460
-#, fuzzy
msgid "Create a search folder for these recipients"
msgstr "为这些收件人创建搜索文件夹"
@@ -9955,7 +9633,6 @@ msgid "Search Folder from Sen_der..."
msgstr "基于发件人的搜索文件夹(_D)..."
#: ../mail/e-mail-reader.c:1467
-#, fuzzy
msgid "Create a search folder for this sender"
msgstr "为该发件人创建搜索文件夹"
@@ -9964,25 +9641,24 @@ msgid "Search Folder from S_ubject..."
msgstr "基于主题的搜索文件夹(_U)..."
#: ../mail/e-mail-reader.c:1474
-#, fuzzy
msgid "Create a search folder for this subject"
msgstr "为该主题创建搜索文件夹"
#: ../mail/e-mail-reader.c:1479
msgid "_Message Source"
-msgstr "信件源代码(_M)"
+msgstr "信息源代码(_M)"
#: ../mail/e-mail-reader.c:1481
msgid "Show the raw email source of the message"
-msgstr "显示信件的原始邮件源代码"
+msgstr "显示信息的原始邮件源代码"
#: ../mail/e-mail-reader.c:1493
msgid "_Undelete Message"
-msgstr "取消删除信件(_U)"
+msgstr "取消删除信息(_U)"
#: ../mail/e-mail-reader.c:1495
msgid "Undelete the selected messages"
-msgstr "取消选中信件的删除"
+msgstr "取消选中信息的删除"
#: ../mail/e-mail-reader.c:1500
msgid "_Normal Size"
@@ -10030,7 +9706,7 @@ msgstr "标记为(_K)"
#: ../mail/e-mail-reader.c:1558
msgid "_Message"
-msgstr "信件(_M)"
+msgstr "信息(_M)"
#: ../mail/e-mail-reader.c:1565
msgid "_Zoom"
@@ -10070,7 +9746,7 @@ msgstr "光标模式(_C)"
#: ../mail/e-mail-reader.c:1656
msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "在显示信件的信体中显示闪烁光标"
+msgstr "在显示信息的信体中显示闪烁光标"
#: ../mail/e-mail-reader.c:1662
msgid "All Message _Headers"
@@ -10080,53 +9756,52 @@ msgstr "全部信头(_H)"
msgid "Show messages with all email headers"
msgstr "显示邮件时显示所有信头"
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1885
msgid "Unable to retrieve message"
-msgstr "无法获取信件"
+msgstr "无法获取信息"
-#: ../mail/e-mail-reader.c:1900 ../mail/e-mail-reader.c:1957
-#: ../mail/mail-ops.c:1849
-#, fuzzy, c-format
+#: ../mail/e-mail-reader.c:1945 ../mail/mail-ops.c:1891
+#, c-format
msgid "Retrieving message '%s'"
-msgstr "收取信件 %s"
+msgstr "收取信息 %s"
#. we changed user, thus reset the chosen calendar combo too, because
#. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2471
-#: ../plugins/google-account-setup/google-source.c:304
-#: ../plugins/google-account-setup/google-source.c:534
-#: ../plugins/google-account-setup/google-source.c:656
+#: ../mail/e-mail-reader.c:2461 ../mail/mail-config.ui.h:31
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:537
+#: ../plugins/google-account-setup/google-source.c:659
#: ../widgets/misc/e-account-tree-view.c:234
msgid "Default"
msgstr "默认"
-#: ../mail/e-mail-reader.c:2592
-#: ../modules/mail/e-mail-attachment-handler.c:134
+#: ../mail/e-mail-reader.c:2601
+#: ../modules/mail/e-mail-attachment-handler.c:132
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/e-mail-reader.c:2593
+#: ../mail/e-mail-reader.c:2602
msgid "Forward the selected message to someone"
-msgstr "把选中信件转发给某人"
+msgstr "把选中信息转发给某人"
-#: ../mail/e-mail-reader.c:2637 ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:753
+#: ../mail/e-mail-reader.c:2647 ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:743
msgid "Delete"
msgstr "删除"
-#: ../mail/e-mail-reader.c:2641
-#: ../modules/calendar/e-cal-shell-view-actions.c:1251
+#: ../mail/e-mail-reader.c:2655
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
#: ../widgets/misc/e-calendar.c:193
msgid "Next"
msgstr "下一项"
-#: ../mail/e-mail-reader.c:2645
-#: ../modules/calendar/e-cal-shell-view-actions.c:1244
+#: ../mail/e-mail-reader.c:2659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
#: ../widgets/misc/e-calendar.c:169
msgid "Previous"
msgstr "上一项"
-#: ../mail/e-mail-reader.c:2649 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2669 ../mail/mail-dialogs.ui.h:19
msgid "Reply"
msgstr "回复"
@@ -10136,33 +9811,33 @@ msgstr "跟随的标志"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. It will not use an encrypted connection.
-#: ../mail/em-account-editor.c:499 ../mail/mail-config.ui.h:72
-#: ../modules/addressbook/ldap-config.ui.h:10
+#: ../mail/em-account-editor.c:508 ../mail/mail-config.ui.h:75
+#: ../modules/addressbook/ldap-config.ui.h:9
msgid "No encryption"
msgstr "不加密"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. TLS (Transport Layer Security) is commonly known by
#. this abbreviation.
-#: ../mail/em-account-editor.c:503 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../mail/em-account-editor.c:512 ../mail/mail-config.ui.h:131
+#: ../modules/addressbook/ldap-config.ui.h:20
msgid "TLS encryption"
msgstr "TLS 加密"
#. Translators: This string is a "Use secure connection" option for
#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
#. abbreviation.
-#: ../mail/em-account-editor.c:507 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../mail/em-account-editor.c:516 ../mail/mail-config.ui.h:100
+#: ../modules/addressbook/ldap-config.ui.h:12
msgid "SSL encryption"
msgstr "SSL 加密"
-#: ../mail/em-account-editor.c:594
+#: ../mail/em-account-editor.c:603
#, c-format
msgid "%s License Agreement"
msgstr "%s 许可协议"
-#: ../mail/em-account-editor.c:601
+#: ../mail/em-account-editor.c:610
#, c-format
msgid ""
"\n"
@@ -10175,38 +9850,34 @@ msgstr ""
"并选中复选框表明您接受该协议\n"
#. Translators: "None" as an option for a default signature of an account, part of "Signature: None"
-#: ../mail/em-account-editor.c:881 ../widgets/misc/e-signature-combo-box.c:75
-#, fuzzy
-#| msgid "None"
+#: ../mail/em-account-editor.c:897 ../widgets/misc/e-signature-combo-box.c:75
msgctxt "mail-signature"
msgid "None"
msgstr "无"
-#: ../mail/em-account-editor.c:965
+#: ../mail/em-account-editor.c:981
msgid "Never"
msgstr "从不"
-#: ../mail/em-account-editor.c:966
+#: ../mail/em-account-editor.c:982
msgid "Always"
msgstr "总是"
-#: ../mail/em-account-editor.c:967
+#: ../mail/em-account-editor.c:983
msgid "Ask for each message"
msgstr "每封信都询问"
#. Translators: "None" for receiving account type, beside of IMAP, POP3, ...
-#: ../mail/em-account-editor.c:1704 ../widgets/misc/e-account-tree-view.c:124
-#, fuzzy
-#| msgid "None"
+#: ../mail/em-account-editor.c:1720 ../widgets/misc/e-account-tree-view.c:124
msgctxt "mail-receiving"
msgid "None"
msgstr "无"
-#: ../mail/em-account-editor.c:2061
+#: ../mail/em-account-editor.c:2095
msgid "Mail Configuration"
msgstr "邮件配置"
-#: ../mail/em-account-editor.c:2062
+#: ../mail/em-account-editor.c:2096
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -10216,7 +9887,7 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/em-account-editor.c:2065
+#: ../mail/em-account-editor.c:2099
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 "
@@ -10225,20 +9896,20 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../mail/em-account-editor.c:2067 ../mail/em-account-editor.c:2233
-#: ../mail/mail-config.ui.h:90
+#: ../mail/em-account-editor.c:2101 ../mail/em-account-editor.c:2258
+#: ../mail/mail-config.ui.h:93
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:2068
+#: ../mail/em-account-editor.c:2102
msgid "Please configure the following account settings."
msgstr "请配置下列帐户设置。"
-#: ../mail/em-account-editor.c:2070 ../mail/em-account-editor.c:2710
+#: ../mail/em-account-editor.c:2104 ../mail/em-account-editor.c:2738
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2071
+#: ../mail/em-account-editor.c:2105
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -10246,23 +9917,23 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: ../mail/em-account-editor.c:2073
+#: ../mail/em-account-editor.c:2107
msgid "Account Management"
-msgstr "账户管理"
+msgstr "帐号管理"
-#: ../mail/em-account-editor.c:2074
+#: ../mail/em-account-editor.c:2108
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
msgstr ""
-"请在下面的空白处输入此账户的描述性名称。\n"
+"请在下面的空白处输入此帐号的描述性名称。\n"
"此名称将只在显示时使用。"
-#: ../mail/em-account-editor.c:2078
+#: ../mail/em-account-editor.c:2112
msgid "Done"
msgstr "完成"
-#: ../mail/em-account-editor.c:2079
+#: ../mail/em-account-editor.c:2113
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -10276,57 +9947,52 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: ../mail/em-account-editor.c:2520
+#: ../mail/em-account-editor.c:2554
msgid "Check for _new messages every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2528
+#: ../mail/em-account-editor.c:2562
msgid "minu_tes"
msgstr "分钟(_T)"
-#: ../mail/em-account-editor.c:2836 ../mail/mail-config.ui.h:100
+#: ../mail/em-account-editor.c:2836
+msgid "Please select a folder from the current account."
+msgstr "请从当前帐号选择一个文件夹。"
+
+#: ../mail/em-account-editor.c:3106 ../mail/mail-config.ui.h:107
msgid "Security"
msgstr "安全"
#. Most sections for this is auto-generated from the camel config
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2881 ../mail/em-account-editor.c:2949
+#: ../mail/em-account-editor.c:3151 ../mail/em-account-editor.c:3219
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2882 ../mail/em-account-editor.c:2950
+#: ../mail/em-account-editor.c:3152 ../mail/em-account-editor.c:3220
msgid "Checking for New Messages"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:3418
-msgid "Account Editor"
-msgstr "账户编辑器"
-
-#: ../mail/em-account-editor.c:3418
-msgid "Evolution Account Assistant"
-msgstr "Evolution 账户助手"
-
#. Translators: First %s is an email address, second %s is the subject of the email, third %s is the date
-#: ../mail/em-composer-utils.c:1578
+#: ../mail/em-composer-utils.c:1539
#, c-format
msgid "Your message to %s about \"%s\" on %s has been read."
msgstr ""
#. Translators: %s is the subject of the email message
-#: ../mail/em-composer-utils.c:1626
-#, fuzzy, c-format
-#| msgid "Mail Notification Properties"
+#: ../mail/em-composer-utils.c:1587
+#, c-format
msgid "Delivery Notification for: \"%s\""
-msgstr "邮件通知属性"
+msgstr "邮件通知:%s"
-#: ../mail/em-composer-utils.c:1950
+#: ../mail/em-composer-utils.c:1918
msgid "an unknown sender"
msgstr "未知发件人"
#. Note to translators: this is the attribution string used when quoting messages.
#. * each ${Variable} gets replaced with a value. To see a full list of available
#. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1997
+#: ../mail/em-composer-utils.c:1965
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10334,19 +10000,19 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
-#: ../mail/em-composer-utils.c:2141
+#: ../mail/em-composer-utils.c:2109
msgid "-----Original Message-----"
-msgstr "-------- 原始信件 --------"
+msgstr "-------- 原始信息 --------"
-#: ../mail/em-composer-utils.c:2322
+#: ../mail/em-composer-utils.c:2289
msgid "Posting destination"
msgstr "投递目的"
-#: ../mail/em-composer-utils.c:2323
+#: ../mail/em-composer-utils.c:2290
msgid "Choose folders to post the message to."
-msgstr "选择要将信件投递到哪个文件夹。"
+msgstr "选择要将信息投递到哪个文件夹。"
-#: ../mail/em-filter-folder-element.c:258
+#: ../mail/em-filter-folder-element.c:260
msgid "Select Folder"
msgstr "选择文件夹"
@@ -10363,10 +10029,18 @@ msgstr "分配颜色"
msgid "Assign Score"
msgstr "分配计分"
+#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "BCC"
+
#: ../mail/em-filter-i18n.h:7
msgid "Beep"
msgstr "响铃"
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
#: ../mail/em-filter-i18n.h:9
msgid "Completed On"
msgstr "完成于"
@@ -10427,6 +10101,10 @@ msgstr "跟随"
msgid "Forward to"
msgstr "转发至"
+#: ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "重要"
+
#: ../mail/em-filter-i18n.h:32
msgid "is after"
msgstr "之后"
@@ -10451,7 +10129,7 @@ msgstr "未设置"
msgid "is set"
msgstr "已设置"
-#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:64
msgid "Junk"
msgstr "垃圾"
@@ -10489,7 +10167,7 @@ msgstr "不是垃圾邮件"
#: ../mail/em-filter-i18n.h:50
msgid "Message Location"
-msgstr "信件位置"
+msgstr "信息位置"
#: ../mail/em-filter-i18n.h:52
msgid "Pipe to Program"
@@ -10500,7 +10178,7 @@ msgid "Play Sound"
msgstr "播放声音"
#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:18
msgid "Read"
msgstr "已读"
@@ -10562,7 +10240,7 @@ msgstr "发音类似"
#: ../mail/em-filter-i18n.h:69
msgid "Source Account"
-msgstr "来源账户"
+msgstr "来源帐号"
#: ../mail/em-filter-i18n.h:70
msgid "Specific header"
@@ -10581,39 +10259,39 @@ msgid "Unset Status"
msgstr "取消状态"
#. and now for the action area
-#: ../mail/em-filter-rule.c:530
+#: ../mail/em-filter-rule.c:533
msgid "Then"
msgstr "然后"
-#: ../mail/em-filter-rule.c:561
+#: ../mail/em-filter-rule.c:564
msgid "Add Ac_tion"
msgstr "添加动作(_T)"
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:174
+#: ../mail/em-folder-properties.c:126
msgid "Unread messages:"
msgid_plural "Unread messages:"
-msgstr[0] "未读信件数:"
+msgstr[0] "未读信息数:"
#. TODO: can this be done in a loop?
#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:178
+#: ../mail/em-folder-properties.c:130
msgid "Total messages:"
msgid_plural "Total messages:"
-msgstr[0] "总信件数:"
+msgstr[0] "总信息数:"
-#: ../mail/em-folder-properties.c:196
+#: ../mail/em-folder-properties.c:148
#, c-format
msgid "Quota usage (%s):"
msgstr "配额使用(%s):"
-#: ../mail/em-folder-properties.c:198
+#: ../mail/em-folder-properties.c:150
#, c-format
msgid "Quota usage"
msgstr "配额使用"
-#: ../mail/em-folder-properties.c:399
-#: ../plugins/groupwise-features/properties.ui.h:4
+#: ../mail/em-folder-properties.c:288
+#: ../plugins/groupwise-features/properties.ui.h:3
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -10621,32 +10299,32 @@ msgstr "文件夹属性"
msgid "<click here to select a folder>"
msgstr "<单击此处以选择文件夹>"
-#: ../mail/em-folder-selector.c:266
+#: ../mail/em-folder-selector.c:264
msgid "C_reate"
msgstr "创建(_R)"
-#: ../mail/em-folder-selector.c:270
+#: ../mail/em-folder-selector.c:268
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
#. load store to mail component
-#: ../mail/em-folder-tree-model.c:151 ../mail/em-folder-tree-model.c:154
-#: ../mail/em-folder-tree-model.c:160 ../mail/em-folder-tree-model.c:162
-#: ../mail/em-folder-tree-model.c:169 ../mail/em-folder-tree-model.c:171
-#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
+#: ../mail/em-folder-tree-model.c:149 ../mail/em-folder-tree-model.c:152
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
+#: ../mail/em-folder-tree-model.c:167 ../mail/em-folder-tree-model.c:169
+#: ../mail/mail-vfolder.c:1061 ../mail/mail-vfolder.c:1126
msgid "Search Folders"
msgstr "搜索文件夹"
#. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:174 ../mail/em-folder-tree-model.c:176
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:748 ../mail/em-folder-tree-model.c:1085
+#: ../mail/em-folder-tree-model.c:768 ../mail/em-folder-tree-model.c:1111
msgid "Loading..."
-msgstr "正在装入..."
+msgstr "正在载入..."
-#: ../mail/em-folder-tree.c:188
+#: ../mail/em-folder-tree.c:184
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
@@ -10673,134 +10351,135 @@ msgstr "文件夹名不能含有字符“/”"
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:1083
-#, fuzzy, c-format
+#: ../mail/em-folder-tree.c:1084
+#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
-msgstr "%s (%u)"
+msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1289
+#: ../mail/em-folder-tree.c:1318
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:1489 ../mail/em-folder-utils.c:99
+#: ../mail/em-folder-tree.c:1623 ../mail/em-folder-utils.c:92
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:1491 ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-tree.c:1625 ../mail/em-folder-utils.c:94
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:1498 ../mail/message-list.c:2100
+#: ../mail/em-folder-tree.c:1632 ../mail/message-list.c:2153
#, c-format
msgid "Moving messages into folder %s"
-msgstr "把信件移至文件夹 %s"
+msgstr "把信息移至文件夹 %s"
-#: ../mail/em-folder-tree.c:1500 ../mail/message-list.c:2102
+#: ../mail/em-folder-tree.c:1634 ../mail/message-list.c:2155
#, c-format
msgid "Copying messages into folder %s"
-msgstr "把信件复制到文件夹 %s"
+msgstr "把信息复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:1515
+#: ../mail/em-folder-tree.c:1650
+#, c-format
msgid "Cannot drop message(s) into toplevel store"
-msgstr "无法将信件放到顶级文件夹存储"
+msgstr "无法将信息放到顶级文件夹存储"
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
msgid "Move Folder To"
msgstr "移动文件夹到"
-#: ../mail/em-folder-utils.c:386
+#: ../mail/em-folder-utils.c:403
msgid "Copy Folder To"
msgstr "复制文件夹到"
-#: ../mail/em-folder-utils.c:507
-#: ../plugins/groupwise-features/share-folder-common.c:141
+#: ../mail/em-folder-utils.c:533
+#: ../plugins/groupwise-features/share-folder-common.c:136
#, c-format
-msgid "Creating folder `%s'"
+msgid "Creating folder '%s'"
msgstr "创建文件夹“%s”"
-#: ../mail/em-folder-utils.c:670
+#: ../mail/em-folder-utils.c:693
msgid "Create Folder"
msgstr "创建文件夹"
-#: ../mail/em-folder-utils.c:671
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../mail/em-folder-utils.c:694
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-utils.c:687
+#: ../mail/em-folder-utils.c:714
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "无法退订文件夹“%s”"
-#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1540
+#: ../mail/em-format-html-display.c:90 ../mail/em-format-html.c:1571
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:103
+#: ../mail/em-format-html-display.c:90
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
-msgstr "此信件未签名。无法保证这封信是可信的。"
+msgstr "此信息未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1541
+#: ../mail/em-format-html-display.c:91 ../mail/em-format-html.c:1572
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:104
+#: ../mail/em-format-html-display.c:91
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
-msgstr "此信件已签名,而且签名是有效的。这意味着这封信应该是可信的。"
+msgstr "此信息已签名,而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1542
+#: ../mail/em-format-html-display.c:92 ../mail/em-format-html.c:1573
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:105
+#: ../mail/em-format-html-display.c:92
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1543
+#: ../mail/em-format-html-display.c:93 ../mail/em-format-html.c:1574
msgid "Valid signature, but cannot verify sender"
msgstr "签名有效,但是无法校验发送者"
-#: ../mail/em-format-html-display.c:106
+#: ../mail/em-format-html-display.c:93
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
-#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1544
+#: ../mail/em-format-html-display.c:94 ../mail/em-format-html.c:1575
msgid "Signature exists, but need public key"
msgstr "签名已存在,但需要公钥"
-#: ../mail/em-format-html-display.c:107
+#: ../mail/em-format-html-display.c:94
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
msgstr "这封信的签名有效,但是没有相应的公钥。"
-#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1550
+#: ../mail/em-format-html-display.c:101 ../mail/em-format-html.c:1581
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:114
+#: ../mail/em-format-html-display.c:101
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1551
+#: ../mail/em-format-html-display.c:102 ../mail/em-format-html.c:1582
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:115
+#: ../mail/em-format-html-display.c:102
msgid ""
"This message is encrypted, but with a weak encryption algorithm. It would be "
"difficult, but not impossible for an outsider to view the content of this "
@@ -10809,21 +10488,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1552
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1583
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:116
+#: ../mail/em-format-html-display.c:103
msgid ""
"This message is encrypted. It would be difficult for an outsider to view "
"the content of this message."
msgstr "这封信已加密。外人要想查看这封信的内容十分困难。"
-#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1553
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1584
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:117
+#: ../mail/em-format-html-display.c:104
msgid ""
"This message is encrypted, with a strong encryption algorithm. It would be "
"very difficult for an outsider to view the content of this message in a "
@@ -10832,15 +10511,15 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
+#: ../mail/em-format-html-display.c:235 ../smime/gui/smime-ui.ui.h:46
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:261
+#: ../mail/em-format-html-display.c:248
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:509
+#: ../mail/em-format-html-display.c:497
msgid ""
"Evolution cannot render this email as it is too large to process. You can "
"view it unformatted or with an external text editor."
@@ -10848,126 +10527,144 @@ msgstr ""
"Evolution 无法渲染此电子邮件,原因是该邮件太大。您可以以无格式方式查看该邮"
"件,或者使用外部文本编辑器查看。"
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:725
msgid "Completed on"
msgstr "完成于"
-#: ../mail/em-format-html-display.c:746
+#: ../mail/em-format-html-display.c:733
msgid "Overdue:"
msgstr "延期:"
#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:750
+#: ../mail/em-format-html-display.c:737
msgid "by"
msgstr ""
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html-display.c:1001
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html-display.c:999
msgid "View _Unformatted"
msgstr "无格式查看(_U)"
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:954
msgid "Hide _Unformatted"
msgstr "无格式隐藏(_U)"
-#: ../mail/em-format-html-display.c:1021
+#: ../mail/em-format-html-display.c:1019
msgid "O_pen With"
msgstr "打开方式(_P)"
-#: ../mail/em-format-html-print.c:163
+#: ../mail/em-format-html-print.c:162
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/em-format-html.c:165
+#: ../mail/em-format-html.c:151
msgid "Formatting message"
-msgstr "格式化信件"
+msgstr "格式化信息"
-#: ../mail/em-format-html.c:356
+#: ../mail/em-format-html.c:347
msgid "Formatting Message..."
-msgstr "正在格式化信件..."
+msgstr "正在格式化信息..."
-#: ../mail/em-format-html.c:1386 ../mail/em-format-html.c:1395
+#: ../mail/em-format-html.c:1416 ../mail/em-format-html.c:1425
#, c-format
-msgid "Retrieving `%s'"
+msgid "Retrieving '%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:1859
+#: ../mail/em-format-html.c:1896
msgid "Unknown external-body part."
msgstr "未知的 external-body 部分。"
-#: ../mail/em-format-html.c:1867
+#: ../mail/em-format-html.c:1904
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1934
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:1908
+#: ../mail/em-format-html.c:1945
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:1910
+#: ../mail/em-format-html.c:1947
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1968
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:1942
+#: ../mail/em-format-html.c:1979
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
#. To translators: This message suggests to the receipients that the sender of the mail is
#. different from the one listed in From field.
-#.
-#: ../mail/em-format-html.c:2602
+#: ../mail/em-format-html.c:2642
+#, c-format
+msgid "This message was sent by %s on behalf of %s"
+msgstr "此消息由 %s 代表 %s 的身份发送"
+
+#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
+#: ../mail/em-html-stream.c:122
#, c-format
-msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
-msgstr "此消息由 <b>%s</b> 以 <b>%s</b> 的身份发送"
+msgid "No HTML stream available"
+msgstr "没有可用的 HTML 流。"
-#: ../mail/em-subscribe-editor.c:586
+#: ../mail/em-subscribe-editor.c:677
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此存储不支持订阅,或订阅未启用。"
-#: ../mail/em-subscribe-editor.c:619
+#: ../mail/em-subscribe-editor.c:728
msgid "Subscribed"
msgstr "已订阅"
-#: ../mail/em-subscribe-editor.c:623
+#: ../mail/em-subscribe-editor.c:732
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:1120
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:871
+#: ../mail/em-subscribe-editor.c:1166
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:310
+#. Translators: This message is shown only for ten or more messages to be opened.
+#. The %d is replaced with the actual count of messages. If you need a '%' in your text,
+#. then write it doubled, like '%%'.
+#: ../mail/em-utils.c:106
+#, c-format
+msgid "Are you sure you want to open %d messages at once?"
+msgid_plural "Are you sure you want to open %d messages at once?"
+msgstr[0] "您确定要一次打开 %d 封信吗?"
+
+#: ../mail/em-utils.c:152
+#: ../modules/mailto-handler/evolution-mailto-handler.c:146
+msgid "_Do not show this message again"
+msgstr "不再显示此信息(_D)"
+
+#: ../mail/em-utils.c:314
msgid "Message Filters"
msgstr "邮件过滤器"
-#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:814
+#: ../mail/em-utils.c:848
#, c-format
msgid "Messages from %s"
-msgstr "来自 %s 的信件"
+msgstr "来自 %s 的信息"
#: ../mail/em-vfolder-editor.c:126
msgid "Search _Folders"
msgstr "搜索文件夹(_F)"
-#: ../mail/em-vfolder-rule.c:522
+#: ../mail/em-vfolder-rule.c:525
msgid "Add Folder"
msgstr "添加文件夹"
@@ -11008,138 +10705,134 @@ msgid "\"Send and Receive Mail\" window width"
msgstr "“发送和接收邮件”窗口宽度"
#: ../mail/evolution-mail.schemas.in.h:10
-msgid "Allows Evolution to display text part of limited size"
-msgstr "允许 Evolution 显示被限制大小的文本部分"
-
-#: ../mail/evolution-mail.schemas.in.h:11
msgid "Always request read receipt"
msgstr "总是请求阅读收条"
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Automatic emoticon recognition"
msgstr "自动识别表情图标"
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:13
msgid "Automatic link recognition"
msgstr "自动识别链接"
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Check incoming mail being junk"
msgstr "检查收到的邮件是否是垃圾邮件"
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Citation highlight color"
msgstr "引用突出颜色"
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:16
msgid "Citation highlight color."
msgstr "引用突出颜色。"
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:17
msgid "Composer Window default height"
msgstr "编写窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:18
msgid "Composer Window default width"
msgstr "编写窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:19
msgid "Composer load/attach directory"
msgstr "撰写器加载/附件目录"
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:20
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "压缩 TO/CC/BCC 中地址的显示"
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:21
msgid ""
"Compress display of addresses in TO/CC/BCC to the number specified in "
"address_count."
msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:22
msgid ""
"Controls how frequently local changes are synchronized with the remote mail "
"server. The interval must be at least 30 seconds."
msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Custom headers to use while checking for junk."
msgstr "自定义用以检查垃圾邮件的信头。"
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:24
msgid ""
"Custom headers to use while checking for junk. The list elements are string "
"in the format \"headername=value\"."
msgstr "自定义用以检查垃圾邮件的信头。列表元素的字符串格式为“信头名=值”。"
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:25
msgid "Default charset in which to compose messages"
-msgstr "编写信件的默认字符集"
+msgstr "编写信息的默认字符集"
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:26
msgid "Default charset in which to compose messages."
-msgstr "编写信件的默认字符集。"
+msgstr "编写信息的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:27
msgid "Default charset in which to display messages"
-msgstr "显示信件的默认字符集"
+msgstr "显示信息的默认字符集"
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:28
msgid "Default charset in which to display messages."
-msgstr "显示信件的默认字符集。"
+msgstr "显示信息的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:29
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:30
msgid "Default height of the Composer Window."
msgstr "撰写窗口的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:31
msgid "Default height of the mail browser window."
msgstr "邮件浏览器窗口的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:32
msgid "Default height of the subscribe dialog."
msgstr "订阅对话框的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:33
msgid "Default maximized state of the mail browser window."
msgstr "邮件浏览器窗口的默认最大化状态。"
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:34
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:35
msgid "Default value for thread expand state"
msgstr "话题的默认展开状态"
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Default width of the Composer Window."
msgstr "撰写窗口的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:37
msgid "Default width of the mail browser window."
msgstr "邮件浏览器窗口的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:38
msgid "Default width of the subscribe dialog."
msgstr "订阅对话框的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:39
msgid ""
"Determines whether to look up addresses for junk filtering in local address "
"book only"
msgstr "决定是否仅在本地地址簿中查找地址进行垃圾邮件过滤"
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:40
msgid "Determines whether to lookup in address book for sender email"
msgstr "决定是否在地址簿中查找发件人电子邮件"
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:41
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 "
@@ -11150,11 +10843,11 @@ msgstr ""
"为自动补全的地址簿中查找,如果远程地址簿(如 LDAP)被标记为自动补全的话,可能会"
"比较慢。"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:42
msgid "Determines whether to use custom headers to check for junk"
msgstr "决定是否使用自定义信头检测垃圾邮件"
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:43
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 "
@@ -11163,28 +10856,31 @@ msgstr ""
"决定是否使用自定义信头检测垃圾邮件。如果此选项被启用且信头被设置的话,将提高"
"垃圾邮件检测速度。"
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:44
msgid ""
"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
"lines in the \"Messages\" column in vertical view."
-msgstr "决定是否在垂直视图中对“信件”列的“来自”和“主题”行使用相同的字体。"
+msgstr "决定是否在垂直视图中对“信息”列的“来自”和“主题”行使用相同的字体。"
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "Directory for loading/attaching files to composer."
msgstr "邮件写作器用来加载/附加文件的目录"
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "Directory for saving mail component files."
msgstr "保存邮件组件文件的目录。"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "Disable or enable ellipsizing of folder names in side bar"
msgstr "禁用或启用侧边栏中文件夹名的省略显示"
+#: ../mail/evolution-mail.schemas.in.h:48
+msgid "Display only message texts not exceeding certain size"
+msgstr ""
+
#: ../mail/evolution-mail.schemas.in.h:49
-#, fuzzy
msgid "Do not add signature delimiter"
-msgstr "无法保存签名文件。"
+msgstr "不添加签名分隔符"
#: ../mail/evolution-mail.schemas.in.h:50
msgid "Draw spelling error indicators on words as you type."
@@ -11221,9 +10917,8 @@ msgid "Enable or disable magic space bar"
msgstr "启用或禁用魔术空格键"
#: ../mail/evolution-mail.schemas.in.h:58
-#, fuzzy
msgid "Enable or disable the prompt whilst marking multiple messages."
-msgstr "禁用/启用对多封邮件的标记。"
+msgstr "禁用/启用对多封邮件标记时的提示。"
#: ../mail/evolution-mail.schemas.in.h:59
msgid "Enable or disable type ahead search feature"
@@ -11250,18 +10945,29 @@ msgid ""
msgstr "启用以在消息预览、消息列表和文件夹中使用空格键。"
#: ../mail/evolution-mail.schemas.in.h:64
-msgid "Enable to render message text part of limited size."
-msgstr "允许渲染被限制大小的信件文本部分。"
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
#: ../mail/evolution-mail.schemas.in.h:65
+msgid "Enable to use a similar message list view settings for all folders"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:66
+#, fuzzy
+msgid "Enable to use a similar message list view settings for all folders."
+msgstr "启用以在消息预览、消息列表和文件夹中使用空格键。"
+
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
+#: ../mail/evolution-mail.schemas.in.h:68 ../mail/mail-config.ui.h:48
msgid "Encode file names in an Outlook/GMail way"
msgstr "使用 Outlook/Gmail 的方式编码文件名"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:69
msgid ""
"Encode file names in the mail headers same as Outlook or GMail do, to let "
"them display correctly file names with UTF-8 letters sent by Evolution, "
@@ -11269,25 +10975,29 @@ msgid ""
"standard."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:70
+msgid "Flush Outbox after filtering"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Height of the message-list pane"
-msgstr "信件列表面板的高度"
+msgstr "信息列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Height of the message-list pane."
-msgstr "信件列表面板的高度。"
+msgstr "信息列表面板的高度。"
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Hides the per-folder preview and removes the selection"
msgstr "隐藏单文件夹预览并移除选择"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:74
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 "如果用户试图一次打开的信件大于等于十封,将会询问用户是否真的要这么做。"
+msgstr "如果用户试图一次打开的信息大于等于十封,将会询问用户是否真的要这么做。"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:75
#, fuzzy
msgid ""
"If there isn't a builtin viewer for a particular MIME type inside Evolution, "
@@ -11298,25 +11008,25 @@ msgstr ""
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:76
msgid ""
"Initial height of the \"Filter Editor\" window. The value updates as the "
"user resizes the window vertically."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:77
msgid ""
"Initial height of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window vertically."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:78
msgid ""
"Initial height of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window vertically."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:79
msgid ""
"Initial maximize state of the \"Filter Editor\" window. The value updates "
"when the user maximizes or unmaximizes the window. Note, this particular "
@@ -11324,7 +11034,7 @@ msgid ""
"maximized. This key exists only as an implementation detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:80
msgid ""
"Initial maximize state of the \"Search Folder Editor\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11332,7 +11042,7 @@ msgid ""
"window cannot be maximized. This key exists only as an implementation detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:81
msgid ""
"Initial maximize state of the \"Send and Receive Mail\" window. The value "
"updates when the user maximizes or unmaximizes the window. Note, this "
@@ -11341,78 +11051,77 @@ msgid ""
"detail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:82
msgid ""
"Initial width of the \"Filter Editor\" window. The value updates as the user "
"resizes the window horizontally."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:83
msgid ""
"Initial width of the \"Search Folder Editor\" window. The value updates as "
"the user resizes the window horizontally."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:84
msgid ""
"Initial width of the \"Send and Receive Mail\" window. The value updates as "
"the user resizes the window horizontally."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:85
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 "
"the search results."
msgstr ""
-"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信件时不断弹出的提示。"
+"禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信息时不断弹出的提示。"
-#: ../mail/evolution-mail.schemas.in.h:83
-msgid "Last time empty junk was run"
-msgstr "上次清空垃圾邮件的时间"
+#: ../mail/evolution-mail.schemas.in.h:86
+msgid "Last time Empty Junk was run"
+msgstr "上次清空垃圾邮件的时间为:"
-#: ../mail/evolution-mail.schemas.in.h:84
-msgid "Last time empty trash was run"
-msgstr "上次清空回收站的时间"
+#: ../mail/evolution-mail.schemas.in.h:87
+msgid "Last time Empty Trash was run"
+msgstr "上次清空回收站的时间为:"
-#: ../mail/evolution-mail.schemas.in.h:85
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Layout style"
-msgstr "马约特岛"
+msgstr "布局样式"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "List of MIME types to check for Bonobo component viewers"
msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "List of accounts"
-msgstr "账户列表"
+msgstr "帐号列表"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:94
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
msgstr ""
-"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
+"列出了 Evolution 邮件组件已知的帐号。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "List of dictionary language codes used for spell checking."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:97
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."
@@ -11420,377 +11129,368 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:98
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Load images for HTML messages over HTTP"
-msgstr "在 HTML 信件中装入 HTTP 图像"
+msgstr "在 HTML 信息中载入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:100
msgid ""
"Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
"Never load images off the net. \"1\" - Load images in messages from "
"contacts. \"2\" - Always load images off the net."
msgstr ""
-"在 HTML 信件中装入 HTTP(S) 图像。可供选择的值有:0 - 绝不从网上装入图像,1 - "
-"如果发送者在地址簿中则装入图像,2 - 总是从网上装入图像。"
+"在 HTML 信息中载入 HTTP(S) 图像。可供选择的值有:0 - 绝不从网上载入图像,1 - "
+"如果发送者在地址簿中则载入图像,2 - 总是从网上载入图像。"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Mail browser height"
msgstr "邮件浏览器高度"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Mail browser maximized"
msgstr "邮件浏览器最大化"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Mail browser width"
msgstr "邮件浏览器宽度"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Mark citations in the message \"Preview\""
-msgstr "在信件“预览”中标出引用"
+msgstr "在信息“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Mark citations in the message \"Preview\"."
-msgstr "在信件“预览”中标出引用。"
+msgstr "在信息“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Message text limit for display"
+msgstr "信息文本显示限制"
+
+#: ../mail/evolution-mail.schemas.in.h:113
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
-msgstr "信件显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
+msgstr "信息显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Minimum days between emptying the junk on exit"
-msgstr "退出时清空垃圾信件的最少天数"
+msgstr "退出时清空垃圾信息的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:115
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:116
msgid "Minimum time between emptying the junk on exit, in days."
-msgstr "退出时清空垃圾信件的最少时间,以天计。"
+msgstr "退出时清空垃圾信息的最少时间,以天计。"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:121
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Prompt when deleting messages in search folder"
-msgstr "删除搜索文件夹中的信件时提示"
+msgstr "删除搜索文件夹中的信息时提示"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:126
msgid ""
"Prompt when user tries to send HTML mail to recipients that may not want to "
"receive HTML mail."
msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Prompt while marking multiple messages"
-msgstr "标记多封信件时提示"
+msgstr "标记多封信息时提示"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Put personalized signatures at the top of replies"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:131
#, fuzzy
msgid "Put the cursor at the bottom of replies"
msgstr "回复时在底部开始打字(_T)"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Recognize emoticons in text and replace them with images."
msgstr "识别文本中的表情,并将其替换为图像。"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "Run junk test on incoming mail."
msgstr "对收到的邮件运行垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "Save directory"
msgstr "保存目录"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Search for the sender photo in local address books"
msgstr "在本地地址薄中搜索发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "Sender email-address column in the message list"
-msgstr "在信件列表中显示 email 地址列"
+msgstr "在信息列表中显示 email 地址列"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "Server synchronization interval"
msgstr "服务器同步间隔"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:141
msgid ""
"Set to TRUE in case you do not want to add signature delimiter before your "
"signature when composing a mail."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:142
msgid "Show \"Bcc\" field when sending a mail message"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:143
msgid "Show \"Cc\" field when sending a mail message"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "Show \"From\" field when posting to a newsgroup"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:141
-msgid "Show \"From\" field when sending a mail message"
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:145
msgid "Show \"Reply To\" field when posting to a newsgroup"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:146
#, fuzzy
msgid "Show \"Reply To\" field when sending a mail message"
msgstr "当发送加密邮件时也对自身加密(_F)"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:147
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.h:145
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "Show all message headers"
-msgstr "折叠全部信件线索"
+msgstr "显示全部信息头"
-#: ../mail/evolution-mail.schemas.in.h:146
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:149
msgid "Show all the headers when viewing a messages."
-msgstr "选中信件中的全部文本"
+msgstr "查看消息时显示全部信息头。"
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "在信件列表中显示删除了的信件(带有删除线)。"
+msgstr "在信息列表中显示删除了的信息(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "Show deleted messages in the message-list"
-msgstr "在信件列表中显示删除了的信件"
+msgstr "在信息列表中显示删除了的信息"
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "Show image animations"
msgstr "显示图像动画"
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "Show original \"Date\" header value."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "Show photo of the sender"
msgstr "显示发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:156
msgid ""
"Show the \"Bcc\" field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:157
msgid ""
"Show the \"Cc\" field when sending a mail message. This is controlled from "
"the View menu when a mail account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:158
msgid ""
"Show the \"From\" field when posting to a newsgroup. This is controlled from "
"the View menu when a news account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:156
-msgid ""
-"Show the \"From\" field when sending a mail message. This is controlled from "
-"the View menu when a mail account is chosen."
-msgstr ""
-
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:159
msgid ""
"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
"from the View menu when a news account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:160
msgid ""
"Show the \"Reply To\" field when sending a mail message. This is controlled "
"from the View menu when a mail account is chosen."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:161
msgid ""
"Show the email-address of the sender in a separate column in the message "
"list."
-msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
+msgstr "在信息列表的以另外的列显示电子邮件的发送者。"
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:162
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 ""
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Show the photo of the sender in the message reading pane."
-msgstr "在信件阅读面板中显示发件人照片。"
+msgstr "在信息阅读面板中显示发件人照片。"
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:165
msgid "Spell checking color"
msgstr "拼写检查颜色"
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:166
msgid "Spell checking languages"
msgstr "拼写检查语言"
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:167
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:168
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:169
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "Text message part limit"
-msgstr "文本信件部分限制"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "The default plugin for Junk hook"
-msgstr "默认的垃圾信件钩子插件"
-
#: ../mail/evolution-mail.schemas.in.h:170
-msgid "The last time empty junk was run, in days since the epoch."
-msgstr "上次清空垃圾信件的时间,以自新纪元后的天数显示。"
+msgid "The default plugin for Junk hook"
+msgstr "默认的垃圾信息钩子插件"
#: ../mail/evolution-mail.schemas.in.h:171
-msgid "The last time empty trash was run, in days since the epoch."
-msgstr "上次清空回收站的时间,以新纪元后的天数显示。"
+msgid ""
+"The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
+msgstr "上次清空垃圾信息的时间,以自新纪元后的天数显示。"
#: ../mail/evolution-mail.schemas.in.h:172
msgid ""
+"The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
+msgstr "上次清空回收站的时间,以新纪元后的天数显示。"
+
+#: ../mail/evolution-mail.schemas.in.h:173
+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 "
"message list. \"1\" (Vertical View) places the preview pane next to the "
"message list."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:174
msgid "The terminal font for mail display."
msgstr "邮件显示用的终端字体。"
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:175
msgid "The variable width font for mail display."
msgstr "用于显示邮件的变宽字体。"
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:176
msgid ""
"This can have three possible values. \"0\" for errors. \"1\" for warnings. "
"\"2\" for debug messages."
msgstr "此选项有三种可能值:0-错误,1-警告,2-调试信息。"
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:177
#, fuzzy
msgid ""
-"This decides the max size of the text part that can be formatted under "
-"Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
msgstr ""
"此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB,单位"
"为 KB。"
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:178
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 "
@@ -11799,7 +11499,7 @@ msgstr ""
"这是默认的垃圾邮件插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
"缺省到其它可用的插件。"
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:179
#, fuzzy
msgid ""
"This key is read only once and reset to \"false\" after read. This unselects "
@@ -11808,7 +11508,7 @@ msgstr ""
"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
"件夹的预览。"
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:180
msgid ""
"This key should contain a list of XML structures specifying custom headers, "
"and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11818,30 +11518,30 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:181
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 "
"mail sent by known contacts from junk filtering."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:182
msgid "This option would help in improving the speed of fetching."
-msgstr "此选项能帮助提高获取信件的速度"
+msgstr "此选项能帮助提高获取信息的速度"
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:183
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
-msgstr "设定默认信件视图中要显示的地址数,超过的部分显示为“...”。"
+msgstr "设定默认信息视图中要显示的地址数,超过的部分显示为“...”。"
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:184
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart."
msgstr "此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:185
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 "
@@ -11850,149 +11550,174 @@ msgstr ""
"此设置指定了默认情况下是否将线索按线索中的最新消息而不是消息日期排序。需要重"
"启 Evolution。"
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:186
msgid "Thread the message-list based on Subject"
-msgstr "基于主题按线索编排信件列表"
+msgstr "基于主题按线索编排信息列表"
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:187
msgid "Timeout for marking message as seen"
-msgstr "将信件标为已看的超时时长"
+msgstr "将信息标为已看的超时时长"
-#: ../mail/evolution-mail.schemas.in.h:187
+#: ../mail/evolution-mail.schemas.in.h:188
msgid "Timeout for marking message as seen."
-msgstr "将信件标为已看的超时时长。"
+msgstr "将信息标为已看的超时时长。"
-#: ../mail/evolution-mail.schemas.in.h:188
+#: ../mail/evolution-mail.schemas.in.h:189
msgid "UID string of the default account."
-msgstr "默认账户的 UID 字符串。"
+msgstr "默认帐号的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:190
msgid "Underline color for misspelled words when using inline spelling."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:191
msgid "Use SpamAssassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:192
msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:193
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:194
msgid "Use custom fonts for displaying mail."
msgstr "使用自定义字体显示邮件。"
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:195
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:196
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:197
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 "
"message or the bottom."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:198
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 "
"the message or the bottom."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:199
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:200
msgid "Whether a read receipt request gets added to every message by default."
-msgstr "是否默认对所有信件添加阅读收条请求。"
+msgstr "是否默认对所有信息添加阅读收条请求。"
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:201
msgid "Whether disable ellipsizing feature of folder names in side bar."
msgstr "禁用或启用侧边栏中文件夹名的省略显示"
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:202
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 头时强制按主题编排线索。"
+msgstr "是否在信息不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:203
msgid "Whether sort threads based on latest message in that thread"
-msgstr "是否以线索中的最新信件来排序线索"
+msgstr "是否以线索中的最新信息来排序线索"
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:204
+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 "
+"one minute after the last action invocation."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:205
msgid "Width of the message-list pane"
-msgstr "信件列表面板的高度"
+msgstr "信息列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:206
msgid "Width of the message-list pane."
-msgstr "信件列表面板的高度。"
+msgstr "信息列表面板的高度。"
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:176
msgid "Importing Elm data"
msgstr "导入 Elm 数据"
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:374
+#: ../mail/importers/elm-importer.c:325 ../mail/importers/pine-importer.c:400
#: ../modules/mail/e-mail-shell-view.c:952
#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+#: ../widgets/misc/e-send-options.c:499
msgid "Mail"
msgstr "邮件"
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:366
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导入器"
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:367
msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
-#: ../mail/importers/evolution-mbox-importer.c:115
-#: ../plugins/pst-import/pst-importer.c:311
-msgid "Destination folder:"
+#: ../mail/importers/evolution-mbox-importer.c:116
+#: ../plugins/dbx-import/dbx-importer.c:226
+#, fuzzy
+msgid "_Destination folder:"
msgstr "目的文件夹:"
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/dbx-import/dbx-importer.c:232
+#: ../plugins/pst-import/pst-importer.c:300
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/importers/evolution-mbox-importer.c:119
-#: ../plugins/pst-import/pst-importer.c:304
+#: ../mail/importers/evolution-mbox-importer.c:122
+#: ../plugins/pst-import/pst-importer.c:300
msgid "Select folder to import into"
msgstr "选择要导入到哪个文件夹"
-#: ../mail/importers/evolution-mbox-importer.c:260
-#: ../shell/e-shell-utils.c:245
+#. Translators: Column header for a message subject
+#: ../mail/importers/evolution-mbox-importer.c:372
+#, fuzzy
+msgctxt "mboxImp"
+msgid "Subject"
+msgstr "主题"
+
+#. Translators: Column header for a message From address
+#: ../mail/importers/evolution-mbox-importer.c:376
+#, fuzzy
+msgctxt "mboxImp"
+msgid "From"
+msgstr "发件人"
+
+#: ../mail/importers/evolution-mbox-importer.c:412
+#: ../shell/e-shell-utils.c:251
msgid "Berkeley Mailbox (mbox)"
msgstr "Berkeley 邮箱(mbox)"
-#: ../mail/importers/evolution-mbox-importer.c:261
+#: ../mail/importers/evolution-mbox-importer.c:413
msgid "Importer Berkeley Mailbox format folders"
msgstr "导入器 Berkeley 邮箱格式文件夹"
-#: ../mail/importers/mail-importer.c:71
+#: ../mail/importers/mail-importer.c:64
msgid "Importing mailbox"
msgstr "导入邮箱"
#. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:155
-#: ../plugins/pst-import/pst-importer.c:456
-#: ../plugins/pst-import/pst-importer.c:562
-#, c-format
-msgid "Importing `%s'"
+#: ../mail/importers/mail-importer.c:150
+#: ../plugins/dbx-import/dbx-importer.c:554
+#: ../plugins/pst-import/pst-importer.c:452
+#: ../plugins/pst-import/pst-importer.c:558
+#, fuzzy, c-format
+msgid "Importing '%s'"
msgstr "导入“%s”"
-#: ../mail/importers/mail-importer.c:298
+#: ../mail/importers/mail-importer.c:295
#, c-format
msgid "Scanning %s"
msgstr "扫描 %s"
@@ -12001,474 +11726,534 @@ msgstr "扫描 %s"
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
-#: ../mail/importers/pine-importer.c:379
-#: ../modules/addressbook/addressbook-config.c:986
+#: ../mail/importers/pine-importer.c:405
+#: ../modules/addressbook/addressbook-config.c:1006
msgid "Address Book"
msgstr "地址簿"
-#: ../mail/importers/pine-importer.c:420
+#: ../mail/importers/pine-importer.c:447
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导入器"
-#: ../mail/importers/pine-importer.c:421
+#: ../mail/importers/pine-importer.c:448
msgid "Import mail from Pine."
msgstr "从 Pine 导入邮件。"
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
#, c-format
msgid "Mail to %s"
msgstr "邮寄给 %s"
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:233 ../mail/mail-autofilter.c:272
#, c-format
msgid "Mail from %s"
msgstr "来自 %s 的邮件"
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:256
#, c-format
msgid "Subject is %s"
msgstr "主题是 %s"
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:291
#, c-format
msgid "%s mailing list"
msgstr "%s 邮件列表"
-#: ../mail/mail-autofilter.c:366
+#: ../mail/mail-autofilter.c:363
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-config.ui.h:1
-msgid "(Note: Requires restart of the application)"
-msgstr "(注意:需要重启应用程序)"
+#. Translators: The first %s is name of the affected filter rule(s),
+#. the second %s is uri of the removed folder. For more than one filter
+#. rule is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-autofilter.c:450
+#, c-format
+msgid ""
+"The filter rule \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following filter rules\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+#. Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage
#: ../mail/mail-config.ui.h:2
-msgid "<b>Top Posting Option</b> (Not Recommended)"
-msgstr "<b>Top Posting 选项</b> (不推荐)"
+msgid "(Not Recommended)"
+msgstr ""
#: ../mail/mail-config.ui.h:3
+msgid "(Note: Requires restart of the application)"
+msgstr "(注意:需要重启应用程序)"
+
+#: ../mail/mail-config.ui.h:4
msgid "Account Information"
msgstr "帐户信息"
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:5
msgid "Add Ne_w Signature..."
msgstr "添加新签名(_W)..."
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:6
msgid "Al_ways sign outgoing messages when using this account"
-msgstr "当使用该账户时总是发送签名信件(_W)"
+msgstr "当使用该帐号时总是发送签名信息(_W)"
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:8
msgid "Also encrypt to sel_f when sending encrypted messages"
msgstr "当发送加密邮件时也对自身加密(_F)"
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:9
msgid "Alway_s carbon-copy (cc) to:"
msgstr "总是抄送到(_S):"
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:10
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是暗送到(_B):"
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:11
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
msgid "Always request rea_d receipt"
msgstr "请求阅读收条(_D)"
-#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+#: ../mail/mail-config.ui.h:14
+msgid "Apply the same _view settings to all folders"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:16
+#: ../modules/addressbook/addressbook-config.c:1013
msgid "Authentication"
msgstr "身份验证"
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
msgid "Automatically insert _emoticon images"
msgstr "自动插入表情图像(_E)"
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
msgid "C_haracter set:"
msgstr "字符集(_H):"
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
msgid "Check cu_stom headers for junk"
msgstr "检查自定义信头以判别垃圾邮件(_S)"
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾邮件(_M)"
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
msgid "Checks incoming mail messages to be Junk"
-msgstr "检查收到的信件是否是垃圾邮件"
+msgstr "检查收到的信息是否是垃圾邮件"
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
msgid "Cle_ar"
msgstr "清除(_A)"
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
msgid "Clea_r"
msgstr "清除(_R)"
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词着色(_M):"
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
msgid "Composing Messages"
-msgstr "撰写信件"
+msgstr "撰写信息"
-#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+#: ../mail/mail-config.ui.h:28 ../plugins/plugin-manager/plugin-manager.c:146
msgid "Configuration"
msgstr "配置"
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
msgid "Default Behavior"
msgstr "默认行为"
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N):"
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:35
msgid "Delete Mail"
msgstr "删除邮件"
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
msgid "Delete junk messages on e_xit"
msgstr "退出时删除垃圾邮件(_X)"
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:38
msgid "Digitally sign o_utgoing messages (by default)"
-msgstr "对寄出的信件进行数字签名(默认)(_U)"
+msgstr "对寄出的信息进行数字签名(默认)(_U)"
-#: ../mail/mail-config.ui.h:36
-msgid "Displayed Message _Headers"
+#: ../mail/mail-config.ui.h:39
+#, fuzzy
+msgid "Displayed Message Headers"
msgstr "显示信头(_H)"
-#: ../mail/mail-config.ui.h:37
-msgid "Do not format messages when text si_ze exceeds"
+#: ../mail/mail-config.ui.h:40
+#, fuzzy
+msgid "Do not display messages when text si_ze exceeds"
msgstr "如果文本超出大小限制,则不格式化邮件中的文本内容(_Z)"
-#: ../mail/mail-config.ui.h:38
+#: ../mail/mail-config.ui.h:41
msgid "Do not mar_k messages as junk if sender is in my address book"
-msgstr "如果信件发送者在地址簿中则不标记为垃圾邮件(_K)"
+msgstr "如果信息发送者在地址簿中则不标记为垃圾邮件(_K)"
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
msgid "Do not quote"
msgstr "不引用"
-#: ../mail/mail-config.ui.h:40
+#: ../mail/mail-config.ui.h:43
msgid "Drafts _Folder:"
msgstr "草稿文件夹(_F):"
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
msgid "Email _Address:"
msgstr "电子邮件地址(_A):"
-#: ../mail/mail-config.ui.h:42
+#: ../mail/mail-config.ui.h:45
msgid "Empty trash folders on e_xit"
msgstr "退出时清空已删除邮件(_X)"
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
msgid "Enable Magic S_pacebar"
msgstr "启用魔术空格键(_P)"
-#: ../mail/mail-config.ui.h:44
+#: ../mail/mail-config.ui.h:47
msgid "Enable Sea_rch Folders"
msgstr "启用搜索文件夹(_R)"
-#: ../mail/mail-config.ui.h:46
+#: ../mail/mail-config.ui.h:49
msgid "Encry_ption certificate:"
msgstr "加密证书(_P):"
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:50
msgid "Encrypt out_going messages (by default)"
-msgstr "加密寄出的信件(默认)(_G)"
+msgstr "加密寄出的信息(默认)(_G)"
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:51
msgid "Fi_xed-width:"
msgstr "等宽(_X):"
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:52
msgid "Fix_ed width Font:"
msgstr "等宽字体(_E):"
-#: ../mail/mail-config.ui.h:50
+#: ../mail/mail-config.ui.h:53
msgid "Font Properties"
msgstr "字体属性"
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:54
msgid "Format messages in _HTML"
-msgstr "用 HTML 格式化信件(_H)"
+msgstr "用 HTML 格式化信息(_H)"
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:55
msgid "Full Nam_e:"
msgstr "全名(_E):"
-#: ../mail/mail-config.ui.h:54
+#: ../mail/mail-config.ui.h:57
msgid "HTML Messages"
-msgstr "HTML 信件"
+msgstr "HTML 信息"
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
msgid "H_TTP Proxy:"
msgstr "HTTP 代理服务器(_T):"
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:59
msgid "Headers"
msgstr "信头"
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:62
msgid "Inline"
msgstr "嵌入"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:63
msgid "Inline (Outlook style)"
msgstr "嵌入(Outlook 风格)"
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:66 ../mail/message-list.etspec.h:8
msgid "Labels"
msgstr "标签"
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
msgid "Loading Images"
-msgstr "装入图像"
+msgstr "载入图像"
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:69
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:70
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:71
msgid "Message Display"
-msgstr "信件显示"
+msgstr "信息显示"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:72
msgid "Message Fonts"
-msgstr "信件字体"
+msgstr "信息字体"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:73
#, fuzzy
msgid "Message Receipts"
-msgstr "信件状态"
+msgstr "信息状态"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:74
msgid "No _Proxy for:"
msgstr "不使用代理的情况(_P):"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
#: ../plugins/publish-calendar/publish-calendar.ui.h:10
msgid "Optional Information"
msgstr "可选信息"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:82
msgid "Pass_word:"
msgstr "密码(_W):"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
msgid "Port:"
msgstr "端口:"
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "发送只有暗送收件人的信件时提示(_O)"
+msgstr "发送只有暗送收件人的信息时提示(_O)"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:86
#, fuzzy
msgid "Pretty Good Privacy (PGP/GPG)"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
msgid "Printed Fonts"
msgstr "打印字体"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
msgid "Proxy Settings"
msgstr "代理设置"
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
msgid "Re_member password"
msgstr "记住密码(_M)"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
msgid "Remember _password"
msgstr "记住密码(_P)"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:95
msgid "Required Information"
msgstr "需要的信息"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:96
+msgid "SHA1"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:97
+msgid "SHA256"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:98
+msgid "SHA384"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:99
+msgid "SHA512"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:101
#, fuzzy
msgid "SSL is not supported in this build of Evolution"
msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:102
msgid "S_earch for sender photograph only in local address books"
msgstr "仅在本地地址簿中搜索发件人照片(_E)"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:103
msgid "S_elect..."
msgstr "选择(_E)..."
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:104
msgid "S_end message receipts:"
-msgstr "发送信件收条(_E):"
+msgstr "发送信息收条(_E):"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:105
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:106
msgid "Secure MIME (S/MIME)"
msgstr "安全 MIME(S/MIME)"
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:108
msgid "Select Drafts Folder"
msgstr "选择草稿文件夹"
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:109
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:110
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:111
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:112
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:113
+#, fuzzy
+msgid "Select Junk Folder"
+msgstr "选择文件夹"
+
+#: ../mail/mail-config.ui.h:114
msgid "Select Sent Folder"
msgstr "选择已发文件夹"
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:115
+#, fuzzy
+msgid "Select Trash Folder"
+msgstr "选择草稿文件夹"
+
+#: ../mail/mail-config.ui.h:116
#, fuzzy
msgid "Sender Photograph"
msgstr "<b>发送者照片</b>"
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:117
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:118
msgid "Sent _Messages Folder:"
-msgstr "已发送信件文件夹(_M):"
+msgstr "已发送信息文件夹(_M):"
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:119
#, fuzzy
msgid "Sent and Draft Messages"
-msgstr "已发信件"
+msgstr "已发信息"
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:120
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:121
msgid "Server Configuration"
msgstr "服务器配置"
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:122
msgid "Server _Type:"
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:123
+#, fuzzy
+msgid "Si_gning algorithm:"
+msgstr "签名证书(_N):"
+
+#: ../mail/mail-config.ui.h:124
msgid "Sig_natures"
msgstr "签名(_N)"
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:125
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:126
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:127
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:128
+#, fuzzy
+msgid "Signing _algorithm:"
+msgstr "签名证书(_N):"
+
+#: ../mail/mail-config.ui.h:129
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:130
msgid "Start _typing at the bottom on replying"
msgstr "回复时在底部开始打字(_T)"
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:132
msgid "T_ype:"
msgstr "类型(_Y):"
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:133
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:134
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -12477,7 +12262,13 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.ui.h:126
+#. Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding
+#: ../mail/mail-config.ui.h:138
+#, fuzzy
+msgid "Top Posting Option"
+msgstr "投递目的"
+
+#: ../mail/mail-config.ui.h:139
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -12485,184 +12276,197 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.ui.h:128
+#: ../mail/mail-config.ui.h:141
msgid "Us_ername:"
msgstr "用户名(_E):"
-#: ../mail/mail-config.ui.h:129
+#: ../mail/mail-config.ui.h:142
msgid "Use Authe_ntication"
msgstr "使用身份验证(_N)"
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:221
-#: ../plugins/google-account-setup/google-contacts-source.c:283
-#: ../plugins/google-account-setup/google-source.c:620
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:257
+#: ../mail/mail-config.ui.h:143 ../plugins/caldav/caldav-source.c:225
+#: ../plugins/google-account-setup/google-contacts-source.c:286
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:260
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:144
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.ui.h:132
+#: ../mail/mail-config.ui.h:145
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.ui.h:133
+#: ../mail/mail-config.ui.h:146
msgid "_Always load images from the Internet"
-msgstr "总是从 Internet 上装入图像(_A)"
+msgstr "总是从 Internet 上载入图像(_A)"
-#: ../mail/mail-config.ui.h:134
+#: ../mail/mail-config.ui.h:147
msgid "_Authentication Type"
msgstr "身份验证类型(_A)"
-#: ../mail/mail-config.ui.h:135
+#: ../mail/mail-config.ui.h:148
msgid "_Default junk plugin:"
msgstr "默认的垃圾邮件插件(_D):"
-#: ../mail/mail-config.ui.h:136
+#: ../mail/mail-config.ui.h:149
msgid "_Direct connection to the Internet"
msgstr "直接连接到 Internet(_D)"
-#: ../mail/mail-config.ui.h:137
+#: ../mail/mail-config.ui.h:150
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.ui.h:138
+#: ../mail/mail-config.ui.h:151
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.ui.h:139
+#: ../mail/mail-config.ui.h:152
+#, fuzzy
+msgid "_Junk Folder:"
+msgstr "当前文件夹"
+
+#: ../mail/mail-config.ui.h:153
msgid "_Keep Signature above the original message on replying"
-msgstr "回复时保留原始信件的签名(_K)"
+msgstr "回复时保留原始信息的签名(_K)"
-#: ../mail/mail-config.ui.h:140
+#: ../mail/mail-config.ui.h:154
msgid "_Languages"
msgstr "语言(_L)"
-#: ../mail/mail-config.ui.h:141
+#: ../mail/mail-config.ui.h:155
msgid "_Load images in messages from contacts"
-msgstr "装入来自联系人的邮件中的图像(_L)"
+msgstr "载入来自联系人的邮件中的图像(_L)"
-#: ../mail/mail-config.ui.h:142
+#: ../mail/mail-config.ui.h:156
msgid "_Lookup in local address book only"
msgstr "仅在本地地址簿中查阅(_L)"
-#: ../mail/mail-config.ui.h:143
+#: ../mail/mail-config.ui.h:157
msgid "_Make this my default account"
-msgstr "使它成为我的默认账户(_M)"
+msgstr "使它成为我的默认帐号(_M)"
-#: ../mail/mail-config.ui.h:144
+#: ../mail/mail-config.ui.h:158
msgid "_Manual proxy configuration:"
msgstr "手动代理服务器配置(_M):"
-#: ../mail/mail-config.ui.h:145
+#: ../mail/mail-config.ui.h:159
msgid "_Mark messages as read after"
-msgstr "把信件标记为已读前等(_M)"
+msgstr "把信息标记为已读前等(_M)"
-#: ../mail/mail-config.ui.h:147
+#: ../mail/mail-config.ui.h:161
msgid "_Never load images from the Internet"
-msgstr "绝不从 Internet 装入图像(_N)"
+msgstr "绝不从 Internet 载入图像(_N)"
-#: ../mail/mail-config.ui.h:148
+#: ../mail/mail-config.ui.h:162
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.ui.h:149
+#: ../mail/mail-config.ui.h:163
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.ui.h:150
+#: ../mail/mail-config.ui.h:164
msgid "_Prompt when sending messages with an empty subject line"
-msgstr "发送空主题行的信件时提示(_P)"
+msgstr "发送空主题行的信息时提示(_P)"
-#: ../mail/mail-config.ui.h:151
+#: ../mail/mail-config.ui.h:165
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.ui.h:152
+#: ../mail/mail-config.ui.h:166
msgid "_Script:"
msgstr "脚本(_S):"
-#: ../mail/mail-config.ui.h:153
+#: ../mail/mail-config.ui.h:167
msgid "_Secure HTTP Proxy:"
msgstr "安全 HTTP 代理(_S):"
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
+#: ../mail/mail-config.ui.h:169 ../modules/addressbook/ldap-config.ui.h:29
#: ../plugins/publish-calendar/publish-calendar.ui.h:28
msgid "_Server:"
msgstr "服务器(_S):"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:157
+#: ../mail/mail-config.ui.h:171
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
-#: ../mail/mail-config.ui.h:158
+#: ../mail/mail-config.ui.h:172
msgid "_Show the photograph of sender in the message preview"
msgstr "在电子邮件预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.ui.h:159
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:174
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-#: ../mail/mail-config.ui.h:160
+#: ../mail/mail-config.ui.h:175
+#, fuzzy
+msgid "_Trash Folder:"
+msgstr "草稿文件夹(_F):"
+
+#: ../mail/mail-config.ui.h:176
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
-#: ../mail/mail-config.ui.h:161
+#: ../mail/mail-config.ui.h:177
msgid "_Use system defaults"
msgstr "使用默认值(_U)"
-#: ../mail/mail-config.ui.h:162
+#: ../mail/mail-config.ui.h:178
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/mail-config.ui.h:179 ../smime/gui/smime-ui.ui.h:47
#, fuzzy
msgid "a"
msgstr "上午"
-#: ../mail/mail-config.ui.h:164
+#. Translators: This is part of 'Shrink To / Cc / Bcc headers to [X] addresses', where [X] is a spin with a number
+#: ../mail/mail-config.ui.h:181
msgid "addresses"
msgstr "个地址"
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:182 ../smime/gui/smime-ui.ui.h:48
msgid "b"
msgstr ""
-#: ../mail/mail-config.ui.h:166
+#: ../mail/mail-config.ui.h:183
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.ui.h:167
+#: ../mail/mail-config.ui.h:184
msgid "description"
msgstr "描述"
#: ../mail/mail-dialogs.ui.h:1
-msgid " "
-msgstr " "
-
-#: ../mail/mail-dialogs.ui.h:2
msgid "All active remote folders"
msgstr "全部活跃远程文件夹"
-#: ../mail/mail-dialogs.ui.h:3
+#: ../mail/mail-dialogs.ui.h:2
msgid "All local and active remote folders"
msgstr "全部本地和活跃远程文件夹"
-#: ../mail/mail-dialogs.ui.h:4
+#: ../mail/mail-dialogs.ui.h:3
msgid "All local folders"
msgstr "全部本地文件夹"
-#: ../mail/mail-dialogs.ui.h:5
+#: ../mail/mail-dialogs.ui.h:4
msgid "Call"
msgstr "呼叫"
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:5
msgid "Co_mpleted"
msgstr "已完成(_M)"
+#: ../mail/mail-dialogs.ui.h:6
+#, fuzzy
+msgid "Collapse _all"
+msgstr "折叠"
+
#: ../mail/mail-dialogs.ui.h:7
msgid "Digital Signature"
msgstr "数字签名"
@@ -12672,241 +12476,247 @@ msgid "Do Not Forward"
msgstr "不要转发"
#: ../mail/mail-dialogs.ui.h:9
+#, fuzzy
+msgid "E_xpand all"
+msgstr "展开全部线索(_X)"
+
+#: ../mail/mail-dialogs.ui.h:10
msgid "Encryption"
msgstr "加密"
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
msgid "Folder Subscriptions"
msgstr "文件夹订阅"
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
msgid "Follow-Up"
msgstr "跟随"
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
msgid "For Your Information"
msgstr "给您的信息"
-#: ../mail/mail-dialogs.ui.h:13
+#: ../mail/mail-dialogs.ui.h:14
msgid "Forward"
msgstr "转发"
-#: ../mail/mail-dialogs.ui.h:14
+#: ../mail/mail-dialogs.ui.h:15
msgid "License Agreement"
msgstr "许可协议"
-#: ../mail/mail-dialogs.ui.h:15
+#: ../mail/mail-dialogs.ui.h:16
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
msgid "Reply to All"
msgstr "全部回复"
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:21
msgid "Review"
msgstr "回顾"
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:22
msgid "S_erver:"
msgstr "服务器(_E):"
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:23
+msgid "S_how only items containing:"
+msgstr ""
+
+#: ../mail/mail-dialogs.ui.h:24
#, fuzzy
msgid "Search Folder Sources"
msgstr "搜索文件夹来源"
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
msgid "Security Information"
msgstr "安全信息"
-#: ../mail/mail-dialogs.ui.h:24
+#: ../mail/mail-dialogs.ui.h:26
msgid "Specific folders"
msgstr "指定文件夹"
-#: ../mail/mail-dialogs.ui.h:25
+#: ../mail/mail-dialogs.ui.h:27
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
msgstr ""
-"您选中进行跟随的信件已经在下面列出。\n"
+"您选中进行跟随的信息已经在下面列出。\n"
"请从“标志”菜单中选择跟随操作。"
-#: ../mail/mail-dialogs.ui.h:27
+#: ../mail/mail-dialogs.ui.h:29
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../mail/mail-dialogs.ui.h:28
+#: ../mail/mail-dialogs.ui.h:30
msgid "_Due By:"
msgstr "延期人(_D):"
-#: ../mail/mail-dialogs.ui.h:29
+#: ../mail/mail-dialogs.ui.h:31
msgid "_Flag:"
msgstr "标志(_F):"
-#: ../mail/mail-dialogs.ui.h:30
+#: ../mail/mail-dialogs.ui.h:32
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-folder-cache.c:893
+#: ../mail/mail-folder-cache.c:783
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
-#: ../mail/mail-ops.c:95
+#: ../mail/mail-ops.c:84
msgid "Filtering Selected Messages"
-msgstr "过滤选中的信件"
+msgstr "过滤选中的信息"
-#: ../mail/mail-ops.c:254
+#: ../mail/mail-ops.c:245
msgid "Fetching Mail"
msgstr "收取邮件"
-#. sending mail, filtering failed
-#: ../mail/mail-ops.c:585
+#: ../mail/mail-ops.c:592
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:597 ../mail/mail-ops.c:624
-#, c-format
+#: ../mail/mail-ops.c:608 ../mail/mail-ops.c:635
+#, fuzzy, c-format
msgid ""
"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
+"Appending to local 'Sent' folder instead."
msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:641
-#, c-format
-msgid "Failed to append to local `Sent' folder: %s"
+#: ../mail/mail-ops.c:654
+#, fuzzy, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:752 ../mail/mail-ops.c:833
+#: ../mail/mail-ops.c:774 ../mail/mail-ops.c:866
msgid "Sending message"
-msgstr "发送信件"
+msgstr "发送信息"
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:782
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
-#: ../mail/mail-ops.c:789
+#: ../mail/mail-ops.c:826
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:791 ../mail/mail-send-recv.c:760
+#: ../mail/mail-ops.c:828 ../mail/mail-send-recv.c:758
msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:793 ../mail/mail-send-recv.c:762
+#: ../mail/mail-ops.c:830 ../mail/mail-send-recv.c:760
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:905
+#: ../mail/mail-ops.c:938
#, fuzzy, c-format
msgid "Saving message to folder '%s'"
-msgstr "把信件保存到文件夹中"
+msgstr "把信息保存到文件夹中"
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
#, fuzzy, c-format
msgid "Moving messages to '%s'"
-msgstr "把信件移至 %s"
+msgstr "把信息移至 %s"
-#: ../mail/mail-ops.c:982
+#: ../mail/mail-ops.c:1018
#, fuzzy, c-format
msgid "Copying messages to '%s'"
-msgstr "把信件复制到 %s"
+msgstr "把信息复制到 %s"
-#: ../mail/mail-ops.c:1091
+#: ../mail/mail-ops.c:1127
#, fuzzy, c-format
msgid "Scanning folders in '%s'"
msgstr "在“%s”中扫描文件夹"
-#: ../mail/mail-ops.c:1199
+#: ../mail/mail-ops.c:1235
msgid "Forwarded messages"
-msgstr "转发的信件"
+msgstr "转发的信息"
-#: ../mail/mail-ops.c:1240
+#: ../mail/mail-ops.c:1276
#, fuzzy, c-format
msgid "Opening folder '%s'"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1306
+#: ../mail/mail-ops.c:1342
#, fuzzy, c-format
msgid "Retrieving quota information for folder '%s'"
msgstr "正在获取文件加 %s 的配额信息"
-#: ../mail/mail-ops.c:1378
+#: ../mail/mail-ops.c:1414
#, fuzzy, c-format
msgid "Opening store '%s'"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1449
+#: ../mail/mail-ops.c:1485
#, fuzzy, c-format
msgid "Removing folder '%s'"
msgstr "删除文件夹 %s"
-#: ../mail/mail-ops.c:1567
+#: ../mail/mail-ops.c:1609
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1630
+#: ../mail/mail-ops.c:1672
#, c-format
msgid "Expunging and storing account '%s'"
-msgstr "销毁并存储账户“%s”"
+msgstr "销毁并存储帐号“%s”"
-#: ../mail/mail-ops.c:1631
+#: ../mail/mail-ops.c:1673
#, c-format
msgid "Storing account '%s'"
-msgstr "存储账户“%s”"
+msgstr "存储帐号“%s”"
-#: ../mail/mail-ops.c:1685
+#: ../mail/mail-ops.c:1727
#, fuzzy, c-format
msgid "Refreshing folder '%s'"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1725
+#: ../mail/mail-ops.c:1767
#, fuzzy, c-format
msgid "Expunging folder '%s'"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1770
+#: ../mail/mail-ops.c:1812
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1771
+#: ../mail/mail-ops.c:1813
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1967
+#: ../mail/mail-ops.c:2016
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:2056
+#: ../mail/mail-ops.c:2105
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:2136
-#, c-format
-msgid ""
-"Error saving messages to: %s:\n"
-" %s"
+#: ../mail/mail-ops.c:2192
+#, fuzzy, c-format
+msgid "Error saving messages to: %s:\n"
msgstr ""
-"在将信件保存到 %s 时发生错误:\n"
+"在将信息保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2208
+#: ../mail/mail-ops.c:2265
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2226 ../mail/mail-ops.c:2234
+#: ../mail/mail-ops.c:2285 ../mail/mail-ops.c:2295
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -12915,142 +12725,176 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2249
-#, c-format
-msgid "Could not write data: %s"
+#: ../mail/mail-ops.c:2310
+#, fuzzy
+msgid "Could not write data: "
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
#, fuzzy, c-format
msgid "Disconnecting from '%s'"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2394
+#: ../mail/mail-ops.c:2454
#, fuzzy, c-format
msgid "Reconnecting to '%s'"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2490
+#: ../mail/mail-ops.c:2550
#, c-format
msgid "Preparing account '%s' for offline"
-msgstr "正在准备脱机使用账户“%s”"
+msgstr "正在准备脱机使用帐号“%s”"
-#: ../mail/mail-ops.c:2576
+#: ../mail/mail-ops.c:2636
msgid "Checking Service"
msgstr "检查服务"
-#: ../mail/mail-send-recv.c:189
+#: ../mail/mail-send-recv.c:184
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:431
+#: ../mail/mail-send-recv.c:424
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:444
+#: ../mail/mail-send-recv.c:441
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:553
+#: ../mail/mail-send-recv.c:551
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:553 ../mail/mail-send-recv.c:630
+#: ../mail/mail-send-recv.c:551 ../mail/mail-send-recv.c:628
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:873
+#: ../mail/mail-send-recv.c:866
#, c-format
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:220
+#: ../mail/mail-session.c:225
#, c-format
msgid "Enter Passphrase for %s"
msgstr "输入 %s 的密码"
-#: ../mail/mail-session.c:222
+#: ../mail/mail-session.c:227
msgid "Enter Passphrase"
msgstr "输入密码"
-#: ../mail/mail-session.c:225
+#: ../mail/mail-session.c:230
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:227
+#: ../mail/mail-session.c:232
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:269
+#: ../mail/mail-session.c:277
+#, c-format
msgid "User canceled operation."
msgstr "用户己取消操作。"
-#: ../mail/mail-session.c:663
+#: ../mail/mail-session.c:723
+#, c-format
msgid ""
"No destination address provided, forward of the message has been cancelled."
msgstr "缺少发送目标地址,邮件转发被取消。"
-#: ../mail/mail-session.c:669
+#: ../mail/mail-session.c:732
+#, c-format
msgid "No account found to use, forward of the message has been cancelled."
-msgstr "无可用账户,邮件转发被取消。"
+msgstr "无可用帐号,邮件转发被取消。"
-#: ../mail/mail-tools.c:123
-#, c-format
-msgid "Could not create spool directory `%s': %s"
+#: ../mail/mail-tools.c:128
+#, fuzzy, c-format
+msgid "Could not create spool directory '%s': %s"
msgstr "无法创建脱机目录“%s”:%s"
-#: ../mail/mail-tools.c:153
-#, c-format
-msgid "Trying to movemail a non-mbox source `%s'"
+#: ../mail/mail-tools.c:161
+#, fuzzy, c-format
+msgid "Trying to movemail a non-mbox source '%s'"
msgstr "试图将邮件移至非 mbox 源“%s”"
-#: ../mail/mail-tools.c:259
+#: ../mail/mail-tools.c:273
#, c-format
msgid "Forwarded message - %s"
-msgstr "转发的信件 - %s"
+msgstr "转发的信息 - %s"
-#: ../mail/mail-tools.c:261
+#: ../mail/mail-tools.c:275
msgid "Forwarded message"
-msgstr "转发的信件"
+msgstr "转发的信息"
-#: ../mail/mail-tools.c:301
-#, c-format
-msgid "Invalid folder: `%s'"
+#: ../mail/mail-tools.c:318
+#, fuzzy, c-format
+msgid "Invalid folder: '%s'"
msgstr "无效的文件夹:“%s”"
-#: ../mail/mail-vfolder.c:87
+#: ../mail/mail-vfolder.c:85
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "设置搜索文件夹:%s"
-#: ../mail/mail-vfolder.c:232
+#: ../mail/mail-vfolder.c:224
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "更新“%s:%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:239
+#: ../mail/mail-vfolder.c:231
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "更新“%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:1172
+#. Translators: The first %s is name of the affected search folder(s),
+#. the second %s is uri of the removed folder. For more than one search
+#. folder is each of them on a separate line, with four spaces in front
+#. of its name, without quotes.
+#: ../mail/mail-vfolder.c:674
+#, c-format
+msgid ""
+"The Search Folder \"%s\" has been updated, because it used just removed "
+"folder\n"
+"\"%s\"."
+msgid_plural ""
+"The following Search Folders\n"
+"%s have been updated, because they used just removed folder\n"
+"\"%s\"."
+msgstr[0] ""
+
+#: ../mail/mail-vfolder.c:1179
msgid "Edit Search Folder"
msgstr "编辑搜索文件夹"
-#: ../mail/mail-vfolder.c:1274
+#: ../mail/mail-vfolder.c:1284
msgid "New Search Folder"
msgstr "新建搜索文件夹"
#: ../mail/mail.error.xml.h:1
+#, fuzzy
+msgid "\"Check Junk\" Failed"
+msgstr "检查垃圾信失败"
+
+#: ../mail/mail.error.xml.h:2
+#, fuzzy
+msgid "\"Report Junk\" Failed"
+msgstr "报告垃圾邮件失败"
+
+#: ../mail/mail.error.xml.h:3
+#, fuzzy
+msgid "\"Report Not Junk\" Failed"
+msgstr "报告非垃圾邮件失败"
+
+#: ../mail/mail.error.xml.h:4
msgid "A folder named \"{0}\" already exists. Please use a different name."
msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
-#: ../mail/mail.error.xml.h:2
+#: ../mail/mail.error.xml.h:5
msgid "A folder named \"{1}\" already exists. Please use a different name."
msgstr "已经存在名为“{1}”的文件夹。请使用不同的名称。"
-#: ../mail/mail.error.xml.h:3
+#: ../mail/mail.error.xml.h:6
msgid ""
"A non-empty folder at \"{1}\" already exists.\n"
"\n"
@@ -13061,136 +12905,125 @@ msgstr ""
"\n"
"您可以选择忽略此文件夹,覆盖或追加其内容,或者退出。"
-#: ../mail/mail.error.xml.h:6
+#: ../mail/mail.error.xml.h:9
msgid ""
"A read receipt notification has been requested for \"{1}\". Send the receipt "
"notification to {0}?"
msgstr "“{1}”请求了阅读收条。将阅读收条发送给{0}吗?"
-#: ../mail/mail.error.xml.h:7
+#: ../mail/mail.error.xml.h:10
msgid ""
"A signature already exists with the name \"{0}\". Please specify a different "
"name."
msgstr "已经存在名为“{0}”的签名。请使用不同的名称。"
-#: ../mail/mail.error.xml.h:8
+#: ../mail/mail.error.xml.h:11
msgid ""
"Adding a meaningful Subject line to your messages will give your recipients "
"an idea of what your mail is about."
-msgstr "在您的信件中添加有意义的主题可以让您的收件人更容易明白您邮件的内容。"
+msgstr "在您的信息中添加有意义的主题可以让您的收件人更容易明白您邮件的内容。"
-#: ../mail/mail.error.xml.h:9
+#: ../mail/mail.error.xml.h:12
msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "您确定要删除此账户及其全部代理服务器吗?"
+msgstr "您确定要删除此帐号及其全部代理服务器吗?"
-#: ../mail/mail.error.xml.h:10
+#: ../mail/mail.error.xml.h:13
msgid "Are you sure you want to delete this account?"
-msgstr "您确定要删除此账户吗?"
+msgstr "您确定要删除此帐号吗?"
-#: ../mail/mail.error.xml.h:11
+#: ../mail/mail.error.xml.h:14
msgid ""
"Are you sure you want to disable this account and delete all its proxies?"
-msgstr "您确定要禁用此账户及其全部代理服务器吗?"
-
-#: ../mail/mail.error.xml.h:12
-msgid "Are you sure you want to open {0} messages at once?"
-msgstr "您确定要一次打开{0}封信吗?"
+msgstr "您确定要禁用此帐号及其全部代理服务器吗?"
-#: ../mail/mail.error.xml.h:13
+#: ../mail/mail.error.xml.h:15
msgid ""
"Are you sure you want to permanently remove all the deleted messages in all "
"folders?"
-msgstr "您确定想要永久删除全部文件夹中已删除的全部信件吗?"
+msgstr "您确定想要永久删除全部文件夹中已删除的全部信息吗?"
-#: ../mail/mail.error.xml.h:14
+#: ../mail/mail.error.xml.h:16
msgid ""
"Are you sure you want to permanently remove all the deleted messages in "
"folder \"{0}\"?"
-msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信件吗?"
+msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信息吗?"
-#: ../mail/mail.error.xml.h:15
+#: ../mail/mail.error.xml.h:17
msgid "Are you sure you want to send a message in HTML format?"
-msgstr "您确定想要以 HTML 格式发送信件吗?"
+msgstr "您确定想要以 HTML 格式发送信息吗?"
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:18
#, fuzzy
msgid "Are you sure you want to send a message with invalid address?"
-msgstr "您确信您要发送只有密件抄送收件人的信件吗?"
+msgstr "您确信您要发送只有密件抄送收件人的信息吗?"
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:19
#, fuzzy
msgid "Are you sure you want to send a message with invalid addresses?"
-msgstr "您确信您要发送只有密件抄送收件人的信件吗?"
+msgstr "您确信您要发送只有密件抄送收件人的信息吗?"
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "您确信您要发送只有密件抄送收件人的信件吗?"
+msgstr "您确信您要发送只有密件抄送收件人的信息吗?"
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:21
msgid "Are you sure you want to send a message without a subject?"
-msgstr "您确定想要发送没有主题的信件吗?"
-
-#: ../mail/mail.error.xml.h:20
-msgid "Because \"{0}\"."
-msgstr "原因是“{0}”。"
+msgstr "您确定想要发送没有主题的信息吗?"
#: ../mail/mail.error.xml.h:22
-msgid "Because \"{2}\"."
-msgstr "原因是“{2}”。"
-
-#: ../mail/mail.error.xml.h:23
msgid "Blank Signature"
msgstr "空签名"
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:23
msgid "Cannot add Search Folder \"{0}\"."
msgstr "无法添加搜索文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:24
msgid "Cannot copy folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”复制到“{1}”。"
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:25
msgid "Cannot create folder \"{0}\"."
msgstr "无法创建文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:26
msgid "Cannot create temporary save directory."
msgstr "无法创建临时保存目录。"
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:27
msgid "Cannot create the save directory, because \"{1}\""
msgstr "无法创建保存目录,原因是“{1}”"
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:28
msgid "Cannot delete folder \"{0}\"."
msgstr "无法删除文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:29
msgid "Cannot delete system folder \"{0}\"."
msgstr "无法删除系统文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:30
msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:31
msgid "Cannot move folder \"{0}\" to \"{1}\"."
msgstr "无法将文件夹“{0}”移至“{1}”。"
-#: ../mail/mail.error.xml.h:33
-msgid "Cannot open source \"{1}\""
+#: ../mail/mail.error.xml.h:32
+#, fuzzy
+msgid "Cannot open source \"{1}\"."
msgstr "无法打开源“{0}”"
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:33
msgid "Cannot open source \"{2}\"."
msgstr "无法打开源“{2}”。"
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:34
msgid "Cannot open target \"{2}\"."
msgstr "无法打开目标“{2}”。"
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:35
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."
@@ -13198,35 +13031,31 @@ msgstr ""
"无法读取许可文件“{0}”,原因是安装有问题。您将无法使用此提供者,除非您接受其许"
"可协议。"
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:36
msgid "Cannot rename \"{0}\" to \"{1}\"."
msgstr "无法将“{0}”重命名为“{1}”。"
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:37
msgid "Cannot rename or move system folder \"{0}\"."
msgstr "无法重命名或移动系统文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:38
msgid "Cannot save changes to account."
-msgstr "无法将更改保存到账户。"
+msgstr "无法将更改保存到帐号。"
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:39
msgid "Cannot save to directory \"{0}\"."
msgstr "无法保存到目录“{0}”。"
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:40
msgid "Cannot save to file \"{0}\"."
msgstr "无法保存到文件“{0}”。"
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:41
msgid "Cannot set signature script \"{0}\"."
msgstr "无法设定签名脚本“{0}”。"
-#: ../mail/mail.error.xml.h:43
-msgid "Check Junk Failed"
-msgstr "检查垃圾信失败"
-
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
msgid ""
"Check to make sure your password is spelled correctly. Remember that many "
"passwords are case sensitive; your caps lock might be on."
@@ -13234,151 +13063,155 @@ msgstr ""
"选中此处以确保您的密码拼写正确。请记住,很多密码都是区分大小写的;您的 Caps "
"Lock 灯可能为开。"
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
msgid "Could not save signature file."
msgstr "无法保存签名文件。"
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
msgid "Delete messages in Search Folder \"{0}\"?"
-msgstr "删除搜索文件夹“{0}”中的信件吗?"
+msgstr "删除搜索文件夹“{0}”中的信息吗?"
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Do _Not Disable"
+msgstr "不禁用"
#: ../mail/mail.error.xml.h:47
-msgid "Do not d_elete"
-msgstr "不删除(_E)"
+#, fuzzy
+msgid "Do _Not Send"
+msgstr "不发送(_N)"
#: ../mail/mail.error.xml.h:48
-msgid "Do not delete"
-msgstr "不删除"
+#, fuzzy
+msgid "Do _Not Synchronize"
+msgstr "不同步(_D)"
#: ../mail/mail.error.xml.h:49
-msgid "Do not disable"
-msgstr "不禁用"
-
-#: ../mail/mail.error.xml.h:50
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
msgstr "您想要同步那些标记为离线使用的文件夹吗?"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:50
msgid "Do you want to mark all messages as read?"
-msgstr "您是否想要把所有信件标记为已读?"
+msgstr "您是否想要把所有信息标记为已读?"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:51
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:52
msgid "Enter password."
msgstr "输入密码。"
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:53
msgid "Error loading filter definitions."
-msgstr "装入过滤器定义错误。"
+msgstr "载入过滤器定义错误。"
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:54
msgid "Error while performing operation."
msgstr "执行操作时出错。"
-#: ../mail/mail.error.xml.h:56
+#. 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:58
msgid "Error while {0}."
msgstr "{0} 时出错。"
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:59
msgid "File exists but cannot overwrite it."
msgstr "文件存在但无法覆盖。"
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:60
msgid "File exists but is not a regular file."
msgstr "文件存在但不是普通文件。"
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:61
msgid "If you continue, you will not be able to recover these messages."
-msgstr "如果您继续的话,您将无法恢复这些信件。"
+msgstr "如果您继续的话,您将无法恢复这些信息。"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
+#, fuzzy
msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
+"If you delete the folder, all of its contents and its subfolders' contents "
"will be deleted permanently."
msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:63
#, fuzzy
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders contents "
-#| "will be deleted permanently."
msgid ""
"If you delete the folder, all of its contents will be deleted permanently."
msgstr "如果您删除文件夹,其中的全部内容及其子文件夹内容将被永久删除。"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
msgid "If you proceed, all proxy accounts will be deleted permanently."
-msgstr "如果您继续的话,全部代理服务器账户都将被永久删除。"
+msgstr "如果您继续的话,全部代理服务器帐号都将被永久删除。"
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:65
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
-msgstr "如果您继续的话,账户信息及其全部代理服务器信息将被永久删除。"
+msgstr "如果您继续的话,帐号信息及其全部代理服务器信息将被永久删除。"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
msgid "If you proceed, the account information will be deleted permanently."
-msgstr "如果您继续的话,账户信息将被永久删除。"
+msgstr "如果您继续的话,帐号信息将被永久删除。"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
-msgstr "如果您退出,这些信件将会等到 Evolution 下次启动才会发出。"
+msgstr "如果您退出,这些信息将会等到 Evolution 下次启动才会发出。"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
msgid "Ignore"
msgstr "忽略"
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:70
msgid "Invalid authentication"
msgstr "无效的身份验证"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
msgid "Mail filters automatically updated."
msgstr "邮件过滤器已自动更新。"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
msgid ""
"Many email systems add an Apparently-To header to messages that only have "
"BCC recipients. This header, if added, will list all of your recipients to "
"your message anyway. To avoid this, you should add at least one To: or CC: "
"recipient."
msgstr ""
-"许多邮件系统会在只有密件抄送收件人的信件中添加 Apparently-To 头。如果添加了这"
-"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
+"许多邮件系统会在只有密件抄送收件人的信息中添加 Apparently-To 头。如果添加了这"
+"个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:76
msgid "No sources selected."
msgstr "没有选中源。"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
msgid "Please check your account settings and try again."
-msgstr "请检查您的账户设置,然后再试一次。"
+msgstr "请检查您的帐号设置,然后再试一次。"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
msgid "Please enable the account or send using another account."
-msgstr "请启用账户或者使用其它账户发送。"
+msgstr "请启用帐号或者使用其它帐号发送。"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
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."
@@ -13386,7 +13219,7 @@ msgstr ""
"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
"邮件地址。"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
@@ -13395,71 +13228,54 @@ msgstr ""
"请确定下列收件人愿意并且能够接收 HTML 邮件:\n"
"{0}"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
msgid "Please provide an unique name to identify this signature."
msgstr "请提供此签名的唯一标识名称。"
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:84
msgid "Please wait."
msgstr "请稍候。"
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:85
msgid "Problem migrating old mail folder \"{0}\"."
msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:86
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证算法列表。"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:87
msgid "Read receipt requested."
msgstr "阅读收条已请求。"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:88
msgid "Really delete folder \"{0}\" and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:89
#, fuzzy
-#| msgid "Cannot delete folder \"{0}\"."
msgid "Really delete folder \"{0}\"?"
msgstr "无法删除文件夹“{0}”。"
-#: ../mail/mail.error.xml.h:88
-msgid "Report Junk Failed"
-msgstr "报告垃圾邮件失败"
-
-#: ../mail/mail.error.xml.h:89
-msgid "Report Not Junk Failed"
-msgstr "报告非垃圾邮件失败"
-
#: ../mail/mail.error.xml.h:90
msgid "Search Folders automatically updated."
msgstr "搜索文件夹已自动更新。"
#: ../mail/mail.error.xml.h:91
-msgid "Send Receipt"
-msgstr "发送收条"
-
-#: ../mail/mail.error.xml.h:92
msgid "Signature Already Exists"
msgstr "签名已经存在"
-#: ../mail/mail.error.xml.h:93
-msgid "Synchronize"
-msgstr "同步"
-
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
msgid "Synchronize folders locally for offline usage?"
msgstr "同步文件夹到本地以脱机使用吗?"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
msgid ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:94
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13470,145 +13286,122 @@ msgid ""
msgstr ""
"您即将发送的联系人列表配置为隐藏列表收件人。\n"
"\n"
-"许多邮件系统会在只有密件抄送收件人的信件中添加 Apparently-To 头。如果添加了这"
-"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
+"许多邮件系统会在只有密件抄送收件人的信息中添加 Apparently-To 头。如果添加了这"
+"个邮件头,将在您的信息中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:99
-msgid ""
-"The following Search Folder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-" \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"下列搜索文件夹:\n"
-"{0}\n"
-"使用现已删除的文件夹:\n"
-" “{1}”\n"
-"已经更新。"
-
-#: ../mail/mail.error.xml.h:104
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-" \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"下列过滤规则:\n"
-"{0}\n"
-"使用现已删除的文件夹:\n"
-" “{1}”\n"
-"已经更新。"
-
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:97
msgid ""
"The following recipient was not recognized as a valid mail address:\n"
"{0}"
msgstr ""
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:99
msgid ""
"The following recipients were not recognized as valid mail addresses:\n"
"{0}"
msgstr ""
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:101
msgid "The script file must exist and be executable."
msgstr "脚本文件必须存在且可执行。"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:102
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:116
+#: ../mail/mail.error.xml.h:104
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
-msgstr "无法发送此信件,因为您所选择用来发送的账户未启用"
+msgstr "无法发送此信息,因为您所选择用来发送的帐号未启用"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:105
msgid ""
"This message cannot be sent because you have not specified any recipients"
-msgstr "无法发送此信件,因为您没有指定任何收件人"
+msgstr "无法发送此信息,因为您没有指定任何收件人"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:106
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:107
msgid "This signature has been changed, but has not been saved."
msgstr "签名已经更改,但尚未保存。"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:108
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
-msgstr "这将把选中文件夹及其子文件夹中的全部信件标记为已读。"
+msgstr "这将把选中文件夹及其子文件夹中的全部信息标记为已读。"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:109
+#, fuzzy
+msgid "This will mark all messages as read in the selected folder."
+msgstr "这将把选中文件夹及其子文件夹中的全部信息标记为已读。"
+
+#: ../mail/mail.error.xml.h:110
msgid "Unable to connect to the GroupWise server."
msgstr "无法连接到 GroupWise 服务器。"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:111
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
-msgstr "无法打开此账户的草稿文件夹。使用系统的草稿文件夹吗?"
+msgstr "无法打开此帐号的草稿文件夹。使用系统的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:112
msgid "Unable to read license file."
msgstr "无法读取许可文件。"
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:113
msgid "Use _Default"
msgstr "使用默认值(_D)"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:114
msgid "Use default drafts folder?"
msgstr "使用默认的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:115
msgid ""
"Warning: Deleting messages from a Search Folder will delete the actual "
"message from one of your local or remote folders.\n"
"Do you really want to do this?"
msgstr ""
-"警告:从搜索文件夹中删除信件将会删除实际位于您的本地或远程文件夹中的相应信"
+"警告:从搜索文件夹中删除信息将会删除实际位于您的本地或远程文件夹中的相应信"
"件。\n"
"您真的想要这么做吗?"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:117
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:118
msgid "You have not filled in all of the required information."
msgstr "您没有填入所需的全部信息。"
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:119
msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "您有未发信件,您仍然想要退出吗?"
+msgstr "您有未发信息,您仍然想要退出吗?"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:120
msgid "You may not create two accounts with the same name."
-msgstr "您不能创建两个同名账户。"
+msgstr "您不能创建两个同名帐号。"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:121
msgid "You must name this Search Folder."
msgstr "您必须为此搜索文件夹命名。"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:122
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:123
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -13617,129 +13410,131 @@ msgstr ""
"您必须一次至少指定一个文件夹作为源。\n"
"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:125
msgid "Your login to your server \"{0}\" as \"{0}\" failed."
msgstr "您以“{0}”的身份登录到服务器“{0}”失败。"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:126
msgid "_Append"
msgstr "追加(_A)"
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:127
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:596
+msgid "_Disable"
+msgstr "禁用(_D)"
+
+#: ../mail/mail.error.xml.h:128
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
-#: ../mail/mail.error.xml.h:139
-msgid "_Do not Synchronize"
-msgstr "不同步(_D)"
-
-#: ../mail/mail.error.xml.h:140
-#: ../modules/mail/e-mail-shell-view-actions.c:866
+#: ../mail/mail.error.xml.h:129
+#: ../modules/mail/e-mail-shell-view-actions.c:827
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
-#: ../mail/mail.error.xml.h:141
+#: ../mail/mail.error.xml.h:130
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:131
msgid "_Open Messages"
-msgstr "打开信件(_O)"
+msgstr "打开信息(_O)"
+
+#: ../mail/mail.error.xml.h:134
+#, fuzzy
+msgid "_Send Receipt"
+msgstr "发送收条"
+
+#: ../mail/mail.error.xml.h:135
+#, fuzzy
+msgid "_Synchronize"
+msgstr "同步"
-#: ../mail/message-list.c:1119
+#: ../mail/message-list.c:1159
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:1120
+#: ../mail/message-list.c:1160
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:1121
+#: ../mail/message-list.c:1161
msgid "Answered"
msgstr "已答复"
-#: ../mail/message-list.c:1122
+#: ../mail/message-list.c:1162
msgid "Forwarded"
msgstr "已转发"
-#: ../mail/message-list.c:1123
+#: ../mail/message-list.c:1163
msgid "Multiple Unseen Messages"
-msgstr "多封未看信件"
+msgstr "多封未看信息"
-#: ../mail/message-list.c:1124
+#: ../mail/message-list.c:1164
msgid "Multiple Messages"
msgstr "多封信"
-#: ../mail/message-list.c:1128
+#: ../mail/message-list.c:1168
msgid "Lowest"
msgstr "最低"
-#: ../mail/message-list.c:1129
+#: ../mail/message-list.c:1169
msgid "Lower"
msgstr "较低"
-#: ../mail/message-list.c:1133
+#: ../mail/message-list.c:1173
msgid "Higher"
msgstr "较高"
-#: ../mail/message-list.c:1134
+#: ../mail/message-list.c:1174
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1744 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1784 ../widgets/table/e-cell-date.c:46
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1751 ../plugins/itip-formatter/itip-view.c:209
+#: ../mail/message-list.c:1791 ../plugins/itip-formatter/itip-view.c:205
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../mail/message-list.c:1760
+#: ../mail/message-list.c:1800
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../mail/message-list.c:1772
+#: ../mail/message-list.c:1812
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1780
+#: ../mail/message-list.c:1820
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../mail/message-list.c:1782
+#: ../mail/message-list.c:1822
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2528
+#: ../mail/message-list.c:2582
msgid "Select all visible messages"
-msgstr "选中所有可见的信件"
-
-#: ../mail/message-list.c:2579 ../shell/e-shell-view.c:729
-msgid "Shell Backend"
-msgstr ""
+msgstr "选中所有可见的信息"
#. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4434 ../mail/message-list.c:4932
+#: ../mail/message-list.c:4342 ../mail/message-list.c:4734
msgid "Generating message list"
-msgstr "生成信件列表"
+msgstr "生成信息列表"
-#: ../mail/message-list.c:4763
+#: ../mail/message-list.c:4573
msgid ""
"No message satisfies your search criteria. Either clear search with Search-"
">Clear menu item or change it."
msgstr ""
-#: ../mail/message-list.c:4765
-msgid ""
-"There are only hidden messages in this folder. Use View->Show Hidden "
-"Messages to show them."
-msgstr ""
-
-#: ../mail/message-list.c:4767
+#: ../mail/message-list.c:4575
msgid "There are no messages in this folder."
-msgstr "此文件夹中没有信件。"
+msgstr "此文件夹中没有信息。"
#: ../mail/message-list.etspec.h:3
msgid "Due By"
@@ -13763,10 +13558,10 @@ msgstr "已接收"
#: ../mail/message-list.etspec.h:15
msgid "Sent Messages"
-msgstr "已发信件"
+msgstr "已发信息"
#: ../mail/message-list.etspec.h:16
-#: ../widgets/misc/e-attachment-tree-view.c:542
+#: ../widgets/misc/e-attachment-tree-view.c:560
msgid "Size"
msgstr "大小"
@@ -13775,27 +13570,27 @@ msgid "Subject - Trimmed"
msgstr "主题 - 被截断"
#: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1279
+#: ../modules/mail/e-mail-shell-view-actions.c:1218
msgid "Body contains"
msgstr "邮件体含有"
#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1286
+#: ../modules/mail/e-mail-shell-view-actions.c:1225
msgid "Message contains"
-msgstr "信件含有"
+msgstr "信息含有"
#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1293
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
msgid "Recipients contain"
msgstr "收件人含有"
#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1239
msgid "Sender contains"
msgstr "发件人含有"
#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1307
+#: ../modules/mail/e-mail-shell-view-actions.c:1246
msgid "Subject contains"
msgstr "主题含有"
@@ -13829,16 +13624,16 @@ msgstr ""
"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
"接不太安全,您也易于受到安全漏洞的攻击。"
-#: ../modules/addressbook/addressbook-config.c:592
+#: ../modules/addressbook/addressbook-config.c:602
#, fuzzy
-msgid "Use in _Birthday & Anniversaries calendar"
+msgid "U_se in Birthday & Anniversaries calendar"
msgstr "生日和纪念日"
-#: ../modules/addressbook/addressbook-config.c:628
+#: ../modules/addressbook/addressbook-config.c:638
msgid "Copy _book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
-#: ../modules/addressbook/addressbook-config.c:736
+#: ../modules/addressbook/addressbook-config.c:746
msgid ""
"This is the port on the LDAP server that Evolution will try to connect to. A "
"list of standard ports has been provided. Ask your system administrator what "
@@ -13847,7 +13642,7 @@ msgstr ""
"这是 LDAP 服务器上的端口,Evolution 将试图连接到您所给出的标准端口列表。如果"
"您不清楚要指定的端口,请询问您的系统管理员。"
-#: ../modules/addressbook/addressbook-config.c:810
+#: ../modules/addressbook/addressbook-config.c:820
msgid ""
"This is the method Evolution will use to authenticate you. Note that "
"setting this to \"Email Address\" requires anonymous access to your LDAP "
@@ -13856,7 +13651,7 @@ msgstr ""
"这是 Evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
"对 LDAP 服务器的匿名访问权限。"
-#: ../modules/addressbook/addressbook-config.c:885
+#: ../modules/addressbook/addressbook-config.c:895
msgid ""
"The search scope defines how deep you would like the search to extend down "
"the directory tree. A search scope of \"sub\" will include all entries below "
@@ -13867,29 +13662,29 @@ msgstr ""
"搜索基础下所属的全部项。搜索范围若为“一级”,则只会包含您指定的搜索基础之下一"
"级的项目。"
-#: ../modules/addressbook/addressbook-config.c:991
+#: ../modules/addressbook/addressbook-config.c:1011
msgid "Server Information"
msgstr "服务器信息"
-#: ../modules/addressbook/addressbook-config.c:996
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../modules/addressbook/addressbook-config.c:1016
+#: ../smime/gui/smime-ui.ui.h:13
msgid "Details"
msgstr "细节"
-#: ../modules/addressbook/addressbook-config.c:997
+#: ../modules/addressbook/addressbook-config.c:1017
#: ../modules/mail/e-mail-shell-view.c:54
msgid "Searching"
msgstr "搜索"
-#: ../modules/addressbook/addressbook-config.c:999
+#: ../modules/addressbook/addressbook-config.c:1019
msgid "Downloading"
msgstr "下载"
-#: ../modules/addressbook/addressbook-config.c:1205
+#: ../modules/addressbook/addressbook-config.c:1225
msgid "Address Book Properties"
msgstr "地址簿属性"
-#: ../modules/addressbook/addressbook-config.c:1207
+#: ../modules/addressbook/addressbook-config.c:1227
msgid "New Address Book"
msgstr "新地址簿"
@@ -13967,8 +13762,11 @@ msgstr ""
msgid "Whether to show the preview pane."
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:159
-msgid "Table column:"
+#: ../modules/mail/em-mailer-prefs.c:1165
+#, fuzzy
+msgid "_Table column:"
msgstr "表格栏:"
#: ../modules/addressbook/autocompletion-config.c:162
@@ -13980,426 +13778,314 @@ msgid "Always _show address of the autocompleted contact"
msgstr "总是显示自动补全的联系人的地址(_S)"
#. Create the LDAP source group
-#: ../modules/addressbook/e-book-shell-backend.c:190
-#: ../modules/addressbook/e-book-shell-migrate.c:517
+#: ../modules/addressbook/e-book-shell-backend.c:191
+#: ../modules/addressbook/e-book-shell-migrate.c:148
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
-#: ../modules/addressbook/e-book-shell-backend.c:340
+#: ../modules/addressbook/e-book-shell-backend.c:341
msgctxt "New"
msgid "_Contact"
msgstr "联系人(_C)"
-#: ../modules/addressbook/e-book-shell-backend.c:342
-#: ../modules/addressbook/e-book-shell-view-actions.c:755
+#: ../modules/addressbook/e-book-shell-backend.c:343
+#: ../modules/addressbook/e-book-shell-view-actions.c:757
msgid "Create a new contact"
msgstr "创建一个新联系人"
-#: ../modules/addressbook/e-book-shell-backend.c:347
+#: ../modules/addressbook/e-book-shell-backend.c:348
msgctxt "New"
msgid "Contact _List"
msgstr "联系人列表(_L)"
-#: ../modules/addressbook/e-book-shell-backend.c:349
-#: ../modules/addressbook/e-book-shell-view-actions.c:762
+#: ../modules/addressbook/e-book-shell-backend.c:350
+#: ../modules/addressbook/e-book-shell-view-actions.c:764
msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
-#: ../modules/addressbook/e-book-shell-backend.c:357
+#: ../modules/addressbook/e-book-shell-backend.c:358
msgctxt "New"
msgid "Address _Book"
msgstr "地址簿(_B)"
-#: ../modules/addressbook/e-book-shell-backend.c:359
-#: ../modules/addressbook/e-book-shell-view-actions.c:685
+#: ../modules/addressbook/e-book-shell-backend.c:360
+#: ../modules/addressbook/e-book-shell-view-actions.c:687
msgid "Create a new address book"
msgstr "创建新地址簿"
#. Create the contacts group
-#: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:394
-#: ../modules/calendar/e-cal-shell-backend.c:123
-#: ../modules/calendar/e-cal-shell-migrate.c:480
+#: ../modules/addressbook/e-book-shell-backend.c:377
+#: ../modules/addressbook/e-book-shell-view.c:398
+#: ../modules/calendar/e-cal-shell-backend.c:124
+#: ../modules/calendar/e-cal-shell-migrate.c:57
msgid "Contacts"
msgstr "联系人"
-#: ../modules/addressbook/e-book-shell-backend.c:596
-#: ../modules/calendar/e-cal-shell-backend.c:777
-#: ../modules/calendar/e-memo-shell-backend.c:587
-#: ../modules/calendar/e-task-shell-backend.c:597
-msgid "Source List"
-msgstr "来源列表"
-
-#: ../modules/addressbook/e-book-shell-backend.c:597
-#, fuzzy
-msgid "The registry of address books"
-msgstr "无法获得地址簿列表"
-
-#: ../modules/addressbook/e-book-shell-content.c:364
-msgid "Current View"
-msgstr "当前视图"
-
-#: ../modules/addressbook/e-book-shell-content.c:365
-msgid "The currently selected address book view"
-msgstr ""
-
-#: ../modules/addressbook/e-book-shell-content.c:374
-#, fuzzy
-msgid "Previewed Contact"
-msgstr "新建联系人"
-
-#: ../modules/addressbook/e-book-shell-content.c:375
-#, fuzzy
-msgid "The contact being shown in the preview pane"
-msgstr "是否显示预览面板。"
-
-#: ../modules/addressbook/e-book-shell-content.c:384
-#: ../modules/calendar/e-memo-shell-content.c:617
-#: ../modules/calendar/e-task-shell-content.c:639
-#: ../modules/mail/e-mail-shell-content.c:689
-#, fuzzy
-msgid "Preview is Visible"
-msgstr "侧边栏可见"
-
-#: ../modules/addressbook/e-book-shell-content.c:385
-#: ../modules/calendar/e-memo-shell-content.c:618
-#: ../modules/calendar/e-task-shell-content.c:640
-#: ../modules/mail/e-mail-shell-content.c:690
-#, fuzzy
-msgid "Whether the preview pane is visible"
-msgstr "是否显示预览面板。"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:645
-msgid "LDAP Servers"
-msgstr "LDAP 服务器"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:765
-msgid "Autocompletion Settings"
-msgstr "自动补全设置"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1152
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1166
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"邮件列表联系人的格式已经更改。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1175
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 存储某些电话号码的方式已经更改。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#: ../modules/addressbook/e-book-shell-migrate.c:1185
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution Palm 同步更新日志和地图文件已经更改。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
-#: ../modules/calendar/e-memo-shell-sidebar.c:689
-#: ../modules/calendar/e-task-shell-sidebar.c:689
-#, fuzzy
-msgid "Source Selector Widget"
-msgstr "备忘来源选择器"
-
-#: ../modules/addressbook/e-book-shell-sidebar.c:182
-#, fuzzy
-msgid "This widget displays groups of address books"
-msgstr "无法获得地址簿列表"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:262
-#: ../modules/addressbook/e-book-shell-view-actions.c:539
+#. Translators: This is a save dialog title
+#: ../modules/addressbook/e-book-shell-view-actions.c:263
+#: ../modules/addressbook/e-book-shell-view-actions.c:541
msgid "Save as vCard"
msgstr "另存为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:662
+#: ../modules/addressbook/e-book-shell-view-actions.c:664
msgid "Co_py All Contacts To..."
msgstr "将全部联系人复制到(_P)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:666
#, fuzzy
msgid "Copy the contacts of the selected address book to another"
msgstr "把选中文件夹中的联系人复制到其它文件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:669
+#: ../modules/addressbook/e-book-shell-view-actions.c:671
#, fuzzy
-#| msgid "Del_ete Address Book"
msgid "D_elete Address Book"
msgstr "删除地址簿(_E)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:671
+#: ../modules/addressbook/e-book-shell-view-actions.c:673
#, fuzzy
msgid "Delete the selected address book"
msgstr "删除选中的文件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:676
+#: ../modules/addressbook/e-book-shell-view-actions.c:678
msgid "Mo_ve All Contacts To..."
msgstr "将全部联系人移至(_V)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:678
+#: ../modules/addressbook/e-book-shell-view-actions.c:680
#, fuzzy
msgid "Move the contacts of the selected address book to another"
msgstr "把选中文件夹中的联系人移至其它文件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:683
+#: ../modules/addressbook/e-book-shell-view-actions.c:685
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:690
+#: ../modules/addressbook/e-book-shell-view-actions.c:692
msgid "Address _Book Properties"
msgstr "地址簿属性(_B)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:692
+#: ../modules/addressbook/e-book-shell-view-actions.c:694
#, fuzzy
msgid "Show properties of the selected address book"
msgstr "更改选中文件夹的属性"
-#: ../modules/addressbook/e-book-shell-view-actions.c:697
-#: ../modules/calendar/e-cal-shell-view-actions.c:1300
-#: ../modules/calendar/e-memo-shell-view-actions.c:610
-#: ../modules/calendar/e-task-shell-view-actions.c:734
-#: ../modules/mail/e-mail-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-actions.c:1354
+#: ../modules/calendar/e-memo-shell-view-actions.c:620
+#: ../modules/calendar/e-task-shell-view-actions.c:744
+#: ../modules/mail/e-mail-shell-view-actions.c:911
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:699
+#: ../modules/addressbook/e-book-shell-view-actions.c:701
#, fuzzy
msgid "Rename the selected address book"
msgstr "重命名选中文件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:704
+#: ../modules/addressbook/e-book-shell-view-actions.c:706
msgid "S_ave Address Book as vCard"
msgstr "保存地址簿为 VCard(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:706
+#: ../modules/addressbook/e-book-shell-view-actions.c:708
#, fuzzy
msgid "Save the contacts of the selected address book as a vCard"
msgstr "把选中文件夹中的的联系人保存为 VCard"
-#: ../modules/addressbook/e-book-shell-view-actions.c:713
+#: ../modules/addressbook/e-book-shell-view-actions.c:715
msgid "Stop loading"
msgstr "停止载入"
-#: ../modules/addressbook/e-book-shell-view-actions.c:718
+#: ../modules/addressbook/e-book-shell-view-actions.c:720
#, fuzzy
msgid "_Copy Contact To..."
msgstr "将联系人复制到(_C)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:720
+#: ../modules/addressbook/e-book-shell-view-actions.c:722
#, fuzzy
msgid "Copy selected contacts to another address book"
msgstr "把选中的联系人复制到其它文件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:725
+#: ../modules/addressbook/e-book-shell-view-actions.c:727
msgid "_Delete Contact"
msgstr "删除联系人(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:732
+#: ../modules/addressbook/e-book-shell-view-actions.c:734
#, fuzzy
-#| msgid "_Forward Contact..."
msgid "_Find in Contact..."
msgstr "转发联系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:734
+#: ../modules/addressbook/e-book-shell-view-actions.c:736
#, fuzzy
-#| msgid "Search for text in the body of the displayed message"
msgid "Search for text in the displayed contact"
-msgstr "在显示信件的主体中搜索文本"
+msgstr "在显示信息的主体中搜索文本"
-#: ../modules/addressbook/e-book-shell-view-actions.c:739
+#: ../modules/addressbook/e-book-shell-view-actions.c:741
msgid "_Forward Contact..."
msgstr "转发联系人(_F)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:741
+#: ../modules/addressbook/e-book-shell-view-actions.c:743
msgid "Send selected contacts to another person"
msgstr "把选中的联系人发送给其他人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:746
+#: ../modules/addressbook/e-book-shell-view-actions.c:748
#, fuzzy
msgid "_Move Contact To..."
msgstr "将联系人移至(_M)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:748
+#: ../modules/addressbook/e-book-shell-view-actions.c:750
#, fuzzy
msgid "Move selected contacts to another address book"
msgstr "把选中的联系人移至其它文件夹"
-#: ../modules/addressbook/e-book-shell-view-actions.c:753
+#: ../modules/addressbook/e-book-shell-view-actions.c:755
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:762
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:767
+#: ../modules/addressbook/e-book-shell-view-actions.c:769
msgid "_Open Contact"
msgstr "打开联系人(_O)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:769
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
msgid "View the current contact"
msgstr "查看当前联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:774
+#: ../modules/addressbook/e-book-shell-view-actions.c:776
msgid "_Send Message to Contact..."
-msgstr "给联系人发信件(_S)..."
+msgstr "给联系人发信息(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:776
+#: ../modules/addressbook/e-book-shell-view-actions.c:778
msgid "Send a message to the selected contacts"
-msgstr "给选中的联系人发信件"
+msgstr "给选中的联系人发信息"
-#: ../modules/addressbook/e-book-shell-view-actions.c:783
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-#: ../modules/calendar/e-task-shell-view-actions.c:792
+#: ../modules/addressbook/e-book-shell-view-actions.c:785
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-task-shell-view-actions.c:802
msgid "_Actions"
msgstr "操作(_A)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:790
-#: ../modules/calendar/e-memo-shell-view-actions.c:647
-#: ../modules/calendar/e-task-shell-view-actions.c:799
-#: ../modules/mail/e-mail-shell-view-actions.c:1094
+#: ../modules/addressbook/e-book-shell-view-actions.c:792
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/mail/e-mail-shell-view-actions.c:1034
msgid "_Preview"
msgstr "预览(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:799
-#: ../modules/calendar/e-cal-shell-view-actions.c:1452
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/addressbook/e-book-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:822
msgid "_Delete"
msgstr "删除(_D)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:803
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
msgid "_Properties"
msgstr "属性(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#. Translators: This is an action label
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
msgid "_Save as vCard..."
msgstr "另存为 vCard(_S)..."
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
msgid "Contact _Preview"
msgstr "联系人预览(_P)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:844
msgid "Show contact preview window"
msgstr "显示联系人预览窗口"
-#: ../modules/addressbook/e-book-shell-view-actions.c:860
-#: ../modules/calendar/e-memo-shell-view-actions.c:717
-#: ../modules/calendar/e-task-shell-view-actions.c:881
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
+#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/mail/e-mail-shell-view-actions.c:1128
msgid "_Classic View"
msgstr "分类视图(_C)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
#, fuzzy
msgid "Show contact preview below the contact list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
-#: ../modules/calendar/e-memo-shell-view-actions.c:724
-#: ../modules/calendar/e-task-shell-view-actions.c:888
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
+#: ../modules/calendar/e-memo-shell-view-actions.c:734
+#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/mail/e-mail-shell-view-actions.c:1135
msgid "_Vertical View"
msgstr "垂直视图(_V)"
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:872
#, fuzzy
msgid "Show contact preview alongside the contact list"
msgstr "显示联系人预览窗口"
-#: ../modules/addressbook/e-book-shell-view-actions.c:877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
-#: ../modules/calendar/e-memo-shell-view-actions.c:734
-#: ../modules/calendar/e-task-shell-view-actions.c:905
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/calendar/e-cal-shell-view-actions.c:1656
+#: ../modules/calendar/e-memo-shell-view-actions.c:744
+#: ../modules/calendar/e-task-shell-view-actions.c:915
msgid "Any Category"
msgstr "任何类别"
-#: ../modules/addressbook/e-book-shell-view-actions.c:884
-#: ../modules/calendar/e-cal-shell-view-actions.c:1609
-#: ../modules/calendar/e-memo-shell-view-actions.c:741
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/calendar/e-cal-shell-view-actions.c:1670
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-task-shell-view-actions.c:950
msgid "Unmatched"
msgstr "无匹配"
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
-#: ../modules/calendar/e-cal-shell-view-actions.c:1619
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
-#: ../modules/calendar/e-task-shell-view-actions.c:950
-#: ../modules/mail/e-mail-shell-view-actions.c:1272
-#: ../shell/e-shell-content.c:516
+#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/calendar/e-cal-shell-view-actions.c:1680
+#: ../modules/calendar/e-memo-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1211
+#: ../shell/e-shell-content.c:459
msgid "Advanced Search"
msgstr "高级搜索"
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
#, fuzzy
msgid "Print all shown contacts"
msgstr "打印选中的联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
#, fuzzy
msgid "Preview the contacts to be printed"
msgstr "预览将要打印的联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
msgid "Print selected contacts"
msgstr "打印选中的联系人"
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
-msgid "Save as vCard..."
-msgstr "另存为 VCard..."
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
#, fuzzy
msgid "Save selected contacts as a vCard"
msgstr "把选中的联系人保存为 VCard"
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:342
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:340
+#: ../modules/addressbook/e-book-shell-view.c:344
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:375
#, fuzzy
msgid "_Send Message to Contacts"
-msgstr "给联系人发信件(_M)"
+msgstr "给联系人发信息(_M)"
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:377
#, fuzzy
msgid "_Send Message to List"
-msgstr "给列表发信件(_M)"
+msgstr "给列表发信息(_M)"
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:379
#, fuzzy
msgid "_Send Message to Contact"
-msgstr "给联系人发信件(_M)"
+msgstr "给联系人发信息(_M)"
#: ../modules/addressbook/eab-composer-util.c:137
msgid "Multiple vCards"
@@ -14421,57 +14107,47 @@ msgstr "联系人信息"
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
-#: ../modules/addressbook/ldap-config.ui.h:1
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
+#: ../modules/addressbook/ldap-config.ui.h:2
msgid "1"
msgstr "1"
-#: ../modules/addressbook/ldap-config.ui.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../modules/addressbook/ldap-config.ui.h:3
-msgid "389"
-msgstr "389"
-
+#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
#: ../modules/addressbook/ldap-config.ui.h:4
msgid "5"
msgstr "5"
#: ../modules/addressbook/ldap-config.ui.h:5
-msgid "636"
-msgstr "636"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
msgid "Anonymously"
msgstr "匿名"
#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:8
+#: ../modules/addressbook/ldap-config.ui.h:7
msgid "B_rowse this book until limit reached"
msgstr "浏览此地址簿直到达到极限(_R)"
-#: ../modules/addressbook/ldap-config.ui.h:9
+#: ../modules/addressbook/ldap-config.ui.h:8
msgid "Lo_gin:"
msgstr "登录(_G):"
#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:11
msgid "One"
msgstr "一次"
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:13
msgid "Search Filter"
msgstr "搜索过滤器"
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:14
msgid "Search _base:"
msgstr "搜索基础(_B):"
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:15
msgid "Search _filter:"
msgstr "搜索过滤器(_F):"
-#: ../modules/addressbook/ldap-config.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:16
#, fuzzy
msgid ""
"Search filter is the type of object to be searched for. If this is not "
@@ -14481,55 +14157,56 @@ msgstr ""
"将会在“个人”类型的对象类型。"
#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:18
msgid "Sub"
msgstr "子"
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:19
msgid "Supported Search Bases"
msgstr "支持的搜索起点"
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:21
msgid "Using distinguished name (DN)"
msgstr "使用已识别的姓名(DN)"
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:22
msgid "Using email address"
msgstr "使用电子邮件地址"
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:23
msgid "_Download limit:"
msgstr "下载限制(_D):"
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:24
msgid "_Find Possible Search Bases"
msgstr "查找可能的搜索基础(_F)"
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:25
msgid "_Login method:"
msgstr "登录方式(_L):"
-#: ../modules/addressbook/ldap-config.ui.h:28
+#: ../modules/addressbook/ldap-config.ui.h:27
msgid "_Port:"
msgstr "端口(_P):"
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:28
msgid "_Search scope:"
msgstr "搜索范围(_S):"
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:30
msgid "_Timeout:"
msgstr "超时(_T):"
-#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../modules/addressbook/ldap-config.ui.h:31
msgid "_Use secure connection:"
msgstr "使用安全连接(_U):"
-#: ../modules/addressbook/ldap-config.ui.h:33
+#: ../modules/addressbook/ldap-config.ui.h:32
msgid "cards"
msgstr "名片"
#: ../modules/calendar/e-cal-attachment-handler.c:259
+#: ../smime/gui/smime-ui.ui.h:22
msgid "I_mport"
msgstr "导入(_M)"
@@ -14550,97 +14227,69 @@ msgid "I_mport to Tasks"
msgstr "导入到任务(_M)"
#. Create the Webcal source group
-#: ../modules/calendar/e-cal-shell-backend.c:125
-#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-cal-shell-backend.c:126
+#: ../modules/calendar/e-cal-shell-migrate.c:176
#: ../modules/calendar/e-memo-shell-backend.c:110
#: ../modules/calendar/e-memo-shell-migrate.c:136
#: ../modules/calendar/e-task-shell-backend.c:113
-#: ../modules/calendar/e-task-shell-migrate.c:535
+#: ../modules/calendar/e-task-shell-migrate.c:145
msgid "On The Web"
msgstr "网上"
-#: ../modules/calendar/e-cal-shell-backend.c:127
+#: ../modules/calendar/e-cal-shell-backend.c:128
#: ../plugins/calendar-weather/calendar-weather.c:117
msgid "Weather"
msgstr "天气"
-#: ../modules/calendar/e-cal-shell-backend.c:242
-#: ../modules/calendar/e-cal-shell-migrate.c:483
+#: ../modules/calendar/e-cal-shell-backend.c:252
+#: ../modules/calendar/e-cal-shell-migrate.c:60
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
-#: ../modules/calendar/e-cal-shell-backend.c:446
+#: ../modules/calendar/e-cal-shell-backend.c:456
msgctxt "New"
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../modules/calendar/e-cal-shell-backend.c:448
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-backend.c:458
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../modules/calendar/e-cal-shell-backend.c:453
+#: ../modules/calendar/e-cal-shell-backend.c:463
msgctxt "New"
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../modules/calendar/e-cal-shell-backend.c:455
+#: ../modules/calendar/e-cal-shell-backend.c:465
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../modules/calendar/e-cal-shell-backend.c:460
+#: ../modules/calendar/e-cal-shell-backend.c:470
msgctxt "New"
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../modules/calendar/e-cal-shell-backend.c:462
+#: ../modules/calendar/e-cal-shell-backend.c:472
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../modules/calendar/e-cal-shell-backend.c:470
+#: ../modules/calendar/e-cal-shell-backend.c:480
msgctxt "New"
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../modules/calendar/e-cal-shell-backend.c:472
-#: ../modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../modules/calendar/e-cal-shell-backend.c:482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
msgid "Create a new calendar"
msgstr "创建新日历"
-#: ../modules/calendar/e-cal-shell-backend.c:507
-#: ../plugins/itip-formatter/itip-formatter.c:2657
+#: ../modules/calendar/e-cal-shell-backend.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:2667
msgid "Calendar and Tasks"
msgstr "日历和任务"
-#: ../modules/calendar/e-cal-shell-backend.c:778
-msgid "The registry of calendars"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-migrate.c:131
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 日历文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#. FIXME: set proper domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:664
-#: ../modules/calendar/e-task-shell-migrate.c:591
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-cal-shell-migrate.c:693
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "无法升迁日历“%s”"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:168
+#: ../modules/calendar/e-cal-shell-sidebar.c:169
#: ../modules/calendar/e-memo-shell-sidebar.c:163
#: ../modules/calendar/e-task-shell-sidebar.c:163
#, c-format
@@ -14651,38 +14300,21 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: ../modules/calendar/e-cal-shell-sidebar.c:227
+#: ../modules/calendar/e-cal-shell-sidebar.c:230
msgid "Loading calendars"
-msgstr "装入日历"
+msgstr "载入日历"
-#: ../modules/calendar/e-cal-shell-sidebar.c:617
-msgid "Calendar Selector"
-msgstr "日历选择器"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:743
-msgid "Date Navigator Widget"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:744
-msgid "This widget displays a miniature calendar"
-msgstr ""
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:753
+#: ../modules/calendar/e-cal-shell-sidebar.c:652
#, fuzzy
-#| msgid "Default Mail Client"
-msgid "Default Calendar Client"
-msgstr "默认邮件客户端"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:754
-msgid "Default client for calendar operations"
-msgstr ""
+msgid "_New Calendar..."
+msgstr "新建日历(_N)"
-#: ../modules/calendar/e-cal-shell-sidebar.c:764
-msgid "This widget displays groups of calendars"
-msgstr ""
+#: ../modules/calendar/e-cal-shell-sidebar.c:669
+msgid "Calendar Selector"
+msgstr "日历选择器"
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-cal-shell-sidebar.c:952
+#: ../modules/calendar/e-cal-shell-sidebar.c:1010
#, c-format
msgid "Opening calendar at %s"
msgstr "在 %s 打开日历"
@@ -14710,303 +14342,303 @@ msgstr "销毁较早的事件"
msgid "Copying Items"
msgstr "复制项目"
-#: ../modules/calendar/e-cal-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
msgid "Moving Items"
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:1098
+#: ../modules/calendar/e-cal-shell-view-actions.c:1126
msgid "event"
msgstr "事件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1100
-#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1128
+#: ../modules/calendar/e-cal-shell-view-memopad.c:210
#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
-#: ../modules/calendar/e-memo-shell-view-actions.c:494
-#: ../modules/calendar/e-task-shell-view-actions.c:611
+#: ../modules/calendar/e-memo-shell-view-actions.c:504
+#: ../modules/calendar/e-task-shell-view-actions.c:621
msgid "Save as iCalendar"
msgstr "保存为 iCalendar"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1230
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1237
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
msgid "D_elete Calendar"
msgstr "删除日历(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1239
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
#, fuzzy
-#| msgid "Rename the selected calendar"
msgid "Delete the selected calendar"
msgstr "重命名选中的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1246
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
msgid "Go Back"
msgstr "后退"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1253
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
msgid "Go Forward"
msgstr "前进"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1258
-msgid "Select _Today"
-msgstr "选择今天(_T)"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:1260
+#: ../modules/calendar/e-cal-shell-view-actions.c:1314
msgid "Select today"
msgstr "选择今天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1265
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
msgid "Select _Date"
msgstr "选择日期(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
msgid "Select a specific date"
msgstr "选择特定日期"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1272
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1286
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
+#: ../modules/calendar/e-task-shell-view-actions.c:793
msgid "Purg_e"
msgstr "销毁(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../modules/calendar/e-cal-shell-view-actions.c:1342
msgid "Purge old appointments and meetings"
msgstr "销毁旧约会和会议"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1293
-#: ../modules/calendar/e-memo-shell-view-actions.c:603
-#: ../modules/calendar/e-task-shell-view-actions.c:727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:737
msgid "Re_fresh"
msgstr "刷新(_F)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../modules/calendar/e-cal-shell-view-actions.c:1349
msgid "Refresh the selected calendar"
msgstr "刷新选中的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1302
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
msgid "Rename the selected calendar"
msgstr "重命名选中的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1307
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
msgid "Show _Only This Calendar"
msgstr "只显示此日历(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1314
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1321
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1328
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
msgid "_Delete Appointment"
msgstr "删除约会(_D)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1330
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
msgid "Delete selected appointments"
msgstr "删除选中的约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
msgid "Delete This _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1337
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
msgid "Delete this occurrence"
msgstr "删除此次发生"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
msgid "Delete All Occ_urrences"
msgstr "删除所有出现(_U)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
msgid "Delete all occurrences"
msgstr "删除全部发生"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
msgid "New All Day _Event..."
msgstr "新建全天事件(_E)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
msgid "Create a new all day event"
msgstr "创建一个新的全天事件"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
-#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
+#: ../modules/calendar/e-cal-shell-view-memopad.c:244
#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:702
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
msgid "New _Meeting..."
msgstr "新建会议(_M)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
msgid "Create a new meeting"
msgstr "创建一个新的会议"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1384
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
msgid "_Open Appointment"
msgstr "打开约会(_O)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
msgid "View the current appointment"
msgstr "查看当前约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
msgid "_Reply"
msgstr "回复(_R)"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1466
+#: ../modules/calendar/e-cal-shell-view-memopad.c:272
msgid "Save as iCalendar..."
msgstr "保存为 iCalendar..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1473
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
#, fuzzy
msgid "Converts an appointment to a meeting"
msgstr "销毁旧约会和会议"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1480
msgid "Conv_ert to Appointment..."
msgstr "转换到约会(_E)..."
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
#, fuzzy
msgid "Converts a meeting to an appointment"
msgstr "在约会结束时 %s"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1487
+#, fuzzy
+msgid "Quit"
+msgstr "引用"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
msgid "Day"
msgstr "天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/calendar/e-cal-shell-view-actions.c:1613
msgid "Show one day"
msgstr "显示一天"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
msgid "List"
msgstr "列表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1559
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
msgid "Show as list"
msgstr "显示为列表"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
msgid "Month"
msgstr "月"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
msgid "Show one month"
msgstr "显示一个月"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1632
msgid "Week"
msgstr "周"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
msgid "Show one week"
msgstr "显示一周"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
#, fuzzy
msgid "Show one work week"
msgstr "显示一周"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
msgid "Active Appointments"
msgstr "活动约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1663
msgid "Next 7 Days' Appointments"
msgstr "下一周的约会"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1633
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-memo-shell-view-actions.c:775
+#: ../modules/calendar/e-task-shell-view-actions.c:974
msgid "Description contains"
msgstr "描述含有"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1640
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-memo-shell-view-actions.c:782
+#: ../modules/calendar/e-task-shell-view-actions.c:981
msgid "Summary contains"
msgstr "概要含有"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1652
+#: ../modules/calendar/e-cal-shell-view-actions.c:1713
msgid "Print this calendar"
msgstr "打印此日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1659
+#: ../modules/calendar/e-cal-shell-view-actions.c:1720
msgid "Preview the calendar to be printed"
msgstr "预览将要打印的日历"
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
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:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:492
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-memo-shell-view-actions.c:502
msgid "memo"
msgstr "备忘"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:250
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:634
msgid "New _Memo"
msgstr "新建备忘(_M)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:252
-#: ../modules/calendar/e-memo-shell-backend.c:320
-#: ../modules/calendar/e-memo-shell-view-actions.c:626
+#: ../modules/calendar/e-cal-shell-view-memopad.c:253
+#: ../modules/calendar/e-memo-shell-backend.c:322
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:641
msgid "_Open Memo"
msgstr "打开备忘(_O)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:259
-#: ../modules/calendar/e-memo-shell-view-actions.c:633
+#: ../modules/calendar/e-cal-shell-view-memopad.c:260
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
msgid "View the selected memo"
msgstr "查看选中的备忘"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-memopad.c:265
#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-memo-shell-view-actions.c:648
+#: ../modules/calendar/e-task-shell-view-actions.c:786
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
msgid "Print the selected memo"
msgstr "打印选中的备忘"
@@ -15015,22 +14647,22 @@ msgstr "打印选中的备忘"
#. 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:275
-#: ../modules/calendar/e-task-shell-view-actions.c:609
+#: ../modules/calendar/e-task-shell-view-actions.c:619
msgid "task"
msgstr "任务"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
-#: ../modules/calendar/e-task-shell-view-actions.c:671
+#: ../modules/calendar/e-task-shell-view-actions.c:681
msgid "_Assign Task"
msgstr "分配任务(_A)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-view-actions.c:758
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
-#: ../modules/calendar/e-task-shell-view-actions.c:750
+#: ../modules/calendar/e-task-shell-view-actions.c:760
msgid "Mark selected tasks as complete"
msgstr "把选中任务标记为完成"
@@ -15039,100 +14671,76 @@ msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
-#: ../modules/calendar/e-task-shell-view-actions.c:757
+#: ../modules/calendar/e-task-shell-view-actions.c:767
msgid "Mark selected tasks as incomplete"
msgstr "把选中任务标记为未完成"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:772
msgid "New _Task"
msgstr "新建任务(_T)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
#: ../modules/calendar/e-task-shell-backend.c:324
-#: ../modules/calendar/e-task-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:774
msgid "Create a new task"
msgstr "创建新任务"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:779
msgid "_Open Task"
msgstr "打开任务(_O)"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:781
msgid "View the selected task"
msgstr "查看选中的任务"
#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
msgid "_Save as iCalendar..."
msgstr "保存为 iCalendar(_S)..."
#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-task-shell-view-actions.c:1007
msgid "Print the selected task"
msgstr "打印选中的任务"
-#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-backend.c:320
msgctxt "New"
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../modules/calendar/e-memo-shell-backend.c:325
+#: ../modules/calendar/e-memo-shell-backend.c:327
msgctxt "New"
msgid "_Shared Memo"
msgstr "共享的备忘(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:327
+#: ../modules/calendar/e-memo-shell-backend.c:329
msgid "Create a new shared memo"
msgstr "创建一个新的共享备忘"
-#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-backend.c:337
msgctxt "New"
msgid "Memo Li_st"
msgstr "备忘列表(_S)"
-#: ../modules/calendar/e-memo-shell-backend.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:591
+#: ../modules/calendar/e-memo-shell-backend.c:339
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
msgid "Create a new memo list"
msgstr "创建新备忘列表"
-#: ../modules/calendar/e-memo-shell-backend.c:588
-#, fuzzy
-msgid "The registry of memo lists"
-msgstr "打印备忘列表"
-
-#: ../modules/calendar/e-memo-shell-content.c:608
-#, fuzzy
-msgid "The memo table model"
-msgstr "表格模型"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:222
+#: ../modules/calendar/e-memo-shell-sidebar.c:224
msgid "Loading memos"
-msgstr "装入备忘"
+msgstr "载入备忘"
-#: ../modules/calendar/e-memo-shell-sidebar.c:571
+#: ../modules/calendar/e-memo-shell-sidebar.c:591
msgid "Memo List Selector"
msgstr "备忘列表选择器"
-#: ../modules/calendar/e-memo-shell-sidebar.c:679
-#, fuzzy
-#| msgid "Default Mail Client"
-msgid "Default Memo Client"
-msgstr "默认邮件客户端"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:680
-msgid "Default client for memo operations"
-msgstr ""
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
-msgid "This widget displays groups of memo lists"
-msgstr ""
-
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-memo-shell-sidebar.c:870
+#: ../modules/calendar/e-memo-shell-sidebar.c:896
#, c-format
msgid "Opening memos at %s"
msgstr "在 %s 打开备忘"
@@ -15142,76 +14750,73 @@ msgstr "在 %s 打开备忘"
msgid "Print Memos"
msgstr "打印备忘"
-#: ../modules/calendar/e-memo-shell-view-actions.c:554
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
msgid "_Delete Memo"
msgstr "删除备忘(_D)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:561
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
#, fuzzy
-#| msgid "_Find in Message..."
msgid "_Find in Memo..."
-msgstr "在信件中查找(_F)..."
+msgstr "在信息中查找(_F)..."
-#: ../modules/calendar/e-memo-shell-view-actions.c:563
+#: ../modules/calendar/e-memo-shell-view-actions.c:573
#, fuzzy
-#| msgid "Search for text in the body of the displayed message"
msgid "Search for text in the displayed memo"
-msgstr "在显示信件的主体中搜索文本"
+msgstr "在显示信息的主体中搜索文本"
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
#, fuzzy
-#| msgid "Delete Memos"
msgid "D_elete Memo List"
msgstr "删除备忘"
-#: ../modules/calendar/e-memo-shell-view-actions.c:584
+#: ../modules/calendar/e-memo-shell-view-actions.c:594
#, fuzzy
msgid "Delete the selected memo list"
msgstr "重命名选中文件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
msgid "_New Memo List"
msgstr "新建备忘列表(_N)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:605
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
#, fuzzy
msgid "Refresh the selected memo list"
msgstr "重命名选中文件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:612
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
#, fuzzy
msgid "Rename the selected memo list"
msgstr "重命名选中文件夹"
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:627
#, fuzzy
msgid "Show _Only This Memo List"
msgstr "只显示此备忘列表(_O)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:696
+#: ../modules/calendar/e-memo-shell-view-actions.c:706
msgid "Memo _Preview"
msgstr "备忘预览(_P)"
-#: ../modules/calendar/e-memo-shell-view-actions.c:698
+#: ../modules/calendar/e-memo-shell-view-actions.c:708
#, fuzzy
msgid "Show memo preview pane"
msgstr "显示预览面板"
-#: ../modules/calendar/e-memo-shell-view-actions.c:719
+#: ../modules/calendar/e-memo-shell-view-actions.c:729
#, fuzzy
msgid "Show memo preview below the memo list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-memo-shell-view-actions.c:736
#, fuzzy
msgid "Show memo preview alongside the memo list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-memo-shell-view-actions.c:794
msgid "Print the list of memos"
msgstr "打印备忘列表"
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-memo-shell-view-actions.c:801
#, fuzzy
msgid "Preview the list of memos to be printed"
msgstr "预览要打印的备忘列表"
@@ -15234,8 +14839,6 @@ msgstr "删除备忘"
#: ../modules/calendar/e-memo-shell-view.c:225
#, fuzzy
-#| msgid "Delete Memo"
-#| msgid_plural "Delete Memos"
msgid "Delete Memo"
msgstr "删除备忘"
@@ -15259,64 +14862,21 @@ msgid "Tas_k List"
msgstr "任务列表(_K)"
#: ../modules/calendar/e-task-shell-backend.c:341
-#: ../modules/calendar/e-task-shell-view-actions.c:715
+#: ../modules/calendar/e-task-shell-view-actions.c:725
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../modules/calendar/e-task-shell-backend.c:598
-#, fuzzy
-msgid "The registry of task lists"
-msgstr "打印任务列表"
-
-#: ../modules/calendar/e-task-shell-content.c:630
-#, fuzzy
-msgid "The task table model"
-msgstr "表格模型"
-
-#: ../modules/calendar/e-task-shell-migrate.c:98
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候,Evolution 正在升迁您的文件夹..."
-
-#. FIXME: domain/code
-#: ../modules/calendar/e-task-shell-migrate.c:620
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "无法升迁任务“%s”"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:222
+#: ../modules/calendar/e-task-shell-sidebar.c:224
msgid "Loading tasks"
-msgstr "装入任务"
+msgstr "载入任务"
-#: ../modules/calendar/e-task-shell-sidebar.c:571
+#: ../modules/calendar/e-task-shell-sidebar.c:591
#, fuzzy
msgid "Task List Selector"
msgstr "任务来源选择器"
-#: ../modules/calendar/e-task-shell-sidebar.c:679
-#, fuzzy
-#| msgid "Default Mail Client"
-msgid "Default Task Client"
-msgstr "默认邮件客户端"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:680
-#, fuzzy
-#| msgid "Default value for thread expand state"
-msgid "Default client for task operations"
-msgstr "话题的默认展开状态"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:690
-msgid "This widget displays groups of task lists"
-msgstr ""
-
#. Translators: The string field is a URI.
-#: ../modules/calendar/e-task-shell-sidebar.c:870
+#: ../modules/calendar/e-task-shell-sidebar.c:896
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
@@ -15326,7 +14886,7 @@ msgstr "在 %s 打开任务"
msgid "Print Tasks"
msgstr "打印任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:553
+#: ../modules/calendar/e-task-shell-view-actions.c:563
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -15337,107 +14897,104 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: ../modules/calendar/e-task-shell-view-actions.c:678
+#: ../modules/calendar/e-task-shell-view-actions.c:688
msgid "_Delete Task"
msgstr "删除任务(_D)"
-#: ../modules/calendar/e-task-shell-view-actions.c:685
+#: ../modules/calendar/e-task-shell-view-actions.c:695
#, fuzzy
-#| msgid "_Find in Message..."
msgid "_Find in Task..."
-msgstr "在信件中查找(_F)..."
+msgstr "在信息中查找(_F)..."
-#: ../modules/calendar/e-task-shell-view-actions.c:687
+#: ../modules/calendar/e-task-shell-view-actions.c:697
#, fuzzy
-#| msgid "Search for text in the body of the displayed message"
msgid "Search for text in the displayed task"
-msgstr "在显示信件的主体中搜索文本"
+msgstr "在显示信息的主体中搜索文本"
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:709
msgid "Copy..."
msgstr "复制..."
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-task-shell-view-actions.c:716
#, fuzzy
-#| msgid "Delete Tasks"
msgid "D_elete Task List"
msgstr "删除任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:708
+#: ../modules/calendar/e-task-shell-view-actions.c:718
#, fuzzy
msgid "Delete the selected task list"
msgstr "重命名选中文件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-task-shell-view-actions.c:723
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../modules/calendar/e-task-shell-view-actions.c:729
+#: ../modules/calendar/e-task-shell-view-actions.c:739
#, fuzzy
msgid "Refresh the selected task list"
msgstr "重命名选中文件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:736
+#: ../modules/calendar/e-task-shell-view-actions.c:746
#, fuzzy
msgid "Rename the selected task list"
msgstr "重命名选中文件夹"
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:751
msgid "Show _Only This Task List"
msgstr "只显示此任务列表(_O)"
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:765
msgid "Mar_k as Incomplete"
msgstr "标记为未完成(_K)"
-#: ../modules/calendar/e-task-shell-view-actions.c:785
+#: ../modules/calendar/e-task-shell-view-actions.c:795
msgid "Delete completed tasks"
msgstr "删除已完成的任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:860
+#: ../modules/calendar/e-task-shell-view-actions.c:870
msgid "Task _Preview"
msgstr "任务预览(_P)"
-#: ../modules/calendar/e-task-shell-view-actions.c:862
+#: ../modules/calendar/e-task-shell-view-actions.c:872
#, fuzzy
msgid "Show task preview pane"
msgstr "显示预览面板"
-#: ../modules/calendar/e-task-shell-view-actions.c:883
+#: ../modules/calendar/e-task-shell-view-actions.c:893
#, fuzzy
msgid "Show task preview below the task list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/calendar/e-task-shell-view-actions.c:890
+#: ../modules/calendar/e-task-shell-view-actions.c:900
#, fuzzy
msgid "Show task preview alongside the task list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/calendar/e-task-shell-view-actions.c:898
+#: ../modules/calendar/e-task-shell-view-actions.c:908
msgid "Active Tasks"
msgstr "活动任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:912
+#: ../modules/calendar/e-task-shell-view-actions.c:922
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:919
+#: ../modules/calendar/e-task-shell-view-actions.c:929
msgid "Next 7 Days' Tasks"
msgstr "下一周的任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/calendar/e-task-shell-view-actions.c:936
msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/calendar/e-task-shell-view-actions.c:943
msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../modules/calendar/e-task-shell-view-actions.c:983
+#: ../modules/calendar/e-task-shell-view-actions.c:993
msgid "Print the list of tasks"
msgstr "打印任务列表"
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/calendar/e-task-shell-view-actions.c:1000
#, fuzzy
msgid "Preview the list of tasks to be printed"
msgstr "预览要打印的任务列表"
@@ -15458,413 +15015,377 @@ msgstr "删除任务"
#: ../modules/calendar/e-task-shell-view.c:353
#, fuzzy
-#| msgid "Delete Task"
-#| msgid_plural "Delete Tasks"
msgid "Delete Task"
msgstr "删除任务"
#. Translators: This is only for multiple messages.
-#: ../modules/mail/e-mail-attachment-handler.c:335
+#: ../modules/mail/e-mail-attachment-handler.c:333
#, c-format
msgid "%d attached messages"
msgstr "%d 个附加的信息"
#. Translators: "None" for a junk hook name,
#. * when the junk plugin is not enabled.
-#: ../modules/mail/e-mail-junk-hook.c:90
+#: ../modules/mail/e-mail-junk-hook.c:89
#, fuzzy
-#| msgid "None"
msgctxt "mail-junk-hook"
msgid "None"
msgstr "无"
-#: ../modules/mail/e-mail-shell-backend.c:168
+#: ../modules/mail/e-mail-shell-backend.c:169
msgctxt "New"
msgid "_Mail Message"
-msgstr "信件(_M)"
+msgstr "信息(_M)"
-#: ../modules/mail/e-mail-shell-backend.c:170
+#: ../modules/mail/e-mail-shell-backend.c:171
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../modules/mail/e-mail-shell-backend.c:178
+#: ../modules/mail/e-mail-shell-backend.c:179
msgctxt "New"
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../modules/mail/e-mail-shell-backend.c:180
+#: ../modules/mail/e-mail-shell-backend.c:181
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../modules/mail/e-mail-shell-backend.c:199
+#: ../modules/mail/e-mail-shell-backend.c:200
msgid "Mail Accounts"
-msgstr "邮件账户"
+msgstr "邮件帐号"
-#: ../modules/mail/e-mail-shell-backend.c:207
+#: ../modules/mail/e-mail-shell-backend.c:208
msgid "Mail Preferences"
msgstr "邮件首选项"
-#: ../modules/mail/e-mail-shell-backend.c:215
+#: ../modules/mail/e-mail-shell-backend.c:216
msgid "Composer Preferences"
msgstr "编写器首选项"
-#: ../modules/mail/e-mail-shell-backend.c:223
+#: ../modules/mail/e-mail-shell-backend.c:224
msgid "Network Preferences"
msgstr "网络首选项"
-#: ../modules/mail/e-mail-shell-content.c:679
-#, fuzzy
-#| msgid "_Group By Threads"
-msgid "Group by Threads"
-msgstr "按线索分组(_G)"
-
-#: ../modules/mail/e-mail-shell-content.c:680
-msgid "Whether to group messages by threads"
-msgstr ""
-
-#: ../modules/mail/e-mail-shell-view-actions.c:859
-#: ../modules/mail/e-mail-shell-view.c:875
+#: ../modules/mail/e-mail-shell-view-actions.c:820
+#: ../modules/mail/e-mail-shell-view.c:871
msgid "_Disable Account"
-msgstr "禁用账户(_D)"
+msgstr "禁用帐号(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:861
+#: ../modules/mail/e-mail-shell-view-actions.c:822
msgid "Disable this account"
-msgstr "禁用这个账户"
+msgstr "禁用这个帐号"
-#: ../modules/mail/e-mail-shell-view-actions.c:868
+#: ../modules/mail/e-mail-shell-view-actions.c:829
#, fuzzy
msgid "Permanently remove all the deleted messages from all folders"
-msgstr "永久删除所有文件夹中的所有已删除的信件"
+msgstr "永久删除所有文件夹中的所有已删除的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:873
+#: ../modules/mail/e-mail-shell-view-actions.c:834
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:880
+#: ../modules/mail/e-mail-shell-view-actions.c:841
msgid "_Download Messages for Offline Usage"
-msgstr "下载信件以离线使用(_D)"
+msgstr "下载信息以离线使用(_D)"
-#: ../modules/mail/e-mail-shell-view-actions.c:882
+#: ../modules/mail/e-mail-shell-view-actions.c:843
#, fuzzy
msgid "Download messages of accounts and folders marked for offline usage"
-msgstr "为标记为脱机的帐户/文件夹下载信件"
+msgstr "为标记为脱机的帐户/文件夹下载信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:887
+#: ../modules/mail/e-mail-shell-view-actions.c:848
msgid "Fl_ush Outbox"
msgstr "清空发件箱(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:894
+#: ../modules/mail/e-mail-shell-view-actions.c:855
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:896
+#: ../modules/mail/e-mail-shell-view-actions.c:857
msgid "Copy the selected folder into another folder"
msgstr "把选中的文件夹复制到其它文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:903
+#: ../modules/mail/e-mail-shell-view-actions.c:864
msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:908
+#: ../modules/mail/e-mail-shell-view-actions.c:869
msgid "E_xpunge"
msgstr "销毁(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:910
+#: ../modules/mail/e-mail-shell-view-actions.c:871
msgid "Permanently remove all deleted messages from this folder"
-msgstr "从该文件夹永久删除所有已删除的信件"
+msgstr "从该文件夹永久删除所有已删除的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:915
+#: ../modules/mail/e-mail-shell-view-actions.c:876
msgid "Mar_k All Messages as Read"
-msgstr "把全部信件标记为已读(_K)"
+msgstr "把全部信息标记为已读(_K)"
-#: ../modules/mail/e-mail-shell-view-actions.c:917
+#: ../modules/mail/e-mail-shell-view-actions.c:878
msgid "Mark all messages in the folder as read"
-msgstr "将此文件夹中的所有信件标记为已读"
+msgstr "将此文件夹中的所有信息标记为已读"
-#: ../modules/mail/e-mail-shell-view-actions.c:922
+#: ../modules/mail/e-mail-shell-view-actions.c:883
msgid "_Move Folder To..."
msgstr "文件夹移至(_M)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:924
+#: ../modules/mail/e-mail-shell-view-actions.c:885
msgid "Move the selected folder into another folder"
msgstr "把选中的文件夹移至其它文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:929
+#: ../modules/mail/e-mail-shell-view-actions.c:890
msgid "_New..."
msgstr "新建(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:931
+#: ../modules/mail/e-mail-shell-view-actions.c:892
msgid "Create a new folder for storing mail"
msgstr "创建存储邮件的新文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:938
+#: ../modules/mail/e-mail-shell-view-actions.c:899
msgid "Change the properties of this folder"
msgstr "更改此文件夹的属性"
-#: ../modules/mail/e-mail-shell-view-actions.c:945
+#: ../modules/mail/e-mail-shell-view-actions.c:906
msgid "Refresh the folder"
msgstr "刷新文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:913
msgid "Change the name of this folder"
msgstr "更改此文件夹的名称"
-#: ../modules/mail/e-mail-shell-view-actions.c:957
+#: ../modules/mail/e-mail-shell-view-actions.c:918
msgid "Select Message _Thread"
-msgstr "选择信件线索(_T)"
+msgstr "选择信息线索(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:920
msgid "Select all messages in the same thread as the selected message"
-msgstr "把同一线索中的所有信件选择为选中信件"
+msgstr "把同一线索中的所有信息选择为选中信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:964
+#: ../modules/mail/e-mail-shell-view-actions.c:925
msgid "Select Message S_ubthread"
-msgstr "选择信件子线索(_U)"
+msgstr "选择信息子线索(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:966
+#: ../modules/mail/e-mail-shell-view-actions.c:927
msgid "Select all replies to the currently selected message"
-msgstr "选择当前选中信件的所有回复"
+msgstr "选择当前选中信息的所有回复"
-#: ../modules/mail/e-mail-shell-view-actions.c:971
+#: ../modules/mail/e-mail-shell-view-actions.c:932
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../modules/mail/e-mail-shell-view-actions.c:973
+#: ../modules/mail/e-mail-shell-view-actions.c:934
#, fuzzy
msgid "Unsubscribe from the selected folder"
msgstr "重命名选中文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:978
+#: ../modules/mail/e-mail-shell-view-actions.c:939
msgid "Empty _Trash"
msgstr "清空回收站(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:980
+#: ../modules/mail/e-mail-shell-view-actions.c:941
#, fuzzy
msgid "Permanently remove all the deleted messages from all accounts"
-msgstr "永久删除所有文件夹中的所有已删除的信件"
+msgstr "永久删除所有文件夹中的所有已删除的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:985
+#: ../modules/mail/e-mail-shell-view-actions.c:946
msgid "_New Label"
msgstr "新建标签(_N)"
-#: ../modules/mail/e-mail-shell-view-actions.c:994
+#: ../modules/mail/e-mail-shell-view-actions.c:955
msgid "N_one"
msgstr "无(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1001
-msgid "Hide _Read Messages"
-msgstr "隐藏已读的信件(_R)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1003
-msgid "Temporarily hide all messages that have already been read"
-msgstr "暂时隐藏所有已读信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1008
-msgid "Hide S_elected Messages"
-msgstr "隐藏选中的信件(_E)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1010
-msgid "Temporarily hide the selected messages"
-msgstr "暂时隐藏选中信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1015
-msgid "Show Hidde_n Messages"
-msgstr "显示隐藏的信件(_N)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1017
-msgid "Show messages that have been temporarily hidden"
-msgstr "显示暂时被隐藏的信件"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1038
+#: ../modules/mail/e-mail-shell-view-actions.c:978
msgid "Cancel the current mail operation"
msgstr "取消当前邮件操作"
-#: ../modules/mail/e-mail-shell-view-actions.c:1043
+#: ../modules/mail/e-mail-shell-view-actions.c:983
msgid "Collapse All _Threads"
msgstr "折叠全部线索(_T)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1045
+#: ../modules/mail/e-mail-shell-view-actions.c:985
msgid "Collapse all message threads"
-msgstr "折叠全部信件线索"
+msgstr "折叠全部信息线索"
-#: ../modules/mail/e-mail-shell-view-actions.c:1050
+#: ../modules/mail/e-mail-shell-view-actions.c:990
msgid "E_xpand All Threads"
msgstr "展开全部线索(_X)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1052
+#: ../modules/mail/e-mail-shell-view-actions.c:992
msgid "Expand all message threads"
-msgstr "展开全部信件线索"
+msgstr "展开全部信息线索"
-#: ../modules/mail/e-mail-shell-view-actions.c:1057
+#: ../modules/mail/e-mail-shell-view-actions.c:997
msgid "_Message Filters"
-msgstr "信件过滤(_M)"
+msgstr "信息过滤(_M)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1059
+#: ../modules/mail/e-mail-shell-view-actions.c:999
msgid "Create or edit rules for filtering new mail"
msgstr "创建或编辑过滤新邮件的规则"
-#: ../modules/mail/e-mail-shell-view-actions.c:1064
+#: ../modules/mail/e-mail-shell-view-actions.c:1004
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1066
+#: ../modules/mail/e-mail-shell-view-actions.c:1006
#, fuzzy
msgid "Create or edit search folder definitions"
msgstr "创建或编辑搜索文件夹定义"
-#: ../modules/mail/e-mail-shell-view-actions.c:1071
+#: ../modules/mail/e-mail-shell-view-actions.c:1011
msgid "_Subscriptions..."
msgstr "订阅(_S)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1073
+#: ../modules/mail/e-mail-shell-view-actions.c:1013
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或退订远程服务器上的文件夹"
-#: ../modules/mail/e-mail-shell-view-actions.c:1080
+#: ../modules/mail/e-mail-shell-view-actions.c:1020
msgid "F_older"
msgstr "文件夹(_O)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1087
+#: ../modules/mail/e-mail-shell-view-actions.c:1027
msgid "_Label"
msgstr "标签(_L)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1127
+#: ../modules/mail/e-mail-shell-view-actions.c:1067
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../modules/mail/e-mail-shell-view-actions.c:1151
-msgid "Hide _Deleted Messages"
-msgstr "隐藏已删除的信件(_D)"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1153
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "隐藏已删除的信件而不是在上面显示一条线"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1160
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
msgid "Show Message _Preview"
-msgstr "显示信件预览(_P)"
+msgstr "显示信息预览(_P)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1162
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
#, fuzzy
msgid "Show message preview pane"
-msgstr "显示信件预览窗口"
+msgstr "显示信息预览窗口"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
+#, fuzzy
+msgid "Show _Deleted Messages"
+msgstr "显示删除的信息"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1101
+#, fuzzy
+msgid "Show deleted messages with a line through them"
+msgstr "在信息列表中显示删除了的信息(带有删除线)。"
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
msgid "_Group By Threads"
msgstr "按线索分组(_G)"
-#: ../modules/mail/e-mail-shell-view-actions.c:1170
+#: ../modules/mail/e-mail-shell-view-actions.c:1109
#, fuzzy
msgid "Threaded message list"
-msgstr "按线索编排的信件列表"
+msgstr "按线索编排的信息列表"
-#: ../modules/mail/e-mail-shell-view-actions.c:1191
+#: ../modules/mail/e-mail-shell-view-actions.c:1130
msgid "Show message preview below the message list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/mail/e-mail-shell-view-actions.c:1198
+#: ../modules/mail/e-mail-shell-view-actions.c:1137
#, fuzzy
msgid "Show message preview alongside the message list"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
-#: ../modules/mail/e-mail-shell-view-actions.c:1206
+#: ../modules/mail/e-mail-shell-view-actions.c:1145
msgid "All Messages"
-msgstr "全部信件"
+msgstr "全部信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1213
+#: ../modules/mail/e-mail-shell-view-actions.c:1152
msgid "Important Messages"
-msgstr "重要信件"
+msgstr "重要信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1220
+#: ../modules/mail/e-mail-shell-view-actions.c:1159
msgid "Last 5 Days' Messages"
-msgstr "前五天的信件"
+msgstr "前五天的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1227
+#: ../modules/mail/e-mail-shell-view-actions.c:1166
msgid "Messages Not Junk"
msgstr "不是垃圾邮件"
-#: ../modules/mail/e-mail-shell-view-actions.c:1234
+#: ../modules/mail/e-mail-shell-view-actions.c:1173
msgid "Messages with Attachments"
-msgstr "有附件的信件"
+msgstr "有附件的信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1241
+#: ../modules/mail/e-mail-shell-view-actions.c:1180
msgid "No Label"
msgstr "无标签"
-#: ../modules/mail/e-mail-shell-view-actions.c:1248
+#: ../modules/mail/e-mail-shell-view-actions.c:1187
msgid "Read Messages"
-msgstr "已读信件"
+msgstr "已读信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1255
+#: ../modules/mail/e-mail-shell-view-actions.c:1194
msgid "Recent Messages"
-msgstr "最近信件"
+msgstr "最近信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1262
+#: ../modules/mail/e-mail-shell-view-actions.c:1201
msgid "Unread Messages"
-msgstr "未读信件"
+msgstr "未读信息"
-#: ../modules/mail/e-mail-shell-view-actions.c:1314
+#: ../modules/mail/e-mail-shell-view-actions.c:1253
#, fuzzy
msgid "Subject or Addresses contain"
msgstr "主题或发送者含有"
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1263
msgid "All Accounts"
-msgstr "全部账户"
+msgstr "全部帐号"
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1270
msgid "Current Account"
-msgstr "当前账户"
+msgstr "当前帐号"
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1277
msgid "Current Folder"
msgstr "当前文件夹"
-#: ../modules/mail/e-mail-shell-view-private.c:891
+#: ../modules/mail/e-mail-shell-view-private.c:887
#, c-format
msgid "%d selected, "
msgid_plural "%d selected, "
msgstr[0] "已选中 %d 个,"
-#: ../modules/mail/e-mail-shell-view-private.c:902
+#: ../modules/mail/e-mail-shell-view-private.c:898
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../modules/mail/e-mail-shell-view-private.c:908
-#: ../modules/mail/e-mail-shell-view-private.c:915
+#: ../modules/mail/e-mail-shell-view-private.c:904
+#: ../modules/mail/e-mail-shell-view-private.c:911
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../modules/mail/e-mail-shell-view-private.c:921
+#: ../modules/mail/e-mail-shell-view-private.c:917
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../modules/mail/e-mail-shell-view-private.c:927
+#: ../modules/mail/e-mail-shell-view-private.c:923
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../modules/mail/e-mail-shell-view-private.c:933
+#: ../modules/mail/e-mail-shell-view-private.c:929
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../modules/mail/e-mail-shell-view-private.c:945
+#: ../modules/mail/e-mail-shell-view-private.c:941
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] ",%d 封未读,"
-#: ../modules/mail/e-mail-shell-view-private.c:948
+#: ../modules/mail/e-mail-shell-view-private.c:944
#, c-format
msgid "%d total"
msgid_plural "%d total"
@@ -15872,94 +15393,114 @@ msgstr[0] "总共 %d 封"
#: ../modules/mail/e-mail-shell-view.c:548
msgid "All Account Search"
-msgstr "全部账户搜索"
+msgstr "全部帐号搜索"
-#: ../modules/mail/e-mail-shell-view.c:685
+#: ../modules/mail/e-mail-shell-view.c:675
msgid "Account Search"
-msgstr "账户搜索"
+msgstr "帐号搜索"
-#: ../modules/mail/e-mail-shell-view.c:873
+#: ../modules/mail/e-mail-shell-view.c:869
msgid "Proxy _Logout"
msgstr "代理服务器注销(_L)"
+#: ../modules/mail/em-account-prefs.c:129
+msgid "Evolution Account Assistant"
+msgstr "Evolution 帐号助手"
+
+#: ../modules/mail/em-account-prefs.c:178
+msgid "Account Editor"
+msgstr "帐号编辑器"
+
#: ../modules/mail/em-composer-prefs.c:473
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:827
+#: ../widgets/misc/e-account-tree-view.c:205
+msgid "Enabled"
+msgstr "已启用"
+
+#: ../modules/mail/em-composer-prefs.c:477
msgid "Language(s)"
msgstr "语言"
-#: ../modules/mail/em-mailer-prefs.c:96
+#: ../modules/mail/em-mailer-prefs.c:97
msgid "Every time"
msgstr "每次"
-#: ../modules/mail/em-mailer-prefs.c:97
+#: ../modules/mail/em-mailer-prefs.c:98
msgid "Once per day"
msgstr "每天一次"
-#: ../modules/mail/em-mailer-prefs.c:98
+#: ../modules/mail/em-mailer-prefs.c:99
msgid "Once per week"
msgstr "每周一次"
-#: ../modules/mail/em-mailer-prefs.c:99
+#: ../modules/mail/em-mailer-prefs.c:100
msgid "Once per month"
msgstr "每月一次"
-#: ../modules/mail/em-mailer-prefs.c:221
+#: ../modules/mail/em-mailer-prefs.c:225
msgid "Add Custom Junk Header"
msgstr "添加自定义垃圾信头"
-#: ../modules/mail/em-mailer-prefs.c:225
+#: ../modules/mail/em-mailer-prefs.c:233
msgid "Header Name:"
msgstr "信头名称:"
-#: ../modules/mail/em-mailer-prefs.c:226
+#: ../modules/mail/em-mailer-prefs.c:234
msgid "Header Value Contains:"
msgstr "信头值含有:"
-#: ../modules/mail/em-mailer-prefs.c:325
-#: ../widgets/table/e-table-click-to-add.c:504
-#: ../widgets/table/e-table-selection-model.c:309
+#: ../modules/mail/em-mailer-prefs.c:334
msgid "Header"
msgstr "页眉"
-#: ../modules/mail/em-mailer-prefs.c:329
+#: ../modules/mail/em-mailer-prefs.c:338
msgid "Contains Value"
msgstr "包含值"
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:722 ../modules/mail/em-mailer-prefs.c:793
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:802
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s 插件可用,二进制文件已经安装。"
#. May be a better text
-#: ../modules/mail/em-mailer-prefs.c:730 ../modules/mail/em-mailer-prefs.c:802
+#: ../modules/mail/em-mailer-prefs.c:739 ../modules/mail/em-mailer-prefs.c:811
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr "%s 插件不可用。请检查软件包是否已安装。"
-#: ../modules/mail/em-mailer-prefs.c:766
+#: ../modules/mail/em-mailer-prefs.c:775
#, fuzzy
msgid "No junk plugin available"
msgstr "没有可用的垃圾邮件插件"
-#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/mail/em-mailer-prefs.c:1151
-#, fuzzy
-#| msgid "Table column:"
-msgid "_Table column:"
-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:1153
+#: ../modules/mail/em-mailer-prefs.c:1167
#, fuzzy
msgid "_Date header:"
msgstr "表头"
-#: ../modules/mail/em-mailer-prefs.c:1154
+#: ../modules/mail/em-mailer-prefs.c:1168
#, fuzzy
msgid "Show _original header value"
msgstr "显示原始大小(_O)"
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
+msgid "Check whether Evolution is the default mailer"
+msgstr "检查 Evolution 是否是默认邮件程序"
+
+#: ../modules/mailto-handler/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
+msgstr "每次启动 Evolution 的时候,检查它是否是默认邮件程序。"
+
+#: ../modules/mailto-handler/evolution-mailto-handler.c:138
+#, fuzzy
+msgid "Do you want to make Evolution your default email client?"
+msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端?"
+
#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
msgid "Hello Python"
msgstr "你好 Python"
@@ -15976,6 +15517,51 @@ msgstr "Python 测试插件"
msgid "Test Plugin for Python EPlugin loader."
msgstr "Python Eplugin 加载器测试插件。"
+#: ../modules/startup-wizard/evolution-startup-wizard.c:270
+#: ../widgets/misc/e-import-assistant.c:389
+msgid "Please select the information that you would like to import:"
+msgstr "请选择您希望导入的信息:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:302
+#: ../widgets/misc/e-import-assistant.c:545
+#, c-format
+msgid "From %s:"
+msgstr "从 %s:"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:313
+#: ../modules/startup-wizard/evolution-startup-wizard.c:410
+#, fuzzy
+msgid "Importing Files"
+msgstr "导入文件"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:388
+msgid "Import cancelled. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:406
+msgid "Import complete. Click \"Forward\" to continue."
+msgstr ""
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:466
+msgid "Evolution Setup Assistant"
+msgstr "Evolution 设置助手"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:472
+msgid "Welcome"
+msgstr "欢迎"
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:477
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
+"\n"
+"Please click the \"Forward\" button to continue. "
+msgstr ""
+"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的电子邮件帐号,并从其它"
+"应用程序中导入文件。\n"
+"\n"
+"请单击“前进”按钮继续。"
+
#: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
#, fuzzy
msgid "Add local address books to Evolution."
@@ -15991,14 +15577,8 @@ msgid ""
"body"
msgstr "消息主体中的用于附件提醒插件的线索列表"
-#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
-msgid ""
-"List of clues for the attachment reminder plugin to look for in a message "
-"body."
-msgstr "消息主体中的用于附件提醒插件的线索列表。"
-
-#: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:413
+#: ../plugins/attachment-reminder/attachment-reminder.c:451
+#: ../plugins/templates/templates.c:409
msgid "Keywords"
msgstr "关键字"
@@ -16006,11 +15586,11 @@ msgstr "关键字"
msgid ""
"Evolution has found some keywords that suggest that this message should "
"contain an attachment, but cannot find one."
-msgstr "Evolution 找到一些关键字表明此信件应当包含附件,但却没发现附件。"
+msgstr "Evolution 找到一些关键字表明此信息应当包含附件,但却没发现附件。"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
msgid "Message has no attachments"
-msgstr "信件无附件"
+msgstr "信息无附件"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
msgid "_Add attachment..."
@@ -16018,7 +15598,7 @@ msgstr "添加附件(_A)..."
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
msgid "_Edit Message"
-msgstr "编辑信件(_E)"
+msgstr "编辑信息(_E)"
#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
msgid "Attachment Reminder"
@@ -16037,23 +15617,23 @@ msgstr "嵌入"
msgid "Play audio attachments directly in mail messages."
msgstr ""
-#: ../plugins/backup-restore/backup-restore.c:152
+#: ../plugins/backup-restore/backup-restore.c:160
msgid "Select name of the Evolution backup file"
msgstr "选择 Evolution 备份文件名称"
-#: ../plugins/backup-restore/backup-restore.c:183
+#: ../plugins/backup-restore/backup-restore.c:191
msgid "_Restart Evolution after backup"
msgstr "备份后重新启动 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:209
+#: ../plugins/backup-restore/backup-restore.c:217
msgid "Select name of the Evolution backup file to restore"
msgstr "选择要恢复的 Evolution 备份文件名称"
-#: ../plugins/backup-restore/backup-restore.c:222
+#: ../plugins/backup-restore/backup-restore.c:230
msgid "_Restart Evolution after restore"
msgstr "恢复后重新启动 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:290
+#: ../plugins/backup-restore/backup-restore.c:298
#, fuzzy
msgid ""
"You can restore Evolution from your backup. It can restore all the Mails, "
@@ -16064,36 +15644,38 @@ msgstr ""
"人。\n"
"它还能恢复您的所有的个人设置和邮件过滤器等。"
-#: ../plugins/backup-restore/backup-restore.c:297
+#: ../plugins/backup-restore/backup-restore.c:305
msgid "_Restore Evolution from the backup file"
msgstr "从备份文件中恢复 Evolution(_R)"
-#: ../plugins/backup-restore/backup-restore.c:304
+#: ../plugins/backup-restore/backup-restore.c:312
msgid "Please select an Evolution Archive to restore:"
msgstr "选择要恢复的 Evolution 存档:"
-#: ../plugins/backup-restore/backup-restore.c:307
+#: ../plugins/backup-restore/backup-restore.c:315
msgid "Choose a file to restore"
msgstr "选择要恢复的文件"
-#: ../plugins/backup-restore/backup-restore.c:315
+#: ../plugins/backup-restore/backup-restore.c:323
msgid "Restore from backup"
msgstr "从备份中恢复"
-#: ../plugins/backup-restore/backup-restore.c:353
-msgid "_Backup Settings..."
+#: ../plugins/backup-restore/backup-restore.c:361
+#, fuzzy
+msgid "_Backup Evolution Settings..."
msgstr "备份设置(_B)..."
-#: ../plugins/backup-restore/backup-restore.c:355
+#: ../plugins/backup-restore/backup-restore.c:363
#, fuzzy
msgid "Backup Evolution data and settings to an archive file"
msgstr "备份及恢复 Evolution 的数据和设置"
-#: ../plugins/backup-restore/backup-restore.c:360
-msgid "R_estore Settings..."
+#: ../plugins/backup-restore/backup-restore.c:368
+#, fuzzy
+msgid "R_estore Evolution Settings..."
msgstr "恢复设置(_E)..."
-#: ../plugins/backup-restore/backup-restore.c:362
+#: ../plugins/backup-restore/backup-restore.c:370
#, fuzzy
msgid "Restore Evolution data and settings from an archive file"
msgstr "备份及恢复 Evolution 的数据和设置"
@@ -16125,7 +15707,7 @@ msgstr "关闭 Evolution"
#: ../plugins/backup-restore/backup.c:196
msgid "Backing Evolution accounts and settings"
-msgstr "备份 Evolution 的账户及设置"
+msgstr "备份 Evolution 的帐号及设置"
#: ../plugins/backup-restore/backup.c:202
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
@@ -16142,7 +15724,8 @@ msgid "Restarting Evolution"
msgstr "重新启动 Evolution"
#: ../plugins/backup-restore/backup.c:255
-msgid "Backup current Evolution data"
+#, fuzzy
+msgid "Back up current Evolution data"
msgstr "备份当前 Evolution 数据"
#: ../plugins/backup-restore/backup.c:260
@@ -16151,7 +15734,7 @@ msgstr "从备份中提取文件"
#: ../plugins/backup-restore/backup.c:267
msgid "Loading Evolution settings"
-msgstr "装入 Evolution 的设置"
+msgstr "载入 Evolution 的设置"
#: ../plugins/backup-restore/backup.c:274
msgid "Removing temporary backup files"
@@ -16172,31 +15755,31 @@ msgid "Restoring from the folder %s"
msgstr "正在从文件夹 %s 中恢复"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
msgid "Evolution Backup"
msgstr "Evolution 备份"
-#: ../plugins/backup-restore/backup.c:453
+#: ../plugins/backup-restore/backup.c:455
msgid "Evolution Restore"
msgstr "Evolution 恢复"
-#: ../plugins/backup-restore/backup.c:488
+#: ../plugins/backup-restore/backup.c:494
msgid "Backing up Evolution Data"
msgstr "正在备份 Evolution 数据"
-#: ../plugins/backup-restore/backup.c:489
+#: ../plugins/backup-restore/backup.c:495
msgid "Please wait while Evolution is backing up your data."
msgstr "请稍候,Evolution 正在备份您的数据。"
-#: ../plugins/backup-restore/backup.c:491
+#: ../plugins/backup-restore/backup.c:497
msgid "Restoring Evolution Data"
msgstr "正在恢复 Evolution 数据"
-#: ../plugins/backup-restore/backup.c:492
+#: ../plugins/backup-restore/backup.c:498
msgid "Please wait while Evolution is restoring your data."
msgstr "请稍候,Evolution 正在恢复您的数据。"
-#: ../plugins/backup-restore/backup.c:510
+#: ../plugins/backup-restore/backup.c:516
msgid "This may take a while depending on the amount of data in your account."
msgstr "这可能要花一点时间,取决于您帐户中的数据总量。"
@@ -16257,36 +15840,37 @@ msgstr ""
"复只能在 Evolution 未运行时启动。请确保在开始之前您保存和关闭了您的所有的未保"
"存的窗口。如果您想让 Evolution 在恢复后自动重启动,请启用切换按钮。"
-#: ../plugins/bbdb/bbdb.c:686 ../plugins/bbdb/bbdb.c:695
+#: ../plugins/bbdb/bbdb.c:685 ../plugins/bbdb/bbdb.c:694
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:710
+#: ../plugins/bbdb/bbdb.c:709
#, fuzzy
msgid "Create _address book entries when sending mails"
msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:716
+#: ../plugins/bbdb/bbdb.c:715
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../plugins/bbdb/bbdb.c:731
+#: ../plugins/bbdb/bbdb.c:730
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:746
-msgid "Synchronize contact info and images from Pidgin buddy list"
+#: ../plugins/bbdb/bbdb.c:745
+#, fuzzy
+msgid "_Synchronize contact info and images from Pidgin buddy list"
msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
-#: ../plugins/bbdb/bbdb.c:752
+#: ../plugins/bbdb/bbdb.c:751
msgid "Select Address book for Pidgin buddy list"
msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:763
+#: ../plugins/bbdb/bbdb.c:762
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
@@ -16306,35 +15890,35 @@ msgstr ""
"在您回复邮件时自动用姓名和电子邮件地址填入您的地址簿。同时还将填入您好友列表"
"的即时通讯联系信息。"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:154
#, c-format
msgid "Bogofilter is not available. Please install it first."
msgstr ""
#. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
#, fuzzy, c-format
msgid "Error occurred while spawning %s: %s."
msgstr "打印时发生了错误"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:187
#, c-format
msgid "Bogofilter child process does not respond, killing..."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:189
#, c-format
msgid "Wait for Bogofilter child process interrupted, terminating..."
msgstr ""
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:212
#, c-format
msgid "Pipe to Bogofilter failed, error code: %d."
msgstr ""
#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
msgid "Convert message text to _Unicode"
-msgstr "将信件文本转换为 _Unicode"
+msgstr "将信息文本转换为 _Unicode"
#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
msgid "Convert mail messages to Unicode"
@@ -16345,7 +15929,7 @@ msgid ""
"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
"different character sets."
msgstr ""
-"将信件文本转换到 Unicode UTF-8 以一致化来自于不同字符集的垃圾信件特征。"
+"将信息文本转换到 Unicode UTF-8 以一致化来自于不同字符集的垃圾信息特征。"
#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
msgid "Bogofilter Junk Filter"
@@ -16358,69 +15942,56 @@ msgstr "Bogofilter 选项"
#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
#, fuzzy
msgid "Filter junk messages using Bogofilter."
-msgstr "使用 Bogofilter 过滤垃圾信件。"
+msgstr "使用 Bogofilter 过滤垃圾信息。"
-#: ../plugins/caldav/caldav-browse-server.c:198
+#: ../plugins/caldav/caldav-browse-server.c:197
msgid "Authentication failed. Server requires correct login."
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:200
+#: ../plugins/caldav/caldav-browse-server.c:199
msgid "Given URL cannot be found."
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:204
+#: ../plugins/caldav/caldav-browse-server.c:203
#, c-format
msgid ""
"Server returned unexpected data.\n"
"%d - %s"
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:204
-#: ../plugins/caldav/caldav-browse-server.c:1249 ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: ../plugins/caldav/caldav-browse-server.c:334
-#: ../plugins/caldav/caldav-browse-server.c:585
+#: ../plugins/caldav/caldav-browse-server.c:333
+#: ../plugins/caldav/caldav-browse-server.c:584
msgid "Failed to parse server response."
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:428
+#: ../plugins/caldav/caldav-browse-server.c:427
#, fuzzy
-#| msgid "Ends"
msgid "Events"
msgstr "结束"
-#: ../plugins/caldav/caldav-browse-server.c:450
+#: ../plugins/caldav/caldav-browse-server.c:449
#, fuzzy
-#| msgid "New calendar"
msgid "User's calendars"
msgstr "新建日历"
-#: ../plugins/caldav/caldav-browse-server.c:558
-#: ../plugins/caldav/caldav-browse-server.c:629
+#: ../plugins/caldav/caldav-browse-server.c:557
+#: ../plugins/caldav/caldav-browse-server.c:628
#, fuzzy
-#| msgid "Failed to authenticate with LDAP server."
msgid "Failed to get server URL."
msgstr "认证到 IMAP 服务器失败。"
-#: ../plugins/caldav/caldav-browse-server.c:627
-#: ../plugins/caldav/caldav-browse-server.c:668
-#: ../plugins/caldav/caldav-browse-server.c:1272
+#: ../plugins/caldav/caldav-browse-server.c:626
+#: ../plugins/caldav/caldav-browse-server.c:667
+#: ../plugins/caldav/caldav-browse-server.c:1277
#, fuzzy
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
msgid "Searching for user's calendars..."
msgstr ""
"\n"
"\n"
"正在搜索联系人..."
-#: ../plugins/caldav/caldav-browse-server.c:666
+#: ../plugins/caldav/caldav-browse-server.c:665
#, fuzzy
-#| msgid "Unable to find any calendars"
msgid "Could not find any user calendar."
msgstr "无法找到任何日历"
@@ -16434,85 +16005,71 @@ msgstr ""
msgid "Previous attempt failed with code %d"
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:799
+#: ../plugins/caldav/caldav-browse-server.c:801
#, fuzzy, c-format
-#| msgid "Enter password for %s (user %s)"
-msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgid "Enter password for user %s on server %s"
msgstr "输入 %s 的密码(用户 %s)"
-#: ../plugins/caldav/caldav-browse-server.c:856
+#: ../plugins/caldav/caldav-browse-server.c:860
#, fuzzy, c-format
-#| msgid ""
-#| "Cannot create output file: %s:\n"
-#| " %s"
msgid "Cannot create soup message for URL '%s'"
msgstr ""
"无法创建输出文件:%s:\n"
" %s"
#. fetch content
-#: ../plugins/caldav/caldav-browse-server.c:1091
+#: ../plugins/caldav/caldav-browse-server.c:1095
#, fuzzy
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Searching for the Contacts..."
msgid "Searching folder content..."
msgstr ""
"\n"
"\n"
"正在搜索联系人..."
-#: ../plugins/caldav/caldav-browse-server.c:1134
+#: ../plugins/caldav/caldav-browse-server.c:1138
#, fuzzy
-#| msgid "Loading calendars"
msgid "List of available calendars:"
-msgstr "装入日历"
+msgstr "载入日历"
-#: ../plugins/caldav/caldav-browse-server.c:1171
+#: ../plugins/caldav/caldav-browse-server.c:1175
#, fuzzy
-#| msgid "Hula Support"
msgid "Supports"
msgstr "Hula 支持"
-#: ../plugins/caldav/caldav-browse-server.c:1249
+#: ../plugins/caldav/caldav-browse-server.c:1254
#, fuzzy, c-format
msgid "Failed to create thread: %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../plugins/caldav/caldav-browse-server.c:1357
+#: ../plugins/caldav/caldav-browse-server.c:1362
#, c-format
msgid "Server URL '%s' is not a valid URL"
msgstr ""
-#: ../plugins/caldav/caldav-browse-server.c:1363
+#: ../plugins/caldav/caldav-browse-server.c:1368
msgid "Browse for a CalDAV calendar"
msgstr ""
-#: ../plugins/caldav/caldav-source.c:66
-msgid "CalDAV"
-msgstr "CalDAV"
-
-#: ../plugins/caldav/caldav-source.c:215
-#: ../plugins/calendar-http/calendar-http.c:92
+#: ../plugins/caldav/caldav-source.c:216
+#: ../plugins/calendar-http/calendar-http.c:100
msgid "_URL:"
msgstr "_URL:"
-#: ../plugins/caldav/caldav-source.c:219
-#: ../plugins/google-account-setup/google-contacts-source.c:305
+#: ../plugins/caldav/caldav-source.c:223
+#: ../plugins/google-account-setup/google-contacts-source.c:308
msgid "Use _SSL"
msgstr "使用 _SSL"
-#: ../plugins/caldav/caldav-source.c:228
+#: ../plugins/caldav/caldav-source.c:235
msgid "Brows_e server for a calendar"
msgstr ""
-#: ../plugins/caldav/caldav-source.c:237
-#: ../plugins/calendar-file/calendar-file.c:178
-#: ../plugins/calendar-http/calendar-http.c:111
-#: ../plugins/calendar-weather/calendar-weather.c:393
-#: ../plugins/google-account-setup/google-contacts-source.c:323
-#: ../plugins/google-account-setup/google-source.c:627
+#: ../plugins/caldav/caldav-source.c:251
+#: ../plugins/calendar-file/calendar-file.c:191
+#: ../plugins/calendar-http/calendar-http.c:119
+#: ../plugins/calendar-weather/calendar-weather.c:395
+#: ../plugins/google-account-setup/google-contacts-source.c:326
+#: ../plugins/google-account-setup/google-source.c:630
msgid "Re_fresh:"
msgstr "刷新(_F):"
@@ -16525,35 +16082,35 @@ msgstr ""
msgid "CalDAV Support"
msgstr "CalDAV 源"
-#: ../plugins/calendar-file/calendar-file.c:112
+#: ../plugins/calendar-file/calendar-file.c:125
#, fuzzy
msgid "_Customize options"
msgstr "自定义"
-#: ../plugins/calendar-file/calendar-file.c:131
+#: ../plugins/calendar-file/calendar-file.c:144
msgid "File _name:"
msgstr "文件名(_N):"
-#: ../plugins/calendar-file/calendar-file.c:135
+#: ../plugins/calendar-file/calendar-file.c:148
#, fuzzy
msgid "Choose calendar file"
msgstr "选择文件"
-#: ../plugins/calendar-file/calendar-file.c:183
+#: ../plugins/calendar-file/calendar-file.c:196
#, fuzzy
msgid "On open"
msgstr "打开"
-#: ../plugins/calendar-file/calendar-file.c:184
+#: ../plugins/calendar-file/calendar-file.c:197
msgid "On file change"
msgstr "在文件改变时"
-#: ../plugins/calendar-file/calendar-file.c:185
+#: ../plugins/calendar-file/calendar-file.c:198
#, fuzzy
msgid "Periodically"
msgstr "个人"
-#: ../plugins/calendar-file/calendar-file.c:200
+#: ../plugins/calendar-file/calendar-file.c:213
msgid "Force read _only"
msgstr "强制只读(_O)"
@@ -16563,13 +16120,13 @@ msgstr "添加本地日历到 Evolution。"
#: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
msgid "Local Calendars"
-msgstr "装入日历"
+msgstr "载入日历"
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/calendar-http/calendar-http.c:134
msgid "_Secure connection"
msgstr "安全连接(_S)"
-#: ../plugins/calendar-http/calendar-http.c:186
+#: ../plugins/calendar-http/calendar-http.c:194
msgid "Userna_me:"
msgstr "用户名(_M):"
@@ -16617,28 +16174,27 @@ msgstr "天气: 夜间晴"
msgid "Weather: Thunderstorms"
msgstr "天气:暴风雨"
-#: ../plugins/calendar-weather/calendar-weather.c:221
+#: ../plugins/calendar-weather/calendar-weather.c:222
msgid "Select a location"
msgstr "选择一个位置"
#. Translators: "None" location for a weather calendar
-#: ../plugins/calendar-weather/calendar-weather.c:326
-#: ../plugins/calendar-weather/calendar-weather.c:371
+#: ../plugins/calendar-weather/calendar-weather.c:328
+#: ../plugins/calendar-weather/calendar-weather.c:373
#, fuzzy
-#| msgid "None"
msgctxt "weather-cal-location"
msgid "None"
msgstr "无"
-#: ../plugins/calendar-weather/calendar-weather.c:446
+#: ../plugins/calendar-weather/calendar-weather.c:448
msgid "_Units:"
msgstr "单位(_U):"
-#: ../plugins/calendar-weather/calendar-weather.c:453
+#: ../plugins/calendar-weather/calendar-weather.c:455
msgid "Metric (Celsius, cm, etc)"
msgstr "公制(摄氏、厘米等等)"
-#: ../plugins/calendar-weather/calendar-weather.c:454
+#: ../plugins/calendar-weather/calendar-weather.c:456
msgid "Imperial (Fahrenheit, inches, etc)"
msgstr "英制(华氏、英寸等等)"
@@ -16659,7 +16215,7 @@ msgstr "联系人:"
#: ../plugins/contacts-map/contacts-map.c:56
#, fuzzy
msgid "Show a map of all the contacts"
-msgstr "在信件列表下方显示信件预览"
+msgstr "在信息列表下方显示信息预览"
#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
msgid "Add a map showing the location of contacts when possible."
@@ -16670,45 +16226,49 @@ msgstr ""
msgid "Map for contacts"
msgstr "无联系人"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
-msgid "Check whether Evolution is the default mailer"
-msgstr "检查 Evolution 是否是默认邮件程序"
+#: ../plugins/dbx-import/dbx-importer.c:232
+#, fuzzy
+msgid "Select folder to import OE folder into"
+msgstr "选择要导入到哪个文件夹"
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
-msgid ""
-"Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "每次启动 Evolution 的时候,检查它是否是默认邮件程序。"
+#: ../plugins/dbx-import/dbx-importer.c:251
+#, fuzzy
+msgid "Importing Outlook Express data"
+msgstr "导入 Outlook 数据"
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Check whether Evolution is the default mail client on startup."
-msgstr "在启动时检查 Evolution 是不是默认的邮件客户端。"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:1
+#, fuzzy
+msgid "Import Outlook Express messages from DBX file"
+msgstr "从 PST 文件中导入 Outlook 邮件"
-#: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client"
-msgstr "默认邮件客户端"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:2
+#, fuzzy
+msgid "Outlook DBX import"
+msgstr "Outlook PST 导入"
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
-msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端?"
+#: ../plugins/dbx-import/org-gnome-dbx-import.eplug.xml.h:3
+#, fuzzy
+msgid "Outlook Express 5/6 personal folders (.dbx)"
+msgstr "Outlook 个人文件夹(.pst)"
-#: ../plugins/default-source/default-source.c:75
+#: ../plugins/default-source/default-source.c:83
msgid "Mark as _default address book"
msgstr "标为默认地址簿(_D)"
-#: ../plugins/default-source/default-source.c:88
+#: ../plugins/default-source/default-source.c:96
#, fuzzy
msgid "A_utocomplete with this address book"
msgstr "在地址簿中查阅"
-#: ../plugins/default-source/default-source.c:97
+#: ../plugins/default-source/default-source.c:105
msgid "Mark as _default calendar"
msgstr "标为默认日历(_D)"
-#: ../plugins/default-source/default-source.c:98
+#: ../plugins/default-source/default-source.c:106
msgid "Mark as _default task list"
msgstr "标为默认任务列表(_D)"
-#: ../plugins/default-source/default-source.c:99
+#: ../plugins/default-source/default-source.c:107
msgid "Mark as _default memo list"
msgstr "标为默认备忘列表(_D)"
@@ -16756,28 +16316,27 @@ msgstr "绝密"
#. indicating the header will not be added to a mail message
#: ../plugins/email-custom-header/email-custom-header.c:379
#, fuzzy
-#| msgid "None"
msgctxt "email-custom-header"
msgid "None"
msgstr "无"
-#: ../plugins/email-custom-header/email-custom-header.c:569
+#: ../plugins/email-custom-header/email-custom-header.c:571
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:894
+#: ../plugins/email-custom-header/email-custom-header.c:830
msgid ""
"The format for specifying a Custom Header key value is:\n"
"Name of the Custom Header key values separated by \";\"."
msgstr ""
-#: ../plugins/email-custom-header/email-custom-header.c:948
+#: ../plugins/email-custom-header/email-custom-header.c:884
msgid "Key"
msgstr "键"
-#: ../plugins/email-custom-header/email-custom-header.c:959
-#: ../plugins/templates/templates.c:419
+#: ../plugins/email-custom-header/email-custom-header.c:900
+#: ../plugins/templates/templates.c:415
msgid "Values"
msgstr "值"
@@ -16799,7 +16358,7 @@ msgid "Automatically launch editor when key is pressed in the mail composer"
msgstr ""
#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
-#: ../plugins/external-editor/external-editor.c:119
+#: ../plugins/external-editor/external-editor.c:126
msgid "Automatically launch when a new mail is edited"
msgstr ""
@@ -16811,11 +16370,11 @@ msgstr "默认外部编辑器"
msgid "The default command that must be used as the editor."
msgstr "默认命令必须用作编辑器。"
-#: ../plugins/external-editor/external-editor.c:108
+#: ../plugins/external-editor/external-editor.c:115
msgid "Command to be executed to launch the editor: "
msgstr "调用编辑器要执行的命令:"
-#: ../plugins/external-editor/external-editor.c:109
+#: ../plugins/external-editor/external-editor.c:116
msgid ""
"For Emacs use \"xemacs\"\n"
"For VI use \"gvim -f\""
@@ -16823,8 +16382,8 @@ msgstr ""
"Emacs 应使用“xemacs”\n"
"VI 应使用“gvim -f”"
-#: ../plugins/external-editor/external-editor.c:375
-#: ../plugins/external-editor/external-editor.c:377
+#: ../plugins/external-editor/external-editor.c:382
+#: ../plugins/external-editor/external-editor.c:384
msgid "Compose in External Editor"
msgstr "在外部编辑器中写作"
@@ -16835,7 +16394,7 @@ msgstr "外部编辑器"
#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
#, fuzzy
msgid "Use an external editor to compose plain-text mail messages."
-msgstr "一个使用外部编辑器作为撰写器的插件。您只能发送纯文本信件。"
+msgstr "一个使用外部编辑器作为撰写器的插件。您只能发送纯文本信息。"
#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
msgid "Cannot create Temporary File"
@@ -16894,7 +16453,7 @@ msgstr ""
msgid "Load new _Face picture"
msgstr ""
-#: ../plugins/face/face.c:415
+#: ../plugins/face/face.c:422
#, fuzzy
msgid "Include _Face"
msgstr "包含:"
@@ -16930,22 +16489,18 @@ msgstr "这个文件不能被读取"
msgid "The file you selected does not look like a valid .png image. Error: {0}"
msgstr ""
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-source.c:82
-msgid "Google"
-msgstr "Google"
-
-#: ../plugins/google-account-setup/google-contacts-source.c:273
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:235
-msgid "<b>Server</b>"
-msgstr "<b>服务器</b>"
+#: ../plugins/google-account-setup/google-contacts-source.c:274
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:236
+#, fuzzy
+msgid "Server"
+msgstr "服务器(_S):"
-#: ../plugins/google-account-setup/google-source.c:439
+#: ../plugins/google-account-setup/google-source.c:437
#, c-format
msgid "Enter password for user %s to access list of subscribed calendars."
msgstr "输入用户 %s 的密码以便访问已订阅日历的列表。"
-#: ../plugins/google-account-setup/google-source.c:545
+#: ../plugins/google-account-setup/google-source.c:548
#, c-format
msgid ""
"Cannot read data from Google server.\n"
@@ -16954,18 +16509,19 @@ msgstr ""
"无法从 Google 服务器上读取数据。\n"
"%s"
-#: ../plugins/google-account-setup/google-source.c:545
-#: ../plugins/mail-to-task/mail-to-task.c:725
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/google-account-setup/google-source.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:736
+#: ../plugins/mail-to-task/mail-to-task.c:952
msgid "Unknown error."
msgstr "未知错误。"
-#: ../plugins/google-account-setup/google-source.c:631
+#: ../plugins/google-account-setup/google-source.c:634
msgid "Cal_endar:"
msgstr "日历(_E):"
-#: ../plugins/google-account-setup/google-source.c:666
-msgid "Retrieve _list"
+#: ../plugins/google-account-setup/google-source.c:669
+#, fuzzy
+msgid "Retrieve _List"
msgstr "获取列表(_L)"
#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
@@ -16976,7 +16532,7 @@ msgstr ""
msgid "Google Calendars"
msgstr "Google 日历"
-#: ../plugins/groupwise-features/camel-gw-listener.c:446
+#: ../plugins/groupwise-features/camel-gw-listener.c:447
msgid "Checklist"
msgstr "待办清单"
@@ -16994,7 +16550,7 @@ msgstr "垃圾邮件设置..."
#: ../plugins/groupwise-features/gw-ui.c:177
msgid "Track Message Status..."
-msgstr "跟踪信件状态..."
+msgstr "跟踪信息状态..."
#: ../plugins/groupwise-features/gw-ui.c:183
msgid "Retract Mail"
@@ -17008,12 +16564,12 @@ msgstr "暂时接受"
msgid "Rese_nd Meeting..."
msgstr "重新发送会议(_N)..."
-#: ../plugins/groupwise-features/install-shared.c:175
-#: ../plugins/groupwise-features/share-folder-common.c:350
+#: ../plugins/groupwise-features/install-shared.c:165
+#: ../plugins/groupwise-features/share-folder-common.c:343
msgid "Create folder"
msgstr "创建文件夹"
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:217
#, fuzzy, c-format
msgid ""
"The user '%s' has shared a folder with you\n"
@@ -17038,19 +16594,19 @@ msgstr ""
"单击“前进”可安装共享文件夹\n"
"\n"
-#: ../plugins/groupwise-features/install-shared.c:237
+#: ../plugins/groupwise-features/install-shared.c:229
msgid "Install the shared folder"
msgstr "安装共享文件夹"
-#: ../plugins/groupwise-features/install-shared.c:241
+#: ../plugins/groupwise-features/install-shared.c:233
msgid "Shared Folder Installation"
msgstr "共享文件夹安装"
-#: ../plugins/groupwise-features/junk-mail-settings.c:81
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
msgid "Junk Settings"
msgstr "垃圾邮件设置"
-#: ../plugins/groupwise-features/junk-mail-settings.c:94
+#: ../plugins/groupwise-features/junk-mail-settings.c:96
#: ../plugins/groupwise-features/junk-settings.ui.h:3
msgid "Junk Mail Settings"
msgstr "垃圾邮件设置"
@@ -17063,11 +16619,6 @@ msgstr "电子邮件:"
msgid "Junk List:"
msgstr "垃圾邮件列表:"
-#: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:596
-msgid "_Disable"
-msgstr "禁用(_D)"
-
#: ../plugins/groupwise-features/junk-settings.ui.h:6
msgid "_Enable"
msgstr "启用(_E)"
@@ -17086,13 +16637,13 @@ msgstr "删除(_R)"
msgid "Message Retract"
msgstr "信息收回"
-#: ../plugins/groupwise-features/mail-retract.c:86
+#: ../plugins/groupwise-features/mail-retract.c:90
msgid ""
"Retracting a message may remove it from the recipient's mailbox. Are you "
"sure you want to do this?"
msgstr ""
-#: ../plugins/groupwise-features/mail-retract.c:107
+#: ../plugins/groupwise-features/mail-retract.c:111
msgid "Message retracted successfully"
msgstr "邮件成功收回"
@@ -17186,7 +16737,7 @@ msgstr "您确信您要删除该会议吗?"
#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
#, fuzzy
msgid "Do you want to retract the original item?"
-msgstr "您是否想要恢复未完成的信件?"
+msgstr "您是否想要恢复未完成的信息?"
#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
#, fuzzy
@@ -17221,25 +16772,26 @@ msgid "Would you like to decline it?"
msgstr "您希望保存更改吗?"
#: ../plugins/groupwise-features/properties.ui.h:1
-msgid "<b>Users:</b>"
-msgstr "<b>用户数:</b>"
-
-#: ../plugins/groupwise-features/properties.ui.h:2
msgid "C_ustomize notification message"
msgstr "自定义通知消息(_U)"
-#: ../plugins/groupwise-features/properties.ui.h:3
+#: ../plugins/groupwise-features/properties.ui.h:2
msgid "Con_tacts..."
msgstr "联系人(_T)..."
-#: ../plugins/groupwise-features/properties.ui.h:6
+#: ../plugins/groupwise-features/properties.ui.h:5
msgid "Shared Folder Notification"
msgstr "共享文件夹通知"
-#: ../plugins/groupwise-features/properties.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:7
msgid "The participants will receive the following notification.\n"
msgstr "收件人将接收到下列通知。\n"
+#: ../plugins/groupwise-features/properties.ui.h:9
+#, fuzzy
+msgid "Users:"
+msgstr "用户"
+
#: ../plugins/groupwise-features/properties.ui.h:12
msgid "_Not Shared"
msgstr "未共享(_N)"
@@ -17297,50 +16849,58 @@ msgid "Proxy"
msgstr "代理服务器"
#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
-msgid "<b>Account Name</b>"
-msgstr "<b>账户名</b>"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "帐号名"
#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
msgid "Proxy Login"
msgstr "代理服务器登录"
-#: ../plugins/groupwise-features/proxy-login.c:210
-#: ../plugins/groupwise-features/proxy-login.c:253
-#: ../plugins/groupwise-features/proxy.c:495
-#: ../plugins/groupwise-features/send-options.c:85
+#: ../plugins/groupwise-features/proxy-login.c:208
+#: ../plugins/groupwise-features/proxy-login.c:251
+#: ../plugins/groupwise-features/proxy.c:493
+#: ../plugins/groupwise-features/send-options.c:84
#, c-format
msgid "%sEnter password for %s (user %s)"
msgstr "%s输入 %s 的密码(用户 %s)"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:692
+#: ../plugins/groupwise-features/proxy.c:689
msgid "The Proxy tab will be available only when the account is online."
-msgstr "代理服务器标签仅当账户联机时才可用。"
+msgstr "代理服务器标签仅当帐号联机时才可用。"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:698
+#: ../plugins/groupwise-features/proxy.c:695
msgid "The Proxy tab will be available only when the account is enabled."
-msgstr "代理服务器标签仅当账户启用时才可用。"
+msgstr "代理服务器标签仅当帐号启用时才可用。"
-#: ../plugins/groupwise-features/proxy.c:931
-#: ../plugins/groupwise-features/share-folder.c:701
+#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
+#: ../plugins/groupwise-features/proxy.c:700
+#, fuzzy
+msgctxt "GW"
+msgid "Proxy"
+msgstr "代理服务器"
+
+#: ../plugins/groupwise-features/proxy.c:926
+#: ../plugins/groupwise-features/share-folder.c:691
msgid "Add User"
msgstr "添加用户"
-#: ../plugins/groupwise-features/send-options.c:213
+#: ../plugins/groupwise-features/send-options.c:212
msgid "Advanced send options"
msgstr "高级发送选项"
-#: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:736
+#: ../plugins/groupwise-features/share-folder-common.c:309
+#: ../plugins/groupwise-features/share-folder.c:726
msgid "Users"
msgstr "用户"
-#: ../plugins/groupwise-features/share-folder-common.c:318
+#: ../plugins/groupwise-features/share-folder-common.c:310
msgid "Enter the users and set permissions"
msgstr "输入用户及设定权限"
-#: ../plugins/groupwise-features/share-folder-common.c:415
+#: ../plugins/groupwise-features/share-folder-common.c:410
msgid "Sharing"
msgstr "共享"
@@ -17348,67 +16908,59 @@ msgstr "共享"
msgid "Custom Notification"
msgstr "自定义通知"
-#: ../plugins/groupwise-features/share-folder.c:741
+#: ../plugins/groupwise-features/share-folder.c:731
msgid "Add "
msgstr "添加"
-#: ../plugins/groupwise-features/status-track.c:126
+#: ../plugins/groupwise-features/status-track.c:123
msgid "Message Status"
-msgstr "信件状态"
+msgstr "信息状态"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:137
msgid "Subject:"
msgstr "主题:"
-#: ../plugins/groupwise-features/status-track.c:154
+#: ../plugins/groupwise-features/status-track.c:151
msgid "From:"
msgstr "发件人:"
-#: ../plugins/groupwise-features/status-track.c:169
+#: ../plugins/groupwise-features/status-track.c:166
msgid "Creation date:"
msgstr "创建日期:"
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:206
msgid "Recipient: "
msgstr "收件人:"
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:213
msgid "Delivered: "
msgstr "已投递:"
-#: ../plugins/groupwise-features/status-track.c:222
+#: ../plugins/groupwise-features/status-track.c:219
msgid "Opened: "
msgstr "已打开:"
-#: ../plugins/groupwise-features/status-track.c:227
+#: ../plugins/groupwise-features/status-track.c:224
msgid "Accepted: "
msgstr "已接受:"
-#: ../plugins/groupwise-features/status-track.c:232
+#: ../plugins/groupwise-features/status-track.c:229
msgid "Deleted: "
msgstr "已删除:"
-#: ../plugins/groupwise-features/status-track.c:237
+#: ../plugins/groupwise-features/status-track.c:234
msgid "Declined: "
msgstr "已拒绝:"
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:239
msgid "Completed: "
msgstr "已完成:"
-#: ../plugins/groupwise-features/status-track.c:247
+#: ../plugins/groupwise-features/status-track.c:244
msgid "Undelivered: "
msgstr "未投递:"
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "Add Hula support to Evolution."
-msgstr ""
-
-#: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Support"
-msgstr "Hula 支持"
-
#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
#, fuzzy
msgid "Inline Image"
@@ -17418,12 +16970,12 @@ msgstr "嵌入"
msgid "View image attachments directly in mail messages."
msgstr ""
-#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.c:330
#: ../plugins/imap-features/imap-headers.ui.h:2
msgid "Custom Headers"
msgstr "自定义信头"
-#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.c:343
#: ../plugins/imap-features/imap-headers.ui.h:5
msgid "IMAP Headers"
msgstr "IMAP 信头"
@@ -17464,40 +17016,42 @@ msgstr "获取全部信头(_L)"
#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
msgid "Fine-tune your IMAP accounts."
-msgstr "调整您的 IMAP 账户。"
+msgstr "调整您的 IMAP 帐号。"
#: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
msgid "IMAP Features"
msgstr "IMAP 特性"
-#: ../plugins/itip-formatter/itip-formatter.c:486
-#, c-format
-msgid "Failed to load the calendar '%s'"
-msgstr "装入日历“%s”失败"
+#. Translators: The first '%s' is replaced with a calendar name,
+#. the second '%s' with an error message
+#: ../plugins/itip-formatter/itip-formatter.c:485
+#, fuzzy, c-format
+msgid "Failed to load the calendar '%s' (%s)"
+msgstr "载入日历“%s”失败"
-#: ../plugins/itip-formatter/itip-formatter.c:652
+#: ../plugins/itip-formatter/itip-formatter.c:649
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../plugins/itip-formatter/itip-formatter.c:688
+#: ../plugins/itip-formatter/itip-formatter.c:685
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../plugins/itip-formatter/itip-formatter.c:787
+#: ../plugins/itip-formatter/itip-formatter.c:784
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../plugins/itip-formatter/itip-formatter.c:794
+#: ../plugins/itip-formatter/itip-formatter.c:791
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../plugins/itip-formatter/itip-formatter.c:798
+#: ../plugins/itip-formatter/itip-formatter.c:795
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:799
msgid "Unable to find this memo in any memo list"
msgstr "无法在任何备忘列表中找到此备忘"
@@ -17608,7 +17162,7 @@ msgstr "附加的日历无效"
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
-msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
+msgstr "信息声明其包含日历,但日历不是有效的 iCalendar。"
#: ../plugins/itip-formatter/itip-formatter.c:1639
#: ../plugins/itip-formatter/itip-formatter.c:1667
@@ -17622,7 +17176,7 @@ msgstr "日历项无效"
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
-msgstr "信件的确包含日历,但是日历不包含事件、任务或忙/闲信息"
+msgstr "信息的确包含日历,但是日历不包含事件、任务或忙/闲信息"
#: ../plugins/itip-formatter/itip-formatter.c:1681
msgid "The calendar attached contains multiple items"
@@ -17634,503 +17188,501 @@ msgid ""
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
-#: ../plugins/itip-formatter/itip-formatter.c:2447
+#: ../plugins/itip-formatter/itip-formatter.c:2452
msgid "This meeting recurs"
msgstr "此会议重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2450
+#: ../plugins/itip-formatter/itip-formatter.c:2455
msgid "This task recurs"
msgstr "此任务重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2453
+#: ../plugins/itip-formatter/itip-formatter.c:2458
msgid "This memo recurs"
msgstr "此备忘重现"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2682
+#: ../plugins/itip-formatter/itip-formatter.c:2692
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2692
-#: ../plugins/itip-formatter/itip-formatter.c:2725
+#: ../plugins/itip-formatter/itip-formatter.c:2702
+#: ../plugins/itip-formatter/itip-formatter.c:2735
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2707
+#: ../plugins/itip-formatter/itip-formatter.c:2717
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:196
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:204
+#: ../plugins/itip-formatter/itip-view.c:200
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:213
+#: ../plugins/itip-formatter/itip-view.c:209
msgid "Today %l:%M:%S %p"
msgstr "今天%p%l:%M:%S"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:224
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:232
+#: ../plugins/itip-formatter/itip-view.c:228
msgid "Tomorrow %H:%M:%S"
msgstr "明天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:233
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:241
+#: ../plugins/itip-formatter/itip-view.c:237
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:260
+#: ../plugins/itip-formatter/itip-view.c:256
#, c-format
msgid "%A"
msgstr "%A"
#. strftime format of a weekday and a
#. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:261
msgid "%A %H:%M"
msgstr "%A %H:%M"
#. strftime format of a weekday and a
#. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:269
+#: ../plugins/itip-formatter/itip-view.c:265
msgid "%A %H:%M:%S"
msgstr "%A %H:%M:%S"
#. strftime format of a weekday and a
#. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:270
msgid "%A %l:%M %p"
msgstr "%A%p%l:%M"
#. strftime format of a weekday and a
#. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:278
+#: ../plugins/itip-formatter/itip-view.c:274
msgid "%A %l:%M:%S %p"
msgstr "%A%p%l:%M:%S"
#. strftime format of a weekday and a date
#. without a year.
-#: ../plugins/itip-formatter/itip-view.c:287
+#: ../plugins/itip-formatter/itip-view.c:283
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.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:289
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.
-#: ../plugins/itip-formatter/itip-view.c:297
+#: ../plugins/itip-formatter/itip-view.c:293
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.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:298
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.
-#: ../plugins/itip-formatter/itip-view.c:306
+#: ../plugins/itip-formatter/itip-view.c:302
msgid "%A, %B %e %l:%M:%S %p"
msgstr "%-m月%-d日%A%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:312
+#: ../plugins/itip-formatter/itip-view.c:308
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.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:313
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.
-#: ../plugins/itip-formatter/itip-view.c:321
+#: ../plugins/itip-formatter/itip-view.c:317
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.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:322
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.
-#: ../plugins/itip-formatter/itip-view.c:330
+#: ../plugins/itip-formatter/itip-view.c:326
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:355
-#: ../plugins/itip-formatter/itip-view.c:443
-#: ../plugins/itip-formatter/itip-view.c:530
-#, c-format
-msgid "Please respond on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:542
+#, fuzzy, c-format
+msgid "Please respond on behalf of %s"
msgstr "请以 <b>%s</b> 的身份回应"
-#: ../plugins/itip-formatter/itip-view.c:357
-#: ../plugins/itip-formatter/itip-view.c:445
-#: ../plugins/itip-formatter/itip-view.c:532
-#, c-format
-msgid "Received on behalf of <b>%s</b>"
+#: ../plugins/itip-formatter/itip-view.c:369
+#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:544
+#, fuzzy, c-format
+msgid "Received on behalf of %s"
msgstr "以 <b>%s</b> 的身份接收"
-#: ../plugins/itip-formatter/itip-view.c:362
-#, c-format
-msgid "<b>%s</b> through %s has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:374
+#, fuzzy, c-format
+msgid "%s through %s has published the following meeting information:"
msgstr "<b>%s</b> 通过 %s 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:364
-#, c-format
-msgid "<b>%s</b> has published the following meeting information:"
+#: ../plugins/itip-formatter/itip-view.c:376
+#, fuzzy, c-format
+msgid "%s has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:369
-#, c-format
-msgid "<b>%s</b> has delegated the following meeting to you:"
+#: ../plugins/itip-formatter/itip-view.c:381
+#, fuzzy, c-format
+msgid "%s has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:372
-#, c-format
-msgid "<b>%s</b> through %s requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:384
+#, fuzzy, c-format
+msgid "%s through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> 通过 %s 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:374
-#, c-format
-msgid "<b>%s</b> requests your presence at the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+msgid "%s requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:380
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:392
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:382
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing meeting:"
+#: ../plugins/itip-formatter/itip-view.c:394
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:386
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following meeting:"
+"%s through %s wishes to receive the latest information for the following "
+"meeting:"
msgstr "<b>%s</b> 通过 %s 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:388
-#, c-format
-msgid ""
-"<b>%s</b> wishes to receive the latest information for the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:400
+#, fuzzy, c-format
+msgid "%s wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:392
-#, c-format
-msgid "<b>%s</b> through %s has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:404
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following meeting response:"
msgstr "<b>%s</b> 通过 %s 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:394
-#, c-format
-msgid "<b>%s</b> has sent back the following meeting response:"
+#: ../plugins/itip-formatter/itip-view.c:406
+#, fuzzy, c-format
+msgid "%s has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:398
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following meeting:"
+#: ../plugins/itip-formatter/itip-view.c:410
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:400
-#, c-format
-msgid "<b>%s</b> has canceled the following meeting."
+#: ../plugins/itip-formatter/itip-view.c:412
+#, fuzzy, c-format
+msgid "%s has canceled the following meeting."
msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:404
-#, c-format
-msgid "<b>%s</b> through %s has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:416
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following meeting changes."
msgstr "<b>%s</b> 通过 %s 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:406
-#, c-format
-msgid "<b>%s</b> has proposed the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:418
+#, fuzzy, c-format
+msgid "%s has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:410
-#, c-format
-msgid "<b>%s</b> through %s has declined the following meeting changes:"
+#: ../plugins/itip-formatter/itip-view.c:422
+#, fuzzy, c-format
+msgid "%s through %s has declined the following meeting changes:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更:"
-#: ../plugins/itip-formatter/itip-view.c:412
-#, c-format
-msgid "<b>%s</b> has declined the following meeting changes."
+#: ../plugins/itip-formatter/itip-view.c:424
+#, fuzzy, c-format
+msgid "%s has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:450
-#, c-format
-msgid "<b>%s</b> through %s has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:462
+#, fuzzy, c-format
+msgid "%s through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:452
-#, c-format
-msgid "<b>%s</b> has published the following task:"
+#: ../plugins/itip-formatter/itip-view.c:464
+#, fuzzy, c-format
+msgid "%s has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:457
-#, c-format
-msgid "<b>%s</b> requests the assignment of %s to the following task:"
+#: ../plugins/itip-formatter/itip-view.c:469
+#, fuzzy, c-format
+msgid "%s requests the assignment of %s to the following task:"
msgstr "<b>%s</b> 请求给 %s 分配下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:460
-#, c-format
-msgid "<b>%s</b> through %s has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:472
+#, fuzzy, c-format
+msgid "%s through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您分配了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:462
-#, c-format
-msgid "<b>%s</b> has assigned you a task:"
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+msgid "%s has assigned you a task:"
msgstr "<b>%s</b> 为您分配了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:468
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:480
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing task:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务:"
-#: ../plugins/itip-formatter/itip-view.c:470
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing task:"
+#: ../plugins/itip-formatter/itip-view.c:482
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:474
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
msgid ""
-"<b>%s</b> through %s wishes to receive the latest information for the "
-"following assigned task:"
+"%s through %s wishes to receive the latest information for the following "
+"assigned task:"
msgstr "<b>%s</b> 通过 %s 想要收到所分配的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:476
-#, c-format
+#: ../plugins/itip-formatter/itip-view.c:488
+#, fuzzy, c-format
msgid ""
-"<b>%s</b> wishes to receive the latest information for the following "
-"assigned task:"
+"%s wishes to receive the latest information for the following assigned task:"
msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:480
-#, c-format
-msgid ""
-"<b>%s</b> through %s has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:492
+#, fuzzy, c-format
+msgid "%s through %s has sent back the following assigned task response:"
msgstr "<b>%s</b> 通过 %s 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:482
-#, c-format
-msgid "<b>%s</b> has sent back the following assigned task response:"
+#: ../plugins/itip-formatter/itip-view.c:494
+#, fuzzy, c-format
+msgid "%s has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:486
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:498
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following assigned task:"
msgstr "<b>%s</b> 通过 %s 取消了下列任务分配:"
-#: ../plugins/itip-formatter/itip-view.c:488
-#, c-format
-msgid "<b>%s</b> has canceled the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:500
+#, fuzzy, c-format
+msgid "%s has canceled the following assigned task:"
msgstr "<b>%s</b> 取消分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:492
-#, c-format
-msgid ""
-"<b>%s</b> through %s has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:504
+#, fuzzy, c-format
+msgid "%s through %s has proposed the following task assignment changes:"
msgstr "<b>%s</b> 通过 %s 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:494
-#, c-format
-msgid "<b>%s</b> has proposed the following task assignment changes:"
+#: ../plugins/itip-formatter/itip-view.c:506
+#, fuzzy, c-format
+msgid "%s has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:498
-#, c-format
-msgid "<b>%s</b> through %s has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:510
+#, fuzzy, c-format
+msgid "%s through %s has declined the following assigned task:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列任务分配:"
-#: ../plugins/itip-formatter/itip-view.c:500
-#, c-format
-msgid "<b>%s</b> has declined the following assigned task:"
+#: ../plugins/itip-formatter/itip-view.c:512
+#, fuzzy, c-format
+msgid "%s has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:537
-#, c-format
-msgid "<b>%s</b> through %s has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:549
+#, fuzzy, c-format
+msgid "%s through %s has published the following memo:"
msgstr "<b>%s</b> 通过 %s 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:539
-#, c-format
-msgid "<b>%s</b> has published the following memo:"
+#: ../plugins/itip-formatter/itip-view.c:551
+#, fuzzy, c-format
+msgid "%s has published the following memo:"
msgstr "<b>%s</b> 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:544
-#, c-format
-msgid "<b>%s</b> through %s wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:556
+#, fuzzy, c-format
+msgid "%s through %s wishes to add to an existing memo:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的备忘:"
-#: ../plugins/itip-formatter/itip-view.c:546
-#, c-format
-msgid "<b>%s</b> wishes to add to an existing memo:"
+#: ../plugins/itip-formatter/itip-view.c:558
+#, fuzzy, c-format
+msgid "%s wishes to add to an existing memo:"
msgstr "<b>%s</b> 希望加入到已有的备忘中:"
-#: ../plugins/itip-formatter/itip-view.c:550
-#, c-format
-msgid "<b>%s</b> through %s has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:562
+#, fuzzy, c-format
+msgid "%s through %s has canceled the following shared memo:"
msgstr "<b>%s</b> 通过 %s 取消了下列共享备忘:"
-#: ../plugins/itip-formatter/itip-view.c:552
-#, c-format
-msgid "<b>%s</b> has canceled the following shared memo:"
+#: ../plugins/itip-formatter/itip-view.c:564
+#, fuzzy, c-format
+msgid "%s has canceled the following shared memo:"
msgstr "<b>%s</b> 取消了下列共享备忘:"
-#: ../plugins/itip-formatter/itip-view.c:676
+#: ../plugins/itip-formatter/itip-view.c:688
msgid "All day:"
msgstr "全天:"
-#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:698
msgid "Start day:"
msgstr "开始日期:"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:686
-#: ../plugins/itip-formatter/itip-view.c:1045
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1053
msgid "Start time:"
msgstr "开始时间:"
-#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:710
msgid "End day:"
msgstr "结束日期:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:698
-#: ../plugins/itip-formatter/itip-view.c:1056
+#: ../plugins/itip-formatter/itip-view.c:710
+#: ../plugins/itip-formatter/itip-view.c:1064
msgid "End time:"
msgstr "结束时间:"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:843
msgid "_Open Calendar"
msgstr "打开日历(_O)"
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:841
-#: ../plugins/itip-formatter/itip-view.c:847
-#: ../plugins/itip-formatter/itip-view.c:864
-#: ../plugins/itip-formatter/itip-view.c:869
+#: ../plugins/itip-formatter/itip-view.c:849
+#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:876
+#: ../plugins/itip-formatter/itip-view.c:881
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:838
-#: ../plugins/itip-formatter/itip-view.c:843
#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:866
-#: ../plugins/itip-formatter/itip-view.c:871
-msgid "_Accept"
-msgstr "接受(_A)"
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:862
+#: ../plugins/itip-formatter/itip-view.c:878
+#: ../plugins/itip-formatter/itip-view.c:883
+#, fuzzy
+msgid "A_ccept"
+msgstr "接受"
-#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:853
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:854
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:842
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:865
-#: ../plugins/itip-formatter/itip-view.c:870
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:877
+#: ../plugins/itip-formatter/itip-view.c:882
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:843
-msgid "_Accept all"
+#: ../plugins/itip-formatter/itip-view.c:855
+#, fuzzy
+msgid "A_ccept all"
msgstr "全部接受(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:866
msgid "_Send Information"
msgstr "发送信息(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:870
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../plugins/itip-formatter/itip-view.c:861
+#: ../plugins/itip-formatter/itip-view.c:873
msgid "_Update"
msgstr "更新(_U)"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1076
-#: ../plugins/itip-formatter/itip-view.c:1130
+#: ../plugins/itip-formatter/itip-view.c:1084
+#: ../plugins/itip-formatter/itip-view.c:1138
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1123
msgid "Send _reply to sender"
msgstr "回复发件人(_R)"
-#: ../plugins/itip-formatter/itip-view.c:1145
+#: ../plugins/itip-formatter/itip-view.c:1153
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
-#: ../plugins/itip-formatter/itip-view.c:1154
+#: ../plugins/itip-formatter/itip-view.c:1162
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1171
msgid "Show time as _free"
msgstr "将时间显示为空闲(_F)"
-#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1174
msgid "_Preserve my reminder"
msgstr "保留我的提醒(_P)"
#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1172
+#: ../plugins/itip-formatter/itip-view.c:1180
msgid "_Inherit reminder"
msgstr "继承提示(_I)"
-#: ../plugins/itip-formatter/itip-view.c:1915
+#: ../plugins/itip-formatter/itip-view.c:1923
msgid "_Tasks:"
msgstr "任务(_T):"
-#: ../plugins/itip-formatter/itip-view.c:1917
+#: ../plugins/itip-formatter/itip-view.c:1925
msgid "_Memos:"
msgstr "备忘(_M):"
@@ -18143,16 +17695,15 @@ msgid "Itip Formatter"
msgstr "Itip 格式化"
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid ""
-"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
-"&quot;{1}&quot;?"
+#, fuzzy
+msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
msgstr "“{0}”代理了该会议。您是否想要添加代理人“{1}”?"
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "This meeting has been delegated"
msgstr "该会议已被代理"
-#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
+#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
msgid ""
"This response is not from a current attendee. Add the sender as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
@@ -18181,11 +17732,11 @@ msgstr "新邮件到达时生成 D-Bus 信息。"
msgid ""
"If \"true\", then beep, otherwise will play sound file when new messages "
"arrive."
-msgstr "新信件到达时,此值如果为 true,则响铃,否则播放声音文件。"
+msgstr "新信息到达时,此值如果为 true,则响铃,否则播放声音文件。"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
msgid "Notify new messages for Inbox only."
-msgstr "只通知收件箱中的新信件。"
+msgstr "只通知收件箱中的新信息。"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
msgid "Play sound when new messages arrive."
@@ -18230,18 +17781,17 @@ msgstr "是否闪烁图标。"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
msgid "Whether to notify new messages in Inbox folder only."
-msgstr "是否只通知收件箱文件夹中的新信件。"
+msgstr "是否只通知收件箱文件夹中的新信息。"
-#: ../plugins/mail-notification/mail-notification.c:344
+#: ../plugins/mail-notification/mail-notification.c:355
msgid "Evolution's Mail Notification"
msgstr "Evolution 邮件通知"
-#: ../plugins/mail-notification/mail-notification.c:366
+#: ../plugins/mail-notification/mail-notification.c:377
msgid "Mail Notification Properties"
msgstr "邮件通知属性"
-#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:495
+#: ../plugins/mail-notification/mail-notification.c:513
#, c-format
msgid ""
"You have received %d new message\n"
@@ -18251,66 +17801,68 @@ msgid_plural ""
"in %s."
msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
-#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:506
+#. Translators: "From:" is preceding a new mail
+#. * sender address, like "From: user@example.com"
+#: ../plugins/mail-notification/mail-notification.c:525
#, c-format
msgid "From: %s"
msgstr "来自:%s"
-#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:518
+#. Translators: "Subject:" is preceding a new mail
+#. * subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:538
#, c-format
msgid "Subject: %s"
msgstr "主题:%s"
-#: ../plugins/mail-notification/mail-notification.c:527
+#: ../plugins/mail-notification/mail-notification.c:548
#, c-format
msgid "You have received %d new message."
msgid_plural "You have received %d new messages."
msgstr[0] "您收到了 %d 封新邮件。"
-#: ../plugins/mail-notification/mail-notification.c:545
-#: ../plugins/mail-notification/mail-notification.c:550
+#: ../plugins/mail-notification/mail-notification.c:570
+#: ../plugins/mail-notification/mail-notification.c:577
msgid "New email"
msgstr "新电子邮件"
-#: ../plugins/mail-notification/mail-notification.c:604
+#: ../plugins/mail-notification/mail-notification.c:638
msgid "Show icon in _notification area"
msgstr "在通知区显示图标(_N)"
-#: ../plugins/mail-notification/mail-notification.c:632
+#: ../plugins/mail-notification/mail-notification.c:666
msgid "B_link icon in notification area"
msgstr "闪烁通知区图标(_L)"
-#: ../plugins/mail-notification/mail-notification.c:642
+#: ../plugins/mail-notification/mail-notification.c:676
msgid "Popup _message together with the icon"
msgstr "同时弹出图标和消息(_M)"
-#: ../plugins/mail-notification/mail-notification.c:827
+#: ../plugins/mail-notification/mail-notification.c:863
msgid "_Play sound when new messages arrive"
msgstr "新邮件到达时播放声音(_P)"
-#: ../plugins/mail-notification/mail-notification.c:856
+#: ../plugins/mail-notification/mail-notification.c:892
msgid "_Beep"
msgstr "响铃(_B)"
-#: ../plugins/mail-notification/mail-notification.c:869
+#: ../plugins/mail-notification/mail-notification.c:905
msgid "Use sound _theme"
msgstr "使用声音主题(_T)"
-#: ../plugins/mail-notification/mail-notification.c:888
+#: ../plugins/mail-notification/mail-notification.c:924
msgid "Play _file:"
msgstr "播放文件(_F):"
-#: ../plugins/mail-notification/mail-notification.c:899
+#: ../plugins/mail-notification/mail-notification.c:935
msgid "Select sound file"
msgstr "选择声音文件"
-#: ../plugins/mail-notification/mail-notification.c:957
+#: ../plugins/mail-notification/mail-notification.c:993
msgid "Notify new messages for _Inbox only"
-msgstr "只通知收件箱中的新信件(_I)"
+msgstr "只通知收件箱中的新信息(_I)"
-#: ../plugins/mail-notification/mail-notification.c:966
+#: ../plugins/mail-notification/mail-notification.c:1002
msgid "Generate a _D-Bus message"
msgstr "生成 _D-Bus 消息"
@@ -18323,51 +17875,63 @@ msgid "Notifies you when new mail messages arrive."
msgstr "当新的邮件信息到达时提示您。"
#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:166
+#: ../plugins/mail-to-task/mail-to-task.c:158
#, c-format
msgid "Created from a mail by %s"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:496
+#: ../plugins/mail-to-task/mail-to-task.c:489
#, c-format
msgid ""
"Selected calendar contains event '%s' already. Would you like to edit the "
"old event?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:499
+#: ../plugins/mail-to-task/mail-to-task.c:492
#, c-format
msgid ""
"Selected task list contains task '%s' already. Would you like to edit the "
"old task?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:502
+#: ../plugins/mail-to-task/mail-to-task.c:495
#, c-format
msgid ""
"Selected memo list contains memo '%s' already. Would you like to edit the "
"old memo?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:519
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:515
msgid ""
"Selected calendar contains some events for the given mails already. Would "
"you like to create new events anyway?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:522
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:521
msgid ""
"Selected task list contains some tasks for the given mails already. Would "
"you like to create new tasks anyway?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:525
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:527
msgid ""
"Selected memo list contains some memos for the given mails already. Would "
"you like to create new memos anyway?"
msgstr ""
-#: ../plugins/mail-to-task/mail-to-task.c:543
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:548
msgid ""
"Selected calendar contains an event for the given mail already. Would you "
"like to create new event anyway?"
@@ -18376,7 +17940,10 @@ msgid_plural ""
"like to create new events anyway?"
msgstr[0] ""
-#: ../plugins/mail-to-task/mail-to-task.c:549
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:557
msgid ""
"Selected task list contains a task for the given mail already. Would you "
"like to create new task anyway?"
@@ -18385,7 +17952,10 @@ msgid_plural ""
"like to create new tasks anyway?"
msgstr[0] ""
-#: ../plugins/mail-to-task/mail-to-task.c:555
+#. Translators: Codewise it is impossible to provide separate strings for all
+#. combinations of singular and plural. Please translate it in the way that you
+#. feel is most appropriate for your language.
+#: ../plugins/mail-to-task/mail-to-task.c:566
msgid ""
"Selected memo list contains a memo for the given mail already. Would you "
"like to create new memo anyway?"
@@ -18394,78 +17964,78 @@ msgid_plural ""
"like to create new memos anyway?"
msgstr[0] ""
-#: ../plugins/mail-to-task/mail-to-task.c:614
+#: ../plugins/mail-to-task/mail-to-task.c:625
msgid "[No Summary]"
msgstr "[没有概要]"
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:636
msgid "Invalid object returned from a server"
msgstr "从一个服务器上返回了无效的对象"
-#: ../plugins/mail-to-task/mail-to-task.c:696
+#: ../plugins/mail-to-task/mail-to-task.c:707
#, c-format
msgid "An error occurred during processing: %s"
msgstr "在处理时出现了一个错误:%s"
-#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:736
#, c-format
msgid "Cannot open calendar. %s"
msgstr "无法打开日历。%s"
-#: ../plugins/mail-to-task/mail-to-task.c:732
+#: ../plugins/mail-to-task/mail-to-task.c:743
#, fuzzy
msgid ""
"Selected source is read only, thus cannot create event there. Select other "
"source, please."
msgstr "选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
-#: ../plugins/mail-to-task/mail-to-task.c:735
+#: ../plugins/mail-to-task/mail-to-task.c:746
msgid ""
"Selected source is read only, thus cannot create task there. Select other "
"source, please."
msgstr "选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
-#: ../plugins/mail-to-task/mail-to-task.c:738
+#: ../plugins/mail-to-task/mail-to-task.c:749
#, fuzzy
msgid ""
"Selected source is read only, thus cannot create memo there. Select other "
"source, please."
msgstr "选中的源是只读的,因此不能在此创建任务。请选择其它的源。"
-#: ../plugins/mail-to-task/mail-to-task.c:941
+#: ../plugins/mail-to-task/mail-to-task.c:952
#, c-format
msgid "Cannot get source list. %s"
msgstr "能获取源列表。 %s"
-#: ../plugins/mail-to-task/mail-to-task.c:1060
+#: ../plugins/mail-to-task/mail-to-task.c:1071
msgid "Create an _Event"
msgstr "创建一个事件(_E)"
-#: ../plugins/mail-to-task/mail-to-task.c:1062
+#: ../plugins/mail-to-task/mail-to-task.c:1073
msgid "Create a new event from the selected message"
msgstr "从选择的信息中创建一个新的事件"
-#: ../plugins/mail-to-task/mail-to-task.c:1067
+#: ../plugins/mail-to-task/mail-to-task.c:1078
msgid "Create a Mem_o"
msgstr "创建一个备忘(_O)"
-#: ../plugins/mail-to-task/mail-to-task.c:1069
+#: ../plugins/mail-to-task/mail-to-task.c:1080
msgid "Create a new memo from the selected message"
msgstr "用所选邮件创建新备忘"
-#: ../plugins/mail-to-task/mail-to-task.c:1074
+#: ../plugins/mail-to-task/mail-to-task.c:1085
msgid "Create a _Task"
msgstr "创建一个任务(_T)"
-#: ../plugins/mail-to-task/mail-to-task.c:1076
+#: ../plugins/mail-to-task/mail-to-task.c:1087
msgid "Create a new task from the selected message"
msgstr "用所选邮件创建新任务"
-#: ../plugins/mail-to-task/mail-to-task.c:1084
+#: ../plugins/mail-to-task/mail-to-task.c:1095
msgid "Create a _Meeting"
msgstr "创建一个会议(_M)"
-#: ../plugins/mail-to-task/mail-to-task.c:1086
+#: ../plugins/mail-to-task/mail-to-task.c:1097
msgid "Create a new meeting from the selected message"
msgstr "用所选邮件创建新会议"
@@ -18473,56 +18043,56 @@ msgstr "用所选邮件创建新会议"
msgid "Convert a mail message to a task."
msgstr "转换一个邮件信息成为一个任务。"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
msgid "Get List _Archive"
msgstr "获得列表存档(_A)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:288
msgid "Get an archive of the list this message belongs to"
msgstr "获取这封信所属邮件列表的存档"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
msgid "Get List _Usage Information"
msgstr "获得列表用法信息(_U)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:295
msgid "Get information about the usage of the list this message belongs to"
msgstr "获取这封信所属邮件列表的用法信息"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
msgid "Contact List _Owner"
msgstr "联系列表所有者(_O)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:302
msgid "Contact the owner of the mailing list this message belongs to"
msgstr "联系这封信所属邮件列表的所有者"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
msgid "_Post Message to List"
msgstr "投递到列表(_P)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:309
msgid "Post a message to the mailing list this message belongs to"
msgstr "给这封信所属的邮件列表投递"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
msgid "_Subscribe to List"
msgstr "订阅列表(_S)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:316
msgid "Subscribe to the mailing list this message belongs to"
msgstr "订阅这封信所属的邮件列表"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:318
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
msgid "_Unsubscribe from List"
msgstr "退订列表(_U)"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:323
#, fuzzy
msgid "Unsubscribe from the mailing list this message belongs to"
msgstr "退订这封信所属的邮件列表"
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:327
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:330
msgid "Mailing _List"
msgstr "邮件列表(_L)"
@@ -18571,7 +18141,7 @@ msgstr ""
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
msgid "Send e-mail message to mailing list?"
-msgstr "把信件发送到邮件列表吗?"
+msgstr "把信息发送到邮件列表吗?"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
#, fuzzy
@@ -18591,7 +18161,7 @@ msgid ""
"\n"
"Header: {1}"
msgstr ""
-"信件的 {0} 头格式不对,无法处理。\n"
+"信息的 {0} 头格式不对,无法处理。\n"
"\n"
"头:{1}"
@@ -18603,33 +18173,33 @@ msgstr "这封信不包含此动作所需的头信息。"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
msgid "_Edit message"
-msgstr "编辑信件(_E)"
+msgstr "编辑信息(_E)"
#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
msgid "_Send message"
-msgstr "发送信件(_S)"
+msgstr "发送信息(_S)"
#: ../plugins/mark-all-read/mark-all-read.c:42
msgid "Also mark messages in subfolders?"
-msgstr "也标记的子文件夹中的信件吗?"
+msgstr "也标记的子文件夹中的信息吗?"
#: ../plugins/mark-all-read/mark-all-read.c:44
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 "您是想要只标记当前文件夹中的信件,还是也包括子文件夹中的信件?"
+msgstr "您是想要只标记当前文件夹中的信息,还是也包括子文件夹中的信息?"
-#: ../plugins/mark-all-read/mark-all-read.c:168
+#: ../plugins/mark-all-read/mark-all-read.c:194
msgid "In Current Folder and _Subfolders"
msgstr "在当前文件夹和子文件夹(_S)"
-#: ../plugins/mark-all-read/mark-all-read.c:182
+#: ../plugins/mark-all-read/mark-all-read.c:208
msgid "In Current _Folder Only"
msgstr "只在当前文件夹(_F)"
-#: ../plugins/mark-all-read/mark-all-read.c:402
+#: ../plugins/mark-all-read/mark-all-read.c:437
msgid "Mark Me_ssages as Read"
-msgstr "把信件标记为已读(_S)"
+msgstr "把信息标记为已读(_S)"
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
msgid "Mark All Read"
@@ -18638,7 +18208,7 @@ msgstr "全部标为已读"
#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
#, fuzzy
msgid "Mark all messages in a folder as read."
-msgstr "将此文件夹中的所有信件标记为已读"
+msgstr "将此文件夹中的所有信息标记为已读"
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
msgid "Manage your Evolution plugins."
@@ -18687,41 +18257,41 @@ msgstr "首选纯文本"
msgid "View mail messages as plain text, even if they contain HTML content."
msgstr "作为纯文本来查看邮件信息,甚至在它们包含 HTML 内容时。"
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
msgid "Show HTML if present"
msgstr "首选 HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:201
+#: ../plugins/prefer-plain/prefer-plain.c:198
msgid "Let Evolution choose the best part to show."
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
#, fuzzy
msgid "Show plain text if present"
msgstr "首选 HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:202
+#: ../plugins/prefer-plain/prefer-plain.c:199
msgid ""
"Show plain text part, if present, otherwise let Evolution choose the best "
"part to show."
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
#, fuzzy
msgid "Only ever show plain text"
msgstr "仅显示纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:203
+#: ../plugins/prefer-plain/prefer-plain.c:200
msgid ""
"Always show plain text part and make attachments from other parts, if "
"requested."
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:247
msgid "Show s_uppressed HTML parts as attachments"
msgstr ""
-#: ../plugins/prefer-plain/prefer-plain.c:270
+#: ../plugins/prefer-plain/prefer-plain.c:267
msgid "HTML _Mode"
msgstr "HT_ML 模式"
@@ -18745,31 +18315,35 @@ msgstr "Outlook PST 导入"
msgid "Outlook personal folders (.pst)"
msgstr "Outlook 个人文件夹(.pst)"
-#: ../plugins/pst-import/pst-importer.c:299
+#: ../plugins/pst-import/pst-importer.c:295
msgid "_Mail"
msgstr "邮件(_M)"
+#: ../plugins/pst-import/pst-importer.c:307
+msgid "Destination folder:"
+msgstr "目的文件夹:"
+
#. Address book
-#: ../plugins/pst-import/pst-importer.c:317
+#: ../plugins/pst-import/pst-importer.c:313
msgid "_Address Book"
msgstr "地址簿(_A)"
#. Appointments
-#: ../plugins/pst-import/pst-importer.c:324
+#: ../plugins/pst-import/pst-importer.c:320
msgid "A_ppointments"
msgstr "约会(_P)"
#. Tasks
-#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+#: ../plugins/pst-import/pst-importer.c:326 ../views/tasks/galview.xml.h:3
msgid "_Tasks"
msgstr "任务(_T)"
#. Journal
-#: ../plugins/pst-import/pst-importer.c:336
+#: ../plugins/pst-import/pst-importer.c:332
msgid "_Journal entries"
msgstr "日记项(_J)"
-#: ../plugins/pst-import/pst-importer.c:351
+#: ../plugins/pst-import/pst-importer.c:347
msgid "Importing Outlook data"
msgstr "导入 Outlook 数据"
@@ -18829,7 +18403,7 @@ msgstr "您确定您想要删除此位置吗?"
#: ../plugins/publish-calendar/publish-calendar.c:1051
#, fuzzy
msgid "Could not create publish thread."
-msgstr "无法创建信件。"
+msgstr "无法创建信息。"
#: ../plugins/publish-calendar/publish-calendar.c:1059
msgid "_Publish Calendar Information"
@@ -18933,64 +18507,64 @@ msgstr "iCal"
msgid "Could not publish calendar: Calendar backend no longer exists"
msgstr "不能发布日历:日历后端已经不存在了"
-#: ../plugins/publish-calendar/url-editor-dialog.c:478
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
msgid "New Location"
msgstr "新建位置"
-#: ../plugins/publish-calendar/url-editor-dialog.c:480
+#: ../plugins/publish-calendar/url-editor-dialog.c:478
msgid "Edit Location"
msgstr "编辑位置"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:121
#, fuzzy, c-format
msgid "SpamAssassin not found, code: %d"
msgstr "垃圾克星插件"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:129
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:137
#, fuzzy, c-format
msgid "Failed to create pipe: %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:176
#, fuzzy, c-format
msgid "Error after fork: %s"
msgstr ""
"%s 错误:\n"
" %s"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:232
#, c-format
msgid "SpamAssassin child process does not respond, killing..."
msgstr "SpamAssassin 子进程没有响应,关闭中..."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:234
#, c-format
msgid "Wait for SpamAssassin child process interrupted, terminating..."
msgstr "等待停止 SpamAssassin 子进程,终止中..."
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
#, c-format
msgid "Pipe to SpamAssassin failed, error code: %d"
msgstr "SpamAssassin 的管道出错了,错误码:%d"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:506
#, fuzzy, c-format
msgid "SpamAssassin is not available. Please install it first."
msgstr "垃圾克星不可用。"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:927
msgid "This will make SpamAssassin more reliable, but slower"
msgstr "这将让垃圾克星更可靠,但稍慢"
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:935
msgid "I_nclude remote tests"
msgstr "包含远程测试(_N)"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
#, fuzzy
msgid "Filter junk messages using SpamAssassin."
-msgstr "使用 Bogofilter 过滤垃圾信件。"
+msgstr "使用 Bogofilter 过滤垃圾信息。"
#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
msgid "SpamAssassin Junk Filter"
@@ -19101,80 +18675,29 @@ msgstr "%FT%T"
msgid "RDF format (.rdf)"
msgstr "RDF 格式(.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:111
+#: ../plugins/save-calendar/save-calendar.c:120
msgid "_Format:"
msgstr "格式(_F):"
-#: ../plugins/save-calendar/save-calendar.c:172
+#: ../plugins/save-calendar/save-calendar.c:181
msgid "Select destination file"
msgstr "选择目的文件"
-#: ../plugins/save-calendar/save-calendar.c:325
+#: ../plugins/save-calendar/save-calendar.c:334
#, fuzzy
msgid "Save the selected calendar to disk"
msgstr "把选中的日历或任务列表保存到磁盘。"
-#: ../plugins/save-calendar/save-calendar.c:356
+#: ../plugins/save-calendar/save-calendar.c:365
#, fuzzy
msgid "Save the selected memo list to disk"
msgstr "把选中的日历或任务列表保存到磁盘。"
-#: ../plugins/save-calendar/save-calendar.c:387
+#: ../plugins/save-calendar/save-calendar.c:396
#, fuzzy
msgid "Save the selected task list to disk"
msgstr "把选中的日历或任务列表保存到磁盘。"
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
-msgid "Guides you through your initial account setup."
-msgstr "指引您进行初始帐户的设置。"
-
-#: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:2
-msgid "Setup Assistant"
-msgstr "设置助手"
-
-#: ../plugins/startup-wizard/startup-wizard.c:110
-msgid "Evolution Setup Assistant"
-msgstr "Evolution 设置助手"
-
-#: ../plugins/startup-wizard/startup-wizard.c:115
-msgid "Welcome"
-msgstr "欢迎"
-
-#: ../plugins/startup-wizard/startup-wizard.c:118
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications. \n"
-"\n"
-"Please click the \"Forward\" button to continue. "
-msgstr ""
-"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的电子邮件账户,并从其它"
-"应用程序中导入文件。\n"
-"\n"
-"请单击“前进”按钮继续。"
-
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../widgets/misc/e-import-assistant.c:385
-msgid "Please select the information that you would like to import:"
-msgstr "请选择您希望导入的信息:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:168
-#: ../widgets/misc/e-import-assistant.c:542
-#, c-format
-msgid "From %s:"
-msgstr "从 %s:"
-
-#: ../plugins/startup-wizard/startup-wizard.c:185
-msgid "Importing files"
-msgstr "导入文件"
-
-#: ../plugins/startup-wizard/startup-wizard.c:248
-msgid "Importing data."
-msgstr "正在导入数据。"
-
-#: ../plugins/startup-wizard/startup-wizard.c:250
-msgid "Please wait"
-msgstr "请稍候"
-
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
msgid "Sort mail message threads by subject."
msgstr "通过主题来排序邮件信息。"
@@ -19185,12 +18708,12 @@ msgstr "主题线索"
#: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
msgid "Thread messages by subject"
-msgstr "基于主题按线索编排信件列表"
+msgstr "基于主题按线索编排信息列表"
#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
-#: ../plugins/subject-thread/subject-thread.c:56
+#: ../plugins/subject-thread/subject-thread.c:63
msgid "F_all back to threading messages by subject"
-msgstr "默认按照主题对线索中的信件排序(_A)"
+msgstr "默认按照主题对线索中的信息排序(_A)"
#: ../plugins/templates/apps-evolution-template-placeholders.schemas.in.h:1
#, fuzzy
@@ -19203,15 +18726,15 @@ msgstr "消息主体中的用于附件提醒插件的线索列表。"
msgid "Drafts based template plugin"
msgstr "基于草稿的模板型插件"
-#: ../plugins/templates/templates.c:617
+#: ../plugins/templates/templates.c:616
msgid "No Title"
msgstr "无标题"
-#: ../plugins/templates/templates.c:688
+#: ../plugins/templates/templates.c:687
msgid "Save as _Template"
msgstr "另存为模板(_T)"
-#: ../plugins/templates/templates.c:690
+#: ../plugins/templates/templates.c:689
msgid "Save as Template"
msgstr "另存为模板"
@@ -19232,26 +18755,26 @@ msgstr "多个 vCard"
msgid "Show vCards directly in mail messages."
msgstr "在邮件信息里直接查看 vCards。"
-#: ../plugins/vcard-inline/vcard-inline.c:160
-#: ../plugins/vcard-inline/vcard-inline.c:245
+#: ../plugins/vcard-inline/vcard-inline.c:164
+#: ../plugins/vcard-inline/vcard-inline.c:249
msgid "Show Full vCard"
msgstr "显示完整 vCard"
-#: ../plugins/vcard-inline/vcard-inline.c:163
+#: ../plugins/vcard-inline/vcard-inline.c:167
msgid "Show Compact vCard"
msgstr "显示紧凑 vCard"
-#: ../plugins/vcard-inline/vcard-inline.c:224
+#: ../plugins/vcard-inline/vcard-inline.c:228
msgid "There is one other contact."
msgstr "有另外 1 个联系人。"
-#: ../plugins/vcard-inline/vcard-inline.c:233
+#: ../plugins/vcard-inline/vcard-inline.c:237
#, c-format
msgid "There is %d other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "有另外 %d 个联系人。"
-#: ../plugins/vcard-inline/vcard-inline.c:254
+#: ../plugins/vcard-inline/vcard-inline.c:258
msgid "Save in Address Book"
msgstr "保存至地址簿"
@@ -19267,11 +18790,11 @@ msgstr "WebDAV 联系人"
msgid "WebDAV"
msgstr "WebDAV"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:245
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:248
msgid "URL:"
msgstr "URL:"
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:271
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:274
msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
@@ -19315,7 +18838,6 @@ msgstr "默认窗口宽度"
#: ../shell/apps_evolution_shell.schemas.in.h:10
#, fuzzy
-#| msgid "Enable search folders"
msgid "Enable express mode"
msgstr "启用搜索文件夹"
@@ -19570,158 +19092,49 @@ msgstr "窗口按钮样式"
msgid "Window buttons are visible"
msgstr "窗口按钮可见"
-#: ../shell/e-shell-content.c:577 ../shell/e-shell-content.c:578
+#: ../shell/e-shell-content.c:520 ../shell/e-shell-content.c:521
msgid "Searches"
msgstr "搜索"
-#: ../shell/e-shell-content.c:619
+#: ../shell/e-shell-content.c:563
msgid "Save Search"
msgstr "保存搜索"
-#: ../shell/e-shell-migrate.c:287 ../shell/e-shell-migrate.c:288
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
#. Translators: The "Show:" label precedes a combo box that
#. * 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:883
+#: ../shell/e-shell-searchbar.c:921
msgid "Sho_w:"
msgstr "显示(_W):"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:910
+#: ../shell/e-shell-searchbar.c:952
msgid "Sear_ch:"
msgstr "搜索(_C):"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:970
+#: ../shell/e-shell-searchbar.c:1013
msgid "i_n"
msgstr "在(_N) "
-#: ../shell/e-shell-switcher.c:448
-msgid "Toolbar Style"
-msgstr "工具栏样式"
-
-#: ../shell/e-shell-switcher.c:449
-msgid "The switcher's toolbar style"
-msgstr ""
-
-#: ../shell/e-shell-switcher.c:465 ../shell/e-shell-window.c:740
-msgid "Toolbar Visible"
-msgstr "工具栏可见"
-
-#: ../shell/e-shell-switcher.c:466
-msgid "Whether the switcher is visible"
-msgstr "切换器是否可见"
-
-#: ../shell/e-shell-utils.c:247
+#: ../shell/e-shell-utils.c:253
#, fuzzy
-#| msgid "vCard (.vcf, .gcrd)"
msgid "vCard (.vcf)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../shell/e-shell-utils.c:249
+#: ../shell/e-shell-utils.c:255
#, fuzzy
-#| msgid "iCalendar files (.ics)"
msgid "iCalendar (.ics)"
msgstr "iCalendar 文件(.ics)"
-#: ../shell/e-shell-utils.c:270
+#: ../shell/e-shell-utils.c:276
#, fuzzy
-#| msgid "All files"
msgid "All Files (*)"
msgstr "全部文件"
-#: ../shell/e-shell-view.c:681
-#, fuzzy
-msgid "Switcher Action"
-msgstr "切换到 %s"
-
-#: ../shell/e-shell-view.c:682
-msgid "The switcher action for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:697
-msgid "Page Number"
-msgstr "页码"
-
-#: ../shell/e-shell-view.c:698
-msgid "The notebook page number of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:714
-#, fuzzy
-#| msgid "Search Filter"
-msgid "Search Rule"
-msgstr "搜索过滤器"
-
-#: ../shell/e-shell-view.c:715
-#, fuzzy
-msgid "Criteria for the current search results"
-msgstr "取消当前邮件操作"
-
-#: ../shell/e-shell-view.c:730
-msgid "The EShellBackend for this shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:745
-msgid "Shell Content Widget"
-msgstr ""
-
-#: ../shell/e-shell-view.c:746
-msgid "The content widget appears in a shell window's right pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:762
-#, fuzzy
-msgid "Shell Sidebar Widget"
-msgstr "默认侧边栏宽度"
-
-#: ../shell/e-shell-view.c:763
-msgid "The sidebar widget appears in a shell window's left pane"
-msgstr ""
-
-#: ../shell/e-shell-view.c:778
-#, fuzzy
-msgid "Shell Taskbar Widget"
-msgstr "选择任务列表"
-
-#: ../shell/e-shell-view.c:779
-msgid "The taskbar widget appears at the bottom of a shell window"
-msgstr ""
-
-#: ../shell/e-shell-view.c:794
-#, fuzzy
-msgid "Shell Window"
-msgstr "新建窗口(_W)"
-
-#: ../shell/e-shell-view.c:795
-msgid "The window to which the shell view belongs"
-msgstr ""
-
-#: ../shell/e-shell-view.c:811
-msgid "The key file holding widget state data"
-msgstr ""
-
-#: ../shell/e-shell-view.c:826
-msgid "The title of the shell view"
-msgstr ""
-
-#: ../shell/e-shell-view.c:840
-#, fuzzy
-msgid "Current View ID"
-msgstr "当前视图(_C)"
-
-#: ../shell/e-shell-view.c:841
-#, fuzzy
-msgid "The current GAL view ID"
-msgstr "当前时间"
-
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
@@ -19735,421 +19148,303 @@ msgstr ""
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-actions.c:1224
+#: ../shell/e-shell-window-actions.c:1235
msgid "Bug Buddy is not installed."
msgstr "未安装 Bug Buddy。"
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1237
msgid "Bug Buddy could not be run."
msgstr "无法运行 Bug Buddy。"
-#: ../shell/e-shell-window-actions.c:1343
-msgid "GNOME Pilot is not installed."
-msgstr "GNOME Pilot 没有安装。"
-
-#: ../shell/e-shell-window-actions.c:1345
-msgid "GNOME Pilot could not be run."
-msgstr "GNOME Pilot 不能运行。"
-
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1418
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../shell/e-shell-window-actions.c:1444
+#: ../shell/e-shell-window-actions.c:1423
+#: ../shell/e-shell-window-actions.c:1437
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../shell/e-shell-window-actions.c:1451
+#: ../shell/e-shell-window-actions.c:1444
msgid "_Contents"
msgstr "目录(_C)"
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1446
msgid "Open the Evolution User Guide"
msgstr "打开 Evolution 用户指南"
-#: ../shell/e-shell-window-actions.c:1479
+#: ../shell/e-shell-window-actions.c:1472
msgid "Evolution _FAQ"
msgstr "Evolution _FAQ"
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1474
msgid "Open the Frequently Asked Questions webpage"
msgstr "打开 FAQ 网页"
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1479
msgid "_Forget Passwords"
msgstr "丢弃密码(_F)"
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1481
msgid "Forget all remembered passwords"
msgstr "忘记所有记住的密码"
-#: ../shell/e-shell-window-actions.c:1493
+#: ../shell/e-shell-window-actions.c:1486
msgid "I_mport..."
msgstr "导入(_M)..."
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1488
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1493
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1495
msgid "Create a new window displaying this view"
msgstr "创建一个新窗口来显示这个视图"
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1509
msgid "Configure Evolution"
msgstr "配置 Evolution"
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1514
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1516
msgid "Show Evolution's shortcut keys"
msgstr "显示 Evolution 的快捷键"
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1523
msgid "Exit the program"
msgstr "退出程序"
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1528
msgid "_Advanced Search..."
msgstr "高级搜索(_A)..."
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1530
msgid "Construct a more advanced search"
msgstr ""
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1537
#, fuzzy
msgid "Clear the current search parameters"
msgstr "取消当前邮件操作"
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1542
msgid "_Edit Saved Searches..."
msgstr "编辑保存的搜索(_E)..."
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1544
msgid "Manage your saved searches"
msgstr "管理您保存的搜索"
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1551
msgid "Click here to change the search type"
msgstr "单击此处更改搜索类型"
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1556
msgid "_Find Now"
msgstr "立即查找(_F)"
#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1558
msgid "Execute the current search parameters"
msgstr "执行当前搜索参数"
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1563
msgid "_Save Search..."
msgstr "保存搜索(_S)..."
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1565
msgid "Save the current search parameters"
msgstr "保存当前搜索参数"
-#: ../shell/e-shell-window-actions.c:1584
+#: ../shell/e-shell-window-actions.c:1577
msgid "Send / _Receive"
msgstr "发送/接收(_R)"
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1579
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1584
msgid "Submit _Bug Report..."
msgstr "提交错误报告(_B)..."
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1586
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../shell/e-shell-window-actions.c:1598
-msgid "GNOME Pilot _Synchronization..."
-msgstr "GNOME Pilot 同步(_S)..."
-
-#: ../shell/e-shell-window-actions.c:1600
-msgid "Set up GNOME Pilot configuration"
-msgstr "设置 GNOME Pilot 配置"
-
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1591
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1593
msgid "Put Evolution into offline mode"
msgstr "将 Evolution 转入脱机模式"
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1598
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1600
msgid "Put Evolution into online mode"
msgstr "将 Evolution 转入联机模式"
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1628
msgid "Lay_out"
msgstr "布局(_O)"
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1635
msgid "_New"
msgstr "新建(_N)"
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1642
msgid "_Search"
msgstr "搜索(_S)"
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1649
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1663
msgid "_Window"
msgstr "窗口(_W)"
-#: ../shell/e-shell-window-actions.c:1706
+#: ../shell/e-shell-window-actions.c:1692
msgid "Show Side _Bar"
msgstr "显示侧边栏(_B)"
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1694
msgid "Show the side bar"
msgstr "显示侧边栏"
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1700
msgid "Show _Buttons"
msgstr "显示按钮(_B)"
-#: ../shell/e-shell-window-actions.c:1716
+#: ../shell/e-shell-window-actions.c:1702
msgid "Show the switcher buttons"
msgstr "显示切换器按钮"
-#: ../shell/e-shell-window-actions.c:1722
+#: ../shell/e-shell-window-actions.c:1708
msgid "Show _Status Bar"
msgstr "显示状态栏(_S)"
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1710
msgid "Show the status bar"
msgstr "显示状态栏"
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1716
msgid "Show _Tool Bar"
msgstr "显示工具栏(_T)"
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1718
msgid "Show the tool bar"
msgstr "显示工具栏"
-#: ../shell/e-shell-window-actions.c:1754
+#: ../shell/e-shell-window-actions.c:1740
msgid "_Icons Only"
msgstr "只有图标(_I)"
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1742
msgid "Display window buttons with icons only"
msgstr "显示只有图标的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1761
+#: ../shell/e-shell-window-actions.c:1747
msgid "_Text Only"
msgstr "只有文字(_T)"
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1749
msgid "Display window buttons with text only"
msgstr "显示只有文字的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1768
+#: ../shell/e-shell-window-actions.c:1754
msgid "Icons _and Text"
msgstr "图标和文字(_A)"
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1756
msgid "Display window buttons with icons and text"
msgstr "显示带图标和文字的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1761
msgid "Tool_bar Style"
msgstr "工具栏样式(_B)"
-#: ../shell/e-shell-window-actions.c:1777
+#: ../shell/e-shell-window-actions.c:1763
msgid "Display window buttons using the desktop toolbar setting"
msgstr "使用桌面工具栏设置显示窗口按钮"
-#: ../shell/e-shell-window-actions.c:1785
+#: ../shell/e-shell-window-actions.c:1771
msgid "Define Views..."
msgstr "定义视图..."
-#: ../shell/e-shell-window-actions.c:1787
+#: ../shell/e-shell-window-actions.c:1773
msgid "Create or edit views"
msgstr "创建或编辑视图"
-#: ../shell/e-shell-window-actions.c:1792
+#: ../shell/e-shell-window-actions.c:1778
msgid "Save Custom View..."
msgstr "保存当前视图..."
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1780
msgid "Save current custom view"
msgstr "保存当前自定义视图"
-#: ../shell/e-shell-window-actions.c:1801
+#: ../shell/e-shell-window-actions.c:1787
msgid "C_urrent View"
msgstr "当前视图(_U)"
-#: ../shell/e-shell-window-actions.c:1811
+#: ../shell/e-shell-window-actions.c:1797
msgid "Custom View"
msgstr "当前视图"
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1799
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
-#: ../shell/e-shell-window-actions.c:1823
+#: ../shell/e-shell-window-actions.c:1809
#, fuzzy
msgid "Change the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
-#: ../shell/e-shell-window-actions.c:2200
+#: ../shell/e-shell-window-actions.c:2182
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell-window-actions.c:2413
+#: ../shell/e-shell-window-actions.c:2395
msgid "Execute these search parameters"
msgstr ""
#. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:571
+#: ../shell/e-shell-window-private.c:576
#, c-format
msgid "%s - Evolution"
msgstr "%s - Evolution"
-#: ../shell/e-shell-window.c:366
+#: ../shell/e-shell-window.c:416
msgid "New"
msgstr "新建"
-#: ../shell/e-shell-window.c:616
-msgid "Active Shell View"
-msgstr ""
-
-#: ../shell/e-shell-window.c:617
-#, fuzzy
-msgid "Name of the active shell view"
-msgstr "新视图的名称:"
-
-#: ../shell/e-shell-window.c:632
-msgid "The shell window's EFocusTracker"
-msgstr ""
-
-#: ../shell/e-shell-window.c:646 ../shell/e-shell.c:804
-msgid "Geometry"
-msgstr ""
-
-#: ../shell/e-shell-window.c:647 ../shell/e-shell.c:805
-msgid "Initial window geometry string"
-msgstr ""
-
-#: ../shell/e-shell-window.c:662
-msgid "Safe Mode"
-msgstr "安全模式"
-
-#: ../shell/e-shell-window.c:663
-#, fuzzy
-msgid "Whether the shell window is in safe mode"
-msgstr "插件是否已启用"
-
-#: ../shell/e-shell-window.c:694
-#, fuzzy
-#| msgid "Sidebar is visible"
-msgid "Sidebar Visible"
-msgstr "侧边栏可见"
-
-#: ../shell/e-shell-window.c:695
-#, fuzzy
-#| msgid "Whether the switcher is visible"
-msgid "Whether the shell window's side bar is visible"
-msgstr "切换器是否可见"
-
-#: ../shell/e-shell-window.c:709
-#, fuzzy
-#| msgid "Sidebar is visible"
-msgid "Switcher Visible"
-msgstr "侧边栏可见"
-
-#: ../shell/e-shell-window.c:710
-#, fuzzy
-#| msgid "Whether the window buttons should be visible."
-msgid "Whether the shell window's switcher buttons are visible"
-msgstr "窗口按钮是否可见。"
-
-#: ../shell/e-shell-window.c:725
-msgid "Taskbar Visible"
-msgstr "任务栏可见"
-
-#: ../shell/e-shell-window.c:726
-#, fuzzy
-#| msgid "Whether the switcher is visible"
-msgid "Whether the shell window's task bar is visible"
-msgstr "切换器是否可见"
-
-#: ../shell/e-shell-window.c:741
-#, fuzzy
-#| msgid "Whether the switcher is visible"
-msgid "Whether the shell window's tool bar is visible"
-msgstr "切换器是否可见"
-
-#: ../shell/e-shell-window.c:755
-msgid "UI Manager"
-msgstr "UI 管理器"
-
-#: ../shell/e-shell-window.c:756
-msgid "The shell window's GtkUIManager"
-msgstr ""
-
-#: ../shell/e-shell.c:212
+#: ../shell/e-shell.c:226
msgid "Preparing to go offline..."
msgstr "正在准备离线..."
-#: ../shell/e-shell.c:262
+#: ../shell/e-shell.c:276
msgid "Preparing to go online..."
msgstr "正在准备上线..."
-#: ../shell/e-shell.c:330
+#: ../shell/e-shell.c:335
msgid "Preparing to quit..."
msgstr "正在准备退出..."
-#: ../shell/e-shell.c:820
-msgid "Module Directory"
-msgstr "模块目录"
-
-#: ../shell/e-shell.c:821
-msgid "The directory from which to load EModules"
-msgstr ""
-
-#: ../shell/e-shell.c:836
-msgid "Network Available"
-msgstr "网络可用"
-
-#: ../shell/e-shell.c:837
-msgid "Whether the network is available"
-msgstr "网络是否可用"
-
-#: ../shell/e-shell.c:852 ../widgets/misc/e-online-button.c:134
-msgid "Online"
-msgstr "在线"
-
-#: ../shell/e-shell.c:853
-#, fuzzy
-msgid "Whether the shell is online"
-msgstr "插件是否已启用"
-
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:168
+#: ../shell/main.c:175
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -20181,7 +19476,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: ../shell/main.c:192
+#: ../shell/main.c:199
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -20189,7 +19484,7 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:199
+#: ../shell/main.c:206
msgid "Do not tell me again"
msgstr "不要再通知我"
@@ -20213,35 +19508,31 @@ msgstr "以“快速”模式启动"
msgid "Forcibly shut down Evolution"
msgstr "强制关闭所有 Evolution"
-#: ../shell/main.c:337
-msgid "Forcibly re-migrate from Evolution 1.4"
-msgstr "强制从 Evolution 1.4 重新升迁"
-
-#: ../shell/main.c:340
+#: ../shell/main.c:336
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:342
+#: ../shell/main.c:338
msgid "Disable loading of any plugins."
-msgstr "禁止装入任何插件。"
+msgstr "禁止载入任何插件。"
-#: ../shell/main.c:344
+#: ../shell/main.c:340
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "禁用邮件、联系人和任务的预览面板。"
-#: ../shell/main.c:348
+#: ../shell/main.c:344
msgid "Import URIs or file names given as rest of arguments."
msgstr ""
-#: ../shell/main.c:350
+#: ../shell/main.c:346
msgid "Request a running Evolution process to quit"
msgstr "请求正在运行的 Evolution 进程退出"
-#: ../shell/main.c:465
+#: ../shell/main.c:469
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:491
+#: ../shell/main.c:531
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -20255,90 +19546,41 @@ msgid "Are you sure you want to forget all remembered passwords?"
msgstr "您确定要忘记记住的所有密码吗?"
#: ../shell/shell.error.xml.h:2
-msgid "Continue"
-msgstr "继续"
+#, fuzzy
+msgid "Cannot upgrade directly from version {0}"
+msgstr "删除版本 {0} 中的旧数据吗?"
#: ../shell/shell.error.xml.h:3
-msgid "Delete old data from version {0}?"
-msgstr "删除版本 {0} 中的旧数据吗?"
+#, fuzzy
+msgid "Continue Anyway"
+msgstr "继续"
#: ../shell/shell.error.xml.h:4
msgid ""
+"Evolution no longer supports upgrading directly from version {0}. However as "
+"a workaround you might try first upgrading to Evolution 2, and then "
+"upgrading to Evolution 3."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:5
+msgid ""
"Forgetting your passwords will clear all remembered passwords. You will be "
"reprompted next time they are needed."
msgstr "忘记您的密码将清除记住的全部密码。下次需要密码的时候,您必须重新输入。"
-#: ../shell/shell.error.xml.h:6
-msgid "Insufficient disk space for upgrade."
-msgstr "磁盘空间不足以进行升级。"
-
#: ../shell/shell.error.xml.h:7
-msgid "Really delete old data?"
-msgstr "真的要删除旧数据吗?"
-
-#: ../shell/shell.error.xml.h:8
-msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be "
-"permanently removed.\n"
-"\n"
-"It is suggested you manually verify that all of your mail, contact, and "
-"calendar data is present, and that this version of Evolution operates "
-"correctly before deleting this old data.\n"
-"\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution "
-"without manual intervention.\n"
+msgid "Quit Now"
msgstr ""
-"即将永久删除“evolution”目录的全部内容。\n"
-"\n"
-"我们建议您在删除旧数据之前,手动检查您全部的邮件、联系人和日历信息都存在,并"
-"且确认此版本的 Evolution 工作正常。\n"
-"\n"
-"删除之后,您将无法降级至先前版本的 Evolution,除非您手动从头来过。\n"
-#: ../shell/shell.error.xml.h:14
-#, fuzzy
-msgid ""
-"The previous version of Evolution stored its data in a different location.\n"
-"\n"
-"If you choose to remove this data, the entire contents of the &quot;"
-"evolution&quot; directory will be removed permanently. If you choose to keep "
-"this data, then you may manually remove the contents of &quot;"
-"evolution&quot; at your convenience.\n"
-msgstr ""
-"先前版本的 Evolution 将其数据存储在不同的位置。\n"
-"\n"
-"如果您选择删除此数据,“evolution”目录中的全部内容都将被永久删除。如果您选择保"
-"留此数据,那么您可以在您方便的时候手动删除“evolution”目录。\n"
-
-#: ../shell/shell.error.xml.h:18
+#: ../shell/shell.error.xml.h:8
msgid "Upgrade from previous version failed:"
msgstr "从先前版本升级失败:"
-#: ../shell/shell.error.xml.h:19
-msgid ""
-"Upgrading your data and settings will require up to {0} of disk space, but "
-"you only have {1} available.\n"
-"\n"
-"You will need to make more space available in your home directory before you "
-"can continue."
-msgstr ""
-"升级您的数据和设置需要多至 {0} 的磁盘空间,但您现在只有 {1}。\n"
-"\n"
-"您需要在继续之前在主目录中腾出更多空间。"
-
-#: ../shell/shell.error.xml.h:22
+#: ../shell/shell.error.xml.h:9
msgid "_Forget"
msgstr "忘记(_F)"
-#: ../shell/shell.error.xml.h:23
-msgid "_Keep Data"
-msgstr "保留数据(_K)"
-
-#: ../shell/shell.error.xml.h:24
-msgid "_Remind Me Later"
-msgstr "稍后提醒(_R)"
-
-#: ../shell/shell.error.xml.h:25
+#: ../shell/shell.error.xml.h:10
#, fuzzy
msgid ""
"{0}\n"
@@ -20433,7 +19675,7 @@ msgstr ""
msgid "Show session management options"
msgstr "显示会话管理选项"
-#: ../smime/gui/ca-trust-dialog.c:96
+#: ../smime/gui/ca-trust-dialog.c:104
#, c-format
msgid ""
"Certificate '%s' is a CA certificate.\n"
@@ -20458,66 +19700,80 @@ msgid ""
"unless otherwise indicated here"
msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书的权威性,除非在此声明"
-#: ../smime/gui/certificate-manager.c:135
-#: ../smime/gui/certificate-manager.c:382
-#: ../smime/gui/certificate-manager.c:610
+#: ../smime/gui/certificate-manager.c:148
+#: ../smime/gui/certificate-manager.c:460
+#: ../smime/gui/certificate-manager.c:697
msgid "Select a certificate to import..."
msgstr "选择要导入的证书..."
-#: ../smime/gui/certificate-manager.c:144
+#: ../smime/gui/certificate-manager.c:157
msgid "All PKCS12 files"
msgstr "全部 PKCS12 文件"
-#: ../smime/gui/certificate-manager.c:150
-#: ../smime/gui/certificate-manager.c:397
-#: ../smime/gui/certificate-manager.c:624
+#: ../smime/gui/certificate-manager.c:163
+#: ../smime/gui/certificate-manager.c:475
+#: ../smime/gui/certificate-manager.c:711
msgid "All files"
msgstr "全部文件"
-#: ../smime/gui/certificate-manager.c:274
-#: ../smime/gui/certificate-manager.c:487
-#: ../smime/gui/certificate-manager.c:712
+#: ../smime/gui/certificate-manager.c:182
+#, fuzzy
+msgid "Failed to import user's certificate"
+msgstr "导入的证书"
+
+#: ../smime/gui/certificate-manager.c:352
+#: ../smime/gui/certificate-manager.c:574
+#: ../smime/gui/certificate-manager.c:808
msgid "Certificate Name"
msgstr "证书名称"
-#: ../smime/gui/certificate-manager.c:283
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:361
+#: ../smime/gui/certificate-manager.c:592
msgid "Purposes"
msgstr "用途"
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/certificate-manager.c:370 ../smime/gui/smime-ui.ui.h:32
#: ../smime/lib/e-cert.c:566
msgid "Serial Number"
msgstr "序列号"
-#: ../smime/gui/certificate-manager.c:300
+#: ../smime/gui/certificate-manager.c:378
msgid "Expires"
msgstr "到期"
-#: ../smime/gui/certificate-manager.c:391
+#: ../smime/gui/certificate-manager.c:469
msgid "All email certificate files"
msgstr "所有电子邮件证书文件"
-#: ../smime/gui/certificate-manager.c:496
+#: ../smime/gui/certificate-manager.c:502
+#, fuzzy
+msgid "Failed to import contact's certificate"
+msgstr "删除联系人失败"
+
+#: ../smime/gui/certificate-manager.c:583
msgid "E-Mail Address"
msgstr "电子邮件地址"
-#: ../smime/gui/certificate-manager.c:619
+#: ../smime/gui/certificate-manager.c:706
msgid "All CA certificate files"
msgstr "全部颁证机构文件"
-#: ../smime/gui/certificate-manager.c:1050
+#: ../smime/gui/certificate-manager.c:737
+msgid "Failed to import certificate authority's certificate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1148
msgid "Certificates"
msgstr "证书"
-#: ../smime/gui/certificate-viewer.c:332
+#: ../smime/gui/certificate-viewer.c:338
#, c-format
msgid "Certificate Viewer: %s"
msgstr "证书查看器:%s"
#: ../smime/gui/component.c:46
-#, c-format
-msgid "Enter the password for `%s'"
+#, fuzzy, c-format
+msgid "Enter the password for '%s'"
msgstr "输入“%s”的密码"
#. we're setting the password initially
@@ -20548,7 +19804,7 @@ msgstr ""
"发行者:\n"
" 主题:%s\n"
-#: ../smime/gui/e-cert-selector.c:165
+#: ../smime/gui/e-cert-selector.c:167
msgid "Select certificate"
msgstr "选择证书"
@@ -20561,174 +19817,164 @@ msgid "Authorities"
msgstr "证书颁发机构"
#: ../smime/gui/smime-ui.ui.h:3
-msgid "Backup"
-msgstr "备份"
-
-#: ../smime/gui/smime-ui.ui.h:4
-msgid "Backup All"
+#, fuzzy
+msgid "Backup _All"
msgstr "全部备份"
-#: ../smime/gui/smime-ui.ui.h:5
+#: ../smime/gui/smime-ui.ui.h:4
msgid ""
"Before trusting this CA for any purpose, you should examine its certificate "
"and its policy and procedures (if available)."
msgstr "在信任此 CA 的任何用途之前,您应该先检查该证书及其策略和过程(若可用)。"
-#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:5 ../smime/lib/e-cert.c:1086
msgid "Certificate"
msgstr "证书"
-#: ../smime/gui/smime-ui.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:6
msgid "Certificate Authority Trust"
msgstr "证书颁发机构信任"
-#: ../smime/gui/smime-ui.ui.h:8
+#: ../smime/gui/smime-ui.ui.h:7
msgid "Certificate Fields"
msgstr "证书域"
-#: ../smime/gui/smime-ui.ui.h:9
+#: ../smime/gui/smime-ui.ui.h:8
msgid "Certificate Hierarchy"
msgstr "证书层次"
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:9
msgid "Certificate details"
msgstr "证书细节"
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:10
msgid "Certificates Table"
msgstr "证书表"
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:11
msgid "Common Name (CN)"
msgstr "通用名(CN)"
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:12
msgid "Contact Certificates"
msgstr "联系人证书"
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:14
msgid "Do not trust the authenticity of this certificate"
msgstr "不信任此证书的颁发机构"
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Edit"
-msgstr "编辑"
-
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:15
msgid "Email Certificate Trust Settings"
msgstr "电子邮件证书信任设置"
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:16
msgid "Email Recipient Certificate"
msgstr "电子邮件收件人证书"
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:17
msgid "Email Signer Certificate"
msgstr "电子邮件签名者证书"
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:18
msgid "Expires On"
msgstr "到期"
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:19
msgid "Field Value"
msgstr "域值"
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:20
msgid "Fingerprints"
msgstr "指纹"
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Import"
-msgstr "导入"
-
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:23
msgid "Issued By"
msgstr "颁发者"
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:24
msgid "Issued On"
msgstr "发行日期"
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:25
msgid "Issued To"
msgstr "颁发给"
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:26
msgid "MD5 Fingerprint"
msgstr "MD5 指纹"
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:27
msgid "Organization (O)"
msgstr "组织(O)"
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:28
msgid "Organizational Unit (OU)"
msgstr "组织单元(OU)"
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:29
msgid "SHA1 Fingerprint"
msgstr "SHA1 指纹"
-#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:815
+#: ../smime/gui/smime-ui.ui.h:30 ../smime/lib/e-cert.c:824
msgid "SSL Client Certificate"
msgstr "SSL 客户证书"
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.ui.h:31 ../smime/lib/e-cert.c:828
msgid "SSL Server Certificate"
msgstr "SSL 服务器证书"
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:33
msgid "This certificate has been verified for the following uses:"
msgstr "此证书已经被下列用户所验证:"
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:34
msgid "Trust the authenticity of this certificate"
msgstr "信任此证书的颁发机构"
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:35
msgid "Trust this CA to identify email users."
msgstr "信任此颁发机构标识的电子邮件用户。"
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:36
msgid "Trust this CA to identify software developers."
msgstr "信任此颁发机构标识的软件开发者。"
-#: ../smime/gui/smime-ui.ui.h:39
-msgid "Trust this CA to identify web sites."
+#: ../smime/gui/smime-ui.ui.h:37
+#, fuzzy
+msgid "Trust this CA to identify websites."
msgstr "信任此颁发机构标识的网站。"
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:38
msgid "Validity"
msgstr "有效性"
-#: ../smime/gui/smime-ui.ui.h:41
-msgid "View"
-msgstr "查看"
-
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:39
msgid "You have certificates from these organizations that identify you:"
msgstr "您拥有这些组织证明您身份的证书:"
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:40
msgid ""
"You have certificates on file that identify these certificate authorities:"
msgstr "您拥有证明这些颁发机构的文件型证书:"
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:41
msgid "You have certificates on file that identify these people:"
msgstr "您拥有证明这些人的文件型证书:"
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:42
msgid "Your Certificates"
msgstr "您的证书"
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:43
+#, fuzzy
+msgid "_Backup"
+msgstr "备份"
+
+#: ../smime/gui/smime-ui.ui.h:44
msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
-#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:711
+#: ../smime/lib/e-cert-db.c:906
msgid "Certificate already exists"
msgstr "证书已经存在"
@@ -20773,125 +20019,146 @@ msgstr "带 RSA 加密的 PKCS #1 MD5"
msgid "PKCS #1 SHA-1 With RSA Encryption"
msgstr "带 RSA 加密的 PKCS #1 SHA-1"
-#: ../smime/lib/e-cert.c:663
+#: ../smime/lib/e-cert.c:639
+#, fuzzy
+msgid "PKCS #1 SHA-256 With RSA Encryption"
+msgstr "带 RSA 加密的 PKCS #1 SHA-1"
+
+#: ../smime/lib/e-cert.c:642
+#, fuzzy
+msgid "PKCS #1 SHA-384 With RSA Encryption"
+msgstr "带 RSA 加密的 PKCS #1 SHA-1"
+
+#: ../smime/lib/e-cert.c:645
+#, fuzzy
+msgid "PKCS #1 SHA-512 With RSA Encryption"
+msgstr "带 RSA 加密的 PKCS #1 SHA-1"
+
+#: ../smime/lib/e-cert.c:672
msgid "PKCS #1 RSA Encryption"
msgstr "PKCS #1 RSA 加密"
-#: ../smime/lib/e-cert.c:666
+#: ../smime/lib/e-cert.c:675
msgid "Certificate Key Usage"
msgstr "证书密钥用途"
-#: ../smime/lib/e-cert.c:669
+#: ../smime/lib/e-cert.c:678
msgid "Netscape Certificate Type"
msgstr "Netscape 证书类型"
-#: ../smime/lib/e-cert.c:672
+#: ../smime/lib/e-cert.c:681
msgid "Certificate Authority Key Identifier"
msgstr "证书颁发密钥身份"
-#: ../smime/lib/e-cert.c:684
+#: ../smime/lib/e-cert.c:693
#, c-format
msgid "Object Identifier (%s)"
msgstr "对象标识符(%s)"
-#: ../smime/lib/e-cert.c:735
+#: ../smime/lib/e-cert.c:744
msgid "Algorithm Identifier"
msgstr "算法标识符"
-#: ../smime/lib/e-cert.c:743
+#: ../smime/lib/e-cert.c:752
msgid "Algorithm Parameters"
msgstr "算法参数"
-#: ../smime/lib/e-cert.c:765
+#: ../smime/lib/e-cert.c:774
msgid "Subject Public Key Info"
msgstr "主题公钥信息"
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:779
msgid "Subject Public Key Algorithm"
msgstr "主题公钥算法"
-#: ../smime/lib/e-cert.c:785
+#: ../smime/lib/e-cert.c:794
msgid "Subject's Public Key"
msgstr "主题公钥"
-#: ../smime/lib/e-cert.c:806 ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-cert.c:815 ../smime/lib/e-cert.c:864
msgid "Error: Unable to process extension"
msgstr "错误:无法处理扩展"
-#: ../smime/lib/e-cert.c:827 ../smime/lib/e-cert.c:839
+#: ../smime/lib/e-cert.c:836 ../smime/lib/e-cert.c:848
msgid "Object Signer"
msgstr "对象签名者"
-#: ../smime/lib/e-cert.c:831
+#: ../smime/lib/e-cert.c:840
msgid "SSL Certificate Authority"
msgstr "SSL 证书颁发机构"
-#: ../smime/lib/e-cert.c:835
+#: ../smime/lib/e-cert.c:844
msgid "Email Certificate Authority"
msgstr "电子邮件证书颁发机构"
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-cert.c:872
msgid "Signing"
msgstr "签名"
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-cert.c:876
msgid "Non-repudiation"
msgstr "不可抵赖"
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-cert.c:880
msgid "Key Encipherment"
msgstr "密钥编码器"
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-cert.c:884
msgid "Data Encipherment"
msgstr "数据编码器"
-#: ../smime/lib/e-cert.c:879
+#: ../smime/lib/e-cert.c:888
msgid "Key Agreement"
msgstr "密钥协议"
-#: ../smime/lib/e-cert.c:883
+#: ../smime/lib/e-cert.c:892
msgid "Certificate Signer"
msgstr "证书签名者"
-#: ../smime/lib/e-cert.c:887
+#: ../smime/lib/e-cert.c:896
msgid "CRL Signer"
msgstr "CRL 签名者"
-#: ../smime/lib/e-cert.c:935
+#: ../smime/lib/e-cert.c:944
msgid "Critical"
msgstr "关键"
-#: ../smime/lib/e-cert.c:937 ../smime/lib/e-cert.c:940
+#: ../smime/lib/e-cert.c:946 ../smime/lib/e-cert.c:949
msgid "Not Critical"
msgstr "非关键"
-#: ../smime/lib/e-cert.c:961
+#: ../smime/lib/e-cert.c:970
msgid "Extensions"
msgstr "扩展"
-#: ../smime/lib/e-cert.c:1030
+#. Translators: This string is used in Certificate details for fields like Issuer
+#. or Subject, which shows the field name on the left and its respective value
+#. on the right, both as stored in the certificate itself. You probably do not
+#. need to change this string, unless changing the order of name and value.
+#. As a result example: "OU = VeriSign Trust Network"
+#.
+#: ../smime/lib/e-cert.c:1045
#, c-format
msgid "%s = %s"
msgstr "%s = %s"
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-cert.c:1100 ../smime/lib/e-cert.c:1223
msgid "Certificate Signature Algorithm"
msgstr "证书签名算法"
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-cert.c:1109
msgid "Issuer"
msgstr "发行者"
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-cert.c:1164
msgid "Issuer Unique ID"
msgstr "发行者唯一 ID"
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-cert.c:1183
msgid "Subject Unique ID"
msgstr "主题唯一 ID"
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-cert.c:1229
msgid "Certificate Signature Value"
msgstr "证书签名值"
@@ -20965,7 +20232,7 @@ msgstr "对宽屏视图(_W)"
#: ../views/mail/galview.xml.h:8
msgid "_Messages"
-msgstr "信件(_M)"
+msgstr "信息(_M)"
#: ../views/memos/galview.xml.h:1
msgid "_Memos"
@@ -20980,11 +20247,11 @@ msgid "With _Status"
msgstr "状态(_S)"
#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:436
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:438
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:440
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:776
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:227
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:439
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:441
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:443
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:779
msgid "UTC"
msgstr "UTC"
@@ -21013,19 +20280,14 @@ msgstr ""
msgid "_Selection"
msgstr "选择(_S)"
-#: ../widgets/menus/gal-define-views-dialog.c:74
-#: ../widgets/menus/gal-define-views-model.c:185
-msgid "Collection"
-msgstr "收藏"
-
-#: ../widgets/menus/gal-define-views-dialog.c:332
+#: ../widgets/menus/gal-define-views-dialog.c:346
#: ../widgets/menus/gal-define-views.ui.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "定义 %s 的视图"
-#: ../widgets/menus/gal-define-views-dialog.c:340
-#: ../widgets/menus/gal-define-views-dialog.c:342
+#: ../widgets/menus/gal-define-views-dialog.c:354
+#: ../widgets/menus/gal-define-views-dialog.c:356
msgid "Define Views"
msgstr "定义视图"
@@ -21038,11 +20300,7 @@ msgstr "定义“%s”的视图"
msgid "Table"
msgstr "表格"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
-msgid "Instance"
-msgstr "实例"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:274
msgid "Save Current View"
msgstr "保存当前视图"
@@ -21054,11 +20312,7 @@ msgstr "创建新视图(_C)"
msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
-#: ../widgets/menus/gal-view-new-dialog.c:67
-msgid "Factory"
-msgstr "工厂"
-
-#: ../widgets/menus/gal-view-new-dialog.c:98
+#: ../widgets/menus/gal-view-new-dialog.c:106
msgid "Define New View"
msgstr "定义新视图"
@@ -21078,22 +20332,10 @@ msgstr "视图类型:"
msgid "De_fault"
msgstr "默认(_F)"
-#: ../widgets/misc/e-account-tree-view.c:224
-msgid "Account Name"
-msgstr "账户名"
-
#: ../widgets/misc/e-account-tree-view.c:255
msgid "Protocol"
msgstr "协议"
-#: ../widgets/misc/e-action-combo-box.c:388
-msgid "Action"
-msgstr "活动"
-
-#: ../widgets/misc/e-action-combo-box.c:389
-msgid "A GtkRadioAction"
-msgstr ""
-
#: ../widgets/misc/e-attachment-dialog.c:305
msgid "Attachment Properties"
msgstr "附件属性"
@@ -21111,11 +20353,11 @@ msgstr "MIME 类型:"
msgid "_Suggest automatic display of attachment"
msgstr "建议自动显示附件(_S)"
-#: ../widgets/misc/e-attachment-handler-image.c:95
+#: ../widgets/misc/e-attachment-handler-image.c:97
msgid "Could not set as background"
msgstr "不能设置为背景"
-#: ../widgets/misc/e-attachment-handler-image.c:147
+#: ../widgets/misc/e-attachment-handler-image.c:149
msgid "Set as _Background"
msgstr "设为背景(_B)"
@@ -21133,13 +20375,13 @@ msgstr "发送到(_S)..."
msgid "Send the selected attachments somewhere"
msgstr "选择保存选中附件的文件夹..."
-#: ../widgets/misc/e-attachment-icon-view.c:480
-#: ../widgets/misc/e-attachment-tree-view.c:517
+#: ../widgets/misc/e-attachment-icon-view.c:495
+#: ../widgets/misc/e-attachment-tree-view.c:535
msgid "Loading"
-msgstr "装入"
+msgstr "载入"
-#: ../widgets/misc/e-attachment-icon-view.c:492
-#: ../widgets/misc/e-attachment-tree-view.c:529
+#: ../widgets/misc/e-attachment-icon-view.c:507
+#: ../widgets/misc/e-attachment-tree-view.c:547
msgid "Saving"
msgstr "保存"
@@ -21148,13 +20390,10 @@ msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:605
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../widgets/misc/e-attachment-paned.c:636
-msgid "Show _Attachment Bar"
-msgstr "显示附件栏(_A)"
-
#: ../widgets/misc/e-attachment-store.c:538
msgid "Add Attachment"
msgstr "添加附件"
@@ -21170,32 +20409,32 @@ msgstr[0] "保存附件"
#. Translators: Default attachment filename.
#: ../widgets/misc/e-attachment-store.c:633
-#: ../widgets/misc/e-attachment.c:1779 ../widgets/misc/e-attachment.c:2319
+#: ../widgets/misc/e-attachment.c:1808 ../widgets/misc/e-attachment.c:2348
msgid "attachment.dat"
msgstr "attachment.dat"
-#: ../widgets/misc/e-attachment-view.c:300
+#: ../widgets/misc/e-attachment-view.c:301
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../widgets/misc/e-attachment-view.c:326
+#: ../widgets/misc/e-attachment-view.c:327
msgid "A_dd Attachment..."
msgstr "添加附件(_D)..."
-#: ../widgets/misc/e-attachment-view.c:350
+#: ../widgets/misc/e-attachment-view.c:351
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../widgets/misc/e-attachment-view.c:357
+#: ../widgets/misc/e-attachment-view.c:358
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../widgets/misc/e-attachment-view.c:639
+#: ../widgets/misc/e-attachment-view.c:640
#, c-format
msgid "Open with \"%s\""
msgstr "使用“%s”打开"
-#: ../widgets/misc/e-attachment-view.c:642
+#: ../widgets/misc/e-attachment-view.c:643
#, c-format
msgid "Open this attachment in %s"
msgstr "在 %s 中打开附件"
@@ -21204,59 +20443,59 @@ msgstr "在 %s 中打开附件"
#. * message when, for example, attaching it to a composer. When the
#. * message to be attached has also filled Subject, then this text is
#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:1002
+#: ../widgets/misc/e-attachment.c:1021
msgid "Attached message"
msgstr "附加的信息"
-#: ../widgets/misc/e-attachment.c:1820 ../widgets/misc/e-attachment.c:2621
+#: ../widgets/misc/e-attachment.c:1849 ../widgets/misc/e-attachment.c:2650
msgid "A load operation is already in progress"
msgstr "一个已经加载的操作正在进行"
-#: ../widgets/misc/e-attachment.c:1828 ../widgets/misc/e-attachment.c:2629
+#: ../widgets/misc/e-attachment.c:1857 ../widgets/misc/e-attachment.c:2658
msgid "A save operation is already in progress"
msgstr "个已经保存的操作正在进行"
-#: ../widgets/misc/e-attachment.c:1920
+#: ../widgets/misc/e-attachment.c:1949
#, c-format
msgid "Could not load '%s'"
msgstr "不能加载“%s”"
-#: ../widgets/misc/e-attachment.c:1923
+#: ../widgets/misc/e-attachment.c:1952
#, c-format
msgid "Could not load the attachment"
msgstr "不能加载附件"
-#: ../widgets/misc/e-attachment.c:2199
+#: ../widgets/misc/e-attachment.c:2228
#, c-format
msgid "Could not open '%s'"
msgstr "不能打开“%s”"
-#: ../widgets/misc/e-attachment.c:2202
+#: ../widgets/misc/e-attachment.c:2231
#, c-format
msgid "Could not open the attachment"
msgstr "不能打开附件"
-#: ../widgets/misc/e-attachment.c:2637
+#: ../widgets/misc/e-attachment.c:2666
msgid "Attachment contents not loaded"
-msgstr "附件内容未装入"
+msgstr "附件内容未载入"
-#: ../widgets/misc/e-attachment.c:2713
+#: ../widgets/misc/e-attachment.c:2742
#, c-format
msgid "Could not save '%s'"
msgstr "不能保存“%s”"
-#: ../widgets/misc/e-attachment.c:2716
+#: ../widgets/misc/e-attachment.c:2745
#, c-format
msgid "Could not save the attachment"
msgstr "无法保存附件"
#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:363
+#: ../widgets/misc/e-buffer-tagger.c:359
msgid "Ctrl-click to open a link"
msgstr "Ctrl 加单击来打开一个链接"
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1249
+#: ../widgets/misc/e-calendar-item.c:1255
msgid "%B %Y"
msgstr "%Y年%B"
@@ -21264,65 +20503,6 @@ msgstr "%Y年%B"
msgid "Month Calendar"
msgstr "月历"
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-text.c:3399
-#: ../widgets/text/e-text.c:3400
-msgid "Fill color"
-msgstr "填充颜色"
-
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486 ../widgets/text/e-text.c:3406
-#: ../widgets/text/e-text.c:3407 ../widgets/text/e-text.c:3413
-#: ../widgets/text/e-text.c:3414
-msgid "GDK fill color"
-msgstr "GDK 填充颜色"
-
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493 ../widgets/text/e-text.c:3420
-#: ../widgets/text/e-text.c:3421
-msgid "Fill stipple"
-msgstr "点绘填充"
-
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
-msgid "X1"
-msgstr "X1"
-
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
-msgid "X2"
-msgstr "X2"
-
-#: ../widgets/misc/e-canvas-background.c:513
-#: ../widgets/misc/e-canvas-background.c:514
-msgid "Y1"
-msgstr "Y1"
-
-#: ../widgets/misc/e-canvas-background.c:520
-#: ../widgets/misc/e-canvas-background.c:521
-msgid "Y2"
-msgstr "Y2"
-
-#: ../widgets/misc/e-canvas-vbox.c:89
-#: ../widgets/table/e-table-group-container.c:1009
-#: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:2884
-msgid "Minimum width"
-msgstr "最小宽度"
-
-#: ../widgets/misc/e-canvas-vbox.c:90
-#: ../widgets/table/e-table-group-container.c:1010
-#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:2885
-msgid "Minimum Width"
-msgstr "最小宽度"
-
-#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
-msgid "Spacing"
-msgstr "间距"
-
#: ../widgets/misc/e-charset-combo-box.c:93
msgid "Character Encoding"
msgstr "字符编码"
@@ -21335,91 +20515,88 @@ msgstr "输入要使用的字符集"
msgid "Other..."
msgstr "其它..."
-#: ../widgets/misc/e-dateedit.c:523
+#: ../widgets/misc/e-dateedit.c:502
msgid "Date and Time"
msgstr "日期和时间"
-#: ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:523
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../widgets/misc/e-dateedit.c:566
+#: ../widgets/misc/e-dateedit.c:545
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../widgets/misc/e-dateedit.c:612
+#: ../widgets/misc/e-dateedit.c:591
msgid "Drop-down combination box to select time"
msgstr "选择时间的组合框"
-#: ../widgets/misc/e-dateedit.c:684
+#: ../widgets/misc/e-dateedit.c:663
msgid "No_w"
msgstr "现在(_W)"
-#: ../widgets/misc/e-dateedit.c:690
+#: ../widgets/misc/e-dateedit.c:669
msgid "_Today"
msgstr "今天(_T)"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../widgets/misc/e-dateedit.c:698
+#: ../widgets/misc/e-dateedit.c:677
msgid "_None"
msgstr "无(_N)"
#. Translators: "None" for date field of a date edit, shown when
#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1703 ../widgets/misc/e-dateedit.c:1939
+#: ../widgets/misc/e-dateedit.c:1682 ../widgets/misc/e-dateedit.c:1914
msgctxt "date"
msgid "None"
msgstr "无"
-#: ../widgets/misc/e-dateedit.c:1834
+#: ../widgets/misc/e-dateedit.c:1809
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../widgets/misc/e-dateedit.c:1878
+#: ../widgets/misc/e-dateedit.c:1853
msgid "Invalid Time Value"
msgstr "无效的时间值"
-#: ../widgets/misc/e-import-assistant.c:238
+#: ../widgets/misc/e-import-assistant.c:242
msgid ""
"Choose the file that you want to import into Evolution, and select what type "
"of file it is from the list."
msgstr "选择您希望导入到 Evolution 的文件,并从列表中选择文件的类型。"
-#: ../widgets/misc/e-import-assistant.c:255
+#: ../widgets/misc/e-import-assistant.c:259
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: ../widgets/misc/e-import-assistant.c:265
+#: ../widgets/misc/e-import-assistant.c:269
msgid "Select a file"
msgstr "选择一个文件"
-#: ../widgets/misc/e-import-assistant.c:279
-#: ../widgets/misc/e-import-assistant.c:455
+#: ../widgets/misc/e-import-assistant.c:283
+#: ../widgets/misc/e-import-assistant.c:458
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../widgets/misc/e-import-assistant.c:322
+#: ../widgets/misc/e-import-assistant.c:326
+#: ../widgets/misc/e-import-assistant.c:909
msgid "Choose the destination for this import"
msgstr "选择此导入的目的位置"
-#: ../widgets/misc/e-import-assistant.c:347
+#: ../widgets/misc/e-import-assistant.c:351
msgid "Choose the type of importer to run:"
msgstr "选择要运行的导入器类型:"
-#: ../widgets/misc/e-import-assistant.c:355
+#: ../widgets/misc/e-import-assistant.c:359
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../widgets/misc/e-import-assistant.c:363
+#: ../widgets/misc/e-import-assistant.c:367
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: ../widgets/misc/e-import-assistant.c:439
-msgid "Select what type of file you want to import from the list."
-msgstr ""
-
-#: ../widgets/misc/e-import-assistant.c:516
+#: ../widgets/misc/e-import-assistant.c:519
#, fuzzy
msgid ""
"Evolution checked for settings to import from the following applications: "
@@ -21430,17 +20607,40 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“上一步”按钮。\n"
-#: ../widgets/misc/e-import-assistant.c:1187
-#: ../widgets/misc/e-import-assistant.c:1214
+#. Install a custom "Cancel Import" button.
+#: ../widgets/misc/e-import-assistant.c:766
+#, fuzzy
+msgid "_Cancel Import"
+msgstr "取消"
+
+#: ../widgets/misc/e-import-assistant.c:908
+#, fuzzy
+msgid "Preview data to be imported"
+msgstr "预览要打印的信息"
+
+#: ../widgets/misc/e-import-assistant.c:914
+#: ../widgets/misc/e-import-assistant.c:927
+#: ../widgets/misc/e-import-assistant.c:1276
+#: ../widgets/misc/e-import-assistant.c:1342
+#: ../widgets/misc/e-import-assistant.c:1351
+msgid "Import Data"
+msgstr "导入数据"
+
+#: ../widgets/misc/e-import-assistant.c:922
+msgid "Select what type of file you want to import from the list."
+msgstr ""
+
+#: ../widgets/misc/e-import-assistant.c:1268
+#: ../widgets/misc/e-import-assistant.c:1300
msgid "Evolution Import Assistant"
msgstr "Evolution 导入助手"
-#: ../widgets/misc/e-import-assistant.c:1196
-#: ../widgets/misc/e-import-assistant.c:1248
+#: ../widgets/misc/e-import-assistant.c:1283
+#: ../widgets/misc/e-import-assistant.c:1330
msgid "Import Location"
msgstr "导入位置"
-#: ../widgets/misc/e-import-assistant.c:1207
+#: ../widgets/misc/e-import-assistant.c:1294
msgid ""
"Welcome to the Evolution Import Assistant.\n"
"With this assistant you will be guided through the process of importing "
@@ -21449,32 +20649,27 @@ msgstr ""
"欢迎使用 Evolution 导入助手。\n"
"本助手将全程指导您将外部文件导入 Evolution。"
-#: ../widgets/misc/e-import-assistant.c:1223
+#: ../widgets/misc/e-import-assistant.c:1308
msgid "Importer Type"
msgstr "导入器类型"
-#: ../widgets/misc/e-import-assistant.c:1232
+#: ../widgets/misc/e-import-assistant.c:1316
msgid "Select Information to Import"
msgstr "选择要导入的信息"
-#: ../widgets/misc/e-import-assistant.c:1240
+#: ../widgets/misc/e-import-assistant.c:1323
msgid "Select a File"
msgstr "选择一个文件"
-#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1337
msgid "Click \"Apply\" to begin importing the file into Evolution."
msgstr "单击“应用”以便开始将文件导入到 Evolution。"
-#: ../widgets/misc/e-import-assistant.c:1261
-#: ../widgets/misc/e-import-assistant.c:1271
-msgid "Import Data"
-msgstr "导入数据"
-
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:624
msgid "World Map"
msgstr "世界地图"
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:626
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should instead select the timezone from the drop-down combination box below."
@@ -21494,61 +20689,7 @@ msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
msgid "Evolution is currently offline because the network is unavailable."
msgstr "因为网络不可用,所以 Evolution 目前脱机。"
-#: ../widgets/misc/e-online-button.c:135
-msgid "The button state is online"
-msgstr "按钮状态为在线"
-
-#: ../widgets/misc/e-paned.c:306
-#, fuzzy
-msgid "Horizontal Position"
-msgstr "水平面板位置"
-
-#: ../widgets/misc/e-paned.c:307
-msgid "Pane position when oriented horizontally"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:318
-#, fuzzy
-msgid "Vertical Position"
-msgstr "垂直面板的位置"
-
-#: ../widgets/misc/e-paned.c:319
-msgid "Pane position when oriented vertically"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:330
-#, fuzzy
-#| msgid "Position"
-msgid "Proportion"
-msgstr "位置"
-
-#: ../widgets/misc/e-paned.c:331
-msgid "Proportion of the 2nd pane size"
-msgstr ""
-
-#: ../widgets/misc/e-paned.c:342
-#, fuzzy
-#| msgid "_Resize"
-msgid "Fixed Resize"
-msgstr "缩放(_R)"
-
-#: ../widgets/misc/e-paned.c:343
-msgid "Keep the 2nd pane fixed during resize"
-msgstr ""
-
-#: ../widgets/misc/e-pilot-settings.c:95
-msgid "Sync with:"
-msgstr "同步对象:"
-
-#: ../widgets/misc/e-pilot-settings.c:103
-msgid "Sync Private Records:"
-msgstr "同步私有记录:"
-
-#: ../widgets/misc/e-pilot-settings.c:112
-msgid "Sync Categories:"
-msgstr "同步类别:"
-
-#: ../widgets/misc/e-preferences-window.c:218
+#: ../widgets/misc/e-preferences-window.c:266
msgid "Evolution Preferences"
msgstr "Evolution 首选项"
@@ -21557,68 +20698,46 @@ msgstr "Evolution 首选项"
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../widgets/misc/e-search-bar.c:558
+#: ../widgets/misc/e-search-bar.c:554
msgid "Close the find bar"
msgstr "关闭查找栏"
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:562
msgid "Fin_d:"
msgstr "查找(_D):"
-#: ../widgets/misc/e-search-bar.c:578
+#: ../widgets/misc/e-search-bar.c:574
msgid "Clear the search"
msgstr "清除搜索"
-#: ../widgets/misc/e-search-bar.c:601
+#: ../widgets/misc/e-search-bar.c:597
msgid "_Previous"
msgstr "上一项(_P)"
-#: ../widgets/misc/e-search-bar.c:607
+#: ../widgets/misc/e-search-bar.c:603
msgid "Find the previous occurrence of the phrase"
msgstr "寻找该词句出现的前一个位置"
-#: ../widgets/misc/e-search-bar.c:617
+#: ../widgets/misc/e-search-bar.c:613
msgid "_Next"
msgstr "下一项(_N)"
-#: ../widgets/misc/e-search-bar.c:623
+#: ../widgets/misc/e-search-bar.c:619
msgid "Find the next occurrence of the phrase"
msgstr "寻找该词句出现的下一个位置"
-#: ../widgets/misc/e-search-bar.c:633
+#: ../widgets/misc/e-search-bar.c:629
msgid "Mat_ch case"
msgstr "大小写匹配(_C)"
-#: ../widgets/misc/e-search-bar.c:661
+#: ../widgets/misc/e-search-bar.c:657
msgid "Reached bottom of page, continued from top"
msgstr "到达页面底部,移到顶部继续"
-#: ../widgets/misc/e-search-bar.c:683
+#: ../widgets/misc/e-search-bar.c:679
msgid "Reached top of page, continued from bottom"
msgstr "到达页面顶部,移到底部继续"
-#: ../widgets/misc/e-selection-model-array.c:593
-#: ../widgets/table/e-tree-selection-model.c:803
-msgid "Cursor Row"
-msgstr "光标行"
-
-#: ../widgets/misc/e-selection-model-array.c:600
-#: ../widgets/table/e-tree-selection-model.c:810
-msgid "Cursor Column"
-msgstr "光标列"
-
-#: ../widgets/misc/e-selection-model.c:216
-msgid "Sorter"
-msgstr "排序"
-
-#: ../widgets/misc/e-selection-model.c:223
-msgid "Selection Mode"
-msgstr "选择模式"
-
-#: ../widgets/misc/e-selection-model.c:231
-msgid "Cursor Mode"
-msgstr "光标模式"
-
#: ../widgets/misc/e-send-options.c:515
msgid "When de_leted:"
msgstr "删除时(_L):"
@@ -21649,8 +20768,7 @@ msgstr "常规选项(_R)"
#: ../widgets/misc/e-send-options.ui.h:10
msgid "Mail Receipt"
-msgstr ""
-"阅读收条"
+msgstr "阅读收条"
#: ../widgets/misc/e-send-options.ui.h:14
msgid "Proprietary"
@@ -21692,43 +20810,48 @@ msgstr "完成时(_M):"
msgid "When decli_ned:"
msgstr "拒绝时(_N):"
-#: ../widgets/misc/e-send-options.ui.h:28
+#. Translators: This is part of 'Within [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:29
msgid "Wi_thin"
msgstr "少于(_T)"
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "_After:"
+#. Translators: This is part of 'After [ X ] days', where [ X ] is a spinner with a number
+#: ../widgets/misc/e-send-options.ui.h:31
+#, fuzzy
+msgid "_After"
msgstr "之后(_A):"
-#: ../widgets/misc/e-send-options.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:32
msgid "_All information"
msgstr "全部信息(_A)"
-#: ../widgets/misc/e-send-options.ui.h:31
+#: ../widgets/misc/e-send-options.ui.h:33
msgid "_Classification:"
msgstr "分类(_C):"
-#: ../widgets/misc/e-send-options.ui.h:32
+#: ../widgets/misc/e-send-options.ui.h:34
msgid "_Delay message delivery"
-msgstr "推迟信件投递(_D)"
+msgstr "推迟信息投递(_D)"
-#: ../widgets/misc/e-send-options.ui.h:33
+#: ../widgets/misc/e-send-options.ui.h:35
msgid "_Delivered"
msgstr "已投递(_D)"
-#: ../widgets/misc/e-send-options.ui.h:35
+#: ../widgets/misc/e-send-options.ui.h:37
msgid "_Set expiration date"
msgstr "设置过期时间(_S)"
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "_Until:"
+#. Translators: This is part of 'Until [ date ]', where [ date ] is a date picker
+#: ../widgets/misc/e-send-options.ui.h:39
+#, fuzzy
+msgid "_Until"
msgstr "直到(_U):"
-#: ../widgets/misc/e-send-options.ui.h:37
+#: ../widgets/misc/e-send-options.ui.h:40
msgid "_When convenient"
msgstr "方便时(_W)"
-#: ../widgets/misc/e-send-options.ui.h:38
+#: ../widgets/misc/e-send-options.ui.h:41
msgid "_When opened:"
msgstr "打开时(_W):"
@@ -21785,41 +20908,41 @@ msgstr "脚本文件必须可执行。"
msgid "Click here to go to URL"
msgstr "单击此处转到 URL"
-#: ../widgets/misc/e-web-view.c:348
+#: ../widgets/misc/e-web-view.c:369
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../widgets/misc/e-web-view.c:350
+#: ../widgets/misc/e-web-view.c:371
msgid "Copy the link to the clipboard"
msgstr "将链接复制到剪贴板"
-#: ../widgets/misc/e-web-view.c:358
+#: ../widgets/misc/e-web-view.c:379
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: ../widgets/misc/e-web-view.c:360
+#: ../widgets/misc/e-web-view.c:381
msgid "Open the link in a web browser"
msgstr "在浏览器中打开链接"
-#: ../widgets/misc/e-web-view.c:368
+#: ../widgets/misc/e-web-view.c:389
msgid "_Copy Email Address"
msgstr "复制电子邮件地址(_C)"
-#: ../widgets/misc/e-web-view.c:397 ../widgets/misc/e-web-view.c:977
+#: ../widgets/misc/e-web-view.c:418 ../widgets/misc/e-web-view.c:1073
msgid "Select all text and images"
msgstr "选中全部文本和图像"
-#: ../widgets/misc/e-web-view.c:752 ../widgets/misc/e-web-view.c:754
-#: ../widgets/misc/e-web-view.c:756
+#: ../widgets/misc/e-web-view.c:850 ../widgets/misc/e-web-view.c:852
+#: ../widgets/misc/e-web-view.c:854
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../widgets/misc/e-web-view.c:758
+#: ../widgets/misc/e-web-view.c:856
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
-#: ../widgets/misc/e-web-view.c:760
+#: ../widgets/misc/e-web-view.c:858
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -21838,7 +20961,7 @@ msgstr "日历:从 %s 到 %s"
msgid "evolution calendar item"
msgstr "Evolution 日历项目"
-#: ../widgets/table/e-cell-combo.c:171
+#: ../widgets/table/e-cell-combo.c:174
msgid "popup list"
msgstr "弹出列表"
@@ -21856,7 +20979,7 @@ msgstr "无"
msgid "OK"
msgstr "确定"
-#: ../widgets/table/e-cell-date-edit.c:878
+#: ../widgets/table/e-cell-date-edit.c:872
#, c-format
msgid "The time must be in the format: %s"
msgstr "时间必须采用格式:%s"
@@ -21865,48 +20988,12 @@ msgstr "时间必须采用格式:%s"
msgid "The percent value must be between 0 and 100, inclusive"
msgstr "百分比值必需在 0 到 100 之间,含 0 和 100"
-#: ../widgets/table/e-cell-pixbuf.c:357
-msgid "Selected Column"
-msgstr "选中列"
-
-#: ../widgets/table/e-cell-pixbuf.c:364
-msgid "Focused Column"
-msgstr "聚焦列"
-
-#: ../widgets/table/e-cell-pixbuf.c:371
-msgid "Unselected Column"
-msgstr "未选列"
-
-#: ../widgets/table/e-cell-text.c:1631
-msgid "Strikeout Column"
-msgstr "给列加删除线"
-
-#: ../widgets/table/e-cell-text.c:1638
-msgid "Underline Column"
-msgstr "给列加下划线"
-
-#: ../widgets/table/e-cell-text.c:1645
-msgid "Bold Column"
-msgstr "给列加粗"
-
-#: ../widgets/table/e-cell-text.c:1652
-msgid "Color Column"
-msgstr "给列着色"
-
-#: ../widgets/table/e-cell-text.c:1666
-msgid "BG Color Column"
-msgstr "给列着背景色"
-
-#: ../widgets/table/e-table-click-to-add.c:586
+#: ../widgets/table/e-table-click-to-add.c:595
#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:135
msgid "click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "状态"
-
#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
msgid "(Ascending)"
msgstr "(升序)"
@@ -21923,12 +21010,12 @@ msgstr "未排序"
msgid "No grouping"
msgstr "未分组"
-#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.c:647
#: ../widgets/table/e-table-config.ui.h:11
msgid "Show Fields"
msgstr "显示域"
-#: ../widgets/table/e-table-config.c:658
+#: ../widgets/table/e-table-config.c:667
msgid "Available Fields"
msgstr "可用域"
@@ -21937,7 +21024,7 @@ msgid "A_vailable Fields:"
msgstr "可用域(_V):"
#: ../widgets/table/e-table-config.ui.h:2
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
msgid "Ascending"
msgstr "升序"
@@ -21950,7 +21037,7 @@ msgid "Clear _All"
msgstr "全部清除(_A)"
#: ../widgets/table/e-table-config.ui.h:5
-#: ../widgets/table/e-table-header-item.c:1643
+#: ../widgets/table/e-table-header-item.c:1702
msgid "Descending"
msgstr "降序"
@@ -22010,9 +21097,8 @@ msgstr "按顺序显示这些域(_S):"
msgid "_Sort..."
msgstr "排序(_S)..."
-#: ../widgets/table/e-table-field-chooser-dialog.c:114
+#: ../widgets/table/e-table-field-chooser-dialog.c:117
#, fuzzy
-#| msgid "Add a C_olumn..."
msgid "Add a Column"
msgstr "添加一列(_O)..."
@@ -22022,246 +21108,110 @@ msgid ""
"the location in which you want it to appear."
msgstr "要在您的表格中添加列,请将其拖曳到您想要其出现的位置。"
-#: ../widgets/table/e-table-group-container.c:342
-#, c-format
-msgid "%s : %s (%d item)"
-msgid_plural "%s : %s (%d items)"
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which has set a title.
+#. The first %s is replaced with a column title.
+#. The second %s is replaced with an actual group value.
+#. Finally the %d is replaced with count of items in this group.
+#. Example: "Family name: Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:351
+#, fuzzy, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
msgstr[0] "%s:%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:348
+#. Translators: This text is used as a special row when an ETable
+#. has turned on grouping on a column, which doesn't have set a title.
+#. The %s is replaced with an actual group value.
+#. The %d is replaced with count of items in this group.
+#. Example: "Smith (13 items)"
+#.
+#: ../widgets/table/e-table-group-container.c:363
#, c-format
msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
-#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
-#: ../widgets/table/e-table-group-leaf.c:586
-#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2842 ../widgets/table/e-table-item.c:2843
-msgid "Alternating Row Colors"
-msgstr "交替行色"
-
-#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
-#: ../widgets/table/e-table-group-leaf.c:593
-#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2849 ../widgets/table/e-table-item.c:2850
-#: ../widgets/table/e-tree.c:3373 ../widgets/table/e-tree.c:3374
-msgid "Horizontal Draw Grid"
-msgstr "水平绘制网格"
-
-#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
-#: ../widgets/table/e-table-group-leaf.c:600
-#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:2856 ../widgets/table/e-table-item.c:2857
-#: ../widgets/table/e-tree.c:3379 ../widgets/table/e-tree.c:3380
-msgid "Vertical Draw Grid"
-msgstr "垂直绘制网格"
-
-#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
-#: ../widgets/table/e-table-group-leaf.c:607
-#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:2863 ../widgets/table/e-table-item.c:2864
-#: ../widgets/table/e-tree.c:3385 ../widgets/table/e-tree.c:3386
-msgid "Draw focus"
-msgstr "绘制焦点"
-
-#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
-#: ../widgets/table/e-table-group-leaf.c:614
-#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2870 ../widgets/table/e-table-item.c:2871
-msgid "Cursor mode"
-msgstr "光标模式"
-
-#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
-#: ../widgets/table/e-table-group-leaf.c:628
-#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:2835 ../widgets/table/e-table-item.c:2836
-msgid "Selection model"
-msgstr "选择模型"
-
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:621
-#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:2877 ../widgets/table/e-table-item.c:2878
-#: ../widgets/table/e-table.c:3339 ../widgets/table/e-tree.c:3367
-#: ../widgets/table/e-tree.c:3368
-msgid "Length Threshold"
-msgstr "长度阀值"
-
-#: ../widgets/table/e-table-group-container.c:981
-#: ../widgets/table/e-table-group-container.c:982
-#: ../widgets/table/e-table-group-leaf.c:663
-#: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:2911 ../widgets/table/e-table-item.c:2912
-#: ../widgets/table/e-table.c:3346 ../widgets/table/e-tree.c:3399
-#: ../widgets/table/e-tree.c:3400
-msgid "Uniform row height"
-msgstr "统一行高"
-
-#: ../widgets/table/e-table-group-container.c:988
-#: ../widgets/table/e-table-group-container.c:989
-#: ../widgets/table/e-table-group-leaf.c:656
-#: ../widgets/table/e-table-group-leaf.c:657
-msgid "Frozen"
-msgstr "冻结"
-
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1546
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1508
+#: ../widgets/table/e-table-header-item.c:1567
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../widgets/table/e-table-header-item.c:1511
+#: ../widgets/table/e-table-header-item.c:1570
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../widgets/table/e-table-header-item.c:1514
+#: ../widgets/table/e-table-header-item.c:1573
msgid "_Unsort"
msgstr "未排序(_U)"
-#: ../widgets/table/e-table-header-item.c:1517
+#: ../widgets/table/e-table-header-item.c:1576
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../widgets/table/e-table-header-item.c:1520
+#: ../widgets/table/e-table-header-item.c:1579
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../widgets/table/e-table-header-item.c:1524
+#: ../widgets/table/e-table-header-item.c:1583
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../widgets/table/e-table-header-item.c:1527
+#: ../widgets/table/e-table-header-item.c:1586
msgid "Add a C_olumn..."
msgstr "添加一列(_O)..."
-#: ../widgets/table/e-table-header-item.c:1531
+#: ../widgets/table/e-table-header-item.c:1590
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../widgets/table/e-table-header-item.c:1534
+#: ../widgets/table/e-table-header-item.c:1593
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../widgets/table/e-table-header-item.c:1537
+#: ../widgets/table/e-table-header-item.c:1596
msgid "Format Column_s..."
msgstr "格式化列(_S)..."
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1600
msgid "Custo_mize Current View..."
msgstr "自定义当前视图(_M)..."
-#: ../widgets/table/e-table-header-item.c:1600
+#: ../widgets/table/e-table-header-item.c:1659
msgid "_Sort By"
msgstr "排序方式(_S)"
#. Custom
-#: ../widgets/table/e-table-header-item.c:1618
+#: ../widgets/table/e-table-header-item.c:1677
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../widgets/table/e-table-item.c:2821 ../widgets/table/e-table-item.c:2822
-msgid "Table header"
-msgstr "表头"
-
-#: ../widgets/table/e-table-item.c:2828 ../widgets/table/e-table-item.c:2829
-msgid "Table model"
-msgstr "表格模型"
-
-#: ../widgets/table/e-table-item.c:2904 ../widgets/table/e-table-item.c:2905
-msgid "Cursor row"
-msgstr "光标行"
-
-#: ../widgets/table/e-table-sorter.c:173
-msgid "Sort Info"
-msgstr "排序信息"
-
-#: ../widgets/table/e-table.c:3353 ../widgets/table/e-tree.c:3406
-#: ../widgets/table/e-tree.c:3407
-msgid "Always search"
-msgstr "总是搜索"
-
-#: ../widgets/table/e-table.c:3360
-msgid "Use click to add"
-msgstr "单击可添加"
-
-#: ../widgets/table/e-table.c:3374
-#, fuzzy
-msgid "Vertical Row Spacing"
-msgstr "标识器间距"
-
-#: ../widgets/table/e-table.c:3375
-msgid "Vertical space between rows. It is added to top and to bottom of a row"
-msgstr ""
-
-#: ../widgets/table/e-tree.c:3392 ../widgets/table/e-tree.c:3393
-msgid "ETree table adapter"
-msgstr "ETree 表格适配器"
-
-#: ../widgets/table/e-tree.c:3413
-msgid "Retro Look"
-msgstr "火箭外观"
-
-#: ../widgets/table/e-tree.c:3414
-msgid "Draw lines and +/- expanders."
-msgstr "绘制行和 +/- 扩展柄。"
-
-#: ../widgets/table/e-tree.c:3420
-msgid "Expander Size"
-msgstr "扩展器大小"
-
-#: ../widgets/table/e-tree.c:3421
-msgid "Size of the expander arrow"
-msgstr "扩展器箭头的大小"
-
-#: ../widgets/table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "弹出"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+#. Translators: description of a "popup" action
+#: ../widgets/table/gal-a11y-e-cell-popup.c:123
msgid "popup a child"
msgstr "弹出子对象"
-#: ../widgets/table/gal-a11y-e-cell-text.c:616
-msgid "edit"
-msgstr "编辑"
-
-#: ../widgets/table/gal-a11y-e-cell-text.c:617
+#. Translators: description of an "edit" action
+#: ../widgets/table/gal-a11y-e-cell-text.c:618
msgid "begin editing this cell"
msgstr "开始编辑此单元格"
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
-msgid "toggle"
-msgstr "切换"
-
-#. action name
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+#. Translators: description of a "toggle" action
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:174
msgid "toggle the cell"
msgstr "切换单元格"
-#: ../widgets/table/gal-a11y-e-cell-tree.c:210
-msgid "expand"
-msgstr "展开"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+#. Translators: description of an "expand" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:212
msgid "expands the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中展开行"
-#: ../widgets/table/gal-a11y-e-cell-tree.c:216
-msgid "collapse"
-msgstr "折叠"
-
-#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+#. Translators: description of a "collapse" action
+#: ../widgets/table/gal-a11y-e-cell-tree.c:219
msgid "collapses the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中折叠行"
@@ -22277,115 +21227,1106 @@ msgstr "单击"
msgid "sort"
msgstr "排序"
-#: ../widgets/text/e-text.c:2486
+#: ../widgets/text/e-text.c:2533
msgid "Select All"
msgstr "全选"
-#: ../widgets/text/e-text.c:2498
+#: ../widgets/text/e-text.c:2545
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3315 ../widgets/text/e-text.c:3316
-msgid "Event Processor"
-msgstr "事件处理器"
+#~ msgid "{0}"
+#~ msgstr "{0}"
+
+#~ msgid "{1}"
+#~ msgstr "{1}"
+
+#~ msgid "Default Sync Address:"
+#~ msgstr "默认同步地址:"
+
+#~ msgid "Could not load address book"
+#~ msgstr "无法载入地址簿"
+
+#~ msgid "Could not read pilot's Address application block"
+#~ msgstr "无法读入 Pilot 的地址应用程序块"
+
+#~ msgid "Web Log:"
+#~ msgstr "网络日志:"
+
+#~ msgid "_Web Log:"
+#~ msgstr "_Web 日志:"
+
+#~ msgid "Editable"
+#~ msgstr "可编辑"
+
+#~ msgid "Source Book"
+#~ msgstr "来源地址簿"
+
+#~ msgid "Target Book"
+#~ msgstr "目标地址簿"
+
+#~ msgid "Is New Contact"
+#~ msgstr "为新联系人"
+
+#~ msgid "Writable Fields"
+#~ msgstr "可写域"
+
+#~ msgid "Required Fields"
+#~ msgstr "必需域"
+
+#~ msgid "Changed"
+#~ msgstr "已更改"
+
+#~ msgid "Shell"
+#~ msgstr "外壳"
+
+#~ msgid "The EShell singleton"
+#~ msgstr "EShell 的一个"
+
+#~ msgid "Book"
+#~ msgstr "地址簿"
+
+#~ msgid "Is New List"
+#~ msgstr "为新列表"
+
+#~ msgid "Query"
+#~ msgstr "查询"
+
+#~ msgid "Model"
+#~ msgstr "模型"
+
+#~ msgid "Shell View"
+#~ msgstr "外壳视图"
+
+#~ msgid "Source"
+#~ msgstr "来源"
+
+#~ msgid "Width"
+#~ msgstr "宽度"
+
+#~ msgid "Height"
+#~ msgstr "高度"
+
+#~ msgid "Has Focus"
+#~ msgstr "有焦点"
+
+#~ msgid "Field"
+#~ msgstr "域"
+
+#~ msgid "Field Name"
+#~ msgstr "域名"
+
+#~ msgid "Text Model"
+#~ msgstr "文字模型"
+
+#~ msgid "Max field name length"
+#~ msgstr "最大域名长度"
+
+#~ msgid "Column Width"
+#~ msgstr "列宽"
+
+#~ msgid "Adapter"
+#~ msgstr "适配器"
+
+#~ msgid "Selected"
+#~ msgstr "已选择"
+
+#~ msgid "Has Cursor"
+#~ msgstr "有光标"
+
+#~ msgid "Success"
+#~ msgstr "成功"
+
+#~ msgid "Backend busy"
+#~ msgstr "后台忙"
+
+#~ msgid "Repository offline"
+#~ msgstr "仓库脱机"
+
+#~ msgid "Address Book does not exist"
+#~ msgstr "地址簿不存在"
+
+#~ msgid "No Self Contact defined"
+#~ msgstr "未定义自身联系人"
+
+#~ msgid "Permission denied"
+#~ msgstr "没有权限"
+
+#~ msgid "Contact not found"
+#~ msgstr "找不到联系人"
+
+#~ msgid "Contact ID already exists"
+#~ msgstr "联系人 ID 已经存在"
+
+#~ msgid "Protocol not supported"
+#~ msgstr "不支持的协议"
+
+#~ msgid "Could not cancel"
+#~ msgstr "无法取消"
+
+#~ msgid "Authentication Failed"
+#~ msgstr "认证失败"
+
+#~ msgid "Authentication Required"
+#~ msgstr "必须认证"
+
+#~ msgid "TLS not Available"
+#~ msgstr "TLS 不可用"
+
+#~ msgid "No such source"
+#~ msgstr "没有来源"
+
+#~ msgid "Not available in offline mode"
+#~ msgstr "脱机模式下不可用"
+
+#~ msgid "Other error"
+#~ msgstr "其它错误"
+
+#~ msgid "Invalid server version"
+#~ msgstr "无效的服务器版本"
+
+#~ msgid "Unsupported authentication method"
+#~ msgstr "不支持的认证方式"
+
+#~ msgid "Calendar repository is offline."
+#~ msgstr "日历仓库脱机。"
+
+#~ msgid "Error on '{0}'"
+#~ msgstr "{0} 出错"
+
+#~ msgid "No response from the server."
+#~ msgstr "服务器无响应。"
+
+#~ msgid "Unable to load the calendar"
+#~ msgstr "无法载入日历"
+
+#~ msgid "{0}."
+#~ msgstr "{0}。"
+
+#~ msgid "Split Multi-Day Events:"
+#~ msgstr "分割多日事件:"
+
+#~ msgid "Could not start evolution-data-server"
+#~ msgstr "无法启动 evolution-data-server"
+
+#~ msgid "Could not read pilot's Calendar application block"
+#~ msgstr "无法读入 Pilot 日历应用程序块"
+
+#~ msgid "Could not read pilot's Memo application block"
+#~ msgstr "无法读入 Pilot 的备忘应用程序块"
+
+#~ msgid "Could not write pilot's Memo application block"
+#~ msgstr "无法写入 Pilot 备忘应用程序块"
+
+#~ msgid "Default Priority:"
+#~ msgstr "默认优先级:"
+
+#~ msgid "Could not read pilot's ToDo application block"
+#~ msgstr "无法读入 Pilot ToDo 应用程序块"
+
+#~ msgid "Could not write pilot's ToDo application block"
+#~ msgstr "无法写入 Pilot ToDo 应用程序块"
+
+#~ msgid "Show week numbers in date navigator"
+#~ msgstr "在日期导航器中显示周数"
+
+#~ msgid "Whether to show week number in the Day and Work Week View."
+#~ msgstr "是否在日视图和工作日视图中显示周数。"
+
+#~ msgid "Show week n_umber in Day and Work Week View"
+#~ msgstr "在日视图和工作日视图中显示周数(_U)"
+
+#~ msgid "Save"
+#~ msgstr "保存"
+
+#~ msgid "The event could not be deleted due to a corba error"
+#~ msgstr "无法删除事件,原因是 corba 错误"
+
+#~ msgid "The task could not be deleted due to a corba error"
+#~ msgstr "无法删除任务,原因是 corba 错误"
+
+#~ msgid "The memo could not be deleted due to a corba error"
+#~ msgstr "无法删除备忘,原因是 corba 错误"
+
+#~ msgid "The item could not be deleted due to a corba error"
+#~ msgstr "无法删除项目,原因是 corba 错误"
+
+#~ msgid "Appoint_ment"
+#~ msgstr "约会(_M)"
+
+#~ msgid "Attendee_s..."
+#~ msgstr "出席者(_S)..."
+
+#~ msgid "_Task"
+#~ msgstr "任务(_T)"
+
+#~ msgid "Default Client"
+#~ msgstr "默认客户端"
+
+#~ msgid "Shell Settings"
+#~ msgstr "外壳设置"
+
+#~ msgid "Application-wide settings"
+#~ msgstr "应用程序级设置"
+
+#~ msgid "A_ttendees..."
+#~ msgstr "出席者(_T)..."
+
+#~ msgid "0%"
+#~ msgstr "0%"
+
+#~ msgid "10%"
+#~ msgstr "10%"
+
+#~ msgid "20%"
+#~ msgstr "20%"
+
+#~ msgid "30%"
+#~ msgstr "30%"
+
+#~ msgid "40%"
+#~ msgstr "40%"
+
+#~ msgid "50%"
+#~ msgstr "50%"
+
+#~ msgid "60%"
+#~ msgstr "60%"
+
+#~ msgid "70%"
+#~ msgstr "70%"
+
+#~ msgid "80%"
+#~ msgstr "80%"
+
+#~ msgid "90%"
+#~ msgstr "90%"
+
+#~ msgid "100%"
+#~ msgstr "100%"
+
+#~ msgid "_Select Today"
+#~ msgstr "选择今天(_S)"
+
+#~ msgid "_From Field"
+#~ msgstr "发件人域(_F)"
+
+#~ msgid "Toggles whether the From chooser is displayed"
+#~ msgstr "是否显示发件人选择器"
+
+#~ msgid "Show"
+#~ msgstr "显示"
+
+#~ msgid "Hide"
+#~ msgstr "隐藏"
+
+#~ msgid "address card"
+#~ msgstr "地址卡"
+
+#~ msgid "calendar information"
+#~ msgstr "日历信息"
+
+#, fuzzy
+#~ msgid "Name of the logger"
+#~ msgstr "记录日志的组件名称"
+
+#~ msgid "Filename"
+#~ msgstr "文件名"
+
+#, fuzzy
+#~ msgid "The filename of the module"
+#~ msgstr "更改此文件夹的名称"
+
+#~ msgid "Whether the plugin is enabled"
+#~ msgstr "插件是否已启用"
+
+#~ msgid "Could not parse PGP message: Unknown error"
+#~ msgstr "无法解析 PGP 信息:未知错误"
+
+#, fuzzy
+#~ msgid "Shell Module"
+#~ msgstr "选择模式"
+
+#~ msgid "Show Deleted"
+#~ msgstr "显示删除的"
+
+#~ msgid "To Do"
+#~ msgstr "待办"
+
+#~ 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"
+
+#~ msgid "Unable to scan for existing mailboxes at `%s': %s"
+#~ msgstr "无法扫描位于“%s”的已有邮箱:%s"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution mailbox folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的文件夹..."
+
+#~ msgid "Unable to open old POP keep-on-server data `%s': %s"
+#~ msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”:%s"
+
+#~ msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+#~ msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”:%s"
+
+#~ msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+#~ msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
+
+#~ msgid "Failed to create local mail storage `%s': %s"
+#~ msgstr "创建本地邮件存储“%s”失败:%s"
+
+#~ msgid ""
+#~ "Unable to read settings from previous Evolution install, `evolution/"
+#~ "config.xmldb' does not exist or is corrupt."
+#~ msgstr ""
+#~ "无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者"
+#~ "已损坏。"
+
+#~ msgid "Allows Evolution to display text part of limited size"
+#~ msgstr "允许 Evolution 显示被限制大小的文本部分"
+
+#~ msgid "Enable to render message text part of limited size."
+#~ msgstr "允许渲染被限制大小的信息文本部分。"
+
+#~ msgid "Text message part limit"
+#~ msgstr "文本信息部分限制"
+
+#~ msgid "<b>Top Posting Option</b> (Not Recommended)"
+#~ msgstr "<b>Top Posting 选项</b> (不推荐)"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "原因是“{0}”。"
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "原因是“{2}”。"
+
+#~ msgid "Do not d_elete"
+#~ msgstr "不删除(_E)"
+
+#~ msgid ""
+#~ "The following Search Folder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ " \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "下列搜索文件夹:\n"
+#~ "{0}\n"
+#~ "使用现已删除的文件夹:\n"
+#~ " “{1}”\n"
+#~ "已经更新。"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ " \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "下列过滤规则:\n"
+#~ "{0}\n"
+#~ "使用现已删除的文件夹:\n"
+#~ " “{1}”\n"
+#~ "已经更新。"
+
+#~ msgid "Table column:"
+#~ msgstr "表格栏:"
+
+#~ msgid "Source List"
+#~ msgstr "来源列表"
+
+#, fuzzy
+#~ msgid "The registry of address books"
+#~ msgstr "无法获得地址簿列表"
+
+#~ msgid "Current View"
+#~ msgstr "当前视图"
+
+#, fuzzy
+#~ msgid "Previewed Contact"
+#~ msgstr "新建联系人"
+
+#, fuzzy
+#~ msgid "The contact being shown in the preview pane"
+#~ msgstr "是否显示预览面板。"
+
+#, fuzzy
+#~ msgid "Preview is Visible"
+#~ msgstr "侧边栏可见"
+
+#, fuzzy
+#~ msgid "Whether the preview pane is visible"
+#~ msgstr "是否显示预览面板。"
+
+#~ msgid "LDAP Servers"
+#~ msgstr "LDAP 服务器"
+
+#~ msgid "Autocompletion Settings"
+#~ msgstr "自动补全设置"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution contact folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的文件夹..."
+
+#~ msgid ""
+#~ "The format of mailing list contacts has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "邮件列表联系人的格式已经更改。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的文件夹..."
+
+#~ msgid ""
+#~ "The way Evolution stores some phone numbers has changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution 存储某些电话号码的方式已经更改。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的文件夹..."
+
+#~ msgid ""
+#~ "Evolution's Palm Sync changelog and map files have changed.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your Pilot Sync data..."
+#~ msgstr ""
+#~ "Evolution Palm 同步更新日志和地图文件已经更改。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
+
+#, fuzzy
+#~ msgid "Source Selector Widget"
+#~ msgstr "备忘来源选择器"
+
+#, fuzzy
+#~ msgid "This widget displays groups of address books"
+#~ msgstr "无法获得地址簿列表"
+
+#~ msgid "Save as vCard..."
+#~ msgstr "另存为 VCard..."
+
+#~ msgid "3268"
+#~ msgstr "3268"
+
+#~ msgid "389"
+#~ msgstr "389"
+
+#~ msgid "636"
+#~ msgstr "636"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution calendar folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution 日历文件夹的位置和层次与 Evolution 1.x 不同。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的文件夹..."
+
+#~ msgid "Unable to migrate old settings from evolution/config.xmldb"
+#~ msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
+
+#~ msgid "Unable to migrate calendar `%s'"
+#~ msgstr "无法升迁日历“%s”"
+
+#, fuzzy
+#~| msgid "Default Mail Client"
+#~ msgid "Default Calendar Client"
+#~ msgstr "默认邮件客户端"
+
+#, fuzzy
+#~ msgid "The registry of memo lists"
+#~ msgstr "打印备忘列表"
+
+#, fuzzy
+#~ msgid "The memo table model"
+#~ msgstr "表格模型"
+
+#, fuzzy
+#~| msgid "Default Mail Client"
+#~ msgid "Default Memo Client"
+#~ msgstr "默认邮件客户端"
+
+#, fuzzy
+#~ msgid "The registry of task lists"
+#~ msgstr "打印任务列表"
+
+#, fuzzy
+#~ msgid "The task table model"
+#~ msgstr "表格模型"
+
+#~ msgid ""
+#~ "The location and hierarchy of the Evolution task folders has changed "
+#~ "since Evolution 1.x.\n"
+#~ "\n"
+#~ "Please be patient while Evolution migrates your folders..."
+#~ msgstr ""
+#~ "Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+#~ "\n"
+#~ "请稍候,Evolution 正在升迁您的文件夹..."
+
+#~ msgid "Unable to migrate tasks `%s'"
+#~ msgstr "无法升迁任务“%s”"
+
+#, fuzzy
+#~| msgid "Default Mail Client"
+#~ msgid "Default Task Client"
+#~ msgstr "默认邮件客户端"
+
+#, fuzzy
+#~| msgid "Default value for thread expand state"
+#~ msgid "Default client for task operations"
+#~ msgstr "话题的默认展开状态"
+
+#, fuzzy
+#~| msgid "_Group By Threads"
+#~ msgid "Group by Threads"
+#~ msgstr "按线索分组(_G)"
+
+#~ msgid "Hide _Read Messages"
+#~ msgstr "隐藏已读的信息(_R)"
+
+#~ msgid "Temporarily hide all messages that have already been read"
+#~ msgstr "暂时隐藏所有已读信息"
+
+#~ msgid "Hide S_elected Messages"
+#~ msgstr "隐藏选中的信息(_E)"
+
+#~ msgid "Temporarily hide the selected messages"
+#~ msgstr "暂时隐藏选中信息"
+
+#~ msgid "Show Hidde_n Messages"
+#~ msgstr "显示隐藏的信息(_N)"
+
+#~ msgid "Show messages that have been temporarily hidden"
+#~ msgstr "显示暂时被隐藏的信息"
+
+#~ msgid "Hide _Deleted Messages"
+#~ msgstr "隐藏已删除的信息(_D)"
+
+#~ msgid ""
+#~ "Hide deleted messages rather than displaying them with a line through them"
+#~ msgstr "隐藏已删除的信息而不是在上面显示一条线"
+
+#~ msgid ""
+#~ "List of clues for the attachment reminder plugin to look for in a message "
+#~ "body."
+#~ msgstr "消息主体中的用于附件提醒插件的线索列表。"
+
+#~ msgid "Check whether Evolution is the default mail client on startup."
+#~ msgstr "在启动时检查 Evolution 是不是默认的邮件客户端。"
+
+#~ 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 支持"
+
+#~ msgid "_Accept"
+#~ msgstr "接受(_A)"
+
+#~ msgid "Guides you through your initial account setup."
+#~ msgstr "指引您进行初始帐户的设置。"
+
+#~ msgid "Setup Assistant"
+#~ msgstr "设置助手"
+
+#~ msgid "Importing data."
+#~ msgstr "正在导入数据。"
+
+#~ msgid "Please wait"
+#~ msgstr "请稍候"
+
+#~ msgid "%ld KB"
+#~ msgstr "%ld KB"
+
+#~ msgid "Toolbar Style"
+#~ msgstr "工具栏样式"
+
+#~ msgid "Toolbar Visible"
+#~ msgstr "工具栏可见"
+
+#~ msgid "Whether the switcher is visible"
+#~ msgstr "切换器是否可见"
+
+#, fuzzy
+#~ msgid "Switcher Action"
+#~ msgstr "切换到 %s"
+
+#~ msgid "Page Number"
+#~ msgstr "页码"
+
+#, fuzzy
+#~| msgid "Search Filter"
+#~ msgid "Search Rule"
+#~ msgstr "搜索过滤器"
+
+#, fuzzy
+#~ msgid "Criteria for the current search results"
+#~ msgstr "取消当前邮件操作"
+
+#, fuzzy
+#~ msgid "Shell Sidebar Widget"
+#~ msgstr "默认侧边栏宽度"
+
+#, fuzzy
+#~ msgid "Shell Taskbar Widget"
+#~ msgstr "选择任务列表"
+
+#, fuzzy
+#~ msgid "Shell Window"
+#~ msgstr "新建窗口(_W)"
+
+#, fuzzy
+#~ msgid "Current View ID"
+#~ msgstr "当前视图(_C)"
+
+#, fuzzy
+#~ msgid "The current GAL view ID"
+#~ msgstr "当前时间"
+
+#~ msgid "GNOME Pilot is not installed."
+#~ msgstr "GNOME Pilot 没有安装。"
+
+#~ msgid "GNOME Pilot could not be run."
+#~ msgstr "GNOME Pilot 不能运行。"
+
+#~ msgid "GNOME Pilot _Synchronization..."
+#~ msgstr "GNOME Pilot 同步(_S)..."
+
+#~ msgid "Set up GNOME Pilot configuration"
+#~ msgstr "设置 GNOME Pilot 配置"
+
+#, fuzzy
+#~ msgid "Name of the active shell view"
+#~ msgstr "新视图的名称:"
+
+#~ msgid "Safe Mode"
+#~ msgstr "安全模式"
+
+#, fuzzy
+#~ msgid "Whether the shell window is in safe mode"
+#~ msgstr "插件是否已启用"
+
+#, fuzzy
+#~| msgid "Sidebar is visible"
+#~ msgid "Sidebar Visible"
+#~ msgstr "侧边栏可见"
+
+#, fuzzy
+#~| msgid "Whether the switcher is visible"
+#~ msgid "Whether the shell window's side bar is visible"
+#~ msgstr "切换器是否可见"
+
+#, fuzzy
+#~| msgid "Sidebar is visible"
+#~ msgid "Switcher Visible"
+#~ msgstr "侧边栏可见"
+
+#, fuzzy
+#~| msgid "Whether the window buttons should be visible."
+#~ msgid "Whether the shell window's switcher buttons are visible"
+#~ msgstr "窗口按钮是否可见。"
+
+#~ msgid "Taskbar Visible"
+#~ msgstr "任务栏可见"
+
+#, fuzzy
+#~| msgid "Whether the switcher is visible"
+#~ msgid "Whether the shell window's task bar is visible"
+#~ msgstr "切换器是否可见"
+
+#, fuzzy
+#~| msgid "Whether the switcher is visible"
+#~ msgid "Whether the shell window's tool bar is visible"
+#~ msgstr "切换器是否可见"
+
+#~ msgid "UI Manager"
+#~ msgstr "UI 管理器"
+
+#~ msgid "Module Directory"
+#~ msgstr "模块目录"
+
+#~ msgid "Network Available"
+#~ msgstr "网络可用"
+
+#~ msgid "Whether the network is available"
+#~ msgstr "网络是否可用"
+
+#~ msgid "Online"
+#~ msgstr "在线"
+
+#, fuzzy
+#~ msgid "Whether the shell is online"
+#~ msgstr "插件是否已启用"
+
+#~ msgid "Forcibly re-migrate from Evolution 1.4"
+#~ msgstr "强制从 Evolution 1.4 重新升迁"
+
+#~ msgid "Insufficient disk space for upgrade."
+#~ msgstr "磁盘空间不足以进行升级。"
+
+#~ msgid "Really delete old data?"
+#~ msgstr "真的要删除旧数据吗?"
+
+#~ msgid ""
+#~ "The entire contents of the &quot;evolution&quot; directory are about to "
+#~ "be permanently removed.\n"
+#~ "\n"
+#~ "It is suggested you manually verify that all of your mail, contact, and "
+#~ "calendar data is present, and that this version of Evolution operates "
+#~ "correctly before deleting this old data.\n"
+#~ "\n"
+#~ "Once deleted, you cannot downgrade to the previous version of Evolution "
+#~ "without manual intervention.\n"
+#~ msgstr ""
+#~ "即将永久删除“evolution”目录的全部内容。\n"
+#~ "\n"
+#~ "我们建议您在删除旧数据之前,手动检查您全部的邮件、联系人和日历信息都存在,"
+#~ "并且确认此版本的 Evolution 工作正常。\n"
+#~ "\n"
+#~ "删除之后,您将无法降级至先前版本的 Evolution,除非您手动从头来过。\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "The previous version of Evolution stored its data in a different "
+#~ "location.\n"
+#~ "\n"
+#~ "If you choose to remove this data, the entire contents of the &quot;"
+#~ "evolution&quot; directory will be removed permanently. If you choose to "
+#~ "keep this data, then you may manually remove the contents of &quot;"
+#~ "evolution&quot; at your convenience.\n"
+#~ msgstr ""
+#~ "先前版本的 Evolution 将其数据存储在不同的位置。\n"
+#~ "\n"
+#~ "如果您选择删除此数据,“evolution”目录中的全部内容都将被永久删除。如果您选"
+#~ "择保留此数据,那么您可以在您方便的时候手动删除“evolution”目录。\n"
+
+#~ msgid ""
+#~ "Upgrading your data and settings will require up to {0} of disk space, "
+#~ "but you only have {1} available.\n"
+#~ "\n"
+#~ "You will need to make more space available in your home directory before "
+#~ "you can continue."
+#~ msgstr ""
+#~ "升级您的数据和设置需要多至 {0} 的磁盘空间,但您现在只有 {1}。\n"
+#~ "\n"
+#~ "您需要在继续之前在主目录中腾出更多空间。"
+
+#~ msgid "_Keep Data"
+#~ msgstr "保留数据(_K)"
+
+#~ msgid "_Remind Me Later"
+#~ msgstr "稍后提醒(_R)"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
+#~ msgid "Import"
+#~ msgstr "导入"
+
+#~ msgid "View"
+#~ msgstr "查看"
+
+#~ msgid "Collection"
+#~ msgstr "收藏"
+
+#~ msgid "Instance"
+#~ msgstr "实例"
+
+#~ msgid "Factory"
+#~ msgstr "工厂"
+
+#~ msgid "Action"
+#~ msgstr "活动"
+
+#~ msgid "Show _Attachment Bar"
+#~ msgstr "显示附件栏(_A)"
+
+#~ msgid "Fill color"
+#~ msgstr "填充颜色"
+
+#~ msgid "GDK fill color"
+#~ msgstr "GDK 填充颜色"
+
+#~ msgid "Fill stipple"
+#~ msgstr "点绘填充"
+
+#~ msgid "X1"
+#~ msgstr "X1"
+
+#~ msgid "X2"
+#~ msgstr "X2"
+
+#~ msgid "Y1"
+#~ msgstr "Y1"
+
+#~ msgid "Y2"
+#~ msgstr "Y2"
+
+#~ msgid "Minimum width"
+#~ msgstr "最小宽度"
+
+#~ msgid "Minimum Width"
+#~ msgstr "最小宽度"
+
+#~ msgid "Spacing"
+#~ msgstr "间距"
+
+#~ msgid "The button state is online"
+#~ msgstr "按钮状态为在线"
+
+#, fuzzy
+#~ msgid "Horizontal Position"
+#~ msgstr "水平面板位置"
+
+#, fuzzy
+#~ msgid "Vertical Position"
+#~ msgstr "垂直面板的位置"
+
+#, fuzzy
+#~| msgid "Position"
+#~ msgid "Proportion"
+#~ msgstr "位置"
+
+#, fuzzy
+#~| msgid "_Resize"
+#~ msgid "Fixed Resize"
+#~ msgstr "缩放(_R)"
+
+#~ msgid "Sync with:"
+#~ msgstr "同步对象:"
+
+#~ msgid "Sync Private Records:"
+#~ msgstr "同步私有记录:"
+
+#~ msgid "Sync Categories:"
+#~ msgstr "同步类别:"
+
+#~ msgid "Cursor Row"
+#~ msgstr "光标行"
+
+#~ msgid "Cursor Column"
+#~ msgstr "光标列"
+
+#~ msgid "Sorter"
+#~ msgstr "排序"
+
+#~ msgid "Selection Mode"
+#~ msgstr "选择模式"
+
+#~ msgid "Cursor Mode"
+#~ msgstr "光标模式"
+
+#~ msgid "Selected Column"
+#~ msgstr "选中列"
+
+#~ msgid "Focused Column"
+#~ msgstr "聚焦列"
+
+#~ msgid "Unselected Column"
+#~ msgstr "未选列"
+
+#~ msgid "Strikeout Column"
+#~ msgstr "给列加删除线"
+
+#~ msgid "Underline Column"
+#~ msgstr "给列加下划线"
+
+#~ msgid "Bold Column"
+#~ msgstr "给列加粗"
+
+#~ msgid "Color Column"
+#~ msgstr "给列着色"
+
+#~ msgid "BG Color Column"
+#~ msgstr "给列着背景色"
+
+#~ msgid "State"
+#~ msgstr "状态"
+
+#~ msgid "Alternating Row Colors"
+#~ msgstr "交替行色"
+
+#~ msgid "Horizontal Draw Grid"
+#~ msgstr "水平绘制网格"
+
+#~ msgid "Vertical Draw Grid"
+#~ msgstr "垂直绘制网格"
+
+#~ msgid "Draw focus"
+#~ msgstr "绘制焦点"
+
+#~ msgid "Cursor mode"
+#~ msgstr "光标模式"
+
+#~ msgid "Selection model"
+#~ msgstr "选择模型"
+
+#~ msgid "Length Threshold"
+#~ msgstr "长度阀值"
+
+#~ msgid "Uniform row height"
+#~ msgstr "统一行高"
+
+#~ msgid "Frozen"
+#~ msgstr "冻结"
+
+#~ msgid "Table header"
+#~ msgstr "表头"
+
+#~ msgid "Table model"
+#~ msgstr "表格模型"
+
+#~ msgid "Cursor row"
+#~ msgstr "光标行"
+
+#~ msgid "Sort Info"
+#~ msgstr "排序信息"
+
+#~ msgid "Always search"
+#~ msgstr "总是搜索"
+
+#~ msgid "Use click to add"
+#~ msgstr "单击可添加"
+
+#, fuzzy
+#~ msgid "Vertical Row Spacing"
+#~ msgstr "标识器间距"
+
+#~ msgid "ETree table adapter"
+#~ msgstr "ETree 表格适配器"
+
+#~ msgid "Retro Look"
+#~ msgstr "火箭外观"
+
+#~ msgid "Draw lines and +/- expanders."
+#~ msgstr "绘制行和 +/- 扩展柄。"
+
+#~ msgid "Expander Size"
+#~ msgstr "扩展器大小"
+
+#~ msgid "Size of the expander arrow"
+#~ msgstr "扩展器箭头的大小"
+
+#~ msgid "popup"
+#~ msgstr "弹出"
+
+#~ msgid "edit"
+#~ msgstr "编辑"
+
+#~ msgid "toggle"
+#~ msgstr "切换"
+
+#~ msgid "expand"
+#~ msgstr "展开"
+
+#~ msgid "Event Processor"
+#~ msgstr "事件处理器"
+
+#~ msgid "Text"
+#~ msgstr "文字"
-#: ../widgets/text/e-text.c:3322 ../widgets/text/e-text.c:3323
-msgid "Text"
-msgstr "文字"
+#~ msgid "Bold"
+#~ msgstr "粗体"
-#: ../widgets/text/e-text.c:3329 ../widgets/text/e-text.c:3330
-msgid "Bold"
-msgstr "粗体"
+#~ msgid "Strikeout"
+#~ msgstr "删除线"
-#: ../widgets/text/e-text.c:3336 ../widgets/text/e-text.c:3337
-msgid "Strikeout"
-msgstr "删除线"
+#~ msgid "Anchor"
+#~ msgstr "锚点"
-#: ../widgets/text/e-text.c:3343 ../widgets/text/e-text.c:3344
-msgid "Anchor"
-msgstr "锚点"
+#~ msgid "Justification"
+#~ msgstr "两端对齐"
-#: ../widgets/text/e-text.c:3350 ../widgets/text/e-text.c:3351
-msgid "Justification"
-msgstr "两端对齐"
+#~ msgid "Clip Width"
+#~ msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3357 ../widgets/text/e-text.c:3358
-msgid "Clip Width"
-msgstr "裁剪宽度"
+#~ msgid "Clip Height"
+#~ msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3364 ../widgets/text/e-text.c:3365
-msgid "Clip Height"
-msgstr "裁剪高度"
+#~ msgid "Clip"
+#~ msgstr "裁剪"
-#: ../widgets/text/e-text.c:3371 ../widgets/text/e-text.c:3372
-msgid "Clip"
-msgstr "裁剪"
+#~ msgid "Fill clip rectangle"
+#~ msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3378 ../widgets/text/e-text.c:3379
-msgid "Fill clip rectangle"
-msgstr "填充裁剪矩形"
+#~ msgid "X Offset"
+#~ msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3385 ../widgets/text/e-text.c:3386
-msgid "X Offset"
-msgstr "水平偏移"
+#~ msgid "Y Offset"
+#~ msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3392 ../widgets/text/e-text.c:3393
-msgid "Y Offset"
-msgstr "垂直偏移"
+#~ msgid "Text width"
+#~ msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3427 ../widgets/text/e-text.c:3428
-msgid "Text width"
-msgstr "文字宽度"
+#~ msgid "Text height"
+#~ msgstr "文字高度"
-#: ../widgets/text/e-text.c:3434 ../widgets/text/e-text.c:3435
-msgid "Text height"
-msgstr "文字高度"
+#~ msgid "Use ellipsis"
+#~ msgstr "使用椭圆"
-#: ../widgets/text/e-text.c:3448 ../widgets/text/e-text.c:3449
-msgid "Use ellipsis"
-msgstr "使用椭圆"
+#~ msgid "Ellipsis"
+#~ msgstr "椭圆"
-#: ../widgets/text/e-text.c:3455 ../widgets/text/e-text.c:3456
-msgid "Ellipsis"
-msgstr "椭圆"
+#~ msgid "Line wrap"
+#~ msgstr "换行"
-#: ../widgets/text/e-text.c:3462 ../widgets/text/e-text.c:3463
-msgid "Line wrap"
-msgstr "换行"
+#~ msgid "Break characters"
+#~ msgstr "换行字符"
-#: ../widgets/text/e-text.c:3469 ../widgets/text/e-text.c:3470
-msgid "Break characters"
-msgstr "换行字符"
+#~ msgid "Max lines"
+#~ msgstr "最多行数"
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
-msgid "Max lines"
-msgstr "最多行数"
+#~ msgid "Draw borders"
+#~ msgstr "绘制边框"
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
-msgid "Draw borders"
-msgstr "绘制边框"
+#~ msgid "Allow newlines"
+#~ msgstr "允许新行"
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
-msgid "Allow newlines"
-msgstr "允许新行"
+#~ msgid "Draw background"
+#~ msgstr "绘制背景"
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
-msgid "Draw background"
-msgstr "绘制背景"
+#~ msgid "Draw button"
+#~ msgstr "绘制按钮"
-#: ../widgets/text/e-text.c:3518 ../widgets/text/e-text.c:3519
-msgid "Draw button"
-msgstr "绘制按钮"
+#~ msgid "Cursor position"
+#~ msgstr "光标位置"
-#: ../widgets/text/e-text.c:3525 ../widgets/text/e-text.c:3526
-msgid "Cursor position"
-msgstr "光标位置"
+#~ msgid "IM Context"
+#~ msgstr "输入法环境"
-#. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3535
-msgid "IM Context"
-msgstr "输入法环境"
-
-#: ../widgets/text/e-text.c:3541 ../widgets/text/e-text.c:3542
-msgid "Handle Popup"
-msgstr "处理弹出"
+#~ msgid "Handle Popup"
+#~ msgstr "处理弹出"