aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--po/zh_CN.po790
1 files changed, 386 insertions, 404 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6a835546ee..bdf31d4dbc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -24,7 +24,7 @@ msgstr ""
"Project-Id-Version: evolution master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
"product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-02-18 15:31+0000\n"
+"POT-Creation-Date: 2014-03-08 05:29+0000\n"
"PO-Revision-Date: 2014-01-23 21:43+0800\n"
"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -189,7 +189,7 @@ msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添
#: ../addressbook/addressbook.error.xml.h:33
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:625
+#: ../addressbook/gui/widgets/eab-contact-merging.c:626
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
#: ../calendar/gui/dialogs/event-page.ui.h:22
#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
@@ -197,7 +197,7 @@ msgstr "已经存在此地址的联系人了。您仍然想要以相同地址添
#: ../e-util/e-mail-signature-manager.c:327
#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:100
+#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
#: ../modules/mail/em-composer-prefs.c:443
#: ../plugins/attachment-reminder/attachment-reminder.c:557
#: ../plugins/email-custom-header/email-custom-header.c:838
@@ -324,7 +324,7 @@ msgid "Instant Messaging"
msgstr "即时通讯"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/importers/evolution-vcard-importer.c:971
msgid "Contact"
msgstr "联系人"
@@ -511,10 +511,10 @@ msgstr "笔记"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1337 ../e-util/e-send-options.ui.h:41
+#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
#: ../e-util/e-preferences-window.c:379
#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1041
+#: ../shell/e-shell-window-actions.c:1086
msgid "_Help"
msgstr "帮助(_H)"
@@ -527,7 +527,7 @@ msgstr "帮助(_H)"
#: ../addressbook/gui/contact-editor/fullname.ui.h:14
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
#: ../addressbook/gui/widgets/eab-contact-merging.c:362
-#: ../addressbook/gui/widgets/eab-contact-merging.c:620
+#: ../addressbook/gui/widgets/eab-contact-merging.c:621
#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
#: ../addressbook/gui/widgets/eab-gui-util.c:318
#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
@@ -547,10 +547,10 @@ msgstr "帮助(_H)"
#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
#: ../e-util/e-source-config-dialog.c:375
#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3081 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-web-view.c:3088 ../e-util/evolution-source-viewer.c:832
#: ../e-util/gal-view-instance-save-as-dialog.c:269
#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:241 ../mail/em-folder-selector.c:278
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
#: ../mail/mail-vfolder-ui.c:270
@@ -566,18 +566,17 @@ msgstr "帮助(_H)"
#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
-#| msgid "Cancel"
msgid "_Cancel"
msgstr "取消(_C)"
#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:623
+#: ../addressbook/gui/widgets/eab-contact-merging.c:624
#: ../calendar/calendar.error.xml.h:47
#: ../calendar/gui/dialogs/comp-editor.c:1278
#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3082
+#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3089
#: ../e-util/gal-view-instance-save-as-dialog.c:270
#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
msgid "_Save"
@@ -664,7 +663,6 @@ msgstr "请选择此联系人的图像"
#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
-#| msgid "Open"
msgid "_Open"
msgstr "打开(_O)"
@@ -721,7 +719,7 @@ msgstr "无效的联系人。"
#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:242
+#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
#: ../mail/mail-vfolder-ui.c:271
@@ -730,7 +728,6 @@ msgstr "无效的联系人。"
#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
#: ../smime/gui/smime-ui.ui.h:24
-#| msgid "OK"
msgid "_OK"
msgstr "确定(_O)"
@@ -862,7 +859,7 @@ msgstr "从列表中删除电子邮件地址"
#: ../e-util/e-mail-signature-manager.c:367
#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:52
#: ../plugins/attachment-reminder/attachment-reminder.c:567
#: ../plugins/email-custom-header/email-custom-header.c:848
#: ../plugins/publish-calendar/publish-calendar.c:807
@@ -886,13 +883,11 @@ msgstr "顶部(_T)"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
#: ../e-util/filter.ui.h:20
-#| msgid "_Update"
msgid "_Up"
msgstr "上(_U)"
#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
#: ../e-util/filter.ui.h:21
-#| msgid "Move _Down"
msgid "_Down"
msgstr "下(_D)"
@@ -931,28 +926,23 @@ msgid "Merge Contact"
msgstr "合并联系人"
#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:627
msgid "_Merge"
msgstr "合并(_M)"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:615
+#: ../addressbook/gui/widgets/eab-contact-merging.c:616
msgid "Duplicate Contact Detected"
msgstr "复制检测到的联系人"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:670
-#| msgid ""
-#| "The name or email of this contact already exists in this folder. Would "
-#| "you like to save the changes anyway?"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:674
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to save the changes anyway?"
-msgstr "此联系人的姓名或邮箱地址已经在本文件夹中了。\n"
+msgstr ""
+"此联系人的姓名或邮箱地址已经在本文件夹中了。\n"
"您仍要保存更改吗?"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:673
-#| msgid ""
-#| "The name or email address of this contact already exists\n"
-#| "in this folder. Would you like to add it anyway?"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:677
msgid ""
"The name or email address of this contact already exists\n"
"in this folder. Would you like to add it anyway?"
@@ -960,20 +950,19 @@ msgstr ""
"此联系人的姓名或地址已经在本文件夹中存在了。\n"
"您仍然要添加它吗?"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:687
+#: ../addressbook/gui/widgets/eab-contact-merging.c:692
msgid "Changed Contact:"
msgstr "更改了的联系人:"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:689
+#: ../addressbook/gui/widgets/eab-contact-merging.c:694
msgid "New Contact:"
msgstr "新联系人:"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:725
+#: ../addressbook/gui/widgets/eab-contact-merging.c:733
msgid "Conflicting Contact:"
msgstr "冲突的联系人:"
-#: ../addressbook/gui/widgets/eab-contact-merging.c:727
-#| msgid "Contact: "
+#: ../addressbook/gui/widgets/eab-contact-merging.c:735
msgid "Old Contact:"
msgstr "以前联系人:"
@@ -1068,14 +1057,15 @@ msgstr "您确定要删除联系人(%s)吗?"
#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/evolution-source-viewer.c:803
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
+#: ../e-util/evolution-source-viewer.c:803
#: ../mail/e-mail-account-manager.c:737
#: ../modules/addressbook/e-book-shell-view-actions.c:1022
#: ../modules/calendar/e-cal-shell-view-actions.c:1593
#: ../modules/calendar/e-memo-shell-view-actions.c:692
#: ../modules/calendar/e-task-shell-view-actions.c:844
#: ../modules/mail/e-mail-shell-view-actions.c:1561
-#: ../shell/e-shell-window-actions.c:899 ../smime/gui/smime-ui.ui.h:10
+#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
msgid "_Delete"
msgstr "删除(_D)"
@@ -1274,7 +1264,6 @@ msgstr "联系人地图"
#. Zoom-in button
#: ../addressbook/gui/widgets/e-contact-map-window.c:410
-#| msgid "_Zoom In"
msgid "Zoom _In"
msgstr "放大(_I)"
@@ -1286,8 +1275,7 @@ msgstr "缩小(_O)"
#. Search button
#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:976
-#| msgid "_Find Now"
+#: ../shell/e-shell-window-actions.c:1021
msgid "_Find"
msgstr "查找(_F)"
@@ -1418,7 +1406,7 @@ msgid "Send a mail message to this address"
msgstr "发送一个邮件信息到这个地址"
#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:987
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
#, c-format
msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
@@ -1614,7 +1602,7 @@ msgstr "将联系人复制到"
#: ../addressbook/importers/evolution-csv-importer.c:746
#: ../addressbook/importers/evolution-ldif-importer.c:548
-#: ../addressbook/importers/evolution-vcard-importer.c:280
+#: ../addressbook/importers/evolution-vcard-importer.c:249
#: ../calendar/importers/icalendar-importer.c:439
#: ../calendar/importers/icalendar-importer.c:934
#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
@@ -1653,11 +1641,11 @@ msgstr "LDAP 数据交换格式(.ldif)"
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
-#: ../addressbook/importers/evolution-vcard-importer.c:665
+#: ../addressbook/importers/evolution-vcard-importer.c:634
msgid "vCard (.vcf, .gcrd)"
msgstr "vCard (.vfg, .gcrd)"
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:635
msgid "Evolution vCard Importer"
msgstr "Evolution vCard 导入器"
@@ -1748,25 +1736,24 @@ msgstr "午睡(_S)"
#: ../calendar/alarm-notify/alarm-notify.ui.h:4
#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1323
+#: ../calendar/gui/dialogs/comp-editor.c:1322
#: ../calendar/gui/dialogs/event-page.ui.h:24
#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
#: ../e-util/e-categories-editor.c:278
#: ../e-util/e-mail-signature-manager.c:357
#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
#: ../plugins/attachment-reminder/attachment-reminder.c:562
#: ../plugins/email-custom-header/email-custom-header.c:843
#: ../plugins/mail-to-task/mail-to-task.c:594
#: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1027
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
#: ../smime/gui/smime-ui.ui.h:13
msgid "_Edit"
msgstr "编辑(_E)"
#: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#| msgid "Print"
msgid "_Print"
msgstr "打印(_P)"
@@ -2686,9 +2673,9 @@ msgstr "无法与服务器同步"
#: ../e-util/e-mail-signature-editor.c:307
#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
-#: ../mail/em-folder-properties.c:416 ../mail/em-subscription-editor.c:1714
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:864
+#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
#: ../smime/gui/certificate-manager.c:1182
msgid "_Close"
msgstr "关闭(_C)"
@@ -2698,36 +2685,38 @@ msgid "Close the current window"
msgstr "关闭当前窗口"
#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-text.c:2084
-#: ../mail/e-mail-browser.c:133 ../shell/e-shell-window-actions.c:885
-#| msgid "_Copy..."
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
+#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
+#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:930
msgid "_Copy"
msgstr "复制(_C)"
#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:733
+#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1302
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:887
+#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
+#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
msgid "Copy the selection"
msgstr "复制选中内容"
#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-text.c:2071
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:892
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
+#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
+#: ../shell/e-shell-window-actions.c:937
msgid "Cu_t"
msgstr "剪切(_T)"
#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:728
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1296
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:894
+#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
+#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
msgid "Cut the selection"
msgstr "剪切选中内容"
#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:743
-#: ../shell/e-shell-window-actions.c:901
+#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
+#: ../shell/e-shell-window-actions.c:946
msgid "Delete the selection"
msgstr "删除选中内容"
@@ -2736,16 +2725,16 @@ msgid "View help"
msgstr "查看帮助"
#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:920
-#| msgid "_Pascal"
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
+#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
+#: ../shell/e-shell-window-actions.c:965
msgid "_Paste"
msgstr "粘贴(_P)"
#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:738
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1308
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:922
+#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
+#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
msgid "Paste the clipboard"
msgstr "粘贴剪贴板"
@@ -2761,7 +2750,6 @@ msgstr "打印(_P)..."
#: ../modules/calendar/e-cal-shell-view-actions.c:1801
#: ../modules/calendar/e-memo-shell-view-actions.c:821
#: ../modules/calendar/e-task-shell-view-actions.c:1020
-#| msgid "Preview"
msgid "Pre_view..."
msgstr "预览(_V)..."
@@ -2778,142 +2766,141 @@ msgstr "保存并关闭"
msgid "Save current changes and close editor"
msgstr "保存当前更改并关闭编辑器"
-#: ../calendar/gui/dialogs/comp-editor.c:1292
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:997
-#| msgid "Select All"
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
msgid "Select _All"
msgstr "全选(_A)"
#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:748
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:999
+#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
msgid "Select all text"
msgstr "选中所有文字"
-#: ../calendar/gui/dialogs/comp-editor.c:1316
+#: ../calendar/gui/dialogs/comp-editor.c:1315
msgid "_Classification"
msgstr "分类(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1330
+#: ../calendar/gui/dialogs/comp-editor.c:1329
#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1034
+#: ../shell/e-shell-window-actions.c:1079
msgid "_File"
msgstr "文件(_F)"
-#: ../calendar/gui/dialogs/comp-editor.c:1344
+#: ../calendar/gui/dialogs/comp-editor.c:1343
msgid "_Insert"
msgstr "插入(_I)"
-#: ../calendar/gui/dialogs/comp-editor.c:1351
+#: ../calendar/gui/dialogs/comp-editor.c:1350
#: ../composer/e-composer-actions.c:319
msgid "_Options"
msgstr "选项(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1358 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1076 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
msgid "_View"
msgstr "查看(_V)"
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1367
#: ../composer/e-composer-actions.c:268
msgid "_Attachment..."
msgstr "附件(_A)..."
-#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../calendar/gui/dialogs/comp-editor.c:1369
#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
msgid "Attach a file"
msgstr "添加附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1378
+#: ../calendar/gui/dialogs/comp-editor.c:1377
msgid "_Categories"
msgstr "类别(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1379
msgid "Toggles whether to display categories"
msgstr "切换是否显示类别"
-#: ../calendar/gui/dialogs/comp-editor.c:1386
+#: ../calendar/gui/dialogs/comp-editor.c:1385
msgid "Time _Zone"
msgstr "时区(_Z)"
-#: ../calendar/gui/dialogs/comp-editor.c:1388
+#: ../calendar/gui/dialogs/comp-editor.c:1387
msgid "Toggles whether the time zone is displayed"
msgstr "切换是否显示时区"
-#: ../calendar/gui/dialogs/comp-editor.c:1397
+#: ../calendar/gui/dialogs/comp-editor.c:1396
msgid "Pu_blic"
msgstr "公开(_B)"
-#: ../calendar/gui/dialogs/comp-editor.c:1399
+#: ../calendar/gui/dialogs/comp-editor.c:1398
msgid "Classify as public"
msgstr "分类为公开"
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1403
msgid "_Private"
msgstr "私人(_P)"
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1405
msgid "Classify as private"
msgstr "分类为私人"
-#: ../calendar/gui/dialogs/comp-editor.c:1411
+#: ../calendar/gui/dialogs/comp-editor.c:1410
msgid "_Confidential"
msgstr "机密(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:1413
+#: ../calendar/gui/dialogs/comp-editor.c:1412
msgid "Classify as confidential"
msgstr "分类为机密"
-#: ../calendar/gui/dialogs/comp-editor.c:1421
+#: ../calendar/gui/dialogs/comp-editor.c:1420
msgid "R_ole Field"
msgstr "角色域(_O)"
-#: ../calendar/gui/dialogs/comp-editor.c:1423
+#: ../calendar/gui/dialogs/comp-editor.c:1422
msgid "Toggles whether the Role field is displayed"
msgstr "切换是否显示角色域"
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1428
msgid "_RSVP"
msgstr "请回复(_R)"
-#: ../calendar/gui/dialogs/comp-editor.c:1431
+#: ../calendar/gui/dialogs/comp-editor.c:1430
msgid "Toggles whether the RSVP field is displayed"
msgstr "切换是否显示请回复域"
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1436
msgid "_Status Field"
msgstr "状态域(_S)"
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1438
msgid "Toggles whether the Status field is displayed"
msgstr "切换是否显示状态域"
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1444
msgid "_Type Field"
msgstr "类型域(_T)"
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1446
msgid "Toggles whether the Attendee Type is displayed"
msgstr "切换是否显示出席者类型域"
-#: ../calendar/gui/dialogs/comp-editor.c:2234
+#: ../calendar/gui/dialogs/comp-editor.c:2233
#: ../composer/e-composer-actions.c:487
msgid "Attach"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:2564
-#: ../calendar/gui/dialogs/comp-editor.c:2774
-#: ../calendar/gui/dialogs/comp-editor.c:3787
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:3749
+#: ../calendar/gui/dialogs/comp-editor.c:3748
#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
msgid "attachment"
msgstr "附件"
-#: ../calendar/gui/dialogs/comp-editor.c:3819
+#: ../calendar/gui/dialogs/comp-editor.c:3818
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -4671,32 +4658,32 @@ msgstr "%-m月%-d日"
msgid "Purging"
msgstr "销毁"
-#: ../calendar/gui/itip-utils.c:648 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:840
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
msgid "An organizer must be set."
msgstr "必须设定组织者。"
-#: ../calendar/gui/itip-utils.c:697
+#: ../calendar/gui/itip-utils.c:698
msgid "At least one attendee is necessary"
msgstr "至少需要一个参加者"
-#: ../calendar/gui/itip-utils.c:928 ../calendar/gui/itip-utils.c:1089
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
msgid "Event information"
msgstr "事件信息"
-#: ../calendar/gui/itip-utils.c:931 ../calendar/gui/itip-utils.c:1092
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
msgid "Task information"
msgstr "任务信息"
-#: ../calendar/gui/itip-utils.c:934 ../calendar/gui/itip-utils.c:1095
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
msgid "Memo information"
msgstr "备忘信息"
-#: ../calendar/gui/itip-utils.c:937 ../calendar/gui/itip-utils.c:1113
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
msgid "Free/Busy information"
msgstr "忙闲信息"
-#: ../calendar/gui/itip-utils.c:940
+#: ../calendar/gui/itip-utils.c:941
msgid "Calendar information"
msgstr "日历信息"
@@ -4704,7 +4691,7 @@ msgstr "日历信息"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:977
+#: ../calendar/gui/itip-utils.c:978
msgctxt "Meeting"
msgid "Accepted"
msgstr "接受"
@@ -4713,7 +4700,7 @@ msgstr "接受"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:984
+#: ../calendar/gui/itip-utils.c:985
msgctxt "Meeting"
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -4725,7 +4712,7 @@ msgstr "暂时接受"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:991 ../calendar/gui/itip-utils.c:1039
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
msgctxt "Meeting"
msgid "Declined"
msgstr "拒绝"
@@ -4734,7 +4721,7 @@ msgstr "拒绝"
#. * line of a meeting request or update email.
#. * The full subject line would be:
#. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:998
+#: ../calendar/gui/itip-utils.c:999
msgctxt "Meeting"
msgid "Delegated"
msgstr "被委任的"
@@ -4742,7 +4729,7 @@ msgstr "被委任的"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1011
+#: ../calendar/gui/itip-utils.c:1012
msgctxt "Meeting"
msgid "Updated"
msgstr "更新"
@@ -4750,7 +4737,7 @@ msgstr "更新"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1018
+#: ../calendar/gui/itip-utils.c:1019
msgctxt "Meeting"
msgid "Cancel"
msgstr "取消"
@@ -4758,7 +4745,7 @@ msgstr "取消"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1025
+#: ../calendar/gui/itip-utils.c:1026
msgctxt "Meeting"
msgid "Refresh"
msgstr "刷新"
@@ -4766,30 +4753,30 @@ msgstr "刷新"
#. Translators: This is part of the subject line of a
#. * meeting request or update email. The full subject
#. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1032
+#: ../calendar/gui/itip-utils.c:1033
msgctxt "Meeting"
msgid "Counter-proposal"
msgstr "投票表决"
-#: ../calendar/gui/itip-utils.c:1110
+#: ../calendar/gui/itip-utils.c:1111
#, c-format
msgid "Free/Busy information (%s to %s)"
msgstr "忙闲信息 (%s 到 %s)"
-#: ../calendar/gui/itip-utils.c:1118
+#: ../calendar/gui/itip-utils.c:1119
msgid "iCalendar information"
msgstr "iCalendar 信息"
-#: ../calendar/gui/itip-utils.c:1146
+#: ../calendar/gui/itip-utils.c:1147
msgid "Unable to book a resource, the new event collides with some other."
msgstr "无法预约资源,新事件与其它事件冲突。"
-#: ../calendar/gui/itip-utils.c:1154
+#: ../calendar/gui/itip-utils.c:1155
#, c-format
msgid "Unable to book a resource, error: %s"
msgstr "无法预约资源,错误:%s"
-#: ../calendar/gui/itip-utils.c:1326
+#: ../calendar/gui/itip-utils.c:1327
msgid "You must be an attendee of the event."
msgstr "您必须是事件的出席者。"
@@ -6779,12 +6766,11 @@ msgstr "新建信息(_M)"
msgid "Open New Message window"
msgstr "打开新建信息窗口"
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:934
-#| msgid "Mail Preferences"
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
msgid "_Preferences"
msgstr "首选项(_P)"
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:936
+#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
msgid "Configure Evolution"
msgstr "配置 Evolution"
@@ -6963,28 +6949,28 @@ msgstr "单击此处以使用地址簿"
msgid "Click here to select folders to post to"
msgstr "单击此处以选择要投递到的文件夹"
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:879
#, c-format
msgid ""
"Cannot sign outgoing message: No signing certificate set for this account"
msgstr "无法对寄出的信息签名:未对此帐号设置签名证书"
-#: ../composer/e-msg-composer.c:887
+#: ../composer/e-msg-composer.c:888
#, c-format
msgid ""
"Cannot encrypt outgoing message: No encryption certificate set for this "
"account"
msgstr "无法对寄出的信息加密:未对此帐号设置加密证书"
-#: ../composer/e-msg-composer.c:1568 ../composer/e-msg-composer.c:1980
+#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
msgid "Compose Message"
msgstr "新建消息"
-#: ../composer/e-msg-composer.c:4242
+#: ../composer/e-msg-composer.c:4243
msgid "The composer contains a non-text message body, which cannot be edited."
msgstr "编写器含有不可编辑的非文本信体。"
-#: ../composer/e-msg-composer.c:4942
+#: ../composer/e-msg-composer.c:4943
msgid "Untitled Message"
msgstr "无标题信息"
@@ -9360,7 +9346,7 @@ msgstr "只使用本地垃圾信息测试。"
msgid "Use only the local spam tests (no DNS)."
msgstr "之使用本地垃圾信息测试(无 DNS)。"
-#: ../em-format/e-mail-formatter-attachment.c:396
+#: ../em-format/e-mail-formatter-attachment.c:407
#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
#: ../mail/message-list.etspec.h:4
@@ -9368,20 +9354,20 @@ msgid "Attachment"
msgid_plural "Attachments"
msgstr[0] "附件"
-#: ../em-format/e-mail-formatter-attachment.c:397
+#: ../em-format/e-mail-formatter-attachment.c:408
msgid "Display as attachment"
msgstr "以附件显示"
-#: ../em-format/e-mail-formatter-audio.c:143
+#: ../em-format/e-mail-formatter-audio.c:152
msgid "Audio Player"
msgstr "音乐播放器"
-#: ../em-format/e-mail-formatter-audio.c:144
+#: ../em-format/e-mail-formatter-audio.c:153
msgid "Play the attachment in embedded audio player"
msgstr "在嵌入式音乐播放器中播放附件"
#: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:272
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
msgid "From"
msgstr "发件人"
@@ -9395,19 +9381,19 @@ msgstr "(无主题)"
msgid "This message was sent by %s on behalf of %s"
msgstr "此信息由 %s 代表 %s 的身份发送"
-#: ../em-format/e-mail-formatter-image.c:151
+#: ../em-format/e-mail-formatter-image.c:170
msgid "Regular Image"
msgstr "常规图像"
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:171
msgid "Display part as an image"
msgstr "以图像显示部分"
-#: ../em-format/e-mail-formatter-message-rfc822.c:245
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
msgid "RFC822 message"
msgstr "RFC822 信息"
-#: ../em-format/e-mail-formatter-message-rfc822.c:246
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
msgid "Format part as an RFC822 message"
msgstr "将部分格式化为 RFC822 信息"
@@ -9449,7 +9435,7 @@ msgid "Security"
msgstr "安全"
#: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:277
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
#: ../modules/mail/em-mailer-prefs.c:68
msgid "Subject"
@@ -9462,33 +9448,33 @@ msgstr "主题"
msgid "Mailer"
msgstr "邮件程序"
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:90
-#: ../em-format/e-mail-formatter-text-enriched.c:97
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-text-enriched.c:96
msgid "Richtext"
msgstr "富文本"
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:93
+#: ../em-format/e-mail-formatter-text-enriched.c:97
msgid "Display part as enriched text"
msgstr "以富文本显示部分"
-#: ../em-format/e-mail-formatter-quote-text-html.c:89
-#: ../em-format/e-mail-formatter-text-html.c:348
+#: ../em-format/e-mail-formatter-quote-text-html.c:93
+#: ../em-format/e-mail-formatter-text-html.c:359
msgid "HTML"
msgstr "HTML"
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:349
+#: ../em-format/e-mail-formatter-quote-text-html.c:94
+#: ../em-format/e-mail-formatter-text-html.c:360
msgid "Format part as HTML"
msgstr "将部分格式化为 HTML"
-#: ../em-format/e-mail-formatter-quote-text-plain.c:114
-#: ../em-format/e-mail-formatter-text-plain.c:184
+#: ../em-format/e-mail-formatter-quote-text-plain.c:117
+#: ../em-format/e-mail-formatter-text-plain.c:195
msgid "Plain Text"
msgstr "纯文字"
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-quote-text-plain.c:118
+#: ../em-format/e-mail-formatter-text-plain.c:196
msgid "Format part as plain text"
msgstr "将部分格式化为纯文字"
@@ -9588,20 +9574,20 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../em-format/e-mail-formatter-secure-button.c:186
+#: ../em-format/e-mail-formatter-secure-button.c:187
#: ../smime/gui/smime-ui.ui.h:22
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../em-format/e-mail-formatter-secure-button.c:201
+#: ../em-format/e-mail-formatter-secure-button.c:202
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../em-format/e-mail-formatter-source.c:114
+#: ../em-format/e-mail-formatter-source.c:118
msgid "Source"
msgstr "来源"
-#: ../em-format/e-mail-formatter-source.c:115
+#: ../em-format/e-mail-formatter-source.c:119
msgid "Display source of a MIME part"
msgstr "显示 MIME 部分的源内容"
@@ -9704,7 +9690,7 @@ msgstr "新闻组"
msgid "Face"
msgstr "头像"
-#: ../em-format/e-mail-part-utils.c:499
+#: ../em-format/e-mail-part-utils.c:508
#, c-format
msgid "%s attachment"
msgstr "%s 附件"
@@ -9851,7 +9837,6 @@ msgstr "状态跟踪(_T)"
#: ../e-util/e-table-config.ui.h:2
#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-#| msgid "_Append"
msgid "_Apply"
msgstr "应用(_A)"
@@ -9941,7 +9926,7 @@ msgid "Timezone drop-down combination box"
msgstr "时区下拉组合框"
#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:230
+#: ../mail/em-utils.c:229
msgid "Incoming"
msgstr "接收"
@@ -9957,7 +9942,7 @@ msgstr "您指定的时间"
msgid "a time relative to the current time"
msgstr "相对于当前时间的时间"
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
msgid "seconds"
msgstr "秒"
@@ -10150,7 +10135,6 @@ msgid "S_ave All"
msgstr "全部保存(_A)"
#: ../e-util/e-attachment-view.c:391
-#| msgid "Sa_ve"
msgid "Sa_ve As"
msgstr "另存为(_V)"
@@ -10158,7 +10142,6 @@ msgstr "另存为(_V)"
#: ../plugins/save-calendar/save-calendar.c:349
#: ../plugins/save-calendar/save-calendar.c:380
#: ../plugins/save-calendar/save-calendar.c:411
-#| msgid "Save _As..."
msgid "Save _As"
msgstr "另存为(_A)"
@@ -10265,7 +10248,7 @@ msgid "Copy book content locally for offline operation"
msgstr "将地址簿内容复制到本地以进行离线操作"
#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../e-util/e-buffer-tagger.c:409
+#: ../e-util/e-buffer-tagger.c:407
msgid "Ctrl-click to open a link"
msgstr "Ctrl 加单击来打开一个链接"
@@ -10345,7 +10328,7 @@ msgstr "可用类别(_A):"
#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1055
+#: ../shell/e-shell-window-actions.c:1100
msgid "_New"
msgstr "新建(_N)"
@@ -10513,7 +10496,7 @@ msgstr "乌克兰语"
msgid "Visual"
msgstr "可视"
-#: ../e-util/e-client-cache.c:1161
+#: ../e-util/e-client-cache.c:1189
#, c-format
msgid "Cannot create a client object from extension name '%s'"
msgstr "无法从名为 '%s' 的扩展创建客户端对象"
@@ -10819,7 +10802,7 @@ msgstr "包含线索(_N):"
msgid "A_dd Condition"
msgstr "添加动作(_D)"
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:231
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
msgid "Outgoing"
msgstr "寄出"
@@ -11545,11 +11528,11 @@ msgstr "排序方式(_S)"
msgid "_Custom"
msgstr "自定义(_C)"
-#: ../e-util/e-text.c:2107
+#: ../e-util/e-text.c:2110
msgid "Select All"
msgstr "全选"
-#: ../e-util/e-text.c:2120
+#: ../e-util/e-text.c:2123
msgid "Input Methods"
msgstr "输入法"
@@ -11597,22 +11580,22 @@ msgid "Copy the image to the clipboard"
msgstr "将图像复制到剪贴板"
#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1314
+#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
msgid "Select all text and images"
msgstr "选中全部文本和图像"
#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:989
-#: ../e-util/e-web-view.c:991 ../e-util/e-web-view.c:993
+#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
+#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
#, c-format
msgid "Click to call %s"
msgstr "单击以呼叫 %s"
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:995
+#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
msgid "Click to hide/unhide addresses"
msgstr "单击可隐藏/显示地址"
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:997
+#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
#, c-format
msgid "Click to open %s"
msgstr "单击以打开 %s"
@@ -11625,32 +11608,32 @@ msgstr "保存图像(_I)..."
msgid "Save the image to a file"
msgstr "保存该图像为文件"
-#: ../e-util/e-web-view.c:2891
+#: ../e-util/e-web-view.c:2898
msgid "Copying image to clipboard"
msgstr "正在将图像复制到剪贴板"
-#: ../e-util/e-web-view.c:3079
+#: ../e-util/e-web-view.c:3086
msgid "Save Image"
msgstr "保存图像"
-#: ../e-util/e-web-view.c:3115
+#: ../e-util/e-web-view.c:3122
#, c-format
msgid "Saving image to '%s'"
msgstr "正在保存图像至 %s"
-#: ../e-util/e-widget-undo.c:424
+#: ../e-util/e-widget-undo.c:429
msgid "Undo 'Insert text'"
msgstr "撤消 “插入文字”"
-#: ../e-util/e-widget-undo.c:426
+#: ../e-util/e-widget-undo.c:431
msgid "Redo 'Insert text'"
msgstr "重做 “插入文字”"
-#: ../e-util/e-widget-undo.c:440
+#: ../e-util/e-widget-undo.c:445
msgid "Undo 'Delete text'"
msgstr "撤消 ”删除文字“"
-#: ../e-util/e-widget-undo.c:442
+#: ../e-util/e-widget-undo.c:447
msgid "Redo 'Delete text'"
msgstr "重做“删除文字”"
@@ -11738,7 +11721,6 @@ msgid "Filter should have at least one condition."
msgstr "过滤器至少应有一个筛选条件。"
#: ../e-util/filter.error.xml.h:14
-#| msgid "Missing date."
msgid "Missing value."
msgstr "缺少值。"
@@ -11911,33 +11893,33 @@ msgstr "追加到本地“已发”文件夹失败:%s"
msgid "Sending message"
msgstr "发送信息"
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:408
-#: ../mail/em-folder-tree-model.c:1138
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1160
#: ../modules/mail/e-mail-shell-view-private.c:1057
#: ../modules/mail/e-mail-shell-view-private.c:1068
msgid "Inbox"
msgstr "收件箱"
#. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1131
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
#: ../modules/mail/e-mail-shell-view-private.c:1055
msgid "Drafts"
msgstr "草稿"
#. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1142
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
#: ../modules/mail/e-mail-shell-view-private.c:1059
msgid "Outbox"
msgstr "发件箱"
#. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1146
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
#: ../modules/mail/e-mail-shell-view-private.c:1061
msgid "Sent"
msgstr "已发箱"
#. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1134
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
#: ../modules/mail/e-mail-shell-view-private.c:1063
#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
@@ -12151,8 +12133,8 @@ msgstr "帐号名"
#: ../mail/e-mail-account-tree-view.c:135
#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3601
-#: ../mail/mail-config.ui.h:61
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
+#: ../mail/mail-config.ui.h:66
msgid "Default"
msgstr "默认"
@@ -12164,12 +12146,12 @@ msgstr "没有提供电子邮件地址"
msgid "Missing domain in email address"
msgstr "电子邮件地址中缺少域"
-#: ../mail/e-mail-backend.c:815
+#: ../mail/e-mail-backend.c:841
msgid "Unknown background operation"
msgstr "未知的后台操作"
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:859
-#: ../shell/e-shell-window-actions.c:866 ../shell/e-shell-window-actions.c:873
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
msgid "Close this window"
msgstr "关闭此窗口"
@@ -12179,7 +12161,6 @@ msgstr "(无主题)"
#. GtkAssistant's back button label.
#: ../mail/e-mail-config-assistant.c:46
-#| msgid "Go Back"
msgid "Go _Back"
msgstr "后退(_B)"
@@ -12188,12 +12169,11 @@ msgstr "后退(_B)"
msgid "_Skip Lookup"
msgstr "跳过查找(_S)"
-#: ../mail/e-mail-config-assistant.c:648
+#: ../mail/e-mail-config-assistant.c:654
msgid "Evolution Account Assistant"
msgstr "Evolution 帐号助手"
-#: ../mail/e-mail-config-assistant.c:929
-#| msgid "_Restore Defaults"
+#: ../mail/e-mail-config-assistant.c:936
msgid "_Revise Details"
msgstr "核实详细信息(_R)"
@@ -12372,7 +12352,7 @@ msgid "Receiving Email"
msgstr "接收电子邮件"
#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:332 ../mail/mail-config.ui.h:26
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
#: ../modules/addressbook/autocompletion-config.c:113
#: ../modules/calendar/e-calendar-preferences.ui.h:47
#: ../modules/itip-formatter/plugin/config-ui.c:90
@@ -12397,22 +12377,22 @@ msgid "Si_gning algorithm:"
msgstr "签名函数(_N):"
#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:62
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
msgid "SHA1"
msgstr "SHA1"
#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:63
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
msgid "SHA256"
msgstr "SHA256"
#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:64
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
msgid "SHA384"
msgstr "SHA384"
#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:65
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
msgid "SHA512"
msgstr "SHA512"
@@ -12443,8 +12423,7 @@ msgstr "选择"
#: ../mail/e-mail-config-security-page.c:453
#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:962
-#| msgid "Clea_r"
+#: ../shell/e-shell-window-actions.c:1007
msgid "_Clear"
msgstr "清除(_C)"
@@ -12655,7 +12634,7 @@ msgstr "信头名称"
msgid "Header Value"
msgstr "信头值"
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:103
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
msgid "Headers"
msgstr "信头"
@@ -13205,38 +13184,38 @@ msgstr "显示信息时显示所有信头"
msgid "Retrieving message"
msgstr "正在获取信息"
-#: ../mail/e-mail-reader.c:3771
+#: ../mail/e-mail-reader.c:3772
#: ../modules/mail/e-mail-attachment-handler.c:206
msgid "_Forward"
msgstr "转发(_F)"
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:3773
msgid "Forward the selected message to someone"
msgstr "把选中信息转发给某人"
-#: ../mail/e-mail-reader.c:3791
+#: ../mail/e-mail-reader.c:3792
msgid "Group Reply"
msgstr "回复全部"
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:3793
msgid "Reply to the mailing list, or to all recipients"
msgstr "为选中信息的邮件列表或全部收件人撰写回复"
-#: ../mail/e-mail-reader.c:3858 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
msgid "Delete"
msgstr "删除"
-#: ../mail/e-mail-reader.c:3870
+#: ../mail/e-mail-reader.c:3871
#: ../modules/calendar/e-cal-shell-view-actions.c:1371
msgid "Next"
msgstr "下一项"
-#: ../mail/e-mail-reader.c:3874
+#: ../mail/e-mail-reader.c:3875
#: ../modules/calendar/e-cal-shell-view-actions.c:1364
msgid "Previous"
msgstr "上一项"
-#: ../mail/e-mail-reader.c:3883 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
msgid "Reply"
msgstr "回复"
@@ -13284,7 +13263,7 @@ msgstr[0] "信息"
msgid "Parsing message"
msgstr "正在解析信息"
-#: ../mail/e-mail-request.c:196
+#: ../mail/e-mail-request.c:199
msgid "The message has no text content."
msgstr "该信息没有文本内容。"
@@ -13397,7 +13376,7 @@ msgstr "重要"
msgid "Junk Test"
msgstr "垃圾测试"
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:110
+#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
msgid "Junk"
msgstr "垃圾"
@@ -13615,11 +13594,13 @@ msgstr "配额使用(%s):"
msgid "Quota usage"
msgstr "配额使用"
-#: ../mail/em-folder-properties.c:284
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
msgid "_Send Account Override:"
msgstr "发送帐户覆盖(_S):"
-#: ../mail/em-folder-properties.c:413
+#: ../mail/em-folder-properties.c:415
msgid "Folder Properties"
msgstr "文件夹属性"
@@ -13635,41 +13616,41 @@ msgstr "创建(_R)"
msgid "Folder _name:"
msgstr "文件夹名称(_N):"
-#: ../mail/em-folder-tree.c:668
+#: ../mail/em-folder-tree.c:682
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../mail/em-folder-tree.c:805
+#: ../mail/em-folder-tree.c:819
#, c-format
msgctxt "folder-display"
msgid "%s (%u%s)"
msgstr "%s (%u%s)"
-#: ../mail/em-folder-tree.c:1654
+#: ../mail/em-folder-tree.c:1661
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:2202 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:2205 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:2212 ../mail/message-list.c:2268
+#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2268
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信息移至文件夹 %s"
-#: ../mail/em-folder-tree.c:2216 ../mail/message-list.c:2270
+#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2270
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信息复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:2235
+#: ../mail/em-folder-tree.c:2242
#, c-format
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信息放到顶级文件夹存储"
@@ -13679,7 +13660,7 @@ msgstr "无法将信息放到顶级文件夹存储"
msgid "UNMATCHED"
msgstr "不匹配"
-#: ../mail/em-folder-tree-model.c:1222 ../mail/em-folder-tree-model.c:1599
+#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
msgid "Loading..."
msgstr "正在载入..."
@@ -13792,22 +13773,22 @@ msgstr "停止(_S)"
#. * messages to be opened. The %d is replaced with the actual
#. * count of messages. If you need a '%' in your text, then
#. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:76
+#: ../mail/em-utils.c:75
#, c-format
msgid "Are you sure you want to open %d message at once?"
msgid_plural "Are you sure you want to open %d messages at once?"
msgstr[0] "您确定要一次打开 %d 封信吗?"
-#: ../mail/em-utils.c:132
+#: ../mail/em-utils.c:131
#: ../modules/mailto-handler/evolution-mailto-handler.c:148
msgid "_Do not show this message again"
msgstr "不再显示此信息(_D)"
-#: ../mail/em-utils.c:242
+#: ../mail/em-utils.c:241
msgid "Message Filters"
msgstr "邮件过滤器"
-#: ../mail/em-utils.c:971
+#: ../mail/em-utils.c:970
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信息"
@@ -14146,35 +14127,37 @@ msgstr "发送只填写了密件抄送收件人的信息时(_B)"
msgid "Confirmations"
msgstr "配置"
-#: ../mail/mail-config.ui.h:51
-msgid "Add"
-msgstr "添加"
-
-#: ../mail/mail-config.ui.h:52
-msgid "Remove"
-msgstr "删除"
-
-#: ../mail/mail-config.ui.h:53
-msgid " Use for Folders "
-msgstr " 用于文件夹 "
-
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account overrides
#: ../mail/mail-config.ui.h:54
-msgid "Edit"
-msgstr "编辑"
+#| msgid " Use for Folders "
+msgid "Use for Folders"
+msgstr "用于文件夹 "
#: ../mail/mail-config.ui.h:55
-msgid " Use for Recipients "
-msgstr " 用于接收者 "
-
-#: ../mail/mail-config.ui.h:56
-msgid " Account "
-msgstr " 帐号 "
+msgid "A_dd"
+msgstr "添加(_D)"
#: ../mail/mail-config.ui.h:57
+#| msgid "Remove"
+msgid "Re_move"
+msgstr "删除(_M)"
+
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account overrides
+#: ../mail/mail-config.ui.h:59
+#| msgid " Use for Recipients "
+msgid "Use for Recipients"
+msgstr "用于接收者"
+
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+msgid "Account"
+msgstr "帐号"
+
+#: ../mail/mail-config.ui.h:62
msgid "Send account overrides"
msgstr "发送帐户覆盖"
-#: ../mail/mail-config.ui.h:58
+#: ../mail/mail-config.ui.h:63
msgid ""
"Assign which account should be used as a send account for respective folders "
"or recipients, an override for usual send account detection. List of "
@@ -14184,184 +14167,185 @@ msgstr ""
"针对某些文件夹或收件人指定发送帐户,而不是通常检测的发送帐户。收件人列表可以"
"包含部分地址或姓名。姓名和地址将分别比较。"
-#: ../mail/mail-config.ui.h:59
-msgid "Folder override has precedence over Recipient override"
-msgstr "文件夹覆盖 比 收件人覆盖 优先"
+#: ../mail/mail-config.ui.h:64
+#| msgid "Folder override has precedence over Recipient override"
+msgid "_Folder override has precedence over Recipient override"
+msgstr "文件夹覆盖 比 收件人覆盖 优先(_F)"
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:65
msgid "Send Account"
msgstr "发送帐号"
-#: ../mail/mail-config.ui.h:66 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
msgid "a"
msgstr "a"
-#: ../mail/mail-config.ui.h:67 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
msgid "b"
msgstr "b"
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
msgid "Start up"
msgstr "启动"
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
msgid "Check for new _messages on start"
msgstr "启动时自动检查新信息(_M)"
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
msgid "Check for new messa_ges in all active accounts"
msgstr "检查所有活动帐号的新信息(_G)"
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
msgid "Message Display"
msgstr "信息显示"
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:77
msgid "_Use the same fonts as other applications"
msgstr "使用与其它应用程序相同的字体(_U)"
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
msgid "S_tandard Font:"
msgstr "标准字体(_T):"
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
msgid "Select HTML fixed width font"
msgstr "选择 HTML 固定宽度字体"
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
msgid "Select HTML variable width font"
msgstr "选择 HTML 变宽度字体"
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:81
msgid "Fix_ed Width Font:"
msgstr "等宽字体(_E):"
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
msgid "_Mark messages as read after"
msgstr "把信息标记为已读前等(_M)"
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
msgid "Highlight _quotations with"
msgstr "突出显示引用(_Q)"
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
msgid "color"
msgstr "颜色"
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
msgid "Default character e_ncoding:"
msgstr "默认字符编码(_N):"
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
msgid "Apply the same _view settings to all folders"
msgstr "应用同样的查看设置到所有文件夹(_v)"
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
msgid "F_all back to threading messages by subject"
msgstr "默认按照主题对线索中的信息排序(_A)"
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
msgid "Delete Mail"
msgstr "删除邮件"
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
msgid "Empty _trash folders"
msgstr "清空已删除邮件(_T)"
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
msgid "Confirm _when expunging a folder"
msgstr "销毁文件夹时确认(_W)"
#. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:93
msgid "_Show animated images"
msgstr "显示动态图像(_S)"
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:94
msgid "_Prompt on sending HTML mail to contacts that do not want them"
msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:95
msgid "Loading Images"
msgstr "载入图像"
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:96
msgid "_Never load images from the Internet"
msgstr "绝不从 Internet 载入图像(_N)"
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:97
msgid "_Load images only in messages from contacts"
msgstr "载入来自联系人的邮件中的图像(_L)"
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:98
msgid "_Always load images from the Internet"
msgstr "总是从 Internet 上载入图像(_A)"
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:99
msgid "HTML Messages"
msgstr "HTML 信息"
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
msgid "Labels"
msgstr "标签"
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:101
msgid "Sender Photograph"
msgstr "发送者照片"
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:102
msgid "_Show the photograph of sender in the message preview"
msgstr "在信息预览中显示发送者的照片(_S)"
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:103
msgid "Displayed Message Headers"
msgstr "显示信头"
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:104
msgid "Mail Headers Table"
msgstr "邮件头表"
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:105
#: ../modules/addressbook/autocompletion-config.c:116
#: ../modules/calendar/e-calendar-preferences.ui.h:54
msgid "Date/Time Format"
msgstr "日期/时间格式"
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:107
msgid "Check incoming _messages for junk"
msgstr "检查收到的邮件是否是垃圾信息(_M)"
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:108
msgid "_Delete junk messages"
msgstr "删除垃圾信息(_D)"
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:109
msgid "Check cu_stom headers for junk"
msgstr "检查自定义信头以判别垃圾信息(_S)"
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:110
msgid "Do not mar_k messages as junk if sender is in my address book"
msgstr "如果信息发送者在地址簿中则不标记为垃圾信息(_K)"
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:111
msgid "_Lookup in local address book only"
msgstr "仅在本地地址簿中查阅(_L)"
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:112
msgid "Option is ignored if a match for custom junk headers is found."
msgstr "如果找到匹配的自定义垃圾信头,此选项将被覆盖。"
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:114
#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
msgid "No encryption"
msgstr "不加密"
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:115
msgid "TLS encryption"
msgstr "TLS 加密"
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:116
msgid "SSL encryption"
msgstr "SSL 加密"
@@ -15233,7 +15217,7 @@ msgstr "较高"
msgid "Highest"
msgstr "最高"
-#: ../mail/message-list.c:455 ../mail/message-list.c:5716
+#: ../mail/message-list.c:455 ../mail/message-list.c:5719
msgid "Generating message list"
msgstr "生成信息列表"
@@ -15268,11 +15252,11 @@ msgid "Messages"
msgstr "信息"
#. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4759
+#: ../mail/message-list.c:4690
msgid "Follow-up"
msgstr "跟随"
-#: ../mail/message-list.c:5654
+#: ../mail/message-list.c:5657
msgid ""
"No message satisfies your search criteria. Change search criteria by "
"selecting a new Show message filter from the drop down list above or by "
@@ -15283,7 +15267,7 @@ msgstr ""
"示”信息过滤器;或通过“搜索->清除”菜单项清除搜索条件或更改上方的查询来重新搜"
"索。"
-#: ../mail/message-list.c:5662
+#: ../mail/message-list.c:5665
msgid "There are no messages in this folder."
msgstr "此文件夹中没有信息。"
@@ -16168,7 +16152,6 @@ msgstr "允许 Evolution 更新该文件"
#. * units for the current locale.
#.
#: ../modules/cal-config-weather/evolution-cal-config-weather.c:188
-#| msgid "Default"
msgctxt "locale-metric"
msgid "default:mm"
msgstr "默认:毫米"
@@ -16540,6 +16523,7 @@ msgstr "保存为 iCalendar"
#: ../modules/calendar/e-cal-shell-view-actions.c:1350
#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:731
msgid "_Copy..."
msgstr "复制(_C)..."
@@ -16788,7 +16772,6 @@ msgstr "概要含有"
#: ../modules/calendar/e-memo-shell-view-actions.c:828
#: ../modules/calendar/e-task-shell-view-actions.c:1013
#: ../modules/calendar/e-task-shell-view-actions.c:1027
-#| msgid "_Print..."
msgid "Print..."
msgstr "打印..."
@@ -17136,10 +17119,6 @@ msgstr "在任务中查找(_F)..."
msgid "Search for text in the displayed task"
msgstr "在显示的任务中搜索文本"
-#: ../modules/calendar/e-task-shell-view-actions.c:731
-msgid "Copy..."
-msgstr "复制..."
-
#: ../modules/calendar/e-task-shell-view-actions.c:738
msgid "D_elete Task List"
msgstr "删除任务列表(_D)"
@@ -17234,11 +17213,11 @@ msgid "%d task"
msgid_plural "%d tasks"
msgstr[0] "%d 个任务"
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:148
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
msgid "ITIP"
msgstr "ITIP"
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:149
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:150
msgid "Display part as an invitation"
msgstr "以邀请方式显示部分"
@@ -18509,10 +18488,6 @@ msgstr "发送/接收"
msgid "Select Folder to Add"
msgstr "选择要添加的文件夹"
-#: ../modules/mail/em-composer-prefs.c:870
-msgid "Account"
-msgstr "帐号"
-
#: ../modules/mail/em-composer-prefs.c:888
msgid "Folder"
msgstr "文件夹"
@@ -18791,11 +18766,11 @@ msgstr "格式化为(_F)..."
msgid "_Other languages"
msgstr "其他语言(_O)"
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:336
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
msgid "Text Highlight"
msgstr "文字高度"
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:337
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
msgid "Syntax highlighting of mail parts"
msgstr "邮件部分的语法高亮"
@@ -19015,35 +18990,35 @@ msgstr "_TCSH"
msgid "_VHDL"
msgstr "_VHDL"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:128
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
#: ../modules/vcard-inline/e-mail-part-vcard.c:151
msgid "Show F_ull vCard"
msgstr "显示完整 vCard(_U)"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
#: ../modules/vcard-inline/e-mail-part-vcard.c:169
msgid "Show Com_pact vCard"
msgstr "显示紧凑 vCard(_P)"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:156
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
msgid "Save _To Addressbook"
msgstr "保存至地址簿(_T)"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:177
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
msgid "There is one other contact."
msgstr "有另外 1 个联系人。"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:183
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
#, c-format
msgid "There is %d other contact."
msgid_plural "There are %d other contacts."
msgstr[0] "有另外 %d 个联系人。"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:208
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
msgid "Addressbook Contact"
msgstr "地址簿联系人"
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
msgid "Display the part as an addressbook contact"
msgstr "将该部分显示为地址簿联系人"
@@ -19987,7 +19962,6 @@ msgid "Select destination file"
msgstr "选择目的文件"
#: ../plugins/save-calendar/save-calendar.c:190
-#| msgid "_Save"
msgid "_Save As"
msgstr "另存为(_S)"
@@ -20024,19 +19998,19 @@ msgstr "另存为模板(_T)"
msgid "Save as Template"
msgstr "另存为模板"
-#: ../shell/e-shell.c:278
+#: ../shell/e-shell.c:302
msgid "Preparing to go offline..."
msgstr "正在准备离线..."
-#: ../shell/e-shell.c:331
+#: ../shell/e-shell.c:355
msgid "Preparing to go online..."
msgstr "正在准备上线..."
-#: ../shell/e-shell.c:412
+#: ../shell/e-shell.c:436
msgid "Preparing to quit"
msgstr "正在准备退出"
-#: ../shell/e-shell.c:418
+#: ../shell/e-shell.c:442
msgid "Preparing to quit..."
msgstr "正在准备退出..."
@@ -20052,19 +20026,19 @@ msgstr "保存搜索"
#. * allows the user to filter the current view. Examples of
#. * items that appear in the combo box are "Unread Messages",
#. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:938
+#: ../shell/e-shell-searchbar.c:937
msgid "Sho_w:"
msgstr "显示(_W):"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:963
+#: ../shell/e-shell-searchbar.c:962
msgid "Sear_ch:"
msgstr "搜索(_C):"
#. Translators: This is part of the quick search interface.
#. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1030
msgid "i_n"
msgstr "在(_N) "
@@ -20103,267 +20077,266 @@ msgstr "Evolution 网站"
msgid "Categories Editor"
msgstr "类别编辑器"
-#: ../shell/e-shell-window-actions.c:671
+#: ../shell/e-shell-window-actions.c:716
msgid "Bug Buddy is not installed."
msgstr "未安装 Bug Buddy。"
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:717
msgid "Bug Buddy could not be run."
msgstr "无法运行 Bug Buddy。"
-#: ../shell/e-shell-window-actions.c:850
+#: ../shell/e-shell-window-actions.c:895
msgid "_About"
msgstr "关于(_A)"
-#: ../shell/e-shell-window-actions.c:852
+#: ../shell/e-shell-window-actions.c:897
msgid "Show information about Evolution"
msgstr "显示关于 Evolution 的信息"
-#: ../shell/e-shell-window-actions.c:857 ../shell/e-shell-window-actions.c:871
+#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
msgid "_Close Window"
msgstr "关闭窗口(_C)"
-#: ../shell/e-shell-window-actions.c:878
+#: ../shell/e-shell-window-actions.c:923
msgid "_Contents"
msgstr "目录(_C)"
-#: ../shell/e-shell-window-actions.c:880
+#: ../shell/e-shell-window-actions.c:925
msgid "Open the Evolution User Guide"
msgstr "打开 Evolution 用户指南"
-#: ../shell/e-shell-window-actions.c:906
+#: ../shell/e-shell-window-actions.c:951
msgid "I_mport..."
msgstr "导入(_M)..."
-#: ../shell/e-shell-window-actions.c:908
+#: ../shell/e-shell-window-actions.c:953
msgid "Import data from other programs"
msgstr "从其它程序导入数据"
-#: ../shell/e-shell-window-actions.c:913
+#: ../shell/e-shell-window-actions.c:958
msgid "New _Window"
msgstr "新建窗口(_W)"
-#: ../shell/e-shell-window-actions.c:915
+#: ../shell/e-shell-window-actions.c:960
msgid "Create a new window displaying this view"
msgstr "创建一个新窗口来显示这个视图"
-#: ../shell/e-shell-window-actions.c:927
+#: ../shell/e-shell-window-actions.c:972
msgid "Available Cate_gories"
msgstr "可用类别(_G)"
-#: ../shell/e-shell-window-actions.c:929
+#: ../shell/e-shell-window-actions.c:974
msgid "Manage available categories"
msgstr "管理可用类别"
-#: ../shell/e-shell-window-actions.c:941
+#: ../shell/e-shell-window-actions.c:986
msgid "_Quick Reference"
msgstr "快速首选项(_Q)"
-#: ../shell/e-shell-window-actions.c:943
+#: ../shell/e-shell-window-actions.c:988
msgid "Show Evolution's shortcut keys"
msgstr "显示 Evolution 的快捷键"
-#: ../shell/e-shell-window-actions.c:948
-#| msgid "Quit"
+#: ../shell/e-shell-window-actions.c:993
msgid "_Quit"
msgstr "退出(_Q)"
-#: ../shell/e-shell-window-actions.c:950
+#: ../shell/e-shell-window-actions.c:995
msgid "Exit the program"
msgstr "退出程序"
-#: ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell-window-actions.c:1000
msgid "_Advanced Search..."
msgstr "高级搜索(_A)..."
-#: ../shell/e-shell-window-actions.c:957
+#: ../shell/e-shell-window-actions.c:1002
msgid "Construct a more advanced search"
msgstr "构造一个更高级的搜索"
-#: ../shell/e-shell-window-actions.c:964
+#: ../shell/e-shell-window-actions.c:1009
msgid "Clear the current search parameters"
msgstr "清除当前搜索参数"
-#: ../shell/e-shell-window-actions.c:969
+#: ../shell/e-shell-window-actions.c:1014
msgid "_Edit Saved Searches..."
msgstr "编辑保存的搜索(_E)..."
-#: ../shell/e-shell-window-actions.c:971
+#: ../shell/e-shell-window-actions.c:1016
msgid "Manage your saved searches"
msgstr "管理您保存的搜索"
-#: ../shell/e-shell-window-actions.c:978
+#: ../shell/e-shell-window-actions.c:1023
msgid "Click here to change the search type"
msgstr "单击此处更改搜索类型"
-#: ../shell/e-shell-window-actions.c:983
+#: ../shell/e-shell-window-actions.c:1028
msgid "_Find Now"
msgstr "立即查找(_F)"
-#: ../shell/e-shell-window-actions.c:985
+#: ../shell/e-shell-window-actions.c:1030
msgid "Execute the current search parameters"
msgstr "执行当前搜索参数"
-#: ../shell/e-shell-window-actions.c:990
+#: ../shell/e-shell-window-actions.c:1035
msgid "_Save Search..."
msgstr "保存搜索(_S)..."
-#: ../shell/e-shell-window-actions.c:992
+#: ../shell/e-shell-window-actions.c:1037
msgid "Save the current search parameters"
msgstr "保存当前搜索参数"
-#: ../shell/e-shell-window-actions.c:1004
+#: ../shell/e-shell-window-actions.c:1049
msgid "Submit _Bug Report..."
msgstr "提交错误报告(_B)..."
-#: ../shell/e-shell-window-actions.c:1006
+#: ../shell/e-shell-window-actions.c:1051
msgid "Submit a bug report using Bug Buddy"
msgstr "用 Bug Buddy 提交错误报告"
-#: ../shell/e-shell-window-actions.c:1011
+#: ../shell/e-shell-window-actions.c:1056
msgid "_Work Offline"
msgstr "离线工作(_W)"
-#: ../shell/e-shell-window-actions.c:1013
+#: ../shell/e-shell-window-actions.c:1058
msgid "Put Evolution into offline mode"
msgstr "将 Evolution 转入离线模式"
-#: ../shell/e-shell-window-actions.c:1018
+#: ../shell/e-shell-window-actions.c:1063
msgid "_Work Online"
msgstr "在线工作(_W)"
-#: ../shell/e-shell-window-actions.c:1020
+#: ../shell/e-shell-window-actions.c:1065
msgid "Put Evolution into online mode"
msgstr "将 Evolution 转入在线模式"
-#: ../shell/e-shell-window-actions.c:1048
+#: ../shell/e-shell-window-actions.c:1093
msgid "Lay_out"
msgstr "布局(_O)"
-#: ../shell/e-shell-window-actions.c:1062
+#: ../shell/e-shell-window-actions.c:1107
msgid "_Search"
msgstr "搜索(_S)"
-#: ../shell/e-shell-window-actions.c:1069
+#: ../shell/e-shell-window-actions.c:1114
msgid "_Switcher Appearance"
msgstr "切换器外观(_S)"
-#: ../shell/e-shell-window-actions.c:1083
+#: ../shell/e-shell-window-actions.c:1128
msgid "_Window"
msgstr "窗口(_W)"
-#: ../shell/e-shell-window-actions.c:1112
+#: ../shell/e-shell-window-actions.c:1157
msgid "Show Side _Bar"
msgstr "显示侧边栏(_B)"
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1159
msgid "Show the side bar"
msgstr "显示侧边栏"
-#: ../shell/e-shell-window-actions.c:1120
+#: ../shell/e-shell-window-actions.c:1165
msgid "Show _Buttons"
msgstr "显示按钮(_B)"
-#: ../shell/e-shell-window-actions.c:1122
+#: ../shell/e-shell-window-actions.c:1167
msgid "Show the switcher buttons"
msgstr "显示切换器按钮"
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1173
msgid "Show _Status Bar"
msgstr "显示状态栏(_S)"
-#: ../shell/e-shell-window-actions.c:1130
+#: ../shell/e-shell-window-actions.c:1175
msgid "Show the status bar"
msgstr "显示状态栏"
-#: ../shell/e-shell-window-actions.c:1136
+#: ../shell/e-shell-window-actions.c:1181
msgid "Show _Tool Bar"
msgstr "显示工具栏(_T)"
-#: ../shell/e-shell-window-actions.c:1138
+#: ../shell/e-shell-window-actions.c:1183
msgid "Show the tool bar"
msgstr "显示工具栏"
-#: ../shell/e-shell-window-actions.c:1160
+#: ../shell/e-shell-window-actions.c:1205
msgid "_Icons Only"
msgstr "只有图标(_I)"
-#: ../shell/e-shell-window-actions.c:1162
+#: ../shell/e-shell-window-actions.c:1207
msgid "Display window buttons with icons only"
msgstr "显示只有图标的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1212
msgid "_Text Only"
msgstr "只有文字(_T)"
-#: ../shell/e-shell-window-actions.c:1169
+#: ../shell/e-shell-window-actions.c:1214
msgid "Display window buttons with text only"
msgstr "显示只有文字的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1174
+#: ../shell/e-shell-window-actions.c:1219
msgid "Icons _and Text"
msgstr "图标和文字(_A)"
-#: ../shell/e-shell-window-actions.c:1176
+#: ../shell/e-shell-window-actions.c:1221
msgid "Display window buttons with icons and text"
msgstr "显示带图标和文字的窗口按钮"
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1226
msgid "Tool_bar Style"
msgstr "工具栏样式(_B)"
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1228
msgid "Display window buttons using the desktop toolbar setting"
msgstr "使用桌面工具栏设置显示窗口按钮"
-#: ../shell/e-shell-window-actions.c:1191
+#: ../shell/e-shell-window-actions.c:1236
msgid "Delete Current View"
msgstr "保存当前视图"
-#: ../shell/e-shell-window-actions.c:1198
+#: ../shell/e-shell-window-actions.c:1243
msgid "Save Custom View..."
msgstr "保存当前视图..."
-#: ../shell/e-shell-window-actions.c:1200
+#: ../shell/e-shell-window-actions.c:1245
msgid "Save current custom view"
msgstr "保存当前自定义视图"
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1252
msgid "C_urrent View"
msgstr "当前视图(_U)"
-#: ../shell/e-shell-window-actions.c:1217
+#: ../shell/e-shell-window-actions.c:1262
msgid "Custom View"
msgstr "当前视图"
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1264
msgid "Current view is a customized view"
msgstr "当前视图为自定义视图"
-#: ../shell/e-shell-window-actions.c:1227
+#: ../shell/e-shell-window-actions.c:1272
msgid "Page Set_up..."
msgstr "页面设置(_U)..."
-#: ../shell/e-shell-window-actions.c:1229
+#: ../shell/e-shell-window-actions.c:1274
msgid "Change the page settings for your current printer"
msgstr "更改当前打印机的页面设置"
-#: ../shell/e-shell-window-actions.c:1590
+#: ../shell/e-shell-window-actions.c:1635
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
-#: ../shell/e-shell-window-actions.c:1713
+#: ../shell/e-shell-window-actions.c:1758
#, c-format
msgid "Select view: %s"
msgstr "选择视图:%s"
-#: ../shell/e-shell-window-actions.c:1730
+#: ../shell/e-shell-window-actions.c:1775
#, c-format
msgid "Delete view: %s"
msgstr "删除视图:%s"
-#: ../shell/e-shell-window-actions.c:1824
+#: ../shell/e-shell-window-actions.c:1869
msgid "Execute these search parameters"
msgstr "执行这些搜索参数"
@@ -20879,12 +20852,21 @@ msgstr "到期日期(_D)"
msgid "With _Status"
msgstr "状态(_S)"
+#~ msgid "Add"
+#~ msgstr "添加"
+
+#~ msgid "Edit"
+#~ msgstr "编辑"
+
+#~ msgid " Account "
+#~ msgstr " 帐号 "
+
+#~ msgid "Copy..."
+#~ msgstr "复制..."
+
#~ msgid "Original Contact:"
#~ msgstr "原联系人:"
-#~ msgid "A_dd"
-#~ msgstr "添加(_D)"
-
#~ msgid "Pinging %s"
#~ msgstr "查验 %s"