aboutsummaryrefslogtreecommitdiffstats
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/zh_CN.po6754
1 files changed, 3701 insertions, 3053 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 96fb202d39..dbffabb9e9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Evolution 2.8\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-02 10:06+0100\n"
-"PO-Revision-Date: 2007-09-08 16:30+0800\n"
+"POT-Creation-Date: 2008-02-23 20:44+0000\n"
+"PO-Revision-Date: 2008-03-01 15:34+0800\n"
"Last-Translator: YangZhang <zyangmath@gmail.com>\n"
"Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
"MIME-Version: 1.0\n"
@@ -82,7 +82,7 @@ msgstr "日历事件:无摘要。"
msgid "calendar view event"
msgstr "日历视图事件"
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
msgid "Grab Focus"
msgstr "获得焦点"
@@ -150,7 +150,7 @@ msgid "calendar view for one or more days"
msgstr "一天或多天的日历视图"
#: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:740
+#: ../calendar/gui/calendar-component.c:747
msgid "%A %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -161,9 +161,9 @@ msgstr "%Y年%-m月%-d日%A"
#. You can change the order but don't change the
#. specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:743
-#: ../calendar/gui/e-day-view-top-item.c:1340
-#: ../calendar/gui/e-day-view.c:2115
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1363
+#: ../calendar/gui/e-day-view.c:2158
#: ../calendar/gui/e-week-view-main-item.c:319
#: ../calendar/gui/e-week-view-main-item.c:533
msgid "%a %d %b"
@@ -172,9 +172,9 @@ msgstr "%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:193
#: ../a11y/calendar/ea-gnome-calendar.c:198
#: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:745
-#: ../calendar/gui/calendar-component.c:750
#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
msgid "%a %d %b %Y"
msgstr "%Y年%-m月%-d日%A"
@@ -182,10 +182,10 @@ msgstr "%Y年%-m月%-d日%A"
#: ../a11y/calendar/ea-gnome-calendar.c:223
#: ../a11y/calendar/ea-gnome-calendar.c:229
#: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:764
#: ../calendar/gui/calendar-component.c:771
-#: ../calendar/gui/calendar-component.c:777
-#: ../calendar/gui/calendar-component.c:779
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -195,25 +195,25 @@ msgstr "%Y年%-m月%-d日"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:769
-#: ../calendar/gui/e-day-view-top-item.c:1344
-#: ../calendar/gui/e-day-view.c:2131
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1367
+#: ../calendar/gui/e-day-view.c:2174
#: ../calendar/gui/e-week-view-main-item.c:333
#: ../calendar/gui/e-week-view-main-item.c:547
msgid "%d %b"
msgstr "%B%-d日"
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
#: ../calendar/importers/icalendar-importer.c:772
msgid "Gnome Calendar"
msgstr "Gnome 日历"
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
msgid "search bar"
msgstr "搜索栏"
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
msgid "evolution calendar search bar"
msgstr "Evolution 日历和搜索栏"
@@ -269,19 +269,19 @@ msgstr "切换"
msgid "toggle the cell"
msgstr "切换单元格"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
msgid "expand"
msgstr "展开"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
msgid "expands the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中展开行"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
msgid "collapse"
msgstr "折叠"
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
msgid "collapses the row in the ETree containing this cell"
msgstr "在包含此单元格的 ETree 中折叠行"
@@ -291,7 +291,7 @@ msgstr "表格单元格"
#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:571
+#: ../widgets/table/e-table-click-to-add.c:581
msgid "click to add"
msgstr "单击可添加"
@@ -337,25 +337,37 @@ msgstr "切换附件栏"
msgid "activate"
msgstr "激活"
-#: ../addressbook/addressbook.error.xml.h:1
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:2
+#, fuzzy
+msgid ""
+"'{0}' is a read-only address book source. Switch to Contacts View and "
+"highlight an address book that can accept contacts."
+msgstr "您选择了只读日历源。请更改为日历视图,然后选择可接受约会的日历。"
+
+#: ../addressbook/addressbook.error.xml.h:3
msgid ""
"A contact already exists with this address. Would you like to add a new card "
"with the same address anyway?"
msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添加新名片吗?"
-#: ../addressbook/addressbook.error.xml.h:2
+#: ../addressbook/addressbook.error.xml.h:4
msgid "Address '{0}' already exists."
msgstr "地址“{0}”已经存在。"
-#: ../addressbook/addressbook.error.xml.h:3
+#: ../addressbook/addressbook.error.xml.h:5
+msgid "Cannot add new contact"
+msgstr "无法添加新联系人"
+
+#: ../addressbook/addressbook.error.xml.h:6
msgid "Cannot move contact."
msgstr "无法移动联系人。"
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:7
msgid "Category editor not available."
msgstr "类别编辑器不可用。"
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:8
msgid ""
"Check to make sure your password is spelled correctly and that you are using "
"a supported login method. Remember that many passwords are case sensitive; "
@@ -364,15 +376,15 @@ msgstr ""
"选中此处以确保您的密码拼写正确,并确保您使用了支持的登录方式。请记住,很多密"
"码都是区分大小写的;您的 Caps Lock 灯可能为开。"
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:9
msgid "Could not get schema information for LDAP server."
msgstr "无法从 LDAP 服务器获取大纲信息。"
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:10
msgid "Could not remove addressbook."
msgstr "无法删除地址簿。"
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:11
msgid ""
"Currently you can access only GroupWise System Address Book from Evolution. "
"Please use some other GroupWise mail client once, to get your GroupWise "
@@ -381,58 +393,58 @@ msgstr ""
"目前您只能从 Evolution 中访问 GroupWise 系统地址簿。请使用其它 GroupWise 邮件"
"客户程序获得 GroupWise 中您最常联系的联系人以及 GroupWise 个人联系人文件夹。"
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:12
msgid "Delete address book '{0}'?"
msgstr "删除地址簿“{0}”吗?"
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:13
msgid "Error loading addressbook."
msgstr "装入默认地址簿错误。"
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:14
msgid "Error saving {0} to {1}: {2}"
msgstr "将{0}保存到 {1} 出错:{2}"
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:15
msgid "Failed to authenticate with LDAP server."
msgstr "认证到 IMAP 服务器失败。"
#. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
+#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
msgid "Failed to delete contact"
msgstr "删除联系人失败"
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:17
msgid "GroupWise Address book creation:"
msgstr "GroupWise 地址簿创建:"
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:18
msgid "LDAP server did not respond with valid schema information."
msgstr "LDAP 服务器无法响应有效的大纲信息。"
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:19
msgid "Permission Denied."
msgstr "权限被禁止。"
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:20
msgid "Server Version"
msgstr "服务器版本"
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:21
msgid "Some features may not work properly with your current server"
msgstr "某些特性可能无法在您目前的服务器下工作"
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:22
msgid "The Evolution addressbook has quit unexpectedly."
msgstr "Evolution 地址簿异常退出。"
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:23
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:24
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 "
@@ -441,45 +453,45 @@ msgstr ""
"此 LDAP 服务器可能使用较早版本的 LDAP,所以无法支持此功能,或者是配置错误。请"
"询问您的管理员有关支持的搜索基础一事。"
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:25
msgid "This address book will be removed permanently."
msgstr "此地址簿即将被永久删除。"
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:26
msgid "This addressbook could not be opened."
msgstr "无法打开此地址簿。"
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:27
msgid "This addressbook server does not have any suggested search bases."
msgstr "此地址簿服务器不支持任何建议的搜索基础。"
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:28
msgid ""
"This addressbook server might be unreachable or the server name may be "
"misspelled or your network connection could be down."
msgstr "此地址簿服务器不可达,或者服务器名称拼错,又或者您的网络连接已断。"
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:29
msgid "This server does not support LDAPv3 schema information."
msgstr "此服务器不支持 LDAPv3 大纲信息。"
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:30
msgid "Unable to open addressbook"
msgstr "无法打开地址簿"
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:31
msgid "Unable to perform search."
msgstr "无法执行搜索。"
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:32
msgid "Unable to save {0}."
msgstr "无法保存 {0}。"
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:33
msgid "Would you like to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:34
msgid ""
"You are attempting to move a contact from one addressbook to another but it "
"cannot be removed from the source. Do you want to save a copy instead?"
@@ -487,7 +499,7 @@ msgstr ""
"您即将把联系人从一个地址簿移至另外一个地址簿,但是无法从源地址簿删除该联系"
"人。您想要换作复制联系人吗?"
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:35
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results the server should be upgraded to "
@@ -496,48 +508,48 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到 Evolution 支持的版本"
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:36
msgid ""
"You have made modifications to this contact. Do you want to save these "
"changes?"
msgstr "您已对此联系人作出了修改。您想要保存这些更改吗?"
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:37
msgid ""
"Your contacts for {0} will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则 {0} 的联系人无法使用。"
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:512
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:512
#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
msgid "_Add"
msgstr "添加(_A)"
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:39
msgid "_Discard"
msgstr "丢弃(_D)"
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:40
msgid "_Do not save"
msgstr "不保存(_D)"
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:41
msgid "_Resize"
msgstr "缩放(_R)"
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:42
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 addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:44
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "{0}"
msgstr "{0}"
#. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:46
msgid "{1}"
msgstr "{1}"
@@ -545,13 +557,13 @@ msgstr "{1}"
msgid "Default Sync Address:"
msgstr "默认同步地址:"
-#: ../addressbook/conduit/address-conduit.c:1315
-#: ../addressbook/conduit/address-conduit.c:1316
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
msgid "Could not load addressbook"
msgstr "无法装入地址簿"
-#: ../addressbook/conduit/address-conduit.c:1393
-#: ../addressbook/conduit/address-conduit.c:1396
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
msgid "Could not read pilot's Address application block"
msgstr "无法读入 Pilot 的地址应用程序块"
@@ -574,8 +586,8 @@ msgstr "在此配置自动补全"
#. Create the contacts group
#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
#: ../addressbook/gui/component/addressbook-view.c:1338
-#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:403
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:581
msgid "Contacts"
msgstr "联系人"
@@ -615,13 +627,13 @@ msgstr "在此管理您的 S/MIME 证书"
#. create the local source group
#. On This Computer is always first and Search Folders is always last
#: ../addressbook/gui/component/addressbook-component.c:144
-#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../addressbook/gui/component/addressbook-migrate.c:499
#: ../calendar/gui/calendar-component.c:237
-#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
-#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
-#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:583 ../calendar/gui/migration.c:1096
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:307
+#: ../mail/mail-vfolder.c:216
msgid "On This Computer"
msgstr "在此计算机中"
@@ -631,20 +643,19 @@ msgstr "在此计算机中"
#. Create the default Person addressbook
#. orange
#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:505
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
#: ../calendar/gui/calendar-component.c:248
-#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
-#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
-#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:492
+#: ../calendar/gui/migration.c:591 ../calendar/gui/migration.c:1104
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-migrate.c:517
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
@@ -665,7 +676,7 @@ msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1209
+#: ../addressbook/gui/component/addressbook-config.c:1206
msgid "New Address Book"
msgstr "新地址簿"
@@ -681,61 +692,61 @@ msgstr "创建新地址簿"
msgid "Failed upgrading Address Book settings or folders."
msgstr "升级地址簿设置或文件夹失败。"
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
msgid "Base"
msgstr "基础"
-#: ../addressbook/gui/component/addressbook-config.c:533
+#: ../addressbook/gui/component/addressbook-config.c:530
#: ../calendar/gui/dialogs/calendar-setup.c:172
msgid "_Type:"
msgstr "类型(_T):"
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "将地址簿内容复制到本地以进行脱机操作"
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy _book content locally for offline operation"
+msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:981
#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
#: ../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:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2238
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2343
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "常规"
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:565
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:387
msgid "Address Book"
msgstr "地址簿"
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
msgid "Server Information"
msgstr "服务器信息"
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
msgid "Authentication"
msgstr "身份验证"
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
#: ../addressbook/gui/component/ldap-config.glade.h:17
#: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "细节"
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:865
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:935
msgid "Searching"
msgstr "搜索"
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1207
+#: ../addressbook/gui/component/addressbook-config.c:1204
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "地址簿属性"
@@ -751,15 +762,15 @@ msgstr "正在升迁..."
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
-#: ../addressbook/gui/component/addressbook-migrate.c:643
+#: ../addressbook/gui/component/addressbook-migrate.c:645
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: ../addressbook/gui/component/addressbook-migrate.c:758
+#: ../addressbook/gui/component/addressbook-migrate.c:760
msgid "Autocompletion Settings"
msgstr "自动补全设置"
-#: ../addressbook/gui/component/addressbook-migrate.c:1134
+#: ../addressbook/gui/component/addressbook-migrate.c:1136
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -770,7 +781,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1148
+#: ../addressbook/gui/component/addressbook-migrate.c:1150
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -780,7 +791,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1159
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -790,7 +801,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1167
+#: ../addressbook/gui/component/addressbook-migrate.c:1169
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -801,46 +812,43 @@ msgstr ""
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:504
+#: ../mail/em-folder-utils.c:503
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "将“%s”文件夹重命名为:"
#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:505
msgid "Rename Folder"
msgstr "重命名文件夹"
#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:512
+#: ../mail/em-folder-utils.c:511
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:954
msgid "_New Address Book"
msgstr "新建地址簿(_N)"
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:981
-#: ../calendar/gui/calendar-component.c:604
-#: ../calendar/gui/e-calendar-table.c:1375
-#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:992
-#: ../calendar/gui/memos-component.c:466 ../calendar/gui/tasks-component.c:457
-#: ../mail/em-folder-tree.c:2109 ../mail/em-folder-view.c:1233
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "另存为 vCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1385
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:939
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1346
#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
#: ../ui/evolution-tasks.xml.h:24
msgid "_Delete"
msgstr "删除(_D)"
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "另存为 Vcard..."
-
#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:605
-#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
msgid "_Properties..."
msgstr "属性(_P)..."
@@ -852,17 +860,24 @@ msgstr "联系人源选择器"
msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
-#: ../addressbook/gui/component/addressbook.c:197
+#: ../addressbook/gui/component/addressbook.c:200
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
-#: ../addressbook/gui/component/addressbook.c:204
+#: ../addressbook/gui/component/addressbook.c:207
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "输入 %s 的密码(用户 %s)"
+#: ../addressbook/gui/component/addressbook.c:215
+#: ../calendar/common/authentication.c:51
+#: ../plugins/publish-calendar/publish-calendar.c:93
+#: ../smime/gui/component.c:50
+msgid "Enter password"
+msgstr "输入密码"
+
#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
msgid "Autocomplete length"
msgstr "自动补全长度"
@@ -1166,7 +1181,8 @@ msgstr "登录方式(_L):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
#: ../calendar/gui/dialogs/calendar-setup.c:229
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "名称(_N):"
@@ -1180,7 +1196,7 @@ msgid "_Search scope:"
msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:172
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1201,9 +1217,9 @@ msgstr "名片"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../mail/em-account-editor.c:2064
#: ../plugins/calendar-http/calendar-http.c:288
#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:395
msgid "minutes"
msgstr "分钟"
@@ -1244,99 +1260,99 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
-#: ../addressbook/gui/widgets/eab-contact-display.c:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:274
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "类别(_T)..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
#: ../addressbook/gui/widgets/e-minicard.c:194
msgid "Contact"
msgstr "联系人"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:551
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
msgid "Contact Editor"
msgstr "联系人编辑器"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
msgid "Full _Name..."
msgstr "全名(_N)..."
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
msgid "Image"
msgstr "图像"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
msgid "MSN Messenger"
msgstr "MSN Messenger"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
msgid "Mailing Address"
msgstr "邮政地址"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "昵称(_C):"
-
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr "昵称(_K):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
msgid "Novell Groupwise"
msgstr "Novell Groupwise"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
msgid "Personal Information"
msgstr "个人信息"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
msgid "Telephone"
msgstr "电话"
#. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../filter/filter-label.c:121 ../mail/em-migrate.c:1055
-#: ../mail/mail-config.glade.h:158
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
msgid "Work"
msgstr "工作"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
msgid "_Address:"
msgstr "地址(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
msgid "_Anniversary:"
msgstr "周年(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
msgid "_Assistant:"
msgstr "助手(_A):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
msgid "_Birthday:"
msgstr "生日(_B):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:908
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1833
+#: ../plugins/itip-formatter/itip-view.c:1850
msgid "_Calendar:"
msgstr "日历(_C):"
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "类别(_C)..."
-
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
msgid "_City:"
msgstr "城市(_C):"
@@ -1413,7 +1429,7 @@ msgid "_Web Log:"
msgstr "_Web 日志:"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
msgid "_Where:"
msgstr "何处(_W):"
@@ -1422,26 +1438,25 @@ msgid "_Zip/Postal Code:"
msgstr "邮政编码(_Z):"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
msgid "Address"
msgstr "地址"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:302
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
#: ../addressbook/gui/widgets/e-addressbook-model.c:312
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
#: ../addressbook/gui/widgets/e-minicard-label.c:164
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
#: ../addressbook/gui/widgets/e-minicard-view.c:522
#: ../addressbook/gui/widgets/e-minicard.c:187
#: ../widgets/menus/gal-define-views-model.c:179
-#: ../widgets/table/e-cell-text.c:1831 ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3681
-#: ../widgets/text/e-text.c:3682
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3687
msgid "Editable"
msgstr "可编辑"
@@ -2414,11 +2429,13 @@ msgid "Zimbabwe"
msgstr "津巴布韦"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
+#: ../mail/em-mailer-prefs.c:481
#: ../plugins/exchange-operations/exchange-delegates.c:958
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../plugins/plugin-manager/plugin-manager.c:56
#: ../plugins/save-attachments/save-attachments.c:366
#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
#: ../widgets/menus/gal-view-new-dialog.c:65
msgid "Name"
msgstr "姓名"
@@ -2428,8 +2445,8 @@ msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:554
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
msgid "Jabber"
msgstr "Jabber"
@@ -2442,8 +2459,8 @@ msgid "Gadu-Gadu Messenger"
msgstr "Gadu-Gadu 即时通讯"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
msgid "ICQ"
msgstr "ICQ"
@@ -2452,9 +2469,9 @@ msgid "Service"
msgstr "服务"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
msgid "Location"
msgstr "位置"
@@ -2463,76 +2480,76 @@ msgid "Username"
msgstr "用户名"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
#: ../addressbook/gui/widgets/eab-contact-display.c:58
msgid "Home"
msgstr "家庭"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
#: ../addressbook/gui/widgets/eab-contact-display.c:59
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
msgid "Yahoo"
msgstr "雅虎"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
msgid "Gadu-Gadu"
msgstr "Gadu-Gadu"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:555
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:260
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
msgid "Source Book"
msgstr "来源地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:267
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
msgid "Target Book"
msgstr "目标地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:281
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
msgid "Is New Contact"
msgstr "为新联系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:288
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
msgid "Writable Fields"
msgstr "可写域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:295
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
msgid "Required Fields"
msgstr "必需域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:309
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
msgid "Changed"
msgstr "已更改"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2540,43 +2557,43 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3117
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3150
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3165
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
msgid "Invalid contact."
msgstr "无效的联系人。"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
msgid "Contact Quick-Add"
msgstr "快速添加联系人"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:297
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:339
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:361
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
@@ -2712,67 +2729,51 @@ msgid "_Location:"
msgstr "位置(_L):"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "<b>Members</b>"
+msgstr "<b>成员</b>"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "将电子邮件添加到列表"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
msgid "Contact List Editor"
msgstr "联系人列表编辑器"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "从地址簿中插入电子邮件地址"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "成员"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "从列表中删除电子邮件地址"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "选择..."
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
msgid "_Hide addresses when sending mail to this list"
msgstr "在往该列表发送邮件时隐藏地址(_H)"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
msgid "_List name:"
msgstr "列表名称(_L):"
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "选择(_S)"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
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:167
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "联系人列表成员"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
#: ../addressbook/gui/widgets/e-addressbook-model.c:298
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
#: ../addressbook/gui/widgets/e-minicard-view.c:508
msgid "Book"
msgstr "地址簿"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
msgid "Is New List"
msgstr "为新列表"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
msgid "_Members"
msgstr "成员(_M)"
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "联系人列表成员"
-
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
msgid "Changed Contact:"
msgstr "更改了的联系人:"
@@ -2818,27 +2819,28 @@ msgstr "合并(_M)"
#: ../addressbook/gui/merging/eab-contact-merging.c:258
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:535
-#: ../addressbook/gui/widgets/eab-contact-display.c:537
-#: ../addressbook/gui/widgets/eab-contact-display.c:780
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:860
#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
msgid "Email"
msgstr "电子邮件"
#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
+#: ../addressbook/gui/widgets/e-addressbook-view.c:165
#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
msgid "Any field contains"
msgstr "任何域含有"
#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
msgid "Email begins with"
msgstr "邮件以此开头"
#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
msgid "Name begins with"
msgstr "姓名以此开头"
@@ -2853,8 +2855,8 @@ msgid_plural "%d contacts"
msgstr[0] "%d 个联系人"
#: ../addressbook/gui/widgets/e-addressbook-model.c:305
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
#: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
#: ../addressbook/gui/widgets/e-minicard-view.c:515
msgid "Query"
@@ -2864,103 +2866,99 @@ msgstr "查询"
msgid "Error getting book view"
msgstr "获取名簿视图出错"
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:500
-#: ../widgets/table/e-table-selection-model.c:307
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:411
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
#: ../widgets/table/e-table.c:3335
-#: ../widgets/table/e-tree-selection-model.c:821
-#: ../widgets/text/e-entry.c:1202 ../widgets/text/e-entry.c:1203
-#: ../widgets/text/e-text.c:3545 ../widgets/text/e-text.c:3546
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3551
msgid "Model"
msgstr "模型"
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:104
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
msgid "Error modifying card"
msgstr "修改名片错误"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
msgid "Source"
msgstr "来源"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:246
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:501
#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
msgid "Type"
msgstr "类型"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:838
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2049
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
msgstr "另存为 VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
-#: ../calendar/gui/dialogs/comp-editor.c:1124
-#: ../calendar/gui/e-calendar-table.c:1353
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../calendar/gui/e-calendar-table.c:1363
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:922
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "打开(_O)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:961
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
-msgid "_Save as VCard..."
-msgstr "另存为 VCard(_S)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as vCard..."
+msgstr "另存为 vCard(_S)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
msgid "Send _Message to Contact"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
msgid "Send _Message to List"
msgstr "给列表发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
msgid "Send _Message to Contacts"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
msgid "_Print"
msgstr "打印(_P)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
msgid "Cop_y to Address Book..."
msgstr "复制到地址簿(_Y)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
msgid "Mo_ve to Address Book..."
msgstr "移至地址簿(_V)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
msgid "Cu_t"
msgstr "剪切(_T)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
-#: ../calendar/gui/calendar-component.c:603
-#: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:983
-#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
-#: ../composer/e-msg-composer.c:3221 ../mail/em-folder-tree.c:988
-#: ../mail/em-folder-view.c:1218 ../mail/message-list.c:1962
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:457
+#: ../calendar/gui/e-calendar-table.c:1371
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:930
+#: ../composer/e-msg-composer.c:3100 ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1331 ../mail/message-list.c:2065
#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
#: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
#: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -2968,25 +2966,25 @@ msgstr "剪切(_T)"
msgid "_Copy"
msgstr "复制(_C)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
msgid "P_aste"
msgstr "粘贴(_A)"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1636
-#: ../calendar/gui/cal-search-bar.c:618 ../calendar/gui/cal-search-bar.c:661
-#: ../calendar/gui/cal-search-bar.c:680
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
msgid "Any Category"
msgstr "任何类别"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
msgid "Other error"
msgstr "其它错误"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
msgid "Assistant"
msgstr "助手"
@@ -3024,7 +3022,7 @@ msgid "Categories"
msgstr "类别"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
msgid "Company"
msgstr "公司"
@@ -3073,22 +3071,22 @@ msgid "Journal"
msgstr "日记"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
msgid "Manager"
msgstr "经理"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
msgid "Mobile Phone"
msgstr "移动电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:545
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
msgid "Nickname"
msgstr "昵称"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:604
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
msgid "Note"
msgstr "注释"
@@ -3117,14 +3115,14 @@ msgid "Radio"
msgstr "收音机"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
msgid "Role"
msgstr "角色"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
msgid "Spouse"
msgstr "配偶"
@@ -3158,15 +3156,15 @@ msgstr "网站"
#: ../addressbook/gui/widgets/e-minicard.c:150
#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
-#: ../widgets/table/e-table-click-to-add.c:514
+#: ../widgets/table/e-table-click-to-add.c:524
#: ../widgets/table/e-table-col.c:99
-#: ../widgets/table/e-table-field-chooser-item.c:657
+#: ../widgets/table/e-table-field-chooser-item.c:655
#: ../widgets/table/e-table-group-container.c:966
#: ../widgets/table/e-table-group-container.c:967
#: ../widgets/table/e-table-group-leaf.c:628
#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/table/e-table-item.c:3078 ../widgets/table/e-table-item.c:3079
+#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
msgid "Width"
msgstr "宽度"
@@ -3174,14 +3172,14 @@ msgstr "宽度"
#: ../addressbook/gui/widgets/e-minicard.c:157
#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
-#: ../widgets/table/e-table-click-to-add.c:521
-#: ../widgets/table/e-table-field-chooser-item.c:664
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
#: ../widgets/table/e-table-group-container.c:959
#: ../widgets/table/e-table-group-container.c:960
#: ../widgets/table/e-table-group-leaf.c:621
#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
-#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
+#: ../widgets/table/e-table-item.c:3084 ../widgets/table/e-table-item.c:3085
+#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
msgid "Height"
msgstr "高度"
@@ -3282,16 +3280,16 @@ msgstr "已选择"
msgid "Has Cursor"
msgstr "有光标"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:633
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2603
+#: ../mail/em-folder-view.c:2808
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:634
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
@@ -3301,42 +3299,44 @@ msgid "Copy _Email Address"
msgstr "复制电子邮件地址(_E)"
#: ../addressbook/gui/widgets/eab-contact-display.c:296
-#: ../addressbook/gui/widgets/eab-contact-display.c:359
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
msgid "(map)"
msgstr "(地图)"
#: ../addressbook/gui/widgets/eab-contact-display.c:306
-#: ../addressbook/gui/widgets/eab-contact-display.c:372
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
msgid "map"
msgstr "地图"
-#: ../addressbook/gui/widgets/eab-contact-display.c:456
-#: ../addressbook/gui/widgets/eab-contact-display.c:758
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
msgid "List Members"
msgstr "列出成员"
-#: ../addressbook/gui/widgets/eab-contact-display.c:567
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
msgid "Department"
msgstr "部门"
-#: ../addressbook/gui/widgets/eab-contact-display.c:568
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
msgid "Profession"
msgstr "职业"
-#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
msgid "Position"
msgstr "位置"
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
msgid "Video Chat"
msgstr "视频聊天"
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/calendar-component.c:795
#: ../calendar/gui/dialogs/calendar-setup.c:370
-#: ../calendar/gui/gnome-cal.c:2354
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../calendar/gui/gnome-cal.c:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:575
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
@@ -3347,149 +3347,150 @@ msgstr "视频聊天"
msgid "Calendar"
msgstr "日历"
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
#: ../calendar/gui/dialogs/event-editor.c:369
#: ../ui/evolution-event-editor.xml.h:8
msgid "Free/Busy"
msgstr "忙/闲"
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
-#: ../addressbook/gui/widgets/eab-contact-display.c:590
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
msgid "Phone"
msgstr "电话"
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
msgid "Fax"
msgstr "传真"
-#: ../addressbook/gui/widgets/eab-contact-display.c:587
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
msgid "Home Page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
msgid "Web Log"
msgstr "Web 日志"
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
-#: ../calendar/gui/e-calendar-view.c:2323
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2327
msgid "Birthday"
msgstr "生日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:594
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2328
msgid "Anniversary"
msgstr "纪念日"
-#: ../addressbook/gui/widgets/eab-contact-display.c:776
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
msgid "Job Title"
msgstr "职称"
-#: ../addressbook/gui/widgets/eab-contact-display.c:807
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
msgid "Home page"
msgstr "主页"
-#: ../addressbook/gui/widgets/eab-contact-display.c:815
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
msgid "Blog"
msgstr "Blog"
#. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
msgid "Success"
msgstr "成功"
#. E_BOOK_ERROR_INVALID_ARG
#. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
msgid "Backend busy"
msgstr "后台忙"
#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
msgid "Repository offline"
msgstr "仓库脱机"
#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
msgid "Address Book does not exist"
msgstr "地址簿不存在"
#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:56
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
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:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
msgid "Permission denied"
msgstr "没有权限"
#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
msgid "Contact not found"
msgstr "找不到联系人"
#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
msgid "Contact ID already exists"
msgstr "联系人 ID 已经存在"
#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
msgid "Protocol not supported"
msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
#: ../calendar/gui/e-cal-component-preview.c:239
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:475 ../calendar/gui/print.c:2351
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:236
+#: ../calendar/gui/e-calendar-table.c:436 ../calendar/gui/print.c:2523
msgid "Canceled"
msgstr "已取消"
#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
msgid "Could not cancel"
msgstr "无法取消"
#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/comp-editor-factory.c:423
msgid "Authentication Failed"
msgstr "认证失败"
#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
msgid "Authentication Required"
msgstr "必须认证"
#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "TLS not Available"
msgstr "TLS 不可用"
#. E_BOOK_ERROR_CORBA_EXCEPTION
#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
msgid "No such source"
msgstr "没有来源"
#. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
msgid "Not available in offline mode"
msgstr "脱机模式下不可用"
#. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
msgid "Invalid server version"
msgstr "无效的服务器版本"
-#: ../addressbook/gui/widgets/eab-gui-util.c:95
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
msgid ""
"We were unable to open this addressbook. This either means this book is not "
"marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3498,7 +3499,7 @@ msgstr ""
"我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用,或者尚未下载完"
"成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
-#: ../addressbook/gui/widgets/eab-gui-util.c:104
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
#, c-format
msgid ""
"We were unable to open this addressbook. Please check that the path %s "
@@ -3506,7 +3507,7 @@ msgid ""
msgstr ""
"我们无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:113
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the LDAP server is unreachable."
@@ -3514,7 +3515,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为LDAP 服务器"
"已经关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:118
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
msgid ""
"This version of Evolution does not have LDAP support compiled in to it. If "
"you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3523,7 +3524,7 @@ msgstr ""
"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
"LDAP,就必须安装启用了 LDAP 的 Evolution 包。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:125
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
msgid ""
"We were unable to open this addressbook. This either means you have entered "
"an incorrect URI, or the server is unreachable."
@@ -3531,7 +3532,7 @@ msgstr ""
"我们无法打开此地址簿。这可能是由于您输入了错误的 URI,也可能是因为服务器已经"
"关闭。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
msgid ""
"More cards matched this query than either the server is \n"
"configured to return or Evolution is configured to display.\n"
@@ -3542,7 +3543,7 @@ msgstr ""
"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
"搜索条件,或者在此地址簿的目录服务器参数中将结果限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:154
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
msgid ""
"The time to execute this query exceeded the server limit or the limit\n"
"you have configured for this addressbook. Please make your search\n"
@@ -3553,45 +3554,45 @@ msgstr ""
"请在搜索的时候指定更加严格的搜索条件,或者在此地址簿的目录服务器参数\n"
"中将时间限制调高。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:160
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
msgid "The backend for this addressbook was unable to parse this query."
msgstr "此地址簿的后端无法解析此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:163
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
msgid "The backend for this addressbook refused to perform this query."
msgstr "此地址簿的后端拒绝执行此查询。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
msgid "This query did not complete successfully."
msgstr "此查询未成功完成。"
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
msgid "Error adding list"
msgstr "添加列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:713
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
msgid "Error adding contact"
msgstr "添加联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
msgid "Error modifying list"
msgstr "修改列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:199
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
msgid "Error modifying contact"
msgstr "修改联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
msgid "Error removing list"
msgstr "删除列表出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:663
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
msgid "Error removing contact"
msgstr "删除联系人出错"
-#: ../addressbook/gui/widgets/eab-gui-util.c:293
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
#, c-format
msgid ""
"Opening %d contact will open %d new window as well.\n"
@@ -3603,16 +3604,16 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:301
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
msgid "_Don't Display"
msgstr "不显示(_D)"
-#: ../addressbook/gui/widgets/eab-gui-util.c:302
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
msgid "Display _All Contacts"
msgstr "显示全部联系人(_A)"
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
#, c-format
msgid ""
"%s already exists\n"
@@ -3621,7 +3622,7 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:332
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
msgid "Overwrite"
msgstr "覆盖"
@@ -3635,49 +3636,50 @@ msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:467
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:608
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:774
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:779
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:781
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
-msgid "Multiple VCards"
-msgstr "多个 VCard"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "多个 vCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1010
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
#, c-format
-msgid "VCard for %s"
-msgstr "%s 的 VCard"
+msgid "vCard for %s"
+msgstr "%s 的 vCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1051
-#: ../addressbook/gui/widgets/eab-gui-util.c:1069
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#, c-format
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1071
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
@@ -3693,15 +3695,15 @@ msgid_plural "There are %d other contacts."
msgstr[0] "有另外 %d 个联系人。"
#: ../addressbook/gui/widgets/eab-vcard-control.c:228
-#: ../addressbook/gui/widgets/eab-vcard-control.c:281
-msgid "Show Full VCard"
-msgstr "显示完整 VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "显示完整 vCard"
#: ../addressbook/gui/widgets/eab-vcard-control.c:232
-msgid "Show Compact VCard"
-msgstr "显示紧凑 VCard"
+msgid "Show Compact vCard"
+msgstr "显示紧凑 vCard"
-#: ../addressbook/gui/widgets/eab-vcard-control.c:286
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
msgid "Save in addressbook"
msgstr "保存在地址簿中"
@@ -3710,7 +3712,7 @@ msgid "Card View"
msgstr "名片视图"
#: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-ldif-importer.c:499
#: ../addressbook/importers/evolution-vcard-importer.c:250
#: ../calendar/importers/icalendar-importer.c:312
#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
@@ -3741,21 +3743,21 @@ msgstr "Evolution CSV 或 Tab (.csv, .tab)"
msgid "Evolution CSV and Tab Importer"
msgstr "Evolution CSV 和 Tab 导入器"
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:666
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:667
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
#: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vfg, .gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vfg, .gcrd)"
#: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard 导入器"
+msgid "Evolution vCard Importer"
+msgstr "Evolution vCard 导入器"
#: ../addressbook/printing/e-contact-print.glade.h:1
msgid "10 pt. Tahoma"
@@ -3798,12 +3800,12 @@ msgid "Format"
msgstr "格式"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:493
+#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:650
+#: ../widgets/table/e-table-field-chooser-item.c:648
#: ../widgets/table/e-table-field-chooser.c:81
-#: ../widgets/table/e-table-header-item.c:1896
-#: ../widgets/table/e-table-selection-model.c:314
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:310
msgid "Header"
msgstr "页眉"
@@ -3905,7 +3907,7 @@ msgstr "阴影"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:964
+#: ../plugins/exchange-operations/exchange-account-setup.c:987
#: ../plugins/exchange-operations/exchange-calendar.c:231
#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
@@ -3941,7 +3943,7 @@ msgid "Contact Print Style Editor Test"
msgstr "联系人打印样式编辑器测试"
#: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:47
+#: ../addressbook/printing/test-print.c:44
msgid "Copyright (C) 2000, Ximian, Inc."
msgstr "版权 (C) 2000, Ximian, Inc."
@@ -3949,11 +3951,11 @@ msgstr "版权 (C) 2000, Ximian, Inc."
msgid "This should test the contact print style editor widget"
msgstr "这应该测试联系人打印样式编辑器部件"
-#: ../addressbook/printing/test-print.c:46
+#: ../addressbook/printing/test-print.c:43
msgid "Contact Print Test"
msgstr "联系人打印测试"
-#: ../addressbook/printing/test-print.c:49
+#: ../addressbook/printing/test-print.c:46
msgid "This should test the contact print code"
msgstr "这应该测试联系人打印代码"
@@ -4026,283 +4028,294 @@ msgstr "在普通模式中,不应该有大小选项。"
msgid "Unhandled error"
msgstr "未处理的错误"
-#: ../calendar/calendar.error.xml.h:1
+#. For Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:2
+#, fuzzy
+msgid ""
+"'{0}' is a read-only calendar source. Switch to Calendar View and highlight "
+"a calendar that can accept appointments."
+msgstr "您选择了只读日历源。请更改为日历视图,然后选择可接受约会的日历。"
+
+#: ../calendar/calendar.error.xml.h:3
msgid ""
"Adding a meaningful summary to your appointment will give your recipients an "
"idea of what your appointment is about."
msgstr "在您的约会中添加有意义的摘要可以让您的收件人更容易明白您约会的内容。"
-#: ../calendar/calendar.error.xml.h:2
+#: ../calendar/calendar.error.xml.h:4
msgid ""
"Adding a meaningful summary to your task will give your recipients an idea "
"of what your task is about."
msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
-#: ../calendar/calendar.error.xml.h:3
+#: ../calendar/calendar.error.xml.h:5
msgid "All information in these memos will be deleted and can not be restored."
msgstr "这些备忘的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:4
+#: ../calendar/calendar.error.xml.h:6
msgid "All information in this memo will be deleted and can not be restored."
msgstr "此备忘的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:5
+#: ../calendar/calendar.error.xml.h:7
msgid ""
"All information on these appointments will be deleted and can not be "
"restored."
msgstr "这些约会的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:6
+#: ../calendar/calendar.error.xml.h:8
msgid "All information on these tasks will be deleted and can not be restored."
msgstr "这些任务的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:7
+#: ../calendar/calendar.error.xml.h:9
msgid ""
"All information on this appointment will be deleted and can not be restored."
msgstr "此约会的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:10
msgid ""
"All information on this meeting will be deleted and can not be restored."
msgstr "此会议的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:9
+#: ../calendar/calendar.error.xml.h:11
msgid "All information on this memo will be deleted and can not be restored."
msgstr "此备忘的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:10
+#: ../calendar/calendar.error.xml.h:12
msgid "All information on this task will be deleted and can not be restored."
msgstr "此任务的全部信息将被删除,且无法恢复。"
-#: ../calendar/calendar.error.xml.h:11
+#: ../calendar/calendar.error.xml.h:13
msgid "Are you sure you want to delete the '{0}' task?"
msgstr "您确定要删除“{0}”任务吗?"
-#: ../calendar/calendar.error.xml.h:12
+#: ../calendar/calendar.error.xml.h:14
msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "您确信您要删除标题为“{0}”的约会吗?"
-#: ../calendar/calendar.error.xml.h:13
+#: ../calendar/calendar.error.xml.h:15
msgid "Are you sure you want to delete the memo '{0}'?"
msgstr "您确定要删除“{0}”备忘吗?"
-#: ../calendar/calendar.error.xml.h:14
+#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "您确定要删除这 {0} 个约会吗?"
-#: ../calendar/calendar.error.xml.h:15
+#: ../calendar/calendar.error.xml.h:17
msgid "Are you sure you want to delete these {0} memos?"
msgstr "您确定要删除这 {0} 个备忘吗?"
-#: ../calendar/calendar.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:18
msgid "Are you sure you want to delete these {0} tasks?"
msgstr "您确定要删除这 {0} 个任务吗?"
-#: ../calendar/calendar.error.xml.h:17
+#: ../calendar/calendar.error.xml.h:19
msgid "Are you sure you want to delete this appointment?"
msgstr "您确信您要删除该约会吗?"
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:20
#: ../calendar/gui/dialogs/delete-comp.c:183
+#, c-format
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗?"
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:21
#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
msgid "Are you sure you want to delete this memo?"
msgstr "您确信您要删除该备忘吗?"
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:22
#: ../calendar/gui/dialogs/delete-comp.c:186
+#, c-format
msgid "Are you sure you want to delete this task?"
msgstr "您确定要删除此任务吗?"
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:23
msgid "Are you sure you want to save the memo without a summary?"
msgstr "您确定想要保存没有摘要的备忘吗?"
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:24
msgid "Are you sure you want to send the appointment without a summary?"
msgstr "您确定想要发送没有摘要的约会吗?"
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:25
msgid "Are you sure you want to send the task without a summary?"
msgstr "您确定想要发送没有摘要的任务吗?"
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:26
msgid "Cannot create a new event"
msgstr "无法创建新事件"
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:27
msgid "Delete calendar '{0}'?"
msgstr "删除日历“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:28
msgid "Delete memo list '{0}'?"
msgstr "删除备忘列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:29
msgid "Delete task list '{0}'?"
msgstr "删除任务列表“{0}”吗?"
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:30
msgid "Do _not Send"
msgstr "不发送(_N)"
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:31
msgid "Download in progress. Do you want to save the appointment?"
msgstr "下载进行中。您想要保存约会吗?"
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:32
msgid "Download in progress. Do you want to save the task?"
msgstr "下载进行中。您想要保存任务吗?"
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:33
msgid "Editor could not be loaded."
msgstr "无法装入编辑器。"
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:34
msgid ""
"Email invitations will be sent to all participants and allow them to accept "
"this task."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们接受此任务。"
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:35
msgid ""
"Email invitations will be sent to all participants and allow them to reply."
msgstr "将会向全部出席者发送电子邮件邀请,并允许他们答复。"
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:36
msgid "Error loading calendar"
msgstr "装入日历时出错"
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:37
msgid "Error loading memo list"
msgstr "装入备忘列表出错"
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:38
msgid "Error loading task list"
msgstr "装入任务列表出错"
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:39
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:38
+#: ../calendar/calendar.error.xml.h:40
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:39
+#: ../calendar/calendar.error.xml.h:41
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:40
+#: ../calendar/calendar.error.xml.h:42
msgid ""
"Sending updated information allows other participants to keep their "
"calendars up to date."
msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:43
msgid ""
"Sending updated information allows other participants to keep their task "
"lists up to date."
msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:44
msgid ""
"Some attachments are being downloaded. Saving the appointment would result "
"in the loss of these attachments."
msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
msgid ""
"Some attachments are being downloaded. Saving the task would result in the "
"loss of these attachments."
msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:46
msgid "Some features may not work properly with your current server."
msgstr "某些特性可能无法在您目前的服务器下工作。"
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:47
msgid "The Evolution calendar has quit unexpectedly."
msgstr "Evolution 日历异常退出。"
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:48
msgid "The Evolution memo has quit unexpectedly."
msgstr "Evolution 备忘异常退出。"
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:49
msgid "The Evolution tasks have quit unexpectedly."
msgstr "Evolution 任务异常退出。"
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:50
msgid "The calendar is not marked for offline usage."
msgstr "日历未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:51
msgid "The memo list is not marked for offline usage"
msgstr "备忘列表未标为脱机使用"
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:52
msgid "The task list is not marked for offline usage."
msgstr "任务列表未标为脱机使用。"
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
msgid "This calendar will be removed permanently."
msgstr "此日历将被永久删除。"
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
msgid "This memo list will be removed permanently."
msgstr "此备忘列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
msgid "This task list will be removed permanently."
msgstr "此任务列表将被永久删除。"
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
msgid "Would you like to save your changes to this appointment?"
msgstr "您想要保存对约会的更改吗?"
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
msgid "Would you like to save your changes to this memo?"
msgstr "您想要保存对此备忘的更改吗?"
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
msgid "Would you like to send a cancelation notice for this memo?"
msgstr "您是否想要为此备忘发送取消通知?"
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:60
msgid "Would you like to send all the participants a cancelation notice?"
msgstr "您是否想要给全部出席者发送取消通知?"
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
msgid "Would you like to send meeting invitations to participants?"
msgstr "您是否想要给出席者发送会议邀请?"
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
msgid "Would you like to send this task to participants?"
msgstr "您是否想要将此任务发送给出席者?"
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
msgid "Would you like to send updated meeting information to participants?"
msgstr "您是否想要给出席者发送更新的会议信息?"
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:64
msgid "Would you like to send updated task information to participants?"
msgstr "您是否想要给出席者发送更新的任务信息?"
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:65
msgid ""
"You are connecting to an unsupported GroupWise server and may encounter "
"problems using Evolution. For best results, the server should be upgraded to "
@@ -4311,117 +4324,107 @@ msgstr ""
"您正在连接到不支持的 GroupWise 服务器,此时使用 Evolution 可能遇到问题。为了"
"得到最佳效果,服务器应该升级到支持的版本。"
-#: ../calendar/calendar.error.xml.h:64
-msgid ""
-"You have a read-only calendar source selected. Change to Calendar View and "
-"highlight a calendar that can accept appointments."
-msgstr "您选择了只读日历源。请更改为日历视图,然后选择可接受约会的日历。"
-
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
msgid "You have changed this appointment, but not yet saved it."
msgstr "您已经更改了此约会,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
msgid "You have changed this task, but not yet saved it."
msgstr "您已经对此任务做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
msgid "You have made changes to this memo, but not yet saved them."
msgstr "您已经对此备忘做出了更改,但尚未保存。"
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
msgid "Your calendars will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的日历无法使用。"
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
msgid "Your memos will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的备忘将无法使用。"
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
msgid "Your tasks will not be available until Evolution is restarted."
msgstr "除非您重新启动 Evolution,否则您的任务将无法使用。"
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:72
#: ../composer/mail-composer.error.xml.h:29
msgid "_Discard Changes"
msgstr "丢弃更改(_D)"
-#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:73 ../ui/evolution-editor.xml.h:23
#: ../ui/evolution-message-composer.xml.h:59
msgid "_Save"
msgstr "保存(_S)"
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:74
msgid "_Save Changes"
msgstr "保存更改(_S)"
-#: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
+#: ../calendar/calendar.error.xml.h:75
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "发送(_S)"
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
msgid "_Send Notice"
msgstr "发送通知(_S)"
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:77
msgid "{0}."
msgstr "{0}。"
-#: ../calendar/common/authentication.c:50 ../smime/gui/component.c:50
-msgid "Enter password"
-msgstr "输入密码"
-
-#: ../calendar/conduits/calendar/calendar-conduit.c:253
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
msgid "Split Multi-Day Events:"
msgstr "分割多日事件:"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1504
-#: ../calendar/conduits/calendar/calendar-conduit.c:1505
-#: ../calendar/conduits/memo/memo-conduit.c:930
-#: ../calendar/conduits/memo/memo-conduit.c:931
-#: ../calendar/conduits/todo/todo-conduit.c:1106
-#: ../calendar/conduits/todo/todo-conduit.c:1107
+#: ../calendar/conduits/calendar/calendar-conduit.c:1517
+#: ../calendar/conduits/calendar/calendar-conduit.c:1518
+#: ../calendar/conduits/memo/memo-conduit.c:818
+#: ../calendar/conduits/memo/memo-conduit.c:819
+#: ../calendar/conduits/todo/todo-conduit.c:1016
+#: ../calendar/conduits/todo/todo-conduit.c:1017
msgid "Could not start evolution-data-server"
msgstr "无法启动 evolution-data-server"
-#: ../calendar/conduits/calendar/calendar-conduit.c:1612
-#: ../calendar/conduits/calendar/calendar-conduit.c:1615
+#: ../calendar/conduits/calendar/calendar-conduit.c:1625
+#: ../calendar/conduits/calendar/calendar-conduit.c:1628
msgid "Could not read pilot's Calendar application block"
msgstr "无法读入 Pilot 日历应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:1024
-#: ../calendar/conduits/memo/memo-conduit.c:1027
+#: ../calendar/conduits/memo/memo-conduit.c:912
+#: ../calendar/conduits/memo/memo-conduit.c:915
msgid "Could not read pilot's Memo application block"
msgstr "无法读入 Pilot 的备忘应用程序块"
-#: ../calendar/conduits/memo/memo-conduit.c:1071
-#: ../calendar/conduits/memo/memo-conduit.c:1074
+#: ../calendar/conduits/memo/memo-conduit.c:959
+#: ../calendar/conduits/memo/memo-conduit.c:962
msgid "Could not write pilot's Memo application block"
msgstr "无法写入 Pilot 备忘应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:237
+#: ../calendar/conduits/todo/todo-conduit.c:238
msgid "Default Priority:"
msgstr "默认优先级:"
-#: ../calendar/conduits/todo/todo-conduit.c:1190
-#: ../calendar/conduits/todo/todo-conduit.c:1193
+#: ../calendar/conduits/todo/todo-conduit.c:1100
+#: ../calendar/conduits/todo/todo-conduit.c:1103
msgid "Could not read pilot's ToDo application block"
msgstr "无法读入 Pilot ToDo 应用程序块"
-#: ../calendar/conduits/todo/todo-conduit.c:1235
-#: ../calendar/conduits/todo/todo-conduit.c:1238
+#: ../calendar/conduits/todo/todo-conduit.c:1145
+#: ../calendar/conduits/todo/todo-conduit.c:1148
msgid "Could not write pilot's ToDo application block"
msgstr "无法写入 Pilot ToDo 应用程序块"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2229
+#: ../plugins/itip-formatter/itip-formatter.c:2334
msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1385
+#: ../calendar/gui/calendar-component.c:1392
msgid "Calendars"
msgstr "日历"
@@ -4462,22 +4465,22 @@ msgid "Memo_s"
msgstr "备忘(_S)"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:335 ../calendar/gui/e-memos.c:1093
-#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:544
-#: ../calendar/gui/memos-component.c:1031 ../calendar/gui/memos-control.c:336
-#: ../calendar/gui/memos-control.c:352
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
+#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:538 ../calendar/gui/e-tasks.c:1357
-#: ../calendar/gui/gnome-cal.c:1541 ../calendar/gui/print.c:1809
-#: ../calendar/gui/tasks-component.c:535
-#: ../calendar/gui/tasks-component.c:1026 ../calendar/gui/tasks-control.c:478
-#: ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/e-calendar-table.c:495 ../calendar/gui/e-tasks.c:1441
+#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
#: ../calendar/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:587
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
@@ -4498,17 +4501,18 @@ msgstr "任务(_T)"
msgid "Evolution Calendar alarm notification service"
msgstr "Evolution 日历提醒通知服务"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
msgid "minute"
msgid_plural "minutes"
msgstr[0] "分钟"
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
#: ../plugins/calendar-http/calendar-http.c:289
#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:396
msgid "hours"
msgid_plural "hours"
msgstr[0] "小时"
@@ -4524,10 +4528,10 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1615
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1621
-#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:998
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/e-itip-control.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1004
msgid "Location:"
msgstr "位置:"
@@ -4537,7 +4541,7 @@ msgstr "午睡时间(_T):"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:165
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
#: ../plugins/publish-calendar/publish-calendar.glade.h:21
#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
@@ -4546,7 +4550,7 @@ msgstr "午睡时间(_T):"
#: ../ui/evolution-message-composer.xml.h:52
#: ../ui/evolution-signature-editor.xml.h:24
#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4558,31 +4562,32 @@ msgstr "午睡(_S)"
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1533
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1523
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4594,7 +4599,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4610,7 +4615,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -4876,12 +4881,12 @@ msgid "Show status field in the event/task/meeting editor"
msgstr "在事件/任务/会议编辑器中显示状态域"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
@@ -5078,36 +5083,36 @@ msgstr "注释含有"
msgid "Location contains"
msgstr "位置含有"
-#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
-#: ../calendar/gui/cal-search-bar.c:684
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
msgid "Unmatched"
msgstr "无匹配"
-#: ../calendar/gui/cal-search-bar.c:630
+#: ../calendar/gui/cal-search-bar.c:631
msgid "Next 7 Days' Tasks"
msgstr "下一周的任务"
-#: ../calendar/gui/cal-search-bar.c:634
+#: ../calendar/gui/cal-search-bar.c:635
msgid "Active Tasks"
msgstr "活动任务"
-#: ../calendar/gui/cal-search-bar.c:638
+#: ../calendar/gui/cal-search-bar.c:639
msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../calendar/gui/cal-search-bar.c:642
+#: ../calendar/gui/cal-search-bar.c:643
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../calendar/gui/cal-search-bar.c:646
+#: ../calendar/gui/cal-search-bar.c:647
msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../calendar/gui/cal-search-bar.c:692
+#: ../calendar/gui/cal-search-bar.c:693
msgid "Active Appointments"
msgstr "活动约会"
-#: ../calendar/gui/cal-search-bar.c:696
+#: ../calendar/gui/cal-search-bar.c:697
msgid "Next 7 Days' Appointments"
msgstr "下一周的约会"
@@ -5133,6 +5138,7 @@ msgstr "销毁较早的事件"
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
#: ../plugins/calendar-http/calendar-http.c:290
#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:397
#: ../widgets/misc/e-send-options.glade.h:38
msgid "days"
msgstr "天"
@@ -5142,88 +5148,102 @@ msgstr "天"
#. Create the Webcal source group
#. Create the LDAP source group
#: ../calendar/gui/calendar-component.c:273
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
-#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:512
+#: ../calendar/gui/migration.c:610 ../calendar/gui/migration.c:1123
#: ../calendar/gui/tasks-component.c:231
msgid "On The Web"
msgstr "网上"
-#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:406
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:305
+#: ../calendar/gui/calendar-component.c:308
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:602
+#: ../calendar/gui/calendar-component.c:605
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:932
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2102
+msgid "_Copy..."
+msgstr "复制(_C)..."
+
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1130
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3631 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "属性(_P)"
+
+#: ../calendar/gui/calendar-component.c:939
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1231
+#: ../calendar/gui/calendar-component.c:1238
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1247
+#: ../calendar/gui/calendar-component.c:1254
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1360
+#: ../calendar/gui/calendar-component.c:1367
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1578
+#: ../calendar/gui/calendar-component.c:1585
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1579
+#: ../calendar/gui/calendar-component.c:1586
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1580
+#: ../calendar/gui/calendar-component.c:1587
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1586
+#: ../calendar/gui/calendar-component.c:1593
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1587
+#: ../calendar/gui/calendar-component.c:1594
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1588
+#: ../calendar/gui/calendar-component.c:1595
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1594
+#: ../calendar/gui/calendar-component.c:1601
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1595
+#: ../calendar/gui/calendar-component.c:1602
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1596
+#: ../calendar/gui/calendar-component.c:1603
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1602
+#: ../calendar/gui/calendar-component.c:1609
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1603
+#: ../calendar/gui/calendar-component.c:1610
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1604
+#: ../calendar/gui/calendar-component.c:1611
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5253,19 +5273,19 @@ msgstr "描述含有"
msgid "Summary Contains"
msgstr "概要含有"
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/comp-editor-factory.c:405
msgid "Error while opening the calendar"
msgstr "打开日历时出错"
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:411
msgid "Method not supported when opening the calendar"
msgstr "打开日历的方法不支持"
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:417
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1282
+#: ../calendar/gui/comp-editor-factory.c:429 ../shell/e-shell.c:1290
msgid "Unknown error"
msgstr "未知的错误"
@@ -5395,14 +5415,12 @@ msgstr "添加(_D)"
msgid "Alarms"
msgstr "提醒"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
msgid "_Suggest automatic display of attachment"
msgstr "建议自动显示附件(_S)"
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
msgid "Attach file(s)"
msgstr "添加附件"
@@ -5431,7 +5449,7 @@ msgid ""
msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">警告</span>"
@@ -5470,8 +5488,8 @@ msgid "Display"
msgstr "显示"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/e-itip-control.c:740
msgid "Friday"
msgstr "星期五"
@@ -5486,8 +5504,8 @@ msgstr ""
"天"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
+#: ../calendar/gui/e-itip-control.c:736
msgid "Monday"
msgstr "星期一"
@@ -5510,7 +5528,7 @@ msgstr ""
"星期日"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
msgid "Pick a color"
msgstr "选取一种颜色"
@@ -5520,8 +5538,8 @@ msgid "S_un"
msgstr "周日(_U)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
+#: ../calendar/gui/e-itip-control.c:741
msgid "Saturday"
msgstr "星期六"
@@ -5538,8 +5556,8 @@ msgid "Show week _numbers in date navigator"
msgstr "在日期浏览器中显示周数(_N)"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
+#: ../calendar/gui/e-itip-control.c:735
msgid "Sunday"
msgstr "星期日"
@@ -5557,8 +5575,8 @@ msgid "Template:"
msgstr "模板:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/e-itip-control.c:739
msgid "Thursday"
msgstr "星期四"
@@ -5572,14 +5590,14 @@ msgid "Time format:"
msgstr "时间格式:"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/e-itip-control.c:737
msgid "Tuesday"
msgstr "星期二"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/e-itip-control.c:738
msgid "Wednesday"
msgstr "星期三"
@@ -5746,151 +5764,147 @@ msgstr "%s 您还没有进行修改,更新编辑器吗?"
msgid "Validation error: %s"
msgstr "校验错误:%s"
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2179
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2340
msgid " to "
msgstr " 到 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2183
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2344
msgid " (Completed "
msgstr " (完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2185
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2346
msgid "Completed "
msgstr "已完成 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2190
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2351
msgid " (Due "
msgstr " (预定 "
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2192
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2353
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2968
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
#: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2973
-#: ../composer/e-msg-composer.c:3158
+#: ../calendar/gui/dialogs/comp-editor.c:387 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3037
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3222
-#: ../mail/em-folder-tree.c:989 ../mail/em-folder-utils.c:369
-#: ../mail/em-folder-view.c:1114 ../mail/message-list.c:1963
+#: ../calendar/gui/dialogs/comp-editor.c:458 ../composer/e-msg-composer.c:3101
+#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1192 ../mail/message-list.c:2066
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3224
-#: ../mail/em-folder-tree.c:991 ../mail/message-list.c:1965
+#: ../calendar/gui/dialogs/comp-editor.c:460 ../composer/e-msg-composer.c:3103
+#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2068
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:824
+#: ../calendar/gui/dialogs/comp-editor.c:663
+#: ../calendar/gui/dialogs/comp-editor.c:2821 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:825
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2585
+#: ../calendar/gui/dialogs/comp-editor.c:975 ../composer/e-msg-composer.c:2487
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1003
+#: ../calendar/gui/dialogs/comp-editor.c:1007
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1006
-#: ../calendar/gui/dialogs/comp-editor.c:1542
+#: ../calendar/gui/dialogs/comp-editor.c:1010
+#: ../calendar/gui/dialogs/comp-editor.c:1558
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../calendar/gui/dialogs/event-page.c:1976
-#: ../calendar/gui/dialogs/task-page.c:1252 ../composer/e-msg-composer.c:3739
+#: ../calendar/gui/dialogs/comp-editor.c:1129
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3630
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
msgid "_Remove"
msgstr "删除(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1126
-#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1128
-#: ../composer/e-msg-composer.c:3742
+#: ../calendar/gui/dialogs/comp-editor.c:1132
+#: ../composer/e-msg-composer.c:3633
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1566
-#: ../mail/em-format-html-display.c:2320
+#: ../calendar/gui/dialogs/comp-editor.c:1582
+#: ../mail/em-format-html-display.c:2374
msgid "Show Attachments"
msgstr "显示附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1567
+#: ../calendar/gui/dialogs/comp-editor.c:1583
msgid "Press space key to toggle attachment bar"
msgstr "按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2173
-#: ../calendar/gui/dialogs/comp-editor.c:2216
+#: ../calendar/gui/dialogs/comp-editor.c:2189
+#: ../calendar/gui/dialogs/comp-editor.c:2232
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2181
-#: ../calendar/gui/dialogs/comp-editor.c:2224
+#: ../calendar/gui/dialogs/comp-editor.c:2197
+#: ../calendar/gui/dialogs/comp-editor.c:2240
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2185
-#: ../calendar/gui/dialogs/comp-editor.c:2228
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
#, c-format
msgid "Assigned Task - %s"
msgstr "分配的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2187
-#: ../calendar/gui/dialogs/comp-editor.c:2230
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:2206
+#: ../calendar/gui/dialogs/comp-editor.c:2249
#, c-format
msgid "Memo - %s"
msgstr "备忘 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2201
-#: ../calendar/gui/dialogs/comp-editor.c:2243
+#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2259
msgid "No summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:2791 ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:361
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2880
-#: ../calendar/gui/dialogs/comp-editor.c:2934
-#: ../calendar/gui/dialogs/comp-editor.c:2958
+#: ../calendar/gui/dialogs/comp-editor.c:2910
+#: ../calendar/gui/dialogs/comp-editor.c:2964
+#: ../calendar/gui/dialogs/comp-editor.c:2988
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2987
+#: ../calendar/gui/dialogs/comp-editor.c:3017
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -5971,133 +5985,132 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:601
+#: ../calendar/gui/dialogs/event-editor.c:602
msgid "Appoint_ment"
msgstr "约会(_M)"
-#: ../calendar/gui/dialogs/event-editor.c:605
+#: ../calendar/gui/dialogs/event-editor.c:606
#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "再现"
-#: ../calendar/gui/dialogs/event-page.c:835
-#: ../calendar/gui/dialogs/event-page.c:2852
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:915
+#: ../calendar/gui/dialogs/event-page.c:906
#: ../calendar/gui/dialogs/event-page.glade.h:11
#: ../calendar/gui/dialogs/meeting-page.glade.h:5
#: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:456
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:953
+#: ../calendar/gui/dialogs/event-page.c:944
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:955
+#: ../calendar/gui/dialogs/event-page.c:946
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1138
+#: ../calendar/gui/dialogs/event-page.c:1128
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1141
+#: ../calendar/gui/dialogs/event-page.c:1131
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1312
-#: ../calendar/gui/dialogs/memo-page.c:693
-#: ../calendar/gui/dialogs/task-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1322
+#: ../calendar/gui/dialogs/event-page.c:1313
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1345
+#: ../calendar/gui/dialogs/event-page.c:1336
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1352
+#: ../calendar/gui/dialogs/event-page.c:1343
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1514
-#: ../calendar/gui/dialogs/memo-page.c:735
-#: ../calendar/gui/dialogs/task-page.c:940
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1520
-#: ../calendar/gui/dialogs/memo-page.c:741
-#: ../calendar/gui/dialogs/task-page.c:946
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1545
-#: ../calendar/gui/dialogs/task-page.c:970
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1977
-#: ../calendar/gui/dialogs/task-page.c:1253
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2723
+#: ../calendar/gui/dialogs/event-page.c:2711
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2772
-#: ../calendar/gui/dialogs/memo-page.c:1140
-#: ../calendar/gui/dialogs/task-page.c:1948
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
#, c-format
msgid "You are acting on behalf of %s"
msgstr "您正在以 %s 的身份行动"
-#: ../calendar/gui/dialogs/event-page.c:3068
+#: ../calendar/gui/dialogs/event-page.c:3053
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:3074
+#: ../calendar/gui/dialogs/event-page.c:3059
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:3080
+#: ../calendar/gui/dialogs/event-page.c:3065
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:3093
+#: ../calendar/gui/dialogs/event-page.c:3078
msgid "Customize"
msgstr "自定义"
#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:3098
+#: ../calendar/gui/dialogs/event-page.c:3083
#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2369
-#: ../filter/filter-rule.c:891 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
-#: ../mail/em-junk-hook.c:83
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
-#: ../plugins/exchange-operations/exchange-delegates-user.c:200
+#: ../plugins/exchange-operations/exchange-delegates-user.c:205
#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1920
-#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1504
-#: ../widgets/misc/e-dateedit.c:1718
+#: ../plugins/itip-formatter/itip-formatter.c:2011
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
msgid "None"
msgstr "无"
@@ -6117,11 +6130,6 @@ msgstr "约会的 15 分钟前"
msgid "Attendee_s..."
msgstr "出席者(_S)..."
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "类别(_T)..."
-
#: ../calendar/gui/dialogs/event-page.glade.h:8
msgid "Custom Alarm:"
msgstr "自定义提醒:"
@@ -6183,20 +6191,19 @@ msgstr "组织者"
msgid "Organizer:"
msgstr "组织者:"
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2287
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2448
msgid "Memo"
msgstr "备忘"
-#: ../calendar/gui/dialogs/memo-page.c:913
+#: ../calendar/gui/dialogs/memo-page.c:952
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "无法打开“%s”中的备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1078 ../mail/em-format-html.c:1520
-#: ../mail/em-format-html.c:1534 ../mail/em-format-html.c:1592
-#: ../mail/em-format-html.c:1618 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:856 ../mail/em-mailer-prefs.c:89
-#: ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1545
+#: ../mail/em-format-html.c:1603 ../mail/em-format-html.c:1629
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
msgid "To"
msgstr "收件人"
@@ -6214,24 +6221,28 @@ msgid "_Description:"
msgstr "描述(_D):"
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:449
+#: ../calendar/gui/dialogs/task-page.c:451
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "组(_G):"
#: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
msgid "You are modifying a recurring event. What would you like to modify?"
msgstr "您即将修改再现事件。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
msgid "You are delegating a recurring event. What would you like to delegate?"
msgstr "您即将代理再现事件。您想要代理何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:58
+#, c-format
msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "您即将修改再现任务。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:62
+#, c-format
msgid "You are modifying a recurring memo. What would you like to modify?"
msgstr "您即将修改再现备忘。您想要修改何内容?"
@@ -6251,17 +6262,17 @@ msgstr "本次和以后各次"
msgid "All Instances"
msgstr "所有各次"
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
msgid "This appointment contains recurrences that Evolution cannot edit."
msgstr "此约会含有 Evolution 无法编辑的再现。"
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
msgid "Recurrence date is invalid"
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:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
msgid "on"
msgstr "在"
@@ -6269,7 +6280,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:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
msgid "first"
msgstr "第一个"
@@ -6278,7 +6289,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:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
msgid "second"
msgstr "第二"
@@ -6286,7 +6297,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:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
msgid "third"
msgstr "第三个"
@@ -6294,7 +6305,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:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
msgid "fourth"
msgstr "第四个"
@@ -6302,13 +6313,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:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
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:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
msgid "Other Date"
msgstr "其它日期"
@@ -6316,7 +6327,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:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
msgid "1st to 10th"
msgstr "上旬"
@@ -6324,7 +6335,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:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
msgid "11th to 20th"
msgstr "中旬"
@@ -6332,45 +6343,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:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
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:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
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:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
msgid "on the"
msgstr "在"
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
msgid "occurrences"
msgstr "循环"
-#: ../calendar/gui/dialogs/recurrence-page.c:2157
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
msgid "Add exception"
msgstr "添加例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2200
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
msgid "Could not get a selection to modify."
msgstr "无法获得要修改的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2206
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
msgid "Modify exception"
msgstr "修改例外"
-#: ../calendar/gui/dialogs/recurrence-page.c:2252
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
msgid "Could not get a selection to delete."
msgstr "无法获得要删除的选中项。"
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
msgid "Date/Time"
msgstr "日期/时间"
@@ -6379,7 +6390,7 @@ msgid "<b>Exceptions</b>"
msgstr "<b>例外</b>"
#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
msgid "<b>Preview</b>"
msgstr "<b>预览</b>"
@@ -6442,47 +6453,50 @@ msgstr "<span weight=\"bold\">状态</span>"
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
#: ../calendar/gui/e-cal-component-preview.c:236
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:474 ../calendar/gui/e-itip-control.c:923
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2348 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:234
+#: ../calendar/gui/e-calendar-table.c:435 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2520 ../plugins/save-calendar/csv-format.c:386
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
#: ../calendar/gui/e-cal-component-preview.c:255
-#: ../calendar/gui/e-calendar-table.c:399 ../mail/message-list.c:1034
+#: ../calendar/gui/e-calendar-table.c:360 ../mail/message-list.c:1065
msgid "High"
msgstr "高"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
#: ../calendar/gui/e-cal-component-preview.c:233
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:473 ../calendar/gui/print.c:2345
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:750
+#: ../calendar/gui/e-calendar-table.c:232
+#: ../calendar/gui/e-calendar-table.c:434 ../calendar/gui/print.c:2517
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
#: ../calendar/gui/e-cal-component-preview.c:259
-#: ../calendar/gui/e-calendar-table.c:401 ../mail/message-list.c:1032
+#: ../calendar/gui/e-calendar-table.c:362 ../mail/message-list.c:1063
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
#: ../calendar/gui/e-cal-component-preview.c:257
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:400
-#: ../mail/message-list.c:1033
+#: ../calendar/gui/e-cal-model.c:966 ../calendar/gui/e-calendar-table.c:361
+#: ../mail/message-list.c:1064
msgid "Normal"
msgstr "中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
#: ../calendar/gui/e-cal-component-preview.c:243
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:472 ../calendar/gui/print.c:2342
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:230
+#: ../calendar/gui/e-calendar-table.c:433 ../calendar/gui/print.c:2514
msgid "Not Started"
msgstr "尚未开始"
@@ -6495,7 +6509,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:402
+#: ../calendar/gui/e-calendar-table.c:363
msgid "Undefined"
msgstr "未定义"
@@ -6512,20 +6526,25 @@ msgstr "优先级(_P):"
msgid "_Web Page:"
msgstr "网页(_W):"
-#: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1322
msgid "_Task"
msgstr "任务(_T)"
-#: ../calendar/gui/dialogs/task-editor.c:428
+#: ../calendar/gui/dialogs/task-editor.c:430
msgid "Task Details"
msgstr "任务细节"
-#: ../calendar/gui/dialogs/task-page.c:851
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "组织者(_Z):"
+
+#: ../calendar/gui/dialogs/task-page.c:866
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1719
+#: ../calendar/gui/dialogs/task-page.c:1885
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -6542,10 +6561,6 @@ msgstr "类别(_I)..."
msgid "De_scription:"
msgstr "描述(_S):"
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "组织者(_G):"
-
#: ../calendar/gui/dialogs/task-page.glade.h:7
msgid "Time zone:"
msgstr "时区:"
@@ -6629,7 +6644,7 @@ msgid "%s for an unknown trigger type"
msgstr "%s 为未知触发类型"
#: ../calendar/gui/e-cal-component-memo-preview.c:74
-#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3001
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3328
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -6648,8 +6663,8 @@ msgstr "开始日期:"
#: ../calendar/gui/e-cal-component-memo-preview.c:225
#: ../calendar/gui/e-cal-component-preview.c:274
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:68
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "描述:"
@@ -6660,7 +6675,7 @@ msgid "Web Page:"
msgstr "网页:"
#: ../calendar/gui/e-cal-component-preview.c:193
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-itip-control.c:1145
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "概要:"
@@ -6672,9 +6687,9 @@ msgstr "到期日期:"
#. write status
#. Status
#: ../calendar/gui/e-cal-component-preview.c:229
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.c:1169
#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:1023
+#: ../plugins/itip-formatter/itip-view.c:1029
msgid "Status:"
msgstr "状态:"
@@ -6682,18 +6697,18 @@ msgstr "状态:"
msgid "Priority:"
msgstr "优先级:"
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:377
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:318
+#: ../calendar/gui/e-cal-model.c:325 ../calendar/gui/e-calendar-table.c:338
msgid "Public"
msgstr "公开"
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:378
+#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:327
+#: ../calendar/gui/e-calendar-table.c:339
msgid "Private"
msgstr "保密"
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:379
+#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:329
+#: ../calendar/gui/e-calendar-table.c:340
msgid "Confidential"
msgstr "机密"
@@ -6702,29 +6717,29 @@ msgid "End Date"
msgstr "结束日期"
#: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
msgid "Start Date"
msgstr "开始日期"
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:382
msgid "Summary"
msgstr "概要"
#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:451
+#: ../calendar/gui/e-calendar-table.c:412
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:452
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:413
msgid "Busy"
msgstr "繁忙"
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
msgid ""
"The geographical position must be entered in the format: \n"
"\n"
@@ -6734,66 +6749,67 @@ msgstr ""
"\n"
"45.436845,125.862501"
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
#: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
msgid "Yes"
msgstr "是"
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1025 ../calendar/gui/e-cal-model.c:972
#: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
#: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
msgid "No"
msgstr "否"
#. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-model.c:331 ../calendar/gui/e-cal-popup.c:107
#: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
#: ../calendar/gui/e-meeting-list-view.c:169
#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1210
-#: ../plugins/itip-formatter/itip-formatter.c:394
-#: ../plugins/itip-formatter/itip-formatter.c:1945
-#: ../plugins/plugin-manager/plugin-manager.c:82
-#: ../widgets/misc/e-attachment-bar.c:724
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:405
+#: ../plugins/itip-formatter/itip-formatter.c:2036
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
#: ../widgets/misc/e-charset-picker.c:64
msgid "Unknown"
msgstr "未知"
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:968
msgid "Recurring"
msgstr "重复"
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:970
msgid "Assigned"
msgstr "已分配"
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:422
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:450
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1355
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:977
-#: ../mail/em-folder-view.c:1229 ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1365
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:924
+#: ../mail/em-folder-view.c:1342 ../mail/em-popup.c:571 ../mail/em-popup.c:582
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:568
-#: ../mail/em-popup.c:579
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
msgid "Set as _Background"
msgstr "设为背景(_B)"
@@ -6801,137 +6817,131 @@ msgstr "设为背景(_B)"
msgid "_Save Selected"
msgstr "保存选中(_S)"
-#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:789
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:790
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:421
+#: ../calendar/gui/e-calendar-table.c:382
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:422
+#: ../calendar/gui/e-calendar-table.c:383
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:423
+#: ../calendar/gui/e-calendar-table.c:384
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:424
+#: ../calendar/gui/e-calendar-table.c:385
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:425
+#: ../calendar/gui/e-calendar-table.c:386
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:426
+#: ../calendar/gui/e-calendar-table.c:387
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:427
+#: ../calendar/gui/e-calendar-table.c:388
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:428
+#: ../calendar/gui/e-calendar-table.c:389
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:429
+#: ../calendar/gui/e-calendar-table.c:390
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:430
+#: ../calendar/gui/e-calendar-table.c:391
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:431
+#: ../calendar/gui/e-calendar-table.c:392
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:716
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:494
+#: ../calendar/gui/e-calendar-table.c:670
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:995
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:697
+#: ../calendar/gui/e-calendar-table.c:952
+#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-table.c:1179
-#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:872
-#: ../composer/e-msg-composer.c:1405
+#: ../calendar/gui/e-calendar-table.c:1137
+#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:819
+#: ../composer/e-msg-composer.c:1472
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1350
-#: ../calendar/gui/e-calendar-view.c:1662
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1660
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../calendar/gui/e-calendar-table.c:1354 ../calendar/gui/e-memo-table.c:976
+#: ../calendar/gui/e-calendar-table.c:1364 ../calendar/gui/e-memo-table.c:923
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1356
-#: ../calendar/gui/e-calendar-view.c:1665
-#: ../calendar/gui/e-calendar-view.c:1681 ../calendar/gui/e-memo-table.c:978
-#: ../mail/em-folder-view.c:1230
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "打印(_P)..."
+#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:925
+msgid "P_rint..."
+msgstr "打印(_R)..."
-#: ../calendar/gui/e-calendar-table.c:1360
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:982
+#: ../calendar/gui/e-calendar-table.c:1370
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:929
#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
msgid "C_ut"
msgstr "剪切(_U)"
-#: ../calendar/gui/e-calendar-table.c:1362
-#: ../calendar/gui/e-calendar-view.c:1668
-#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:984
+#: ../calendar/gui/e-calendar-table.c:1372
+#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:931
#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
msgid "_Paste"
msgstr "粘贴(_P)"
-#: ../calendar/gui/e-calendar-table.c:1366 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1376 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1367 ../calendar/gui/e-memo-table.c:988
+#: ../calendar/gui/e-calendar-table.c:1377 ../calendar/gui/e-memo-table.c:935
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1368
+#: ../calendar/gui/e-calendar-table.c:1378
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1369
+#: ../calendar/gui/e-calendar-table.c:1379
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1370
+#: ../calendar/gui/e-calendar-table.c:1380
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1371
+#: ../calendar/gui/e-calendar-table.c:1381
msgid "_Mark Selected Tasks as Incomplete"
msgstr "把任务标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1376
+#: ../calendar/gui/e-calendar-table.c:1386
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1610
+#: ../calendar/gui/e-calendar-table.c:1623
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -6954,7 +6964,7 @@ msgid "Due date"
msgstr "到期日期"
#: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
msgid "Priority"
msgstr "优先级"
@@ -6963,111 +6973,111 @@ msgid "Start date"
msgstr "开始日期"
#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
msgid "Status"
msgstr "状态"
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "任务排序"
-
-#: ../calendar/gui/e-calendar-view.c:1348
+#: ../calendar/gui/e-calendar-view.c:1346
msgid "Moving items"
msgstr "移动项目"
-#: ../calendar/gui/e-calendar-view.c:1350
+#: ../calendar/gui/e-calendar-view.c:1348
msgid "Copying items"
msgstr "复制项目"
-#: ../calendar/gui/e-calendar-view.c:1659
+#: ../calendar/gui/e-calendar-view.c:1657
msgid "New _Appointment..."
msgstr "新建约会(_A)..."
-#: ../calendar/gui/e-calendar-view.c:1660
+#: ../calendar/gui/e-calendar-view.c:1658
msgid "New All Day _Event"
msgstr "新建全天事件(_E)"
-#: ../calendar/gui/e-calendar-view.c:1661
+#: ../calendar/gui/e-calendar-view.c:1659
msgid "New _Meeting"
msgstr "新建会议(_M)"
#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1672
+#: ../calendar/gui/e-calendar-view.c:1670
msgid "_Current View"
msgstr "当前视图(_C)"
-#: ../calendar/gui/e-calendar-view.c:1674
+#: ../calendar/gui/e-calendar-view.c:1672
msgid "Select T_oday"
msgstr "选择今天(_O)"
-#: ../calendar/gui/e-calendar-view.c:1675
+#: ../calendar/gui/e-calendar-view.c:1673
msgid "_Select Date..."
msgstr "选择日期(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1679
+msgid "Pri_nt..."
+msgstr "打印(_N)..."
+
+#: ../calendar/gui/e-calendar-view.c:1689
msgid "Cop_y to Calendar..."
msgstr "复制到日历(_Y)..."
-#: ../calendar/gui/e-calendar-view.c:1692
+#: ../calendar/gui/e-calendar-view.c:1690
msgid "Mo_ve to Calendar..."
msgstr "移至日历(_V)..."
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1691
msgid "_Delegate Meeting..."
msgstr "代理会议(_D)..."
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1692
msgid "_Schedule Meeting..."
msgstr "调度会议(_S)..."
-#: ../calendar/gui/e-calendar-view.c:1695
+#: ../calendar/gui/e-calendar-view.c:1693
msgid "_Forward as iCalendar..."
msgstr "作为 iCalendar 转发(_F)..."
-#: ../calendar/gui/e-calendar-view.c:1696
+#: ../calendar/gui/e-calendar-view.c:1694
msgid "_Reply"
msgstr "回复(_R)"
-#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1223
-#: ../mail/em-popup.c:572 ../mail/em-popup.c:583
+#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1336
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "回复所有人(_A)"
-#: ../calendar/gui/e-calendar-view.c:1702
+#: ../calendar/gui/e-calendar-view.c:1700
msgid "Make this Occurrence _Movable"
msgstr "将此次发生变为可移动(_M)"
-#: ../calendar/gui/e-calendar-view.c:1703 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
msgid "Delete this _Occurrence"
msgstr "删除此次出现(_O)"
-#: ../calendar/gui/e-calendar-view.c:1704
+#: ../calendar/gui/e-calendar-view.c:1702
msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2201
+#: ../calendar/gui/e-calendar-view.c:2202
#, c-format
msgid "Organizer: %s <%s>"
msgstr "组织者:%s <%s>"
#. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2205
+#: ../calendar/gui/e-calendar-view.c:2206
#, c-format
msgid "Organizer: %s"
msgstr "组织者:%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2221 ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2477
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2252
+#: ../calendar/gui/e-calendar-view.c:2256
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
@@ -7106,26 +7116,26 @@ msgstr "%02i 分钟分割"
#. 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:1336
-#: ../calendar/gui/e-day-view.c:2098
+#: ../calendar/gui/e-day-view-top-item.c:1359
+#: ../calendar/gui/e-day-view.c:2141
#: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
msgid "%A %d %B"
msgstr "%B%d日%A"
#. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1095
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:811
+#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
+#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:752 ../calendar/gui/e-day-view.c:1098
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:813
+#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
+#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
msgid "pm"
msgstr "下午"
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:769
msgid "Yes. (Complex Recurrence)"
msgstr "是(复杂重现)"
@@ -7134,7 +7144,7 @@ msgstr "是(复杂重现)"
#. Every %d day/days"
#. For Translators : 'Every day' is event Recurring every day
#. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:785
#, c-format
msgid "Every day"
msgid_plural "Every %d days"
@@ -7145,7 +7155,7 @@ msgstr[0] "每 %d 天"
#. Every %d week/weeks"
#. For Translators : 'Every week' is event Recurring every week
#. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:795
#, c-format
msgid "Every week"
msgid_plural "Every %d weeks"
@@ -7153,26 +7163,26 @@ msgstr[0] "每 %d 周"
#. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
#. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:799
#, c-format
msgid "Every week on "
msgid_plural "Every %d weeks on "
msgstr[0] "每 %d 周的"
#. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:808
msgid " and "
msgstr " 和 "
#. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:816
#, c-format
msgid "The %s day of "
msgstr "第 %s 天属于"
#. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
#. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:821
+#: ../calendar/gui/e-itip-control.c:831
#, c-format
msgid "The %s %s of "
msgstr "%s %s 属于"
@@ -7183,7 +7193,7 @@ msgstr "%s %s 属于"
#. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
#. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
#. %d is a digit
-#: ../calendar/gui/e-itip-control.c:834
+#: ../calendar/gui/e-itip-control.c:844
#, c-format
msgid "every month"
msgid_plural "every %d months"
@@ -7194,7 +7204,7 @@ msgstr[0] "每 %d 月"
#. Every %d year/years"
#. For Translators : 'Every year' is event Recurring every year
#. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:843
+#: ../calendar/gui/e-itip-control.c:853
#, c-format
msgid "Every year"
msgid_plural "Every %d years"
@@ -7202,340 +7212,340 @@ msgstr[0] "每 %d 年"
#. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
#. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:866
#, c-format
msgid "a total of %d time"
msgid_plural " a total of %d times"
msgstr[0] " 总计 %d 次"
#. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:876
msgid ", ending on "
msgstr ",结束于 "
#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:898
msgid "Starts"
msgstr "开始"
#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:912
msgid "Ends"
msgstr "结束"
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:946
+#: ../plugins/save-calendar/csv-format.c:391
msgid "Due"
msgstr "到期"
-#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
msgid "iCalendar Information"
msgstr "iCalendar 信息"
#. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1003
msgid "iCalendar Error"
msgstr "iCalendar 错误"
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:344
-#: ../plugins/itip-formatter/itip-view.c:345
-#: ../plugins/itip-formatter/itip-view.c:432
-#: ../plugins/itip-formatter/itip-view.c:433
-#: ../plugins/itip-formatter/itip-view.c:520
-#: ../plugins/itip-formatter/itip-view.c:521
+#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
msgid "An unknown person"
msgstr "未知的人"
#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../calendar/gui/e-itip-control.c:1126
msgid ""
"<br> Please review the following information, and then select an action from "
"the menu below."
msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作。"
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1174
#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:730
-#: ../plugins/itip-formatter/itip-formatter.c:1933
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2024
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:733
-#: ../plugins/itip-formatter/itip-formatter.c:1936
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2027
msgid "Tentatively Accepted"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-itip-control.c:1182
#: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
-#: ../plugins/itip-formatter/itip-formatter.c:1939
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2030
msgid "Declined"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../calendar/gui/e-itip-control.c:1266
msgid ""
"The meeting has been canceled, however it could not be found in your "
"calendars"
msgstr "会议已经被取消,但无法在您的日历中找到该会议"
-#: ../calendar/gui/e-itip-control.c:1258
+#: ../calendar/gui/e-itip-control.c:1268
msgid ""
"The task has been canceled, however it could not be found in your task lists"
msgstr "任务已经被取消,但无法在您的任务列表中找到该任务"
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-itip-control.c:1346
#, c-format
msgid "<b>%s</b> has published meeting information."
msgstr "<b>%s</b> 发布了会议信息。"
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1347
msgid "Meeting Information"
msgstr "会议信息"
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1353
#, c-format
msgid "<b>%s</b> requests the presence of %s at a meeting."
msgstr "<b>%s</b> 请求 %s 参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1355
#, c-format
msgid "<b>%s</b> requests your presence at a meeting."
msgstr "<b>%s</b> 请求您参加一个会议。"
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1356
msgid "Meeting Proposal"
msgstr "会议建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1362
#, c-format
msgid "<b>%s</b> wishes to be added to an existing meeting."
msgstr "<b>%s</b> 希望加入到已有的会议。"
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1363
msgid "Meeting Update"
msgstr "会议更新"
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1367
#, c-format
msgid "<b>%s</b> wishes to receive the latest meeting information."
msgstr "<b>%s</b> 希望收到最新的会议信息。"
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1368
msgid "Meeting Update Request"
msgstr "会议更新请求"
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1375
#, c-format
msgid "<b>%s</b> has replied to a meeting request."
msgstr "<b>%s</b> 已回复一个会议请求。"
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1376
msgid "Meeting Reply"
msgstr "会议答复"
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1383
#, c-format
msgid "<b>%s</b> has canceled a meeting."
msgstr "<b>%s</b> 取消了一个会议。"
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1384
msgid "Meeting Cancelation"
msgstr "会议取消"
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1511
#, c-format
msgid "<b>%s</b> has sent an unintelligible message."
msgstr "<b>%s</b> 发送了一个无法理解的信件。"
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1395
msgid "Bad Meeting Message"
msgstr "错误的会议信件"
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1422
#, c-format
msgid "<b>%s</b> has published task information."
msgstr "<b>%s</b> 发布了任务信息。"
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1423
msgid "Task Information"
msgstr "任务信息"
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1430
#, c-format
msgid "<b>%s</b> requests %s to perform a task."
msgstr "<b>%s</b> 请求 %s 完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1432
#, c-format
msgid "<b>%s</b> requests you perform a task."
msgstr "<b>%s</b> 请求您完成一个任务。"
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1433
msgid "Task Proposal"
msgstr "任务建议"
#. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1439
#, c-format
msgid "<b>%s</b> wishes to be added to an existing task."
msgstr "<b>%s<b> 希望加入到已有的任务。"
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1440
msgid "Task Update"
msgstr "任务更新"
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1444
#, c-format
msgid "<b>%s</b> wishes to receive the latest task information."
msgstr "<b>%s</b> 希望获取最新的任务信息。"
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1445
msgid "Task Update Request"
msgstr "任务更新请求"
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1452
#, c-format
msgid "<b>%s</b> has replied to a task assignment."
msgstr "<b>%s</b> 已经回复了任务分配。"
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1453
msgid "Task Reply"
msgstr "任务回复"
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1460
#, c-format
msgid "<b>%s</b> has canceled a task."
msgstr "<b>%s</b> 取消了任务。"
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1461
msgid "Task Cancelation"
msgstr "任务取消"
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1472
msgid "Bad Task Message"
msgstr "错误的任务信件"
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1496
#, c-format
msgid "<b>%s</b> has published free/busy information."
msgstr "<b>%s</b> 发布了忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1497
msgid "Free/Busy Information"
msgstr "忙闲信息"
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1501
#, c-format
msgid "<b>%s</b> requests your free/busy information."
msgstr "<b>%s</b> 请求您的忙闲信息。"
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1502
msgid "Free/Busy Request"
msgstr "忙/闲请求"
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1506
#, c-format
msgid "<b>%s</b> has replied to a free/busy request."
msgstr "<b>%s</b> 应答了忙闲请求。"
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1507
msgid "Free/Busy Reply"
msgstr "忙闲应答"
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1512
msgid "Bad Free/Busy Message"
msgstr "错误的忙闲信件"
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1588
msgid "The message does not appear to be properly formed"
msgstr "信件的格式可能不正确"
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1647
msgid "The message contains only unsupported requests."
msgstr "信件只含有不支持的请求。"
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1680
msgid "The attachment does not contain a valid calendar message"
msgstr "附件中没有有效的日历信件"
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1712
msgid "The attachment has no viewable calendar items"
msgstr "附件中没有可查看的日历项目"
-#: ../calendar/gui/e-itip-control.c:1944
+#: ../calendar/gui/e-itip-control.c:1954
msgid "Update complete\n"
msgstr "更新完成\n"
-#: ../calendar/gui/e-itip-control.c:1977
+#: ../calendar/gui/e-itip-control.c:1988
msgid "Object is invalid and cannot be updated\n"
msgstr "对象无效,无法更新\n"
-#: ../calendar/gui/e-itip-control.c:1994
+#: ../calendar/gui/e-itip-control.c:2005
msgid "This response is not from a current attendee. Add as an attendee?"
msgstr "此响应并非来自当前出席者。将响应者加为出席者吗?"
-#: ../calendar/gui/e-itip-control.c:2012
+#: ../calendar/gui/e-itip-control.c:2023
msgid "Attendee status could not be updated because of an invalid status!\n"
msgstr "因为无效状态而无法更新出席者状态!\n"
-#: ../calendar/gui/e-itip-control.c:2036
+#: ../calendar/gui/e-itip-control.c:2047
msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
-#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1229
+#: ../calendar/gui/e-itip-control.c:2054
+#: ../plugins/itip-formatter/itip-formatter.c:1242
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
-#: ../calendar/gui/e-itip-control.c:2074 ../calendar/gui/e-itip-control.c:2131
+#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
msgid "Item sent!\n"
msgstr "项目已发送!\n"
-#: ../calendar/gui/e-itip-control.c:2080 ../calendar/gui/e-itip-control.c:2139
+#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
msgid "The item could not be sent!\n"
msgstr "无法发送项目!\n"
-#: ../calendar/gui/e-itip-control.c:2223
+#: ../calendar/gui/e-itip-control.c:2230
msgid "Choose an action:"
msgstr "选择一项活动:"
-#: ../calendar/gui/e-itip-control.c:2296
+#: ../calendar/gui/e-itip-control.c:2301
msgid "Update"
msgstr "更新"
-#: ../calendar/gui/e-itip-control.c:2324
+#: ../calendar/gui/e-itip-control.c:2329
#: ../plugins/groupwise-features/process-meeting.c:48
msgid "Accept"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:2325
+#: ../calendar/gui/e-itip-control.c:2330
msgid "Tentatively accept"
msgstr "暂时接受"
-#: ../calendar/gui/e-itip-control.c:2326
+#: ../calendar/gui/e-itip-control.c:2331
#: ../plugins/groupwise-features/process-meeting.c:50
msgid "Decline"
msgstr "拒绝"
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2360
msgid "Send Free/Busy Information"
msgstr "发送忙闲信息"
-#: ../calendar/gui/e-itip-control.c:2383
+#: ../calendar/gui/e-itip-control.c:2388
msgid "Update respondent status"
msgstr "更新应答者状态"
-#: ../calendar/gui/e-itip-control.c:2411
+#: ../calendar/gui/e-itip-control.c:2416
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:753
+#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -7585,65 +7595,69 @@ msgid "Attendees"
msgstr "出席者"
#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
msgid "Individual"
msgstr "个人"
#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
msgid "Group"
msgstr "组"
#: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
msgid "Resource"
msgstr "资源"
#: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
msgid "Room"
msgstr "房间"
#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
msgid "Chair"
msgstr "主席"
#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
msgid "Required Participant"
msgstr "必需的出席者"
#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
msgid "Optional Participant"
msgstr "可选的出席者"
#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
msgid "Non-Participant"
msgstr "不参加"
#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
msgid "Needs Action"
msgstr "需要动作"
#: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
msgid "Tentative"
msgstr "暂时的"
#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:739
-#: ../plugins/itip-formatter/itip-formatter.c:1942
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2033
msgid "Delegated"
msgstr "被委任的"
@@ -7653,19 +7667,19 @@ msgid "Attendee "
msgstr "出席者 "
#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:523
+#: ../calendar/gui/e-meeting-list-view.c:526
#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
msgid "RSVP"
msgstr "请回复"
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
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:464
-#: ../calendar/gui/e-meeting-time-sel.c:2116
+#: ../calendar/gui/e-meeting-time-sel.c:2137
msgid "%A, %B %d, %Y"
msgstr "%Y年%m月%d日%A"
@@ -7674,7 +7688,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:468
-#: ../calendar/gui/e-meeting-time-sel.c:2149
+#: ../calendar/gui/e-meeting-time-sel.c:2168
msgid "%a %m/%d/%Y"
msgstr "%Y年%m月%d日%A"
@@ -7684,67 +7698,67 @@ msgstr "%Y年%m月%d日%A"
msgid "%m/%d/%Y"
msgstr "%Y-%m-%d"
-#: ../calendar/gui/e-meeting-time-sel.c:412
+#: ../calendar/gui/e-meeting-time-sel.c:414
msgid "Out of Office"
msgstr "办公室以外"
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
msgid "No Information"
msgstr "没有信息"
-#: ../calendar/gui/e-meeting-time-sel.c:428
+#: ../calendar/gui/e-meeting-time-sel.c:430
msgid "A_ttendees..."
msgstr "出席者(_T)..."
-#: ../calendar/gui/e-meeting-time-sel.c:449
+#: ../calendar/gui/e-meeting-time-sel.c:451
msgid "O_ptions"
msgstr "选项(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:466
+#: ../calendar/gui/e-meeting-time-sel.c:468
msgid "Show _only working hours"
msgstr "只显示工作小时(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:476
+#: ../calendar/gui/e-meeting-time-sel.c:478
msgid "Show _zoomed out"
msgstr "显示缩放的输出(_Z)"
-#: ../calendar/gui/e-meeting-time-sel.c:491
+#: ../calendar/gui/e-meeting-time-sel.c:493
msgid "_Update free/busy"
msgstr "更新忙闲(_U)"
-#: ../calendar/gui/e-meeting-time-sel.c:506
+#: ../calendar/gui/e-meeting-time-sel.c:508
msgid "_<<"
msgstr "_<<"
-#: ../calendar/gui/e-meeting-time-sel.c:524
+#: ../calendar/gui/e-meeting-time-sel.c:526
msgid "_Autopick"
msgstr "自动获取(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:539
+#: ../calendar/gui/e-meeting-time-sel.c:541
msgid ">_>"
msgstr ">_>"
-#: ../calendar/gui/e-meeting-time-sel.c:556
+#: ../calendar/gui/e-meeting-time-sel.c:558
msgid "_All people and resources"
msgstr "全部人和资源(_A)"
-#: ../calendar/gui/e-meeting-time-sel.c:565
+#: ../calendar/gui/e-meeting-time-sel.c:567
msgid "All _people and one resource"
msgstr "全部人和一个资源(_P)"
-#: ../calendar/gui/e-meeting-time-sel.c:574
+#: ../calendar/gui/e-meeting-time-sel.c:576
msgid "_Required people"
msgstr "必需的人(_R)"
-#: ../calendar/gui/e-meeting-time-sel.c:583
+#: ../calendar/gui/e-meeting-time-sel.c:585
msgid "Required people and _one resource"
msgstr "必需的人和一个资源(_O)"
-#: ../calendar/gui/e-meeting-time-sel.c:619
+#: ../calendar/gui/e-meeting-time-sel.c:621
msgid "_Start time:"
msgstr "开始时间(_S):"
-#: ../calendar/gui/e-meeting-time-sel.c:646
+#: ../calendar/gui/e-meeting-time-sel.c:648
msgid "_End time:"
msgstr "结束时间(_E):"
@@ -7776,20 +7790,16 @@ msgstr "语言"
msgid "Member"
msgstr "成员"
-#: ../calendar/gui/e-memo-table.c:993
+#: ../calendar/gui/e-memo-table.c:940
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:1144 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1091 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "备忘排序"
-
-#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2828
+#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/gnome-cal.c:2871
#, c-format
msgid ""
"Error on %s:\n"
@@ -7798,33 +7808,33 @@ msgstr ""
"%s 错误:\n"
" %s"
-#: ../calendar/gui/e-memos.c:781
+#: ../calendar/gui/e-memos.c:839
msgid "Loading memos"
msgstr "装入备忘"
-#: ../calendar/gui/e-memos.c:862
+#: ../calendar/gui/e-memos.c:920
#, c-format
msgid "Opening memos at %s"
msgstr "在 %s 打开备忘"
-#: ../calendar/gui/e-memos.c:1035 ../calendar/gui/e-tasks.c:1249
+#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1333
msgid "Deleting selected objects..."
msgstr "正在删除选中的对象..."
-#: ../calendar/gui/e-tasks.c:894
+#: ../calendar/gui/e-tasks.c:975
msgid "Loading tasks"
msgstr "装入任务"
-#: ../calendar/gui/e-tasks.c:981
+#: ../calendar/gui/e-tasks.c:1065
#, c-format
msgid "Opening tasks at %s"
msgstr "在 %s 打开任务"
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-tasks.c:1310
msgid "Completing tasks..."
msgstr "正在完成任务..."
-#: ../calendar/gui/e-tasks.c:1276
+#: ../calendar/gui/e-tasks.c:1360
msgid "Expunging"
msgstr "销毁"
@@ -7836,47 +7846,47 @@ msgstr "选择时区"
#. month name. You can change the order but don't
#. change the specifiers or add anything.
#: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1484
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
msgid "%d %B"
msgstr "%-m月%-d日"
-#: ../calendar/gui/gnome-cal.c:824
+#: ../calendar/gui/gnome-cal.c:828
msgid "Updating query"
msgstr "更新查询"
-#: ../calendar/gui/gnome-cal.c:2479
+#: ../calendar/gui/gnome-cal.c:2508
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2480
+#: ../calendar/gui/gnome-cal.c:2509
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2485
+#: ../calendar/gui/gnome-cal.c:2514
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2651
+#: ../calendar/gui/gnome-cal.c:2695
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2670
+#: ../calendar/gui/gnome-cal.c:2714
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2679
+#: ../calendar/gui/gnome-cal.c:2723
#, c-format
msgid "Loading memos at %s"
msgstr "装入位于 %s 的备忘"
-#: ../calendar/gui/gnome-cal.c:2787
+#: ../calendar/gui/gnome-cal.c:2830
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3726
+#: ../calendar/gui/gnome-cal.c:3787
msgid "Purging"
msgstr "销毁"
@@ -7936,57 +7946,57 @@ msgstr "九月"
msgid "_Select Today"
msgstr "选择今天(_S)"
-#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
-#: ../calendar/gui/itip-utils.c:606
+#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../calendar/gui/itip-utils.c:487
+#: ../calendar/gui/itip-utils.c:485
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
msgid "Memo information"
msgstr "备忘信息"
-#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../calendar/gui/itip-utils.c:700
+#: ../calendar/gui/itip-utils.c:698
msgid "Calendar information"
msgstr "日历信息"
-#: ../calendar/gui/itip-utils.c:749
+#: ../calendar/gui/itip-utils.c:747
msgid "Updated"
msgstr "更新"
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:755
msgid "Refresh"
msgstr "刷新"
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:759
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:833
+#: ../calendar/gui/itip-utils.c:831
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:843
+#: ../calendar/gui/itip-utils.c:841
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:1008
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
@@ -7994,72 +8004,72 @@ msgstr "您必须是事件的出席者。"
msgid "_New Memo List"
msgstr "新建备忘列表(_N)"
-#: ../calendar/gui/memos-component.c:540
+#: ../calendar/gui/memos-component.c:544
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: ../calendar/gui/memos-component.c:589
+#: ../calendar/gui/memos-component.c:593
msgid "Failed upgrading memos."
msgstr "升级备忘失败。"
-#: ../calendar/gui/memos-component.c:897
+#: ../calendar/gui/memos-component.c:953
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "无法打开备忘列表“%s”来创建事件和会议"
-#: ../calendar/gui/memos-component.c:910
+#: ../calendar/gui/memos-component.c:966
msgid "There is no calendar available for creating memos"
msgstr "没有可创建备忘的日历"
-#: ../calendar/gui/memos-component.c:1006
+#: ../calendar/gui/memos-component.c:1076
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1189
+#: ../calendar/gui/memos-component.c:1259
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1190
+#: ../calendar/gui/memos-component.c:1260
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../calendar/gui/memos-component.c:1191
+#: ../calendar/gui/memos-component.c:1261
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1197
+#: ../calendar/gui/memos-component.c:1267
msgid "New shared memo"
msgstr "新建共享备忘"
-#: ../calendar/gui/memos-component.c:1198
+#: ../calendar/gui/memos-component.c:1268
msgid "_Shared memo"
msgstr "共享备忘(_S)"
-#: ../calendar/gui/memos-component.c:1199
+#: ../calendar/gui/memos-component.c:1269
msgid "Create a shared new memo"
msgstr "创建新的共享备忘"
-#: ../calendar/gui/memos-component.c:1205
+#: ../calendar/gui/memos-component.c:1275
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1206
+#: ../calendar/gui/memos-component.c:1276
msgid "Memo li_st"
msgstr "备忘列表(_S)"
-#: ../calendar/gui/memos-component.c:1207
+#: ../calendar/gui/memos-component.c:1277
msgid "Create a new memo list"
msgstr "创建新备忘列表"
-#: ../calendar/gui/memos-control.c:336 ../calendar/gui/memos-control.c:352
+#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
msgid "Print Memos"
msgstr "打印备忘"
@@ -8086,226 +8096,231 @@ msgstr ""
"请稍候,Evolution 正在升迁您的文件夹..."
#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#: ../calendar/gui/migration.c:781 ../calendar/gui/migration.c:949
+#, c-format
msgid "Unable to migrate old settings from evolution/config.xmldb"
msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:809
+#: ../calendar/gui/migration.c:810
#, c-format
msgid "Unable to migrate calendar `%s'"
msgstr "无法升迁日历“%s”"
#. FIXME: domain/code
-#: ../calendar/gui/migration.c:977
+#: ../calendar/gui/migration.c:978
#, c-format
msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
-#: ../calendar/gui/migration.c:1226
+#: ../calendar/gui/migration.c:1227
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
msgid "Notes"
msgstr "笔记"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "1st"
msgstr "1日"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "2nd"
msgstr "2日"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "3rd"
msgstr "3日"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "4th"
msgstr "4日"
-#: ../calendar/gui/print.c:513
+#: ../calendar/gui/print.c:515
msgid "5th"
msgstr "5日"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "6th"
msgstr "6日"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "7th"
msgstr "7日"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "8th"
msgstr "8日"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "9th"
msgstr "9日"
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:516
msgid "10th"
msgstr "10日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "11th"
msgstr "11日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "12th"
msgstr "12日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "13th"
msgstr "13日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "14th"
msgstr "14日"
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:517
msgid "15th"
msgstr "15日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "16th"
msgstr "16日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "17th"
msgstr "17日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "18th"
msgstr "18日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "19th"
msgstr "19日"
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:518
msgid "20th"
msgstr "20日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "21st"
msgstr "21日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "22nd"
msgstr "22日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "23rd"
msgstr "23日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "24th"
msgstr "24日"
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:519
msgid "25th"
msgstr "25日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "26th"
msgstr "26日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "27th"
msgstr "27日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "28th"
msgstr "28日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "29th"
msgstr "29日"
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:520
msgid "30th"
msgstr "30日"
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:521
msgid "31st"
msgstr "31日"
#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "Su"
msgstr "日"
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "Mo"
msgstr "一"
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "Tu"
msgstr "二"
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:596
msgid "We"
msgstr "三"
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
msgid "Th"
msgstr "四"
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
msgid "Fr"
msgstr "五"
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:597
msgid "Sa"
msgstr "六"
-#: ../calendar/gui/print.c:2283
+#: ../calendar/gui/print.c:2444
msgid "Appointment"
msgstr "约会"
-#: ../calendar/gui/print.c:2285
+#: ../calendar/gui/print.c:2446
msgid "Task"
msgstr "任务"
-#: ../calendar/gui/print.c:2307
+#: ../calendar/gui/print.c:2468
#, c-format
msgid "Summary: %s"
msgstr "概要:%s"
-#: ../calendar/gui/print.c:2358
+#: ../calendar/gui/print.c:2490
+msgid "Attendees: "
+msgstr "出席者:"
+
+#: ../calendar/gui/print.c:2530
#, c-format
msgid "Status: %s"
msgstr "状态:%s"
-#: ../calendar/gui/print.c:2375
+#: ../calendar/gui/print.c:2547
#, c-format
msgid "Priority: %s"
msgstr "优先级:%s"
-#: ../calendar/gui/print.c:2387
+#: ../calendar/gui/print.c:2559
#, c-format
msgid "Percent Complete: %i"
msgstr "完成率:%i"
-#: ../calendar/gui/print.c:2399
+#: ../calendar/gui/print.c:2571
#, c-format
msgid "URL: %s"
msgstr "URL:%s"
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2584
#, c-format
msgid "Categories: %s"
msgstr "类别:%s"
-#: ../calendar/gui/print.c:2423
+#: ../calendar/gui/print.c:2595
msgid "Contacts: "
msgstr "联系人:"
#. TODO Allow the user to customize the title.
-#: ../calendar/gui/print.c:2524
+#: ../calendar/gui/print.c:2697
msgid "Upcoming Appointments"
msgstr "即将到来的约会"
@@ -8313,62 +8328,62 @@ msgstr "即将到来的约会"
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../calendar/gui/tasks-component.c:531
+#: ../calendar/gui/tasks-component.c:535
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../calendar/gui/tasks-component.c:580
+#: ../calendar/gui/tasks-component.c:584
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:941
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:904
+#: ../calendar/gui/tasks-component.c:954
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:1001
+#: ../calendar/gui/tasks-component.c:1065
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1321
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1259
+#: ../calendar/gui/tasks-component.c:1323
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1265
+#: ../calendar/gui/tasks-component.c:1329
msgid "New assigned task"
msgstr "新建分配的任务"
-#: ../calendar/gui/tasks-component.c:1266
+#: ../calendar/gui/tasks-component.c:1330
msgid "Assigne_d Task"
msgstr "分配的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1267
+#: ../calendar/gui/tasks-component.c:1331
msgid "Create a new assigned task"
msgstr "创建新分配的任务"
-#: ../calendar/gui/tasks-component.c:1273
+#: ../calendar/gui/tasks-component.c:1337
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1274
+#: ../calendar/gui/tasks-component.c:1338
msgid "Tas_k list"
msgstr "任务列表(_K)"
-#: ../calendar/gui/tasks-component.c:1275
+#: ../calendar/gui/tasks-component.c:1339
msgid "Create a new task list"
msgstr "创建新任务列表"
-#: ../calendar/gui/tasks-control.c:438
+#: ../calendar/gui/tasks-control.c:455
msgid ""
"This operation will permanently erase all tasks marked as completed. If you "
"continue, you will not be able to recover these tasks.\n"
@@ -8379,25 +8394,21 @@ msgstr ""
"\n"
"确实删除这些任务吗?"
-#: ../calendar/gui/tasks-control.c:441
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1132
msgid "Do not ask me again."
msgstr "不要再次询问。"
-#: ../calendar/gui/tasks-control.c:478 ../calendar/gui/tasks-control.c:494
+#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
msgid "Print Tasks"
msgstr "打印任务"
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "日一二三四五六"
-
#: ../calendar/importers/icalendar-importer.c:79
msgid "Appointments and Meetings"
msgstr "约会和会议"
#: ../calendar/importers/icalendar-importer.c:337
#: ../calendar/importers/icalendar-importer.c:620
+#: ../plugins/itip-formatter/itip-formatter.c:1570
msgid "Opening calendar"
msgstr "打开日历"
@@ -9959,149 +9970,124 @@ msgstr "太平洋/沃利斯"
msgid "Pacific/Yap"
msgstr "太平洋/雅浦"
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "单击此处以使用地址簿"
+
+#: ../composer/e-composer-post-header.c:117
msgid "Posting destination"
msgstr "投递目的"
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-composer-post-header.c:118
msgid "Choose folders to post the message to."
msgstr "选择要将信件投递到哪个文件夹。"
-#: ../composer/e-msg-composer-hdrs.c:602
-msgid "Click here for the address book"
-msgstr "单击此处以使用地址簿"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "单击此处以选择要投递到的文件夹"
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:634
-msgid "_Reply-To:"
-msgstr "回复到(_R):"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "签名(_G):"
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:641
+#: ../composer/e-msg-composer-hdrs.c:326
msgid "Fr_om:"
msgstr "发件人(_O):"
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:648
-msgid "S_ubject:"
-msgstr "主题(_U):"
+#: ../composer/e-msg-composer-hdrs.c:332
+msgid "_Reply-To:"
+msgstr "回复到(_R):"
-#: ../composer/e-msg-composer-hdrs.c:657
+#: ../composer/e-msg-composer-hdrs.c:335
msgid "_To:"
msgstr "收信人(_T):"
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:337
msgid "Enter the recipients of the message"
msgstr "输入信件的收件人"
-#: ../composer/e-msg-composer-hdrs.c:661
+#: ../composer/e-msg-composer-hdrs.c:340
msgid "_Cc:"
msgstr "抄送(_C):"
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:342
msgid "Enter the addresses that will receive a carbon copy of the message"
msgstr "输入将接收该信件副本的收件人地址"
-#: ../composer/e-msg-composer-hdrs.c:665
+#: ../composer/e-msg-composer-hdrs.c:346
msgid "_Bcc:"
msgstr "暗送(_B):"
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:348
msgid ""
"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr "输入将接收该信件副本,但不出现在收件人列表中的收件人地址。"
+"appearing in the recipient list of the message"
+msgstr "输入将接收该信件副本,但不出现在收件人列表中的收件人地址"
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:353
msgid "_Post To:"
msgstr "投递到(_P):"
-#: ../composer/e-msg-composer-hdrs.c:678
-msgid "Click here to select folders to post to"
-msgstr "单击此处以选择要投递到的文件夹"
-
-#: ../composer/e-msg-composer-hdrs.c:683
-msgid "Post To:"
-msgstr "投递到:"
+#: ../composer/e-msg-composer-hdrs.c:356
+msgid "S_ubject:"
+msgstr "主题(_U):"
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:77
msgid "A_ttach"
msgstr "附件(_T)"
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:198
msgid "Insert Attachment"
msgstr "插入附件"
-#: ../composer/e-msg-composer.c:835
+#: ../composer/e-msg-composer.c:819
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:842
+#: ../composer/e-msg-composer.c:826
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2614
+#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
msgid "Hide _Attachment Bar"
msgstr "隐藏附件栏(_A)"
-#: ../composer/e-msg-composer.c:1354 ../composer/e-msg-composer.c:2617
-#: ../composer/e-msg-composer.c:3985
+#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3878
msgid "Show _Attachment Bar"
msgstr "显示附件栏(_A)"
-#: ../composer/e-msg-composer.c:1386 ../composer/e-msg-composer.c:1420
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
msgid "Unknown reason"
msgstr "未知原因"
-#: ../composer/e-msg-composer.c:1458
+#: ../composer/e-msg-composer.c:1525
msgid "Could not open file"
msgstr "无法打开文件"
-#: ../composer/e-msg-composer.c:1466
+#: ../composer/e-msg-composer.c:1533
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-msg-composer.c:1751
+#: ../composer/e-msg-composer.c:1820
msgid "Untitled Message"
msgstr "无标题信件"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1787
+#: ../composer/e-msg-composer.c:1856
msgid "Open File"
msgstr "打开文件"
-#: ../composer/e-msg-composer.c:2249 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "自动生成的"
-
-#: ../composer/e-msg-composer.c:2352
-msgid "Si_gnature:"
-msgstr "签名(_G):"
-
-#: ../composer/e-msg-composer.c:2628 ../composer/e-msg-composer.c:3867
-#: ../composer/e-msg-composer.c:3870
+#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3758
+#: ../composer/e-msg-composer.c:3761
msgid "Compose Message"
msgstr "撰写新信件"
-#: ../composer/e-msg-composer.c:5125
+#: ../composer/e-msg-composer.c:5031
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10239,7 +10225,7 @@ msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
msgid "_Do not Recover"
msgstr "不恢复(_D)"
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:312
msgid "_Recover"
msgstr "恢复(_R)"
@@ -10248,18 +10234,16 @@ msgid "_Save Message"
msgstr "保存信件(_S)"
#: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:512
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution 邮件及日历"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:593
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
msgid "Groupware Suite"
msgstr "Groupwise 套件"
#: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "Evolution 个人信息管理和邮件客户"
+msgid "Manage your email, contacts and schedule"
+msgstr "配置您的电子邮件,联系人和日程表"
#: ../data/evolution.keys.in.in.h:1
msgid "address card"
@@ -10291,15 +10275,15 @@ msgstr "Evolution 查询"
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
-#: ../e-util/e-print.c:136
+#: ../e-util/e-print.c:138
msgid "An error occurred while printing"
msgstr "打印时发生了错误"
-#: ../e-util/e-print.c:143
+#: ../e-util/e-print.c:145
msgid "The printing system reported the following details about the error:"
msgstr "打印系统报告了下列错误细节:"
-#: ../e-util/e-print.c:149
+#: ../e-util/e-print.c:151
msgid ""
"The printing system did not report any additional details about the error."
msgstr "打印系统未报告关于错误的任何额外细节。"
@@ -10324,10 +10308,54 @@ msgstr "文件已存在“{0}”。"
msgid "Overwrite file?"
msgstr "覆盖文件吗?"
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
msgid "_Overwrite"
msgstr "覆盖(_O)"
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "重要(_M)"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "工作(_W)"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "个人(_P)"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "待办(_T)"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "稍候(_L)"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "标签名称(_N):"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Edit Label"
+msgstr "编辑标签"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Add Label"
+msgstr "添加标签"
+
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "标签名称不能为空。"
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr ""
+
#: ../filter/filter-datespec.c:80
#, c-format
msgid "1 second ago"
@@ -10426,81 +10454,69 @@ msgstr "现在"
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../filter/filter-datespec.c:449
+#: ../filter/filter-datespec.c:451
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+#: ../filter/filter-file.c:288
msgid "Choose a file"
msgstr "选择文件"
-#: ../filter/filter-label.c:120 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1054 ../mail/mail-config.glade.h:91
-msgid "Important"
-msgstr "重要"
-
-#. forest green
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:150
-msgid "To Do"
-msgstr "待办"
-
-#. blue
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1058
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "稍候"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
msgid "Test"
msgstr "测试"
#: ../filter/filter-rule.c:800
-msgid "_Search name:"
-msgstr "搜索名称(_B):"
+msgid "R_ule name:"
+msgstr "规则名(_U):"
#: ../filter/filter-rule.c:828
msgid "Find items that meet the following criteria"
msgstr "查找符合下列条件的项目"
-#: ../filter/filter-rule.c:867
+#: ../filter/filter-rule.c:862
+msgid "A_dd Filter Criteria"
+msgstr "添加过滤规则(_D)"
+
+#: ../filter/filter-rule.c:868
msgid "If all criteria are met"
msgstr "如果满足所有条件"
-#: ../filter/filter-rule.c:867
+#: ../filter/filter-rule.c:868
msgid "If any criteria are met"
msgstr "如果满足任一条件"
-#: ../filter/filter-rule.c:869
+#: ../filter/filter-rule.c:870
msgid "_Find items:"
msgstr "查找项目(_F):"
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:892
msgid "All related"
msgstr "相关的全部"
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:892
msgid "Replies"
msgstr "回复"
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:892
msgid "Replies and parents"
msgstr "回复及原始邮件"
-#: ../filter/filter-rule.c:891
+#: ../filter/filter-rule.c:892
msgid "No reply or parent"
msgstr "无回复或原始邮件"
-#: ../filter/filter-rule.c:893
+#: ../filter/filter-rule.c:894
msgid "I_nclude threads"
msgstr "包含线索(_N)"
-#: ../filter/filter-rule.c:989 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:307
+#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:989 ../mail/em-utils.c:308
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
msgid "Outgoing"
msgstr "寄出"
@@ -10524,7 +10540,7 @@ msgstr "缺少日期。"
msgid "Missing file name."
msgstr "缺少文件名。"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
msgid "Missing name."
msgstr "缺少名称。"
@@ -10594,7 +10610,7 @@ msgstr "未来"
msgid "months"
msgstr "月"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
msgid "seconds"
msgstr "秒"
@@ -10608,6 +10624,7 @@ msgstr "您指定的时间"
#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:398
msgid "weeks"
msgstr "周"
@@ -10668,21 +10685,21 @@ msgstr "Evolution 邮件撰写控件"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:605
-#: ../mail/importers/elm-importer.c:341 ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:568 ../mail/mail-component.c:569
-#: ../mail/mail-component.c:729
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:575 ../mail/mail-component.c:576
+#: ../mail/mail-component.c:740
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
msgid "Mail"
msgstr "邮件"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:535
+#: ../mail/em-account-prefs.c:502
msgid "Mail Accounts"
msgstr "邮件账户"
#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
msgid "Mail Preferences"
msgstr "邮件首选项"
@@ -10712,112 +10729,110 @@ msgstr ""
msgid "Select Folder"
msgstr "选择文件夹"
+#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "自动生成的"
+
#: ../mail/em-account-editor.c:778
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:2056
-msgid "Automatically check for _new mail every"
+#: ../mail/em-account-editor.c:2053
+msgid "Check for _new messages every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "分钟(_T)"
+
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2362 ../mail/mail-config.glade.h:126
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
#: ../plugins/exchange-operations/exchange-account-setup.c:317
msgid "Security"
msgstr "安全"
#. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
+#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
-msgid "Checking for New Mail"
+#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+msgid "Checking for New Messages"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:412
-msgid "Di_sable"
-msgstr "禁用(_S)"
-
-#: ../mail/em-account-prefs.c:334 ../mail/em-account-prefs.c:379
-#: ../mail/em-account-prefs.c:414 ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "启用(_N)"
-
#. translators: default account indicator
-#: ../mail/em-account-prefs.c:469
+#: ../mail/em-account-prefs.c:436
msgid "[Default]"
msgstr "[默认]"
-#: ../mail/em-account-prefs.c:522 ../mail/em-composer-prefs.c:949
-#: ../plugins/plugin-manager/plugin-manager.c:284
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
+#: ../plugins/publish-calendar/publish-calendar.c:510
msgid "Enabled"
msgstr "已启用"
-#: ../mail/em-account-prefs.c:528
+#: ../mail/em-account-prefs.c:495
msgid "Account name"
msgstr "账户名"
-#: ../mail/em-account-prefs.c:530
+#: ../mail/em-account-prefs.c:497
msgid "Protocol"
msgstr "协议"
-#: ../mail/em-composer-prefs.c:310 ../mail/em-composer-prefs.c:436
-#: ../mail/mail-config.c:1030
+#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:1062
msgid "Unnamed"
msgstr "未命名"
-#: ../mail/em-composer-prefs.c:955
+#: ../mail/em-composer-prefs.c:953
msgid "Language(s)"
msgstr "语言"
-#: ../mail/em-composer-prefs.c:998
+#: ../mail/em-composer-prefs.c:996
msgid "Add signature script"
msgstr "添加签名脚本"
-#: ../mail/em-composer-prefs.c:1018
+#: ../mail/em-composer-prefs.c:1016
msgid "Signature(s)"
msgstr "签名"
-#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:399
+#: ../mail/em-composer-utils.c:898 ../mail/em-format-quote.c:399
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信件 --------"
-#: ../mail/em-composer-utils.c:1692
+#: ../mail/em-composer-utils.c:1703
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:1739
+#: ../mail/em-composer-utils.c:1750
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10825,7 +10840,7 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
-#: ../mail/em-composer-utils.c:1880
+#: ../mail/em-composer-utils.c:1891
msgid "-----Original Message-----"
msgstr "-------- 原始信件 --------"
@@ -10851,301 +10866,336 @@ msgid "Attachments"
msgstr "附件"
#: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr ""
+
+#: ../mail/em-filter-i18n.h:7
msgid "Beep"
msgstr "响铃"
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/em-filter-i18n.h:9
+#, fuzzy
+msgid "Completed On"
+msgstr "已完成 "
+
+#: ../mail/em-filter-i18n.h:10
msgid "contains"
msgstr "含有"
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
msgid "Copy to Folder"
msgstr "复制到文件夹"
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
msgid "Date received"
msgstr "接收日期"
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
msgid "Date sent"
msgstr "发送日期"
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
#: ../ui/evolution-tasks.xml.h:6
msgid "Delete"
msgstr "删除"
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
msgid "Deleted"
msgstr "已删除"
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
msgid "does not contain"
msgstr "不含有"
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
msgid "does not end with"
msgstr "不结尾于"
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
msgid "does not exist"
msgstr "不存在"
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
msgid "does not return"
msgstr "不含有"
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
msgid "does not sound like"
msgstr "发音不像"
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
msgid "does not start with"
msgstr "不开始于"
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
msgid "Do Not Exist"
msgstr "不存在"
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
msgid "Draft"
msgstr "草稿"
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
msgid "ends with"
msgstr "结束于"
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
msgid "Exist"
msgstr "存在"
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
msgid "exists"
msgstr "存在"
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
msgid "Expression"
msgstr "表达式"
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
msgid "Follow Up"
msgstr "跟随"
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "重要"
+
+#: ../mail/em-filter-i18n.h:30
msgid "is"
msgstr "是"
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
msgid "is after"
msgstr "之后"
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
msgid "is before"
msgstr "之前"
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
msgid "is Flagged"
msgstr "已标志"
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
msgid "is greater than"
msgstr "大于"
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
msgid "is less than"
msgstr "小于"
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
msgid "is not"
msgstr "不是"
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
msgid "is not Flagged"
msgstr "未标志"
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "未设置"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "已设置"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
#: ../ui/evolution-mail-message.xml.h:48
msgid "Junk"
msgstr "垃圾"
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
msgid "Junk Test"
msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
msgid "Label"
msgstr "标签"
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
msgid "Mailing list"
msgstr "邮件列表"
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
msgid "Match All"
msgstr "全部匹配"
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
msgid "Message Body"
msgstr "信体"
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
msgid "Message Header"
msgstr "信头"
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
msgid "Message is Junk"
msgstr "是垃圾邮件"
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
msgid "Message is not Junk"
msgstr "不是垃圾邮件"
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
msgid "Move to Folder"
msgstr "移至文件夹"
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
msgid "Pipe to Program"
msgstr "管道到程序"
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
msgid "Play Sound"
msgstr "播放声音"
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
msgid "Read"
msgstr "已读"
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
msgid "Recipients"
msgstr "收件人"
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
msgid "Regex Match"
msgstr "正则表达式匹配"
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
msgid "Replied to"
msgstr "已回复到"
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
msgid "returns"
msgstr "返回"
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
msgid "returns greater than"
msgstr "返回大于"
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
msgid "returns less than"
msgstr "返回小于"
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
msgid "Run Program"
msgstr "运行程序"
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
msgid "Score"
msgstr "分数"
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
msgid "Sender"
msgstr "发送者"
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "设置标签"
+
+#: ../mail/em-filter-i18n.h:64
msgid "Set Status"
msgstr "设置状态"
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
msgid "Size (kB)"
msgstr "大小(kB)"
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
msgid "sounds like"
msgstr "发音类似"
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
msgid "Source Account"
msgstr "来源账户"
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
msgid "Specific header"
msgstr "指定信头"
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
msgid "starts with"
msgstr "开始于"
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1691
-#: ../mail/em-format-quote.c:320 ../mail/em-format.c:859
-#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1702
+#: ../mail/em-format-quote.c:322 ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
#: ../smime/lib/e-cert.c:1132
msgid "Subject"
msgstr "主题"
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
msgid "Unset Status"
msgstr "取消状态"
#. and now for the action area
-#: ../mail/em-filter-rule.c:488
+#: ../mail/em-filter-rule.c:489
msgid "Then"
msgstr "然后"
-#: ../mail/em-folder-browser.c:186
+#: ../mail/em-filter-rule.c:517
+msgid "Add Ac_tion"
+msgstr "添加动作(_T)"
+
+#: ../mail/em-folder-browser.c:189
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../mail/em-folder-browser.c:208
+#: ../mail/em-folder-browser.c:214
msgid "All Messages"
msgstr "全部信件"
-#: ../mail/em-folder-browser.c:209
+#: ../mail/em-folder-browser.c:215
msgid "Unread Messages"
msgstr "未读信件"
-#: ../mail/em-folder-browser.c:211
+#: ../mail/em-folder-browser.c:217
msgid "No Label"
msgstr "无标签"
-#: ../mail/em-folder-browser.c:218
+#: ../mail/em-folder-browser.c:224
msgid "Read Messages"
msgstr "已读信件"
-#: ../mail/em-folder-browser.c:219
+#: ../mail/em-folder-browser.c:225
msgid "Recent Messages"
msgstr "最近信件"
-#: ../mail/em-folder-browser.c:220
+#: ../mail/em-folder-browser.c:226
msgid "Last 5 Days' Messages"
msgstr "前五天的信件"
-#: ../mail/em-folder-browser.c:221
+#: ../mail/em-folder-browser.c:227
msgid "Messages with Attachments"
msgstr "有附件的信件"
-#: ../mail/em-folder-browser.c:222
+#: ../mail/em-folder-browser.c:228
msgid "Important Messages"
msgstr "重要信件"
-#: ../mail/em-folder-browser.c:223
+#: ../mail/em-folder-browser.c:229
msgid "Messages Not Junk"
msgstr "不是垃圾邮件"
-#: ../mail/em-folder-browser.c:1041
+#: ../mail/em-folder-browser.c:1123
msgid "Account Search"
msgstr "账户搜索"
-#: ../mail/em-folder-browser.c:1085
+#: ../mail/em-folder-browser.c:1176
msgid "All Account Search"
msgstr "全部账户搜索"
@@ -11163,53 +11213,53 @@ msgid_plural "Total messages:"
msgstr[0] "总信件数:"
#: ../mail/em-folder-properties.c:323
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Folder Properties"
msgstr "文件夹属性"
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
msgid "<click here to select a folder>"
msgstr "<单击此处以选择文件夹>"
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "创建"
+#: ../mail/em-folder-selector.c:262
+msgid "C_reate"
+msgstr "创建(_R)"
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:931 ../mail/mail-vfolder.c:1004
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
msgid "Search Folders"
msgstr "搜索文件夹"
#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
msgid "Drafts"
msgstr "草稿"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2558
-#: ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:88
#: ../plugins/exchange-operations/exchange-folder.c:593
msgid "Inbox"
msgstr "收件箱"
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
msgid "Outbox"
msgstr "发件箱"
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
msgid "Sent"
msgstr "已发箱"
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
msgid "Loading..."
msgstr "正在装入..."
@@ -11228,78 +11278,74 @@ msgstr "正在装入..."
#. * Do not translate the "folder-display|" part. Remove it
#. * from your translation.
#.
-#: ../mail/em-folder-tree.c:369
+#: ../mail/em-folder-tree.c:372
#, c-format
msgid "folder-display|%s (%u)"
msgstr "%s (%u)"
-#: ../mail/em-folder-tree.c:721
+#: ../mail/em-folder-tree.c:732
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:881
+#: ../mail/em-folder-tree.c:891
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:883
+#: ../mail/em-folder-tree.c:893
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:890 ../mail/message-list.c:1867
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1974
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移至文件夹 %s"
-#: ../mail/em-folder-tree.c:892 ../mail/message-list.c:1869
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1976
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:908
+#: ../mail/em-folder-tree.c:917
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信件放到顶级文件夹存储"
-#: ../mail/em-folder-tree.c:986 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ../mail/em-folder-tree.c:987 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
msgid "_Move to Folder"
msgstr "移至文件夹(_M)"
-#: ../mail/em-folder-tree.c:1697 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1056
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2097 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
+#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
#: ../ui/evolution-mail-messagedisplay.xml.h:8
#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../ui/evolution.xml.h:54
msgid "_View"
msgstr "查看(_V)"
-#: ../mail/em-folder-tree.c:2098
+#: ../mail/em-folder-tree.c:2095
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: ../mail/em-folder-tree.c:2102
-msgid "_Copy..."
-msgstr "复制(_C)..."
+#. FIXME: need to disable for nochildren folders
+#: ../mail/em-folder-tree.c:2100
+msgid "_New Folder..."
+msgstr "新建文件夹(_N)..."
#: ../mail/em-folder-tree.c:2103
msgid "_Move..."
msgstr "移动(_M)..."
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2107
-msgid "_New Folder..."
-msgstr "新建文件夹(_N)..."
-
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
msgid "_Rename..."
msgstr "重命名(_R)..."
@@ -11311,290 +11357,304 @@ msgstr "刷新(_F)"
msgid "Fl_ush Outbox"
msgstr "清空发件箱(_U)"
-#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:135
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
-#: ../mail/em-folder-utils.c:105
+#: ../mail/em-folder-utils.c:103
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1114
-#: ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1192
+#: ../mail/em-folder-view.c:1207
#: ../mail/importers/evolution-mbox-importer.c:86
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1129
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1207
msgid "C_opy"
msgstr "复制(_O)"
-#: ../mail/em-folder-utils.c:590
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: ../mail/em-folder-utils.c:749
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
msgid "Create folder"
msgstr "创建文件夹"
-#: ../mail/em-folder-utils.c:749
-#: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../mail/em-folder-utils.c:745
+#: ../plugins/groupwise-features/install-shared.c:168
+#: ../plugins/groupwise-features/share-folder-common.c:385
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:1050 ../mail/mail.error.xml.h:68
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:70
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/em-folder-view.c:1051 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-view.c:1097 ../mail/mail.error.xml.h:126
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/em-folder-view.c:1222 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1335 ../ui/evolution-mail-message.xml.h:128
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1224 ../mail/em-popup.c:574 ../mail/em-popup.c:585
+#: ../mail/em-folder-view.c:1337 ../mail/em-popup.c:578 ../mail/em-popup.c:589
#: ../ui/evolution-mail-message.xml.h:110
msgid "_Forward"
msgstr "转发(_F)"
#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1228 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1341 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1234
+#: ../mail/em-folder-view.c:1343
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "打印(_P)..."
+
+#: ../mail/em-folder-view.c:1347
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1235
+#: ../mail/em-folder-view.c:1348
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/em-folder-view.c:1236
+#: ../mail/em-folder-view.c:1349
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1239
+#: ../mail/em-folder-view.c:1352
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1240
+#: ../mail/em-folder-view.c:1353
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1241
+#: ../mail/em-folder-view.c:1354
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1242
+#: ../mail/em-folder-view.c:1355
msgid "Mark as Un_important"
msgstr "标记为不重要(_I)"
-#: ../mail/em-folder-view.c:1243
+#: ../mail/em-folder-view.c:1356
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1244
+#: ../mail/em-folder-view.c:1357
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1245
+#: ../mail/em-folder-view.c:1358
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1247
+#: ../mail/em-folder-view.c:1360
msgid "_Label"
msgstr "标签(_L)"
#. Note that we don't show this here, since by default a 'None' date
#. is not permitted.
-#: ../mail/em-folder-view.c:1248 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1361 ../widgets/misc/e-dateedit.c:498
msgid "_None"
msgstr "无(_N)"
-#: ../mail/em-folder-view.c:1253
+#: ../mail/em-folder-view.c:1364
+msgid "_New Label"
+msgstr "新建标签(_N)"
+
+#: ../mail/em-folder-view.c:1368
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1254
+#: ../mail/em-folder-view.c:1369
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1257
+#: ../mail/em-folder-view.c:1372
msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
-#: ../mail/em-folder-view.c:1258
-msgid "Search Folder from _Subject"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1374
+msgid "Search Folder based on _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1259
-msgid "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1260
-msgid "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1261
-msgid "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1377
+msgid "Search Folder based on Mailing _List"
msgstr "基于邮件列表的搜索文件夹(_L)"
-#: ../mail/em-folder-view.c:1265
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1382
+msgid "Filter based on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1266
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1267
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1268
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1385
+msgid "Filter based on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2098 ../mail/em-folder-view.c:2142
+#: ../mail/em-folder-view.c:2267 ../mail/em-folder-view.c:2311
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2355
+#: ../mail/em-folder-view.c:2529
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2374
+#: ../mail/em-folder-view.c:2548
msgid "Retrieving Message..."
msgstr "正在收取信件..."
-#: ../mail/em-folder-view.c:2602
+#: ../mail/em-folder-view.c:2807
msgid "C_all To..."
msgstr "呼叫到(_A)..."
-#: ../mail/em-folder-view.c:2605
+#: ../mail/em-folder-view.c:2810
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2606
+#: ../mail/em-folder-view.c:2811
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2607
+#: ../mail/em-folder-view.c:2812
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:2982
+#: ../mail/em-folder-view.c:3309
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: ../mail/em-folder-view.c:2994
+#: ../mail/em-folder-view.c:3321
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../mail/em-folder-view.c:2999
+#: ../mail/em-folder-view.c:3326
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:515
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
-msgstr "查找(_N):"
+#: ../mail/em-format-html-display.c:659
+msgid "Fin_d:"
+msgstr "查找(_D):"
#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:683
msgid "_Previous"
msgstr "上一项(_P)"
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:688
msgid "_Next"
msgstr "下一项(_N)"
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:693
msgid "M_atch case"
msgstr "匹配大小写(_A)"
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:635
+#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:641
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:992
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:636
+#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:642
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:993
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr "此信件已签名,而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:637
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:643
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:994
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:638
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:644
msgid "Valid signature, but cannot verify sender"
msgstr "签名有效,但是无法校验发送者"
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:995
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:942 ../mail/em-format-html.c:639
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:645
msgid "Signature exists, but need public key"
msgstr "签名已存在,但需要公钥"
-#: ../mail/em-format-html-display.c:942
+#: ../mail/em-format-html-display.c:996
msgid ""
"This message is signed with a signature, but there is no corresponding "
"public key."
msgstr "这封信的签名有效,但是没有相应的公钥。"
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:645
+#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:651
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:1003
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:646
+#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:652
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:1004
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 "
@@ -11603,21 +11663,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:647
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:653
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:1005
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:952 ../mail/em-format-html.c:648
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:654
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:1006
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 "
@@ -11626,91 +11686,91 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:1068
+#: ../mail/em-format-html-display.c:1122
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1387
+#: ../mail/em-format-html-display.c:1441
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%p%l:%M完成"
-#: ../mail/em-format-html-display.c:1395
+#: ../mail/em-format-html-display.c:1449
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1452
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%p%l:%M"
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1512
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1513
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1460
+#: ../mail/em-format-html-display.c:1514
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1461
+#: ../mail/em-format-html-display.c:1515
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2518
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
-#: ../mail/em-format-html-display.c:2119
+#: ../mail/em-format-html-display.c:2173
msgid "Save attachment as"
msgstr "附件另存为"
-#: ../mail/em-format-html-display.c:2123
+#: ../mail/em-format-html-display.c:2177
msgid "Select folder to save all attachments"
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:2174
+#: ../mail/em-format-html-display.c:2228
msgid "_Save Selected..."
msgstr "保存所选(_S)..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2241
+#: ../mail/em-format-html-display.c:2295
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d 个附件(_T)"
-#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
+#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
msgid "S_ave"
msgstr "保存(_A)"
-#: ../mail/em-format-html-display.c:2259
+#: ../mail/em-format-html-display.c:2313
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../mail/em-format-html-display.c:2322
+#: ../mail/em-format-html-display.c:2376
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2491
+#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
msgid "View _Unformatted"
msgstr "无格式查看(_U)"
-#: ../mail/em-format-html-display.c:2455
+#: ../mail/em-format-html-display.c:2509
msgid "Hide _Unformatted"
msgstr "无格式隐藏(_U)"
-#: ../mail/em-format-html-display.c:2510
+#: ../mail/em-format-html-display.c:2564
msgid "O_pen With"
msgstr "打开方式(_P)"
-#: ../mail/em-format-html-display.c:2581
+#: ../mail/em-format-html-display.c:2635
msgid ""
"Evolution cannot render this email as it is too large to handle. You can "
"view it unformatted or with an external text editor."
@@ -11723,191 +11783,223 @@ msgstr ""
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
+#: ../mail/em-format-html.c:495 ../mail/em-format-html.c:504
#, c-format
msgid "Retrieving `%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:910
+#: ../mail/em-format-html.c:916
msgid "Unknown external-body part."
msgstr "未知的 external-body 部分。"
-#: ../mail/em-format-html.c:918
+#: ../mail/em-format-html.c:924
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:948
+#: ../mail/em-format-html.c:954
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:959
+#: ../mail/em-format-html.c:965
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:961
+#: ../mail/em-format-html.c:967
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:982
+#: ../mail/em-format-html.c:988
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:993
+#: ../mail/em-format-html.c:999
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../mail/em-format-html.c:1220
+#: ../mail/em-format-html.c:1227
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1388
+#: ../mail/em-format-html.c:1394
msgid "Formatting Message..."
msgstr "正在格式化信件..."
-#: ../mail/em-format-html.c:1520 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "发件人"
-
-#: ../mail/em-format-html.c:1520 ../mail/em-format-quote.c:207
-#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:88
-msgid "Reply-To"
-msgstr "回复至"
-
-#: ../mail/em-format-html.c:1520 ../mail/em-format-html.c:1535
-#: ../mail/em-format-html.c:1599 ../mail/em-format-html.c:1621
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:857
-#: ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1546 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1632 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1520 ../mail/em-format-html.c:1536
-#: ../mail/em-format-html.c:1605 ../mail/em-format-html.c:1624
-#: ../mail/em-format-quote.c:207 ../mail/em-format.c:858
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1547 ../mail/em-format-html.c:1616
+#: ../mail/em-format-html.c:1635 ../mail/em-format-quote.c:209
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1695 ../mail/em-format-quote.c:329
-#: ../mail/em-mailer-prefs.c:1196
+#: ../mail/em-format-html.c:1706 ../mail/em-format-quote.c:331
+#: ../mail/em-mailer-prefs.c:1458
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1722
+#: ../mail/em-format-html.c:1733
msgid " (%a, %R %Z)"
msgstr " (%A,%R %Z)"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1727
+#: ../mail/em-format-html.c:1738
msgid " (%R %Z)"
msgstr " (%R %Z)"
-#: ../mail/em-format-html.c:1739 ../mail/em-format-quote.c:336
-#: ../mail/em-format.c:860 ../mail/em-mailer-prefs.c:93
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../mail/em-format-html.c:1750 ../mail/em-format-quote.c:338
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
msgid "Date"
msgstr "日期"
-#: ../mail/em-format-html.c:1762 ../mail/em-format.c:861
-#: ../mail/em-mailer-prefs.c:94
+#: ../mail/em-format-html.c:1773 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
msgid "Newsgroups"
msgstr "新闻组"
#. 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:1852
+#: ../mail/em-format-html.c:1866
#, c-format
msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
msgstr "此消息由 <b>%s</b> 以 <b>%s</b> 的身份发送"
-#: ../mail/em-format.c:1125
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
+msgid "From"
+msgstr "发件人"
+
+#: ../mail/em-format-quote.c:209 ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:91
+msgid "Reply-To"
+msgstr "回复至"
+
+#: ../mail/em-format.c:1157
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../mail/em-format.c:1164
+#: ../mail/em-format.c:1196
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 S/MIME 信件:未知错误"
-#: ../mail/em-format.c:1301 ../mail/em-format.c:1457
+#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信件。显示源文本。"
-#: ../mail/em-format.c:1309
+#: ../mail/em-format.c:1341
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../mail/em-format.c:1319
+#: ../mail/em-format.c:1351
msgid "Could not parse PGP/MIME message"
msgstr "无法解析 PGP/MIME 信件"
-#: ../mail/em-format.c:1319
+#: ../mail/em-format.c:1351
msgid "Could not parse PGP/MIME message: Unknown error"
msgstr "无法解析 PGP/MIME 信件:未知错误"
-#: ../mail/em-format.c:1476
+#: ../mail/em-format.c:1508
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../mail/em-format.c:1484 ../mail/em-format.c:1555
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../mail/em-format.c:1484 ../mail/em-format.c:1546 ../mail/em-format.c:1555
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
-#: ../mail/em-format.c:1626
+#: ../mail/em-format.c:1659
msgid "Could not parse PGP message"
msgstr "无法分析 PGP 信件"
-#: ../mail/em-format.c:1626
+#: ../mail/em-format.c:1659
msgid "Could not parse PGP message: Unknown error"
msgstr "无法解析 PGP 信件:未知错误"
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:108
msgid "Every time"
msgstr "每次"
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:109
msgid "Once per day"
msgstr "每天一次"
-#: ../mail/em-mailer-prefs.c:107
+#: ../mail/em-mailer-prefs.c:110
msgid "Once per week"
msgstr "每周一次"
-#: ../mail/em-mailer-prefs.c:108
+#: ../mail/em-mailer-prefs.c:111
msgid "Once per month"
msgstr "每月一次"
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr "添加自定义垃圾信头"
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr "信头名称:"
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr "信头值含有:"
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr "包含值"
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "颜色"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr "标签"
+
#. May be a better text
-#: ../mail/em-mailer-prefs.c:787 ../mail/em-mailer-prefs.c:841
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
#, c-format
msgid "%s plugin is available and the binary is installed."
msgstr "%s 插件可用,二进制文件已经安装。"
#. May be a better text
-#: ../mail/em-mailer-prefs.c:795 ../mail/em-mailer-prefs.c:850
+#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
msgstr "%s 插件不可用。请检查软件包是否已安装。"
-#: ../mail/em-mailer-prefs.c:816
+#: ../mail/em-mailer-prefs.c:1115
msgid "No Junk plugin available"
msgstr "没有可用的垃圾邮件插件"
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "待办"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "稍候"
+
#: ../mail/em-migrate.c:1211
msgid ""
"The location and hierarchy of the Evolution mailbox folders has changed "
@@ -11954,12 +12046,12 @@ msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2743
+#: ../mail/em-migrate.c:2827
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2762
+#: ../mail/em-migrate.c:2846
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -11967,62 +12059,62 @@ msgstr ""
"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
"坏。"
-#: ../mail/em-popup.c:570 ../mail/em-popup.c:581
+#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/em-popup.c:635
+#: ../mail/em-popup.c:639
msgid "_Add to Address Book"
msgstr "添加到地址簿(_A)"
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-subscribe-editor.c:595
msgid "This store does not support subscriptions, or they are not enabled."
msgstr "此存储不支持订阅,或订阅未启用。"
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:628
msgid "Subscribed"
msgstr "已订阅"
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:632
msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:837
+#: ../mail/em-subscribe-editor.c:834
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:858
+#: ../mail/em-subscribe-editor.c:855
msgid "No server has been selected"
msgstr "没有选中服务器"
-#: ../mail/em-utils.c:120
-msgid "Do not show this message again."
-msgstr "不再显示此信息。"
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "不再显示此信息(_D)。"
-#: ../mail/em-utils.c:315
+#: ../mail/em-utils.c:317
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:368
+#: ../mail/em-utils.c:370
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:563
+#: ../mail/em-utils.c:645
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:612
+#: ../mail/em-utils.c:694
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1096
+#: ../mail/em-utils.c:1178
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
@@ -12040,128 +12132,187 @@ msgid "Allows evolution to display text part of limited size"
msgstr "允许 Evolution 显示被限制大小的文本部分"
#: ../mail/evolution-mail.schemas.in.h:2
-msgid "Automatic link recognition"
-msgstr "自动识别链接"
+msgid "Always request read receipt"
+msgstr "总是请求阅读收条"
#: ../mail/evolution-mail.schemas.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "自动识别表情"
+msgid "Amount of time in seconds the error should be shown on the status bar."
+msgstr ""
#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
+msgstr "自动识别表情图标"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "Automatic link recognition"
+msgstr "自动识别链接"
+
+#: ../mail/evolution-mail.schemas.in.h:6
msgid "Check incoming mail being junk"
msgstr "检查收到的邮件是否是垃圾邮件"
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
msgid "Citation highlight color"
msgstr "引用突出颜色"
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
msgid "Citation highlight color."
msgstr "引用突出颜色。"
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
msgid "Composer Window default height"
msgstr "编写窗口的默认高度"
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
msgid "Composer Window default width"
msgstr "编写窗口的默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:12
msgid "Compress display of addresses in TO/CC/BCC"
msgstr "压缩 TO/CC/BCC 中地址的显示"
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
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:11
+#: ../mail/evolution-mail.schemas.in.h:14
msgid "Default charset in which to compose messages"
msgstr "编写信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
msgid "Default charset in which to compose messages."
msgstr "编写信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
msgid "Default charset in which to display messages"
msgstr "显示信件的默认字符集"
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
msgid "Default charset in which to display messages."
msgstr "显示信件的默认字符集。"
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
msgid "Default forward style"
msgstr "默认转发方式"
-#: ../mail/evolution-mail.schemas.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "撰写窗口的默认高度"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default height of the Composer Window."
+msgstr "撰写窗口的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:17
-msgid "Default height of the Message Window"
-msgstr "信件窗口的默认高度"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default height of the message window."
+msgstr "信件窗口的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "订阅对话框的默认高度"
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default height of the subscribe dialog."
+msgstr "订阅对话框的默认高度。"
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
msgid "Default reply style"
msgstr "默认回复样式"
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:23
msgid "Default value for thread expand state"
msgstr "话题的默认展开状态"
-#: ../mail/evolution-mail.schemas.in.h:21
-msgid "Default width of the Composer Window"
-msgstr "撰写窗口的默认宽度"
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default width of the Composer Window."
+msgstr "撰写窗口的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:22
-msgid "Default width of the Message Window"
-msgstr "信件窗口的默认宽度"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "信件窗口的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:23
-msgid "Default width of the Subscribe dialog"
-msgstr "订阅对话框的默认宽度"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "订阅对话框的默认宽度。"
-#: ../mail/evolution-mail.schemas.in.h:24
-msgid "Directory for saving mail component files"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:30
+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 "
+"checking speed."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid ""
+"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
+"lines in the \"Messages\" column in vertical view."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:32
+#, fuzzy
+msgid "Directory for loading/attaching files to composer."
msgstr "保存邮件组件文件的目录"
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:33
+msgid "Directory for saving mail component files."
+msgstr "保存邮件组件文件的目录。"
+
+#: ../mail/evolution-mail.schemas.in.h:34
msgid "Draw spelling error indicators on words as you type."
msgstr "在您打字的时候就显示拼写错误标识。"
-#: ../mail/evolution-mail.schemas.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:35
msgid "Empty Junk folders on exit"
msgstr "退出时清空垃圾邮件文件夹"
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:36
msgid "Empty Trash folders on exit"
msgstr "退出时清空回收站"
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:37
msgid "Empty all Junk folders when exiting Evolution."
msgstr "退出 Evolution 时清空垃圾邮件。"
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:38
msgid "Empty all Trash folders when exiting Evolution."
msgstr "退出 Evolution 时清空回收站。"
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:39
msgid "Enable caret mode, so that you can see a cursor when reading mail."
msgstr "启用光标模式,这样您在读取邮件时就能看到光标了。"
-#: ../mail/evolution-mail.schemas.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:40
+#, fuzzy
+msgid "Enable or disable magic space bar"
+msgstr "启用或禁用自动前进功能"
+
+#: ../mail/evolution-mail.schemas.in.h:41
msgid "Enable or disable type ahead search feature"
msgstr "启用或禁用自动前进功能"
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders"
+msgstr "启用搜索文件夹"
+
+#: ../mail/evolution-mail.schemas.in.h:43
+msgid "Enable search folders on startup."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:44
msgid ""
"Enable side bar search feature so that you can start interactive searching "
"by typing in the text. Use is that you can easily find a folder in that side "
@@ -12172,39 +12323,45 @@ msgstr ""
"您可以更加轻松地在侧边栏中找到文件夹,只需输入文件夹名称,然后选中范围就会自"
"动跳转到该文件夹。"
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:45
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "Enable to render message text part of limited size."
msgstr "允许渲染被限制大小的信件文本部分。"
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "Enable/disable caret mode"
msgstr "启用/禁用光标模式"
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:48
msgid "Height of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:49
msgid "Height of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:50
msgid "Hides the per-folder preview and removes the selection"
msgstr "隐藏单文件夹预览并移除选择"
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:51
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 "如果用户试图一次打开的信件大于等于十封,将会询问用户是否真的要这么做。"
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:52
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
msgstr "如果开启了“预览”面板,则以并列方式显示,而不是垂直方式显示。"
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:53
msgid ""
"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
"any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12214,38 +12371,48 @@ msgstr ""
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.h:41
-msgid ""
-"It disables the feature where repeated prompts to ask if offline sync is "
-"required."
-msgstr ""
-"禁用在需要离线同步时的不停的提示。"
-
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:54
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "禁用/启用对多封邮件的标记。"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr "禁用/启用在进入离线模式前的是否需要离线同步的不停的提示。"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+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:57
msgid "Last time empty junk was run"
msgstr "上次清空垃圾邮件的时间"
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Last time empty trash was run"
msgstr "上次清空回收站的时间"
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:59
+msgid "Level beyond which the message should be logged."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:60
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:61
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:62
msgid "List of accounts"
msgstr "账户列表"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:63
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12253,11 +12420,11 @@ msgstr ""
"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:64
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:65
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."
@@ -12265,258 +12432,262 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:66
msgid "List of mime types to check for bonobo component viewers"
msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:68
msgid "Load images for HTML messages over http"
msgstr "在 HTML 信件中装入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:69
+#, fuzzy
msgid ""
"Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
+"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 - 总是从网上装入图像"
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:74
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:75
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "Mark citations in the message \"Preview\""
msgstr "在信件“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:77
msgid "Mark citations in the message \"Preview\"."
msgstr "在信件“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "Message Window default height"
msgstr "信件窗口默认高度"
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "Message Window default width"
msgstr "信件窗口默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:80
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "信件显示风格(普通、全部邮件头、源代码)"
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "Minimum days between emptying the junk on exit"
msgstr "退出时清空垃圾信件的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:83
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "退出时清空垃圾信件的最少时间,以天计。"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.h:70
-msgid "New Mail Notify sound file"
-msgstr "新建邮件通知声音文件"
-
-#: ../mail/evolution-mail.schemas.in.h:71
-msgid "New Mail Notify type"
-msgstr "新建邮件通知类型"
-
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:88
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Prompt to check if the user wants to go offline immediately"
msgstr "用户想立即离线时提示检查"
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:90
+msgid "Prompt when deleting messages in search folder"
+msgstr "删除搜索文件夹中的信件时提示"
+
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:94
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:81
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Prompt while marking multiple messages"
msgstr "标记多封信件时提示"
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:98
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "识别文本中的表情,并将其替换为图像。"
+
+#: ../mail/evolution-mail.schemas.in.h:99
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.h:85
-msgid "Recognize smileys in text and replace them with images."
-msgstr "识别文本中的表情,并将其替换为图像。"
-
-#: ../mail/evolution-mail.schemas.in.h:86
-msgid "Run junk test on incoming mail"
-msgstr "对收到的邮件运行垃圾邮件测试"
+#: ../mail/evolution-mail.schemas.in.h:100
+msgid "Run junk test on incoming mail."
+msgstr "对收到的邮件运行垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Save directory"
msgstr "保存目录"
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:102
msgid "Search for the sender photo in local addressbooks"
msgstr "在本地地址薄中搜索发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:105
+msgid "Sender email-address column in the message list"
+msgstr "在信件列表中显示 email 地址列"
+
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信件列表中显示删除了的信件(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:109
msgid "Show deleted messages in the message-list"
msgstr "在信件列表中显示删除了的信件"
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "Show photo of the sender"
msgstr "显示发件人照片"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:113
msgid ""
-"Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr ""
-"在信件列表的信件组合列中显示电子邮件的发送者"
+"Show the email-address of the sender in a separate column in the message "
+"list."
+msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:114
msgid "Show the photo of the sender in the message reading pane."
msgstr "在信件阅读面板中显示发件人照片。"
-#: ../mail/evolution-mail.schemas.in.h:100
-msgid "Show the sender email in the messages column in the message list"
-msgstr "在信件列表中显示发送者的电子邮件"
-
-#: ../mail/evolution-mail.schemas.in.h:101
-msgid "Sound file to play when new mail arrives."
-msgstr "新邮件到达时要播放的声音文件。"
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid "Specifies the header to check for junk."
+msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:102
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "指定用户想要使用的新邮件通知类型。"
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid ""
+"Specifies the header to check for junk. The format is headername=value in "
+"gconf."
+msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:118
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:119
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Text message part limit"
msgstr "文本信件部分限制"
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "The default plugin for Junk hook"
msgstr "默认的垃圾信件钩子插件"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "The last time empty junk was run, in days since the epoch."
msgstr "上次清空垃圾信件的时间,以自新纪元后的天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "The last time empty trash was run, in days since the epoch."
msgstr "上次清空回收站的时间,以新纪元后的天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:111
-msgid "The terminal font for mail display"
-msgstr "邮件显示用的终端字体"
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "The terminal font for mail display."
+msgstr "邮件显示用的终端字体。"
-#: ../mail/evolution-mail.schemas.in.h:112
-msgid "The variable width font for mail display"
-msgstr "用于显示邮件的变宽字体"
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "The variable width font for mail display."
+msgstr "用于显示邮件的变宽字体。"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:127
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:128
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 interms of KB."
@@ -12524,24 +12695,24 @@ msgstr ""
"此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB,单位"
"为 KB。"
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:129
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 "
"to the other available plugins."
msgstr ""
-"这是默认的垃圾邮件插件,即使启用了多个插件。如果默认列出的插件"
-"被禁用,它不会缺省到其它可用的插件。"
+"这是默认的垃圾邮件插件,即使启用了多个插件。如果默认列出的插件被禁用,它不会"
+"缺省到其它可用的插件。"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:130
msgid ""
"This key is read only once and reset to false after read. This unselects the "
"mail in the list and removes the preview for that folder."
msgstr ""
-"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的"
-"邮件并移除相应文件夹的预览。"
+"此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
+"件夹的预览。"
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:131
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;"
@@ -12551,142 +12722,162 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "This option would help in improving the speed of fetching."
msgstr "此选项能帮助提高获取信件的速度"
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:133
msgid ""
"This sets the number of addresses to show in default message list view, "
"beyond which a '...' is shown."
msgstr "设定默认信件视图中要显示的地址数,超过的部分显示为“...”。"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:134
+#, fuzzy
msgid ""
"This setting specifies whether the threads should be in expanded or "
-"collapsed state by default. Evolution requires a restart"
-msgstr ""
-"此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
+"collapsed state by default. Evolution requires a restart."
+msgstr "此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:135
+#, fuzzy
+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 "
+"restart."
+msgstr "此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
+
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "Thread the message list."
msgstr "按线索编排信件列表。"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "Thread the message-list"
msgstr "按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:123
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:139
+#, fuzzy
+msgid "Timeout for marking message as seen"
msgstr "将信件标为已看的超时"
-#: ../mail/evolution-mail.schemas.in.h:124
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:140
+#, fuzzy
+msgid "Timeout for marking message as seen."
msgstr "将信件标为已看的超时。"
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "UID string of the default account."
msgstr "默认账户的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:142
msgid "Use SpamAssassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Use SpamAssassin daemon and client (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
msgstr "使用垃圾克星守护程序和客户(spamc/spamd)"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:144
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.h:129
-msgid "Use custom fonts for displaying mail"
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Use custom fonts for displaying mail."
msgstr "使用自定义字体显示邮件"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:146
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:147
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:148
msgid "Use side-by-side or wide layout"
msgstr "使用并排还是宽屏布局"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:149
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:150
msgid "View/Bcc menu item is checked"
msgstr "选中了查看/Bcc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:151
msgid "View/Bcc menu item is checked."
msgstr "选中了查看/Bcc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:152
msgid "View/Cc menu item is checked"
msgstr "选中了查看/Cc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:153
msgid "View/Cc menu item is checked."
msgstr "选中了查看/Cc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:154
msgid "View/From menu item is checked"
msgstr "选中了查看/From 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:155
msgid "View/From menu item is checked."
msgstr "选中了查看/From 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:156
msgid "View/PostTo menu item is checked"
msgstr "选中了查看/PostTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:157
msgid "View/PostTo menu item is checked."
msgstr "选中了查看/PostTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:158
msgid "View/ReplyTo menu item is checked"
msgstr "选中了查看/ReplyTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:159
msgid "View/ReplyTo menu item is checked."
msgstr "选中了查看/ReplyTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:161
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 头时强制按主题编排线索。"
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid "Whether sort threads based on latest message in that thread"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
msgid "Width of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:164
msgid "Width of the message-list pane."
msgstr "信件列表面板的高度。"
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:184
msgid "Importing Elm data"
msgstr "导入 Elm 数据"
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:369
msgid "Evolution Elm importer"
msgstr "Evolution Elm 导入器"
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:370
msgid "Import mail from Elm."
msgstr "从 Elm 导入邮件。"
@@ -12710,12 +12901,12 @@ msgstr "导入器 Berkeley 邮箱格式文件夹"
msgid "Importing mailbox"
msgstr "导入邮箱"
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:515
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
#, c-format
msgid "Importing `%s'"
msgstr "导入“%s”"
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:372
#, c-format
msgid "Scanning %s"
msgstr "扫描 %s"
@@ -12724,11 +12915,11 @@ msgstr "扫描 %s"
msgid "Importing Pine data"
msgstr "导入 Pine 数据"
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
msgid "Evolution Pine importer"
msgstr "Evolution Pine 导入器"
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
msgid "Import mail from Pine."
msgstr "从 Pine 导入邮件。"
@@ -12756,138 +12947,166 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-component.c:530
+#: ../mail/mail-component.c:536
+#, fuzzy, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "已选中 %d 个,"
+
+#: ../mail/mail-component.c:540
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../mail/mail-component.c:532
+#: ../mail/mail-component.c:542
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../mail/mail-component.c:535
+#: ../mail/mail-component.c:545
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../mail/mail-component.c:537
+#: ../mail/mail-component.c:547
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../mail/mail-component.c:539
+#: ../mail/mail-component.c:549
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../mail/mail-component.c:545
+#: ../mail/mail-component.c:555
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] ",%d 封未读,"
-#: ../mail/mail-component.c:546
+#: ../mail/mail-component.c:556
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:550
-#, c-format
-msgid " %d selected, "
-msgid_plural " %d selected, "
-msgstr[0] "已选中 %d 个,"
-
-#: ../mail/mail-component.c:880
+#: ../mail/mail-component.c:896
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:881
+#: ../mail/mail-component.c:897
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:882
+#: ../mail/mail-component.c:898
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:888
+#: ../mail/mail-component.c:904
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:905
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:906
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:1037
+#: ../mail/mail-component.c:1053
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
-#: ../mail/mail-config.c:81
-msgid "I_mportant"
-msgstr "重要(_M)"
+#: ../mail/mail-component.c:1522
+msgid "Error"
+msgstr ""
-#. red
-#: ../mail/mail-config.c:82
-msgid "_Work"
-msgstr "工作(_W)"
+#: ../mail/mail-component.c:1522
+msgid "Errors"
+msgstr ""
-#. orange
-#: ../mail/mail-config.c:83
-msgid "_Personal"
-msgstr "个人(_P)"
+#: ../mail/mail-component.c:1523
+msgid "Warnings and Errors"
+msgstr ""
-#. forest green
-#: ../mail/mail-config.c:84
-msgid "_To Do"
-msgstr "待办(_T)"
+#: ../mail/mail-component.c:1524
+msgid "Debug"
+msgstr ""
-#. blue
-#: ../mail/mail-config.c:85
-msgid "_Later"
-msgstr "稍候(_L)"
+#: ../mail/mail-component.c:1524
+msgid "Error, Warnings and Debug messages"
+msgstr ""
+
+#: ../mail/mail-component.c:1634
+#, fuzzy
+msgid "Debug Logs"
+msgstr "Web 日志"
+
+#: ../mail/mail-component.c:1638
+msgid "Show _errors in the status bar for"
+msgstr ""
+
+#: ../mail/mail-component.c:1645
+#, fuzzy
+msgid "seconds."
+msgstr "秒"
+
+#: ../mail/mail-component.c:1655
+#, fuzzy
+msgid "Log Messages:"
+msgstr "信件"
+
+#: ../mail/mail-component.c:1707
+msgid "Log Level"
+msgstr ""
+
+#: ../mail/mail-component.c:1714 ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "时间"
+
+#: ../mail/mail-component.c:1721 ../mail/message-list.c:2406
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "信件"
#: ../mail/mail-config.glade.h:1
msgid " Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart of the application)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:4
msgid "<b>SSL is not supported in this build of Evolution</b>"
msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
msgid "<b>Sender Photograph</b>"
msgstr "<b>发送者照片</b>"
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:6
msgid "<b>Sig_natures</b>"
msgstr "<b>签名(_N)</b>"
-#: ../mail/mail-config.glade.h:6
+#: ../mail/mail-config.glade.h:7
msgid "<b>Top Posting Option</b> (Not Recommended)"
msgstr "<b>Top Posting 选项</b> (不推荐)"
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
msgid "<b>_Languages</b>"
msgstr "<b>语言(_L)</b>"
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">账户信息</span>"
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">认证类型</span>"
-
#: ../mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">身份验证</span>"
@@ -12909,12 +13128,14 @@ msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">删除邮件</span>"
#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
+#, fuzzy
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">标签和颜色</span>"
+#, fuzzy
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">警告</span>"
#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Loading Images</span>"
@@ -12933,46 +13154,47 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">信件收条</span>"
#: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">新邮件提醒</span>"
-
-#: ../mail/mail-config.glade.h:24
#: ../plugins/publish-calendar/publish-calendar.glade.h:3
msgid "<span weight=\"bold\">Optional Information</span>"
msgstr "<span weight=\"bold\">可选信息</span>"
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">选项</span>"
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">打印字体</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">请求的信息</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">安全</span>"
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">服务器配置</span>"
+#: ../mail/mail-config.glade.h:32
+#, fuzzy
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">认证类型</span>"
+
#: ../mail/mail-config.glade.h:34
msgid "Account Management"
msgstr "账户管理"
@@ -12990,7 +13212,8 @@ msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该账户时总是发送签名信件(_W)"
#: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
+#, fuzzy
+msgid "Also encrypt to sel_f when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_F)"
#: ../mail/mail-config.glade.h:39
@@ -13006,66 +13229,75 @@ msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
#: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
+#, fuzzy
+msgid "Always encrypt to _myself when sending encrypted messages"
msgstr "当发送加密邮件时总是对自身加密(_M)"
#: ../mail/mail-config.glade.h:43
+#, fuzzy
+msgid "Always request rea_d receipt"
+msgstr "请求阅读收条(_E)"
+
+#: ../mail/mail-config.glade.h:44
msgid "Attach original message"
msgstr "附加原始信件"
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
+#: ../mail/mail-config.glade.h:46
+#, fuzzy
+msgid "Automatically insert _emoticon images"
msgstr "自动插入表情图像(_S)"
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的语(ISO-8859-13)"
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的语(ISO-8859-4)"
-#: ../mail/mail-config.glade.h:48
+#: ../mail/mail-config.glade.h:49
msgid "C_haracter set:"
msgstr "字符集(_H):"
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.glade.h:50
+#, fuzzy
+msgid "C_heck custom headers for junk"
+msgstr "检查收到的邮件是否是垃圾邮件(_C)"
+
+#: ../mail/mail-config.glade.h:51
msgid "Ch_eck for Supported Types "
msgstr "检查支持的类型(_E)"
-#: ../mail/mail-config.glade.h:50
-msgid "Check in_coming mail for junk"
+#: ../mail/mail-config.glade.h:52
+#, fuzzy
+msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾邮件(_C)"
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.glade.h:53
msgid "Check spelling while I _type"
msgstr "在我输入时进行拼写检查(_T)"
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.glade.h:54
msgid "Checks incoming mail messages to be Junk"
msgstr "检查收到的信件是否是垃圾邮件"
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:55
msgid "Cle_ar"
msgstr "清除(_A)"
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:56
msgid "Clea_r"
msgstr "清除(_R)"
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:57
msgid "Color for _misspelled words:"
msgstr "给错误拼写的单词着色(_M):"
-#: ../mail/mail-config.glade.h:56
-msgid "Colors"
-msgstr "颜色"
-
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.glade.h:58
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.glade.h:59
msgid ""
"Congratulations, your mail configuration is complete.\n"
"\n"
@@ -13080,141 +13312,164 @@ msgstr ""
"\n"
"单击“应用”可保存您的设置。"
-#: ../mail/mail-config.glade.h:64
+#: ../mail/mail-config.glade.h:65
msgid "De_fault"
msgstr "默认(_F)"
-#: ../mail/mail-config.glade.h:65
+#: ../mail/mail-config.glade.h:66
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N):"
-#: ../mail/mail-config.glade.h:67
-msgid "Delete junk mails on e_xit"
+#: ../mail/mail-config.glade.h:68
+#, fuzzy
+msgid "Delete junk messages on e_xit"
msgstr "退出时删除垃圾邮件(_X)"
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
+#: ../mail/mail-config.glade.h:70
+#, fuzzy
+msgid "Digitally sign o_utgoing messages (by default)"
msgstr "对寄出的信件进行数字签名(默认)(_S)"
-#: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in mails if the text si_ze exceeds"
+#: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:72
+#, fuzzy
+msgid "Do not format text contents in messages if the text si_ze exceeds"
msgstr "如果文本超出大小限制,则不格式化邮件中的文本内容(_Z)"
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.glade.h:73
msgid "Do not quote original message"
msgstr "无法引用原始信件"
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:74
msgid "Done"
msgstr "完成"
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
msgid "Drafts _Folder:"
msgstr "草稿文件夹(_F):"
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
msgid "Email Accounts"
msgstr "电子邮件"
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
msgid "Email _Address:"
msgstr "电子邮件地址(_A):"
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
msgid "Empty trash folders on e_xit"
msgstr "退出时清空已删除邮件(_X)"
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr ""
+
+#: ../mail/mail-config.glade.h:80
+#, fuzzy
+msgid "Enable Sea_rch Folders"
+msgstr "搜索文件夹"
+
+#: ../mail/mail-config.glade.h:81
msgid "Encry_ption certificate:"
msgstr "加密证书(_P):"
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
msgid "Encrypt out_going messages (by default)"
msgstr "加密寄出的信件(默认)(_G)"
-#: ../mail/mail-config.glade.h:81
+#: ../mail/mail-config.glade.h:84
msgid "Fi_xed-width:"
msgstr "等宽(_X):"
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:85
msgid "Fix_ed width Font:"
msgstr "等宽字体(_E):"
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:86
msgid "Font Properties"
msgstr "字体属性"
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
msgid "Format messages in _HTML"
msgstr "用 HTML 格式化信件(_H)"
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:88
msgid "Full Nam_e:"
msgstr "全名(_E):"
-#: ../mail/mail-config.glade.h:87
-msgid "HTML Mail"
-msgstr "HTML 邮件"
+#: ../mail/mail-config.glade.h:90
+#, fuzzy
+msgid "HTML Messages"
+msgstr "信件"
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:91
msgid "Headers"
msgstr "信头"
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:92
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:94
msgid "Inline"
msgstr "嵌入"
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:95
msgid "Inline original message (Outlook style)"
msgstr "嵌入原消息(Outlook 风格)"
-#: ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.glade.h:97
msgid "KB"
msgstr "KB"
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+#, fuzzy
+msgid "Labels"
+msgstr "标签"
+
+#: ../mail/mail-config.glade.h:99
msgid "Languages Table"
msgstr "语言表"
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
msgid "Mail Configuration"
msgstr "邮件配置"
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:103
msgid "Mailbox location"
msgstr "邮件箱位置"
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:104
msgid "Message Composer"
msgstr "信件撰写器"
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:106
msgid ""
"Note: you will not be prompted for a password until you connect for the "
"first time"
msgstr "注意:直到您第一次连接的时候,才会询问密码。"
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
msgid "Or_ganization:"
msgstr "组织(_G):"
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:108
msgid "PGP/GPG _Key ID:"
msgstr "PGP/GPG 键标识(_K):"
-#: ../mail/mail-config.glade.h:108
-msgid "Play sound file when new mail arri_ves"
-msgstr "新邮件到达时播放声音文件(_V)"
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
msgid ""
"Please enter a descriptive name for this account in the space below.\n"
"This name will be used for display purposes only."
@@ -13222,7 +13477,7 @@ msgstr ""
"请在下面的空白处输入此账户的描述性名称。\n"
"此名称将只在显示时使用。"
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
msgid ""
"Please enter information about the way you will send mail. If you are not "
"sure, ask your system administrator or Internet Service Provider."
@@ -13230,7 +13485,7 @@ msgstr ""
"请在下面输入您的发件服务器信息。如果您不太确定的话,请询问您的系统管理员或者"
"互联网服务提供商ISP。"
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
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 "
@@ -13239,133 +13494,113 @@ msgstr ""
"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入,除非您想要在您发"
"出的邮件中包含此信息。"
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
msgid "Please select among the following options"
msgstr "请从以下选项中选择"
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
msgid "Pr_ompt when sending messages with only Bcc recipients defined"
msgstr "发送只有暗送收件人的信件时提示(_O)"
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
msgid "Quote original message"
msgstr "引用原始信件"
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
msgid "Quoted"
msgstr "引用"
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
msgid "Re_member password"
msgstr "记住密码(_M)"
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
msgid "Re_ply-To:"
msgstr "回复到(_P):"
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
msgid "Remember _password"
msgstr "记住密码(_P)"
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
msgid "S_earch for sender photograph only in local addressbooks"
msgstr "仅在本地地址簿中搜索发件人照片(_E)"
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:123
msgid "S_elect..."
msgstr "选择(_E)..."
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
msgid "S_end message receipts:"
msgstr "发送信件收条(_E):"
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.glade.h:125
-msgid "Se_lect..."
-msgstr "选择(_L)..."
-
#: ../mail/mail-config.glade.h:127
-msgid "Select Drafts Folder"
-msgstr "选择草稿文件夹"
-
-#: ../mail/mail-config.glade.h:128
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:128
msgid "Select HTML fixed width font for printing"
msgstr "选择用于打印的 HTML 固定宽度字体"
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:129
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:130
msgid "Select HTML variable width font for printing"
msgstr "选择用于打印的 HTML 变宽度字体"
#: ../mail/mail-config.glade.h:132
-msgid "Select Sent Folder"
-msgstr "选择已发文件夹"
-
-#: ../mail/mail-config.glade.h:133
-msgid "Select sound file"
-msgstr "选择声音文件"
-
-#: ../mail/mail-config.glade.h:135
msgid "Sending Mail"
msgstr "发送邮件"
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:133
msgid "Sent _Messages Folder:"
msgstr "已发送信件文件夹(_M):"
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:134
msgid "Ser_ver requires authentication"
msgstr "服务器需要认证(_V)"
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:135
msgid "Server _Type: "
msgstr "服务器类型(_T):"
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:136
msgid "Sig_ning certificate:"
msgstr "签名证书(_N):"
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.glade.h:137
msgid "Signat_ure:"
msgstr "签名(_U):"
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.glade.h:138
msgid "Signatures"
msgstr "签名"
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:139
msgid "Signatures Table"
msgstr "签名表"
-#: ../mail/mail-config.glade.h:143
-msgid "Specify _filename:"
-msgstr "指定文件名(_F):"
-
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:140
msgid "Spell Checking"
msgstr "拼写检查"
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.glade.h:141
msgid "T_ype: "
msgstr "类型(_Y):"
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.glade.h:142
msgid ""
"The list of languages here reflects only the languages for which you have a "
"dictionary installed."
msgstr "在此列出的语言反映了您所安装的字典。"
-#: ../mail/mail-config.glade.h:147
+#: ../mail/mail-config.glade.h:143
msgid ""
"The output of this script will be used as your\n"
"signature. The name you specify will be used\n"
@@ -13374,7 +13609,12 @@ msgstr ""
"此脚本的输出将用于您的签名。您指定的名称将只会\n"
"用于显示。"
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:146
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr ""
+
+#: ../mail/mail-config.glade.h:147
msgid ""
"Type the name by which you would like to refer to this account.\n"
"For example: \"Work\" or \"Personal\""
@@ -13382,15 +13622,16 @@ msgstr ""
"输入您想要给此帐户起的名字。\n"
"如:“工作”或“私人”"
-#: ../mail/mail-config.glade.h:153 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
msgid "User_name:"
msgstr "用户名(_N):"
-#: ../mail/mail-config.glade.h:154
+#: ../mail/mail-config.glade.h:150
msgid "V_ariable-width:"
msgstr "变宽(_A):"
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.glade.h:151
msgid ""
"Welcome to the Evolution Mail Configuration Assistant.\n"
"\n"
@@ -13400,104 +13641,103 @@ msgstr ""
"\n"
"单击“前进”开始。"
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:154
msgid "_Add Signature"
msgstr "添加签名(_A)"
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.glade.h:155
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
-#: ../mail/mail-config.glade.h:161
-msgid "_Beep when new mail arrives"
-msgstr "新邮件到达时响铃(_B)"
-
-#: ../mail/mail-config.glade.h:162
+#: ../mail/mail-config.glade.h:156
msgid "_Default junk plugin:"
msgstr "默认的垃圾邮件插件(_D):"
-#: ../mail/mail-config.glade.h:163
-msgid "_Do not notify me when new mail arrives"
-msgstr "新邮件到达时不要提醒我(_D)"
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:157
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:159
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:160
msgid "_Keep Signature above the original message on replying"
msgstr "回复时保留原始信件的签名(_K)"
-#: ../mail/mail-config.glade.h:168
-msgid "_Load images in mail from contacts"
+#: ../mail/mail-config.glade.h:161
+#, fuzzy
+msgid "_Load images in messages from contacts"
msgstr "装入联系人发来的邮件中的图像(_L)"
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:162
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:163
msgid "_Mark messages as read after"
msgstr "把信件标记为已读前等(_M)"
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:165
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 装入图像(_N)"
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:166
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:167
msgid "_Prompt when sending HTML messages to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:168
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的信件时提示(_P)"
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:169
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:170
msgid "_Script:"
msgstr "脚本(_S):"
+#: ../mail/mail-config.glade.h:171
+#, fuzzy
+msgid "_Select..."
+msgstr "选择(_E)..."
+
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:174
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
-#: ../mail/mail-config.glade.h:181
-msgid "_Show the photograph of sender in the email preview"
+#: ../mail/mail-config.glade.h:175
+#, fuzzy
+msgid "_Show the photograph of sender in the message preview"
msgstr "在电子邮件预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:176
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:177
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:178
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:179
msgid "addresses"
msgstr "个地址"
-#: ../mail/mail-config.glade.h:186
+#: ../mail/mail-config.glade.h:180
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:187
+#: ../mail/mail-config.glade.h:181
msgid "description"
msgstr "描述"
@@ -13545,7 +13785,7 @@ msgstr "查找(_I):"
msgid "Find in Message"
msgstr "在信件中查找"
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
msgid "Flag to Follow Up"
msgstr "跟随的标志"
@@ -13597,7 +13837,7 @@ msgstr "标志(_F):"
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-folder-cache.c:877
+#: ../mail/mail-folder-cache.c:826
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
@@ -13606,17 +13846,17 @@ msgstr "查验 %s"
msgid "Filtering Selected Messages"
msgstr "过滤选中的信件"
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
msgid "Fetching Mail"
msgstr "收取邮件"
#. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
#, c-format
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -13625,12 +13865,17 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+#, fuzzy
+msgid "Sending message"
+msgstr "发送信件(_S)"
+
+#: ../mail/mail-ops.c:734
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
@@ -13640,15 +13885,15 @@ msgstr "发送第%d封信,共%d封"
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:696
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:698
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
@@ -13662,75 +13907,75 @@ msgstr "把信件移至 %s"
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1164
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1205
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1270
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1341
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹 %s"
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1430
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1493
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1494
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1548
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1585 ../mail/mail-ops.c:1635
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1632
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1633
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1714
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1821
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1906
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1976
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13739,11 +13984,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2048
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2060 ../mail/mail-ops.c:2066
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13752,74 +13997,75 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2076
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2222
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2222
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2361
+#: ../mail/mail-ops.c:2318
#, c-format
msgid "Preparing account '%s' for offline"
msgstr "正在准备脱机使用账户“%s”"
-#: ../mail/mail-ops.c:2444
+#: ../mail/mail-ops.c:2404
msgid "Checking Service"
msgstr "检查服务"
-#: ../mail/mail-send-recv.c:161
+#: ../mail/mail-send-recv.c:190
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:387
+#: ../mail/mail-send-recv.c:393
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:400
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:502
+#: ../mail/mail-send-recv.c:510
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:575
+#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:783
+#: ../mail/mail-send-recv.c:810
+#, c-format
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:205
#, c-format
msgid "Enter Passphrase for %s"
msgstr "输入 %s 的密码"
-#: ../mail/mail-session.c:204
+#: ../mail/mail-session.c:207
msgid "Enter Passphrase"
msgstr "输入密码"
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:210
#: ../plugins/exchange-operations/exchange-config-listener.c:711
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:209
+#: ../mail/mail-session.c:212
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:251
+#: ../mail/mail-session.c:254
msgid "User canceled operation."
msgstr "用户己取消操作。"
@@ -13832,7 +14078,6 @@ msgid "Enter a name for this signature."
msgstr "输入该签名的名字。"
#: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
msgid "Name:"
msgstr "名称:"
@@ -13860,26 +14105,26 @@ msgstr "转发的信件"
msgid "Invalid folder: `%s'"
msgstr "无效的文件夹:“%s”"
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
#, c-format
msgid "Setting up Search Folder: %s"
msgstr "设置搜索文件夹:%s"
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
#, c-format
msgid "Updating Search Folders for '%s:%s'"
msgstr "更新“%s:%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
#, c-format
msgid "Updating Search Folders for '%s'"
msgstr "更新“%s”的搜索文件夹"
-#: ../mail/mail-vfolder.c:1043
+#: ../mail/mail-vfolder.c:1059
msgid "Edit Search Folder"
msgstr "编辑搜索文件夹"
-#: ../mail/mail-vfolder.c:1127
+#: ../mail/mail-vfolder.c:1148
msgid "New Search Folder"
msgstr "新建搜索文件夹"
@@ -14077,107 +14322,116 @@ msgid "Delete account?"
msgstr "删除账户吗?"
#: ../mail/mail.error.xml.h:45
+#, fuzzy
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr "无法添加搜索文件夹“{0}”。"
+
+#: ../mail/mail.error.xml.h:46
+#, fuzzy
+msgid "Delete messages in Search Folder?"
+msgstr "把选中的信件复制到其它文件夹"
+
+#: ../mail/mail.error.xml.h:47
msgid "Discard changes?"
msgstr "丢弃更改吗?"
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
msgid "Do not d_elete"
msgstr "不删除(_E)"
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:49
msgid "Do not delete"
msgstr "不删除"
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:50
msgid "Do not disable"
msgstr "不禁用"
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:51
msgid "Do you want the operation to be performed also in the subfolders?"
msgstr "您是否想要也在子文件夹中执行操作?"
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:52
msgid ""
"Do you want to locally synchronize the folders that are marked for offline "
"usage?"
-msgstr ""
-"您想要同步那些标记为离线使用的文件夹吗?"
+msgstr "您想要同步那些标记为离线使用的文件夹吗?"
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:53
msgid "Do you want to mark all messages as read?"
msgstr "您是否想要把所有信件标记为已读?"
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:54
msgid "Do you wish to save your changes?"
msgstr "您希望保存更改吗?"
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:55
msgid "Enter password."
msgstr "输入密码。"
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:56
msgid "Error loading filter definitions."
msgstr "装入过滤器定义错误。"
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:57
msgid "Error while performing operation."
msgstr "执行操作时出错。"
-#: ../mail/mail.error.xml.h:56
+#: ../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 "如果您继续的话,您将无法恢复这些信件。"
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:62
msgid ""
"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
msgid "If you proceed, all proxy accounts will be deleted permanently."
msgstr "如果您继续的话,全部代理服务器账户都将被永久删除。"
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:64
msgid ""
"If you proceed, the account information and\n"
"all proxy information will be deleted permanently."
msgstr "如果您继续的话,账户信息及其全部代理服务器信息将被永久删除。"
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:66
msgid "If you proceed, the account information will be deleted permanently."
msgstr "如果您继续的话,账户信息将被永久删除。"
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:67
msgid ""
"If you quit, these messages will not be sent until Evolution is started "
"again."
msgstr "如果您退出,这些信件将会等到 Evolution 下次启动才会发出。"
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:68
msgid "Ignore"
msgstr "忽略"
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:69
msgid "Invalid authentication"
msgstr "无效的身份验证"
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:71
msgid "Mail filters automatically updated."
msgstr "邮件过滤器已自动更新。"
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:72
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 "
@@ -14188,39 +14442,39 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:73
msgid "Mark all messages as read"
msgstr "把所有信件标记为已读"
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:74
msgid "Mark all messages in this folder and subfolders as read?"
msgstr "将此文件夹及其子文件夹中的信件全部标记为已读吗?"
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:75
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:77
msgid "No sources selected."
msgstr "没有选中源。"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:78
msgid "Only on _Current Folder"
msgstr "只对当前文件夹(_C)"
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:79
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:80
msgid "Please check your account settings and try again."
msgstr "请检查您的账户设置,然后再试一次。"
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:81
msgid "Please enable the account or send using another account."
msgstr "请启用账户或者使用其它账户发送。"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:82
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."
@@ -14228,72 +14482,72 @@ msgstr ""
"请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
"邮件地址。"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:83
+#, fuzzy
msgid ""
"Please make sure the following recipients are willing and able to receive "
"HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
msgstr ""
"请确定下列收件人愿意并且能够接收 HTML 邮件:\n"
"{0}\n"
"仍然发送吗?"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
msgid "Please provide an unique name to identify this signature."
msgstr "请提供此签名的唯一标识名称。"
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:86
msgid "Please wait."
msgstr "请稍候。"
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:87
msgid "Problem migrating old mail folder &quot;{0}&quot;."
msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
msgid "Querying server"
msgstr "查询服务器"
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:89
msgid "Querying server for a list of supported authentication mechanisms."
msgstr "查询服务器所支持的身份验证算法列表。"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
msgid "Read receipt requested."
msgstr "阅读收条已请求。"
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:91
msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
msgid "Search Folders automatically updated."
msgstr "搜索文件夹已自动更新。"
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:93
msgid "Send Receipt"
msgstr "发送收条"
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:94
msgid "Signature Already Exists"
msgstr "签名已经存在"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
msgid "Synchronize"
msgstr "同步"
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
msgid "Synchronize folders locally for offline usage?"
msgstr "同步文件夹到本地以脱机使用吗?"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
msgid ""
"System folders are required for Evolution to function correctly and cannot "
"be renamed, moved, or deleted."
msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -14308,7 +14562,7 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:101
msgid ""
"The following Search Folder(s):\n"
"{0}\n"
@@ -14322,7 +14576,7 @@ msgstr ""
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:106
msgid ""
"The following filter rule(s):\n"
"{0}\n"
@@ -14336,87 +14590,94 @@ msgstr ""
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
msgid "The script file must exist and be executable."
msgstr "脚本文件必须存在且可执行。"
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
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:113
+#: ../mail/mail.error.xml.h:114
msgid ""
"This message cannot be sent because the account you chose to send with is "
"not enabled"
msgstr "无法发送此信件,因为您所选择用来发送的账户未启用"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:115
msgid ""
"This message cannot be sent because you have not specified any recipients"
msgstr "无法发送此信件,因为您没有指定任何收件人"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:116
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:117
msgid "This signature has been changed, but has not been saved."
msgstr "签名已经更改,但尚未保存。"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
msgid ""
"This will mark all messages as read in the selected folder and its "
"subfolders."
msgstr "这将把选中文件夹及其子文件夹中的全部信件标记为已读。"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:119
msgid "Unable to connect to the GroupWise server."
msgstr "无法连接到 GroupWise 服务器。"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
msgstr "无法打开此账户的草稿文件夹。使用系统的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:121
msgid "Unable to read license file."
msgstr "无法读取许可文件。"
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
msgid "Use _Default"
msgstr "使用默认值(_D)"
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:123
msgid "Use default drafts folder?"
msgstr "使用默认的草稿文件夹吗?"
#: ../mail/mail.error.xml.h:124
+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 ""
+
+#: ../mail/mail.error.xml.h:127
msgid "You have not filled in all of the required information."
msgstr "您没有填入所需的全部信息。"
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您有未发信件,您仍然想要退出吗?"
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
msgid "You may not create two accounts with the same name."
msgstr "您不能创建两个同名账户。"
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
msgid "You must name this Search Folder."
msgstr "您必须为此搜索文件夹命名。"
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -14425,102 +14686,98 @@ msgstr ""
"您必须一次至少指定一个文件夹作为源。\n"
"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "您以“{1}”的身份登录到服务器“{0}”失败。"
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
msgid "_Append"
msgstr "追加(_A)"
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
msgid "_Do not Synchronize"
msgstr "不同步(_D)"
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
msgid "_Open Messages"
msgstr "打开信件(_O)"
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:143
msgid "on Current Folder and _Subfolders"
msgstr "在当前文件夹及其子文件夹中(_S)"
-#: ../mail/message-list.c:1022
+#: ../mail/message-list.c:1053
msgid "Unseen"
msgstr "未看"
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1054
msgid "Seen"
msgstr "已看"
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1055
msgid "Answered"
msgstr "已答复"
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1056
msgid "Multiple Unseen Messages"
msgstr "多封未看信件"
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1057
msgid "Multiple Messages"
msgstr "多封信"
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1061
msgid "Lowest"
msgstr "最低"
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1062
msgid "Lower"
msgstr "较低"
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1066
msgid "Higher"
msgstr "较高"
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1067
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1614 ../widgets/table/e-cell-date.c:55
msgid "?"
msgstr "?"
#. strftime format of a time,
#. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:203
+#: ../mail/message-list.c:1621 ../plugins/itip-formatter/itip-view.c:206
#: ../widgets/table/e-cell-date.c:70
msgid "Today %l:%M %p"
msgstr "今天%p%l:%M"
-#: ../mail/message-list.c:1524 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1630 ../widgets/table/e-cell-date.c:80
msgid "Yesterday %l:%M %p"
msgstr "昨天%p%l:%M"
-#: ../mail/message-list.c:1536 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1642 ../widgets/table/e-cell-date.c:92
msgid "%a %l:%M %p"
msgstr "%A%p%l:%M"
-#: ../mail/message-list.c:1544 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1650 ../widgets/table/e-cell-date.c:100
msgid "%b %d %l:%M %p"
msgstr "%m月%d日%p%l:%M"
-#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1652 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
-#: ../mail/message-list.c:2306 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "信件"
-
-#: ../mail/message-list.c:3755
+#: ../mail/message-list.c:3849
msgid "Generating message list"
msgstr "生成信件列表"
@@ -14540,15 +14797,15 @@ msgstr "已标志"
msgid "Follow Up Flag"
msgstr "跟随标志"
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
msgid "Received"
msgstr "已接收"
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
msgid "Sent Messages"
msgstr "已发信件"
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
msgid "Size"
msgstr "大小"
@@ -14577,15 +14834,15 @@ msgstr "转发"
msgid "No Response Necessary"
msgstr "不必回复"
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
msgid "Reply"
msgstr "回复"
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
msgid "Reply to All"
msgstr "全部回复"
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
msgid "Review"
msgstr "回顾"
@@ -14626,20 +14883,27 @@ msgid "Enable attachment reminder plugin"
msgstr "启用附件提醒插件"
#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+#, fuzzy
+msgid "Enable attachment reminder plugin."
+msgstr "启用附件提醒插件"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
msgid ""
"List of clues for the attachment reminder plugin to look for in a message "
"body"
-msgstr ""
-"消息主体中的用于附件提醒插件的线索列表"
+msgstr "消息主体中的用于附件提醒插件的线索列表"
-#: ../plugins/attachment-reminder/attachment-reminder.c:376
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+#, fuzzy
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "消息主体中的用于附件提醒插件的线索列表"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
msgid "Keywords"
msgstr "关键字"
-#: ../plugins/attachment-reminder/attachment-reminder.c:422
-msgid "Attachment Reminder Preferences"
-msgstr "附件提醒首选项"
-
#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
msgid "Remind _missing attachments"
msgstr "提醒缺少的附件(_M)"
@@ -14653,15 +14917,13 @@ msgstr "附件提醒"
msgid ""
"Looks for clues in a message for mention of attachments and warns if the "
"attachment is missing"
-msgstr ""
-"在信件中搜索提及附件的线索并在无附件时警告"
+msgstr "在信件中搜索提及附件的线索并在无附件时警告"
#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
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:3
msgid "Message has no attachments"
@@ -14708,8 +14970,8 @@ msgid ""
"Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
msgstr ""
-"您可以从备份中恢复 Evolution。它能够恢复所有邮件、日历、任"
-"务、备忘和联系人。\n"
+"您可以从备份中恢复 Evolution。它能够恢复所有邮件、日历、任务、备忘和联系"
+"人。\n"
"它还能恢复您的所有的个人设置和邮件过滤器等。"
#: ../plugins/backup-restore/backup-restore.c:244
@@ -14744,60 +15006,60 @@ msgstr "重新启动 Evolution"
msgid "With Graphical User Interface"
msgstr "带图形用户界面"
-#: ../plugins/backup-restore/backup.c:67
-#: ../plugins/backup-restore/backup.c:107
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
msgid "Shutting down Evolution"
msgstr "关闭 Evolution"
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:74
msgid "Backing Evolution accounts and settings"
msgstr "备份 Evolution 的账户及设置"
-#: ../plugins/backup-restore/backup.c:77
+#: ../plugins/backup-restore/backup.c:78
msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
msgstr "备份 Evolution 数据(邮件、联系人、日历、任务、备忘)"
-#: ../plugins/backup-restore/backup.c:87
+#: ../plugins/backup-restore/backup.c:88
msgid "Backup complete"
msgstr "备份完成"
-#: ../plugins/backup-restore/backup.c:92
-#: ../plugins/backup-restore/backup.c:133
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
msgid "Restarting Evolution"
msgstr "重新启动 Evolution"
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:114
msgid "Backup current Evolution data"
msgstr "备份当前 Evolution 数据"
-#: ../plugins/backup-restore/backup.c:116
+#: ../plugins/backup-restore/backup.c:119
msgid "Extracting files from backup"
msgstr "从备份中提取文件"
-#: ../plugins/backup-restore/backup.c:122
+#: ../plugins/backup-restore/backup.c:125
msgid "Loading Evolution settings"
msgstr "装入 Evolution 的设置"
-#: ../plugins/backup-restore/backup.c:126
+#: ../plugins/backup-restore/backup.c:129
msgid "Removing temporary backup files"
msgstr "删除临时备份文件"
-#: ../plugins/backup-restore/backup.c:244
+#: ../plugins/backup-restore/backup.c:249
#, c-format
msgid "Backing up to the folder %s"
msgstr "正在备份到文件夹 %s"
-#: ../plugins/backup-restore/backup.c:249
+#: ../plugins/backup-restore/backup.c:254
#, c-format
msgid "Restoring from the folder %s"
msgstr "正在从文件夹 %s 中恢复"
#. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:270
msgid "Evolution Backup"
msgstr "Evolution 备份"
-#: ../plugins/backup-restore/backup.c:264
+#: ../plugins/backup-restore/backup.c:270
msgid "Evolution Restore"
msgstr "Evolution 恢复"
@@ -14826,9 +15088,9 @@ msgid ""
"you want Evolution to restart automatically after backup, please enable the "
"toggle button."
msgstr ""
-"Evolution 备份只能在 Evolution 未运行时启动。请确保在开始之前您"
-"保存和关闭了您的所有的未保存的窗口。如果您想让 Evolution 在备份"
-"后自动重启动,请启用切换按钮。"
+"Evolution 备份只能在 Evolution 未运行时启动。请确保在开始之前您保存和关闭了您"
+"的所有的未保存的窗口。如果您想让 Evolution 在备份后自动重启动,请启用切换按"
+"钮。"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
msgid "Invalid Evolution backup file"
@@ -14846,11 +15108,9 @@ msgid ""
"you proceed. If you want Evolution to restart automatically restart after "
"restore, please enable the toggle button."
msgstr ""
-"这将删除您当前的所有 Evolution 数据和设置并从您的备份中恢复它们。"
-"Evolution 恢复只能在 Evolution 未运行时启动。请确保在开始之前您"
-"保存和关闭了您的所有的未保存的窗口。如果您想让 Evolution 在恢复"
-"后自动重启动,请启用切换按钮。"
-
+"这将删除您当前的所有 Evolution 数据和设置并从您的备份中恢复它们。Evolution 恢"
+"复只能在 Evolution 未运行时启动。请确保在开始之前您保存和关闭了您的所有的未保"
+"存的窗口。如果您想让 Evolution 在恢复后自动重启动,请启用切换按钮。"
#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
msgid "Backup and restore Evolution data and settings"
@@ -14864,38 +15124,39 @@ msgstr "恢复设置(_E)..."
msgid "_Backup Settings..."
msgstr "备份设置(_B)..."
-#: ../plugins/bbdb/bbdb.c:451 ../plugins/bbdb/bbdb.c:460
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:475
+#: ../plugins/bbdb/bbdb.c:565
+#, fuzzy
msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+"_Automatically create entries in the addressbook when responding to messages"
msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:481
+#: ../plugins/bbdb/bbdb.c:571
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../plugins/bbdb/bbdb.c:496
+#: ../plugins/bbdb/bbdb.c:586
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:511
+#: ../plugins/bbdb/bbdb.c:601
msgid ""
"Periodically synchronize contact information and images from Pidgin buddy "
"list"
msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
-#: ../plugins/bbdb/bbdb.c:517
+#: ../plugins/bbdb/bbdb.c:607
msgid "Select Address book for Pidgin buddy list"
msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:528
+#: ../plugins/bbdb/bbdb.c:618
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
@@ -14912,12 +15173,14 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:305
-msgid "Convert mail text to _Unicode"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+#, fuzzy
+msgid "Convert message text to _Unicode"
msgstr "将邮件文本转换为 _Unicode"
#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
-msgid "Convert mail text to Unicode"
+#, fuzzy
+msgid "Convert mail messages to Unicode"
msgstr "将邮件文本转换为 Unicode"
#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
@@ -14945,6 +15208,7 @@ msgid "_URL:"
msgstr "_URL:"
#: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:351
msgid "Use _SSL"
msgstr "使用 _SSL"
@@ -14966,6 +15230,7 @@ msgstr "提供本地日历的核心功能。"
#: ../plugins/calendar-http/calendar-http.c:273
#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:375
msgid "_Refresh:"
msgstr "刷新(_R):"
@@ -15069,8 +15334,13 @@ msgstr "默认邮件客户端"
msgid "Do you want to make Evolution your default e-mail client?"
msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端?"
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:626
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
msgid "Mark as _default folder"
msgstr "标为默认文件夹(_D)"
@@ -15182,30 +15452,32 @@ msgstr "文件夹大小"
msgid "Exchange Settings"
msgstr "Exchange 设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:618
+#: ../plugins/exchange-operations/exchange-account-setup.c:625
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:644
+#: ../plugins/exchange-operations/exchange-account-setup.c:651
msgid "A_uthenticate"
msgstr "身份验证(_U)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:837
-msgid "Authentication Type"
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
+#, fuzzy
+msgid "_Authentication Type"
msgstr "身份验证类型"
-#: ../plugins/exchange-operations/exchange-account-setup.c:851
+#: ../plugins/exchange-operations/exchange-account-setup.c:868
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:957
+#: ../plugins/exchange-operations/exchange-account-setup.c:980
#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:959
+#: ../plugins/exchange-operations/exchange-account-setup.c:982
#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
msgid "0 KB"
msgstr "0 KB"
@@ -15252,34 +15524,32 @@ msgstr "您目前的密码已经过期。请立即更改您的密码。"
msgid "Your password will expire in the next %d days"
msgstr "您的密码即将于 %d 后过期"
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:159
+#: ../plugins/exchange-operations/exchange-delegates-user.c:164
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1558
msgid "Custom"
msgstr "自定义"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates-user.c:194
#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
msgid "Editor (read, create, edit)"
msgstr "编辑(读取、创建、编辑)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates-user.c:198
#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
msgid "Author (read, create)"
msgstr "作者(读取、创建)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates-user.c:202
#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
msgid "Reviewer (read-only)"
msgstr "复查者(只读)"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:247
+#: ../plugins/exchange-operations/exchange-delegates-user.c:252
#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
msgid "Delegate Permissions"
msgstr "代理权限"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:258
+#: ../plugins/exchange-operations/exchange-delegates-user.c:263
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
#, c-format
msgid "Permissions for %s"
@@ -15288,7 +15558,7 @@ msgstr "%s 的权限"
#. To translators: This is a part of the message to be sent to the delegatee
#. summarizing the permissions assigned to him.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
msgid ""
"This message was sent automatically by Evolution to inform you that you have "
"been designated as a delegate. You can now send messages on my behalf."
@@ -15298,25 +15568,25 @@ msgstr ""
#. To translators: Another chunk of the same message.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+#: ../plugins/exchange-operations/exchange-delegates-user.c:358
msgid "You have been given the following permissions on my folders:"
msgstr "你在我的文件夹上拥有下列权限:"
#. To translators: This message is included if the delegatee has been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+#: ../plugins/exchange-operations/exchange-delegates-user.c:376
msgid "You are also permitted to see my private items."
msgstr "你还可以查看我的私人项目。"
#. To translators: This message is included if the delegatee has not been given access
#. to the private items.
#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+#: ../plugins/exchange-operations/exchange-delegates-user.c:383
msgid "However you are not permitted to see my private items."
msgstr "但是你不能查看我的私人项目。"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#: ../plugins/exchange-operations/exchange-delegates-user.c:415
#, c-format
msgid "You have been designated as a delegate for %s"
msgstr "您现在已经被授权为 %s 的代理人"
@@ -15408,15 +15678,15 @@ msgstr "任务(_T):"
msgid "Permissions..."
msgstr "权限..."
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
msgid "Folder Name"
msgstr "文件夹名称"
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
msgid "Folder Size"
msgstr "文件夹大小"
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:310
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:316
#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
msgid "Subscribe to Other User's Folder"
msgstr "订阅其他用户的文件夹"
@@ -15782,7 +16052,7 @@ msgid "Folder offline"
msgstr "文件夹脱机"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1280
+#: ../shell/e-shell.c:1288
msgid "Generic error"
msgstr "常规错误"
@@ -15830,8 +16100,7 @@ msgstr "密码已经成功更改。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr ""
-"请输入一个代理人 ID 或取消选中“以代理人身份发送”选项。"
+msgstr "请输入一个代理人 ID 或取消选中“以代理人身份发送”选项。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Please make sure the Global Catalog Server name is correct."
@@ -15918,8 +16187,7 @@ msgstr "您即将用完您在此服务器上的存储邮件的配额。"
msgid ""
"You are permitted to send a message on behalf of only one delegator at a "
"time."
-msgstr ""
-"您被允许每次只能够以一个(而非多个)代理人的身份发送信件。"
+msgstr "您被允许每次只能够以一个(而非多个)代理人的身份发送信件。"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid "You cannot make yourself your own delegate"
@@ -15975,37 +16243,55 @@ msgstr "订阅其他用户的任务"
msgid "Check folder permissions"
msgstr "更改文件夹权限"
-#: ../plugins/face/face.c:58
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr ""
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#, fuzzy
+msgid "External Editor"
+msgstr "联系人编辑器"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+#, fuzzy
+msgid "Compose in External Editor"
+msgstr "编写窗口的默认宽度"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr ""
+
+#: ../plugins/face/face.c:57
msgid "Select a (48*48) png of size < 700bytes"
msgstr "选择一个小于 700B 的 48*48 的 PNG 图像"
-#: ../plugins/face/face.c:68
+#: ../plugins/face/face.c:67
msgid "PNG files"
msgstr "PNG 文件"
-#: ../plugins/face/face.c:73
-msgid "Select a (48*48) png of size < 720bytes"
-msgstr "选择一个小于 720B 的 48*48 的 PNG 图像"
-
#: ../plugins/face/org-gnome-face-ui.xml.h:1
msgid "_Face"
msgstr "头像(_F)"
#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+#, fuzzy
msgid ""
-"Attach Face header to outgoing mails. First time the user needs to configure "
-"a 48*48 png image. It is base64 encoded and stored in ~/.evolution/faces "
-"This will be used in mails that are sent further."
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
msgstr ""
-"在发出的邮件的邮件头中附上头像。第一次使用时用户需要配置一个 48*48 "
-"的 PNG 图象。它以 base64 编码并保存在 ~/.evolution/faces 下。这将在"
-"以后发出的邮件中使用。"
+"在发出的邮件的邮件头中附上头像。第一次使用时用户需要配置一个 48*48 的 PNG 图"
+"象。它以 base64 编码并保存在 ~/.evolution/faces 下。这将在以后发出的邮件中使"
+"用。"
#: ../plugins/face/org-gnome-face.eplug.xml.h:2
msgid "Face"
msgstr "头像"
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
#, c-format
msgid "Unsubscribing from folder \"%s\""
msgstr "无法退订文件夹“%s”"
@@ -16022,6 +16308,22 @@ msgstr "退订文件夹"
msgid "_Unsubscribe"
msgstr "退订(_U)"
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+#, fuzzy
+msgid "Google"
+msgstr "切换"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+#, fuzzy
+msgid "A plugin to setup google calendar."
+msgstr "设置 Hula 日历源的插件。"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+#, fuzzy
+msgid "Google sources"
+msgstr "资源"
+
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
msgid "Checklist"
msgstr "待办清单"
@@ -16034,7 +16336,7 @@ msgstr "设置 Groupwise 日历和联系人源的插件。"
msgid "Groupwise Account Setup"
msgstr "Groupwise 账户设置"
-#: ../plugins/groupwise-features/install-shared.c:215
+#: ../plugins/groupwise-features/install-shared.c:219
#, c-format
msgid ""
"The user '%s' has shared a folder with you\n"
@@ -16059,11 +16361,11 @@ msgstr ""
"单击“前进”可安装共享文件夹\n"
"\n"
-#: ../plugins/groupwise-features/install-shared.c:220
+#: ../plugins/groupwise-features/install-shared.c:224
msgid "Install the shared folder"
msgstr "安装共享文件夹"
-#: ../plugins/groupwise-features/install-shared.c:222
+#: ../plugins/groupwise-features/install-shared.c:226
msgid "Shared Folder Installation"
msgstr "共享文件夹安装"
@@ -16135,27 +16437,29 @@ msgstr "暂时接受"
msgid "<b>Users:</b>"
msgstr "<b>用户数:</b>"
+#: ../plugins/groupwise-features/properties.glade.h:2
+#, fuzzy
+msgid "C_ustomize notification message"
+msgstr "自定义通知消息(_C)"
+
#: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:507
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "联系人..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
msgid "Message"
msgstr "消息"
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
msgid "Shared Folder Notification"
msgstr "共享文件夹通知"
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
msgid "The participants will receive the following notification.\n"
msgstr "收件人将接收到下列通知。\n"
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "联系人(_C)..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "自定义通知消息(_C)"
-
#: ../plugins/groupwise-features/properties.glade.h:12
msgid "_Not Shared"
msgstr "未共享(_N)"
@@ -16205,14 +16509,15 @@ msgid "Subscribe to my _notifications"
msgstr "订阅我的通知(_N)"
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "读取(_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
msgid "_Write"
msgstr "写入(_W)"
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#, fuzzy
+msgid "permission to read|_Read"
+msgstr "没有权限"
+
#: ../plugins/groupwise-features/proxy-listing.glade.h:1
msgid "Proxy"
msgstr "代理服务器"
@@ -16248,28 +16553,28 @@ msgstr "代理服务器标签仅当账户联机时才可用。"
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代理服务器标签仅当账户启用时才可用。"
-#: ../plugins/groupwise-features/share-folder-common.c:322
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
msgid "Users"
msgstr "用户"
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
msgid "Enter the users and set permissions"
msgstr "输入用户及设定权限"
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
msgid "New _Shared Folder..."
msgstr "新建共享文件夹(_S)..."
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
msgid "Sharing"
msgstr "共享"
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:766
msgid "Add "
msgstr "添加"
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:772
msgid "Modify"
msgstr "修改"
@@ -16290,36 +16595,37 @@ msgstr "发件人:"
msgid "Creation date:"
msgstr "创建日期:"
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:187
msgid "Recipient: "
msgstr "收件人:"
-#: ../plugins/groupwise-features/status-track.c:193
+#: ../plugins/groupwise-features/status-track.c:194
msgid "Delivered: "
msgstr "已投递:"
-#: ../plugins/groupwise-features/status-track.c:199
+#: ../plugins/groupwise-features/status-track.c:200
msgid "Opened: "
msgstr "已打开:"
-#: ../plugins/groupwise-features/status-track.c:204
+#: ../plugins/groupwise-features/status-track.c:205
msgid "Accepted: "
msgstr "已接受:"
-#: ../plugins/groupwise-features/status-track.c:209
+#: ../plugins/groupwise-features/status-track.c:210
msgid "Deleted: "
msgstr "已删除:"
-#: ../plugins/groupwise-features/status-track.c:214
+#: ../plugins/groupwise-features/status-track.c:215
msgid "Declined: "
msgstr "已拒绝:"
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:220
msgid "Completed: "
msgstr "已完成:"
-#: ../plugins/groupwise-features/status-track.c:224
-msgid "Un-delivered: "
+#: ../plugins/groupwise-features/status-track.c:225
+#, fuzzy
+msgid "Undelivered: "
msgstr "未投递:"
#: ../plugins/groupwise-features/status-track.c:249
@@ -16334,15 +16640,11 @@ msgstr "设置 Hula 日历源的插件。"
msgid "Hula Account Setup"
msgstr "Hula 账户设置"
-#: ../plugins/imap-features/imap-headers.c:134
-msgid "Custom Header"
-msgstr "自定义信头"
-
-#: ../plugins/imap-features/imap-headers.c:259
+#: ../plugins/imap-features/imap-headers.c:322
msgid "Custom Headers"
msgstr "自定义信头"
-#: ../plugins/imap-features/imap-headers.c:269
+#: ../plugins/imap-features/imap-headers.c:335
msgid "IMAP Headers"
msgstr "IMAP 信头"
@@ -16395,28 +16697,28 @@ msgstr "实现 IMAP 账户特性的插件。"
msgid "IMAP Features"
msgstr "IMAP 特性"
-#: ../plugins/import-ics-attachments/icsimporter.c:83
+#: ../plugins/import-ics-attachments/icsimporter.c:82
msgid "_Import to Calendar"
msgstr "导入到日历(_I)"
-#: ../plugins/import-ics-attachments/icsimporter.c:88
+#: ../plugins/import-ics-attachments/icsimporter.c:87
msgid "_Import to Tasks"
msgstr "导入到任务(_I)"
-#: ../plugins/import-ics-attachments/icsimporter.c:206
+#: ../plugins/import-ics-attachments/icsimporter.c:205
msgid "Import ICS"
msgstr "导入 ICS"
-#: ../plugins/import-ics-attachments/icsimporter.c:233
+#: ../plugins/import-ics-attachments/icsimporter.c:228
msgid "Select Task List"
msgstr "选择任务列表"
-#: ../plugins/import-ics-attachments/icsimporter.c:237
+#: ../plugins/import-ics-attachments/icsimporter.c:232
msgid "Select Calendar"
msgstr "选择日历"
-#: ../plugins/import-ics-attachments/icsimporter.c:267
-#: ../shell/e-shell-importer.c:700
+#: ../plugins/import-ics-attachments/icsimporter.c:263
+#: ../shell/e-shell-importer.c:703
msgid "_Import"
msgstr "导入(_I)"
@@ -16429,36 +16731,37 @@ msgstr "导入到日历"
msgid "Imports ICS attachments to calendar."
msgstr "将 ICS 附件导入到日历。"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:33
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
msgid "Hardware Abstraction Layer not loaded"
msgstr "硬件抽象层(HAL)尚未加载"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
msgid ""
"The \"hald\" service is required but not currently running. Please enable "
"the service and rerun this program, or contact your system administrator."
msgstr ""
-"需要“hald”服务但它目前尚未运行。请启用该服务并重新支持此程"
-"序,或联系您的系统管理员。"
+"需要“hald”服务但它目前尚未运行。请启用该服务并重新支持此程序,或联系您的系统"
+"管理员。"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:66
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
msgid "Search for an iPod failed"
msgstr "搜索 iPod 失败"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:67
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
msgid ""
"Evolution could not find an iPod to synchronize with. Either the iPod is not "
"connected to the system or it is not powered on."
msgstr ""
"Evolution 找不到要同步的 iPod。您可能没有将其连接到系统,或者没有开机。"
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/ical-format.c:133
+#: ../plugins/save-calendar/ical-format.c:190
msgid "iCalendar format (.ics)"
msgstr "iCalendar 格式(.ics)"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
+#, fuzzy
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
msgstr "将选中的任务/日历/地址簿与 Apple iPod 同步"
#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
@@ -16469,639 +16772,643 @@ msgstr "同步到 iPod"
msgid "iPod Synchronization"
msgstr "iPod 同步"
-#: ../plugins/itip-formatter/itip-formatter.c:428
-#: ../plugins/itip-formatter/itip-formatter.c:549
+#: ../plugins/itip-formatter/itip-formatter.c:439
+#: ../plugins/itip-formatter/itip-formatter.c:564
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "装入日历“%s”失败"
-#: ../plugins/itip-formatter/itip-formatter.c:569
+#: ../plugins/itip-formatter/itip-formatter.c:584
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../plugins/itip-formatter/itip-formatter.c:595
+#: ../plugins/itip-formatter/itip-formatter.c:610
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../plugins/itip-formatter/itip-formatter.c:671
+#: ../plugins/itip-formatter/itip-formatter.c:686
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../plugins/itip-formatter/itip-formatter.c:678
+#: ../plugins/itip-formatter/itip-formatter.c:693
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../plugins/itip-formatter/itip-formatter.c:682
+#: ../plugins/itip-formatter/itip-formatter.c:697
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../plugins/itip-formatter/itip-formatter.c:686
+#: ../plugins/itip-formatter/itip-formatter.c:701
msgid "Unable to find this memo in any memo list"
msgstr "无法在任何备忘列表中找到此备忘"
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:772
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../plugins/itip-formatter/itip-formatter.c:922
+#: ../plugins/itip-formatter/itip-formatter.c:935
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../plugins/itip-formatter/itip-formatter.c:980
+#: ../plugins/itip-formatter/itip-formatter.c:993
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:992
+#: ../plugins/itip-formatter/itip-formatter.c:1005
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../plugins/itip-formatter/itip-formatter.c:996
+#: ../plugins/itip-formatter/itip-formatter.c:1009
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../plugins/itip-formatter/itip-formatter.c:1001
+#: ../plugins/itip-formatter/itip-formatter.c:1014
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../plugins/itip-formatter/itip-formatter.c:1006
+#: ../plugins/itip-formatter/itip-formatter.c:1019
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1113
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1120
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1109
+#: ../plugins/itip-formatter/itip-formatter.c:1122
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1194
+#: ../plugins/itip-formatter/itip-formatter.c:1207
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新,原因是状态无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1221
+#: ../plugins/itip-formatter/itip-formatter.c:1234
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1225
+#: ../plugins/itip-formatter/itip-formatter.c:1238
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../plugins/itip-formatter/itip-formatter.c:1250
+#: ../plugins/itip-formatter/itip-formatter.c:1263
msgid "Meeting information sent"
msgstr "会议信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1253
+#: ../plugins/itip-formatter/itip-formatter.c:1266
msgid "Task information sent"
msgstr "任务信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1256
+#: ../plugins/itip-formatter/itip-formatter.c:1269
msgid "Memo information sent"
msgstr "备忘信息已发送"
-#: ../plugins/itip-formatter/itip-formatter.c:1265
+#: ../plugins/itip-formatter/itip-formatter.c:1278
msgid "Unable to send meeting information, the meeting does not exist"
msgstr "无法发送会议信息,会议不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1268
+#: ../plugins/itip-formatter/itip-formatter.c:1281
msgid "Unable to send task information, the task does not exist"
msgstr "无法发送任务信息,任务不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1271
+#: ../plugins/itip-formatter/itip-formatter.c:1284
msgid "Unable to send memo information, the memo does not exist"
msgstr "无法发送备忘信息,备忘不存在"
-#: ../plugins/itip-formatter/itip-formatter.c:1346
-#: ../plugins/itip-formatter/itip-formatter.c:1361
+#: ../plugins/itip-formatter/itip-formatter.c:1359
+#: ../plugins/itip-formatter/itip-formatter.c:1374
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1347
-#: ../plugins/itip-formatter/itip-formatter.c:1362
+#: ../plugins/itip-formatter/itip-formatter.c:1360
+#: ../plugins/itip-formatter/itip-formatter.c:1375
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
-#: ../plugins/itip-formatter/itip-formatter.c:1397
-#: ../plugins/itip-formatter/itip-formatter.c:1415
-#: ../plugins/itip-formatter/itip-formatter.c:1496
+#: ../plugins/itip-formatter/itip-formatter.c:1410
+#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1510
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1398
-#: ../plugins/itip-formatter/itip-formatter.c:1416
-#: ../plugins/itip-formatter/itip-formatter.c:1497
+#: ../plugins/itip-formatter/itip-formatter.c:1411
+#: ../plugins/itip-formatter/itip-formatter.c:1429
+#: ../plugins/itip-formatter/itip-formatter.c:1511
msgid ""
"The message does contain a calendar, but the calendar contains no events, "
"tasks or free/busy information"
msgstr "信件的确包含日历,但是日历不包含事件、任务或忙/闲信息"
-#: ../plugins/itip-formatter/itip-formatter.c:1427
+#: ../plugins/itip-formatter/itip-formatter.c:1440
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1441
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
-#: ../plugins/itip-formatter/itip-formatter.c:2047
+#: ../plugins/itip-formatter/itip-formatter.c:2138
msgid "This meeting recurs"
msgstr "此会议重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2050
+#: ../plugins/itip-formatter/itip-formatter.c:2141
msgid "This task recurs"
msgstr "此任务重现"
-#: ../plugins/itip-formatter/itip-formatter.c:2053
+#: ../plugins/itip-formatter/itip-formatter.c:2144
msgid "This memo recurs"
msgstr "此备忘重现"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2254
+#: ../plugins/itip-formatter/itip-formatter.c:2359
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2264
-#: ../plugins/itip-formatter/itip-formatter.c:2296
+#: ../plugins/itip-formatter/itip-formatter.c:2369
+#: ../plugins/itip-formatter/itip-formatter.c:2401
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2279
+#: ../plugins/itip-formatter/itip-formatter.c:2384
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:189 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
#: ../widgets/misc/e-cell-date-edit.c:239
msgid "Today"
msgstr "今天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:197
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../plugins/itip-formatter/itip-view.c:201
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:207
+#: ../plugins/itip-formatter/itip-view.c:210
msgid "Today %l:%M:%S %p"
msgstr "今天%p%l:%M:%S"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:220
msgid "Tomorrow"
msgstr "明天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:222
+#: ../plugins/itip-formatter/itip-view.c:225
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:226
+#: ../plugins/itip-formatter/itip-view.c:229
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:231
+#: ../plugins/itip-formatter/itip-view.c:234
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:235
+#: ../plugins/itip-formatter/itip-view.c:238
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:254
+#: ../plugins/itip-formatter/itip-view.c:257
#, 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:259
+#: ../plugins/itip-formatter/itip-view.c:262
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:263
+#: ../plugins/itip-formatter/itip-view.c:266
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:268
+#: ../plugins/itip-formatter/itip-view.c:271
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:272
+#: ../plugins/itip-formatter/itip-view.c:275
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:281
+#: ../plugins/itip-formatter/itip-view.c:284
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:287
+#: ../plugins/itip-formatter/itip-view.c:290
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:291
+#: ../plugins/itip-formatter/itip-view.c:294
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:296
+#: ../plugins/itip-formatter/itip-view.c:299
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:300
+#: ../plugins/itip-formatter/itip-view.c:303
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:306
+#: ../plugins/itip-formatter/itip-view.c:309
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:311
+#: ../plugins/itip-formatter/itip-view.c:314
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:315
+#: ../plugins/itip-formatter/itip-view.c:318
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:320
+#: ../plugins/itip-formatter/itip-view.c:323
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:324
+#: ../plugins/itip-formatter/itip-view.c:327
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:349
-#: ../plugins/itip-formatter/itip-view.c:437
-#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
#, c-format
msgid "Please respond on behalf of <b>%s</b>"
msgstr "请以 <b>%s</b> 的身份回应"
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
#, c-format
msgid "Received on behalf of <b>%s</b>"
msgstr "以 <b>%s</b> 的身份接收"
-#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:359
#, c-format
msgid "<b>%s</b> through %s has published the following meeting information:"
msgstr "<b>%s</b> 通过 %s 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:361
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:363
+#: ../plugins/itip-formatter/itip-view.c:366
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:369
#, c-format
msgid "<b>%s</b> through %s requests your presence at the following meeting:"
msgstr "<b>%s</b> 通过 %s 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:371
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:377
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:383
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following meeting:"
-msgstr ""
-"<b>%s</b> 通过 %s 希望接收到下列会议的最新信息:"
+msgstr "<b>%s</b> 通过 %s 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:385
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following meeting:"
msgstr "<b>%s</b> 希望接收到下列会议的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:389
#, c-format
msgid "<b>%s</b> through %s has sent back the following meeting response:"
msgstr "<b>%s</b> 通过 %s 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:392
+#: ../plugins/itip-formatter/itip-view.c:395
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:398
+#: ../plugins/itip-formatter/itip-view.c:401
#, c-format
msgid "<b>%s</b> through %s has proposed the following meeting changes."
msgstr "<b>%s</b> 通过 %s 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:404
+#: ../plugins/itip-formatter/itip-view.c:407
#, c-format
msgid "<b>%s</b> through %s has declined the following meeting changes:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更:"
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:447
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:449
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:454
#, c-format
msgid "<b>%s</b> requests the assignment of %s to the following task:"
msgstr "<b>%s</b> 请求给 %s 分配下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:457
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您分配了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:459
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为您分配了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:462
+#: ../plugins/itip-formatter/itip-view.c:465
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing task:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务:"
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:468
+#: ../plugins/itip-formatter/itip-view.c:471
#, c-format
msgid ""
"<b>%s</b> through %s wishes to receive the latest information for the "
"following assigned task:"
msgstr "<b>%s</b> 通过 %s 想要收到所分配的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:473
#, c-format
msgid ""
"<b>%s</b> wishes to receive the latest information for the following "
"assigned task:"
msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息:"
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:477
#, c-format
msgid ""
"<b>%s</b> through %s has sent back the following assigned task response:"
msgstr "<b>%s</b> 通过 %s 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:480
+#: ../plugins/itip-formatter/itip-view.c:483
#, c-format
msgid "<b>%s</b> through %s has canceled the following assigned task:"
msgstr "<b>%s</b> 通过 %s 取消了下列任务分配:"
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> 取消分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:489
#, c-format
msgid ""
"<b>%s</b> through %s has proposed the following task assignment changes:"
msgstr "<b>%s</b> 通过 %s 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:492
+#: ../plugins/itip-formatter/itip-view.c:495
#, c-format
msgid "<b>%s</b> through %s has declined the following assigned task:"
msgstr "<b>%s</b> 通过 %s 拒绝了下列任务分配:"
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:532
+#: ../plugins/itip-formatter/itip-view.c:535
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> 通过 %s 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:539
+#: ../plugins/itip-formatter/itip-view.c:542
#, c-format
msgid "<b>%s</b> through %s wishes to add to an existing memo:"
msgstr "<b>%s</b> 通过 %s 希望加入到已有的备忘:"
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> 希望加入到已有的备忘中:"
-#: ../plugins/itip-formatter/itip-view.c:545
+#: ../plugins/itip-formatter/itip-view.c:548
#, c-format
msgid "<b>%s</b> through %s has canceled the following shared memo:"
msgstr "<b>%s</b> 通过 %s 取消了下列共享备忘:"
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
#, c-format
msgid "<b>%s</b> has canceled the following shared memo:"
msgstr "<b>%s</b> 取消了下列共享备忘:"
#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:815
+#: ../plugins/itip-formatter/itip-view.c:821
msgid "_Open Calendar"
msgstr "打开日历(_O)"
-#: ../plugins/itip-formatter/itip-view.c:821
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:827
#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:848
-#: ../plugins/itip-formatter/itip-view.c:853
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:822
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:834
-#: ../plugins/itip-formatter/itip-view.c:850
-#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
msgid "_Accept"
msgstr "接受(_A)"
-#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:831
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:826
+#: ../plugins/itip-formatter/itip-view.c:832
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:826
#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:849
-#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:833
msgid "_Accept all"
msgstr "全部接受(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:844
msgid "_Send Information"
msgstr "发送信息(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../plugins/itip-formatter/itip-view.c:845
+#: ../plugins/itip-formatter/itip-view.c:851
msgid "_Update"
msgstr "更新(_U)"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1006
+#: ../plugins/itip-formatter/itip-view.c:1012
msgid "Start time:"
msgstr "开始时间:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:1015
+#: ../plugins/itip-formatter/itip-view.c:1021
msgid "End time:"
msgstr "结束时间:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1031
-#: ../plugins/itip-formatter/itip-view.c:1081
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:1067
+#: ../plugins/itip-formatter/itip-view.c:1073
msgid "Send _reply to sender"
msgstr "回复发件人(_R)"
-#: ../plugins/itip-formatter/itip-view.c:1095
+#: ../plugins/itip-formatter/itip-view.c:1101
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
-#: ../plugins/itip-formatter/itip-view.c:1104
+#: ../plugins/itip-formatter/itip-view.c:1110
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../plugins/itip-formatter/itip-view.c:1835
+#: ../plugins/itip-formatter/itip-view.c:1119
+#, fuzzy
+msgid "Show time as _free"
+msgstr "将时间显示为忙(_B)"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
msgid "_Tasks :"
msgstr "任务(_T):"
-#: ../plugins/itip-formatter/itip-view.c:1837
+#: ../plugins/itip-formatter/itip-view.c:1854
msgid "Memos :"
msgstr "备忘:"
@@ -17141,68 +17448,161 @@ msgid "Disable Account"
msgstr "禁用账户"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
-msgid "Enable libnotify notifications of new mail"
-msgstr "启用新邮件的 libnotify 通知"
+#, fuzzy
+msgid "Beep or play sound file."
+msgstr "选择声音文件"
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
-msgid "Every time a new mail arrives, pop up a libnotify notification."
-msgstr "每当新邮件到达时,弹出一个 libnotify 通知。"
+msgid "Blink icon in notification area."
+msgstr ""
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
-msgid "Make the status icon blink"
-msgstr "闪烁状态图标"
+msgid "Enable D-Bus messages."
+msgstr ""
#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
-msgid "When the new-mail status icon is visible, make it blink."
-msgstr "当新邮件状态图标可见时,使之闪烁。"
+#, fuzzy
+msgid "Enable icon in notification area."
+msgstr "启用新邮件的 libnotify 通知"
-#: ../plugins/mail-notification/mail-notification.c:132
-#, c-format
-msgid "You have received %d new message in %s."
-msgid_plural "You have received %d new messages in %s."
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+#, fuzzy
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "新邮件到达时生成 D-BUS 信息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+#, fuzzy
+msgid "Play sound when new messages arrive."
+msgstr "新邮件到达时播放声音文件(_V)"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#, fuzzy
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "当新邮件到达时使用通知区图标和通知消息通知用户。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#, fuzzy
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "新邮件到达时要播放的声音文件。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#, fuzzy
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "新邮件到达时播放声音文件(_V)"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr ""
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#, fuzzy
+msgid "Whether the icon should blink or not."
+msgstr "侧边栏是否可见。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr ""
+
+#: ../plugins/mail-notification/mail-notification.c:254
+#, fuzzy
+msgid "Generate a _D-Bus message"
+msgstr "生成信件列表"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
+#, fuzzy, c-format
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
+
+#: ../plugins/mail-notification/mail-notification.c:368
+#, fuzzy, c-format
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
-#: ../plugins/mail-notification/mail-notification.c:153
+#: ../plugins/mail-notification/mail-notification.c:380
+#: ../plugins/mail-notification/mail-notification.c:385
msgid "New email"
msgstr "新电子邮件"
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "邮件通知"
+#: ../plugins/mail-notification/mail-notification.c:440
+#, fuzzy
+msgid "Show icon in _notification area"
+msgstr "在通知托盘中显示提醒"
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
-msgid ""
-"Notifies the user with an icon in notification area and a notification "
-"message whenever a new message has arrived."
+#: ../plugins/mail-notification/mail-notification.c:443
+#, fuzzy
+msgid "B_link icon in notification area"
+msgstr "自定义通知消息(_C)"
+
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
msgstr ""
-"当新邮件到达时使用通知区图标和通知消息通知用户。"
-#: ../plugins/mail-remote/client.c:30
-#, c-format
-msgid "System error: %s"
-msgstr "系统错误:%s"
+#: ../plugins/mail-notification/mail-notification.c:626
+#, fuzzy
+msgid "_Play sound when new messages arrive"
+msgstr "新邮件到达时播放声音文件(_V)"
-#: ../plugins/mail-remote/client.c:32
-#, c-format
-msgid "Camel error: %s"
-msgstr "Camel 错误:%s"
+#: ../plugins/mail-notification/mail-notification.c:632
+#, fuzzy
+msgid "_Beep"
+msgstr "响铃"
+
+#: ../plugins/mail-notification/mail-notification.c:633
+#, fuzzy
+msgid "Play _sound file"
+msgstr "选择声音文件"
+
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "指定文件名(_F):"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "选择声音文件"
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "账户无法发送电子邮件"
+#: ../plugins/mail-notification/mail-notification.c:646
+#, fuzzy
+msgid "Pl_ay"
+msgstr "帕劳群岛"
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "没有可用的存储"
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr ""
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+#, fuzzy
msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "实现远程访问邮件数据的 CORBA 接口的插件。"
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
+msgstr "当新邮件到达时使用通知区图标和通知消息通知用户。"
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "远程邮件"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "邮件通知"
#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
msgid ""
@@ -17218,6 +17618,17 @@ msgstr "转换为会议(_V)"
msgid "Mail to meeting"
msgstr "邮寄到会议"
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, fuzzy, c-format
+msgid "Cannot open calendar. %s"
+msgstr "无法打开文件"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr ""
+
#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
msgid ""
"A plugin which allows the creation of tasks from the contents of a mail "
@@ -17418,11 +17829,13 @@ msgid "Marks the selected calendar for offline viewing."
msgstr "将选中日历标为脱机查看。"
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+#, fuzzy
+msgid "_Do not make available for offline use"
msgstr "不将此日历标为脱机(_D)"
#: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
+#, fuzzy
+msgid "_Make available for offline use"
msgstr "将日历标为脱机使用(_M)"
#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
@@ -17433,21 +17846,13 @@ msgstr "实现 mono 插件的插件。"
msgid "Mono Loader"
msgstr "Mono 装入器"
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "新邮件到达时生成 D-BUS 信息。"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "新邮件通知"
-
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
msgid "A plugin for managing which plugins are enabled or disabled."
msgstr "管理插件是启用还是禁用的插件。"
#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:223
+#: ../plugins/plugin-manager/plugin-manager.c:225
msgid "Plugin Manager"
msgstr "插件管理器"
@@ -17459,26 +17864,35 @@ msgstr "启用和禁用插件"
msgid "_Plugins"
msgstr "插件(_P)"
-#: ../plugins/plugin-manager/plugin-manager.c:55
+#: ../plugins/plugin-manager/plugin-manager.c:57
msgid "Author(s)"
msgstr "作者"
-#: ../plugins/plugin-manager/plugin-manager.c:56
-#: ../widgets/table/e-table-config-no-group.glade.h:6
-#: ../widgets/table/e-table-config.glade.h:5
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
msgid "Description"
msgstr "描述"
-#: ../plugins/plugin-manager/plugin-manager.c:226
-msgid "Configure"
-msgstr "配置"
-
#: ../plugins/plugin-manager/plugin-manager.c:238
msgid "Note: Some changes will not take effect until restart"
msgstr "注意:某些更改直到重新启动后才生效"
-#: ../plugins/plugin-manager/plugin-manager.c:291
-#: ../plugins/plugin-manager/plugin-manager.c:350
+#: ../plugins/plugin-manager/plugin-manager.c:260
+#, fuzzy
+msgid "Overview"
+msgstr "回顾"
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+#, fuzzy
+msgid "Configuration"
+msgstr "邮件配置"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr ""
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
msgid "Plugin"
msgstr "插件"
@@ -17502,24 +17916,25 @@ msgstr "纯文字模式"
msgid "Prefer plain-text"
msgstr "首选纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:139
msgid "Show HTML if present"
msgstr "首选 HTML"
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:140
msgid "Prefer PLAIN"
msgstr "首选纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:141
msgid "Only ever show PLAIN"
msgstr "仅显示纯文本"
-#: ../plugins/prefer-plain/prefer-plain.c:150
+#: ../plugins/prefer-plain/prefer-plain.c:184
msgid "HTML _Mode"
msgstr "HT_ML 模式"
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
+#, fuzzy
+msgid "Gives an option to print from the composer."
msgstr "在撰写器中添加打印邮件的选项"
#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
@@ -17561,7 +17976,13 @@ msgstr "位置"
msgid "_Publish Calendar Information"
msgstr "发布日历信息(_P)"
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "输入“%s”的密码"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
msgid "Are you sure you want to remove this URL?"
msgstr "您确定您想要删除此 URL 吗?"
@@ -17583,6 +18004,10 @@ msgstr ""
"每周\n"
"手动(通过动作菜单)"
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "启用(_N)"
+
#: ../plugins/publish-calendar/publish-calendar.glade.h:10
msgid "P_ort:"
msgstr "端口(_O):"
@@ -17706,79 +18131,79 @@ msgstr "保存"
#. * Translator: the %F %T is the thirth argument for a strftime function.
#. * It lets you define the formatting of the date in the csv-file.
#. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:167
msgid "%F %T"
msgstr "%F %T"
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:381
msgid "UID"
msgstr "UID"
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
msgid "Description List"
msgstr "描述列表"
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
msgid "Categories List"
msgstr "类别列表"
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
msgid "Comment List"
msgstr "注释列表"
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
msgid "Created"
msgstr "创建时间"
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
msgid "Contact List"
msgstr "联系人列表"
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
msgid "Start"
msgstr "开始"
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
msgid "End"
msgstr "结束"
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
msgid "percent Done"
msgstr "完成百分比"
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:394
msgid "URL"
msgstr "URL"
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
msgid "Attendees List"
msgstr "出席者列表"
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
msgid "Modified"
msgstr "修改日期"
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:545
msgid "Advanced options for the CSV format"
msgstr "CSV 格式的高级选项"
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:552
msgid "Prepend a header"
msgstr "前置头"
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:561
msgid "Value delimiter:"
msgstr "值分隔符:"
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:567
msgid "Record delimiter:"
msgstr "记录分隔符:"
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:573
msgid "Encapsulate values with:"
msgstr "将值以下列形式封装:"
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:595
msgid "Comma separated value format (.csv)"
msgstr "逗号分隔的值格式(.csv)"
@@ -17799,16 +18224,15 @@ msgstr "保存到磁盘(_S)"
#. * It lets you define the formatting of the date in the rdf-file.
#. * Also check out http://www.w3.org/2002/12/cal/tzd
#. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:154
msgid "%FT%T"
msgstr "%FT%T"
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:390
msgid "RDF format (.rdf)"
msgstr "RDF 格式(.rdf)"
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:164
msgid "Select destination file"
msgstr "选择目的文件"
@@ -17825,6 +18249,11 @@ msgid "Show _only this Calendar"
msgstr "只显示此日历(_O)"
#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+#, fuzzy
+msgid "Show _only this Memo List"
+msgstr "只显示此任务列表(_O)"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
msgid "Show _only this Task List"
msgstr "只显示此任务列表(_O)"
@@ -17866,18 +18295,19 @@ msgid "Please select the information that you would like to import:"
msgstr "请选择您希望导入的信息:"
#: ../plugins/startup-wizard/startup-wizard.c:151
-#: ../shell/e-shell-importer.c:397
+#: ../shell/e-shell-importer.c:400
#, c-format
msgid "From %s:"
msgstr "从 %s:"
#: ../plugins/startup-wizard/startup-wizard.c:231
-#: ../shell/e-shell-importer.c:508
+#: ../shell/e-shell-importer.c:511
+#, c-format
msgid "Importing data."
msgstr "正在导入数据。"
#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../shell/e-shell-importer.c:525
msgid "Please wait"
msgstr "请稍候"
@@ -17914,16 +18344,17 @@ msgstr "Evolution 外壳"
msgid "Evolution Shell Config factory"
msgstr "Evolution 外壳配置工厂"
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
msgid "Evolution Test"
msgstr "Evolution 测试"
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
msgid "Evolution Test component"
msgstr "Evolution 测试组件"
#: ../shell/apps_evolution_shell.schemas.in.h:1
-msgid "A string description of the current printer settings"
+#, fuzzy
+msgid "A string description of the current printer settings."
msgstr "当前打印机设置的字符串描述"
#: ../shell/apps_evolution_shell.schemas.in.h:2
@@ -17931,75 +18362,84 @@ msgid "Configuration version"
msgstr "配置版本"
#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash detection should be run or not."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
msgid "Default sidebar width"
msgstr "默认侧边栏宽度"
-#: ../shell/apps_evolution_shell.schemas.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
msgid "Default window height"
msgstr "默认窗口高度"
-#: ../shell/apps_evolution_shell.schemas.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
msgid "Default window state"
msgstr "默认窗口状态"
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
msgid "Default window width"
msgstr "默认窗口宽度"
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
msgid "ID or alias of the component to be shown by default at start-up."
msgstr "启动时默认显示的组件 ID 或别名。"
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
msgid "Last upgraded configuration version"
msgstr "上次升级的配置版本"
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
msgid ""
"List of paths for the folders to be synchronized to disk for offline usage"
msgstr "列出脱机使用时要同步到磁盘的文件夹路径"
-#: ../shell/apps_evolution_shell.schemas.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
msgid "Sidebar is visible"
msgstr "侧边栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
msgid "Skip development warning dialog"
msgstr "跳过开发警告对话框"
-#: ../shell/apps_evolution_shell.schemas.in.h:12 ../shell/main.c:458
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+#, fuzzy
+msgid "Skip recovery warning dialog"
+msgstr "跳过开发警告对话框"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:571
msgid "Start in offline mode"
msgstr "以脱机模式启动"
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
msgid "Statusbar is visible"
msgstr "状态栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
msgid ""
"The configuration version of Evolution, with major/minor/configuration level "
"(for example \"2.6.0\")."
msgstr "Evolution 的配置版本,带主/次/配置级别(如“2.6.0”)。"
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
msgid "The default height for the main window, in pixels."
msgstr "主窗口的默认高度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
msgid "The default width for the main window, in pixels."
msgstr "主窗口的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
msgid "The default width for the sidebar, in pixels."
msgstr "侧边栏的默认宽度,以像素计。"
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
msgid ""
"The last upgraded configuration version of Evolution, with major/minor/"
"configuration level (for example \"2.6.0\")."
msgstr "上次升级的 Evolution 配置版本,带主/次/配置级别(如“2.6.0”)。"
-#: ../shell/apps_evolution_shell.schemas.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
msgid ""
"The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
"\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18008,44 +18448,54 @@ msgstr ""
"窗口按钮的样式。可以是文字、图标、二者、工具栏。如果设置为工具栏,则工具栏的"
"样式由 GNOME 设置决定。"
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
msgid "Toolbar is visible"
msgstr "工具栏可见"
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
msgid "Whether Evolution will start up in offline mode instead of online mode."
msgstr "是否以脱机模式而非联机模式启动 Evolution。"
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+#, fuzzy
+msgid "Whether crash detection should be done or not"
+msgstr "窗口按钮是否可见。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
msgid "Whether or not the window should be maximized."
msgstr "窗口是否应为最大化。"
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
msgid "Whether the sidebar should be visible."
msgstr "侧边栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
msgid "Whether the status bar should be visible."
msgstr "状态栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
msgid "Whether the toolbar should be visible."
msgstr "工具栏是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:29
msgid ""
"Whether the warning dialog in development versions of Evolution is skipped."
msgstr "是否跳过 Evoltuion 开发版本的警告。"
-#: ../shell/apps_evolution_shell.schemas.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+#, fuzzy
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr "是否跳过 Evoltuion 开发版本的警告。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
msgid "Whether the window buttons should be visible."
msgstr "窗口按钮是否可见。"
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
msgid "Window button style"
msgstr "窗口按钮样式"
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
msgid "Window buttons are visible"
msgstr "窗口按钮可见"
@@ -18092,27 +18542,27 @@ msgstr ""
"iCalendar。并未发现可导入的设置。如果您想要再试一次,请单击\n"
"“上一步”按钮。\n"
-#: ../shell/e-shell-importer.c:285
+#: ../shell/e-shell-importer.c:288
msgid "F_ilename:"
msgstr "文件名(_I):"
-#: ../shell/e-shell-importer.c:290
+#: ../shell/e-shell-importer.c:293
msgid "Select a file"
msgstr "选择一个文件"
-#: ../shell/e-shell-importer.c:299
+#: ../shell/e-shell-importer.c:302
msgid "File _type:"
msgstr "文件类型(_T):"
-#: ../shell/e-shell-importer.c:335
+#: ../shell/e-shell-importer.c:338
msgid "Import data and settings from _older programs"
msgstr "从旧版程序中导入数据和设置(_O)"
-#: ../shell/e-shell-importer.c:338
+#: ../shell/e-shell-importer.c:341
msgid "Import a _single file"
msgstr "导入单个文件(_S)"
-#: ../shell/e-shell-settings-dialog.c:319
+#: ../shell/e-shell-settings-dialog.c:313
msgid "Evolution Preferences"
msgstr "Evolution 首选项"
@@ -18136,6 +18586,13 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#, fuzzy, c-format
+msgid "%s - Evolution"
+msgstr "Evolution"
+
#: ../shell/e-shell-window-commands.c:77
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
@@ -18156,29 +18613,34 @@ msgstr "无法运行 Bug buddy。"
#. The translator-credits string is for translators to list
#. * per-language credits for translation, displayed in the
#. * about dialog.
-#: ../shell/e-shell-window-commands.c:584
+#: ../shell/e-shell-window-commands.c:663
msgid "translator-credits"
msgstr ""
"开源软件国际化之简体中文组\n"
"http://i18n.linux.net.cn"
-#: ../shell/e-shell-window-commands.c:595
+#: ../shell/e-shell-window-commands.c:674
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-commands.c:803
+#: ../shell/e-shell-window-commands.c:692
+#, fuzzy
+msgid "Error opening the FAQ webpage."
+msgstr "打开日历时出错"
+
+#: ../shell/e-shell-window-commands.c:889
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:816 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:829
+#: ../shell/e-shell-window-commands.c:915
msgid "Work Offline"
msgstr "脱机工作"
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:382
msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
@@ -18190,33 +18652,34 @@ msgstr "Evolution 正在脱机过程中。"
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
-#: ../shell/e-shell-window.c:823
+#: ../shell/e-shell-window.c:805
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:637
-msgid "Uknown system error."
+#: ../shell/e-shell.c:640
+#, fuzzy
+msgid "Unknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:833 ../shell/e-shell.c:834
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1272 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1274
+#: ../shell/e-shell.c:1282
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1276
+#: ../shell/e-shell.c:1284
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1278
+#: ../shell/e-shell.c:1286
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
@@ -18226,15 +18689,15 @@ msgstr "找不到配置数据库"
msgid "New"
msgstr "新建"
-#: ../shell/evolution-test-component.c:107
+#: ../shell/test/evolution-test-component.c:107
msgid "New Test"
msgstr "新建测试"
-#: ../shell/evolution-test-component.c:108
+#: ../shell/test/evolution-test-component.c:108
msgid "_Test"
msgstr "测试(_T)"
-#: ../shell/evolution-test-component.c:109
+#: ../shell/test/evolution-test-component.c:109
msgid "Create a new test item"
msgstr "创建新测试项"
@@ -18276,7 +18739,7 @@ msgstr ""
"本助手将全程指导您将外部文件导入 Evolution。"
#. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:219
+#: ../shell/main.c:228
#, no-c-format
msgid ""
"Hi. Thanks for taking the time to download this preview release\n"
@@ -18308,7 +18771,7 @@ msgstr ""
"\n"
"我们希望您尽情享受我们努力工作的成果,我们也热切盼望着您的意见!\n"
-#: ../shell/main.c:243
+#: ../shell/main.c:252
msgid ""
"Thanks\n"
"The Evolution Team\n"
@@ -18316,43 +18779,66 @@ msgstr ""
"感谢\n"
"Evolution 团队\n"
-#: ../shell/main.c:250
+#: ../shell/main.c:259
msgid "Do not tell me again"
msgstr "不要再通知我"
-#: ../shell/main.c:456
+#: ../shell/main.c:309
+#, fuzzy
+msgid "Evolution Crash Detection"
+msgstr "Evolution 信息"
+
+#: ../shell/main.c:311
+#, fuzzy
+msgid "Ig_nore"
+msgstr "忽略"
+
+#: ../shell/main.c:326
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run. As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+
+#: ../shell/main.c:337
+#, fuzzy
+msgid "_Do not show this message again"
+msgstr "不再显示此信息。"
+
+#: ../shell/main.c:569
msgid "Start Evolution activating the specified component"
msgstr "启动 Evolution 并激活指定组件"
-#: ../shell/main.c:460
+#: ../shell/main.c:573
msgid "Start in online mode"
msgstr "以联机模式启动"
-#: ../shell/main.c:463
+#: ../shell/main.c:576
msgid "Forcibly shut down all Evolution components"
msgstr "强制关闭所有 Evolution 组件"
-#: ../shell/main.c:467
+#: ../shell/main.c:580
msgid "Forcibly re-migrate from Evolution 1.4"
msgstr "强制从 Evolution 1.4 重新升迁"
-#: ../shell/main.c:470
+#: ../shell/main.c:583
msgid "Send the debugging output of all components to a file."
msgstr "把所有成员的调试输出发送到一个文件中。"
-#: ../shell/main.c:472
+#: ../shell/main.c:585
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:474
+#: ../shell/main.c:587
msgid "Disable preview pane of Mail, Contacts and Tasks."
msgstr "禁用邮件、联系人和任务的预览面板。"
-#: ../shell/main.c:503
+#: ../shell/main.c:617
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:516
+#: ../shell/main.c:630
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -18512,54 +18998,51 @@ msgid ""
"unless otherwise indicated here"
msgstr "由于您不信任颁发此证书的机构,您就将不信任此证书的权威性,除非在此声明"
-#: ../smime/gui/certificate-manager.c:138
-#: ../smime/gui/certificate-manager.c:156
-#: ../smime/gui/certificate-manager.c:389
-#: ../smime/gui/certificate-manager.c:407
-#: ../smime/gui/certificate-manager.c:621
-#: ../smime/gui/certificate-manager.c:639
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
msgid "Select a certificate to import..."
msgstr "选择要导入的证书..."
-#: ../smime/gui/certificate-manager.c:147
+#: ../smime/gui/certificate-manager.c:146
msgid "All PKCS12 files"
msgstr "全部 PKCS12 文件"
-#: ../smime/gui/certificate-manager.c:152
-#: ../smime/gui/certificate-manager.c:403
-#: ../smime/gui/certificate-manager.c:635
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
msgid "All files"
msgstr "全部文件"
-#: ../smime/gui/certificate-manager.c:279
-#: ../smime/gui/certificate-manager.c:496
-#: ../smime/gui/certificate-manager.c:726
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
msgid "Certificate Name"
msgstr "证书名称"
-#: ../smime/gui/certificate-manager.c:288
-#: ../smime/gui/certificate-manager.c:514
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
msgid "Purposes"
msgstr "用途"
-#: ../smime/gui/certificate-manager.c:297 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
#: ../smime/lib/e-cert.c:570
msgid "Serial Number"
msgstr "序列号"
-#: ../smime/gui/certificate-manager.c:305
+#: ../smime/gui/certificate-manager.c:297
msgid "Expires"
msgstr "到期"
-#: ../smime/gui/certificate-manager.c:398
+#: ../smime/gui/certificate-manager.c:389
msgid "All email certificate files"
msgstr "所有电子邮件证书文件"
-#: ../smime/gui/certificate-manager.c:505
+#: ../smime/gui/certificate-manager.c:489
msgid "E-Mail Address"
msgstr "电子邮件地址"
-#: ../smime/gui/certificate-manager.c:630
+#: ../smime/gui/certificate-manager.c:613
msgid "All CA certificate files"
msgstr "全部颁证机构文件"
@@ -18568,11 +19051,6 @@ msgstr "全部颁证机构文件"
msgid "Certificate Viewer: %s"
msgstr "证书查看器:%s"
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "输入“%s”的密码"
-
#. we're setting the password initially
#: ../smime/gui/component.c:70
msgid "Enter new password for certificate database"
@@ -18785,7 +19263,7 @@ msgid "_Edit CA Trust"
msgstr "编辑 CA 信任(_E)"
#. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:679
msgid "Certificate already exists"
msgstr "证书已经存在"
@@ -19087,6 +19565,10 @@ msgstr "重命名选中文件夹"
msgid "S_ave Address Book As VCard"
msgstr "将地址簿另存为 VCard(_A)"
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "另存为 VCard..."
+
#: ../ui/evolution-addressbook.xml.h:32
msgid "Save selected contacts as a VCard."
msgstr "把选中的联系人保存为 VCard。"
@@ -19095,7 +19577,7 @@ msgstr "把选中的联系人保存为 VCard。"
msgid "Save the contacts of the selected folder as VCard"
msgstr "把选中文件夹中的的联系人保存为 VCard"
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2717
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
msgid "Select All"
msgstr "全选"
@@ -19170,7 +19652,7 @@ msgstr "将联系人移至(_M)..."
msgid "_Move Folder Contacts To"
msgstr "将文件夹联系人移至(_M)"
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
msgid "_New"
msgstr "新建(_N)"
@@ -19384,11 +19866,12 @@ msgstr "关闭(_C)"
#: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
#: ../ui/evolution-message-composer.xml.h:53
#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:44
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
msgid "_File"
msgstr "文件(_F)"
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
msgid "_Help"
msgstr "帮助(_H)"
@@ -19554,91 +20037,97 @@ msgid "Create or edit rules for filtering new mail"
msgstr "创建或编辑过滤新邮件的规则"
#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages for Offline"
-msgstr "下载信件进行脱机处理"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Download messages for offline"
-msgstr "下载信件进行脱机处理"
-
-#: ../ui/evolution-mail-global.xml.h:9
msgid "Download messages of accounts/folders marked for offline"
msgstr "为标记为脱机的帐户/文件夹下载信件"
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:8
msgid "Empty _Trash"
msgstr "清空回收站(_T)"
-#: ../ui/evolution-mail-global.xml.h:11 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
#: ../ui/evolution-subscribe.xml.h:2
msgid "F_older"
msgstr "文件夹(_O)"
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:10
msgid "Move the selected folder into another folder"
msgstr "把选中的文件夹移至其它文件夹"
#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:12
msgid "Permanently remove all deleted messages from all folders"
msgstr "永久删除所有文件夹中的所有已删除的信件"
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:13
msgid "Search F_olders"
msgstr "搜索文件夹(_O)"
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:14
msgid "Show Message _Preview"
msgstr "显示信件预览(_P)"
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:15
msgid "Show message preview below the message list"
msgstr "在信件列表下方显示信件预览"
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:16
msgid "Show message preview side-by-side with the message list"
msgstr "在信件列表旁显示信件预览"
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:17
msgid "Show message preview window"
msgstr "显示信件预览窗口"
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:18
msgid "Subscribe or unsubscribe to folders on remote servers"
msgstr "订阅或退订远程服务器上的文件夹"
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr ""
+
+#: ../ui/evolution-mail-global.xml.h:20
msgid "_Classic View"
msgstr "分类视图(_C)"
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:21
msgid "_Copy Folder To..."
msgstr "文件夹复制到(_C)..."
+#: ../ui/evolution-mail-global.xml.h:22
+#, fuzzy
+msgid "_Debug Logs"
+msgstr "_Web 日志:"
+
#: ../ui/evolution-mail-global.xml.h:23
+#, fuzzy
+msgid "_Download Messages for Offline Usage"
+msgstr "下载信件进行脱机处理"
+
+#: ../ui/evolution-mail-global.xml.h:25
msgid "_Message Filters"
msgstr "信件过滤(_M)"
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution-mail-global.xml.h:26
msgid "_Move Folder To..."
msgstr "文件夹移至(_M)..."
-#: ../ui/evolution-mail-global.xml.h:25
+#: ../ui/evolution-mail-global.xml.h:27
msgid "_New..."
msgstr "新建(_N)..."
-#: ../ui/evolution-mail-global.xml.h:26
+#: ../ui/evolution-mail-global.xml.h:28
msgid "_Preview"
msgstr "预览(_P)"
#.
#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
#.
-#: ../ui/evolution-mail-global.xml.h:30
+#: ../ui/evolution-mail-global.xml.h:32
msgid "_Subscriptions"
msgstr "订阅(_S)"
-#: ../ui/evolution-mail-global.xml.h:31
+#: ../ui/evolution-mail-global.xml.h:33
msgid "_Vertical View"
msgstr "垂直视图(_V)"
@@ -19701,70 +20190,85 @@ msgid "Mar_k All Messages as Read"
msgstr "把全部信件标记为已读(_K)"
#: ../ui/evolution-mail-list.xml.h:17
+#, fuzzy
+msgid "Mark all messages in the folder as read"
+msgstr "将此文件夹及其子文件夹中的信件全部标记为已读吗?"
+
+#: ../ui/evolution-mail-list.xml.h:18
msgid "Paste message(s) from the clipboard"
msgstr "从剪贴板粘贴信件"
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
msgid "Permanently remove all deleted messages from this folder"
msgstr "从该文件夹永久删除所有已删除的信件"
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
msgid "Permanently remove this folder"
msgstr "永久删除此文件夹"
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
msgid "Re_fresh..."
msgstr "刷新(_F)..."
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:22
msgid "Refresh the folder"
msgstr "刷新文件夹"
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:23
+#, fuzzy
+msgid "Select Message S_ubthread"
+msgstr "选择信件线索(_T)"
+
+#: ../ui/evolution-mail-list.xml.h:24
msgid "Select Message _Thread"
msgstr "选择信件线索(_T)"
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:25
msgid "Select _All Messages"
msgstr "选中全部信件(_A)"
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:26
msgid "Select all and only the messages that are not currently selected"
msgstr "选中所有当前没有选中的信件"
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:27
msgid "Select all messages in the same thread as the selected message"
msgstr "把同一线索中的所有信件选择为选中信件"
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:28
+#, fuzzy
+msgid "Select all replies to the currently selected message"
+msgstr "把同一线索中的所有信件选择为选中信件"
+
+#: ../ui/evolution-mail-list.xml.h:29
msgid "Select all visible messages"
msgstr "选中所有可见的信件"
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:30
msgid "Show Hidde_n Messages"
msgstr "显示隐藏的信件(_N)"
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:31
msgid "Show messages that have been temporarily hidden"
msgstr "显示暂时被隐藏的信件"
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:32
msgid "Temporarily hide all messages that have already been read"
msgstr "暂时隐藏所有已读信件"
-#: ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-mail-list.xml.h:33
msgid "Temporarily hide the selected messages"
msgstr "暂时隐藏选中信件"
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:34
msgid "Threaded Message list"
msgstr "按线索编排的信件列表"
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-mail-list.xml.h:36
msgid "_Group By Threads"
msgstr "按线索分组(_G)"
-#: ../ui/evolution-mail-list.xml.h:34 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
#: ../ui/evolution-mail-messagedisplay.xml.h:7
msgid "_Message"
msgstr "信件(_M)"
@@ -20090,7 +20594,7 @@ msgstr "选中所有文字(_A)"
msgid "Select all the text in a message"
msgstr "选中信件中的全部文本"
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
@@ -20194,23 +20698,28 @@ msgstr "上一封信(_P)"
msgid "_Quoted"
msgstr "引用(_Q)"
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "读取(_R)"
+
+#: ../ui/evolution-mail-message.xml.h:129
msgid "_Save Message..."
msgstr "保存信件(_S)..."
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
msgid "_Undelete Message"
msgstr "取消删除信件(_U)"
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
msgid "_Unread"
msgstr "未读(_U)"
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
msgid "_Zoom"
msgstr "缩放(_Z)"
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
msgid "_Zoom In"
msgstr "放大(_Z)"
@@ -20218,7 +20727,7 @@ msgstr "放大(_Z)"
msgid "Close this window"
msgstr "关闭此窗口"
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
msgid "Main toolbar"
msgstr "主工具栏"
@@ -20623,150 +21132,164 @@ msgid "Display window buttons with text only"
msgstr "显示只有文字的窗口按钮"
#: ../ui/evolution.xml.h:10
+#, fuzzy
+msgid "Evolution _FAQ"
+msgstr "Evolution"
+
+#: ../ui/evolution.xml.h:11
msgid "Exit the program"
msgstr "退出程序"
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
msgid "Forget remembered passwords so you will be prompted for them again"
msgstr "保存的密码被丢弃,所以将再次提示您输入密码"
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
msgid "Hide window buttons"
msgstr "隐藏窗口按钮"
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
msgid "I_mport..."
msgstr "导入(_M)..."
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+#, fuzzy
+msgid "Icons _and Text"
msgstr "图标和文字(_A)"
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
msgid "Lay_out"
msgstr "布局(_O)"
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr ""
+
+#: ../ui/evolution.xml.h:21
msgid "Page Set_up..."
msgstr "页面设置(_U)..."
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:22
msgid "Prefere_nces"
msgstr "首选项(_N)"
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:23
msgid "Send / Receive"
msgstr "发送/接收"
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:24
msgid "Send / _Receive"
msgstr "发送/接收(_R)"
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:25
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
msgid "Show Side _Bar"
msgstr "显示侧边栏(_B)"
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
msgid "Show _Status Bar"
msgstr "显示状态栏(_S)"
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
msgid "Show _Toolbar"
msgstr "显示工具栏(_T)"
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
msgid "Submit Bug Report"
msgstr "提交错误报告"
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:33
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:34
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:35
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ../ui/evolution.xml.h:38
-msgid "Tool_bar style"
+#: ../ui/evolution.xml.h:36
+#, fuzzy
+msgid "Tool_bar Style"
msgstr "工具栏样式(_B)"
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:37
msgid "View/Hide the Side Bar"
msgstr "查看/隐藏侧边栏"
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:38
msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:39
msgid "_About"
msgstr "关于(_A)"
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:40
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:43
msgid "_Forget Passwords"
msgstr "丢弃密码(_F)"
-#: ../ui/evolution.xml.h:47
-msgid "_Hide buttons"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr ""
+
+#: ../ui/evolution.xml.h:46
+#, fuzzy
+msgid "_Hide Buttons"
msgstr "隐藏按钮(_H)"
-#: ../ui/evolution.xml.h:48
-msgid "_Icons only"
+#: ../ui/evolution.xml.h:47
+#, fuzzy
+msgid "_Icons Only"
msgstr "只有图标(_I)"
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:49
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:50
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:51
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:52
msgid "_Synchronization Options..."
msgstr "同步选项(_S)..."
-#: ../ui/evolution.xml.h:54
-msgid "_Text only"
+#: ../ui/evolution.xml.h:53
+#, fuzzy
+msgid "_Text Only"
msgstr "只有文字(_T)"
-#: ../ui/evolution.xml.h:56
+#: ../ui/evolution.xml.h:55
msgid "_Window"
msgstr "窗口(_W)"
@@ -20778,9 +21301,9 @@ msgstr "按公司(_C)"
msgid "_Address Cards"
msgstr "地址名片(_A)"
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "电话列表(_P)"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "列表视图(_L)"
#: ../views/calendar/galview.xml.h:1
msgid "W_eek View"
@@ -20790,10 +21313,6 @@ msgstr "周视图(_E)"
msgid "_Day View"
msgstr "日视图(_D)"
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "列表视图(_L)"
-
#: ../views/calendar/galview.xml.h:4
msgid "_Month View"
msgstr "月视图(_M)"
@@ -20846,12 +21365,12 @@ msgstr "到期日期(_D)"
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:213
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:241
+#: ../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:442
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:791
msgid "UTC"
msgstr "UTC"
@@ -20902,17 +21421,17 @@ msgid "Define Views for \"%s\""
msgstr "定义“%s”的视图"
#: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1910
+#: ../widgets/table/e-table-header-item.c:1921
#: ../widgets/table/e-table-scrolled.c:216
#: ../widgets/table/e-table-scrolled.c:217
msgid "Table"
msgstr "表格"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
msgid "Instance"
msgstr "实例"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
msgid "Save Current View"
msgstr "保存当前视图"
@@ -20984,17 +21503,17 @@ msgstr "视图类型"
msgid "Type of view:"
msgstr "视图类型:"
-#: ../widgets/misc/e-attachment-bar.c:1031
+#: ../widgets/misc/e-attachment-bar.c:1028
msgid "Attachment Bar"
msgstr "附件栏"
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
+#: ../widgets/misc/e-attachment.c:306 ../widgets/misc/e-attachment.c:321
+#: ../widgets/misc/e-attachment.c:522 ../widgets/misc/e-attachment.c:539
#, c-format
msgid "Cannot attach file %s: %s"
msgstr "无法附加文件 %s:%s"
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
+#: ../widgets/misc/e-attachment.c:314 ../widgets/misc/e-attachment.c:531
#, c-format
msgid "Cannot attach file %s: not a regular file"
msgstr "无法附加文件 %s:不是普通文件"
@@ -21015,15 +21534,9 @@ msgstr "MIME 类型:"
msgid "Suggest automatic display of attachment"
msgstr "建议自动显示附件"
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "一二三四五六日"
-
#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1088
-#: ../widgets/misc/e-calendar-item.c:1742
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1726
msgid "%B %Y"
msgstr "%Y年%B"
@@ -21032,27 +21545,23 @@ msgid "Month Calendar"
msgstr "月历"
#: ../widgets/misc/e-canvas-background.c:453
-#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-entry.c:1230
-#: ../widgets/text/e-entry.c:1231 ../widgets/text/e-text.c:3637
-#: ../widgets/text/e-text.c:3638
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
msgid "Fill color"
msgstr "填充颜色"
#: ../widgets/misc/e-canvas-background.c:460
#: ../widgets/misc/e-canvas-background.c:461
#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-entry.c:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-entry.c:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645 ../widgets/text/e-text.c:3652
-#: ../widgets/text/e-text.c:3653
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
msgid "GDK fill color"
msgstr "GDK 填充颜色"
#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
msgid "Fill stipple"
msgstr "点绘填充"
@@ -21079,14 +21588,14 @@ msgstr "Y2"
#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
#: ../widgets/table/e-table-group-container.c:973
#: ../widgets/table/e-table-group-leaf.c:635
-#: ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:3071
msgid "Minimum width"
msgstr "最小宽度"
#: ../widgets/misc/e-canvas-vbox.c:93 ../widgets/misc/e-reflow.c:1427
#: ../widgets/table/e-table-group-container.c:974
#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3072
msgid "Minimum Width"
msgstr "最小宽度"
@@ -21205,39 +21714,35 @@ msgstr "其它..."
msgid "Ch_aracter Encoding"
msgstr "字符编码(_A)"
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
msgid "Date and Time"
msgstr "日期和时间"
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
msgid "Text entry to input date"
msgstr "输入日期的文本框"
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
msgid "Click this button to show a calendar"
msgstr "单击此按钮可显示日历"
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
msgid "Combo box to select time"
msgstr "选择时间的组合框"
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "时间"
-
-#: ../widgets/misc/e-dateedit.c:459
+#: ../widgets/misc/e-dateedit.c:484
msgid "No_w"
msgstr "现在(_W)"
-#: ../widgets/misc/e-dateedit.c:465
+#: ../widgets/misc/e-dateedit.c:490
msgid "_Today"
msgstr "今天(_T)"
-#: ../widgets/misc/e-dateedit.c:1631
+#: ../widgets/misc/e-dateedit.c:1655
msgid "Invalid Date Value"
msgstr "无效的日期值"
-#: ../widgets/misc/e-dateedit.c:1657
+#: ../widgets/misc/e-dateedit.c:1684
msgid "Invalid Time Value"
msgstr "无效的时间值"
@@ -21275,11 +21780,11 @@ msgstr "标签部件"
msgid "A widget to display in place of the usual expander label"
msgstr "在通常扩展器标签的位置显示的部件"
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
@@ -21292,61 +21797,61 @@ msgid "Spacing around expander arrow"
msgstr "扩展器箭头旁边的间距"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:182
-#: ../widgets/misc/e-filter-bar.c:310 ../widgets/misc/e-filter-bar.c:747
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
msgid "Advanced Search"
msgstr "高级搜索"
#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:233
+#: ../widgets/misc/e-filter-bar.c:234
msgid "Save Search"
msgstr "保存搜索"
-#: ../widgets/misc/e-filter-bar.c:270
+#: ../widgets/misc/e-filter-bar.c:271
msgid "_Searches"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-filter-bar.c:272
+#: ../widgets/misc/e-filter-bar.c:273
msgid "Searches"
msgstr "搜索"
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
msgid "_Save Search..."
msgstr "保存搜索(_S)..."
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
msgid "_Edit Saved Searches..."
msgstr "编辑保存的搜索(_E)..."
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
msgid "_Advanced Search..."
msgstr "高级搜索(_A)..."
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
msgid "All Accounts"
msgstr "全部账户"
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
msgid "Current Account"
msgstr "当前账户"
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
msgid "Current Folder"
msgstr "当前文件夹"
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
msgid "Current Message"
msgstr "当前信件"
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
msgid "Choose Image"
msgstr "选择图像"
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:626
msgid "World Map"
msgstr "世界地图"
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:628
msgid ""
"Mouse-based interactive map widget for selecting timezone. Keyboard users "
"should select the timezone from the below combo box instead."
@@ -21378,43 +21883,54 @@ msgstr "回流模型"
msgid "Column width"
msgstr "列宽"
-#: ../widgets/misc/e-search-bar.c:596
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+#, fuzzy
+msgid "Search"
+msgstr "搜索(_S)"
+
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+#, fuzzy
+msgid "Click here to change the search type"
+msgstr "单击此处可便附加文件"
+
+#: ../widgets/misc/e-search-bar.c:610
msgid "_Search"
msgstr "搜索(_S)"
-#: ../widgets/misc/e-search-bar.c:602
+#: ../widgets/misc/e-search-bar.c:616
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:617
msgid "_Clear"
msgstr "清除(_C)"
-#: ../widgets/misc/e-search-bar.c:858
+#: ../widgets/misc/e-search-bar.c:872
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1216
-#: ../widgets/text/e-entry.c:1217 ../widgets/text/e-text.c:3559
-#: ../widgets/text/e-text.c:3560
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-text.c:3565
msgid "Text"
msgstr "文字"
#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:999
+#: ../widgets/misc/e-search-bar.c:1013
msgid "Sho_w: "
msgstr "显示(_W):"
#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1016
+#: ../widgets/misc/e-search-bar.c:1030
msgid "Sear_ch: "
msgstr "搜索(_C):"
#. To Translators: The " in " label is part of the Quick Search Bar, example:
#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1028
+#: ../widgets/misc/e-search-bar.c:1042
msgid " i_n "
msgstr " 于(_N) "
@@ -21573,14 +22089,14 @@ msgid "_When opened:"
msgstr "打开时(_W):"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:213
+#: ../widgets/misc/e-task-widget.c:297
#, c-format
msgid "%s (...)"
msgstr "%s (...)"
#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:219
+#: ../widgets/misc/e-task-widget.c:303
#, c-format
msgid "%s (%d%% complete)"
msgstr "%s (%d%% 完成)"
@@ -21613,166 +22129,161 @@ msgstr "弹出列表"
msgid "%l:%M %p"
msgstr "%p%l:%M"
-#: ../widgets/table/e-cell-pixbuf.c:383
+#: ../widgets/table/e-cell-pixbuf.c:360
msgid "Selected Column"
msgstr "选中列"
-#: ../widgets/table/e-cell-pixbuf.c:390
+#: ../widgets/table/e-cell-pixbuf.c:367
msgid "Focused Column"
msgstr "聚焦列"
-#: ../widgets/table/e-cell-pixbuf.c:397
+#: ../widgets/table/e-cell-pixbuf.c:374
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1803
+#: ../widgets/table/e-cell-text.c:1807
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1810
+#: ../widgets/table/e-cell-text.c:1814
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1817
+#: ../widgets/table/e-cell-text.c:1821
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1824
+#: ../widgets/table/e-cell-text.c:1828
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1838
+#: ../widgets/table/e-cell-text.c:1842
msgid "BG Color Column"
msgstr "给列着背景色"
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<- 删除(_R)"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "状态"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(升序)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(降序)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "未排序"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "未分组"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "显示域"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "可用域"
-#: ../widgets/table/e-table-config-no-group.glade.h:2
#: ../widgets/table/e-table-config.glade.h:1
msgid "A_vailable Fields:"
msgstr "可用域(_V):"
-#: ../widgets/table/e-table-config-no-group.glade.h:3
#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1579
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Ascending"
msgstr "升序"
-#: ../widgets/table/e-table-config-no-group.glade.h:4
#: ../widgets/table/e-table-config.glade.h:3
msgid "Clear All"
msgstr "全部清除"
-#: ../widgets/table/e-table-config-no-group.glade.h:5
#: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1579
+#, fuzzy
+msgid "Clear _All"
+msgstr "全部清除"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1582
msgid "Descending"
msgstr "降序"
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
msgid "Group Items By"
msgstr "分组依据"
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
msgid "Move _Down"
msgstr "下移(_D)"
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
msgid "Move _Up"
msgstr "上移(_U)"
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "按顺序显示这些域(_O):"
+#: ../widgets/table/e-table-config.glade.h:12
+#, fuzzy
+msgid "Show _field in View"
+msgstr "在视图中显示域"
-#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:641
-#: ../widgets/table/e-table-config.glade.h:10
-msgid "Show Fields"
-msgstr "显示域"
+#: ../widgets/table/e-table-config.glade.h:13
+#, fuzzy
+msgid "Show field i_n View"
+msgstr "在视图中显示域"
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
+#: ../widgets/table/e-table-config.glade.h:14
+#, fuzzy
+msgid "Show field in _View"
msgstr "在视图中显示域"
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
msgid "Sort"
msgstr "排序"
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
msgid "Sort Items By"
msgstr "排序依据"
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
msgid "Then By"
msgstr "然后按"
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "添加(_A) ->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
msgid "_Fields Shown..."
msgstr "显示的域(_F)..."
-#: ../widgets/table/e-table-config-no-group.glade.h:19
#: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "排序(_S)..."
-
-#: ../widgets/table/e-table-config.c:152
-msgid "State"
-msgstr "状态"
-
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
-msgid "(Ascending)"
-msgstr "(升序)"
-
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
-msgid "(Descending)"
-msgstr "(降序)"
-
-#: ../widgets/table/e-table-config.c:392
-msgid "Not sorted"
-msgstr "未排序"
-
-#: ../widgets/table/e-table-config.c:433
-msgid "No grouping"
-msgstr "未分组"
-
-#: ../widgets/table/e-table-config.c:662
-msgid "Available Fields"
-msgstr "可用域"
-
-#: ../widgets/table/e-table-config.glade.h:17
msgid "_Group By..."
msgstr "分组依据(_G)..."
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+#, fuzzy
+msgid "_Show field in View"
+msgstr "在视图中显示域"
+
+#: ../widgets/table/e-table-config.glade.h:23
msgid "_Show these fields in order:"
msgstr "按顺序显示这些域(_S):"
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "排序(_S)..."
+
#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:636
+#: ../widgets/table/e-table-field-chooser-item.c:634
#: ../widgets/table/e-table-field-chooser.c:67
-#: ../widgets/table/e-table-header-item.c:1875
+#: ../widgets/table/e-table-header-item.c:1886
msgid "DnD code"
msgstr "拖放代码"
#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:643
+#: ../widgets/table/e-table-field-chooser-item.c:641
#: ../widgets/table/e-table-field-chooser.c:74
-#: ../widgets/table/e-table-header-item.c:1889
+#: ../widgets/table/e-table-header-item.c:1900
msgid "Full Header"
msgstr "完整标题"
@@ -21806,7 +22317,7 @@ msgstr[0] "%s (%d 项)"
#: ../widgets/table/e-table-group-container.c:897
#: ../widgets/table/e-table-group-leaf.c:572
#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-item.c:2972 ../widgets/table/e-table-item.c:2973
+#: ../widgets/table/e-table-item.c:3029 ../widgets/table/e-table-item.c:3030
msgid "Alternating Row Colors"
msgstr "交替行色"
@@ -21814,8 +22325,8 @@ msgstr "交替行色"
#: ../widgets/table/e-table-group-container.c:904
#: ../widgets/table/e-table-group-leaf.c:579
#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-item.c:2979 ../widgets/table/e-table-item.c:2980
-#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
+#: ../widgets/table/e-table-item.c:3036 ../widgets/table/e-table-item.c:3037
+#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
msgid "Horizontal Draw Grid"
msgstr "水平绘制网格"
@@ -21823,8 +22334,8 @@ msgstr "水平绘制网格"
#: ../widgets/table/e-table-group-container.c:911
#: ../widgets/table/e-table-group-leaf.c:586
#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:2986 ../widgets/table/e-table-item.c:2987
-#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
+#: ../widgets/table/e-table-item.c:3043 ../widgets/table/e-table-item.c:3044
+#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
msgid "Vertical Draw Grid"
msgstr "垂直绘制网格"
@@ -21832,8 +22343,8 @@ msgstr "垂直绘制网格"
#: ../widgets/table/e-table-group-container.c:918
#: ../widgets/table/e-table-group-leaf.c:593
#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:2993 ../widgets/table/e-table-item.c:2994
-#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
+#: ../widgets/table/e-table-item.c:3050 ../widgets/table/e-table-item.c:3051
+#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
msgid "Draw focus"
msgstr "绘制焦点"
@@ -21841,7 +22352,7 @@ msgstr "绘制焦点"
#: ../widgets/table/e-table-group-container.c:925
#: ../widgets/table/e-table-group-leaf.c:600
#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3000 ../widgets/table/e-table-item.c:3001
+#: ../widgets/table/e-table-item.c:3057 ../widgets/table/e-table-item.c:3058
msgid "Cursor mode"
msgstr "光标模式"
@@ -21849,7 +22360,7 @@ msgstr "光标模式"
#: ../widgets/table/e-table-group-container.c:932
#: ../widgets/table/e-table-group-leaf.c:614
#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:2965 ../widgets/table/e-table-item.c:2966
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
msgid "Selection model"
msgstr "选择模型"
@@ -21857,9 +22368,9 @@ msgstr "选择模型"
#: ../widgets/table/e-table-group-container.c:939
#: ../widgets/table/e-table-group-leaf.c:607
#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
-#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
-#: ../widgets/table/e-tree.c:3302
+#: ../widgets/table/e-table-item.c:3064 ../widgets/table/e-table-item.c:3065
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
msgid "Length Threshold"
msgstr "长度阀值"
@@ -21867,9 +22378,9 @@ msgstr "长度阀值"
#: ../widgets/table/e-table-group-container.c:946
#: ../widgets/table/e-table-group-leaf.c:649
#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
-#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
-#: ../widgets/table/e-tree.c:3334
+#: ../widgets/table/e-table-item.c:3098 ../widgets/table/e-table-item.c:3099
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
msgid "Uniform row height"
msgstr "统一行高"
@@ -21880,87 +22391,94 @@ msgstr "统一行高"
msgid "Frozen"
msgstr "冻结"
-#: ../widgets/table/e-table-header-item.c:1456
+#: ../widgets/table/e-table-header-item.c:1452
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1472
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1473
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1474
msgid "_Unsort"
msgstr "未排序(_U)"
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1476
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1479
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Add a C_olumn..."
msgstr "添加一列(_O)..."
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1482
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1483
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../widgets/table/e-table-header-item.c:1488
+#: ../widgets/table/e-table-header-item.c:1484
msgid "Format Column_s..."
msgstr "格式化列(_S)..."
-#: ../widgets/table/e-table-header-item.c:1490
+#: ../widgets/table/e-table-header-item.c:1486
msgid "Custo_mize Current View..."
msgstr "自定义当前视图(_M)..."
-#: ../widgets/table/e-table-header-item.c:1540
-msgid "Sort By"
+#: ../widgets/table/e-table-header-item.c:1542
+#, fuzzy
+msgid "_Sort By"
msgstr "排序方式"
-#: ../widgets/table/e-table-header-item.c:1882
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+#, fuzzy
+msgid "_Custom"
+msgstr "自定义"
+
+#: ../widgets/table/e-table-header-item.c:1893
msgid "Font Description"
msgstr "字体描述"
-#: ../widgets/table/e-table-header-item.c:1903
+#: ../widgets/table/e-table-header-item.c:1914
#: ../widgets/table/e-table-sorter.c:173
msgid "Sort Info"
msgstr "排序信息"
-#: ../widgets/table/e-table-header-item.c:1917
+#: ../widgets/table/e-table-header-item.c:1928
#: ../widgets/table/e-tree-scrolled.c:225
#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
msgstr "树"
-#: ../widgets/table/e-table-item.c:2951 ../widgets/table/e-table-item.c:2952
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
msgid "Table header"
msgstr "表头"
-#: ../widgets/table/e-table-item.c:2958 ../widgets/table/e-table-item.c:2959
+#: ../widgets/table/e-table-item.c:3015 ../widgets/table/e-table-item.c:3016
msgid "Table model"
msgstr "表格模型"
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:3091 ../widgets/table/e-table-item.c:3092
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
-#: ../widgets/table/e-tree.c:3341
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
msgid "Always search"
msgstr "总是搜索"
@@ -21968,134 +22486,264 @@ msgstr "总是搜索"
msgid "Use click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3347
+#: ../widgets/table/e-tree.c:3349
msgid "Retro Look"
msgstr "火箭外观"
-#: ../widgets/table/e-tree.c:3348
+#: ../widgets/table/e-tree.c:3350
msgid "Draw lines and +/- expanders."
msgstr "绘制行和 +/- 扩展柄。"
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3552 ../widgets/text/e-text.c:3553
+#: ../widgets/text/e-text.c:2734
+msgid "Input Methods"
+msgstr "输入法"
+
+#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
msgid "Event Processor"
msgstr "事件处理器"
-#: ../widgets/text/e-entry.c:1223 ../widgets/text/e-entry.c:1224
-#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+msgid "Bold"
+msgstr "粗体"
+
+#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+msgid "Strikeout"
+msgstr "删除线"
+
+#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+msgid "Anchor"
+msgstr "锚点"
+
+#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
msgid "Justification"
msgstr "两端对齐"
-#: ../widgets/text/e-entry.c:1265 ../widgets/text/e-entry.c:1266
-#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
+#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+msgid "Clip Width"
+msgstr "裁剪宽度"
+
+#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+msgid "Clip Height"
+msgstr "裁剪高度"
+
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+msgid "Clip"
+msgstr "裁剪"
+
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+msgid "Fill clip rectangle"
+msgstr "填充裁剪矩形"
+
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+msgid "X Offset"
+msgstr "水平偏移"
+
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+msgid "Y Offset"
+msgstr "垂直偏移"
+
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+msgid "Text width"
+msgstr "文字宽度"
+
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+msgid "Text height"
+msgstr "文字高度"
+
+#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
msgid "Use ellipsis"
msgstr "使用椭圆"
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
msgid "Ellipsis"
msgstr "椭圆"
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
msgid "Line wrap"
msgstr "换行"
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
msgid "Break characters"
msgstr "换行字符"
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
msgid "Max lines"
msgstr "最多行数"
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
-msgid "Allow newlines"
-msgstr "允许新行"
-
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
msgid "Draw borders"
msgstr "绘制边框"
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+msgid "Allow newlines"
+msgstr "允许新行"
+
+#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
msgid "Draw background"
msgstr "绘制背景"
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
msgid "Draw button"
msgstr "绘制按钮"
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
msgid "Cursor position"
msgstr "光标位置"
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-msgid "Emulate label resize"
-msgstr "模拟标签缩放"
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+msgid "IM Context"
+msgstr "输入法环境"
-#: ../widgets/text/e-text.c:2729
-msgid "Input Methods"
-msgstr "输入法"
+#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+msgid "Handle Popup"
+msgstr "处理弹出"
-#: ../widgets/text/e-text.c:3566 ../widgets/text/e-text.c:3567
-msgid "Bold"
-msgstr "粗体"
+#~ msgid "_Categories..."
+#~ msgstr "类别(_C)..."
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
-msgid "Strikeout"
-msgstr "删除线"
+#~ msgid "\n"
+#~ msgstr "\n"
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
-msgid "Anchor"
-msgstr "锚点"
+#~ msgid "Add an email to the List"
+#~ msgstr "将电子邮件添加到列表"
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
-msgid "Clip Width"
-msgstr "裁剪宽度"
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "从地址簿中插入电子邮件地址"
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
-msgid "Clip Height"
-msgstr "裁剪高度"
+#~ msgid "Members"
+#~ msgstr "成员"
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
-msgid "Clip"
-msgstr "裁剪"
+#~ msgid "Remove an email address from the List"
+#~ msgstr "从列表中删除电子邮件地址"
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
-msgid "Fill clip rectangle"
-msgstr "填充裁剪矩形"
+#~ msgid "_Select"
+#~ msgstr "选择(_S)"
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
-msgid "X Offset"
-msgstr "水平偏移"
+#~ msgid "Or_ganiser:"
+#~ msgstr "组织者(_G):"
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
-msgid "Y Offset"
-msgstr "垂直偏移"
+#~ msgid "Task sort"
+#~ msgstr "任务排序"
-#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
-msgid "Text width"
-msgstr "文字宽度"
+#~ msgid "Memo sort"
+#~ msgstr "备忘排序"
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
-msgid "Text height"
-msgstr "文字高度"
+#~ msgid "SMTWTFS"
+#~ msgstr "日一二三四五六"
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
-msgid "IM Context"
-msgstr "输入法环境"
+#~ msgid "Post To:"
+#~ msgstr "投递到:"
-#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
-msgid "Handle Popup"
-msgstr "处理弹出"
+#~ msgid "The Evolution PIM and Email Client"
+#~ msgstr "Evolution 个人信息管理和邮件客户"
+
+#~ msgid "_Search name:"
+#~ msgstr "搜索名称(_B):"
+
+#~ msgid "Di_sable"
+#~ msgstr "禁用(_S)"
+
+#~ msgid "Automatic smiley recognition"
+#~ msgstr "自动识别表情"
+
+#~ msgid "New Mail Notify sound file"
+#~ msgstr "新建邮件通知声音文件"
+
+#~ msgid "New Mail Notify type"
+#~ msgstr "新建邮件通知类型"
+
+#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgstr "指定用户想要使用的新邮件通知类型。"
+
+#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
+#~ msgstr "<span weight=\"bold\">标签和颜色</span>"
+
+#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
+#~ msgstr "<span weight=\"bold\">新邮件提醒</span>"
+
+#~ msgid "HTML Mail"
+#~ msgstr "HTML 邮件"
+
+#~ msgid "Se_lect..."
+#~ msgstr "选择(_L)..."
+
+#~ msgid "Select Drafts Folder"
+#~ msgstr "选择草稿文件夹"
+
+#~ msgid "Select Sent Folder"
+#~ msgstr "选择已发文件夹"
+
+#~ msgid "_Beep when new mail arrives"
+#~ msgstr "新邮件到达时响铃(_B)"
+
+#~ msgid "_Do not notify me when new mail arrives"
+#~ msgstr "新邮件到达时不要提醒我(_D)"
+
+#~ msgid "Attachment Reminder Preferences"
+#~ msgstr "附件提醒首选项"
+
+#~ msgid "Select a (48*48) png of size < 720bytes"
+#~ msgstr "选择一个小于 720B 的 48*48 的 PNG 图像"
+
+#~ msgid "_Contacts..."
+#~ msgstr "联系人(_C)..."
+
+#~ msgid "Every time a new mail arrives, pop up a libnotify notification."
+#~ msgstr "每当新邮件到达时,弹出一个 libnotify 通知。"
+
+#~ msgid "Make the status icon blink"
+#~ msgstr "闪烁状态图标"
+
+#~ msgid "When the new-mail status icon is visible, make it blink."
+#~ msgstr "当新邮件状态图标可见时,使之闪烁。"
+
+#~ msgid "System error: %s"
+#~ msgstr "系统错误:%s"
+
+#~ msgid "Camel error: %s"
+#~ msgstr "Camel 错误:%s"
+
+#~ msgid "Account cannot send e-mail"
+#~ msgstr "账户无法发送电子邮件"
+
+#~ msgid "No store available"
+#~ msgstr "没有可用的存储"
+
+#~ msgid ""
+#~ "A plugin which implements a CORBA interface for accessing mail data "
+#~ "remotely."
+#~ msgstr "实现远程访问邮件数据的 CORBA 接口的插件。"
+
+#~ msgid "Mail Remote"
+#~ msgstr "远程邮件"
+
+#~ msgid "New Mail Notification"
+#~ msgstr "新邮件通知"
+
+#~ msgid "Configure"
+#~ msgstr "配置"
+
+#~ msgid "Download messages for offline"
+#~ msgstr "下载信件进行脱机处理"
+
+#~ msgid "_Phone List"
+#~ msgstr "电话列表(_P)"
+
+#~ msgid "MTWTFSS"
+#~ msgstr "一二三四五六日"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<- 删除(_R)"
+
+#~ msgid "Sh_ow these fields in order:"
+#~ msgstr "按顺序显示这些域(_O):"
+
+#~ msgid "_Add ->"
+#~ msgstr "添加(_A) ->"
+
+#~ msgid "Emulate label resize"
+#~ msgstr "模拟标签缩放"