aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po3493
2 files changed, 1924 insertions, 1573 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 85923fb499..663cef3dc8 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-02 Funda Wang <fundawang@gmail.com>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2007-09-02 Duarte Loreto <happyguy_pt@hotmail.com>
* pt.po: Updated Portuguese translation.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index dccb689966..74d8b31398 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-06-19 03:18+0100\n"
-"PO-Revision-Date: 2007-06-21 14:47+0800\n"
+"POT-Creation-Date: 2007-08-28 03:21+0100\n"
+"PO-Revision-Date: 2007-09-02 17:02+0800\n"
"Last-Translator: Funda Wang <fundawang@gmail.com>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@ msgstr "转到今天"
msgid "Go to Date"
msgstr "转到日期"
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
#: ../a11y/calendar/ea-week-view-main-item.c:301
msgid "a table to view and select the current time range"
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:713
+#: ../calendar/gui/calendar-component.c:740
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:716
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:743
+#: ../calendar/gui/e-day-view-top-item.c:1340
+#: ../calendar/gui/e-day-view.c:2115
#: ../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:718
-#: ../calendar/gui/calendar-component.c:723
-#: ../calendar/gui/calendar-component.c:725
+#: ../calendar/gui/calendar-component.c:745
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/calendar-component.c:752
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:737
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:750
-#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:764
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:777
+#: ../calendar/gui/calendar-component.c:779
msgid "%d %b %Y"
msgstr "%Y年%-m月%-d日"
@@ -195,9 +195,9 @@ 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:742
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:769
+#: ../calendar/gui/e-day-view-top-item.c:1344
+#: ../calendar/gui/e-day-view.c:2131
#: ../calendar/gui/e-week-view-main-item.c:333
#: ../calendar/gui/e-week-view-main-item.c:547
msgid "%d %b"
@@ -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:574
+#: ../widgets/table/e-table-click-to-add.c:571
msgid "click to add"
msgstr "单击可添加"
@@ -399,7 +399,7 @@ msgstr "认证到 IMAP 服务器失败。"
#. Unknown error
#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1828
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
msgid "Failed to delete contact"
msgstr "删除联系人失败"
@@ -532,7 +532,7 @@ 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
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
msgid "{0}"
msgstr "{0}"
@@ -574,7 +574,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:277 ../calendar/gui/migration.c:402
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
#: ../plugins/exchange-operations/exchange-folder.c:581
msgid "Contacts"
msgstr "联系人"
@@ -614,8 +615,8 @@ 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:488
-#: ../calendar/gui/calendar-component.c:236
+#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../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
@@ -630,20 +631,20 @@ msgstr "在此计算机中"
#. Create the default Person addressbook
#. orange
#: ../addressbook/gui/component/addressbook-component.c:152
-#: ../addressbook/gui/component/addressbook-migrate.c:496
+#: ../addressbook/gui/component/addressbook-migrate.c:505
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
#: ../addressbook/gui/widgets/eab-contact-display.c:597
-#: ../calendar/gui/calendar-component.c:246
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:491
+#: ../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:204 ../filter/filter-label.c:122
+#: ../calendar/gui/tasks-component.c:205 ../filter/filter-label.c:122
#: ../mail/em-migrate.c:1056 ../mail/mail-config.glade.h:106
msgid "Personal"
msgstr "个人"
#. Create the LDAP source group
#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:506
+#: ../addressbook/gui/component/addressbook-migrate.c:515
msgid "On LDAP Servers"
msgstr "在 LDAP 服务器上"
@@ -664,7 +665,7 @@ msgid "Create a new contact list"
msgstr "创建一个新的联系人列表"
#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1208
+#: ../addressbook/gui/component/addressbook-config.c:1209
msgid "New Address Book"
msgstr "新地址簿"
@@ -696,11 +697,11 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
#: ../addressbook/gui/component/addressbook-config.c:984
#: ../addressbook/gui/component/ldap-config.glade.h:22
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.c:365
-#: ../calendar/gui/dialogs/calendar-setup.c:376
-#: ../calendar/gui/dialogs/calendar-setup.c:387
+#: ../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:2087
+#: ../plugins/itip-formatter/itip-formatter.c:2238
#: ../smime/gui/smime-ui.glade.h:28
msgid "General"
msgstr "常规"
@@ -726,7 +727,7 @@ msgid "Details"
msgstr "细节"
#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:849
+#: ../mail/em-folder-browser.c:865
msgid "Searching"
msgstr "搜索"
@@ -734,7 +735,7 @@ msgstr "搜索"
msgid "Downloading"
msgstr "下载"
-#: ../addressbook/gui/component/addressbook-config.c:1206
+#: ../addressbook/gui/component/addressbook-config.c:1207
#: ../addressbook/gui/component/ldap-config.glade.h:13
msgid "Address Book Properties"
msgstr "地址簿属性"
@@ -750,15 +751,15 @@ msgstr "正在升迁..."
msgid "Migrating `%s':"
msgstr "升迁“%s”:"
-#: ../addressbook/gui/component/addressbook-migrate.c:634
+#: ../addressbook/gui/component/addressbook-migrate.c:643
msgid "LDAP Servers"
msgstr "LDAP 服务器"
-#: ../addressbook/gui/component/addressbook-migrate.c:749
+#: ../addressbook/gui/component/addressbook-migrate.c:758
msgid "Autocompletion Settings"
msgstr "自动补全设置"
-#: ../addressbook/gui/component/addressbook-migrate.c:1124
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
msgid ""
"The location and hierarchy of the Evolution contact folders has changed "
"since Evolution 1.x.\n"
@@ -769,7 +770,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1138
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
msgid ""
"The format of mailing list contacts has changed.\n"
"\n"
@@ -779,7 +780,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1147
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
msgid ""
"The way Evolution stores some phone numbers has changed.\n"
"\n"
@@ -789,7 +790,7 @@ msgstr ""
"\n"
"请稍候,Evolution 正在升迁您的文件夹..."
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
msgid ""
"Evolution's Palm Sync changelog and map files have changed.\n"
"\n"
@@ -800,37 +801,33 @@ msgstr ""
"请稍候,Evolution 正在升迁您的 Pilot 同步数据..."
#: ../addressbook/gui/component/addressbook-view.c:434
-#: ../mail/em-folder-utils.c:503
+#: ../mail/em-folder-utils.c:504
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "将“%s”文件夹重命名为:"
#: ../addressbook/gui/component/addressbook-view.c:437
-#: ../mail/em-folder-utils.c:505
+#: ../mail/em-folder-utils.c:506
msgid "Rename Folder"
msgstr "重命名文件夹"
#: ../addressbook/gui/component/addressbook-view.c:442
-#: ../mail/em-folder-utils.c:511
+#: ../mail/em-folder-utils.c:512
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "已经存在此名称的文件夹"
-
#: ../addressbook/gui/component/addressbook-view.c:956
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:979
-#: ../calendar/gui/calendar-component.c:590
-#: ../calendar/gui/e-calendar-table.c:1303
-#: ../calendar/gui/e-calendar-view.c:1701 ../calendar/gui/e-memo-table.c:919
-#: ../calendar/gui/memos-component.c:458 ../calendar/gui/tasks-component.c:449
-#: ../mail/em-folder-tree.c:2122 ../mail/em-folder-view.c:1155
+#: ../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:2127 ../mail/em-folder-view.c:1233
#: ../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-tasks.xml.h:24
@@ -842,8 +839,8 @@ msgid "Save As Vcard..."
msgstr "另存为 Vcard..."
#: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:591
-#: ../calendar/gui/memos-component.c:459 ../calendar/gui/tasks-component.c:450
+#: ../calendar/gui/calendar-component.c:605
+#: ../calendar/gui/memos-component.c:467 ../calendar/gui/tasks-component.c:458
msgid "_Properties..."
msgstr "属性(_P)..."
@@ -856,12 +853,12 @@ msgid "Accessing LDAP Server anonymously"
msgstr "匿名访问 LDAP 服务器"
#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:507
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
msgid "Failed to authenticate.\n"
msgstr "认证失败。\n"
#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:487
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
#, c-format
msgid "Enter password for %s (user %s)"
msgstr "输入 %s 的密码(用户 %s)"
@@ -1168,8 +1165,8 @@ msgid "_Login method:"
msgstr "登录方式(_L):"
#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:225
-#: ../mail/mail-config.glade.h:169
+#: ../calendar/gui/dialogs/calendar-setup.c:229
+#: ../mail/mail-config.glade.h:171
#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
msgid "_Name:"
msgstr "名称(_N):"
@@ -1183,7 +1180,7 @@ msgid "_Search scope:"
msgstr "搜索范围(_S):"
#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:178
#: ../plugins/publish-calendar/publish-calendar.glade.h:26
msgid "_Server:"
msgstr "服务器(_S):"
@@ -1204,8 +1201,8 @@ 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:2054
-#: ../plugins/calendar-http/calendar-http.c:286
+#: ../mail/em-account-editor.c:2064
+#: ../plugins/calendar-http/calendar-http.c:288
#: ../plugins/calendar-weather/calendar-weather.c:561
msgid "minutes"
msgstr "分钟"
@@ -1263,7 +1260,7 @@ 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:2419
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1313,7 +1310,8 @@ msgid "Work"
msgstr "工作"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
msgstr "地址(_A):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
@@ -1329,9 +1327,9 @@ msgid "_Birthday:"
msgstr "生日(_B):"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:908
#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1716
+#: ../plugins/itip-formatter/itip-view.c:1833
msgid "_Calendar:"
msgstr "日历(_C):"
@@ -1440,10 +1438,10 @@ msgstr "地址"
#: ../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:181
-#: ../widgets/table/e-cell-text.c:1830 ../widgets/text/e-entry.c:1263
-#: ../widgets/text/e-entry.c:1264 ../widgets/text/e-text.c:3609
-#: ../widgets/text/e-text.c:3610
+#: ../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
msgid "Editable"
msgstr "可编辑"
@@ -2416,12 +2414,12 @@ msgid "Zimbabwe"
msgstr "津巴布韦"
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../plugins/exchange-operations/exchange-delegates.c:958
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:52
+#: ../plugins/plugin-manager/plugin-manager.c:54
#: ../plugins/save-attachments/save-attachments.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:354
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-new-dialog.c:65
msgid "Name"
msgstr "姓名"
@@ -2521,20 +2519,20 @@ msgid "Changed"
msgstr "已更改"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:561
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2414
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2420
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2801
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2811
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2802
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2812
msgid "_No image"
msgstr "无图像(_N)"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3113
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2542,23 +2540,23 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3117
#, c-format
msgid "'%s' has an invalid format"
msgstr "“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3124
#, c-format
msgid "%s'%s' has an invalid format"
msgstr "%s“%s”的格式无效"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3129
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3139
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3150
#, c-format
msgid "%s'%s' is empty"
msgstr "%s“%s”为空"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3165
msgid "Invalid contact."
msgstr "无效的联系人。"
@@ -2570,15 +2568,15 @@ msgstr "快速添加联系人"
msgid "_Edit Full"
msgstr "编辑全名(_E)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:338
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:339
msgid "_Full name"
msgstr "全名(_F)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:349
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
msgid "E_mail"
msgstr "电子邮件(_M)"
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:360
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:361
msgid "_Select Address Book"
msgstr "选择地址簿(_S)"
@@ -2624,10 +2622,6 @@ msgstr "国家/地区(_Y):"
msgid "Full Address"
msgstr "完整地址"
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "地址(_A):"
-
#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
msgid "_ZIP Code:"
msgstr "邮政编码(_Z):"
@@ -2794,10 +2788,10 @@ msgstr "复制检测到的联系人"
#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder. Would you like to add it anyway?"
+"The name or email of this contact already exists in this folder. Would you "
+"like to add it anyway?"
msgstr ""
-"更改后的电子邮件或姓名已经在本文件夹中存在了。\n"
+"此联系人的姓名或地址已经在本文件夹中存在了。"
"您一定要添加吗?"
#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
@@ -2821,8 +2815,8 @@ msgid "Merge Contact"
msgstr "合并联系人"
#: ../addressbook/gui/merging/eab-contact-merging.c:205
-msgid "Merge"
-msgstr "合并"
+msgid "_Merge"
+msgstr "合并(_M)"
#: ../addressbook/gui/merging/eab-contact-merging.c:258
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
@@ -2873,12 +2867,12 @@ msgid "Error getting book view"
msgstr "获取名簿视图出错"
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3340
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1207 ../widgets/text/e-entry.c:1208
-#: ../widgets/text/e-text.c:3473 ../widgets/text/e-text.c:3474
+#: ../widgets/table/e-table-click-to-add.c:500
+#: ../widgets/table/e-table-selection-model.c:307
+#: ../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
msgid "Model"
msgstr "模型"
@@ -2898,77 +2892,77 @@ msgstr "来源"
msgid "Type"
msgstr "类型"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:836
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2047
+#: ../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..."
msgstr "另存为 VCard..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:957
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../calendar/gui/e-calendar-table.c:1281
-#: ../calendar/gui/e-calendar-view.c:1679 ../calendar/gui/e-memo-table.c:902
+#: ../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
#: ../ui/evolution-addressbook.xml.h:56
msgid "_Open"
msgstr "打开(_O)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:961
msgid "_New Contact..."
msgstr "新建联系人(_N)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
msgid "New Contact _List..."
msgstr "新建联系人列表(_L)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
msgid "_Save as VCard..."
msgstr "另存为 VCard(_S)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
msgid "_Forward Contact"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
msgid "_Forward Contacts"
msgstr "转发联系人(_F)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
msgid "Send _Message to Contact"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:967
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
msgid "Send _Message to List"
msgstr "给列表发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
+#: ../addressbook/gui/widgets/e-addressbook-view.c:970
msgid "Send _Message to Contacts"
msgstr "给联系人发信件(_M)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:969
+#: ../addressbook/gui/widgets/e-addressbook-view.c:971
msgid "_Print"
msgstr "打印(_P)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:972
+#: ../addressbook/gui/widgets/e-addressbook-view.c:974
msgid "Cop_y to Address Book..."
msgstr "复制到地址簿(_Y)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:973
+#: ../addressbook/gui/widgets/e-addressbook-view.c:975
msgid "Mo_ve to Address Book..."
msgstr "移至地址簿(_V)..."
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
#: ../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:977
-#: ../calendar/gui/calendar-component.c:589
+#: ../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:1289
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:910
-#: ../calendar/gui/memos-component.c:457 ../calendar/gui/tasks-component.c:448
-#: ../composer/e-msg-composer.c:3180 ../mail/em-folder-tree.c:1006
-#: ../mail/em-folder-view.c:1140 ../mail/message-list.c:1962
+#: ../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:1006
+#: ../mail/em-folder-view.c:1218 ../mail/message-list.c:1962
#: ../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
@@ -2976,19 +2970,19 @@ msgstr "剪切(_T)"
msgid "_Copy"
msgstr "复制(_C)"
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:980
msgid "P_aste"
msgstr "粘贴(_A)"
#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1634
-#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
-#: ../calendar/gui/cal-search-bar.c:681
+#: ../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
msgid "Any Category"
msgstr "任何类别"
#. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1828
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1830
#: ../addressbook/gui/widgets/eab-gui-util.c:71
msgid "Other error"
msgstr "其它错误"
@@ -3024,6 +3018,7 @@ msgstr "车载电话"
#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
#: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
#: ../calendar/gui/e-cal-list-view.etspec.h:1
#: ../calendar/gui/e-calendar-table.etspec.h:3
#: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3163,32 +3158,32 @@ msgstr "网站"
#: ../addressbook/gui/widgets/e-minicard-label.c:115
#: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../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-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:657
+#: ../widgets/table/e-table-group-container.c:966
#: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
#: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3651 ../widgets/text/e-text.c:3652
+#: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
msgid "Width"
msgstr "宽度"
#: ../addressbook/gui/widgets/e-minicard-label.c:122
#: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../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-group-container.c:959
#: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
#: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3659 ../widgets/text/e-text.c:3660
+#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/text/e-text.c:3731 ../widgets/text/e-text.c:3732
msgid "Height"
msgstr "高度"
@@ -3289,16 +3284,16 @@ msgstr "已选择"
msgid "Has Cursor"
msgstr "有光标"
-#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:630
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:633
msgid "_Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
#: ../addressbook/gui/widgets/eab-contact-display.c:173
-#: ../mail/em-folder-view.c:2600
+#: ../mail/em-folder-view.c:2603
msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:634
msgid "_Send New Message To..."
msgstr "把新信发送到(_S)..."
@@ -3340,13 +3335,14 @@ msgstr "视频聊天"
#: ../addressbook/gui/widgets/eab-contact-display.c:573
#: ../calendar/gui/calendar-commands.c:99
-#: ../calendar/gui/calendar-component.c:761
-#: ../calendar/gui/dialogs/calendar-setup.c:366
+#: ../calendar/gui/calendar-component.c:788
+#: ../calendar/gui/dialogs/calendar-setup.c:370
#: ../calendar/gui/gnome-cal.c:2354
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
#: ../plugins/exchange-operations/exchange-folder.c:575
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:396
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:427
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:540
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
#: ../plugins/hula-account-setup/camel-hula-listener.c:378
#: ../plugins/hula-account-setup/camel-hula-listener.c:407
#: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -3355,7 +3351,7 @@ msgstr "日历"
#: ../addressbook/gui/widgets/eab-contact-display.c:574
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:370
+#: ../calendar/gui/dialogs/event-editor.c:369
#: ../ui/evolution-event-editor.xml.h:8
msgid "Free/Busy"
msgstr "忙/闲"
@@ -3378,10 +3374,12 @@ msgid "Web Log"
msgstr "Web 日志"
#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../calendar/gui/e-calendar-view.c:2323
msgid "Birthday"
msgstr "生日"
#: ../addressbook/gui/widgets/eab-contact-display.c:594
+#: ../calendar/gui/e-calendar-view.c:2324
msgid "Anniversary"
msgstr "纪念日"
@@ -3449,10 +3447,10 @@ msgstr "不支持的协议"
#. E_BOOK_ERROR_CANCELLED
#: ../addressbook/gui/widgets/eab-gui-util.c:63
#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../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:464 ../calendar/gui/print.c:2351
+#: ../calendar/gui/e-calendar-table.c:475 ../calendar/gui/print.c:2351
msgid "Canceled"
msgstr "已取消"
@@ -3574,7 +3572,7 @@ msgid "Error adding list"
msgstr "添加列表出错"
#: ../addressbook/gui/widgets/eab-gui-util.c:188
-#: ../addressbook/gui/widgets/eab-gui-util.c:710
+#: ../addressbook/gui/widgets/eab-gui-util.c:713
msgid "Error adding contact"
msgstr "添加联系人出错"
@@ -3591,7 +3589,7 @@ msgid "Error removing list"
msgstr "删除列表出错"
#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:660
+#: ../addressbook/gui/widgets/eab-gui-util.c:663
msgid "Error removing contact"
msgstr "删除联系人出错"
@@ -3607,8 +3605,16 @@ msgstr[0] ""
"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
"您真的想要显示所有联系人吗?"
+#: ../addressbook/gui/widgets/eab-gui-util.c:301
+msgid "_Don't Display"
+msgstr "不显示(_D)"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:302
+msgid "Display _All Contacts"
+msgstr "显示全部联系人(_A)"
+
#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
+#: ../addressbook/gui/widgets/eab-gui-util.c:328
#, c-format
msgid ""
"%s already exists\n"
@@ -3617,63 +3623,63 @@ msgstr ""
"%s 已经存在\n"
"您打算覆盖它吗?"
-#: ../addressbook/gui/widgets/eab-gui-util.c:329
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
msgid "Overwrite"
msgstr "覆盖"
#. more than one, finding the total number of contacts might
#. * hit performance while saving large number of contacts
#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:376
#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
msgid "contact"
msgid_plural "contacts"
msgstr[0] "联系人"
#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
msgid "card.vcf"
msgstr "card.vcf"
-#: ../addressbook/gui/widgets/eab-gui-util.c:464
+#: ../addressbook/gui/widgets/eab-gui-util.c:467
msgid "Select Address Book"
msgstr "选择地址簿"
-#: ../addressbook/gui/widgets/eab-gui-util.c:605
+#: ../addressbook/gui/widgets/eab-gui-util.c:608
msgid "list"
msgstr "列表"
-#: ../addressbook/gui/widgets/eab-gui-util.c:771
+#: ../addressbook/gui/widgets/eab-gui-util.c:774
msgid "Move contact to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:776
msgid "Copy contact to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:776
+#: ../addressbook/gui/widgets/eab-gui-util.c:779
msgid "Move contacts to"
msgstr "将联系人移至"
-#: ../addressbook/gui/widgets/eab-gui-util.c:778
+#: ../addressbook/gui/widgets/eab-gui-util.c:781
msgid "Copy contacts to"
msgstr "将联系人复制到"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:1007
msgid "Multiple VCards"
msgstr "多个 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1007
+#: ../addressbook/gui/widgets/eab-gui-util.c:1010
#, c-format
msgid "VCard for %s"
msgstr "%s 的 VCard"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1048
-#: ../addressbook/gui/widgets/eab-gui-util.c:1066
+#: ../addressbook/gui/widgets/eab-gui-util.c:1051
+#: ../addressbook/gui/widgets/eab-gui-util.c:1069
msgid "Contact information"
msgstr "联系人信息"
-#: ../addressbook/gui/widgets/eab-gui-util.c:1068
+#: ../addressbook/gui/widgets/eab-gui-util.c:1071
#, c-format
msgid "Contact information for %s"
msgstr "%s 的联系人信息"
@@ -3794,12 +3800,12 @@ msgid "Format"
msgstr "格式"
#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:495
-#: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1898
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../widgets/table/e-table-click-to-add.c:493
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:650
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1896
+#: ../widgets/table/e-table-selection-model.c:314
msgid "Header"
msgstr "页眉"
@@ -3901,7 +3907,7 @@ msgstr "阴影"
#. FIXME: Take care of i18n
#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:964
#: ../plugins/exchange-operations/exchange-calendar.c:231
#: ../plugins/exchange-operations/exchange-contacts.c:217
msgid "Size:"
@@ -3993,7 +3999,7 @@ msgstr "以异步模式导出"
#: ../addressbook/tools/evolution-addressbook-export.c:63
msgid ""
-"The number of cards in out output file in asynchronous mode, default size "
+"The number of cards in one output file in asynchronous mode, default size "
"100."
msgstr "异步模式中一个输出文件中的名片数,默认大小为 100。"
@@ -4035,15 +4041,12 @@ msgid ""
msgstr "在您的任务中添加有意义的摘要可以让您的收件人更容易明白您任务的内容。"
#: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr "这些日记项的全部信息将被删除,且无法恢复。"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "这些备忘的全部信息将被删除,且无法恢复。"
#: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr "此日记的全部信息将被删除,且无法恢复。"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "此备忘的全部信息将被删除,且无法恢复。"
#: ../calendar/calendar.error.xml.h:5
msgid ""
@@ -4062,15 +4065,13 @@ msgstr "此约会的全部信息将被删除,且无法恢复。"
#: ../calendar/calendar.error.xml.h:8
msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr "此日记项的全部信息将被删除,且无法恢复。"
-
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
"All information on this meeting will be deleted and can not be restored."
msgstr "此会议的全部信息将被删除,且无法恢复。"
+#: ../calendar/calendar.error.xml.h:9
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "此备忘的全部信息将被删除,且无法恢复。"
+
#: ../calendar/calendar.error.xml.h:10
msgid "All information on this task will be deleted and can not be restored."
msgstr "此任务的全部信息将被删除,且无法恢复。"
@@ -4084,16 +4085,16 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
msgstr "您确信您要删除标题为“{0}”的约会吗?"
#: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "您确信您要删除日记项“{0}”吗?"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "您确定要删除“{0}”备忘吗?"
#: ../calendar/calendar.error.xml.h:14
msgid "Are you sure you want to delete these {0} appointments?"
msgstr "您确定要删除这 {0} 个约会吗?"
#: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "您确定要删除这 {0} 个日记项吗?"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "您确定要删除这 {0} 个备忘吗?"
#: ../calendar/calendar.error.xml.h:16
msgid "Are you sure you want to delete these {0} tasks?"
@@ -4104,15 +4105,15 @@ msgid "Are you sure you want to delete this appointment?"
msgstr "您确信您要删除该约会吗?"
#: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "您确信您要删除该日记项吗?"
-
-#: ../calendar/calendar.error.xml.h:19
#: ../calendar/gui/dialogs/delete-comp.c:183
msgid "Are you sure you want to delete this meeting?"
msgstr "您确信您要删除该会议吗?"
+#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:189
+msgid "Are you sure you want to delete this memo?"
+msgstr "您确信您要删除该备忘吗?"
+
#: ../calendar/calendar.error.xml.h:20
#: ../calendar/gui/dialogs/delete-comp.c:186
msgid "Are you sure you want to delete this task?"
@@ -4188,14 +4189,14 @@ msgstr "装入任务列表出错"
#: ../calendar/calendar.error.xml.h:37
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr "如果您不发送取消通知,其他出席者人可能不知道日记已经删除。"
+"the meeting is canceled."
+msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
#: ../calendar/calendar.error.xml.h:38
msgid ""
"If you do not send a cancelation notice, the other participants may not know "
-"the meeting is canceled."
-msgstr "如果您不发送取消通知,其他出席者也许不知道会议已经取消。"
+"the memo has been deleted."
+msgstr "如果您不发送取消通知,其他出席者可能不知道备忘已经删除。"
#: ../calendar/calendar.error.xml.h:39
msgid ""
@@ -4280,8 +4281,8 @@ msgid "Would you like to save your changes to this task?"
msgstr "您想要保存对此任务的更改吗?"
#: ../calendar/calendar.error.xml.h:57
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "您是否想要为此日记项发送取消通知?"
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "您是否想要为此备忘发送取消通知?"
#: ../calendar/calendar.error.xml.h:58
msgid "Would you like to send all the participants a cancelation notice?"
@@ -4357,7 +4358,8 @@ msgid "_Save Changes"
msgstr "保存更改(_S)"
#: ../calendar/calendar.error.xml.h:74
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:140
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:139
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
msgid "_Send"
msgstr "发送(_S)"
@@ -4369,7 +4371,7 @@ msgstr "发送通知(_S)"
msgid "{0}."
msgstr "{0}。"
-#: ../calendar/common/authentication.c:49 ../smime/gui/component.c:50
+#: ../calendar/common/authentication.c:50 ../smime/gui/component.c:50
msgid "Enter password"
msgstr "输入密码"
@@ -4416,12 +4418,12 @@ 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:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2229
msgid "Calendar and Tasks"
msgstr "日历和任务"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1367
+#: ../calendar/gui/calendar-component.c:1385
msgid "Calendars"
msgstr "日历"
@@ -4462,24 +4464,25 @@ msgid "Memo_s"
msgstr "备忘(_S)"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:324 ../calendar/gui/e-memos.c:1093
-#: ../calendar/gui/gnome-cal.c:1669 ../calendar/gui/memos-component.c:536
-#: ../calendar/gui/memos-component.c:1013 ../calendar/gui/memos-control.c:336
+#: ../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
msgid "Memos"
msgstr "备忘"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:527 ../calendar/gui/e-tasks.c:1357
+#: ../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:527
-#: ../calendar/gui/tasks-component.c:1018 ../calendar/gui/tasks-control.c:478
+#: ../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/importers/icalendar-importer.c:80
#: ../calendar/importers/icalendar-importer.c:741
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
#: ../plugins/exchange-operations/exchange-folder.c:587
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:397
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:541
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
msgid "Tasks"
msgstr "任务"
@@ -4506,7 +4509,7 @@ msgstr[0] "分钟"
#: ../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:287
+#: ../plugins/calendar-http/calendar-http.c:289
#: ../plugins/calendar-weather/calendar-weather.c:562
msgid "hours"
msgid_plural "hours"
@@ -4523,10 +4526,10 @@ msgstr "约会"
#. Location
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1570
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
+#: ../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:943
+#: ../plugins/itip-formatter/itip-view.c:998
msgid "Location:"
msgstr "位置:"
@@ -4536,7 +4539,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:164
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:165
#: ../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
@@ -4545,7 +4548,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:41 ../widgets/menus/gal-define-views.glade.h:5
+#: ../ui/evolution.xml.h:43 ../widgets/menus/gal-define-views.glade.h:5
msgid "_Edit"
msgstr "编辑(_E)"
@@ -4557,31 +4560,31 @@ msgstr "午睡(_S)"
msgid "location of appointment"
msgstr "约会位置"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1429
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1552
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1597
msgid "No summary available."
msgstr "没有可用的摘要。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1438
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1440
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1483
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
msgid "No description available."
msgstr "没有描述。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1493
msgid "No location information available."
msgstr "没有可用的位置信息。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1492
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1537
#, c-format
msgid "You have %d alarms"
msgstr "您有 %d 个提醒"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1654
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1682
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1727
msgid "Warning"
msgstr "警告"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1658
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
msgid ""
"Evolution does not support calendar reminders with\n"
"email notifications yet, but this reminder was\n"
@@ -4593,7 +4596,7 @@ msgstr ""
"发送电子邮件。Evolution 将以\n"
"显示普通提示会话框代替。"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1688
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1733
#, c-format
msgid ""
"An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4609,7 +4612,7 @@ msgstr ""
"\n"
"您确信您要运行该程序吗?"
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1702
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1747
msgid "Do not ask me about this program again."
msgstr "不要再次询问此问题。"
@@ -4618,8 +4621,10 @@ msgid "Could not initialize Bonobo"
msgstr "无法初始化 Bonobo"
#: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "无法创建提醒服务车间"
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr "无法创建提醒服务车间,可能已经运行了..."
#: ../calendar/gui/alarm-notify/util.c:41
msgid "invalid time"
@@ -4873,12 +4878,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:95
+#: ../mail/evolution-mail.schemas.in.h:96
msgid "Show the \"Preview\" pane"
msgstr "显示“预览”面板"
#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:97
msgid "Show the \"Preview\" pane."
msgstr "显示“预览”面板。"
@@ -5075,37 +5080,37 @@ msgstr "注释含有"
msgid "Location contains"
msgstr "位置含有"
-#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
-#: ../calendar/gui/cal-search-bar.c:685
+#: ../calendar/gui/cal-search-bar.c:622 ../calendar/gui/cal-search-bar.c:665
+#: ../calendar/gui/cal-search-bar.c:684
msgid "Unmatched"
msgstr "无匹配"
-#: ../calendar/gui/cal-search-bar.c:631
-msgid "Next 7 days Tasks"
+#: ../calendar/gui/cal-search-bar.c:630
+msgid "Next 7 Days' Tasks"
msgstr "下一周的任务"
-#: ../calendar/gui/cal-search-bar.c:635
+#: ../calendar/gui/cal-search-bar.c:634
msgid "Active Tasks"
msgstr "活动任务"
-#: ../calendar/gui/cal-search-bar.c:639
-msgid "Over Due Tasks"
+#: ../calendar/gui/cal-search-bar.c:638
+msgid "Overdue Tasks"
msgstr "延期任务"
-#: ../calendar/gui/cal-search-bar.c:643
+#: ../calendar/gui/cal-search-bar.c:642
msgid "Completed Tasks"
msgstr "已完成任务"
-#: ../calendar/gui/cal-search-bar.c:647
-msgid "Tasks With Attachments"
+#: ../calendar/gui/cal-search-bar.c:646
+msgid "Tasks with Attachments"
msgstr "有附件的任务"
-#: ../calendar/gui/cal-search-bar.c:693
+#: ../calendar/gui/cal-search-bar.c:692
msgid "Active Appointments"
msgstr "活动约会"
-#: ../calendar/gui/cal-search-bar.c:697
-msgid "Next 7 Day Appointments"
+#: ../calendar/gui/cal-search-bar.c:696
+msgid "Next 7 Days' Appointments"
msgstr "下一周的约会"
#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
@@ -5128,7 +5133,7 @@ msgstr "销毁较早的事件"
#: ../calendar/gui/calendar-commands.c:335
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-http/calendar-http.c:290
#: ../plugins/calendar-weather/calendar-weather.c:563
#: ../widgets/misc/e-send-options.glade.h:38
msgid "days"
@@ -5138,89 +5143,89 @@ msgstr "天"
#. Create the LDAP source group
#. Create the Webcal source group
#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:265
-#: ../calendar/gui/memos-component.c:227 ../calendar/gui/migration.c:511
+#: ../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/tasks-component.c:223
+#: ../calendar/gui/tasks-component.c:231
msgid "On The Web"
msgstr "网上"
-#: ../calendar/gui/calendar-component.c:283 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
msgid "Birthdays & Anniversaries"
msgstr "生日和纪念日"
#. Create the weather group
-#: ../calendar/gui/calendar-component.c:290
+#: ../calendar/gui/calendar-component.c:305
#: ../plugins/calendar-weather/calendar-weather.c:100
msgid "Weather"
msgstr "天气"
-#: ../calendar/gui/calendar-component.c:588
+#: ../calendar/gui/calendar-component.c:602
msgid "_New Calendar"
msgstr "新建日历(_N)"
-#: ../calendar/gui/calendar-component.c:905
+#: ../calendar/gui/calendar-component.c:932
msgid "Failed upgrading calendars."
msgstr "升级日历失败。"
-#: ../calendar/gui/calendar-component.c:1204
+#: ../calendar/gui/calendar-component.c:1231
#, c-format
msgid "Unable to open the calendar '%s' for creating events and meetings"
msgstr "无法打开日历“%s”来创建事件和会议"
-#: ../calendar/gui/calendar-component.c:1220
+#: ../calendar/gui/calendar-component.c:1247
msgid "There is no calendar available for creating events and meetings"
msgstr "没有可创建事件和会议的日历"
-#: ../calendar/gui/calendar-component.c:1342
+#: ../calendar/gui/calendar-component.c:1360
msgid "Calendar Source Selector"
msgstr "日历源选择器"
-#: ../calendar/gui/calendar-component.c:1550
+#: ../calendar/gui/calendar-component.c:1578
msgid "New appointment"
msgstr "新建约会"
-#: ../calendar/gui/calendar-component.c:1551
+#: ../calendar/gui/calendar-component.c:1579
msgid "_Appointment"
msgstr "约会(_A)"
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1580
msgid "Create a new appointment"
msgstr "创建新约会"
-#: ../calendar/gui/calendar-component.c:1558
+#: ../calendar/gui/calendar-component.c:1586
msgid "New meeting"
msgstr "新建会议"
-#: ../calendar/gui/calendar-component.c:1559
+#: ../calendar/gui/calendar-component.c:1587
msgid "M_eeting"
msgstr "会议(_E)"
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1588
msgid "Create a new meeting request"
msgstr "创建一条新会议请求"
-#: ../calendar/gui/calendar-component.c:1566
+#: ../calendar/gui/calendar-component.c:1594
msgid "New all day appointment"
msgstr "新建全天约会"
-#: ../calendar/gui/calendar-component.c:1567
+#: ../calendar/gui/calendar-component.c:1595
msgid "All Day A_ppointment"
msgstr "全天约会(_P)"
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1596
msgid "Create a new all-day appointment"
msgstr "创建新全天约会"
-#: ../calendar/gui/calendar-component.c:1574
+#: ../calendar/gui/calendar-component.c:1602
msgid "New calendar"
msgstr "新建日历"
-#: ../calendar/gui/calendar-component.c:1575
+#: ../calendar/gui/calendar-component.c:1603
msgid "Cale_ndar"
msgstr "日历(_N)"
-#: ../calendar/gui/calendar-component.c:1576
+#: ../calendar/gui/calendar-component.c:1604
msgid "Create a new calendar"
msgstr "创建新日历"
@@ -5242,12 +5247,12 @@ msgstr "月视图"
#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
#: ../calendar/gui/tasktypes.xml.h:2
-msgid "Description Contain"
+msgid "Description Contains"
msgstr "描述含有"
#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
#: ../calendar/gui/tasktypes.xml.h:3
-msgid "Summary Contain"
+msgid "Summary Contains"
msgstr "概要含有"
#: ../calendar/gui/comp-editor-factory.c:415
@@ -5262,7 +5267,7 @@ msgstr "打开日历的方法不支持"
msgid "Permission denied to open the calendar"
msgstr "没有权限打开日历"
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1274
+#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1282
msgid "Unknown error"
msgstr "未知的错误"
@@ -5377,7 +5382,7 @@ msgstr "分钟"
msgid "start of appointment"
msgstr "约会开始"
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
msgid "Action/Trigger"
msgstr "动作/触发器"
@@ -5403,7 +5408,7 @@ msgstr "建议自动显示附件(_S)"
msgid "Attach file(s)"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:479
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
msgid "Selected Calendars for Alarms"
msgstr "已选择用于提醒的日历"
@@ -5428,7 +5433,7 @@ msgid ""
msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:9
msgid "<span weight=\"bold\">Alerts</span>"
msgstr "<span weight=\"bold\">警告</span>"
@@ -5437,7 +5442,7 @@ msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-#: ../mail/mail-config.glade.h:16
+#: ../mail/mail-config.glade.h:17
#: ../plugins/publish-calendar/publish-calendar.glade.h:1
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">常规</span>"
@@ -5654,57 +5659,57 @@ msgstr "周三(_W)"
msgid "before every appointment"
msgstr "在每次约会前"
-#: ../calendar/gui/dialogs/calendar-setup.c:268
+#: ../calendar/gui/dialogs/calendar-setup.c:272
msgid "Cop_y calendar contents locally for offline operation"
msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:270
+#: ../calendar/gui/dialogs/calendar-setup.c:274
msgid "Cop_y task list contents locally for offline operation"
msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:272
+#: ../calendar/gui/dialogs/calendar-setup.c:276
msgid "Cop_y memo list contents locally for offline operation"
msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
-#: ../calendar/gui/dialogs/calendar-setup.c:342
+#: ../calendar/gui/dialogs/calendar-setup.c:346
msgid "C_olor:"
msgstr "颜色(_O):"
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../calendar/gui/dialogs/calendar-setup.c:381
msgid "Task List"
msgstr "任务列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:388
+#: ../calendar/gui/dialogs/calendar-setup.c:392
msgid "Memo List"
msgstr "备忘列表"
-#: ../calendar/gui/dialogs/calendar-setup.c:477
+#: ../calendar/gui/dialogs/calendar-setup.c:478
msgid "Calendar Properties"
msgstr "日历属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:480
msgid "New Calendar"
msgstr "新建日历"
-#: ../calendar/gui/dialogs/calendar-setup.c:564
+#: ../calendar/gui/dialogs/calendar-setup.c:536
msgid "Task List Properties"
msgstr "任务列表属性"
-#: ../calendar/gui/dialogs/calendar-setup.c:630
+#: ../calendar/gui/dialogs/calendar-setup.c:592
msgid "New Memo List"
msgstr "新建备忘列表"
#: ../calendar/gui/dialogs/changed-comp.c:60
msgid "This event has been deleted."
-msgstr "该事件已经被删除。"
+msgstr "此事件已经被删除。"
#: ../calendar/gui/dialogs/changed-comp.c:64
msgid "This task has been deleted."
-msgstr "该任务已经被删除。"
+msgstr "此任务已经被删除。"
#: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "该日记条目已经被删除。"
+msgid "This memo has been deleted."
+msgstr "此备注已经被删除。"
#: ../calendar/gui/dialogs/changed-comp.c:77
#, c-format
@@ -5718,15 +5723,15 @@ msgstr "%s 您还没有进行修改,关闭编辑器吗?"
#: ../calendar/gui/dialogs/changed-comp.c:84
msgid "This event has been changed."
-msgstr "该事件已经被更改。"
+msgstr "此事件已经被更改。"
#: ../calendar/gui/dialogs/changed-comp.c:88
msgid "This task has been changed."
-msgstr "该任务已经被更改。"
+msgstr "此任务已经被更改。"
#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "该日记条目已经被更改。"
+msgid "This memo has been changed."
+msgstr "此备注已经被更改。"
#: ../calendar/gui/dialogs/changed-comp.c:101
#, c-format
@@ -5763,27 +5768,27 @@ msgstr " (预定 "
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2917
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2968
#, 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:2922
-#: ../composer/e-msg-composer.c:3117
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2973
+#: ../composer/e-msg-composer.c:3158
#, 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:3181
-#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1036 ../mail/message-list.c:1963
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3222
+#: ../mail/em-folder-tree.c:1007 ../mail/em-folder-utils.c:369
+#: ../mail/em-folder-view.c:1114 ../mail/message-list.c:1963
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3183
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3224
#: ../mail/em-folder-tree.c:1009 ../mail/message-list.c:1965
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
@@ -5792,102 +5797,102 @@ msgstr "取消拖曳(_D)"
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:968 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:971 ../composer/e-msg-composer.c:2585
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1003
msgid "Hide Attachment _Bar"
msgstr "隐藏附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1003
-#: ../calendar/gui/dialogs/comp-editor.c:1532
+#: ../calendar/gui/dialogs/comp-editor.c:1006
+#: ../calendar/gui/dialogs/comp-editor.c:1542
msgid "Show Attachment _Bar"
msgstr "显示附件栏(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1122
-#: ../calendar/gui/dialogs/event-page.c:1904
-#: ../calendar/gui/dialogs/task-page.c:1201 ../composer/e-msg-composer.c:3698
+#: ../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
#: ../plugins/groupwise-features/junk-settings.glade.h:8
#: ../plugins/groupwise-features/properties.glade.h:13
#: ../widgets/table/e-table-config.glade.h:18
msgid "_Remove"
msgstr "删除(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer.c:3699 ../mail/em-folder-tree.c:2129
+#: ../calendar/gui/dialogs/comp-editor.c:1126
+#: ../composer/e-msg-composer.c:3740 ../mail/em-folder-tree.c:2134
#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:35
msgid "_Properties"
msgstr "属性(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1125
-#: ../composer/e-msg-composer.c:3701
+#: ../calendar/gui/dialogs/comp-editor.c:1128
+#: ../composer/e-msg-composer.c:3742
msgid "_Add attachment..."
msgstr "添加附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1556
-#: ../mail/em-format-html-display.c:2315
+#: ../calendar/gui/dialogs/comp-editor.c:1566
+#: ../mail/em-format-html-display.c:2320
msgid "Show Attachments"
msgstr "显示附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1557
+#: ../calendar/gui/dialogs/comp-editor.c:1567
msgid "Press space key to toggle attachment bar"
msgstr "按空格键可切换附件栏"
-#: ../calendar/gui/dialogs/comp-editor.c:2163
-#: ../calendar/gui/dialogs/comp-editor.c:2206
+#: ../calendar/gui/dialogs/comp-editor.c:2173
+#: ../calendar/gui/dialogs/comp-editor.c:2216
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:2169
-#: ../calendar/gui/dialogs/comp-editor.c:2212
+#: ../calendar/gui/dialogs/comp-editor.c:2179
+#: ../calendar/gui/dialogs/comp-editor.c:2222
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2171
-#: ../calendar/gui/dialogs/comp-editor.c:2214
+#: ../calendar/gui/dialogs/comp-editor.c:2181
+#: ../calendar/gui/dialogs/comp-editor.c:2224
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2175
-#: ../calendar/gui/dialogs/comp-editor.c:2218
+#: ../calendar/gui/dialogs/comp-editor.c:2185
+#: ../calendar/gui/dialogs/comp-editor.c:2228
#, c-format
msgid "Assigned Task - %s"
msgstr "分配的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2177
-#: ../calendar/gui/dialogs/comp-editor.c:2220
+#: ../calendar/gui/dialogs/comp-editor.c:2187
+#: ../calendar/gui/dialogs/comp-editor.c:2230
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2180
-#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:2190
+#: ../calendar/gui/dialogs/comp-editor.c:2233
#, c-format
-msgid "Journal entry - %s"
-msgstr "日记条目 - %s"
+msgid "Memo - %s"
+msgstr "备忘 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:2191
-#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2243
msgid "No summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:2779 ../mail/em-utils.c:370
-#: ../widgets/misc/e-attachment-bar.c:350
+#: ../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:2868
-#: ../calendar/gui/dialogs/comp-editor.c:2922
-#: ../calendar/gui/dialogs/comp-editor.c:2946
+#: ../calendar/gui/dialogs/comp-editor.c:2880
+#: ../calendar/gui/dialogs/comp-editor.c:2934
+#: ../calendar/gui/dialogs/comp-editor.c:2958
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2975
+#: ../calendar/gui/dialogs/comp-editor.c:2987
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -5916,8 +5921,8 @@ msgid "The task could not be deleted due to a corba error"
msgstr "无法删除任务,原因是 corba 错误"
#: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "无法删除日记条目,原因是 corba 错误"
+msgid "The memo could not be deleted due to a corba error"
+msgstr "无法删除备忘,原因是 corba 错误"
#: ../calendar/gui/dialogs/delete-error.c:63
msgid "The item could not be deleted due to a corba error"
@@ -5932,8 +5937,8 @@ msgid "The task could not be deleted because permission was denied"
msgstr "无法删除任务,原因是权限被禁止"
#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "无法删除日记条目,原因是权限被禁止"
+msgid "The memo could not be deleted because permission was denied"
+msgstr "无法删除备忘,原因是权限被禁止"
#: ../calendar/gui/dialogs/delete-error.c:79
msgid "The item could not be deleted because permission was denied"
@@ -5948,8 +5953,8 @@ msgid "The task could not be deleted due to an error"
msgstr "由于错误,无法删除任务"
#: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "由于错误,无法删除日记条目"
+msgid "The memo could not be deleted due to an error"
+msgstr "由于错误,无法删除备忘"
#: ../calendar/gui/dialogs/delete-error.c:95
msgid "The item could not be deleted due to an error"
@@ -5968,123 +5973,131 @@ msgstr "授权给:"
msgid "Enter Delegate"
msgstr "输入代表"
-#: ../calendar/gui/dialogs/event-editor.c:602
+#: ../calendar/gui/dialogs/event-editor.c:601
msgid "Appoint_ment"
msgstr "约会(_M)"
-#: ../calendar/gui/dialogs/event-editor.c:606
+#: ../calendar/gui/dialogs/event-editor.c:605
#: ../ui/evolution-event-editor.xml.h:14
msgid "Recurrence"
msgstr "再现"
-#: ../calendar/gui/dialogs/event-page.c:814
-#: ../calendar/gui/dialogs/event-page.c:2723
+#: ../calendar/gui/dialogs/event-page.c:835
+#: ../calendar/gui/dialogs/event-page.c:2852
msgid "This event has alarms"
msgstr "此事件有提醒"
-#: ../calendar/gui/dialogs/event-page.c:886
+#: ../calendar/gui/dialogs/event-page.c:915
#: ../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:441
+#: ../calendar/gui/dialogs/task-page.c:456
msgid "Or_ganizer:"
msgstr "组织者(_G):"
-#: ../calendar/gui/dialogs/event-page.c:924
+#: ../calendar/gui/dialogs/event-page.c:953
msgid "_Delegatees"
msgstr "代理人(_D)"
-#: ../calendar/gui/dialogs/event-page.c:926
+#: ../calendar/gui/dialogs/event-page.c:955
msgid "Atte_ndees"
msgstr "出席者(_N)"
-#: ../calendar/gui/dialogs/event-page.c:1091
+#: ../calendar/gui/dialogs/event-page.c:1138
msgid "Event with no start date"
msgstr "没有开始日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1094
+#: ../calendar/gui/dialogs/event-page.c:1141
msgid "Event with no end date"
msgstr "没有结束日期的事件"
-#: ../calendar/gui/dialogs/event-page.c:1263
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1312
+#: ../calendar/gui/dialogs/memo-page.c:693
+#: ../calendar/gui/dialogs/task-page.c:878
msgid "Start date is wrong"
msgstr "开始日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1273
+#: ../calendar/gui/dialogs/event-page.c:1322
msgid "End date is wrong"
msgstr "结束日期有错"
-#: ../calendar/gui/dialogs/event-page.c:1296
+#: ../calendar/gui/dialogs/event-page.c:1345
msgid "Start time is wrong"
msgstr "开始时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1352
msgid "End time is wrong"
msgstr "结束时间有错"
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1514
+#: ../calendar/gui/dialogs/memo-page.c:733
+#: ../calendar/gui/dialogs/task-page.c:940
msgid "The organizer selected no longer has an account."
msgstr "选中的组织者没有帐户了。"
-#: ../calendar/gui/dialogs/event-page.c:1466
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1520
+#: ../calendar/gui/dialogs/memo-page.c:739
+#: ../calendar/gui/dialogs/task-page.c:946
msgid "An organizer is required."
msgstr "需要一名组织者。"
-#: ../calendar/gui/dialogs/event-page.c:1481
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1545
+#: ../calendar/gui/dialogs/task-page.c:970
msgid "At least one attendee is required."
msgstr "需要至少一个出席者。"
-#: ../calendar/gui/dialogs/event-page.c:1905
-#: ../calendar/gui/dialogs/task-page.c:1202
+#: ../calendar/gui/dialogs/event-page.c:1977
+#: ../calendar/gui/dialogs/task-page.c:1253
msgid "_Add "
msgstr "添加(_A)"
-#: ../calendar/gui/dialogs/event-page.c:2630
+#: ../calendar/gui/dialogs/event-page.c:2723
#, c-format
msgid "Unable to open the calendar '%s'."
msgstr "无法打开日历“%s”。"
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2772
+#: ../calendar/gui/dialogs/memo-page.c:1138
+#: ../calendar/gui/dialogs/task-page.c:1948
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "您正在以 %s 的身份行动"
+
+#: ../calendar/gui/dialogs/event-page.c:3068
#, c-format
msgid "%d day before appointment"
msgid_plural "%d days before appointment"
msgstr[0] "约会的 %d 天前"
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:3074
#, c-format
msgid "%d hour before appointment"
msgid_plural "%d hours before appointment"
msgstr[0] "约会的 %d 小时前"
-#: ../calendar/gui/dialogs/event-page.c:2948
+#: ../calendar/gui/dialogs/event-page.c:3080
#, c-format
msgid "%d minute before appointment"
msgid_plural "%d minutes before appointment"
msgstr[0] "约会的 %d 分钟前"
-#: ../calendar/gui/dialogs/event-page.c:2961
+#: ../calendar/gui/dialogs/event-page.c:3093
msgid "Customize"
msgstr "自定义"
#. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2966
+#: ../calendar/gui/dialogs/event-page.c:3098
#: ../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:2318
+#: ../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:475
-#: ../mail/em-junk-hook.c:78
+#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:478
+#: ../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.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
+#: ../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
msgid "None"
@@ -6176,14 +6189,16 @@ msgstr "组织者:"
msgid "Memo"
msgstr "备忘"
-#: ../calendar/gui/dialogs/memo-page.c:868
+#: ../calendar/gui/dialogs/memo-page.c:911
#, c-format
msgid "Unable to open memos in '%s'."
msgstr "无法打开“%s”中的备忘。"
-#: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1489
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:851
-#: ../mail/em-mailer-prefs.c:89 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1076 ../mail/em-format-html.c:1517
+#: ../mail/em-format-html.c:1531 ../mail/em-format-html.c:1589
+#: ../mail/em-format-html.c:1615 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/message-list.etspec.h:18
msgid "To"
msgstr "收件人"
@@ -6201,7 +6216,7 @@ msgid "_Description:"
msgstr "描述(_D):"
#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:449
#: ../calendar/gui/dialogs/task-page.glade.h:9
msgid "_Group:"
msgstr "组(_G):"
@@ -6219,9 +6234,8 @@ msgid "You are modifying a recurring task. What would you like to modify?"
msgstr "您即将修改再现任务。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "您即将修改再现日记项。您想要修改何内容?"
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "您即将修改再现备忘。您想要修改何内容?"
#: ../calendar/gui/dialogs/recur-comp.c:87
msgid "This Instance Only"
@@ -6429,48 +6443,48 @@ msgstr "<span weight=\"bold\">状态</span>"
#. Pass TRUE as is_utc, so it gets converted to the current
#. timezone.
#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../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:463 ../calendar/gui/e-itip-control.c:923
+#: ../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
msgid "Completed"
msgstr "已完成"
#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:399 ../mail/message-list.c:1034
msgid "High"
msgstr "高"
#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../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:462 ../calendar/gui/print.c:2345
+#: ../calendar/gui/e-calendar-table.c:473 ../calendar/gui/print.c:2345
msgid "In Progress"
msgstr "进行中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:401 ../mail/message-list.c:1032
msgid "Low"
msgstr "低"
#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:389
+#: ../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
msgid "Normal"
msgstr "中"
#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:240
+#: ../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:461 ../calendar/gui/print.c:2342
+#: ../calendar/gui/e-calendar-table.c:472 ../calendar/gui/print.c:2342
msgid "Not Started"
msgstr "尚未开始"
@@ -6483,7 +6497,7 @@ msgid "Stat_us:"
msgstr "状态(_U):"
#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:391
+#: ../calendar/gui/e-calendar-table.c:402
msgid "Undefined"
msgstr "未定义"
@@ -6501,7 +6515,7 @@ msgid "_Web Page:"
msgstr "网页(_W):"
#: ../calendar/gui/dialogs/task-editor.c:424
-#: ../calendar/gui/tasks-component.c:1250
+#: ../calendar/gui/tasks-component.c:1258
msgid "_Task"
msgstr "任务(_T)"
@@ -6509,11 +6523,11 @@ msgstr "任务(_T)"
msgid "Task Details"
msgstr "任务细节"
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:851
msgid "Due date is wrong"
msgstr "到期日期错误"
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1719
#, c-format
msgid "Unable to open tasks in '%s'."
msgstr "无法打开“%s”中的任务。"
@@ -6527,9 +6541,8 @@ msgid "Categor_ies..."
msgstr "类别(_I)..."
#: ../calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
msgid "De_scription:"
-msgstr "描述:"
+msgstr "描述(_S):"
#: ../calendar/gui/dialogs/task-page.glade.h:4
msgid "Or_ganiser:"
@@ -6618,71 +6631,71 @@ 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:2998
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3001
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
-#: ../calendar/gui/e-cal-component-memo-preview.c:157
-#: ../calendar/gui/e-cal-component-preview.c:157 ../filter/filter-rule.c:805
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
#: ../shell/e-shell-folder-title-bar.c:593
msgid "Untitled"
msgstr "无标题"
-#: ../calendar/gui/e-cal-component-memo-preview.c:208
-#: ../calendar/gui/e-cal-component-preview.c:197
-#: ../calendar/gui/e-cal-component-preview.c:208
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
msgid "Start Date:"
msgstr "开始日期:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:221
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../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
#: ../widgets/misc/e-attachment.glade.h:2
msgid "Description:"
msgstr "描述:"
-#: ../calendar/gui/e-cal-component-memo-preview.c:254
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
msgid "Web Page:"
msgstr "网页:"
-#: ../calendar/gui/e-cal-component-preview.c:190
+#: ../calendar/gui/e-cal-component-preview.c:193
#: ../calendar/gui/e-itip-control.c:1135
#: ../calendar/gui/e-itip-control.glade.h:9
msgid "Summary:"
msgstr "概要:"
-#: ../calendar/gui/e-cal-component-preview.c:219
+#: ../calendar/gui/e-cal-component-preview.c:222
msgid "Due Date:"
msgstr "到期日期:"
#. write status
#. Status
-#: ../calendar/gui/e-cal-component-preview.c:226
+#: ../calendar/gui/e-cal-component-preview.c:229
#: ../calendar/gui/e-itip-control.c:1159
#: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:968
+#: ../plugins/itip-formatter/itip-view.c:1023
msgid "Status:"
msgstr "状态:"
-#: ../calendar/gui/e-cal-component-preview.c:250
+#: ../calendar/gui/e-cal-component-preview.c:253
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:366
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:377
msgid "Public"
msgstr "公开"
#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-table.c:378
msgid "Private"
msgstr "保密"
#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
+#: ../calendar/gui/e-calendar-table.c:379
msgid "Confidential"
msgstr "机密"
@@ -6703,12 +6716,12 @@ msgid "Summary"
msgstr "概要"
#: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:440
+#: ../calendar/gui/e-calendar-table.c:451
msgid "Free"
msgstr "空闲"
#: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:441
+#: ../calendar/gui/e-calendar-table.c:452
#: ../calendar/gui/e-meeting-time-sel.c:411
msgid "Busy"
msgstr "繁忙"
@@ -6745,11 +6758,11 @@ msgstr "否"
#: ../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:1204
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:77
-#: ../widgets/misc/e-attachment-bar.c:712
+#: ../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
#: ../widgets/misc/e-charset-picker.c:64
msgid "Unknown"
msgstr "未知"
@@ -6766,108 +6779,108 @@ msgstr "已分配"
msgid "Save As..."
msgstr "另存为..."
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2160
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2165
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:447
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:450
#, c-format
msgid "untitled_image.%s"
msgstr "无标题图像.%s"
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1680 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1151 ../mail/em-popup.c:564 ../mail/em-popup.c:575
+#: ../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
msgid "_Save As..."
msgstr "另存为(_S)..."
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:565
-#: ../mail/em-popup.c:576
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:579
msgid "Set as _Background"
msgstr "设为背景(_B)"
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:281
msgid "_Save Selected"
msgstr "保存选中(_S)"
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:786
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:789
#, c-format
msgid "Open in %s..."
msgstr "在 %s 中打开..."
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:421
msgid "0%"
msgstr "0%"
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:422
msgid "10%"
msgstr "10%"
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:423
msgid "20%"
msgstr "20%"
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:424
msgid "30%"
msgstr "30%"
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:425
msgid "40%"
msgstr "40%"
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:426
msgid "50%"
msgstr "50%"
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:427
msgid "60%"
msgstr "60%"
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:428
msgid "70%"
msgstr "70%"
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:429
msgid "80%"
msgstr "80%"
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:430
msgid "90%"
msgstr "90%"
-#: ../calendar/gui/e-calendar-table.c:420
+#: ../calendar/gui/e-calendar-table.c:431
msgid "100%"
msgstr "100%"
-#: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:483
+#: ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:494
msgid "Deleting selected objects"
msgstr "删除选中的对象"
-#: ../calendar/gui/e-calendar-table.c:958
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:660
+#: ../calendar/gui/e-calendar-table.c:995
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:697
msgid "Updating objects"
msgstr "更新对象"
-#: ../calendar/gui/e-calendar-table.c:1107
-#: ../calendar/gui/e-calendar-view.c:1229 ../calendar/gui/e-memo-table.c:799
-#: ../composer/e-msg-composer.c:1355
+#: ../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
msgid "Save as..."
msgstr "另存为..."
-#: ../calendar/gui/e-calendar-table.c:1278
+#: ../calendar/gui/e-calendar-table.c:1350
#: ../calendar/gui/e-calendar-view.c:1662
msgid "New _Task"
msgstr "新建任务(_T)"
-#: ../calendar/gui/e-calendar-table.c:1282 ../calendar/gui/e-memo-table.c:903
+#: ../calendar/gui/e-calendar-table.c:1354 ../calendar/gui/e-memo-table.c:976
msgid "Open _Web Page"
msgstr "打开网页(_W)"
-#: ../calendar/gui/e-calendar-table.c:1284
+#: ../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:905
-#: ../mail/em-folder-view.c:1152
+#: ../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
@@ -6875,52 +6888,52 @@ msgstr "打开网页(_W)"
msgid "_Print..."
msgstr "打印(_P)..."
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/e-calendar-table.c:1360
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:982
#: ../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:1290
+#: ../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:911
+#: ../calendar/gui/e-calendar-view.c:1687 ../calendar/gui/e-memo-table.c:984
#: ../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:1294 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1366 ../ui/evolution-tasks.xml.h:22
msgid "_Assign Task"
msgstr "分配任务(_A)"
-#: ../calendar/gui/e-calendar-table.c:1295 ../calendar/gui/e-memo-table.c:915
+#: ../calendar/gui/e-calendar-table.c:1367 ../calendar/gui/e-memo-table.c:988
#: ../ui/evolution-tasks.xml.h:26
msgid "_Forward as iCalendar"
msgstr "作为 iCalendar 转发(_F)"
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1368
msgid "_Mark as Complete"
msgstr "标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1369
msgid "_Mark Selected Tasks as Complete"
msgstr "把任务标记为完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1370
msgid "_Mark as Incomplete"
msgstr "标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1299
+#: ../calendar/gui/e-calendar-table.c:1371
msgid "_Mark Selected Tasks as Incomplete"
msgstr "把任务标记为未完成(_M)"
-#: ../calendar/gui/e-calendar-table.c:1304
+#: ../calendar/gui/e-calendar-table.c:1376
msgid "_Delete Selected Tasks"
msgstr "删除选中任务(_D)"
-#: ../calendar/gui/e-calendar-table.c:1537
+#: ../calendar/gui/e-calendar-table.c:1610
#: ../calendar/gui/e-calendar-table.etspec.h:4
msgid "Click to add a task"
msgstr "单击以添加任务"
@@ -6930,7 +6943,7 @@ msgstr "单击以添加任务"
msgid "% Complete"
msgstr "% 完成"
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:692
+#: ../calendar/gui/e-calendar-table.etspec.h:5
msgid "Complete"
msgstr "完成"
@@ -7019,8 +7032,8 @@ msgstr "作为 iCalendar 转发(_F)..."
msgid "_Reply"
msgstr "回复(_R)"
-#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1145
-#: ../mail/em-popup.c:569 ../mail/em-popup.c:580
+#: ../calendar/gui/e-calendar-view.c:1697 ../mail/em-folder-view.c:1223
+#: ../mail/em-popup.c:572 ../mail/em-popup.c:583
#: ../ui/evolution-mail-message.xml.h:82
msgid "Reply to _All"
msgstr "回复所有人(_A)"
@@ -7038,25 +7051,25 @@ msgid "Delete _All Occurrences"
msgstr "删除所有出现(_A)"
#. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2158
+#: ../calendar/gui/e-calendar-view.c:2201
#, 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:2162
+#: ../calendar/gui/e-calendar-view.c:2205
#, c-format
msgid "Organizer: %s"
msgstr "组织者:%s"
#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2178 ../calendar/gui/print.c:2316
+#: ../calendar/gui/e-calendar-view.c:2221 ../calendar/gui/print.c:2316
#, c-format
msgid "Location: %s"
msgstr "位置:%s"
#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2209
+#: ../calendar/gui/e-calendar-view.c:2252
#, c-format
msgid "Time: %s %s"
msgstr "时间:%s %s"
@@ -7095,21 +7108,21 @@ 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:1311
-#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1336
+#: ../calendar/gui/e-day-view.c:2098
#: ../calendar/gui/e-week-view-main-item.c:310
#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1503
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:746 ../calendar/gui/e-day-view.c:1089
+#: ../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
msgid "am"
msgstr "上午"
#. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
+#: ../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
msgid "pm"
msgstr "下午"
@@ -7228,12 +7241,12 @@ 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:341
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:409
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:477
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../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
msgid "An unknown person"
msgstr "未知的人"
@@ -7247,21 +7260,21 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
#: ../calendar/gui/e-itip-control.c:1164
#: ../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:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/itip-utils.c:730
+#: ../plugins/itip-formatter/itip-formatter.c:1933
msgid "Accepted"
msgstr "接受"
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:733
+#: ../plugins/itip-formatter/itip-formatter.c:1936
msgid "Tentatively Accepted"
msgstr "暂时接受"
#: ../calendar/gui/e-itip-control.c:1172
#: ../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:693 ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/itip-utils.c:736 ../calendar/gui/itip-utils.c:765
+#: ../plugins/itip-formatter/itip-formatter.c:1939
msgid "Declined"
msgstr "拒绝"
@@ -7478,7 +7491,7 @@ msgid "Attendee status updated\n"
msgstr "更新出席者状态\n"
#: ../calendar/gui/e-itip-control.c:2043
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../plugins/itip-formatter/itip-formatter.c:1229
msgid "Attendee status can not be updated because the item no longer exists"
msgstr "由于条目不再存在而无法更新出席者状态"
@@ -7524,7 +7537,7 @@ msgstr "更新应答者状态"
msgid "Send Latest Information"
msgstr "发送最新的信息"
-#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:710
+#: ../calendar/gui/e-itip-control.c:2439 ../calendar/gui/itip-utils.c:753
#: ../ui/evolution-mail-global.xml.h:1
msgid "Cancel"
msgstr "取消"
@@ -7631,8 +7644,8 @@ 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:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/itip-utils.c:739
+#: ../plugins/itip-formatter/itip-formatter.c:1942
msgid "Delegated"
msgstr "被委任的"
@@ -7765,11 +7778,11 @@ msgstr "语言"
msgid "Member"
msgstr "成员"
-#: ../calendar/gui/e-memo-table.c:920
+#: ../calendar/gui/e-memo-table.c:993
msgid "_Delete Selected Memos"
msgstr "删除选中备忘(_D)"
-#: ../calendar/gui/e-memo-table.c:1071 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1144 ../calendar/gui/e-memo-table.etspec.h:2
msgid "Click to add a memo"
msgstr "单击以添加备忘"
@@ -7778,7 +7791,7 @@ msgid "Memo sort"
msgstr "备忘排序"
#: ../calendar/gui/e-memos.c:732 ../calendar/gui/e-tasks.c:844
-#: ../calendar/gui/gnome-cal.c:2826
+#: ../calendar/gui/gnome-cal.c:2828
#, c-format
msgid ""
"Error on %s:\n"
@@ -7833,39 +7846,39 @@ msgstr "%-m月%-d日"
msgid "Updating query"
msgstr "更新查询"
-#: ../calendar/gui/gnome-cal.c:2477
+#: ../calendar/gui/gnome-cal.c:2479
msgid "_Custom View"
msgstr "自定义视图(_C)"
-#: ../calendar/gui/gnome-cal.c:2478
+#: ../calendar/gui/gnome-cal.c:2480
msgid "_Save Custom View"
msgstr "保存自定义视图(_S)"
-#: ../calendar/gui/gnome-cal.c:2483
+#: ../calendar/gui/gnome-cal.c:2485
msgid "_Define Views..."
msgstr "定义视图(_D)..."
-#: ../calendar/gui/gnome-cal.c:2649
+#: ../calendar/gui/gnome-cal.c:2651
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2668
+#: ../calendar/gui/gnome-cal.c:2670
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2677
+#: ../calendar/gui/gnome-cal.c:2679
#, c-format
msgid "Loading memos at %s"
msgstr "装入位于 %s 的备忘"
-#: ../calendar/gui/gnome-cal.c:2785
+#: ../calendar/gui/gnome-cal.c:2787
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3724
+#: ../calendar/gui/gnome-cal.c:3726
msgid "Purging"
msgstr "销毁"
@@ -7925,126 +7938,126 @@ msgstr "九月"
msgid "_Select Today"
msgstr "选择今天(_S)"
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:451 ../calendar/gui/itip-utils.c:500
+#: ../calendar/gui/itip-utils.c:606
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:487
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
-msgid "Journal information"
-msgstr "日记信息"
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:819
+msgid "Memo information"
+msgstr "备忘信息"
-#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:698 ../calendar/gui/itip-utils.c:837
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:700
msgid "Calendar information"
msgstr "日历信息"
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:749
msgid "Updated"
msgstr "更新"
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:757
msgid "Refresh"
msgstr "刷新"
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:761
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:833
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:843
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:1010
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
-#: ../calendar/gui/memos-component.c:456
+#: ../calendar/gui/memos-component.c:464
msgid "_New Memo List"
msgstr "新建备忘列表(_N)"
-#: ../calendar/gui/memos-component.c:532
+#: ../calendar/gui/memos-component.c:540
#, c-format
msgid "%d memo"
msgid_plural "%d memos"
msgstr[0] "%d 个备忘"
-#: ../calendar/gui/memos-component.c:534 ../calendar/gui/tasks-component.c:525
+#: ../calendar/gui/memos-component.c:542 ../calendar/gui/tasks-component.c:533
#, c-format
msgid ", %d selected"
msgid_plural ", %d selected"
msgstr[0] ",已选中 %d 个"
-#: ../calendar/gui/memos-component.c:581
+#: ../calendar/gui/memos-component.c:589
msgid "Failed upgrading memos."
msgstr "升级备忘失败。"
-#: ../calendar/gui/memos-component.c:879
+#: ../calendar/gui/memos-component.c:897
#, c-format
msgid "Unable to open the memo list '%s' for creating events and meetings"
msgstr "无法打开备忘列表“%s”来创建事件和会议"
-#: ../calendar/gui/memos-component.c:892
+#: ../calendar/gui/memos-component.c:910
msgid "There is no calendar available for creating memos"
msgstr "没有可创建备忘的日历"
-#: ../calendar/gui/memos-component.c:988
+#: ../calendar/gui/memos-component.c:1006
msgid "Memo Source Selector"
msgstr "备忘来源选择器"
-#: ../calendar/gui/memos-component.c:1171
+#: ../calendar/gui/memos-component.c:1189
msgid "New memo"
msgstr "新建备忘"
-#: ../calendar/gui/memos-component.c:1172
+#: ../calendar/gui/memos-component.c:1190
msgid "Mem_o"
msgstr "备忘(_O)"
-#: ../calendar/gui/memos-component.c:1173
+#: ../calendar/gui/memos-component.c:1191
msgid "Create a new memo"
msgstr "创建新备忘"
-#: ../calendar/gui/memos-component.c:1179
+#: ../calendar/gui/memos-component.c:1197
msgid "New shared memo"
msgstr "新建共享备忘"
-#: ../calendar/gui/memos-component.c:1180
+#: ../calendar/gui/memos-component.c:1198
msgid "_Shared memo"
msgstr "共享备忘(_S)"
-#: ../calendar/gui/memos-component.c:1181
+#: ../calendar/gui/memos-component.c:1199
msgid "Create a shared new memo"
msgstr "创建新的共享备忘"
-#: ../calendar/gui/memos-component.c:1187
+#: ../calendar/gui/memos-component.c:1205
msgid "New memo list"
msgstr "新建备忘列表"
-#: ../calendar/gui/memos-component.c:1188
+#: ../calendar/gui/memos-component.c:1206
msgid "Memo li_st"
msgstr "备忘列表(_S)"
-#: ../calendar/gui/memos-component.c:1189
+#: ../calendar/gui/memos-component.c:1207
msgid "Create a new memo list"
msgstr "创建新备忘列表"
@@ -8092,9 +8105,9 @@ msgid "Unable to migrate tasks `%s'"
msgstr "无法升迁任务“%s”"
#: ../calendar/gui/migration.c:1226
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:398
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:429
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:542
+#: ../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 "笔记"
@@ -8298,62 +8311,62 @@ msgstr "联系人:"
msgid "Upcoming Appointments"
msgstr "即将到来的约会"
-#: ../calendar/gui/tasks-component.c:447
+#: ../calendar/gui/tasks-component.c:455
msgid "_New Task List"
msgstr "新建任务列表(_N)"
-#: ../calendar/gui/tasks-component.c:523
+#: ../calendar/gui/tasks-component.c:531
#, c-format
msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../calendar/gui/tasks-component.c:572
+#: ../calendar/gui/tasks-component.c:580
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:883
+#: ../calendar/gui/tasks-component.c:891
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:896
+#: ../calendar/gui/tasks-component.c:904
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:993
+#: ../calendar/gui/tasks-component.c:1001
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1249
+#: ../calendar/gui/tasks-component.c:1257
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1251
+#: ../calendar/gui/tasks-component.c:1259
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1257
+#: ../calendar/gui/tasks-component.c:1265
msgid "New assigned task"
msgstr "新建分配的任务"
-#: ../calendar/gui/tasks-component.c:1258
+#: ../calendar/gui/tasks-component.c:1266
msgid "Assigne_d Task"
msgstr "分配的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1259
+#: ../calendar/gui/tasks-component.c:1267
msgid "Create a new assigned task"
msgstr "创建新分配的任务"
-#: ../calendar/gui/tasks-component.c:1265
+#: ../calendar/gui/tasks-component.c:1273
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1266
+#: ../calendar/gui/tasks-component.c:1274
msgid "Tas_k list"
msgstr "任务列表(_K)"
-#: ../calendar/gui/tasks-component.c:1267
+#: ../calendar/gui/tasks-component.c:1275
msgid "Create a new task list"
msgstr "创建新任务列表"
@@ -10034,63 +10047,63 @@ msgstr "附件(_T)"
msgid "Insert Attachment"
msgstr "插入附件"
-#: ../composer/e-msg-composer.c:834
+#: ../composer/e-msg-composer.c:835
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信件签名:未对此账户设置签名证书"
-#: ../composer/e-msg-composer.c:841
+#: ../composer/e-msg-composer.c:842
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信件加密:未对此账户设置加密证书"
-#: ../composer/e-msg-composer.c:1301 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1351 ../composer/e-msg-composer.c:2614
msgid "Hide _Attachment Bar"
msgstr "隐藏附件栏(_A)"
-#: ../composer/e-msg-composer.c:1304 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3944
+#: ../composer/e-msg-composer.c:1354 ../composer/e-msg-composer.c:2617
+#: ../composer/e-msg-composer.c:3985
msgid "Show _Attachment Bar"
msgstr "显示附件栏(_A)"
-#: ../composer/e-msg-composer.c:1336 ../composer/e-msg-composer.c:1370
+#: ../composer/e-msg-composer.c:1386 ../composer/e-msg-composer.c:1420
#: ../plugins/mail-remote/e-corba-utils.c:135
msgid "Unknown reason"
msgstr "未知原因"
-#: ../composer/e-msg-composer.c:1408
+#: ../composer/e-msg-composer.c:1458
msgid "Could not open file"
msgstr "无法打开文件"
-#: ../composer/e-msg-composer.c:1416
+#: ../composer/e-msg-composer.c:1466
msgid "Unable to retrieve message from editor"
msgstr "无法从编辑器获取信件"
-#: ../composer/e-msg-composer.c:1701
+#: ../composer/e-msg-composer.c:1751
msgid "Untitled Message"
msgstr "无标题信件"
#. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1736
+#: ../composer/e-msg-composer.c:1787
msgid "Open File"
msgstr "打开文件"
-#: ../composer/e-msg-composer.c:2198 ../mail/em-account-editor.c:606
+#: ../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:2301
+#: ../composer/e-msg-composer.c:2352
msgid "Si_gnature:"
msgstr "签名(_G):"
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3826
-#: ../composer/e-msg-composer.c:3829
+#: ../composer/e-msg-composer.c:2628 ../composer/e-msg-composer.c:3867
+#: ../composer/e-msg-composer.c:3870
msgid "Compose Message"
msgstr "撰写新邮件"
-#: ../composer/e-msg-composer.c:5054
+#: ../composer/e-msg-composer.c:5125
msgid ""
"<b>(The composer contains a non-text message body, which cannot be edited.)</"
"b>"
@@ -10238,11 +10251,11 @@ msgstr "保存信件(_S)"
#: ../data/evolution.desktop.in.in.h:1
#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:510
+#: ../shell/main.c:512
msgid "Evolution"
msgstr "Evolution"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:584
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:593
msgid "Groupware Suite"
msgstr "Groupwise 套件"
@@ -10280,18 +10293,18 @@ msgstr "Evolution 查询"
msgid "Internal error, unknown error '%s' requested"
msgstr "内部错误,请求了未知的错误“%s”"
-#: ../e-util/e-print.c:115
+#: ../e-util/e-print.c:136
msgid "An error occurred while printing"
-msgstr ""
+msgstr "打印时发生了错误"
-#: ../e-util/e-print.c:122
+#: ../e-util/e-print.c:143
msgid "The printing system reported the following details about the error:"
-msgstr ""
+msgstr "打印系统报告了下列错误细节:"
-#: ../e-util/e-print.c:128
+#: ../e-util/e-print.c:149
msgid ""
"The printing system did not report any additional details about the error."
-msgstr ""
+msgstr "打印系统未报告关于错误的任何额外细节。"
#: ../e-util/e-system.error.xml.h:2
msgid "Cannot open file &quot;{0}&quot;."
@@ -10313,7 +10326,7 @@ msgstr "文件已存在“{0}”。"
msgid "Overwrite file?"
msgstr "覆盖文件吗?"
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:139
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:138
msgid "_Overwrite"
msgstr "覆盖(_O)"
@@ -10327,7 +10340,7 @@ msgstr[0] "%d 秒前"
#, c-format
msgid "1 second in the future"
msgid_plural "%d seconds in the future"
-msgstr[0] ""
+msgstr[0] "%d 秒内"
#: ../filter/filter-datespec.c:81
#, c-format
@@ -10339,7 +10352,7 @@ msgstr[0] "%d 分钟前"
#, c-format
msgid "1 minute in the future"
msgid_plural "%d minutes in the future"
-msgstr[0] ""
+msgstr[0] "%d 分钟内"
#: ../filter/filter-datespec.c:82
#, c-format
@@ -10351,7 +10364,7 @@ msgstr[0] "%d 小时前"
#, c-format
msgid "1 hour in the future"
msgid_plural "%d hours in the future"
-msgstr[0] ""
+msgstr[0] "%d 小时内"
#: ../filter/filter-datespec.c:83
#, c-format
@@ -10363,7 +10376,7 @@ msgstr[0] "%d 天前"
#, c-format
msgid "1 day in the future"
msgid_plural "%d days in the future"
-msgstr[0] "未来的 %d 天"
+msgstr[0] "%d 内"
#: ../filter/filter-datespec.c:84
#, c-format
@@ -10375,7 +10388,7 @@ msgstr[0] "%d 周前"
#, c-format
msgid "1 week in the future"
msgid_plural "%d weeks in the future"
-msgstr[0] ""
+msgstr[0] "%d 周内"
#: ../filter/filter-datespec.c:85
#, c-format
@@ -10387,7 +10400,7 @@ msgstr[0] "%d 个月前"
#, c-format
msgid "1 month in the future"
msgid_plural "%d months in the future"
-msgstr[0] "未来的 %d 个月"
+msgstr[0] "%d 个月内"
#: ../filter/filter-datespec.c:86
#, c-format
@@ -10399,7 +10412,7 @@ msgstr[0] "%d 年前"
#, c-format
msgid "1 year in the future"
msgid_plural "%d years in the future"
-msgstr[0] "未来 %d 年"
+msgstr[0] "%d 年内"
#: ../filter/filter-datespec.c:287
msgid "<click here to select a date>"
@@ -10513,7 +10526,7 @@ msgstr "缺少日期。"
msgid "Missing file name."
msgstr "缺少文件名。"
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:74
msgid "Missing name."
msgstr "缺少名称。"
@@ -10577,13 +10590,13 @@ msgstr "过去"
#: ../filter/filter.glade.h:16
msgid "in the future"
-msgstr ""
+msgstr "未来"
#: ../filter/filter.glade.h:18
msgid "months"
msgstr "月"
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:186
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:188
msgid "seconds"
msgstr "秒"
@@ -10595,7 +10608,7 @@ msgstr "当前时间"
msgid "the time you specify"
msgstr "您指定的时间"
-#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:289
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
#: ../plugins/calendar-weather/calendar-weather.c:564
msgid "weeks"
msgstr "周"
@@ -10657,16 +10670,16 @@ msgstr "Evolution 邮件撰写控件"
msgid "Evolution Mail preferences control"
msgstr "Evolution 邮件首选项控件"
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:529
+#: ../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:582 ../mail/mail-component.c:583
-#: ../mail/mail-component.c:738
+#: ../mail/mail-component.c:568 ../mail/mail-component.c:569
+#: ../mail/mail-component.c:729
#: ../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:532
+#: ../mail/em-account-prefs.c:535
msgid "Mail Accounts"
msgstr "邮件账户"
@@ -10705,76 +10718,76 @@ msgstr "选择文件夹"
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:90
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:119
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:2046
+#: ../mail/em-account-editor.c:2056
msgid "Automatically check for _new mail every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:134
+#: ../mail/em-account-editor.c:2237 ../mail/mail-config.glade.h:134
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:66
+#: ../mail/em-account-editor.c:2296 ../mail/mail-config.glade.h:66
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:126
+#: ../mail/em-account-editor.c:2362 ../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:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2399 ../mail/em-account-editor.c:2490
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
+#: ../mail/em-account-editor.c:2400 ../mail/em-account-editor.c:2491
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:32
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:33
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2842 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
+#: ../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:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411 ../mail/mail-config.glade.h:74
+#: ../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:466
+#: ../mail/em-account-prefs.c:469
msgid "[Default]"
msgstr "[默认]"
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:945
-#: ../plugins/plugin-manager/plugin-manager.c:261
+#: ../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
msgid "Enabled"
msgstr "已启用"
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:528
msgid "Account name"
msgstr "账户名"
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:530
msgid "Protocol"
msgstr "协议"
@@ -10783,30 +10796,30 @@ msgstr "协议"
msgid "Unnamed"
msgstr "未命名"
-#: ../mail/em-composer-prefs.c:951
+#: ../mail/em-composer-prefs.c:955
msgid "Language(s)"
msgstr "语言"
-#: ../mail/em-composer-prefs.c:994
+#: ../mail/em-composer-prefs.c:998
msgid "Add signature script"
msgstr "添加签名脚本"
-#: ../mail/em-composer-prefs.c:1014
+#: ../mail/em-composer-prefs.c:1018
msgid "Signature(s)"
msgstr "签名"
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:893 ../mail/em-format-quote.c:399
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信件 --------"
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1692
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:1712
+#: ../mail/em-composer-utils.c:1739
msgid ""
"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
"${TimeZone}, ${Sender} wrote:"
@@ -10814,7 +10827,7 @@ msgstr ""
"在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
"${TimeZone},${Sender}写道:"
-#: ../mail/em-composer-utils.c:1853
+#: ../mail/em-composer-utils.c:1880
msgid "-----Original Message-----"
msgstr "-------- 原始信件 --------"
@@ -11072,8 +11085,8 @@ msgstr "开始于"
msgid "Stop Processing"
msgstr "停止处理"
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1660
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:854
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1688
+#: ../mail/em-format-quote.c:320 ../mail/em-format.c:855
#: ../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
@@ -11087,54 +11100,54 @@ msgstr "取消状态"
#. and now for the action area
#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>则</b>"
+msgid "Then"
+msgstr "然后"
-#: ../mail/em-folder-browser.c:170
+#: ../mail/em-folder-browser.c:186
msgid "C_reate Search Folder From Search..."
msgstr "从头创建搜索文件夹(_R)..."
-#: ../mail/em-folder-browser.c:192
+#: ../mail/em-folder-browser.c:208
msgid "All Messages"
msgstr "全部信件"
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:209
msgid "Unread Messages"
msgstr "未读信件"
-#: ../mail/em-folder-browser.c:195
+#: ../mail/em-folder-browser.c:211
msgid "No Label"
msgstr "无标签"
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:218
msgid "Read Messages"
msgstr "已读信件"
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:219
msgid "Recent Messages"
msgstr "最近信件"
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:220
msgid "Last 5 Days' Messages"
msgstr "前五天的信件"
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:221
msgid "Messages with Attachments"
msgstr "有附件的信件"
-#: ../mail/em-folder-browser.c:206
+#: ../mail/em-folder-browser.c:222
msgid "Important Messages"
msgstr "重要信件"
-#: ../mail/em-folder-browser.c:207
+#: ../mail/em-folder-browser.c:223
msgid "Messages Not Junk"
msgstr "不是垃圾邮件"
-#: ../mail/em-folder-browser.c:1025
+#: ../mail/em-folder-browser.c:1041
msgid "Account Search"
msgstr "账户搜索"
-#: ../mail/em-folder-browser.c:1069
+#: ../mail/em-folder-browser.c:1085
msgid "All Account Search"
msgstr "全部账户搜索"
@@ -11183,8 +11196,9 @@ msgid "Drafts"
msgstr "草稿"
#. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2462
+#: ../mail/em-folder-tree-model.c:487 ../mail/em-folder-tree.c:2576
#: ../mail/mail-component.c:151
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
#: ../plugins/exchange-operations/exchange-folder.c:593
msgid "Inbox"
msgstr "收件箱"
@@ -11257,242 +11271,241 @@ msgstr "复制到文件夹(_C)"
msgid "_Move to Folder"
msgstr "移至文件夹(_M)"
-#: ../mail/em-folder-tree.c:1710 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1715 ../mail/mail-ops.c:1060
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2110 ../ui/evolution-addressbook.xml.h:64
+#: ../mail/em-folder-tree.c:2115 ../ui/evolution-addressbook.xml.h:64
#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:32
#: ../ui/evolution-mail-messagedisplay.xml.h:8
#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution.xml.h:55
msgid "_View"
msgstr "查看(_V)"
-#: ../mail/em-folder-tree.c:2111
+#: ../mail/em-folder-tree.c:2116
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: ../mail/em-folder-tree.c:2115
+#: ../mail/em-folder-tree.c:2120
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../mail/em-folder-tree.c:2116
+#: ../mail/em-folder-tree.c:2121
msgid "_Move..."
msgstr "移动(_M)..."
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2120
+#: ../mail/em-folder-tree.c:2125
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2123 ../ui/evolution-mail-list.xml.h:36
+#: ../mail/em-folder-tree.c:2128 ../ui/evolution-mail-list.xml.h:36
msgid "_Rename..."
msgstr "重命名(_R)..."
-#: ../mail/em-folder-tree.c:2124
+#: ../mail/em-folder-tree.c:2129
msgid "Re_fresh"
msgstr "刷新(_F)"
-#: ../mail/em-folder-tree.c:2125
-#, fuzzy
+#: ../mail/em-folder-tree.c:2130
msgid "Fl_ush Outbox"
-msgstr "发件箱"
+msgstr "清空发件箱(_U)"
-#: ../mail/em-folder-tree.c:2131 ../mail/mail.error.xml.h:136
+#: ../mail/em-folder-tree.c:2136 ../mail/mail.error.xml.h:135
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:105
#, c-format
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1036
-#: ../mail/em-folder-view.c:1051
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1114
+#: ../mail/em-folder-view.c:1129
#: ../mail/importers/evolution-mbox-importer.c:86
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1051
+#: ../mail/em-folder-utils.c:369 ../mail/em-folder-view.c:1129
msgid "C_opy"
msgstr "复制(_O)"
-#: ../mail/em-folder-utils.c:581
+#: ../mail/em-folder-utils.c:590
#: ../plugins/groupwise-features/share-folder-common.c:145
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
#: ../plugins/groupwise-features/install-shared.c:164
#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Create folder"
msgstr "创建文件夹"
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:750
#: ../plugins/groupwise-features/install-shared.c:164
#: ../plugins/groupwise-features/share-folder-common.c:388
msgid "Specify where to create the folder:"
msgstr "指定在哪里创建文件夹:"
-#: ../mail/em-folder-view.c:972 ../mail/mail.error.xml.h:68
+#: ../mail/em-folder-view.c:1050 ../mail/mail.error.xml.h:68
msgid "Mail Deletion Failed"
msgstr "邮件删除失败"
-#: ../mail/em-folder-view.c:973 ../mail/mail.error.xml.h:123
+#: ../mail/em-folder-view.c:1051 ../mail/mail.error.xml.h:123
msgid "You do not have sufficient permissions to delete this mail."
msgstr "您没有足够的权限删除此邮件。"
-#: ../mail/em-folder-view.c:1144 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1222 ../ui/evolution-mail-message.xml.h:127
msgid "_Reply to Sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-folder-view.c:1146 ../mail/em-popup.c:571 ../mail/em-popup.c:582
+#: ../mail/em-folder-view.c:1224 ../mail/em-popup.c:574 ../mail/em-popup.c:585
#: ../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:1150 ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1228 ../ui/evolution-mail-message.xml.h:107
msgid "_Edit as New Message..."
msgstr "作为新信件进行编辑(_E)..."
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1234
msgid "U_ndelete"
msgstr "取消删除(_N)"
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1235
msgid "_Move to Folder..."
msgstr "移至文件夹(_M)..."
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1236
msgid "_Copy to Folder..."
msgstr "复制到文件夹(_C)..."
-#: ../mail/em-folder-view.c:1161
+#: ../mail/em-folder-view.c:1239
msgid "Mar_k as Read"
msgstr "标记为已读(_K)"
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1240
msgid "Mark as _Unread"
msgstr "标记为未读(_U)"
-#: ../mail/em-folder-view.c:1163
+#: ../mail/em-folder-view.c:1241
msgid "Mark as _Important"
msgstr "标记为重要(_I)"
-#: ../mail/em-folder-view.c:1164
+#: ../mail/em-folder-view.c:1242
msgid "Mark as Un_important"
msgstr "标记为不重要(_I)"
-#: ../mail/em-folder-view.c:1165
+#: ../mail/em-folder-view.c:1243
msgid "Mark as _Junk"
msgstr "标记为垃圾(_J)"
-#: ../mail/em-folder-view.c:1166
+#: ../mail/em-folder-view.c:1244
msgid "Mark as _Not Junk"
msgstr "标记为非垃圾(_N)"
-#: ../mail/em-folder-view.c:1167
+#: ../mail/em-folder-view.c:1245
msgid "Mark for Follo_w Up..."
msgstr "标记为跟随(_W)..."
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1247
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:1170 ../widgets/misc/e-dateedit.c:473
+#: ../mail/em-folder-view.c:1248 ../widgets/misc/e-dateedit.c:473
msgid "_None"
msgstr "无(_N)"
-#: ../mail/em-folder-view.c:1175
+#: ../mail/em-folder-view.c:1253
msgid "Fla_g Completed"
msgstr "已完成标志(_G)"
-#: ../mail/em-folder-view.c:1176
+#: ../mail/em-folder-view.c:1254
msgid "Cl_ear Flag"
msgstr "清除标志(_E)"
-#: ../mail/em-folder-view.c:1179
+#: ../mail/em-folder-view.c:1257
msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
-#: ../mail/em-folder-view.c:1180
+#: ../mail/em-folder-view.c:1258
msgid "Search Folder from _Subject"
msgstr "基于主题的搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:1181
+#: ../mail/em-folder-view.c:1259
msgid "Search Folder from Se_nder"
msgstr "基于发件人的搜索文件夹(_N)"
-#: ../mail/em-folder-view.c:1182
+#: ../mail/em-folder-view.c:1260
msgid "Search Folder from _Recipients"
msgstr "基于收件人的搜索文件夹(_R)"
-#: ../mail/em-folder-view.c:1183
+#: ../mail/em-folder-view.c:1261
msgid "Search Folder from Mailing _List"
msgstr "基于邮件列表的搜索文件夹(_L)"
-#: ../mail/em-folder-view.c:1187
+#: ../mail/em-folder-view.c:1265
msgid "Filter on Sub_ject"
msgstr "基于主题过滤(_J)"
-#: ../mail/em-folder-view.c:1188
+#: ../mail/em-folder-view.c:1266
msgid "Filter on Sen_der"
msgstr "基于发件人过滤(_D)"
-#: ../mail/em-folder-view.c:1189
+#: ../mail/em-folder-view.c:1267
msgid "Filter on Re_cipients"
msgstr "基于收件人过滤(_C)"
-#: ../mail/em-folder-view.c:1190
+#: ../mail/em-folder-view.c:1268
msgid "Filter on _Mailing List"
msgstr "基于邮件列表过滤(_M)"
#. default charset used in mail view
-#: ../mail/em-folder-view.c:2097 ../mail/em-folder-view.c:2141
+#: ../mail/em-folder-view.c:2098 ../mail/em-folder-view.c:2142
msgid "Default"
msgstr "默认"
-#: ../mail/em-folder-view.c:2354
+#: ../mail/em-folder-view.c:2355
msgid "Unable to retrieve message"
msgstr "无法获取信件"
-#: ../mail/em-folder-view.c:2375
-msgid "<b>Retrieving Message...</b>"
-msgstr "<b>正在恢复信件...</b>"
+#: ../mail/em-folder-view.c:2374
+msgid "Retrieving Message..."
+msgstr "正在收取信件..."
-#: ../mail/em-folder-view.c:2599
+#: ../mail/em-folder-view.c:2602
msgid "C_all To..."
msgstr "呼叫到(_A)..."
-#: ../mail/em-folder-view.c:2602
+#: ../mail/em-folder-view.c:2605
msgid "Create _Search Folder"
msgstr "创建搜索文件夹(_S)"
-#: ../mail/em-folder-view.c:2603
+#: ../mail/em-folder-view.c:2606
msgid "_From this Address"
msgstr "自此地址(_F)"
-#: ../mail/em-folder-view.c:2604
+#: ../mail/em-folder-view.c:2607
msgid "_To this Address"
msgstr "到此地址(_T)"
-#: ../mail/em-folder-view.c:2979
+#: ../mail/em-folder-view.c:2982
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
-#: ../mail/em-folder-view.c:2991
+#: ../mail/em-folder-view.c:2994
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../mail/em-folder-view.c:2996
+#: ../mail/em-folder-view.c:2999
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
@@ -11519,7 +11532,7 @@ msgstr "下一项(_N)"
msgid "M_atch case"
msgstr "匹配大小写(_A)"
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:632
msgid "Unsigned"
msgstr "未签名"
@@ -11529,7 +11542,7 @@ msgid ""
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:633
msgid "Valid signature"
msgstr "有效签名"
@@ -11539,7 +11552,7 @@ msgid ""
"message is authentic."
msgstr "此信件已签名,而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:634
msgid "Invalid signature"
msgstr "无效签名"
@@ -11549,9 +11562,9 @@ msgid ""
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:941
-msgid "Valid signature, cannot verify sender"
-msgstr "签名有效,无法校验发送者"
+#: ../mail/em-format-html-display.c:941 ../mail/em-format-html.c:635
+msgid "Valid signature, but cannot verify sender"
+msgstr "签名有效,但是无法校验发送者"
#: ../mail/em-format-html-display.c:941
msgid ""
@@ -11559,21 +11572,31 @@ msgid ""
"cannot be verified."
msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
-#: ../mail/em-format-html-display.c:947 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:942 ../mail/em-format-html.c:636
+msgid "Signature exists, but need public key"
+msgstr "签名已存在,但需要公钥"
+
+#: ../mail/em-format-html-display.c:942
+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:642
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:949
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:950 ../mail/em-format-html.c:643
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:950
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 "
@@ -11582,21 +11605,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花一"
"定时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:644
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:951
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:950 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:645
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:952
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 "
@@ -11605,91 +11628,91 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:1051 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1053 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:1066
+#: ../mail/em-format-html-display.c:1068
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1387
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%p%l:%M完成"
-#: ../mail/em-format-html-display.c:1393
+#: ../mail/em-format-html-display.c:1395
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1396
+#: ../mail/em-format-html-display.c:1398
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%p%l:%M"
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1458
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1459
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1460
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1461
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2511
-#: ../mail/mail-config.glade.h:43 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1905 ../mail/em-format-html-display.c:2516
+#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
msgid "Attachment"
msgstr "附件"
-#: ../mail/em-format-html-display.c:2114
+#: ../mail/em-format-html-display.c:2119
msgid "Save attachment as"
msgstr "附件另存为"
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:2123
msgid "Select folder to save all attachments"
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:2169
+#: ../mail/em-format-html-display.c:2174
msgid "_Save Selected..."
msgstr "保存所选(_S)..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2236
+#: ../mail/em-format-html-display.c:2241
#, c-format
msgid "%d at_tachment"
msgid_plural "%d at_tachments"
msgstr[0] "%d 个附件(_T)"
-#: ../mail/em-format-html-display.c:2243 ../mail/em-format-html-display.c:2321
+#: ../mail/em-format-html-display.c:2248 ../mail/em-format-html-display.c:2326
msgid "S_ave"
msgstr "保存(_A)"
-#: ../mail/em-format-html-display.c:2254
+#: ../mail/em-format-html-display.c:2259
msgid "S_ave All"
msgstr "全部保存(_A)"
-#: ../mail/em-format-html-display.c:2317
+#: ../mail/em-format-html-display.c:2322
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:2448 ../mail/em-format-html-display.c:2484
+#: ../mail/em-format-html-display.c:2453 ../mail/em-format-html-display.c:2489
msgid "View _Unformatted"
msgstr "无格式查看(_U)"
-#: ../mail/em-format-html-display.c:2450
+#: ../mail/em-format-html-display.c:2455
msgid "Hide _Unformatted"
msgstr "无格式隐藏(_U)"
-#: ../mail/em-format-html-display.c:2503
+#: ../mail/em-format-html-display.c:2508
msgid "O_pen With"
msgstr "打开方式(_P)"
-#: ../mail/em-format-html-display.c:2574
+#: ../mail/em-format-html-display.c:2579
msgid ""
"Evolution cannot render this email as it is too large to handle. You can "
"view it unformatted or with an external text editor."
@@ -11697,131 +11720,165 @@ msgstr ""
"Evolution 无法渲染此电子邮件,原因是该邮件太大。您可以以无格式方式查看该邮"
"件,或者使用外部文本编辑器查看。"
-#: ../mail/em-format-html-print.c:128
+#: ../mail/em-format-html-print.c:156
#, c-format
msgid "Page %d of %d"
msgstr "第 %d 页,共 %d 页"
-#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
+#: ../mail/em-format-html.c:486 ../mail/em-format-html.c:495
#, c-format
msgid "Retrieving `%s'"
msgstr "收取“%s”"
-#: ../mail/em-format-html.c:621
-msgid "Valid signature but cannot verify sender"
-msgstr "签名有效但是无法校验发送者"
+#: ../mail/em-format-html.c:907
+msgid "Unknown external-body part."
+msgstr "未知的 external-body 部分。"
-#: ../mail/em-format-html.c:892
+#: ../mail/em-format-html.c:915
msgid "Malformed external-body part."
msgstr "格式不正确的 external-body 部分。"
-#: ../mail/em-format-html.c:922
+#: ../mail/em-format-html.c:945
#, c-format
msgid "Pointer to FTP site (%s)"
msgstr "指向 FTP 站点 (%s)"
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:956
#, c-format
msgid "Pointer to local file (%s) valid at site \"%s\""
msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-#: ../mail/em-format-html.c:935
+#: ../mail/em-format-html.c:958
#, c-format
msgid "Pointer to local file (%s)"
msgstr "指向本地文件 (%s)"
-#: ../mail/em-format-html.c:956
+#: ../mail/em-format-html.c:979
#, c-format
msgid "Pointer to remote data (%s)"
msgstr "指向远程数据 (%s)"
-#: ../mail/em-format-html.c:967
+#: ../mail/em-format-html.c:990
#, c-format
msgid "Pointer to unknown external data (\"%s\" type)"
msgstr "指向未知的外部数据 (“%s”类型)"
-#: ../mail/em-format-html.c:1194
+#: ../mail/em-format-html.c:1217
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1385
+msgid "Formatting Message..."
+msgstr "正在格式化信件..."
+
+#: ../mail/em-format-html.c:1517 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:850 ../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:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1517 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
msgid "Reply-To"
msgstr "回复至"
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:90
+#: ../mail/em-format-html.c:1517 ../mail/em-format-html.c:1532
+#: ../mail/em-format-html.c:1596 ../mail/em-format-html.c:1618
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:853
+#: ../mail/em-mailer-prefs.c:90
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1489 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:853 ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1517 ../mail/em-format-html.c:1533
+#: ../mail/em-format-html.c:1602 ../mail/em-format-html.c:1621
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:854
+#: ../mail/em-mailer-prefs.c:91
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1664 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1182
+#: ../mail/em-format-html.c:1692 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1196
msgid "Mailer"
msgstr "邮件程序"
#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1691
-msgid "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1719
+#, fuzzy
+msgid " (%a, %R %Z)"
msgstr "<I> (%A,%R %Z)</I>"
#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1694
-msgid "<I> (%R %Z)</I>"
+#: ../mail/em-format-html.c:1724
+#, fuzzy
+msgid " (%R %Z)"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1704 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:855 ../mail/em-mailer-prefs.c:93
+#: ../mail/em-format-html.c:1736 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:856 ../mail/em-mailer-prefs.c:93
#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
#: ../widgets/misc/e-dateedit.c:363
msgid "Date"
msgstr "日期"
-#: ../mail/em-format-html.c:1727 ../mail/em-format.c:856
+#: ../mail/em-format-html.c:1759 ../mail/em-format.c:857
#: ../mail/em-mailer-prefs.c:94
msgid "Newsgroups"
msgstr "新闻组"
-#: ../mail/em-format.c:1120
+#. 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:1849
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../mail/em-format.c:1121
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
-#: ../mail/em-format.c:1159 ../mail/em-format.c:1310 ../mail/em-format.c:1612
+#: ../mail/em-format.c:1160
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 S/MIME 信件:未知错误"
-#: ../mail/em-format.c:1292 ../mail/em-format.c:1448
+#: ../mail/em-format.c:1297 ../mail/em-format.c:1453
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信件。显示源文本。"
-#: ../mail/em-format.c:1300
+#: ../mail/em-format.c:1305
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../mail/em-format.c:1467
+#: ../mail/em-format.c:1315
+msgid "Could not parse PGP/MIME message"
+msgstr "无法解析 PGP/MIME 信件"
+
+#: ../mail/em-format.c:1315
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "无法解析 PGP/MIME 信件:未知错误"
+
+#: ../mail/em-format.c:1472
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+#: ../mail/em-format.c:1480 ../mail/em-format.c:1551
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../mail/em-format.c:1475 ../mail/em-format.c:1541
+#: ../mail/em-format.c:1480 ../mail/em-format.c:1542 ../mail/em-format.c:1551
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
+#: ../mail/em-format.c:1622
+msgid "Could not parse PGP message"
+msgstr "无法分析 PGP 信件"
+
+#: ../mail/em-format.c:1622
+msgid "Could not parse PGP message: Unknown error"
+msgstr "无法解析 PGP 信件:未知错误"
+
#: ../mail/em-mailer-prefs.c:105
msgid "Every time"
msgstr "每次"
@@ -11838,18 +11895,20 @@ msgstr "每周一次"
msgid "Once per month"
msgstr "每月一次"
-#: ../mail/em-mailer-prefs.c:777
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:787 ../mail/em-mailer-prefs.c:841
#, c-format
msgid "%s plugin is available and the binary is installed."
-msgstr ""
+msgstr "%s 插件可用,二进制文件已经安装。"
-#: ../mail/em-mailer-prefs.c:785
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:795 ../mail/em-mailer-prefs.c:850
#, c-format
msgid ""
"%s plugin is not available. Please check whether the package is installed."
-msgstr ""
+msgstr "%s 插件不可用。请检查软件包是否已安装。"
-#: ../mail/em-mailer-prefs.c:806
+#: ../mail/em-mailer-prefs.c:816
msgid "No Junk plugin available"
msgstr "没有可用的垃圾邮件插件"
@@ -11899,12 +11958,12 @@ msgstr "无法复制 POP3 在服务器上保留的数据“%s”:%s"
msgid "Failed to create local mail storage `%s': %s"
msgstr "创建本地邮件存储“%s”失败:%s"
-#: ../mail/em-migrate.c:2710
+#: ../mail/em-migrate.c:2743
#, c-format
msgid "Unable to create local mail folders at `%s': %s"
msgstr "无法在“%s”创建本地邮件文件夹:%s"
-#: ../mail/em-migrate.c:2729
+#: ../mail/em-migrate.c:2762
msgid ""
"Unable to read settings from previous Evolution install, `evolution/config."
"xmldb' does not exist or is corrupt."
@@ -11912,16 +11971,16 @@ msgstr ""
"无法从先前的 Evolution 安装中读取设置,“evolution/config.xmldb”不存在或者已损"
"坏。"
-#: ../mail/em-popup.c:567 ../mail/em-popup.c:578
+#: ../mail/em-popup.c:570 ../mail/em-popup.c:581
msgid "_Reply to sender"
msgstr "回复发件人(_R)"
-#: ../mail/em-popup.c:568 ../mail/em-popup.c:579
+#: ../mail/em-popup.c:571 ../mail/em-popup.c:582
#: ../ui/evolution-mail-message.xml.h:83
msgid "Reply to _List"
msgstr "回复邮件列表(_L)"
-#: ../mail/em-popup.c:632
+#: ../mail/em-popup.c:635
msgid "_Add to Address Book"
msgstr "添加到地址簿(_A)"
@@ -11938,11 +11997,11 @@ msgid "Folder"
msgstr "文件夹"
#. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:837
msgid "Please select a server."
msgstr "请选择服务器。"
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:858
msgid "No server has been selected"
msgstr "没有选中服务器"
@@ -11958,16 +12017,16 @@ msgstr "邮件过滤器"
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:557
+#: ../mail/em-utils.c:563
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:606
+#: ../mail/em-utils.c:612
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1090
+#: ../mail/em-utils.c:1096
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
@@ -12084,22 +12143,20 @@ msgid "Draw spelling error indicators on words as you type."
msgstr "在您打字的时候就显示拼写错误标识。"
#: ../mail/evolution-mail.schemas.in.h:26
-#, fuzzy
msgid "Empty Junk folders on exit"
-msgstr "退出时清空回收站"
+msgstr "退出时清空垃圾邮件文件夹"
#: ../mail/evolution-mail.schemas.in.h:27
msgid "Empty Trash folders on exit"
msgstr "退出时清空回收站"
#: ../mail/evolution-mail.schemas.in.h:28
-#, fuzzy
msgid "Empty all Junk folders when exiting Evolution."
-msgstr "退出 Evolution 时清空回收站"
+msgstr "退出 Evolution 时清空垃圾邮件。"
#: ../mail/evolution-mail.schemas.in.h:29
msgid "Empty all Trash folders when exiting Evolution."
-msgstr "退出 Evolution 时清空回收站"
+msgstr "退出 Evolution 时清空回收站。"
#: ../mail/evolution-mail.schemas.in.h:30
msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -12137,18 +12194,22 @@ msgid "Height of the message-list pane."
msgstr "信件列表面板的高度。"
#: ../mail/evolution-mail.schemas.in.h:37
+msgid "Hides the per-folder preview and removes the selection"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:38
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:38
+#: ../mail/evolution-mail.schemas.in.h:39
msgid ""
"If the \"Preview\" pane is on, then show it side-by-side rather than "
"vertically."
msgstr "如果开启了“预览”面板,则以并列方式显示,而不是垂直方式显示。"
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:40
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 "
@@ -12158,38 +12219,37 @@ msgstr ""
"MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
"内容。"
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../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:41
+#: ../mail/evolution-mail.schemas.in.h:42
msgid "It disables/enables the prompt while marking multiple messages."
msgstr "禁用/启用对多封邮件的标记。"
-#: ../mail/evolution-mail.schemas.in.h:42
-#, fuzzy
+#: ../mail/evolution-mail.schemas.in.h:43
msgid "Last time empty junk was run"
-msgstr "上次清空回收站的时间"
+msgstr "上次清空垃圾邮件的时间"
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:44
msgid "Last time empty trash was run"
msgstr "上次清空回收站的时间"
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:45
msgid "List of Labels and their associated colors"
msgstr "标签及其对应颜色的列表"
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:46
msgid "List of accepted licenses"
msgstr "列出接受的许可"
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:47
msgid "List of accounts"
msgstr "账户列表"
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:48
msgid ""
"List of accounts known to the mail component of Evolution. The list contains "
"strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12197,11 +12257,11 @@ msgstr ""
"列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
"accounts 的子目录命名字符串。"
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:49
msgid "List of custom headers and whether they are enabled."
msgstr "自定义头及该头是否启用。"
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:50
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."
@@ -12209,19 +12269,19 @@ msgstr ""
"列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”,其中"
"颜色使用了 HTML 十六进制编码方式。"
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:51
msgid "List of mime types to check for bonobo component viewers"
msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:52
msgid "List of protocol names whose license has been accepted."
msgstr "列出接受协议的协议名称。"
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:53
msgid "Load images for HTML messages over http"
msgstr "在 HTML 信件中装入 HTTP 图像"
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:54
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 "
@@ -12230,240 +12290,240 @@ msgstr ""
"在 HTML 信件中装入 http(s) 图像。可供选择的值有:0 - 决不从网上装入图像,1 - "
"如果发送者在地址簿中则装入图像,2 - 总是从网上装入图像"
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:55
msgid "Log filter actions"
msgstr "记录过滤动作"
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:56
msgid "Log filter actions to the specified log file."
msgstr "将过滤动作记录到指定日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:57
msgid "Logfile to log filter actions"
msgstr "记录过滤动作的日志文件"
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:58
msgid "Logfile to log filter actions."
msgstr "记录过滤动作的日志文件。"
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:59
msgid "Mark as Seen after specified timeout"
msgstr "在指定超时过后标为已看"
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:60
msgid "Mark as Seen after specified timeout."
msgstr "在指定超时过后标为已看。"
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:61
msgid "Mark citations in the message \"Preview\""
msgstr "在信件“预览”中标出引用"
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:62
msgid "Mark citations in the message \"Preview\"."
msgstr "在信件“预览”中标出引用。"
-#: ../mail/evolution-mail.schemas.in.h:62
+#: ../mail/evolution-mail.schemas.in.h:63
msgid "Message Window default height"
msgstr "信件窗口默认高度"
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:64
msgid "Message Window default width"
msgstr "信件窗口默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:65
msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
msgstr "信件显示风格(普通、全部邮件头、源代码)"
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:66
#, fuzzy
msgid "Minimum days between emptying the junk on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:67
msgid "Minimum days between emptying the trash on exit"
msgstr "退出时清空回收站的最少天数"
-#: ../mail/evolution-mail.schemas.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:68
#, fuzzy
msgid "Minimum time between emptying the junk on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:69
msgid "Minimum time between emptying the trash on exit, in days."
msgstr "退出时清空回收站的最少天数。"
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:70
msgid "New Mail Notify sound file"
msgstr "新建邮件通知声音文件"
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:71
msgid "New Mail Notify type"
msgstr "新建邮件通知类型"
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:72
msgid "Number of addresses to display in TO/CC/BCC"
msgstr "要在 TO/CC/BCC 中显示的地址数"
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:73
msgid "Prompt on empty subject"
msgstr "空主题时提示"
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:74
msgid "Prompt the user when he or she tries to expunge a folder."
msgstr "用户视图销毁文件夹时提示。"
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:75
msgid ""
"Prompt the user when he or she tries to send a message without a Subject."
msgstr "用户视图发送没有主题的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:76
msgid "Prompt to check if the user wants to go offline immediately"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:77
msgid "Prompt when user expunges"
msgstr "用户销毁时提示"
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:78
msgid "Prompt when user only fills Bcc"
msgstr "用户只填入 Bcc 时提示"
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:79
msgid "Prompt when user tries to open 10 or more messages at once"
msgstr "当用户试图一次打开超过十封信时提示"
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:80
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:80
+#: ../mail/evolution-mail.schemas.in.h:81
msgid "Prompt when user tries to send a message with no To or Cc recipients."
msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:82
msgid "Prompt when user tries to send unwanted HTML"
msgstr "当用户是否发送意外的 HTML 时提示"
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:83
msgid "Prompt while marking multiple messages"
msgstr "标记多封信件时提示"
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:84
msgid "Recognize links in text and replace them."
msgstr "识别文本中的链接并进行替换。"
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:85
msgid "Recognize smileys in text and replace them with images."
msgstr "识别文本中的表情,并将其替换为图像。"
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:86
msgid "Run junk test on incoming mail"
msgstr "对收到的邮件运行垃圾邮件测试"
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:87
msgid "Save directory"
msgstr "保存目录"
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:88
msgid "Search for the sender photo in local addressbooks"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:89
msgid "Send HTML mail by default"
msgstr "默认以 HTML 发送邮件"
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:90
msgid "Send HTML mail by default."
msgstr "默认以 HTML 发送邮件。"
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:91
msgid "Show Animations"
msgstr "显示动画"
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:92
msgid "Show animated images as animations."
msgstr "将动画图像显示为动画。"
-#: ../mail/evolution-mail.schemas.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:93
msgid "Show deleted messages (with a strike-through) in the message-list."
msgstr "在信件列表中显示删除了的信件(带有删除线)。"
-#: ../mail/evolution-mail.schemas.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:94
msgid "Show deleted messages in the message-list"
msgstr "在信件列表中显示删除了的信件"
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:95
msgid "Show photo of the sender"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:98
msgid ""
"Show the email of the sender in the messages composite column in the message "
"list"
msgstr "在信件列表的信件组合列中显示电子邮件的发送者"
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:99
#, fuzzy
msgid "Show the photo of the sender in the message reading pane."
msgstr "在信件列表的信件组合列中显示电子邮件的发送者"
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../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:100
+#: ../mail/evolution-mail.schemas.in.h:101
msgid "Sound file to play when new mail arrives."
msgstr "新邮件到达时要播放的声音文件。"
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../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:102
+#: ../mail/evolution-mail.schemas.in.h:103
msgid "Spell check inline"
msgstr "内嵌拼写检查"
-#: ../mail/evolution-mail.schemas.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:104
msgid "Subscribe dialog default height"
msgstr "订阅对话框默认高度"
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:105
msgid "Subscribe dialog default width"
msgstr "订阅对话框默认宽度"
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:106
msgid "Terminal font"
msgstr "终端字体"
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:107
msgid "Text message part limit"
msgstr "文本信件部分限制"
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:108
msgid "The default plugin for Junk hook"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:109
#, fuzzy
msgid "The last time empty junk was run, in days since the epoch."
msgstr "上次清空回收站的时间,以 epoch 天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:110
msgid "The last time empty trash was run, in days since the epoch."
msgstr "上次清空回收站的时间,以 epoch 天数显示。"
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:111
msgid "The terminal font for mail display"
msgstr "邮件显示用的终端字体"
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:112
msgid "The variable width font for mail display"
msgstr "用于显示邮件的变宽字体"
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:113
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."
@@ -12471,14 +12531,20 @@ msgstr ""
"此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB,单位"
"为 KB。"
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:114
msgid ""
"This is the default junk plugin, even though there are multiple plugins "
-"enabled. If the default listed plugin is disabled, then it wont fall back to "
-"the other available 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:114
+#: ../mail/evolution-mail.schemas.in.h:115
+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 ""
+
+#: ../mail/evolution-mail.schemas.in.h:116
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;"
@@ -12488,129 +12554,129 @@ msgstr ""
"此键应包含指定自定义邮件头的 XML 结构列表,以及是否显示这些邮件头。XML 结构的"
"格式为:&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:117
msgid "This option would help in improving the speed of fetching."
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:118
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:117
+#: ../mail/evolution-mail.schemas.in.h:119
msgid ""
"This setting specifies whether the threads should be in expanded or "
"collapsed state by default. Evolution requires a restart"
msgstr ""
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:120
msgid "Thread the message list."
msgstr "按线索编排信件列表。"
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:121
msgid "Thread the message-list"
msgstr "按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:122
msgid "Thread the message-list based on Subject"
msgstr "基于主题按线索编排信件列表"
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:123
msgid "Timeout for marking message as Seen"
msgstr "将信件标为已看的超时"
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:124
msgid "Timeout for marking message as Seen."
msgstr "将信件标为已看的超时。"
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:125
msgid "UID string of the default account."
msgstr "默认账户的 UID 字符串。"
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:126
msgid "Use SpamAssassin daemon and client"
msgstr "使用垃圾克星守护程序和客户"
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:127
msgid "Use SpamAssassin daemon and client (spamc/spamd)"
msgstr "使用垃圾克星守护程序和客户(spamc/spamd)"
-#: ../mail/evolution-mail.schemas.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:128
msgid "Use custom fonts"
msgstr "使用自定义字体"
-#: ../mail/evolution-mail.schemas.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:129
msgid "Use custom fonts for displaying mail"
msgstr "使用自定义字体显示邮件"
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:130
msgid "Use only local spam tests."
msgstr "只使用本地垃圾邮件测试。"
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:131
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾邮件测试(无 DNS)。"
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:132
msgid "Use side-by-side or wide layout"
msgstr "使用并排还是宽屏布局"
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:133
msgid "Variable width font"
msgstr "变宽字体"
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:134
msgid "View/Bcc menu item is checked"
msgstr "选中了查看/Bcc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:135
msgid "View/Bcc menu item is checked."
msgstr "选中了查看/Bcc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:136
msgid "View/Cc menu item is checked"
msgstr "选中了查看/Cc 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:137
msgid "View/Cc menu item is checked."
msgstr "选中了查看/Cc 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:138
msgid "View/From menu item is checked"
msgstr "选中了查看/From 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:139
msgid "View/From menu item is checked."
msgstr "选中了查看/From 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:140
msgid "View/PostTo menu item is checked"
msgstr "选中了查看/PostTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:141
msgid "View/PostTo menu item is checked."
msgstr "选中了查看/PostTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:142
msgid "View/ReplyTo menu item is checked"
msgstr "选中了查看/ReplyTo 菜单项"
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:143
msgid "View/ReplyTo menu item is checked."
msgstr "选中了查看/ReplyTo 菜单项。"
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:144
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:143
+#: ../mail/evolution-mail.schemas.in.h:145
msgid "Width of the message-list pane"
msgstr "信件列表面板的高度"
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:146
msgid "Width of the message-list pane."
msgstr "信件列表面板的高度。"
@@ -12692,79 +12758,79 @@ msgstr "%s 邮件列表"
msgid "Add Filter Rule"
msgstr "添加过滤规则"
-#: ../mail/mail-component.c:524
+#: ../mail/mail-component.c:530
#, c-format
msgid "%d deleted"
msgid_plural "%d deleted"
msgstr[0] "%d 封已删除"
-#: ../mail/mail-component.c:526
+#: ../mail/mail-component.c:532
#, c-format
msgid "%d junk"
msgid_plural "%d junk"
msgstr[0] "%d 封垃圾"
-#: ../mail/mail-component.c:549
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] ",已选中 %d 个,"
-
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:535
#, c-format
msgid "%d draft"
msgid_plural "%d drafts"
msgstr[0] "%d 封草稿"
-#: ../mail/mail-component.c:554
+#: ../mail/mail-component.c:537
#, c-format
msgid "%d sent"
msgid_plural "%d sent"
msgstr[0] "%d 封已发"
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:539
#, c-format
msgid "%d unsent"
msgid_plural "%d unsent"
msgstr[0] "%d 封未发"
-#: ../mail/mail-component.c:561
+#: ../mail/mail-component.c:545
#, c-format
msgid "%d unread, "
msgid_plural "%d unread, "
msgstr[0] ",%d 封未读,"
-#: ../mail/mail-component.c:562
+#: ../mail/mail-component.c:546
#, c-format
msgid "%d total"
msgid_plural "%d total"
msgstr[0] "总共 %d 封"
-#: ../mail/mail-component.c:889
+#: ../mail/mail-component.c:550
+#, c-format
+msgid " %d selected, "
+msgid_plural " %d selected, "
+msgstr[0] "已选中 %d 个,"
+
+#: ../mail/mail-component.c:880
msgid "New Mail Message"
msgstr "新建信件"
-#: ../mail/mail-component.c:890
+#: ../mail/mail-component.c:881
msgid "_Mail Message"
msgstr "信件(_M)"
-#: ../mail/mail-component.c:891
+#: ../mail/mail-component.c:882
msgid "Compose a new mail message"
msgstr "撰写一封新信"
-#: ../mail/mail-component.c:897
+#: ../mail/mail-component.c:888
msgid "New Mail Folder"
msgstr "新建邮件文件夹"
-#: ../mail/mail-component.c:898
+#: ../mail/mail-component.c:889
msgid "Mail _Folder"
msgstr "邮件文件夹(_F)"
-#: ../mail/mail-component.c:899
+#: ../mail/mail-component.c:890
msgid "Create a new mail folder"
msgstr "创建新邮件文件夹"
-#: ../mail/mail-component.c:1045
+#: ../mail/mail-component.c:1037
msgid "Failed upgrading Mail settings or folders."
msgstr "升级邮件设置或文件夹失败。"
@@ -12809,158 +12875,158 @@ msgid "<b>Sig_natures</b>"
msgstr "<b>签名(_N)</b>"
#: ../mail/mail-config.glade.h:6
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:7
msgid "<b>_Languages</b>"
msgstr "<b>语言(_L)</b>"
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:8
msgid "<span weight=\"bold\">Account Information</span>"
msgstr "<span weight=\"bold\">账户信息</span>"
-#: ../mail/mail-config.glade.h:9
+#: ../mail/mail-config.glade.h:10
msgid "<span weight=\"bold\">Authentication Type</span>"
msgstr "<span weight=\"bold\">认证类型</span>"
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">身份验证</span>"
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
msgid "<span weight=\"bold\">Composing Messages</span>"
msgstr "<span weight=\"bold\">撰写信件</span>"
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
msgid "<span weight=\"bold\">Configuration</span>"
msgstr "<span weight=\"bold\">配置</span>"
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
msgid "<span weight=\"bold\">Default Behavior</span>"
msgstr "<span weight=\"bold\">默认行为</span>"
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
msgid "<span weight=\"bold\">Delete Mail</span>"
msgstr "<span weight=\"bold\">删除邮件</span>"
-#: ../mail/mail-config.glade.h:15
+#: ../mail/mail-config.glade.h:16
msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
-#: ../mail/mail-config.glade.h:17
+#: ../mail/mail-config.glade.h:18
msgid "<span weight=\"bold\">Labels and Colors</span>"
msgstr "<span weight=\"bold\">标签和颜色</span>"
-#: ../mail/mail-config.glade.h:18
+#: ../mail/mail-config.glade.h:19
msgid "<span weight=\"bold\">Loading Images</span>"
msgstr "<span weight=\"bold\">装入图像</span>"
-#: ../mail/mail-config.glade.h:19
+#: ../mail/mail-config.glade.h:20
msgid "<span weight=\"bold\">Message Display</span>"
msgstr "<span weight=\"bold\">信件显示</span>"
-#: ../mail/mail-config.glade.h:20
+#: ../mail/mail-config.glade.h:21
msgid "<span weight=\"bold\">Message Fonts</span>"
msgstr "<span weight=\"bold\">信件字体</span>"
-#: ../mail/mail-config.glade.h:21
+#: ../mail/mail-config.glade.h:22
msgid "<span weight=\"bold\">Message Receipts</span>"
msgstr "<span weight=\"bold\">信件收条</span>"
-#: ../mail/mail-config.glade.h:22
+#: ../mail/mail-config.glade.h:23
msgid "<span weight=\"bold\">New Mail Notification</span>"
msgstr "<span weight=\"bold\">新邮件提醒</span>"
-#: ../mail/mail-config.glade.h:23
+#: ../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:24
+#: ../mail/mail-config.glade.h:25
msgid "<span weight=\"bold\">Options</span>"
msgstr "<span weight=\"bold\">选项</span>"
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:26
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:26
+#: ../mail/mail-config.glade.h:27
msgid "<span weight=\"bold\">Printed Fonts</span>"
msgstr "<span weight=\"bold\">打印字体</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:28
msgid "<span weight=\"bold\">Required Information</span>"
msgstr "<span weight=\"bold\">请求的信息</span>"
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:29
msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:30
msgid "<span weight=\"bold\">Security</span>"
msgstr "<span weight=\"bold\">安全</span>"
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:31
msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:32
msgid "<span weight=\"bold\">Server Configuration</span>"
msgstr "<span weight=\"bold\">服务器配置</span>"
-#: ../mail/mail-config.glade.h:33
+#: ../mail/mail-config.glade.h:34
msgid "Account Management"
msgstr "账户管理"
-#: ../mail/mail-config.glade.h:34
+#: ../mail/mail-config.glade.h:35
msgid "Add Ne_w Signature..."
msgstr "添加新签名(_W)..."
-#: ../mail/mail-config.glade.h:35
+#: ../mail/mail-config.glade.h:36
msgid "Add _Script"
msgstr "添加脚本(_S)"
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.glade.h:37
msgid "Al_ways sign outgoing messages when using this account"
msgstr "当使用该账户时总是发送签名信件(_W)"
-#: ../mail/mail-config.glade.h:37
+#: ../mail/mail-config.glade.h:38
msgid "Also encrypt to sel_f when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_F)"
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.glade.h:39
msgid "Alway_s carbon-copy (cc) to:"
msgstr "总是抄送到(_S):"
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.glade.h:40
msgid "Always _blind carbon-copy (bcc) to:"
msgstr "总是暗送到(_B):"
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.glade.h:41
msgid "Always _trust keys in my keyring when encrypting"
msgstr "加密时总是信任我的密钥环中的密钥(_T)"
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.glade.h:42
msgid "Always encrypt to _myself when sending encrypted mail"
msgstr "当发送加密邮件时总是对自身加密(_M)"
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.glade.h:43
msgid "Attach original message"
msgstr "附加原始信件"
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.glade.h:45
msgid "Automatically insert _smiley images"
msgstr "自动插入表情图像(_S)"
-#: ../mail/mail-config.glade.h:45
+#: ../mail/mail-config.glade.h:46
msgid "Baltic (ISO-8859-13)"
msgstr "波罗的语(ISO-8859-13)"
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.glade.h:47
msgid "Baltic (ISO-8859-4)"
msgstr "波罗的语(ISO-8859-4)"
-#: ../mail/mail-config.glade.h:47
-msgid "Beep w_hen new mail arrives"
-msgstr "新邮件到达时响铃(_H)"
-
#: ../mail/mail-config.glade.h:48
msgid "C_haracter set:"
msgstr "字符集(_H):"
@@ -13026,7 +13092,7 @@ msgstr "默认字符编码(_N):"
#: ../mail/mail-config.glade.h:67
msgid "Delete junk mails on e_xit"
-msgstr ""
+msgstr "退出时删除垃圾邮件(_X)"
#: ../mail/mail-config.glade.h:69
msgid "Digitally _sign outgoing messages (by default)"
@@ -13069,13 +13135,13 @@ msgid "Encrypt out_going messages (by default)"
msgstr "加密寄出的信件(默认)(_G)"
#: ../mail/mail-config.glade.h:81
-msgid "Fi_xed width Font:"
-msgstr "等宽字体(_X):"
-
-#: ../mail/mail-config.glade.h:82
msgid "Fi_xed-width:"
msgstr "等宽(_X):"
+#: ../mail/mail-config.glade.h:82
+msgid "Fix_ed width Font:"
+msgstr "等宽字体(_E):"
+
#: ../mail/mail-config.glade.h:83
msgid "Font Properties"
msgstr "字体属性"
@@ -13345,87 +13411,95 @@ msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上装入图像(_A)"
#: ../mail/mail-config.glade.h:161
-msgid "_Default junk plugin:"
-msgstr ""
+msgid "_Beep when new mail arrives"
+msgstr "新邮件到达时响铃(_B)"
#: ../mail/mail-config.glade.h:162
+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:163
+#: ../mail/mail-config.glade.h:164
msgid "_Do not sign meeting requests (for Outlook compatibility)"
msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.glade.h:166
msgid "_Forward style:"
msgstr "转发方式(_F):"
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:167
+msgid "_Keep Signature above the original message on replying"
+msgstr "回复时保留原始信件的签名(_K)"
+
+#: ../mail/mail-config.glade.h:168
msgid "_Load images in mail from contacts"
msgstr "装入联系人发来的邮件中的图像(_L)"
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:169
msgid "_Make this my default account"
msgstr "使它成为我的默认账户(_M)"
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:170
msgid "_Mark messages as read after"
msgstr "把信件标记为已读前等(_M)"
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:172
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 装入图像(_N)"
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:173
msgid "_Path:"
msgstr "路径(_P):"
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.glade.h:174
msgid "_Prompt when sending HTML messages to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.glade.h:175
msgid "_Prompt when sending messages with an empty subject line"
msgstr "发送空主题行的信件时提示(_P)"
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.glade.h:176
msgid "_Reply style:"
msgstr "回复风格(_R):"
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.glade.h:177
msgid "_Script:"
msgstr "脚本(_S):"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:180
msgid "_Show image animations"
msgstr "显示图像动画(_S)"
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:181
msgid "_Show the photograph of sender in the email preview"
-msgstr ""
+msgstr "在电子邮件预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:182
msgid "_Shrink To / Cc / Bcc headers to "
msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.glade.h:183
msgid "_Use Secure Connection:"
msgstr "使用安全连接(_U):"
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.glade.h:184
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.glade.h:185
msgid "addresses"
msgstr "个地址"
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.glade.h:186
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.glade.h:187
msgid "description"
msgstr "描述"
@@ -13525,7 +13599,7 @@ msgstr "标志(_F):"
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-folder-cache.c:875
+#: ../mail/mail-folder-cache.c:877
#, c-format
msgid "Pinging %s"
msgstr "查验 %s"
@@ -13568,11 +13642,11 @@ msgstr "发送第%d封信,共%d封"
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:690
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:696
msgid "Canceled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:698
msgid "Complete."
msgstr "完成。"
@@ -13696,58 +13770,58 @@ msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
#: ../mail/mail-ops.c:2361
-#, fuzzy, c-format
+#, c-format
msgid "Preparing account '%s' for offline"
-msgstr "Exchange 账户脱机。"
+msgstr "正在准备脱机使用账户“%s”"
#: ../mail/mail-ops.c:2444
msgid "Checking Service"
msgstr "检查服务"
-#: ../mail/mail-send-recv.c:160
+#: ../mail/mail-send-recv.c:161
msgid "Canceling..."
msgstr "正在取消..."
-#: ../mail/mail-send-recv.c:385
+#: ../mail/mail-send-recv.c:387
msgid "Send & Receive Mail"
msgstr "发送和接收邮件"
-#: ../mail/mail-send-recv.c:392
+#: ../mail/mail-send-recv.c:394
msgid "Cancel _All"
msgstr "全部取消(_A)"
-#: ../mail/mail-send-recv.c:500
+#: ../mail/mail-send-recv.c:502
msgid "Updating..."
msgstr "正在更新..."
-#: ../mail/mail-send-recv.c:500 ../mail/mail-send-recv.c:569
+#: ../mail/mail-send-recv.c:502 ../mail/mail-send-recv.c:575
msgid "Waiting..."
msgstr "正在等待..."
-#: ../mail/mail-send-recv.c:777
+#: ../mail/mail-send-recv.c:783
msgid "Checking for new mail"
msgstr "检查新邮件"
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:202
#, c-format
msgid "Enter Passphrase for %s"
msgstr "输入 %s 的密码"
-#: ../mail/mail-session.c:202
+#: ../mail/mail-session.c:204
msgid "Enter Passphrase"
msgstr "输入密码"
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:207
#: ../plugins/exchange-operations/exchange-config-listener.c:711
#, c-format
msgid "Enter Password for %s"
msgstr "为 %s 输入密码"
-#: ../mail/mail-session.c:207
+#: ../mail/mail-session.c:209
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:245
+#: ../mail/mail-session.c:251
msgid "User canceled operation."
msgstr "用户己取消操作。"
@@ -14021,8 +14095,8 @@ msgid "Do not disable"
msgstr "不禁用"
#: ../mail/mail.error.xml.h:49
-msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "您是否想要在子文件夹中执行操作?"
+msgid "Do you want the operation to be performed also in the subfolders?"
+msgstr "您是否想要也在子文件夹中执行操作?"
#: ../mail/mail.error.xml.h:50
msgid ""
@@ -14120,21 +14194,21 @@ msgid "Mark all messages as read"
msgstr "把所有信件标记为已读"
#: ../mail/mail.error.xml.h:72
-msgid "Mark all messages in subfolders as read?"
-msgstr "将子文件夹中的信件也全部标记为已读吗?"
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "将此文件夹及其子文件夹中的信件全部标记为已读吗?"
#: ../mail/mail.error.xml.h:73
-msgid "Mark as _Read"
-msgstr "标记为已读(_R)"
-
-#: ../mail/mail.error.xml.h:74
msgid "Missing folder."
msgstr "缺少文件夹。"
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:75
msgid "No sources selected."
msgstr "没有选中源。"
+#: ../mail/mail.error.xml.h:76
+msgid "Only on _Current Folder"
+msgstr "只对当前文件夹(_C)"
+
#: ../mail/mail.error.xml.h:77
msgid "Opening too many messages at once may take a long time."
msgstr "一次打开太多封信可能要花一点时间。"
@@ -14366,21 +14440,21 @@ msgid "_Discard changes"
msgstr "丢弃更改(_D)"
#: ../mail/mail.error.xml.h:134
-msgid "_Do not Mark as Read"
-msgstr "不标为已读(_D)"
-
-#: ../mail/mail.error.xml.h:135
msgid "_Do not Synchronize"
msgstr "不同步(_D)"
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
msgid "_Open Messages"
msgstr "打开信件(_O)"
+#: ../mail/mail.error.xml.h:140
+msgid "on Current Folder and _Subfolders"
+msgstr ""
+
#: ../mail/message-list.c:1022
msgid "Unseen"
msgstr "未看"
@@ -14417,30 +14491,30 @@ msgstr "较高"
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:1508 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1508 ../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:201
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1515 ../plugins/itip-formatter/itip-view.c:203
+#: ../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:82
+#: ../mail/message-list.c:1524 ../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:94
+#: ../mail/message-list.c:1536 ../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:102
+#: ../mail/message-list.c:1544 ../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:104
+#: ../mail/message-list.c:1546 ../widgets/table/e-cell-date.c:102
msgid "%b %d %Y"
msgstr "%Y年%m月%d日"
@@ -14549,6 +14623,53 @@ msgstr "本地地址簿"
msgid "Provides core functionality for local address books."
msgstr "提供本地地址簿的核心功能。"
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "Enable attachment reminder plugin"
+msgstr "启用附件提醒插件"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr ""
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:376
+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)"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "附件提醒"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+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 ""
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "信件无附件"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Continue Editing"
+msgstr "继续编辑(_C)"
+
#: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
msgid ""
"A formatter plugin which displays audio attachments inline and allows you to "
@@ -14561,16 +14682,16 @@ msgid "Audio inline plugin"
msgstr "内嵌音频插件"
#: ../plugins/backup-restore/backup-restore.c:96
-msgid "Select name of the Evolution archive"
-msgstr "选择 Evolution 存档名称"
+msgid "Select name of the Evolution backup file"
+msgstr "选择 Evolution 备份文件名称"
#: ../plugins/backup-restore/backup-restore.c:120
msgid "_Restart Evolution after backup"
msgstr "备份后重新启动 Evolution(_R)"
#: ../plugins/backup-restore/backup-restore.c:139
-msgid "Select name of the Evolution archive to restore"
-msgstr "选择要恢复的 Evolution 存档名称"
+msgid "Select name of the Evolution backup file to restore"
+msgstr "选择要恢复的 Evolution 备份文件名称"
#: ../plugins/backup-restore/backup-restore.c:163
msgid "_Restart Evolution after restore"
@@ -14582,14 +14703,14 @@ msgstr "从备份中恢复"
#: ../plugins/backup-restore/backup-restore.c:238
msgid ""
-"You can restore Evolution from your archive. It can restore all the Mails/"
-"Calendars/Tasks/Memos/Addressbook. \n"
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
"It also restores all your personal settings, mail filters etc."
msgstr ""
#: ../plugins/backup-restore/backup-restore.c:244
-msgid "_Restore Evolution from the backup archive"
-msgstr "从备份存档中恢复 Evolution(_R)"
+msgid "_Restore Evolution from the backup file"
+msgstr "从备份文件中恢复 Evolution(_R)"
#: ../plugins/backup-restore/backup-restore.c:251
msgid "Please select an Evolution Archive to restore:"
@@ -14608,16 +14729,16 @@ msgid "Restore Evolution directory"
msgstr "恢复 Evolution 目录"
#: ../plugins/backup-restore/backup.c:44
-msgid "Check Evolution archive"
-msgstr "检查 Evolution 存档"
+msgid "Check Evolution Backup"
+msgstr "检查 Evolution 备份"
#: ../plugins/backup-restore/backup.c:46
msgid "Restart Evolution"
msgstr "重新启动 Evolution"
#: ../plugins/backup-restore/backup.c:48
-msgid "With GUI"
-msgstr "带 GUI"
+msgid "With Graphical User Interface"
+msgstr "带图形用户界面"
#: ../plugins/backup-restore/backup.c:67
#: ../plugins/backup-restore/backup.c:107
@@ -14646,33 +14767,31 @@ msgid "Backup current Evolution data"
msgstr "备份当前 Evolution 数据"
#: ../plugins/backup-restore/backup.c:116
-msgid "Extracting files from the archive"
-msgstr ""
+msgid "Extracting files from backup"
+msgstr "从备份中提取文件"
#: ../plugins/backup-restore/backup.c:122
-#, fuzzy
msgid "Loading Evolution settings"
-msgstr "更改 Evolution 的设置"
+msgstr "装入 Evolution 的设置"
#: ../plugins/backup-restore/backup.c:126
msgid "Removing temporary backup files"
-msgstr ""
+msgstr "删除临时备份文件"
#: ../plugins/backup-restore/backup.c:244
-#, fuzzy, c-format
-msgid "Backing up to %s"
-msgstr "邮寄给 %s"
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "正在备份到文件夹 %s"
#: ../plugins/backup-restore/backup.c:249
-#, fuzzy, c-format
-msgid "Restoring from %s"
-msgstr "删除文件夹 %s"
+#, 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
-#, fuzzy
msgid "Evolution Backup"
-msgstr "Evolution 邮件"
+msgstr "Evolution 备份"
#: ../plugins/backup-restore/backup.c:264
msgid "Evolution Restore"
@@ -14692,8 +14811,9 @@ msgid "Are you sure you want to close Evolution?"
msgstr "您确定要关闭 Evolution 吗?"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Are you sure you want to restore Evolution from the selected archive?"
-msgstr "您确定想要从选中的存档中恢复 Evolution 吗?"
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "您确定想要从选中的备份文件中恢复 Evolution 吗?"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
msgid ""
@@ -14704,12 +14824,12 @@ msgid ""
msgstr ""
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
-msgid "Invalid Evolution archive"
-msgstr "无效的 Evolution 存档"
+msgid "Invalid Evolution backup file"
+msgstr "无效的 Evolution 备份文件"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Please select a valid archive file to restore."
-msgstr "请选择要恢复的有效存档文件。"
+msgid "Please select a valid backup file to restore."
+msgstr "请选择要恢复的有效备份文件。"
#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
msgid ""
@@ -14732,37 +14852,38 @@ msgstr "恢复设置(_E)..."
msgid "_Backup Settings..."
msgstr "备份设置(_B)..."
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:451 ../plugins/bbdb/bbdb.c:460
#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
msgid "Automatic Contacts"
msgstr "自动联系人"
#. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
+#: ../plugins/bbdb/bbdb.c:475
msgid ""
"_Automatically create entries in the addressbook when responding to mail"
msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:481
msgid "Select Address book for Automatic Contacts"
msgstr "选择自动联系人的地址簿"
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:496
msgid "Instant Messaging Contacts"
msgstr "即时通讯联系人"
#. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:511
msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr "定时从 Gaim 好友列表中同步联系人信息和图像"
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
-msgstr "选择 Gaim 好友列表的地址簿"
+#: ../plugins/bbdb/bbdb.c:517
+msgid "Select Address book for Pidgin buddy list"
+msgstr "选择 Pidgin 好友列表的地址簿"
#. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:528
msgid "Synchronize with _buddy list now"
msgstr "立即同步好友列表(_B)"
@@ -14779,7 +14900,7 @@ msgstr ""
msgid "BBDB"
msgstr "BBDB"
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:302
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:305
msgid "Convert mail text to _Unicode"
msgstr "将邮件文本转换为 _Unicode"
@@ -14793,12 +14914,21 @@ msgid ""
"different character sets."
msgstr ""
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+#, fuzzy
+msgid "Bogofilter Options"
+msgstr "记录过滤动作"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr ""
+
#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
msgid "CalDAV"
msgstr "CalDAV"
#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
+#: ../plugins/calendar-http/calendar-http.c:135
msgid "_URL:"
msgstr "_URL:"
@@ -14822,15 +14952,19 @@ msgstr "装入日历"
msgid "Provides core functionality for local calendars."
msgstr "提供本地日历的核心功能。"
-#: ../plugins/calendar-http/calendar-http.c:271
+#: ../plugins/calendar-http/calendar-http.c:273
#: ../plugins/calendar-weather/calendar-weather.c:546
msgid "_Refresh:"
msgstr "刷新(_R):"
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:341
msgid "_Secure connection"
msgstr "安全连接(_S)"
+#: ../plugins/calendar-http/calendar-http.c:406
+msgid "Userna_me:"
+msgstr "用户名(_M):"
+
#: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
msgid "HTTP Calendars"
msgstr "HTTP 日历"
@@ -15036,29 +15170,29 @@ msgstr "文件夹大小"
msgid "Exchange Settings"
msgstr "Exchange 设置"
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:618
msgid "_OWA URL:"
msgstr "_OWA URL:"
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:644
msgid "A_uthenticate"
msgstr "身份验证(_U)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
+#: ../plugins/exchange-operations/exchange-account-setup.c:837
msgid "Authentication Type"
msgstr "身份验证类型"
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:851
msgid "Ch_eck for Supported Types"
msgstr "检查支持的类型(_E)"
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:957
#: ../plugins/exchange-operations/exchange-contacts.c:212
#, c-format
msgid "%s KB"
msgstr "%s KB"
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
+#: ../plugins/exchange-operations/exchange-account-setup.c:959
#: ../plugins/exchange-operations/exchange-contacts.c:214
msgid "0 KB"
msgstr "0 KB"
@@ -15107,67 +15241,113 @@ msgid "Your password will expire in the next %d days"
msgstr "您的密码即将于 %d 后过期"
#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:143
+#: ../plugins/exchange-operations/exchange-delegates-user.c:159
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1559
+#: ../widgets/table/e-table-header-item.c:1558
msgid "Custom"
msgstr "自定义"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:190
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../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.glade.h:1
+msgid "Author (read, create)"
+msgstr "作者(读取、创建)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../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.glade.h:6
msgid "Delegate Permissions"
msgstr "代理权限"
-#: ../plugins/exchange-operations/exchange-delegates-user.c:201
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
#: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
#, c-format
msgid "Permissions for %s"
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
+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."
+msgstr ""
+"这封信是 Evolution 自动发送的,目的在于通知你已经被授权为我的代理人。你现在可以以我的身份发送邮件。"
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+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
+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
+msgid "However you are not permitted to see my private items."
+msgstr "但是你不能查看我的私人项目。"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr "您现在已经被授权为 %s 的代理人"
+
#: ../plugins/exchange-operations/exchange-delegates.c:421
msgid "Delegate To"
msgstr "授权给"
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
#, c-format
msgid "Remove the delegate %s?"
msgstr "删除代理人 %s 吗?"
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
msgid "Could not access Active Directory"
msgstr "无法访问 Active Directory"
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
msgid "Could not find self in Active Directory"
msgstr "无法在 Active Directory 中找到自己"
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
#, c-format
msgid "Could not find delegate %s in Active Directory"
msgstr "无法在 Active Directory 中找到代理人 %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
#, c-format
msgid "Could not remove delegate %s"
msgstr "无法删除代理人 %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
msgid "Could not update list of delegates."
msgstr "无法更新代理人。"
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
#, c-format
msgid "Could not add delegate %s"
msgstr "无法添加代理人 %s"
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
msgid "Error reading delegates list."
msgstr "读取代理人列表出错。"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "作者(读取、创建)"
-
#. Translators: This is used for permissions for <user> for the folder Calendar.
#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
msgid "C_alendar:"
@@ -15182,18 +15362,10 @@ msgstr "联系人(_N):"
msgid "Delegates"
msgstr "代理"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "编辑(读取、创建、编辑)"
-
#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
msgid "Permissions for"
msgstr "权限"
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "复查者(只读)"
-
#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
msgid ""
"These users will be able to send mail on your behalf\n"
@@ -15209,8 +15381,12 @@ msgstr "代理可查看私有项目(_D)"
msgid "_Inbox:"
msgstr "收件箱(_I):"
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "总结权限(_S)"
+
#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
msgid "_Tasks:"
msgstr "任务(_T):"
@@ -15428,9 +15604,21 @@ msgid "Request a _read receipt for this message"
msgstr "这封信需要阅读收条(_R)"
#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "以代表身份发送"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
msgid "_Sensitivity: "
msgstr "敏感度(_S):"
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "用户(_U)"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr ""
+
#: ../plugins/exchange-operations/exchange-user-dialog.c:143
msgid "Select User"
msgstr "选择用户"
@@ -15581,7 +15769,7 @@ msgid "Folder offline"
msgstr "文件夹脱机"
#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1272
+#: ../shell/e-shell.c:1280
msgid "Generic error"
msgstr "常规错误"
@@ -15628,34 +15816,38 @@ msgid "Password successfully changed."
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 ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
msgid "Please make sure the Global Catalog Server name is correct."
msgstr "请确定全局目录服务器名称正确。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
msgid "Please restart Evolution for changes to take effect"
msgstr "请重新启动 Evolution 以便使得更改生效"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
msgid "Please select a user."
msgstr "请选择用户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
msgid "Server rejected password because it is too weak."
msgstr "服务器拒绝了密码,因为该密码的安全级别太低。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
msgid "The Exchange account will be disabled when you quit Evolution"
msgstr "当您退出 Evolution 时,Exchange 账户将被禁用"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
msgid "The Exchange account will be removed when you quit Evolution"
msgstr "当您退出 Evolution 时 Exchange 账户将被删除"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
msgid "The Exchange server is not compatible with Exchange Connector."
msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
msgid ""
"The server is running Exchange 5.5. Exchange Connector \n"
"supports Microsoft Exchange 2000 and 2003 only."
@@ -15663,7 +15855,7 @@ msgstr ""
"服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
"2000 和 2003。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
msgid ""
"This probably means that your server requires \n"
"you to specify the Windows domain name \n"
@@ -15676,81 +15868,87 @@ msgstr ""
"\n"
"或者,您可能拼错了密码。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
msgid "Try again with a different password."
msgstr "请用不同的密码再试一次。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
msgid "Unable to add user to access control list:"
msgstr "无法将用户添加到访问控制列表中:"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
msgid "Unable to edit delegates."
msgstr "无法编辑代理人。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
msgid "Unknown error looking up {0}"
msgstr "查阅 {0} 时发生未知错误"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
msgid "Unknown error."
msgstr "未知错误。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
msgid "Unknown type"
msgstr "未知类型"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
msgid "Unsupported operation"
msgstr "不支持的操作"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
msgid "You are nearing your quota available for storing mail on this server."
msgstr "您即将用完您在此服务器上的存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr ""
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
msgid "You cannot make yourself your own delegate"
msgstr "您不能授权给您自己"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
msgid "You have exceeded your quota for storing mail on this server."
msgstr "您已经超过了在此服务器上存储邮件的配额。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
msgid "You may only configure a single Exchange account."
msgstr "您只能配置单个 Exchange 账户。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
msgid ""
"Your current usage is: {0} KB. Try to clear up some space by deleting some "
"mail."
msgstr "您目前使用了 {0} KB。试着通过删除邮件来清理一些空间。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
msgid ""
"Your current usage is: {0} KB. You will not be able to either send or "
"receive mail now."
msgstr "您目前使用了 {0} KB。您现在既不能发送也不能接收邮件。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
msgid ""
"Your current usage is: {0} KB. You will not be able to send mail until you "
"clear up some space by deleting some mail."
msgstr "您目前使用了 {0} KB。您将无法发送邮件,除非您通过删除邮件来清理空间。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
msgid "Your password has expired."
msgstr "您的密码已经过期。"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
msgid "{0} cannot be added to an access control list"
msgstr "{0} 无法添加到访问控制列表中"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
msgid "{0} is already a delegate"
msgstr "{0} 已被授权"
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
msgid "{0} is already in the list"
msgstr "{0} 已经在列表中"
@@ -15762,6 +15960,33 @@ msgstr "订阅其他用户的任务"
msgid "Check folder permissions"
msgstr "更改文件夹权限"
+#: ../plugins/face/face.c:58
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr ""
+
+#: ../plugins/face/face.c:68
+msgid "PNG files"
+msgstr "PNG 文件"
+
+#: ../plugins/face/face.c:73
+msgid "Select a (48*48) png of size < 720bytes"
+msgstr ""
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+msgid "_Face"
+msgstr "头像(_F)"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+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."
+msgstr ""
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "头像"
+
#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
#, c-format
msgid "Unsubscribing from folder \"%s\""
@@ -15779,7 +16004,7 @@ msgstr "退订文件夹"
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:428
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
msgid "Checklist"
msgstr "待办清单"
@@ -15824,15 +16049,16 @@ msgstr "安装共享文件夹"
msgid "Shared Folder Installation"
msgstr "共享文件夹安装"
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
msgid "Junk Settings"
msgstr "垃圾邮件设置"
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>垃圾邮件设置</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "垃圾邮件设置"
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
msgid "Junk Mail Settings..."
msgstr "垃圾邮件设置..."
@@ -15844,10 +16070,6 @@ msgstr "<b>垃圾邮件列表:</b>"
msgid "Email:"
msgstr "电子邮件:"
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "垃圾邮件设置"
-
#: ../plugins/groupwise-features/junk-settings.glade.h:5
#: ../plugins/mail-account-disable/mail-account-disable.c:46
msgid "_Disable"
@@ -15896,7 +16118,7 @@ msgid "<b>Users:</b>"
msgstr "<b>用户数:</b>"
#: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../widgets/table/e-table-click-to-add.c:507
msgid "Message"
msgstr "消息"
@@ -15996,15 +16218,15 @@ msgstr "%s输入 %s 的密码(用户 %s)"
#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
#. * feature by which one person can send/read mails/appointments using another person's identity
#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:516
+#: ../plugins/groupwise-features/proxy-login.c:521
msgid "_Proxy Login..."
msgstr "代理服务器登录(_P)..."
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:701
msgid "The Proxy tab will be available only when the account is online."
msgstr "代理服务器标签仅当账户联机时才可用。"
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:706
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代理服务器标签仅当账户启用时才可用。"
@@ -16033,56 +16255,56 @@ msgstr "添加"
msgid "Modify"
msgstr "修改"
-#: ../plugins/groupwise-features/status-track.c:103
+#: ../plugins/groupwise-features/status-track.c:105
msgid "Message Status"
msgstr "信件状态"
#. Subject
-#: ../plugins/groupwise-features/status-track.c:117
-msgid "<b>Subject</b> :"
-msgstr "<b>主题</b>:"
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "主题:"
-#: ../plugins/groupwise-features/status-track.c:129
-msgid "<b>From</b> :"
-msgstr "<b>来自</b>:"
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "发件人:"
-#: ../plugins/groupwise-features/status-track.c:142
-msgid "<b>Creation date</b> :"
-msgstr "<b>创建日期</b>:"
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr "创建日期:"
-#: ../plugins/groupwise-features/status-track.c:178
+#: ../plugins/groupwise-features/status-track.c:186
msgid "Recipient: "
msgstr "收件人:"
-#: ../plugins/groupwise-features/status-track.c:185
+#: ../plugins/groupwise-features/status-track.c:193
msgid "Delivered: "
msgstr "已投递:"
-#: ../plugins/groupwise-features/status-track.c:191
+#: ../plugins/groupwise-features/status-track.c:199
msgid "Opened: "
msgstr "已打开:"
-#: ../plugins/groupwise-features/status-track.c:196
+#: ../plugins/groupwise-features/status-track.c:204
msgid "Accepted: "
msgstr "已接受:"
-#: ../plugins/groupwise-features/status-track.c:201
+#: ../plugins/groupwise-features/status-track.c:209
msgid "Deleted: "
msgstr "已删除:"
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:214
msgid "Declined: "
msgstr "已拒绝:"
-#: ../plugins/groupwise-features/status-track.c:211
+#: ../plugins/groupwise-features/status-track.c:219
msgid "Completed: "
msgstr "已完成:"
-#: ../plugins/groupwise-features/status-track.c:216
+#: ../plugins/groupwise-features/status-track.c:224
msgid "Un-delivered: "
msgstr "未投递:"
-#: ../plugins/groupwise-features/status-track.c:241
+#: ../plugins/groupwise-features/status-track.c:249
msgid "Track Message Status..."
msgstr "跟踪信件状态..."
@@ -16094,15 +16316,15 @@ msgstr "设置 Hula 日历源的插件。"
msgid "Hula Account Setup"
msgstr "Hula 账户设置"
-#: ../plugins/imap-features/imap-headers.c:133
+#: ../plugins/imap-features/imap-headers.c:134
msgid "Custom Header"
msgstr "自定义信头"
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:259
msgid "Custom Headers"
msgstr "自定义信头"
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:269
msgid "IMAP Headers"
msgstr "IMAP 信头"
@@ -16111,7 +16333,7 @@ msgid "<b>Custom Headers</b>"
msgstr "<b>自定义信头</b>"
#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
+msgid "<b>IMAP Headers</b>"
msgstr "<b>IMAP 信头</b>"
#: ../plugins/imap-features/imap-headers.glade.h:3
@@ -16189,11 +16411,23 @@ msgstr "导入到日历"
msgid "Imports ICS attachments to calendar."
msgstr "将 ICS 附件导入到日历。"
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:64
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:33
+msgid "Hardware Abstraction Layer not loaded"
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid ""
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:66
+msgid "Search for an iPod failed"
+msgstr "搜索 iPod 失败"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:67
#, fuzzy
msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for an iPod failed</span>\n"
-"\n"
"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 ""
@@ -16218,550 +16452,642 @@ msgstr "同步到 iPod"
msgid "iPod Synchronization"
msgstr "iPod 同步"
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:428
+#: ../plugins/itip-formatter/itip-formatter.c:549
#, c-format
msgid "Failed to load the calendar '%s'"
msgstr "装入日历“%s”失败"
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:569
#, c-format
msgid "An appointment in the calendar '%s' conflicts with this meeting"
msgstr "日历“%s”中的一个约会与此会议冲突"
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:595
#, c-format
msgid "Found the appointment in the calendar '%s'"
msgstr "在日历“%s”中找到了约会"
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:671
msgid "Unable to find any calendars"
msgstr "无法找到任何日历"
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:678
msgid "Unable to find this meeting in any calendar"
msgstr "无法在任何日历中找到此会议"
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:682
msgid "Unable to find this task in any task list"
msgstr "无法在任何任务列表中找到此任务"
-#: ../plugins/itip-formatter/itip-formatter.c:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "无法在任何日记中找到此日记项"
+#: ../plugins/itip-formatter/itip-formatter.c:686
+msgid "Unable to find this memo in any memo list"
+msgstr "无法在任何备忘列表中找到此备忘"
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:759
msgid "Searching for an existing version of this appointment"
msgstr "搜索此约会的已有版本"
-#: ../plugins/itip-formatter/itip-formatter.c:801
+#: ../plugins/itip-formatter/itip-formatter.c:922
msgid "Unable to parse item"
msgstr "无法分析项目"
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:980
#, c-format
msgid "Unable to send item to calendar '%s'. %s"
msgstr "无法将项目发送到日历“%s”。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:871
+#: ../plugins/itip-formatter/itip-formatter.c:992
#, c-format
msgid "Sent to calendar '%s' as accepted"
msgstr "将日历“%s”发送为已接受"
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:996
#, c-format
msgid "Sent to calendar '%s' as tentative"
msgstr "将日历“%s”发送为待定"
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1001
#, c-format
msgid "Sent to calendar '%s' as declined"
msgstr "将日历“%s”发送为已拒绝"
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1006
#, c-format
msgid "Sent to calendar '%s' as canceled"
msgstr "将日历“%s”发送为已取消"
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1100
#, c-format
msgid "Organizer has removed the delegate %s "
msgstr "组织者已经删除了代理人 %s"
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1107
msgid "Sent a cancelation notice to the delegate"
msgstr "已给代理人发送了取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1109
msgid "Could not send the cancelation notice to the delegate"
msgstr "无法给代理人发送取消通知"
-#: ../plugins/itip-formatter/itip-formatter.c:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1194
msgid "Attendee status could not be updated because the status is invalid"
msgstr "出席者状态无法更新,原因是状态无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1221
#, c-format
msgid "Unable to update attendee. %s"
msgstr "无法更新出席者。%s"
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1225
msgid "Attendee status updated"
msgstr "出席者状态已更新"
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1250
+#, fuzzy
+msgid "Meeting information sent"
+msgstr "会议信息"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1253
+#, fuzzy
+msgid "Task information sent"
+msgstr "任务信息"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1256
+#, fuzzy
+msgid "Memo information sent"
+msgstr "没有信息"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1265
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-formatter.c:1268
+#, fuzzy
+msgid "Unable to send task information, the task does not exist"
+msgstr "无法在任何任务列表中找到此任务"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1271
+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
msgid "The calendar attached is not valid"
msgstr "附加的日历无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1347
+#: ../plugins/itip-formatter/itip-formatter.c:1362
msgid ""
"The message claims to contain a calendar, but the calendar is not a valid "
"iCalendar."
msgstr "信件声明其包含日历,但日历不是有效的 iCalendar。"
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1397
+#: ../plugins/itip-formatter/itip-formatter.c:1415
+#: ../plugins/itip-formatter/itip-formatter.c:1496
msgid "The item in the calendar is not valid"
msgstr "日历项无效"
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1497
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:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1427
msgid "The calendar attached contains multiple items"
msgstr "附加的日历包含多个项目"
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1428
msgid ""
"To process all of these items, the file should be saved and the calendar "
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
+#: ../plugins/itip-formatter/itip-formatter.c:2047
+msgid "This meeting recurs"
+msgstr "此会议重现"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2050
+msgid "This task recurs"
+msgstr "此任务重现"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2053
+msgid "This memo recurs"
+msgstr "此备忘重现"
+
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2254
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2264
+#: ../plugins/itip-formatter/itip-formatter.c:2296
msgid "Conflict Search"
msgstr "冲突搜索"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2279
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:187 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:189 ../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:192
+#: ../plugins/itip-formatter/itip-view.c:194
msgid "Today %H:%M"
msgstr "今天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:198
msgid "Today %H:%M:%S"
msgstr "今天 %H:%M:%S"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:205
+#: ../plugins/itip-formatter/itip-view.c:207
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:215
+#: ../plugins/itip-formatter/itip-view.c:217
msgid "Tomorrow"
msgstr "明天"
#. strftime format of a time,
#. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:220
+#: ../plugins/itip-formatter/itip-view.c:222
msgid "Tomorrow %H:%M"
msgstr "明天 %H:%M"
#. strftime format of a time,
#. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:226
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:229
+#: ../plugins/itip-formatter/itip-view.c:231
msgid "Tomorrow %l:%M %p"
msgstr "明天%p%l:%M"
#. strftime format of a time,
#. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:235
msgid "Tomorrow %l:%M:%S %p"
msgstr "明天%p%l:%M:%S"
#. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:252
+#: ../plugins/itip-formatter/itip-view.c:254
#, 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:257
+#: ../plugins/itip-formatter/itip-view.c:259
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:261
+#: ../plugins/itip-formatter/itip-view.c:263
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:266
+#: ../plugins/itip-formatter/itip-view.c:268
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:270
+#: ../plugins/itip-formatter/itip-view.c:272
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:279
+#: ../plugins/itip-formatter/itip-view.c:281
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:285
+#: ../plugins/itip-formatter/itip-view.c:287
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:289
+#: ../plugins/itip-formatter/itip-view.c:291
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:294
+#: ../plugins/itip-formatter/itip-view.c:296
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:298
+#: ../plugins/itip-formatter/itip-view.c:300
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:304
+#: ../plugins/itip-formatter/itip-view.c:306
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:309
+#: ../plugins/itip-formatter/itip-view.c:311
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:313
+#: ../plugins/itip-formatter/itip-view.c:315
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:318
+#: ../plugins/itip-formatter/itip-view.c:320
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:322
+#: ../plugins/itip-formatter/itip-view.c:324
msgid "%A, %B %e, %Y %l:%M:%S %p"
msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
-#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:525
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:527
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:356
#, 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:349
+#: ../plugins/itip-formatter/itip-view.c:358
#, c-format
msgid "<b>%s</b> has published the following meeting information:"
msgstr "<b>%s</b> 发布了会议信息:"
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:363
#, c-format
msgid "<b>%s</b> has delegated the following meeting to you:"
msgstr "<b>%s</b> 为您代理了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:357
+#: ../plugins/itip-formatter/itip-view.c:366
#, 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:359
+#: ../plugins/itip-formatter/itip-view.c:368
#, c-format
msgid "<b>%s</b> requests your presence at the following meeting:"
msgstr "<b>%s</b> 请求您参加下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:374
#, 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:367
+#: ../plugins/itip-formatter/itip-view.c:376
#, c-format
msgid "<b>%s</b> wishes to add to an existing meeting:"
msgstr "<b>%s</b> 希望加入到已有的会议:"
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:380
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> 希望接收到下列会议的最新信息:"
+
+#: ../plugins/itip-formatter/itip-view.c:382
#, 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:373
+#: ../plugins/itip-formatter/itip-view.c:386
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> 发回了下列会议请求的响应:"
+
+#: ../plugins/itip-formatter/itip-view.c:388
#, c-format
msgid "<b>%s</b> has sent back the following meeting response:"
msgstr "<b>%s</b> 发回了下列会议请求的响应:"
-#: ../plugins/itip-formatter/itip-view.c:377
+#: ../plugins/itip-formatter/itip-view.c:392
#, c-format
msgid "<b>%s</b> through %s has canceled the following meeting:"
msgstr "<b>%s</b> 通过 %s 取消了下列会议:"
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:394
#, c-format
msgid "<b>%s</b> has canceled the following meeting."
msgstr "<b>%s</b> 取消了下列会议。"
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:398
+#, fuzzy, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> 提议了下列会议变更。"
+
+#: ../plugins/itip-formatter/itip-view.c:400
#, c-format
msgid "<b>%s</b> has proposed the following meeting changes."
msgstr "<b>%s</b> 提议了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:404
#, 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:388
+#: ../plugins/itip-formatter/itip-view.c:406
#, c-format
msgid "<b>%s</b> has declined the following meeting changes."
msgstr "<b>%s</b> 拒绝了下列会议变更。"
-#: ../plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:444
#, c-format
msgid "<b>%s</b> through %s has published the following task:"
msgstr "<b>%s</b> 通过 %s 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:446
#, c-format
msgid "<b>%s</b> has published the following task:"
msgstr "<b>%s</b> 发布了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:422
+#: ../plugins/itip-formatter/itip-view.c:451
#, 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:425
+#: ../plugins/itip-formatter/itip-view.c:454
#, c-format
msgid "<b>%s</b> through %s has assigned you a task:"
msgstr "<b>%s</b> 通过 %s 为您分配了下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:456
#, c-format
msgid "<b>%s</b> has assigned you a task:"
msgstr "<b>%s</b> 为您分配了一个任务:"
-#: ../plugins/itip-formatter/itip-view.c:433
+#: ../plugins/itip-formatter/itip-view.c:462
#, 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:435
+#: ../plugins/itip-formatter/itip-view.c:464
#, c-format
msgid "<b>%s</b> wishes to add to an existing task:"
msgstr "<b>%s<b> 希望加入到已存在的任务:"
-#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:468
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息:"
+
+#: ../plugins/itip-formatter/itip-view.c:470
#, 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:441
+#: ../plugins/itip-formatter/itip-view.c:474
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> 发回了下列分配任务的回应:"
+
+#: ../plugins/itip-formatter/itip-view.c:476
#, c-format
msgid "<b>%s</b> has sent back the following assigned task response:"
msgstr "<b>%s</b> 发回了下列分配任务的回应:"
-#: ../plugins/itip-formatter/itip-view.c:445
+#: ../plugins/itip-formatter/itip-view.c:480
#, 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:447
+#: ../plugins/itip-formatter/itip-view.c:482
#, c-format
msgid "<b>%s</b> has canceled the following assigned task:"
msgstr "<b>%s</b> 取消分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:450
+#: ../plugins/itip-formatter/itip-view.c:486
+#, fuzzy, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> 提议了下列任务分配变更:"
+
+#: ../plugins/itip-formatter/itip-view.c:488
#, c-format
msgid "<b>%s</b> has proposed the following task assignment changes:"
msgstr "<b>%s</b> 提议了下列任务分配变更:"
-#: ../plugins/itip-formatter/itip-view.c:454
+#: ../plugins/itip-formatter/itip-view.c:492
#, 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:456
+#: ../plugins/itip-formatter/itip-view.c:494
#, c-format
msgid "<b>%s</b> has declined the following assigned task:"
msgstr "<b>%s</b> 拒绝了分配的下列任务:"
-#: ../plugins/itip-formatter/itip-view.c:483
+#: ../plugins/itip-formatter/itip-view.c:532
#, c-format
msgid "<b>%s</b> through %s has published the following memo:"
msgstr "<b>%s</b> 通过 %s 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:534
#, c-format
msgid "<b>%s</b> has published the following memo:"
msgstr "<b>%s</b> 发布了下列备忘:"
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:539
#, 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:492
+#: ../plugins/itip-formatter/itip-view.c:541
#, c-format
msgid "<b>%s</b> wishes to add to an existing memo:"
msgstr "<b>%s</b> 希望加入到已有的备忘中:"
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:545
#, 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:498
+#: ../plugins/itip-formatter/itip-view.c:547
#, 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:762
+#: ../plugins/itip-formatter/itip-view.c:815
msgid "_Open Calendar"
msgstr "打开日历(_O)"
-#: ../plugins/itip-formatter/itip-view.c:768
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:778
-#: ../plugins/itip-formatter/itip-view.c:795
-#: ../plugins/itip-formatter/itip-view.c:800
+#: ../plugins/itip-formatter/itip-view.c:821
+#: ../plugins/itip-formatter/itip-view.c:825
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:853
msgid "_Decline"
msgstr "拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:769
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:781
-#: ../plugins/itip-formatter/itip-view.c:797
-#: ../plugins/itip-formatter/itip-view.c:802
+#: ../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
msgid "_Accept"
msgstr "接受(_A)"
-#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:825
msgid "_Decline all"
msgstr "全部拒绝(_D)"
-#: ../plugins/itip-formatter/itip-view.c:773
+#: ../plugins/itip-formatter/itip-view.c:826
msgid "_Tentative all"
msgstr "全部待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:773
-#: ../plugins/itip-formatter/itip-view.c:779
-#: ../plugins/itip-formatter/itip-view.c:796
-#: ../plugins/itip-formatter/itip-view.c:801
+#: ../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
msgid "_Tentative"
msgstr "待定(_T)"
-#: ../plugins/itip-formatter/itip-view.c:774
+#: ../plugins/itip-formatter/itip-view.c:827
msgid "_Accept all"
msgstr "全部接受(_A)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:838
msgid "_Send Information"
msgstr "发送信息(_S)"
#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:789
+#: ../plugins/itip-formatter/itip-view.c:842
msgid "_Update Attendee Status"
msgstr "更新与会者状态(_U)"
-#: ../plugins/itip-formatter/itip-view.c:792
+#: ../plugins/itip-formatter/itip-view.c:845
msgid "_Update"
msgstr "更新(_U)"
#. Start time
-#: ../plugins/itip-formatter/itip-view.c:951
+#: ../plugins/itip-formatter/itip-view.c:1006
msgid "Start time:"
msgstr "开始时间:"
#. End time
-#: ../plugins/itip-formatter/itip-view.c:960
+#: ../plugins/itip-formatter/itip-view.c:1015
msgid "End time:"
msgstr "结束时间:"
#. Comment
-#: ../plugins/itip-formatter/itip-view.c:976
-#: ../plugins/itip-formatter/itip-view.c:1026
+#: ../plugins/itip-formatter/itip-view.c:1031
+#: ../plugins/itip-formatter/itip-view.c:1081
msgid "Comment:"
msgstr "注释:"
-#: ../plugins/itip-formatter/itip-view.c:1012
+#: ../plugins/itip-formatter/itip-view.c:1067
msgid "Send _reply to sender"
msgstr "回复发件人(_R)"
-#: ../plugins/itip-formatter/itip-view.c:1040
+#: ../plugins/itip-formatter/itip-view.c:1095
msgid "Send _updates to attendees"
msgstr "给出席者发送更新(_U)"
-#: ../plugins/itip-formatter/itip-view.c:1049
+#: ../plugins/itip-formatter/itip-view.c:1104
msgid "_Apply to all instances"
msgstr "应用到全部实例(_A)"
-#: ../plugins/itip-formatter/itip-view.c:1718
+#: ../plugins/itip-formatter/itip-view.c:1835
msgid "_Tasks :"
msgstr "任务(_T):"
-#: ../plugins/itip-formatter/itip-view.c:1720
+#: ../plugins/itip-formatter/itip-view.c:1837
msgid "Memos :"
msgstr "备忘:"
@@ -16816,17 +17142,13 @@ msgstr ""
msgid "When the new-mail status icon is visible, make it blink."
msgstr ""
-#: ../plugins/mail-notification/mail-notification.c:108
+#: ../plugins/mail-notification/mail-notification.c:132
#, c-format
msgid "You have received %d new message in %s."
-msgstr ""
-
-#: ../plugins/mail-notification/mail-notification.c:108
-#, c-format
-msgid "You have received %d new messages in %s."
-msgstr ""
+msgid_plural "You have received %d new messages in %s."
+msgstr[0] ""
-#: ../plugins/mail-notification/mail-notification.c:130
+#: ../plugins/mail-notification/mail-notification.c:153
msgid "New email"
msgstr "新电子邮件"
@@ -16836,8 +17158,8 @@ msgstr "邮件通知"
#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
msgid ""
-"Notifies the user with tray icon and a notify message whenever a new message "
-"is arrived."
+"Notifies the user with an icon in notification area and a notification "
+"message whenever a new message has arrived."
msgstr ""
#: ../plugins/mail-remote/client.c:30
@@ -17110,7 +17432,7 @@ msgstr "管理插件是启用还是禁用的插件。"
#. Setup the ui
#: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:223
msgid "Plugin Manager"
msgstr "插件管理器"
@@ -17122,22 +17444,26 @@ msgstr "启用和禁用插件"
msgid "_Plugins"
msgstr "插件(_P)"
-#: ../plugins/plugin-manager/plugin-manager.c:53
+#: ../plugins/plugin-manager/plugin-manager.c:55
msgid "Author(s)"
msgstr "作者"
-#: ../plugins/plugin-manager/plugin-manager.c:54
+#: ../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
msgid "Description"
msgstr "描述"
-#: ../plugins/plugin-manager/plugin-manager.c:215
+#: ../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:268
-#: ../plugins/plugin-manager/plugin-manager.c:327
+#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:350
msgid "Plugin"
msgstr "插件"
@@ -17174,8 +17500,8 @@ msgid "Only ever show PLAIN"
msgstr "仅显示纯文本"
#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "HTML 模式"
+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"
@@ -17326,6 +17652,10 @@ msgstr "使用垃圾克星过滤垃圾邮件。此插件需要安装 Spamassassi
msgid "SpamAssassin junk plugin"
msgstr "垃圾克星插件"
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "垃圾克星选项"
+
#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
msgid "A plugin for saving all attachments or parts of a message at once."
msgstr "一次保存全部附件或信件的不同部分的插件。"
@@ -17550,8 +17880,17 @@ msgstr "基于主题按线索编排信件列表"
#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
#: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
-msgstr "默认按照主体对线索中的信件排序(_J)"
+msgid "F_all back to threading messages by subject"
+msgstr "默认按照主题对线索中的信件排序(_A)"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr ""
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+#, fuzzy
+msgid "TNEF Attachment decoder"
+msgstr "无附件"
#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
msgid "Evolution Shell"
@@ -17783,45 +18122,45 @@ msgstr "文件夹名不能含有字符“#”。"
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
-#: ../shell/e-shell-window-commands.c:76
+#: ../shell/e-shell-window-commands.c:77
msgid "The GNOME Pilot tools do not appear to be installed on this system."
msgstr "GNOME Pilot 工具好像并未安装到系统中。"
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
#, c-format
msgid "Error executing %s."
msgstr "执行 %s 错误。"
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
msgid "Bug buddy is not installed."
msgstr "未安装 Bug buddy。"
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
msgid "Bug buddy could not be run."
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:575
+#: ../shell/e-shell-window-commands.c:584
msgid "translator-credits"
msgstr ""
"开源软件国际化之简体中文组\n"
"http://i18n.linux.net.cn"
-#: ../shell/e-shell-window-commands.c:586
+#: ../shell/e-shell-window-commands.c:595
msgid "Evolution Website"
msgstr "Evolution 网站"
-#: ../shell/e-shell-window-commands.c:793
+#: ../shell/e-shell-window-commands.c:803
msgid "_Work Online"
msgstr "联机工作(_W)"
-#: ../shell/e-shell-window-commands.c:806 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:816 ../ui/evolution.xml.h:57
msgid "_Work Offline"
msgstr "脱机工作(_W)"
-#: ../shell/e-shell-window-commands.c:819
+#: ../shell/e-shell-window-commands.c:829
msgid "Work Offline"
msgstr "脱机工作"
@@ -17837,33 +18176,33 @@ msgstr "Evolution 正在脱机过程中。"
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
-#: ../shell/e-shell-window.c:820
+#: ../shell/e-shell-window.c:823
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell.c:636
+#: ../shell/e-shell.c:637
msgid "Uknown system error."
msgstr "未知的系统错误。"
-#: ../shell/e-shell.c:832 ../shell/e-shell.c:833
+#: ../shell/e-shell.c:833 ../shell/e-shell.c:834
#, c-format
msgid "%ld KB"
msgstr "%ld KB"
-#: ../shell/e-shell.c:1264 ../widgets/misc/e-cell-date-edit.c:255
+#: ../shell/e-shell.c:1272 ../widgets/misc/e-cell-date-edit.c:255
msgid "OK"
msgstr "确定"
-#: ../shell/e-shell.c:1266
+#: ../shell/e-shell.c:1274
msgid "Invalid arguments"
msgstr "无效参数"
-#: ../shell/e-shell.c:1268
+#: ../shell/e-shell.c:1276
msgid "Cannot register on OAF"
msgstr "无法注册到 OAF"
-#: ../shell/e-shell.c:1270
+#: ../shell/e-shell.c:1278
msgid "Configuration Database not found"
msgstr "找不到配置数据库"
@@ -17991,11 +18330,15 @@ msgstr "把所有成员的调试输出发送到一个文件中。"
msgid "Disable loading of any plugins."
msgstr "禁止装入任何插件。"
-#: ../shell/main.c:501
+#: ../shell/main.c:474
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "禁用邮件、联系人和任务的预览面板。"
+
+#: ../shell/main.c:503
msgid "- The Evolution PIM and Email Client"
msgstr "- Evolution 个人信息管理和邮件客户"
-#: ../shell/main.c:514
+#: ../shell/main.c:516
#, c-format
msgid ""
"%s: --online and --offline cannot be used together.\n"
@@ -18738,7 +19081,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:2715
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2717
msgid "Select All"
msgstr "全选"
@@ -18813,7 +19156,7 @@ msgstr "将联系人移至(_M)..."
msgid "_Move Folder Contacts To"
msgstr "将文件夹联系人移至(_M)"
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
msgid "_New"
msgstr "新建(_N)"
@@ -19027,11 +19370,11 @@ 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:42
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:44
msgid "_File"
msgstr "文件(_F)"
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:46
msgid "_Help"
msgstr "帮助(_H)"
@@ -19733,7 +20076,7 @@ msgstr "选中所有文字(_A)"
msgid "Select all the text in a message"
msgstr "选中信件中的全部文本"
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:25
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
@@ -20298,42 +20641,46 @@ msgid "New _Window"
msgstr "新建窗口(_W)"
#: ../ui/evolution.xml.h:19
+msgid "Page Set_up..."
+msgstr "页面设置(_U)..."
+
+#: ../ui/evolution.xml.h:20
msgid "Prefere_nces"
msgstr "首选项(_N)"
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:21
msgid "Send / Receive"
msgstr "发送/接收"
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:22
msgid "Send / _Receive"
msgstr "发送/接收(_R)"
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:23
msgid "Send queued items and retrieve new items"
msgstr "发送队列中的的邮件并收取新邮件"
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:24
msgid "Set up Pilot configuration"
msgstr "配置 Pilot"
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:26
msgid "Show Side _Bar"
msgstr "显示侧边栏(_B)"
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:27
msgid "Show _Status Bar"
msgstr "显示状态栏(_S)"
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
msgid "Show _Toolbar"
msgstr "显示工具栏(_T)"
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
msgid "Submit Bug Report"
msgstr "提交错误报告"
@@ -20341,71 +20688,71 @@ msgstr "提交错误报告"
#. _label="Evolution _FAQ"/>
#.
#. <separator/>
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:35
msgid "Submit _Bug Report"
msgstr "提交错误报告(_B)"
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:36
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:37
msgid "Toggle whether we are working offline."
msgstr "切换是否脱机工作。"
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:38
msgid "Tool_bar style"
msgstr "工具栏样式(_B)"
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:39
msgid "View/Hide the Side Bar"
msgstr "查看/隐藏侧边栏"
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:40
msgid "View/Hide the Status Bar"
msgstr "查看/隐藏状态栏"
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:41
msgid "_About"
msgstr "关于(_A)"
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution.xml.h:42
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:45
msgid "_Forget Passwords"
msgstr "丢弃密码(_F)"
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:47
msgid "_Hide buttons"
msgstr "隐藏按钮(_H)"
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:48
msgid "_Icons only"
msgstr "只有图标(_I)"
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:50
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:51
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:52
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:53
msgid "_Synchronization Options..."
msgstr "同步选项(_S)..."
-#: ../ui/evolution.xml.h:52
+#: ../ui/evolution.xml.h:54
msgid "_Text only"
msgstr "只有文字(_T)"
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:56
msgid "_Window"
msgstr "窗口(_W)"
@@ -20519,19 +20866,19 @@ msgstr ""
"用鼠标左键放大地图的某个区域并选择时区。\n"
"用鼠标右键缩小。"
-#: ../widgets/menus/gal-define-views-dialog.c:84
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
msgid "Collection"
msgstr "收藏"
-#: ../widgets/menus/gal-define-views-dialog.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:360
#: ../widgets/menus/gal-define-views.glade.h:4
#, no-c-format
msgid "Define Views for %s"
msgstr "定义 %s 的视图"
-#: ../widgets/menus/gal-define-views-dialog.c:374
-#: ../widgets/menus/gal-define-views-dialog.c:376
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
msgid "Define Views"
msgstr "定义视图"
@@ -20540,18 +20887,18 @@ msgstr "定义视图"
msgid "Define Views for \"%s\""
msgstr "定义“%s”的视图"
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1912
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1910
+#: ../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:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:179
msgid "Instance"
msgstr "实例"
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:229
msgid "Save Current View"
msgstr "保存当前视图"
@@ -20564,16 +20911,16 @@ msgid "_Replace existing view"
msgstr "替换现有视图(_R)"
#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-instance.c:582
#: ../widgets/menus/gal-view-menus.c:354
msgid "Custom View"
msgstr "当前视图"
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
msgid "Save Custom View"
msgstr "保存自定义视图"
-#: ../widgets/menus/gal-view-instance.c:592
+#: ../widgets/menus/gal-view-instance.c:587
#: ../widgets/menus/gal-view-menus.c:378
msgid "Define Views..."
msgstr "定义视图..."
@@ -20603,11 +20950,11 @@ msgstr "保存当前自定义视图"
msgid "Create or edit views"
msgstr "创建或编辑视图"
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-new-dialog.c:72
msgid "Factory"
msgstr "工厂"
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
msgid "Define New View"
msgstr "定义新视图"
@@ -20623,7 +20970,7 @@ msgstr "视图类型"
msgid "Type of view:"
msgstr "视图类型:"
-#: ../widgets/misc/e-attachment-bar.c:1019
+#: ../widgets/misc/e-attachment-bar.c:1031
msgid "Attachment Bar"
msgstr "附件栏"
@@ -20670,66 +21017,66 @@ msgstr "%Y年%B"
msgid "Month Calendar"
msgstr "月历"
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236 ../widgets/text/e-text.c:3565
-#: ../widgets/text/e-text.c:3566
+#: ../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
msgid "Fill color"
msgstr "填充颜色"
-#: ../widgets/misc/e-canvas-background.c:464
-#: ../widgets/misc/e-canvas-background.c:465
-#: ../widgets/misc/e-canvas-background.c:471
-#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1242
-#: ../widgets/text/e-entry.c:1243 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3572
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3580
-#: ../widgets/text/e-text.c:3581
+#: ../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
msgid "GDK fill color"
msgstr "GDK 填充颜色"
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257 ../widgets/text/e-text.c:3587
-#: ../widgets/text/e-text.c:3588
+#: ../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
msgid "Fill stipple"
msgstr "点绘填充"
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
msgid "X1"
msgstr "X1"
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
msgid "X2"
msgstr "X2"
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
msgid "Y1"
msgstr "Y1"
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
msgid "Y2"
msgstr "Y2"
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../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:3015
msgid "Minimum width"
msgstr "最小宽度"
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../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:3016
msgid "Minimum Width"
msgstr "最小宽度"
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
#: ../widgets/misc/e-expander.c:206
msgid "Spacing"
msgstr "间距"
@@ -20914,11 +21261,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:3351
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3354
msgid "Expander Size"
msgstr "扩展器大小"
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3352
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3355
msgid "Size of the expander arrow"
msgstr "扩展器箭头的大小"
@@ -21005,15 +21352,15 @@ msgstr "同步私有记录:"
msgid "Sync Categories:"
msgstr "同步类别:"
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
msgid "Empty message"
msgstr "空信件"
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
msgid "Reflow model"
msgstr "回流模型"
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
msgid "Column width"
msgstr "列宽"
@@ -21033,9 +21380,9 @@ msgstr "清除(_C)"
msgid "Item ID"
msgstr "项目 ID"
-#: ../widgets/misc/e-search-bar.c:865 ../widgets/text/e-entry.c:1221
-#: ../widgets/text/e-entry.c:1222 ../widgets/text/e-text.c:3487
-#: ../widgets/text/e-text.c:3488
+#: ../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
msgid "Text"
msgstr "文字"
@@ -21057,25 +21404,25 @@ msgstr "搜索(_C):"
msgid " i_n "
msgstr " 于(_N) "
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
msgid "Cursor Row"
msgstr "光标行"
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
msgid "Cursor Column"
msgstr "光标列"
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
msgid "Sorter"
msgstr "排序"
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
msgid "Selection Mode"
msgstr "选择模式"
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
msgid "Cursor Mode"
msgstr "光标模式"
@@ -21244,43 +21591,43 @@ msgstr "可用类别(_A):"
msgid "categories"
msgstr "类别"
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
msgid "popup list"
msgstr "弹出列表"
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
msgid "%l:%M %p"
msgstr "%p%l:%M"
-#: ../widgets/table/e-cell-pixbuf.c:387
+#: ../widgets/table/e-cell-pixbuf.c:383
msgid "Selected Column"
msgstr "选中列"
-#: ../widgets/table/e-cell-pixbuf.c:394
+#: ../widgets/table/e-cell-pixbuf.c:390
msgid "Focused Column"
msgstr "聚焦列"
-#: ../widgets/table/e-cell-pixbuf.c:401
+#: ../widgets/table/e-cell-pixbuf.c:397
msgid "Unselected Column"
msgstr "未选列"
-#: ../widgets/table/e-cell-text.c:1802
+#: ../widgets/table/e-cell-text.c:1803
msgid "Strikeout Column"
msgstr "给列加删除线"
-#: ../widgets/table/e-cell-text.c:1809
+#: ../widgets/table/e-cell-text.c:1810
msgid "Underline Column"
msgstr "给列加下划线"
-#: ../widgets/table/e-cell-text.c:1816
+#: ../widgets/table/e-cell-text.c:1817
msgid "Bold Column"
msgstr "给列加粗"
-#: ../widgets/table/e-cell-text.c:1823
+#: ../widgets/table/e-cell-text.c:1824
msgid "Color Column"
msgstr "给列着色"
-#: ../widgets/table/e-cell-text.c:1837
+#: ../widgets/table/e-cell-text.c:1838
msgid "BG Color Column"
msgstr "给列着背景色"
@@ -21295,7 +21642,7 @@ 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:1580
+#: ../widgets/table/e-table-header-item.c:1579
msgid "Ascending"
msgstr "升序"
@@ -21306,7 +21653,7 @@ 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:1580
+#: ../widgets/table/e-table-header-item.c:1579
msgid "Descending"
msgstr "降序"
@@ -21330,7 +21677,7 @@ msgid "Sh_ow these fields in order:"
msgstr "按顺序显示这些域(_O):"
#: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.c:641
#: ../widgets/table/e-table-config.glade.h:10
msgid "Show Fields"
msgstr "显示域"
@@ -21369,27 +21716,27 @@ msgstr "显示的域(_F)..."
msgid "_Sort..."
msgstr "排序(_S)..."
-#: ../widgets/table/e-table-config.c:154
+#: ../widgets/table/e-table-config.c:152
msgid "State"
msgstr "状态"
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
msgid "(Ascending)"
msgstr "(升序)"
-#: ../widgets/table/e-table-config.c:387 ../widgets/table/e-table-config.c:429
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
msgid "(Descending)"
msgstr "(降序)"
-#: ../widgets/table/e-table-config.c:394
+#: ../widgets/table/e-table-config.c:392
msgid "Not sorted"
msgstr "未排序"
-#: ../widgets/table/e-table-config.c:435
+#: ../widgets/table/e-table-config.c:433
msgid "No grouping"
msgstr "未分组"
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:662
msgid "Available Fields"
msgstr "可用域"
@@ -21401,21 +21748,21 @@ msgstr "分组依据(_G)..."
msgid "_Show these fields in order:"
msgstr "按顺序显示这些域(_S):"
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1877
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:636
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1875
msgid "DnD code"
msgstr "拖放代码"
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1891
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:643
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1889
msgid "Full Header"
msgstr "完整标题"
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
msgid "Add a column..."
msgstr "添加一列..."
@@ -21441,301 +21788,301 @@ msgid "%s (%d item)"
msgid_plural "%s (%d items)"
msgstr[0] "%s (%d 项)"
+#: ../widgets/table/e-table-group-container.c:896
#: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
#: ../widgets/table/e-table-group-leaf.c:573
-#: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2973 ../widgets/table/e-table-item.c:2974
msgid "Alternating Row Colors"
msgstr "交替行色"
+#: ../widgets/table/e-table-group-container.c:903
#: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
#: ../widgets/table/e-table-group-leaf.c:580
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3304 ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-table-item.c:2980 ../widgets/table/e-table-item.c:2981
+#: ../widgets/table/e-tree.c:3307 ../widgets/table/e-tree.c:3308
msgid "Horizontal Draw Grid"
msgstr "水平绘制网格"
+#: ../widgets/table/e-table-group-container.c:910
#: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
#: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3310 ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-table-item.c:2987 ../widgets/table/e-table-item.c:2988
+#: ../widgets/table/e-tree.c:3313 ../widgets/table/e-tree.c:3314
msgid "Vertical Draw Grid"
msgstr "垂直绘制网格"
+#: ../widgets/table/e-table-group-container.c:917
#: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
#: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3316 ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-table-item.c:2994 ../widgets/table/e-table-item.c:2995
+#: ../widgets/table/e-tree.c:3319 ../widgets/table/e-tree.c:3320
msgid "Draw focus"
msgstr "绘制焦点"
+#: ../widgets/table/e-table-group-container.c:924
#: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
#: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3001 ../widgets/table/e-table-item.c:3002
msgid "Cursor mode"
msgstr "光标模式"
+#: ../widgets/table/e-table-group-container.c:931
#: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
#: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2966 ../widgets/table/e-table-item.c:2967
msgid "Selection model"
msgstr "选择模型"
+#: ../widgets/table/e-table-group-container.c:938
#: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
#: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3312 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table-item.c:3008 ../widgets/table/e-table-item.c:3009
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3301
+#: ../widgets/table/e-tree.c:3302
msgid "Length Threshold"
msgstr "长度阀值"
+#: ../widgets/table/e-table-group-container.c:945
#: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
#: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3319 ../widgets/table/e-tree.c:3330
-#: ../widgets/table/e-tree.c:3331
+#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
msgid "Uniform row height"
msgstr "统一行高"
+#: ../widgets/table/e-table-group-container.c:952
#: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
#: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
msgid "Frozen"
msgstr "冻结"
-#: ../widgets/table/e-table-header-item.c:1457
+#: ../widgets/table/e-table-header-item.c:1456
msgid "Customize Current View"
msgstr "自定义当前视图"
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1476
msgid "Sort _Ascending"
msgstr "升序排序(_A)"
-#: ../widgets/table/e-table-header-item.c:1478
+#: ../widgets/table/e-table-header-item.c:1477
msgid "Sort _Descending"
msgstr "降序排序(_D)"
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1478
msgid "_Unsort"
msgstr "未排序(_U)"
-#: ../widgets/table/e-table-header-item.c:1481
+#: ../widgets/table/e-table-header-item.c:1480
msgid "Group By This _Field"
msgstr "按该域分组(_F)"
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1481
msgid "Group By _Box"
msgstr "按方框分组(_B)"
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1483
msgid "Remove This _Column"
msgstr "删除该列(_C)"
-#: ../widgets/table/e-table-header-item.c:1485
+#: ../widgets/table/e-table-header-item.c:1484
msgid "Add a C_olumn..."
msgstr "添加一列(_O)..."
-#: ../widgets/table/e-table-header-item.c:1487
+#: ../widgets/table/e-table-header-item.c:1486
msgid "A_lignment"
msgstr "对齐(_L)"
-#: ../widgets/table/e-table-header-item.c:1488
+#: ../widgets/table/e-table-header-item.c:1487
msgid "B_est Fit"
msgstr "最佳匹配(_E)"
-#: ../widgets/table/e-table-header-item.c:1489
+#: ../widgets/table/e-table-header-item.c:1488
msgid "Format Column_s..."
msgstr "格式化列(_S)..."
-#: ../widgets/table/e-table-header-item.c:1491
+#: ../widgets/table/e-table-header-item.c:1490
msgid "Custo_mize Current View..."
msgstr "自定义当前视图(_M)..."
-#: ../widgets/table/e-table-header-item.c:1541
+#: ../widgets/table/e-table-header-item.c:1540
msgid "Sort By"
msgstr "排序方式"
-#: ../widgets/table/e-table-header-item.c:1884
+#: ../widgets/table/e-table-header-item.c:1882
msgid "Font Description"
msgstr "字体描述"
-#: ../widgets/table/e-table-header-item.c:1905
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1903
+#: ../widgets/table/e-table-sorter.c:173
msgid "Sort Info"
msgstr "排序信息"
-#: ../widgets/table/e-table-header-item.c:1919
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1917
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
msgid "Tree"
msgstr "树"
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2952 ../widgets/table/e-table-item.c:2953
msgid "Table header"
msgstr "表头"
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2959 ../widgets/table/e-table-item.c:2960
msgid "Table model"
msgstr "表格模型"
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
msgid "Cursor row"
msgstr "光标行"
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3340
+#: ../widgets/table/e-tree.c:3341
msgid "Always search"
msgstr "总是搜索"
-#: ../widgets/table/e-table.c:3333
+#: ../widgets/table/e-table.c:3328
msgid "Use click to add"
msgstr "单击可添加"
-#: ../widgets/table/e-tree.c:3323 ../widgets/table/e-tree.c:3324
+#: ../widgets/table/e-tree.c:3326 ../widgets/table/e-tree.c:3327
msgid "ETree table adapter"
msgstr "ETree 表格适配器"
-#: ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-tree.c:3347
msgid "Retro Look"
msgstr "火箭外观"
-#: ../widgets/table/e-tree.c:3345
+#: ../widgets/table/e-tree.c:3348
msgid "Draw lines and +/- expanders."
msgstr "绘制行和 +/- 扩展柄。"
-#: ../widgets/text/e-entry.c:1214 ../widgets/text/e-entry.c:1215
-#: ../widgets/text/e-text.c:3480 ../widgets/text/e-text.c:3481
+#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
+#: ../widgets/text/e-text.c:3552 ../widgets/text/e-text.c:3553
msgid "Event Processor"
msgstr "事件处理器"
-#: ../widgets/text/e-entry.c:1228 ../widgets/text/e-entry.c:1229
-#: ../widgets/text/e-text.c:3516 ../widgets/text/e-text.c:3517
+#: ../widgets/text/e-entry.c:1223 ../widgets/text/e-entry.c:1224
+#: ../widgets/text/e-text.c:3588 ../widgets/text/e-text.c:3589
msgid "Justification"
msgstr "两端对齐"
-#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-entry.c:1265 ../widgets/text/e-entry.c:1266
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
msgid "Use ellipsis"
msgstr "使用椭圆"
-#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
msgid "Ellipsis"
msgstr "椭圆"
-#: ../widgets/text/e-entry.c:1284 ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
msgid "Line wrap"
msgstr "换行"
-#: ../widgets/text/e-entry.c:1291 ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
msgid "Break characters"
msgstr "换行字符"
-#: ../widgets/text/e-entry.c:1298 ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3644 ../widgets/text/e-text.c:3645
+#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
msgid "Max lines"
msgstr "最多行数"
-#: ../widgets/text/e-entry.c:1305 ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../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:1312 ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
+#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
+#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
msgid "Draw borders"
msgstr "绘制边框"
-#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
+#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
msgid "Draw background"
msgstr "绘制背景"
-#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3687 ../widgets/text/e-text.c:3688
+#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
+#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
msgid "Draw button"
msgstr "绘制按钮"
-#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3694 ../widgets/text/e-text.c:3695
+#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
msgid "Cursor position"
msgstr "光标位置"
-#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
msgid "Emulate label resize"
msgstr "模拟标签缩放"
-#: ../widgets/text/e-text.c:2727
+#: ../widgets/text/e-text.c:2729
msgid "Input Methods"
msgstr "输入法"
-#: ../widgets/text/e-text.c:3494 ../widgets/text/e-text.c:3495
+#: ../widgets/text/e-text.c:3566 ../widgets/text/e-text.c:3567
msgid "Bold"
msgstr "粗体"
-#: ../widgets/text/e-text.c:3501 ../widgets/text/e-text.c:3502
+#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
msgid "Strikeout"
msgstr "删除线"
-#: ../widgets/text/e-text.c:3508 ../widgets/text/e-text.c:3509
+#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
msgid "Anchor"
msgstr "锚点"
-#: ../widgets/text/e-text.c:3523 ../widgets/text/e-text.c:3524
+#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
msgid "Clip Width"
msgstr "裁剪宽度"
-#: ../widgets/text/e-text.c:3530 ../widgets/text/e-text.c:3531
+#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
msgid "Clip Height"
msgstr "裁剪高度"
-#: ../widgets/text/e-text.c:3537 ../widgets/text/e-text.c:3538
+#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
msgid "Clip"
msgstr "裁剪"
-#: ../widgets/text/e-text.c:3544 ../widgets/text/e-text.c:3545
+#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
msgid "Fill clip rectangle"
msgstr "填充裁剪矩形"
-#: ../widgets/text/e-text.c:3551 ../widgets/text/e-text.c:3552
+#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
msgid "X Offset"
msgstr "水平偏移"
-#: ../widgets/text/e-text.c:3558 ../widgets/text/e-text.c:3559
+#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
msgid "Y Offset"
msgstr "垂直偏移"
-#: ../widgets/text/e-text.c:3594 ../widgets/text/e-text.c:3595
+#: ../widgets/text/e-text.c:3666 ../widgets/text/e-text.c:3667
msgid "Text width"
msgstr "文字宽度"
-#: ../widgets/text/e-text.c:3601 ../widgets/text/e-text.c:3602
+#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
msgid "Text height"
msgstr "文字高度"
-#: ../widgets/text/e-text.c:3701 ../widgets/text/e-text.c:3702
+#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
msgid "IM Context"
msgstr "输入法环境"
-#: ../widgets/text/e-text.c:3708 ../widgets/text/e-text.c:3709
+#: ../widgets/text/e-text.c:3780 ../widgets/text/e-text.c:3781
msgid "Handle Popup"
msgstr "处理弹出"