aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFunda Wang <fwang@src.gnome.org>2005-08-11 12:52:50 +0800
committerFunda Wang <fwang@src.gnome.org>2005-08-11 12:52:50 +0800
commit79e68e099cb9e3b1a93201ade1f9609d82807ead (patch)
tree59b75ab71f6f1ef3a7cd6ad06411c4a893858a3a
parent559341b0a24b520d33740697b9312a9a67ba7a42 (diff)
downloadgsoc2013-evolution-79e68e099cb9e3b1a93201ade1f9609d82807ead.tar.gz
gsoc2013-evolution-79e68e099cb9e3b1a93201ade1f9609d82807ead.tar.zst
gsoc2013-evolution-79e68e099cb9e3b1a93201ade1f9609d82807ead.zip
Updated Simplified Chinese translation
svn path=/trunk/; revision=30084
-rw-r--r--po/ChangeLog4
-rw-r--r--po/zh_CN.po849
2 files changed, 432 insertions, 421 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 25223fff31..c7829ae1ce 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-11 Funda Wang <fundawang@linux.net.cn>
+
+ * zh_CN.po: Updated Simplified Chinese translation.
+
2005-08-10 Alexander Shopov <ash@contact.bg>
* bg.po: Updated Bulgarian translation by
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4d3212978e..e27768cb97 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Evolution\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-04 05:34+0000\n"
-"PO-Revision-Date: 2005-08-05 00:13+0800\n"
+"POT-Creation-Date: 2005-08-10 21:40+0000\n"
+"PO-Revision-Date: 2005-08-11 12:40+0800\n"
"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -387,8 +387,7 @@ msgstr "Evolution 地址簿异常退出。"
#: ../addressbook/addressbook.error.xml.h:16
msgid ""
"The image you have selected is large. Do you want to resize and store it?"
-msgstr ""
-"您所选择的图像太大。您是否想要缩放并存储?"
+msgstr "您所选择的图像太大。您是否想要缩放并存储?"
#: ../addressbook/addressbook.error.xml.h:17
msgid ""
@@ -556,7 +555,7 @@ msgid "Manage your S/MIME certificates here"
msgstr "在此管理您的 S/MIME 证书"
#. create the local source group
-#. On This Computer is always first and vFolders is always last
+#. On This Computer is always first and Search Folders is always last
#: ../addressbook/gui/component/addressbook-component.c:137
#: ../addressbook/gui/component/addressbook-migrate.c:502
#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
@@ -660,7 +659,7 @@ msgstr "身份验证"
#: ../addressbook/gui/component/addressbook-config.c:912
#: ../addressbook/gui/component/ldap-config.glade.h:18
-#: ../mail/mail-dialogs.glade.h:8 ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
msgid "Details"
msgstr "细节"
@@ -830,7 +829,7 @@ msgstr "是否显示预览面板。"
#: ../calendar/gui/dialogs/new-task-list.glade.h:1
#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../mail/mail-dialogs.glade.h:2 ../mail/message-tags.glade.h:1
+#: ../mail/message-tags.glade.h:1
#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
#: ../plugins/groupwise-features/properties.glade.h:1
#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
@@ -891,7 +890,7 @@ msgid "Add Address Book"
msgstr "添加地址簿"
#: ../addressbook/gui/component/ldap-config.glade.h:15
-#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:757
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:759
msgid "Always"
msgstr "总是"
@@ -925,7 +924,7 @@ msgid "Lo_gin:"
msgstr "登录(_G):"
#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:756
+#: ../mail/em-account-editor.c:300 ../mail/em-account-editor.c:758
msgid "Never"
msgstr "从不"
@@ -1095,7 +1094,7 @@ msgstr "名片"
#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1946
+#: ../filter/filter.glade.h:16 ../mail/em-account-editor.c:1951
#: ../plugins/calendar-http/calendar-http.c:263
#: ../plugins/calendar-weather/calendar-weather.c:563
msgid "minutes"
@@ -1138,13 +1137,13 @@ msgid "<b>Work</b>"
msgstr "<b>工作</b>"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
#: ../addressbook/gui/widgets/eab-contact-display.c:348
msgid "AIM"
msgstr "AIM"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:272
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
#: ../addressbook/gui/widgets/e-minicard.c:181
@@ -1152,9 +1151,9 @@ msgid "Contact"
msgstr "联系人"
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:523
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:538
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2338
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:525
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:540
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2349
msgid "Contact Editor"
msgstr "联系人编辑器"
@@ -1195,7 +1194,7 @@ msgstr "电话"
#. red
#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:235
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:200
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1042
#: ../mail/mail-config.c:77 ../mail/mail-config.glade.h:153
msgid "Work"
@@ -1320,7 +1319,7 @@ msgstr "地址"
#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:103
#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:299
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:300
#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
#: ../addressbook/gui/widgets/e-addressbook-model.c:310
#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
@@ -2317,7 +2316,7 @@ msgid "AOL Instant Messenger"
msgstr "AOL 即时通讯程序"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
#: ../addressbook/gui/widgets/eab-contact-display.c:351
msgid "Jabber"
msgstr "Jabber"
@@ -2327,7 +2326,7 @@ msgid "Yahoo Messenger"
msgstr "雅虎通"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
#: ../addressbook/gui/widgets/eab-contact-display.c:350
msgid "ICQ"
msgstr "ICQ"
@@ -2348,69 +2347,69 @@ msgid "Username"
msgstr "用户名"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:201
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
msgid "Home"
msgstr "家庭"
#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:239
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
msgid "Other"
msgstr "其它"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
#: ../addressbook/gui/widgets/eab-contact-display.c:353
msgid "Yahoo"
msgstr "雅虎"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
#: ../addressbook/gui/widgets/eab-contact-display.c:352
msgid "MSN"
msgstr "MSN"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
#: ../addressbook/gui/widgets/eab-contact-display.c:349
msgid "GroupWise"
msgstr "GroupWise"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:258
msgid "Source Book"
msgstr "来源地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:265
msgid "Target Book"
msgstr "目标地址簿"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:279
msgid "Is New Contact"
msgstr "为新联系人"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:285
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:286
msgid "Writable Fields"
msgstr "可写域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:292
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:293
msgid "Required Fields"
msgstr "必需域"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:307
msgid "Changed"
msgstr "已更改"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:533
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2333
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:535
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2344
#, c-format
msgid "Contact Editor - %s"
msgstr "联系人编辑器 - %s"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2639
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2650
msgid "Please select an image for this contact"
msgstr "请选择此联系人的图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2640
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2651
msgid "No image"
msgstr "无图像"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2916
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2927
msgid ""
"The contact data is invalid:\n"
"\n"
@@ -2418,7 +2417,7 @@ msgstr ""
"联系人数据无效:\n"
"\n"
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2968
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2979
msgid "Invalid contact."
msgstr "无效的联系人。"
@@ -3527,11 +3526,11 @@ msgstr "GTK 树视图"
msgid "Importing ..."
msgstr "正在导入..."
-#: ../addressbook/importers/evolution-ldif-importer.c:651
+#: ../addressbook/importers/evolution-ldif-importer.c:652
msgid "LDAP Data Interchange Format (.ldif)"
msgstr "LDAP 数据交换格式(.ldif)"
-#: ../addressbook/importers/evolution-ldif-importer.c:652
+#: ../addressbook/importers/evolution-ldif-importer.c:653
msgid "Evolution LDIF importer"
msgstr "Evolution LDIF 导入器"
@@ -4120,7 +4119,7 @@ msgid "_Save"
msgstr "保存(_S)"
#: ../calendar/calendar.error.xml.h:65
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:121
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:123
msgid "_Send"
msgstr "发送(_S)"
@@ -4197,8 +4196,8 @@ msgstr "Evolution 任务组件"
#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
#: ../calendar/gui/e-tasks.c:1256 ../calendar/gui/print.c:1822
-#: ../calendar/gui/tasks-component.c:519 ../calendar/gui/tasks-component.c:994
-#: ../calendar/gui/tasks-control.c:457
+#: ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/tasks-component.c:1006 ../calendar/gui/tasks-control.c:457
#: ../calendar/importers/icalendar-importer.c:79
#: ../calendar/importers/icalendar-importer.c:707
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
@@ -4692,7 +4691,7 @@ msgstr "无匹配"
#: ../calendar/gui/calendar-commands.c:119
#: ../calendar/gui/calendar-component.c:708
#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2081
+#: ../calendar/gui/gnome-cal.c:2094
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
#: ../plugins/groupwise-account-setup/camel-gw-listener.c:581
@@ -4983,14 +4982,14 @@ msgstr "%.0fG"
#: ../calendar/gui/dialogs/cal-attachment-bar.c:311
#: ../calendar/gui/dialogs/cal-attachment-bar.c:1106
-#: ../calendar/gui/dialogs/comp-editor.c:2426
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:439
-#: ../mail/em-utils.c:476 ../widgets/misc/e-attachment-bar.c:336
+#: ../calendar/gui/dialogs/comp-editor.c:2438
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:444
+#: ../mail/em-utils.c:481 ../widgets/misc/e-attachment-bar.c:336
msgid "attachment"
msgstr "附件"
#: ../calendar/gui/dialogs/cal-attachment-bar.c:473
-#: ../calendar/gui/dialogs/comp-editor.c:1059
+#: ../calendar/gui/dialogs/comp-editor.c:1071
#: ../calendar/gui/dialogs/meeting-page.c:889
#: ../composer/e-msg-composer-attachment-bar.c:470
#: ../composer/e-msg-composer.c:3398
@@ -5001,15 +5000,15 @@ msgid "_Remove"
msgstr "删除(_R)"
#: ../calendar/gui/dialogs/cal-attachment-bar.c:474
-#: ../calendar/gui/dialogs/comp-editor.c:1060
+#: ../calendar/gui/dialogs/comp-editor.c:1072
#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3399 ../mail/em-folder-tree.c:2120
+#: ../composer/e-msg-composer.c:3399 ../mail/em-folder-tree.c:2047
#: ../ui/evolution-mail-list.xml.h:28
msgid "_Properties"
msgstr "属性(_P)"
#: ../calendar/gui/dialogs/cal-attachment-bar.c:476
-#: ../calendar/gui/dialogs/comp-editor.c:1062
+#: ../calendar/gui/dialogs/comp-editor.c:1074
#: ../composer/e-msg-composer-attachment-bar.c:473
#: ../composer/e-msg-composer.c:3401
msgid "_Add attachment..."
@@ -5506,102 +5505,102 @@ msgstr " (预定 "
msgid "Due "
msgstr "预定 "
-#: ../calendar/gui/dialogs/comp-editor.c:187 ../composer/e-msg-composer.c:2663
+#: ../calendar/gui/dialogs/comp-editor.c:190 ../composer/e-msg-composer.c:2663
#, c-format
msgid "Attached message - %s"
msgstr "附加的信件 - %s"
#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:192
-#: ../calendar/gui/dialogs/comp-editor.c:362 ../composer/e-msg-composer.c:2668
+#: ../calendar/gui/dialogs/comp-editor.c:195
+#: ../calendar/gui/dialogs/comp-editor.c:365 ../composer/e-msg-composer.c:2668
#: ../composer/e-msg-composer.c:2845
#, c-format
msgid "Attached message"
msgid_plural "%d attached messages"
msgstr[0] "%d 封附加的信件"
-#: ../calendar/gui/dialogs/comp-editor.c:425
+#: ../calendar/gui/dialogs/comp-editor.c:428
#: ../calendar/gui/e-calendar-table.c:1162
#: ../calendar/gui/e-calendar-view.c:1536 ../composer/e-msg-composer.c:2909
-#: ../mail/em-folder-tree.c:1047 ../mail/em-folder-view.c:1035
+#: ../mail/em-folder-tree.c:974 ../mail/em-folder-view.c:1035
#: ../mail/message-list.c:1708 ../ui/evolution-addressbook.xml.h:31
#: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
#: ../ui/evolution-mail-message.xml.h:100 ../ui/evolution-tasks.xml.h:21
msgid "_Copy"
msgstr "复制(_C)"
-#: ../calendar/gui/dialogs/comp-editor.c:426 ../composer/e-msg-composer.c:2910
-#: ../mail/em-folder-tree.c:1048 ../mail/em-folder-utils.c:380
+#: ../calendar/gui/dialogs/comp-editor.c:429 ../composer/e-msg-composer.c:2910
+#: ../mail/em-folder-tree.c:975 ../mail/em-folder-utils.c:368
#: ../mail/em-folder-view.c:931 ../mail/message-list.c:1709
msgid "_Move"
msgstr "移动(_M)"
-#: ../calendar/gui/dialogs/comp-editor.c:428 ../composer/e-msg-composer.c:2912
-#: ../mail/em-folder-tree.c:1050 ../mail/message-list.c:1711
+#: ../calendar/gui/dialogs/comp-editor.c:431 ../composer/e-msg-composer.c:2912
+#: ../mail/em-folder-tree.c:977 ../mail/message-list.c:1711
msgid "Cancel _Drag"
msgstr "取消拖曳(_D)"
-#: ../calendar/gui/dialogs/comp-editor.c:765
+#: ../calendar/gui/dialogs/comp-editor.c:768
msgid "Could not update object"
msgstr "无法更新对象"
-#: ../calendar/gui/dialogs/comp-editor.c:956 ../composer/e-msg-composer.c:2317
+#: ../calendar/gui/dialogs/comp-editor.c:968 ../composer/e-msg-composer.c:2317
#, c-format
msgid "<b>%d</b> Attachment"
msgid_plural "<b>%d</b> Attachments"
msgstr[0] "<b>%d</b> 个附件"
-#: ../calendar/gui/dialogs/comp-editor.c:1225
+#: ../calendar/gui/dialogs/comp-editor.c:1237
msgid "_Attachment Bar (drop attachments here)"
msgstr "附件栏(将附件拖至此处)(_A)"
-#: ../calendar/gui/dialogs/comp-editor.c:1839
-#: ../calendar/gui/dialogs/comp-editor.c:1882
+#: ../calendar/gui/dialogs/comp-editor.c:1851
+#: ../calendar/gui/dialogs/comp-editor.c:1894
msgid "Edit Appointment"
msgstr "编辑约会"
-#: ../calendar/gui/dialogs/comp-editor.c:1845
-#: ../calendar/gui/dialogs/comp-editor.c:1888
+#: ../calendar/gui/dialogs/comp-editor.c:1857
+#: ../calendar/gui/dialogs/comp-editor.c:1900
#, c-format
msgid "Meeting - %s"
msgstr "会议 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1847
-#: ../calendar/gui/dialogs/comp-editor.c:1890
+#: ../calendar/gui/dialogs/comp-editor.c:1859
+#: ../calendar/gui/dialogs/comp-editor.c:1902
#, c-format
msgid "Appointment - %s"
msgstr "约会 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1851
-#: ../calendar/gui/dialogs/comp-editor.c:1894
+#: ../calendar/gui/dialogs/comp-editor.c:1863
+#: ../calendar/gui/dialogs/comp-editor.c:1906
#, c-format
msgid "Assigned Task - %s"
msgstr "指派的任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1853
-#: ../calendar/gui/dialogs/comp-editor.c:1896
+#: ../calendar/gui/dialogs/comp-editor.c:1865
+#: ../calendar/gui/dialogs/comp-editor.c:1908
#, c-format
msgid "Task - %s"
msgstr "任务 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1856
-#: ../calendar/gui/dialogs/comp-editor.c:1899
+#: ../calendar/gui/dialogs/comp-editor.c:1868
+#: ../calendar/gui/dialogs/comp-editor.c:1911
#, c-format
msgid "Journal entry - %s"
msgstr "日志条目 - %s"
-#: ../calendar/gui/dialogs/comp-editor.c:1867
-#: ../calendar/gui/dialogs/comp-editor.c:1909
+#: ../calendar/gui/dialogs/comp-editor.c:1879
+#: ../calendar/gui/dialogs/comp-editor.c:1921
msgid "No summary"
msgstr "没有概要"
-#: ../calendar/gui/dialogs/comp-editor.c:2515
-#: ../calendar/gui/dialogs/comp-editor.c:2548
-#: ../calendar/gui/dialogs/comp-editor.c:2572
+#: ../calendar/gui/dialogs/comp-editor.c:2527
+#: ../calendar/gui/dialogs/comp-editor.c:2560
+#: ../calendar/gui/dialogs/comp-editor.c:2584
msgid "Changes made to this item may be discarded if an update arrives"
msgstr "如果更新到达的话,对此项目的更改将被丢弃"
-#: ../calendar/gui/dialogs/comp-editor.c:2596
+#: ../calendar/gui/dialogs/comp-editor.c:2608
msgid "Unable to use current version!"
msgstr "无法使用当前版本!"
@@ -5885,12 +5884,12 @@ msgstr "<b>来自:</b>"
#: ../calendar/gui/e-cal-model-tasks.c:653
#: ../calendar/gui/e-itip-control.c:1104 ../composer/e-msg-composer.c:2121
#: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
-#: ../mail/em-account-editor.c:1346 ../mail/em-account-prefs.c:464
+#: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
#: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
#: ../plugins/calendar-weather/calendar-weather.c:370
#: ../plugins/calendar-weather/calendar-weather.c:424
#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-#: ../plugins/itip-formatter/itip-formatter.c:1607
+#: ../plugins/itip-formatter/itip-formatter.c:1613
#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:190
#: ../widgets/misc/e-cell-date-edit.c:248 ../widgets/misc/e-dateedit.c:465
#: ../widgets/misc/e-dateedit.c:1504 ../widgets/misc/e-dateedit.c:1673
@@ -6457,7 +6456,7 @@ msgstr "开始日期"
#: ../calendar/gui/e-cal-list-view.etspec.h:5
#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:17 ../plugins/save-calendar/csv-format.c:386
+#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
msgid "Summary"
msgstr "概要"
@@ -6503,9 +6502,9 @@ msgstr "否"
#: ../calendar/gui/e-meeting-list-view.c:168
#: ../calendar/gui/e-meeting-list-view.c:182
#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1239
+#: ../calendar/gui/e-meeting-store.c:224 ../mail/em-utils.c:1244
#: ../plugins/itip-formatter/itip-formatter.c:238
-#: ../plugins/itip-formatter/itip-formatter.c:1632
+#: ../plugins/itip-formatter/itip-formatter.c:1638
#: ../plugins/plugin-manager/plugin-manager.c:72
#: ../widgets/misc/e-attachment-bar.c:643
#: ../widgets/misc/e-charset-picker.c:62
@@ -6634,7 +6633,7 @@ msgstr "把任务标记为完成(_M)"
#. FIXME: need to disable for undeletable folders
#: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1549 ../mail/em-folder-tree.c:2116
+#: ../calendar/gui/e-calendar-view.c:1549 ../mail/em-folder-tree.c:2043
#: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:33
#: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:26
#: ../ui/evolution-tasks.xml.h:22
@@ -6909,12 +6908,12 @@ msgstr "<br> 请查看下列信息,并从下面的菜单中选择一个动作
#: ../calendar/gui/e-meeting-list-view.c:204
#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
#: ../calendar/gui/itip-utils.c:548
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../plugins/itip-formatter/itip-formatter.c:1626
msgid "Accepted"
msgstr "接受"
#: ../calendar/gui/e-itip-control.c:1141 ../calendar/gui/itip-utils.c:551
-#: ../plugins/itip-formatter/itip-formatter.c:1623
+#: ../plugins/itip-formatter/itip-formatter.c:1629
msgid "Tentatively Accepted"
msgstr "暂时接受"
@@ -6922,7 +6921,7 @@ msgstr "暂时接受"
#: ../calendar/gui/e-meeting-list-view.c:205
#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
#: ../calendar/gui/itip-utils.c:554 ../calendar/gui/itip-utils.c:583
-#: ../plugins/itip-formatter/itip-formatter.c:1626
+#: ../plugins/itip-formatter/itip-formatter.c:1632
msgid "Declined"
msgstr "拒绝"
@@ -7308,7 +7307,7 @@ msgstr "暂时的"
#: ../calendar/gui/e-meeting-list-view.c:207
#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
#: ../calendar/gui/itip-utils.c:557
-#: ../plugins/itip-formatter/itip-formatter.c:1629
+#: ../plugins/itip-formatter/itip-formatter.c:1635
msgid "Delegated"
msgstr "被委任的"
@@ -7403,7 +7402,7 @@ msgstr "必需的人和一个资源(_O)"
msgid "Enter the password for %s"
msgstr "为 %s 输入密码"
-#: ../calendar/gui/e-tasks.c:797 ../calendar/gui/gnome-cal.c:2519
+#: ../calendar/gui/e-tasks.c:797 ../calendar/gui/gnome-cal.c:2532
#, c-format
msgid ""
"Error on %s:\n"
@@ -7449,36 +7448,36 @@ msgid "Updating query"
msgstr "更新查询"
#. bonobo displays this string so it must be in locale
-#: ../calendar/gui/gnome-cal.c:2196 ../widgets/menus/gal-view-instance.c:585
+#: ../calendar/gui/gnome-cal.c:2209 ../widgets/menus/gal-view-instance.c:585
#: ../widgets/menus/gal-view-menus.c:350
msgid "Custom View"
msgstr "当前视图"
-#: ../calendar/gui/gnome-cal.c:2197 ../widgets/menus/gal-view-instance.c:586
+#: ../calendar/gui/gnome-cal.c:2210 ../widgets/menus/gal-view-instance.c:586
msgid "Save Custom View"
msgstr "保存自定义视图"
-#: ../calendar/gui/gnome-cal.c:2202 ../widgets/menus/gal-view-instance.c:590
+#: ../calendar/gui/gnome-cal.c:2215 ../widgets/menus/gal-view-instance.c:590
#: ../widgets/menus/gal-view-menus.c:372
msgid "Define Views..."
msgstr "定义视图..."
-#: ../calendar/gui/gnome-cal.c:2365
+#: ../calendar/gui/gnome-cal.c:2378
#, c-format
msgid "Loading appointments at %s"
msgstr "装入位于 %s 的约会"
-#: ../calendar/gui/gnome-cal.c:2384
+#: ../calendar/gui/gnome-cal.c:2397
#, c-format
msgid "Loading tasks at %s"
msgstr "装入位于 %s 的任务"
-#: ../calendar/gui/gnome-cal.c:2485
+#: ../calendar/gui/gnome-cal.c:2498
#, c-format
msgid "Opening %s"
msgstr "打开 %s"
-#: ../calendar/gui/gnome-cal.c:3375
+#: ../calendar/gui/gnome-cal.c:3388
msgid "Purging"
msgstr "销毁"
@@ -7884,52 +7883,52 @@ msgstr[0] ",已选中 %d 个"
msgid "Failed upgrading tasks."
msgstr "升级任务失败。"
-#: ../calendar/gui/tasks-component.c:860
+#: ../calendar/gui/tasks-component.c:872
#, c-format
msgid "Unable to open the task list '%s' for creating events and meetings"
msgstr "无法打开任务列表“%s”来创建事件和会议"
-#: ../calendar/gui/tasks-component.c:875
+#: ../calendar/gui/tasks-component.c:887
msgid "There is no calendar available for creating tasks"
msgstr "没有可创建任务的日历"
-#: ../calendar/gui/tasks-component.c:969
+#: ../calendar/gui/tasks-component.c:981
msgid "Task Source Selector"
msgstr "任务来源选择器"
-#: ../calendar/gui/tasks-component.c:1152
+#: ../calendar/gui/tasks-component.c:1164
msgid "New task"
msgstr "新建任务"
-#: ../calendar/gui/tasks-component.c:1153
+#: ../calendar/gui/tasks-component.c:1165
msgid "_Task"
msgstr "任务(_T)"
-#: ../calendar/gui/tasks-component.c:1154
+#: ../calendar/gui/tasks-component.c:1166
msgid "Create a new task"
msgstr "创建新任务"
-#: ../calendar/gui/tasks-component.c:1160
+#: ../calendar/gui/tasks-component.c:1172
msgid "New assigned task"
msgstr "新建指派的任务"
-#: ../calendar/gui/tasks-component.c:1161
+#: ../calendar/gui/tasks-component.c:1173
msgid "Assigne_d Task"
msgstr "指派的任务(_D)"
-#: ../calendar/gui/tasks-component.c:1162
+#: ../calendar/gui/tasks-component.c:1174
msgid "Create a new assigned task"
msgstr "创建新指派的任务"
-#: ../calendar/gui/tasks-component.c:1168
+#: ../calendar/gui/tasks-component.c:1180
msgid "New task list"
msgstr "新建任务列表"
-#: ../calendar/gui/tasks-component.c:1169
+#: ../calendar/gui/tasks-component.c:1181
msgid "Task l_ist"
msgstr "任务列表(_I)"
-#: ../calendar/gui/tasks-component.c:1170
+#: ../calendar/gui/tasks-component.c:1182
msgid "Create a new task list"
msgstr "创建新任务列表"
@@ -9640,7 +9639,7 @@ msgid "Open File"
msgstr "打开文件"
#: ../composer/e-msg-composer.c:2005 ../mail/em-account-editor.c:588
-#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:698
+#: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
msgid "Autogenerated"
msgstr "自动生成的"
@@ -9965,7 +9964,7 @@ msgstr "您打算覆盖它吗?"
msgid "File exists &quot;{0}&quot;."
msgstr "文件已存在“{0}”。"
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:120
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:122
msgid "_Overwrite"
msgstr "覆盖(_O)"
@@ -10071,62 +10070,62 @@ msgstr "%p %I点"
msgid "The orientation of the tray."
msgstr "托盘方向。"
-#: ../filter/filter-datespec.c:73
+#: ../filter/filter-datespec.c:78
#, c-format
msgid "1 second ago"
msgid_plural "%d seconds ago"
msgstr[0] "%d 秒前"
-#: ../filter/filter-datespec.c:74
+#: ../filter/filter-datespec.c:79
#, c-format
msgid "1 minute ago"
msgid_plural "%d minutes ago"
msgstr[0] "%d 分钟前"
-#: ../filter/filter-datespec.c:75
+#: ../filter/filter-datespec.c:80
#, c-format
msgid "1 hour ago"
msgid_plural "%d hours ago"
msgstr[0] "%d 小时前"
-#: ../filter/filter-datespec.c:76
+#: ../filter/filter-datespec.c:81
#, c-format
msgid "1 day ago"
msgid_plural "%d days ago"
msgstr[0] "%d 天前"
-#: ../filter/filter-datespec.c:77
+#: ../filter/filter-datespec.c:82
#, c-format
msgid "1 week ago"
msgid_plural "%d weeks ago"
msgstr[0] "%d 周前"
-#: ../filter/filter-datespec.c:78
+#: ../filter/filter-datespec.c:83
#, c-format
msgid "1 month ago"
msgid_plural "%d months ago"
msgstr[0] "%d 个月前"
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:84
#, c-format
msgid "1 year ago"
msgid_plural "%d years ago"
msgstr[0] "%d 年前"
-#: ../filter/filter-datespec.c:280
+#: ../filter/filter-datespec.c:285
msgid "<click here to select a date>"
msgstr "<单击此处以选择日期>"
-#: ../filter/filter-datespec.c:283 ../filter/filter-datespec.c:294
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
msgid "now"
msgstr "现在"
#. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:290
+#: ../filter/filter-datespec.c:295
msgid "%d-%b-%Y"
msgstr "%Y-%m-%d"
-#: ../filter/filter-datespec.c:406
+#: ../filter/filter-datespec.c:415
msgid "Select a time to compare against"
msgstr "选择用于比较的时间"
@@ -10193,10 +10192,11 @@ msgid "Include threads"
msgstr "包含线索"
#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:291
msgid "Incoming"
msgstr "接收"
-#: ../filter/filter-rule.c:978
+#: ../filter/filter-rule.c:978 ../mail/em-utils.c:292
msgid "Outgoing"
msgstr "寄出"
@@ -10302,15 +10302,15 @@ msgstr "您指定的时间"
msgid "years"
msgstr "年"
-#: ../filter/rule-editor.c:285
+#: ../filter/rule-editor.c:290
msgid "Add Rule"
msgstr "添加规则"
-#: ../filter/rule-editor.c:361
+#: ../filter/rule-editor.c:366
msgid "Edit Rule"
msgstr "编辑规则"
-#: ../filter/rule-editor.c:693
+#: ../filter/rule-editor.c:698
msgid "Rule name"
msgstr "规则名"
@@ -10399,50 +10399,50 @@ msgstr ""
msgid "Select Folder"
msgstr "选择文件夹"
-#: ../mail/em-account-editor.c:758
+#: ../mail/em-account-editor.c:760
msgid "Ask for each message"
msgstr "每封信都询问"
-#: ../mail/em-account-editor.c:1719 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1724 ../mail/mail-config.glade.h:90
msgid "Identity"
msgstr "标识"
-#: ../mail/em-account-editor.c:1755 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1760 ../mail/mail-config.glade.h:117
msgid "Receiving Email"
msgstr "接收电子邮件"
-#: ../mail/em-account-editor.c:1938
+#: ../mail/em-account-editor.c:1943
msgid "Automatically check for _new mail every"
msgstr "自动检查新邮件的间隔(_N)"
-#: ../mail/em-account-editor.c:2106 ../mail/mail-config.glade.h:128
+#: ../mail/em-account-editor.c:2111 ../mail/mail-config.glade.h:128
msgid "Sending Email"
msgstr "发送电子邮件"
-#: ../mail/em-account-editor.c:2157 ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2162 ../mail/mail-config.glade.h:68
msgid "Defaults"
msgstr "默认"
#. Security settings
-#: ../mail/em-account-editor.c:2216 ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2221 ../mail/mail-config.glade.h:122
#: ../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:2253 ../mail/em-account-editor.c:2327
+#: ../mail/em-account-editor.c:2258 ../mail/em-account-editor.c:2332
msgid "Receiving Options"
msgstr "接收选项"
-#: ../mail/em-account-editor.c:2254 ../mail/em-account-editor.c:2328
+#: ../mail/em-account-editor.c:2259 ../mail/em-account-editor.c:2333
msgid "Checking for New Mail"
msgstr "检查新邮件"
-#: ../mail/em-account-editor.c:2652 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:34
msgid "Account Editor"
msgstr "账户编辑器"
-#: ../mail/em-account-editor.c:2652 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2657 ../mail/mail-config.glade.h:80
msgid "Evolution Account Assistant"
msgstr "Evolution 账户助手"
@@ -10480,7 +10480,7 @@ msgstr "添加签名脚本"
msgid "Signature(s)"
msgstr "签名"
-#: ../mail/em-composer-utils.c:853
+#: ../mail/em-composer-utils.c:853 ../mail/em-format-quote.c:389
msgid "-------- Forwarded Message --------"
msgstr "-------- 转发的信件 --------"
@@ -10747,7 +10747,7 @@ msgid "Stop Processing"
msgstr "停止处理"
#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1671
-#: ../mail/em-format-quote.c:310 ../mail/em-format.c:848
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:848
#: ../mail/em-mailer-prefs.c:88 ../mail/message-list.etspec.h:13
#: ../mail/message-tag-followup.c:330
#: ../plugins/groupwise-features/properties.glade.h:7
@@ -10765,8 +10765,8 @@ msgid "<b>Then</b>"
msgstr "<b>则</b>"
#: ../mail/em-folder-browser.c:134
-msgid "Create _vFolder From Search..."
-msgstr "从头创建虚拟文件夹(_V)..."
+msgid "C_reate Search Folder From Search..."
+msgstr "从头创建搜索文件夹(_R)..."
#. TODO: can this be done in a loop?
#: ../mail/em-folder-properties.c:144
@@ -10798,8 +10798,8 @@ msgstr "文件夹名称(_N):"
#: ../mail/em-folder-tree-model.c:201 ../mail/em-folder-tree-model.c:203
#: ../mail/mail-vfolder.c:937 ../mail/mail-vfolder.c:1007
-msgid "vFolders"
-msgstr "虚拟文件夹"
+msgid "Search Folders"
+msgstr "搜索文件夹"
#. UNMATCHED is always last
#: ../mail/em-folder-tree-model.c:207 ../mail/em-folder-tree-model.c:209
@@ -10831,68 +10831,68 @@ msgstr "正在装入..."
msgid "Mail Folder Tree"
msgstr "邮件文件夹树"
-#: ../mail/em-folder-tree.c:922
+#: ../mail/em-folder-tree.c:849
#, c-format
msgid "Moving folder %s"
msgstr "移动文件夹“%s”"
-#: ../mail/em-folder-tree.c:924
+#: ../mail/em-folder-tree.c:851
#, c-format
msgid "Copying folder %s"
msgstr "复制文件夹 %s"
-#: ../mail/em-folder-tree.c:931 ../mail/message-list.c:1613
+#: ../mail/em-folder-tree.c:858 ../mail/message-list.c:1613
#, c-format
msgid "Moving messages into folder %s"
msgstr "把信件移动到文件夹 %s"
-#: ../mail/em-folder-tree.c:933 ../mail/message-list.c:1615
+#: ../mail/em-folder-tree.c:860 ../mail/message-list.c:1615
#, c-format
msgid "Copying messages into folder %s"
msgstr "把信件复制到文件夹 %s"
-#: ../mail/em-folder-tree.c:949
+#: ../mail/em-folder-tree.c:876
msgid "Cannot drop message(s) into toplevel store"
msgstr "无法将信件放到顶级文件夹存储"
-#: ../mail/em-folder-tree.c:1045 ../ui/evolution-mail-message.xml.h:101
+#: ../mail/em-folder-tree.c:972 ../ui/evolution-mail-message.xml.h:101
msgid "_Copy to Folder"
msgstr "复制到文件夹(_C)"
-#: ../mail/em-folder-tree.c:1046 ../ui/evolution-mail-message.xml.h:111
+#: ../mail/em-folder-tree.c:973 ../ui/evolution-mail-message.xml.h:111
msgid "_Move to Folder"
msgstr "移动到文件夹(_M)"
-#: ../mail/em-folder-tree.c:1751 ../mail/mail-ops.c:1056
+#: ../mail/em-folder-tree.c:1678 ../mail/mail-ops.c:1057
#, c-format
msgid "Scanning folders in \"%s\""
msgstr "在“%s”中扫描文件夹"
-#: ../mail/em-folder-tree.c:2104 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2031 ../ui/evolution-addressbook.xml.h:44
#: ../ui/evolution-mail-global.xml.h:23
#: ../ui/evolution-mail-messagedisplay.xml.h:8
#: ../ui/evolution-message-composer.xml.h:54 ../ui/evolution.xml.h:45
msgid "_View"
msgstr "查看(_V)"
-#: ../mail/em-folder-tree.c:2105
+#: ../mail/em-folder-tree.c:2032
msgid "Open in _New Window"
msgstr "在新窗口中打开(_N)"
-#: ../mail/em-folder-tree.c:2109
+#: ../mail/em-folder-tree.c:2036
msgid "_Copy..."
msgstr "复制(_C)..."
-#: ../mail/em-folder-tree.c:2110
+#: ../mail/em-folder-tree.c:2037
msgid "_Move..."
msgstr "移动(_M)..."
#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2114
+#: ../mail/em-folder-tree.c:2041
msgid "_New Folder..."
msgstr "新建文件夹(_N)..."
-#: ../mail/em-folder-tree.c:2117 ../ui/evolution-mail-list.xml.h:29
+#: ../mail/em-folder-tree.c:2044 ../ui/evolution-mail-list.xml.h:29
msgid "_Rename..."
msgstr "重命名(_R)..."
@@ -10901,43 +10901,42 @@ msgstr "重命名(_R)..."
msgid "Copying `%s' to `%s'"
msgstr "把“%s”复制到 %s"
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-utils.c:380
-#: ../mail/em-folder-view.c:931 ../mail/em-folder-view.c:946
-#: ../mail/importers/evolution-mbox-importer.c:85
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:931
+#: ../mail/em-folder-view.c:946 ../mail/importers/evolution-mbox-importer.c:85
#: ../mail/importers/evolution-outlook-importer.c:134
msgid "Select folder"
msgstr "选择文件夹"
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:946
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:946
msgid "C_opy"
msgstr "复制(_O)"
-#: ../mail/em-folder-utils.c:515
+#: ../mail/em-folder-utils.c:503
#, c-format
msgid "Rename the \"%s\" folder to:"
msgstr "将“%s”文件夹重命名为:"
-#: ../mail/em-folder-utils.c:517
+#: ../mail/em-folder-utils.c:505
msgid "Rename Folder"
msgstr "重命名文件夹"
-#: ../mail/em-folder-utils.c:523
+#: ../mail/em-folder-utils.c:511
msgid "Folder names cannot contain '/'"
msgstr "文件夹名不能含有字符“/”"
-#: ../mail/em-folder-utils.c:593
+#: ../mail/em-folder-utils.c:581
#: ../plugins/groupwise-features/share-folder-common.c:140
#, c-format
msgid "Creating folder `%s'"
msgstr "创建文件夹“%s”"
-#: ../mail/em-folder-utils.c:742
+#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:156
#: ../plugins/groupwise-features/share-folder-common.c:382
msgid "Create folder"
msgstr "创建文件夹"
-#: ../mail/em-folder-utils.c:742
+#: ../mail/em-folder-utils.c:730
#: ../plugins/groupwise-features/install-shared.c:156
#: ../plugins/groupwise-features/share-folder-common.c:382
msgid "Specify where to create the folder:"
@@ -11013,20 +11012,20 @@ msgid "Crea_te Rule From Message"
msgstr "根据信件创建规则(_T)"
#: ../mail/em-folder-view.c:1074
-msgid "vFolder on _Subject"
-msgstr "基于主题的虚拟文件夹(_S)"
+msgid "Search Folder from _Subject"
+msgstr "基于主题的搜索文件夹(_S)"
#: ../mail/em-folder-view.c:1075
-msgid "vFolder on Se_nder"
-msgstr "基于发件人的虚拟文件夹(_N)"
+msgid "Search Folder from Se_nder"
+msgstr "基于发件人的搜索文件夹(_N)"
#: ../mail/em-folder-view.c:1076
-msgid "vFolder on _Recipients"
-msgstr "基于收件人的虚拟文件夹(_R)"
+msgid "Search Folder from _Recipients"
+msgstr "基于收件人的搜索文件夹(_R)"
#: ../mail/em-folder-view.c:1077
-msgid "vFolder on Mailing _List"
-msgstr "基于邮件列表的虚拟文件夹(_L)"
+msgid "Search Folder from Mailing _List"
+msgstr "基于邮件列表的搜索文件夹(_L)"
#: ../mail/em-folder-view.c:1081
msgid "Filter on Sub_ject"
@@ -11064,8 +11063,8 @@ msgid "_Copy Link Location"
msgstr "复制链接位置(_C)"
#: ../mail/em-folder-view.c:2419
-msgid "Create _vFolder"
-msgstr "创建虚拟文件夹(_V)"
+msgid "Create _Search Folder"
+msgstr "创建搜索文件夹(_S)"
#: ../mail/em-folder-view.c:2420
msgid "_From this Address"
@@ -11081,66 +11080,66 @@ msgid "Click to mail %s"
msgstr "单击以给 %s 发送邮件"
#. message-search popup match count string
-#: ../mail/em-format-html-display.c:444
+#: ../mail/em-format-html-display.c:442
#, c-format
msgid "Matches: %d"
msgstr "匹配:%d"
-#: ../mail/em-format-html-display.c:691 ../mail/em-format-html.c:596
+#: ../mail/em-format-html-display.c:694 ../mail/em-format-html.c:596
msgid "Unsigned"
msgstr "未签名"
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:694
msgid ""
"This message is not signed. There is no guarantee that this message is "
"authentic."
msgstr "此信件未签名。无法保证这封信是可信的。"
-#: ../mail/em-format-html-display.c:692 ../mail/em-format-html.c:597
+#: ../mail/em-format-html-display.c:695 ../mail/em-format-html.c:597
msgid "Valid signature"
msgstr "有效签名"
-#: ../mail/em-format-html-display.c:692
+#: ../mail/em-format-html-display.c:695
msgid ""
"This message is signed and is valid meaning that it is very likely that this "
"message is authentic."
msgstr "此信件已签名,而且签名是有效的。这意味着这封信应该是可信的。"
-#: ../mail/em-format-html-display.c:693 ../mail/em-format-html.c:598
+#: ../mail/em-format-html-display.c:696 ../mail/em-format-html.c:598
msgid "Invalid signature"
msgstr "无效签名"
-#: ../mail/em-format-html-display.c:693
+#: ../mail/em-format-html-display.c:696
msgid ""
"The signature of this message cannot be verified, it may have been altered "
"in transit."
msgstr "无法校验这封信的签名,可能在传送的过程中邮件被篡改了。"
-#: ../mail/em-format-html-display.c:694
+#: ../mail/em-format-html-display.c:697
msgid "Valid signature, cannot verify sender"
msgstr "签名有效,无法校验发送者"
-#: ../mail/em-format-html-display.c:694
+#: ../mail/em-format-html-display.c:697
msgid ""
"This message is signed with a valid signature, but the sender of the message "
"cannot be verified."
msgstr "这封信的签名有效,但是无法校验邮件的发送者。"
-#: ../mail/em-format-html-display.c:700 ../mail/em-format-html.c:605
+#: ../mail/em-format-html-display.c:703 ../mail/em-format-html.c:605
msgid "Unencrypted"
msgstr "未加密"
-#: ../mail/em-format-html-display.c:700
+#: ../mail/em-format-html-display.c:703
msgid ""
"This message is not encrypted. Its content may be viewed in transit across "
"the Internet."
msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
-#: ../mail/em-format-html-display.c:701 ../mail/em-format-html.c:606
+#: ../mail/em-format-html-display.c:704 ../mail/em-format-html.c:606
msgid "Encrypted, weak"
msgstr "弱加密"
-#: ../mail/em-format-html-display.c:701
+#: ../mail/em-format-html-display.c:704
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 "
@@ -11149,21 +11148,21 @@ msgstr ""
"这封信已加密,但使用的是弱加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这很困难但并不是不可能。"
-#: ../mail/em-format-html-display.c:702 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:705 ../mail/em-format-html.c:607
msgid "Encrypted"
msgstr "加密"
-#: ../mail/em-format-html-display.c:702
+#: ../mail/em-format-html-display.c:705
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:703 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:706 ../mail/em-format-html.c:608
msgid "Encrypted, strong"
msgstr "强加密"
-#: ../mail/em-format-html-display.c:703
+#: ../mail/em-format-html-display.c:706
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 "
@@ -11172,70 +11171,70 @@ msgstr ""
"这封信已加密,且使用的是强加密算法。如果外人想要查看这封信的内容,可能要花大"
"量时间进行暴力破解,这十分困难。"
-#: ../mail/em-format-html-display.c:804 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:807 ../smime/gui/smime-ui.glade.h:48
msgid "_View Certificate"
msgstr "查看证书(_V)"
-#: ../mail/em-format-html-display.c:819
+#: ../mail/em-format-html-display.c:822
msgid "This certificate is not viewable"
msgstr "此证书不可查看"
-#: ../mail/em-format-html-display.c:1107
+#: ../mail/em-format-html-display.c:1104
msgid "Completed on %B %d, %Y, %l:%M %p"
msgstr "%Y年%m月%d日%A,%H:%M完成"
-#: ../mail/em-format-html-display.c:1115
+#: ../mail/em-format-html-display.c:1112
msgid "Overdue:"
msgstr "延期:"
-#: ../mail/em-format-html-display.c:1118
+#: ../mail/em-format-html-display.c:1115
msgid "by %B %d, %Y, %l:%M %p"
msgstr "到 %m月%d日%A,%H:%M"
-#: ../mail/em-format-html-display.c:1178
+#: ../mail/em-format-html-display.c:1175
msgid "_View Inline"
msgstr "嵌入视图(_V)"
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1176
msgid "_Hide"
msgstr "隐藏(_H)"
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1177
msgid "_Fit to Width"
msgstr "适合宽度(_F)"
-#: ../mail/em-format-html-display.c:1181
+#: ../mail/em-format-html-display.c:1178
msgid "Show _Original Size"
msgstr "显示原始大小(_O)"
-#: ../mail/em-format-html-display.c:1550
+#: ../mail/em-format-html-display.c:1547
msgid "Attachment Button"
msgstr "附件按钮"
-#: ../mail/em-format-html-display.c:1757
+#: ../mail/em-format-html-display.c:1754
msgid "Select folder to save all attachments..."
msgstr "选择保存全部附件的文件夹..."
-#: ../mail/em-format-html-display.c:1795
+#: ../mail/em-format-html-display.c:1792
msgid "Select folder to save selected attachments..."
msgstr "选择保存选中附件的文件夹..."
-#: ../mail/em-format-html-display.c:1803
+#: ../mail/em-format-html-display.c:1800
msgid "Save Selected..."
msgstr "保存所选附件..."
#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1870
+#: ../mail/em-format-html-display.c:1867
#, c-format
msgid "%d Attachment"
msgid_plural "%d Attachments"
msgstr[0] "%d 个附件"
-#: ../mail/em-format-html-display.c:1898
+#: ../mail/em-format-html-display.c:1895
msgid "No Attachment"
msgstr "无附件"
-#: ../mail/em-format-html-display.c:1901
+#: ../mail/em-format-html-display.c:1898
msgid "Save All"
msgstr "全部保存"
@@ -11294,35 +11293,35 @@ msgstr "指向未知的外部数据 (“%s”类型)"
msgid "Formatting message"
msgstr "格式化信件"
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:843 ../mail/em-mailer-prefs.c:83
#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:326
msgid "From"
msgstr "发件人"
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:84
msgid "Reply-To"
msgstr "回复至"
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:85
#: ../mail/message-list.etspec.h:14
msgid "To"
msgstr "收件人"
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:86
msgid "Cc"
msgstr "抄送"
-#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:197
+#: ../mail/em-format-html.c:1563 ../mail/em-format-quote.c:200
#: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:87
msgid "Bcc"
msgstr "密件抄送"
#. pseudo-header
-#: ../mail/em-format-html.c:1675 ../mail/em-format-quote.c:319
+#: ../mail/em-format-html.c:1675 ../mail/em-format-quote.c:322
#: ../mail/em-mailer-prefs.c:987
msgid "Mailer"
msgstr "邮件程序"
@@ -11337,7 +11336,7 @@ msgstr "<I> (%A,%R %Z)</I>"
msgid "<I> (%R %Z)</I>"
msgstr "<I> (%R %Z)</I>"
-#: ../mail/em-format-html.c:1715 ../mail/em-format-quote.c:326
+#: ../mail/em-format-html.c:1715 ../mail/em-format-quote.c:329
#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:89
#: ../mail/message-list.etspec.h:2
msgid "Date"
@@ -11353,27 +11352,27 @@ msgstr "新闻组"
msgid "%s attachment"
msgstr "%s 附件"
-#: ../mail/em-format.c:1140 ../mail/em-format.c:1273
+#: ../mail/em-format.c:1140 ../mail/em-format.c:1279
msgid "Could not parse S/MIME message: Unknown error"
msgstr "无法解析 S/MIME 信件:未知错误"
-#: ../mail/em-format.c:1263
+#: ../mail/em-format.c:1269
msgid "Unsupported encryption type for multipart/encrypted"
msgstr "不支持 multipart/encrypted 的加密类型"
-#: ../mail/em-format.c:1411
+#: ../mail/em-format.c:1417
msgid "Could not parse MIME message. Displaying as source."
msgstr "无法解析 MIME 信件。显示源文本。"
-#: ../mail/em-format.c:1430
+#: ../mail/em-format.c:1436
msgid "Unsupported signature format"
msgstr "不支持的签名格式"
-#: ../mail/em-format.c:1438
+#: ../mail/em-format.c:1444
msgid "Error verifying signature"
msgstr "校验签名错误"
-#: ../mail/em-format.c:1438
+#: ../mail/em-format.c:1444
msgid "Unknown error verifying signature"
msgstr "校验签名发生了未知错误"
@@ -11516,35 +11515,35 @@ msgstr "没有选中服务器"
msgid "Don't show this message again."
msgstr "不再显示此信息。"
-#: ../mail/em-utils.c:294
+#: ../mail/em-utils.c:299
msgid "Filters"
msgstr "过滤器"
-#: ../mail/em-utils.c:437 ../mail/em-utils.c:474
+#: ../mail/em-utils.c:442 ../mail/em-utils.c:479
msgid "message"
msgstr "信件"
-#: ../mail/em-utils.c:609
+#: ../mail/em-utils.c:614
msgid "Save Message..."
msgstr "保存信件..."
-#: ../mail/em-utils.c:658
+#: ../mail/em-utils.c:663
msgid "Add address"
msgstr "添加地址"
#. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1137
+#: ../mail/em-utils.c:1142
#, c-format
msgid "Messages from %s"
msgstr "来自 %s 的信件"
#: ../mail/em-vfolder-editor.c:104
-msgid "v_Folders"
-msgstr "虚拟文件夹(_F)"
+msgid "Search _Folders"
+msgstr "搜索文件夹(_F)"
#: ../mail/em-vfolder-rule.c:574
-msgid "vFolder source"
-msgstr "虚拟文件夹来源"
+msgid "Search Folder source"
+msgstr "搜索文件夹来源"
#: ../mail/evolution-mail.schemas.in.in.h:1
msgid "Automatic link recognition"
@@ -12316,7 +12315,7 @@ msgid "<span weight=\"bold\">Filter Options</span>"
msgstr "<span weight=\"bold\">过滤器选项</span>"
#: ../mail/mail-config.glade.h:18
-#: ../plugins/itip-formatter/itip-formatter.c:1916
+#: ../plugins/itip-formatter/itip-formatter.c:1922
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">常规</span>"
@@ -12867,60 +12866,60 @@ msgstr "颜色"
msgid "description"
msgstr "描述"
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<b>vFolder Sources</b>"
-msgstr "<b>虚拟文件夹来源</b>"
+#: ../mail/mail-dialogs.glade.h:2
+msgid "<b>Search Folder Sources</b>"
+msgstr "<b>搜索文件夹来源</b>"
-#: ../mail/mail-dialogs.glade.h:4
+#: ../mail/mail-dialogs.glade.h:3
msgid "<span weight=\"bold\">Digital Signature</span>"
msgstr "<span weight=\"bold\">数字签名</span>"
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.glade.h:4
msgid "<span weight=\"bold\">Encryption</span>"
msgstr "<span weight=\"bold\">加密</span>"
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.glade.h:5
msgid "Case _Sensitive"
msgstr "区分大小写(_S)"
-#: ../mail/mail-dialogs.glade.h:7 ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
msgid "Co_mpleted"
msgstr "已完成(_M)"
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.glade.h:8
msgid "F_ind:"
msgstr "查找(_I):"
-#: ../mail/mail-dialogs.glade.h:10
+#: ../mail/mail-dialogs.glade.h:9
msgid "Find in Message"
msgstr "在信件中寻找"
-#: ../mail/mail-dialogs.glade.h:11 ../mail/message-tag-followup.c:295
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:295
#: ../mail/message-tags.glade.h:3
msgid "Flag to Follow Up"
msgstr "跟随的标志"
-#: ../mail/mail-dialogs.glade.h:12
+#: ../mail/mail-dialogs.glade.h:11
msgid "Folder Subscriptions"
msgstr "文件夹订阅"
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.glade.h:12
msgid "License Agreement"
msgstr "许可协议"
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.glade.h:13
msgid "None Selected"
msgstr "没有选中"
-#: ../mail/mail-dialogs.glade.h:15
+#: ../mail/mail-dialogs.glade.h:14
msgid "S_erver:"
msgstr "服务器(_E):"
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.glade.h:15
msgid "Security Information"
msgstr "安全信息"
-#: ../mail/mail-dialogs.glade.h:18 ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
msgid ""
"The messages you have selected for follow up are listed below.\n"
"Please select a follow up action from the \"Flag\" menu."
@@ -12928,44 +12927,44 @@ msgstr ""
"您选中进行跟随的信件已经在下面列出。\n"
"请从“标志”菜单中选择跟随操作。"
-#: ../mail/mail-dialogs.glade.h:20
+#: ../mail/mail-dialogs.glade.h:19
msgid "_Accept License"
msgstr "接受协议(_A)"
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
msgid "_Due By:"
msgstr "延期人(_D):"
-#: ../mail/mail-dialogs.glade.h:22 ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
msgid "_Flag:"
msgstr "标志(_F):"
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.glade.h:22
msgid "_Subscribe"
msgstr "订阅(_S)"
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.glade.h:23
msgid "_Tick this to accept the license agreement"
msgstr "选中此处以表明您接受许可协议(_T)"
-#: ../mail/mail-dialogs.glade.h:25
+#: ../mail/mail-dialogs.glade.h:24
#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
msgid "_Unsubscribe"
msgstr "退订(_U)"
-#: ../mail/mail-dialogs.glade.h:26
+#: ../mail/mail-dialogs.glade.h:25
msgid "specific folders only"
msgstr "仅指定文件夹"
-#: ../mail/mail-dialogs.glade.h:27
+#: ../mail/mail-dialogs.glade.h:26
msgid "with all active remote folders"
msgstr "以全部活跃远程文件夹"
-#: ../mail/mail-dialogs.glade.h:28
+#: ../mail/mail-dialogs.glade.h:27
msgid "with all local and active remote folders"
msgstr "以全部本地和活跃远程文件夹"
-#: ../mail/mail-dialogs.glade.h:29
+#: ../mail/mail-dialogs.glade.h:28
msgid "with all local folders"
msgstr "以所有本地文件夹"
@@ -12988,7 +12987,7 @@ msgstr "收取邮件"
msgid "Failed to apply outgoing filters: %s"
msgstr "应用寄出过滤器失败:%s"
-#: ../mail/mail-ops.c:574 ../mail/mail-ops.c:603
+#: ../mail/mail-ops.c:575 ../mail/mail-ops.c:604
#, c-format
msgid ""
"Failed to append to %s: %s\n"
@@ -12997,112 +12996,112 @@ msgstr ""
"追加到 %s:%s 失败\n"
"转而追加到本地“已发”文件夹。"
-#: ../mail/mail-ops.c:620
+#: ../mail/mail-ops.c:621
#, c-format
msgid "Failed to append to local `Sent' folder: %s"
msgstr "追加到本地“已发”文件夹失败:%s"
-#: ../mail/mail-ops.c:732
+#: ../mail/mail-ops.c:733
#, c-format
msgid "Sending message %d of %d"
msgstr "发送第%d封信,共%d封"
-#: ../mail/mail-ops.c:757
+#: ../mail/mail-ops.c:758
#, c-format
msgid "Failed to send %d of %d messages"
msgstr "在第%d封信失败,共%d封"
-#: ../mail/mail-ops.c:759 ../mail/mail-send-recv.c:613
+#: ../mail/mail-ops.c:760 ../mail/mail-send-recv.c:613
msgid "Cancelled."
msgstr "已取消。"
-#: ../mail/mail-ops.c:761
+#: ../mail/mail-ops.c:762
msgid "Complete."
msgstr "完成。"
-#: ../mail/mail-ops.c:858
+#: ../mail/mail-ops.c:859
msgid "Saving message to folder"
msgstr "把信件保存到文件夹中"
-#: ../mail/mail-ops.c:943
+#: ../mail/mail-ops.c:944
#, c-format
msgid "Moving messages to %s"
msgstr "把信件移动到 %s"
-#: ../mail/mail-ops.c:943
+#: ../mail/mail-ops.c:944
#, c-format
msgid "Copying messages to %s"
msgstr "把信件复制到 %s"
-#: ../mail/mail-ops.c:1166
+#: ../mail/mail-ops.c:1167
msgid "Forwarded messages"
msgstr "转发的信件"
-#: ../mail/mail-ops.c:1209
+#: ../mail/mail-ops.c:1210
#, c-format
msgid "Opening folder %s"
msgstr "打开文件夹 %s"
-#: ../mail/mail-ops.c:1281
+#: ../mail/mail-ops.c:1282
#, c-format
msgid "Opening store %s"
msgstr "打开存储 %s"
-#: ../mail/mail-ops.c:1359
+#: ../mail/mail-ops.c:1360
#, c-format
msgid "Removing folder %s"
msgstr "删除文件夹“%s”"
-#: ../mail/mail-ops.c:1453
+#: ../mail/mail-ops.c:1454
#, c-format
msgid "Storing folder '%s'"
msgstr "存储文件夹“%s”"
-#: ../mail/mail-ops.c:1518
+#: ../mail/mail-ops.c:1519
#, c-format
msgid "Expunging and storing account '%s'"
msgstr "销毁并存储账户“%s”"
-#: ../mail/mail-ops.c:1519
+#: ../mail/mail-ops.c:1520
#, c-format
msgid "Storing account '%s'"
msgstr "存储账户“%s”"
-#: ../mail/mail-ops.c:1574
+#: ../mail/mail-ops.c:1575
msgid "Refreshing folder"
msgstr "刷新文件夹"
-#: ../mail/mail-ops.c:1610 ../mail/mail-ops.c:1661
+#: ../mail/mail-ops.c:1611 ../mail/mail-ops.c:1662
msgid "Expunging folder"
msgstr "销毁文件夹"
-#: ../mail/mail-ops.c:1658
+#: ../mail/mail-ops.c:1659
#, c-format
msgid "Emptying trash in '%s'"
msgstr "清空“%s”中的回收站"
-#: ../mail/mail-ops.c:1659
+#: ../mail/mail-ops.c:1660
msgid "Local Folders"
msgstr "本地文件夹"
-#: ../mail/mail-ops.c:1742
+#: ../mail/mail-ops.c:1743
#, c-format
msgid "Retrieving message %s"
msgstr "收取信件 %s"
-#: ../mail/mail-ops.c:1852
+#: ../mail/mail-ops.c:1853
#, c-format
msgid "Retrieving %d message"
msgid_plural "Retrieving %d messages"
msgstr[0] "收取 %d 封信"
-#: ../mail/mail-ops.c:1938
+#: ../mail/mail-ops.c:1939
#, c-format
msgid "Saving %d message"
msgid_plural "Saving %d messsages"
msgstr[0] "保存 %d 封信"
-#: ../mail/mail-ops.c:1988
+#: ../mail/mail-ops.c:1989
#, c-format
msgid ""
"Unable to create output file: %s\n"
@@ -13111,7 +13110,7 @@ msgstr ""
"无法创建输出文件:%s\n"
" %s"
-#: ../mail/mail-ops.c:2016
+#: ../mail/mail-ops.c:2017
#, c-format
msgid ""
"Error saving messages to: %s:\n"
@@ -13120,11 +13119,11 @@ msgstr ""
"在将信件保存到 %s 时发生错误:\n"
" %s"
-#: ../mail/mail-ops.c:2087
+#: ../mail/mail-ops.c:2088
msgid "Saving attachment"
msgstr "保存附件"
-#: ../mail/mail-ops.c:2099
+#: ../mail/mail-ops.c:2100
#, c-format
msgid ""
"Cannot create output file: %s:\n"
@@ -13133,22 +13132,22 @@ msgstr ""
"无法创建输出文件:%s:\n"
" %s"
-#: ../mail/mail-ops.c:2109
+#: ../mail/mail-ops.c:2110
#, c-format
msgid "Could not write data: %s"
msgstr "无法写数据:%s"
-#: ../mail/mail-ops.c:2259
+#: ../mail/mail-ops.c:2260
#, c-format
msgid "Disconnecting from %s"
msgstr "断开与 %s 的连接"
-#: ../mail/mail-ops.c:2259
+#: ../mail/mail-ops.c:2260
#, c-format
msgid "Reconnecting to %s"
msgstr "重新连接到 %s"
-#: ../mail/mail-ops.c:2375
+#: ../mail/mail-ops.c:2376
msgid "Checking Service"
msgstr "检查服务"
@@ -13200,7 +13199,7 @@ msgstr "为 %s 输入密码"
msgid "Enter Password"
msgstr "输入密码"
-#: ../mail/mail-session.c:238
+#: ../mail/mail-session.c:244
msgid "User canceled operation."
msgstr "用户己取消操作。"
@@ -13243,26 +13242,26 @@ msgstr "无效的文件夹:“%s”"
#: ../mail/mail-vfolder.c:91
#, c-format
-msgid "Setting up vFolder: %s"
-msgstr "设置虚拟文件夹:%s"
+msgid "Setting up Search Folder: %s"
+msgstr "设置搜索文件夹:%s"
#: ../mail/mail-vfolder.c:240
#, c-format
-msgid "Updating vFolders for '%s:%s'"
-msgstr "更新“%s:%s”的虚拟文件夹"
+msgid "Updating Search Folders for '%s:%s'"
+msgstr "更新“%s:%s”的搜索文件夹"
#: ../mail/mail-vfolder.c:247
#, c-format
-msgid "Updating vFolders for '%s'"
-msgstr "更新“%s”的虚拟文件夹"
+msgid "Updating Search Folders for '%s'"
+msgstr "更新“%s”的搜索文件夹"
#: ../mail/mail-vfolder.c:1046
-msgid "Edit vFolder"
-msgstr "编辑虚拟文件夹"
+msgid "Edit Search Folder"
+msgstr "编辑搜索文件夹"
#: ../mail/mail-vfolder.c:1130
-msgid "New vFolder"
-msgstr "新建虚拟文件夹"
+msgid "New Search Folder"
+msgstr "新建搜索文件夹"
#: ../mail/mail.error.xml.h:1
msgid ""
@@ -13337,8 +13336,8 @@ msgid "Because &quot;{2}&quot;."
msgstr "原因是“{2}”。"
#: ../mail/mail.error.xml.h:19
-msgid "Cannot add vFolder &quot;{0}&quot;."
-msgstr "无法添加文件夹“{0}”。"
+msgid "Cannot add Search Folder &quot;{0}&quot;."
+msgstr "无法添加搜索文件夹“{0}”。"
#: ../mail/mail.error.xml.h:20
msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13365,8 +13364,8 @@ msgid "Cannot delete system folder &quot;{0}&quot;."
msgstr "无法删除系统文件夹“{0}”。"
#: ../mail/mail.error.xml.h:26
-msgid "Cannot edit vFolder &quot;{0}&quot; as it does not exist."
-msgstr "无法编辑虚拟文件夹“{0}”,原因是该文件夹不存在。"
+msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
+msgstr "无法编辑搜索文件夹“{0}”,原因是该文件夹不存在。"
#: ../mail/mail.error.xml.h:27
msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
@@ -13594,16 +13593,20 @@ msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?"
#: ../mail/mail.error.xml.h:79
+msgid "Search Folders automatically updated."
+msgstr "搜索文件夹已自动更新。"
+
+#: ../mail/mail.error.xml.h:80
msgid "Send Receipt"
msgstr "发送收条"
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
msgid ""
"System folders are required for Ximian Evolution to function correctly and "
"cannot be renamed, moved, or deleted."
msgstr "要让 Ximian Evolution 正常运作所需的系统文件夹无法重命名、移动或删除。"
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
msgid ""
"The contact list you are sending to is configured to hide list recipients.\n"
"\n"
@@ -13618,35 +13621,35 @@ msgstr ""
"个邮件头,将在您的信件中列出您的全部收件人。为了避免这种情况,您应该至少填入"
"一个 To: 或 CC: 收件人。"
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:85
msgid ""
-"The following filter rule(s):\n"
+"The following Search Folder(s):\n"
"{0}\n"
"Used the now removed folder:\n"
" &quot;{1}&quot;\n"
"And have been updated."
msgstr ""
-"下列过滤器规则:\n"
+"下列搜索文件夹:\n"
"{0}\n"
"使用现已删除的文件夹:\n"
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:90
msgid ""
-"The following vFolder(s):\n"
+"The following filter rule(s):\n"
"{0}\n"
"Used the now removed folder:\n"
" &quot;{1}&quot;\n"
"And have been updated."
msgstr ""
-"下列虚拟文件夹:\n"
+"下列过滤器规则:\n"
"{0}\n"
"使用现已删除的文件夹:\n"
"“{1}”\n"
"已经更新。"
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:95
msgid ""
"The message was sent via the &quot;sendmail&quot; external application. "
"Sendmail reports the following error: status 67: mail not sent.\n"
@@ -13657,75 +13660,75 @@ msgstr ""
"67:邮件未发出。\n"
"此信件仍然保存在发件夹中。请检查信件的错误,然后重新发送。"
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:97
msgid "The script file must exist and be executable."
msgstr "脚本文件必须存在且可执行。"
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
msgid ""
-"This folder may have been added implicitly, go to the vFolder editor to add "
-"it explicitly, if required."
+"This folder may have been added implicitly,\n"
+"go to the Search Folder editor to add it explicitly, if required."
msgstr ""
-"此文件夹可能已经隐式添加了。如果需要的话,请转到虚拟文件夹编辑器显式添加。"
+"此文件夹可能已经隐式添加了。如果需要的话,请转到搜索文件夹编辑器显式添加。"
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:100
msgid ""
"This message cannot be sent because you have not specified any Recipients"
msgstr "无法发送此信件,因为您没有指定任何收件人"
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:101
msgid ""
"This server does not support this type of authentication and may not support "
"authentication at all."
msgstr "此服务器不支持此类型的身份验证,也可能根本不支持身份验证。"
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:102
msgid "This signature has been changed, but has not been saved."
msgstr "签名已经更改,但尚未保存。"
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:103
msgid "Unable to connect to the GroupWise server."
msgstr "无法连接到 GroupWise 服务器。"
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:104
msgid ""
"Unable to open the drafts folder for this account. Use the system drafts "
"folder instead?"
msgstr "无法打开此账户的草稿文件夹。使用系统的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:105
msgid "Unable to read license file."
msgstr "无法读取许可文件。"
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:106
msgid "Use _Default"
msgstr "使用默认值(_D)"
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:107
msgid "Use default drafts folder?"
msgstr "使用默认的草稿文件夹吗?"
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:108
msgid "You have not filled in all of the required information."
msgstr "您没有填入所需的全部信息。"
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:109
msgid "You have unsent messages, do you wish to quit anyway?"
msgstr "您有未发信件,您仍然想要退出吗?"
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:110
msgid "You may not create two accounts with the same name."
msgstr "您不能创建两个同名账户。"
-#: ../mail/mail.error.xml.h:109
-msgid "You must name this vFolder."
-msgstr "您必须为此虚拟文件夹命名。"
+#: ../mail/mail.error.xml.h:111
+msgid "You must name this Search Folder."
+msgstr "您必须为此搜索文件夹命名。"
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:112
msgid "You must specify a folder."
msgstr "您必须指定文件夹。"
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:113
msgid ""
"You must specify at least one folder as a source.\n"
"Either by selecting the folders individually, and/or by selecting all local "
@@ -13734,38 +13737,34 @@ msgstr ""
"您必须一次至少指定一个文件夹作为源。\n"
"或者逐一选择文件夹,或者选中全部本地文件夹和/或全部远程文件夹。"
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:115
msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
msgstr "您以“{1}”的身份登录到服务器“{0}”失败。"
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:116
msgid "Your message with the subject &quot;{0}&quot; was not delivered."
msgstr "您主题为“{0}”的信没有递送成功。"
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:117
msgid "_Append"
msgstr "追加(_A)"
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:118
msgid "_Discard changes"
msgstr "丢弃更改(_D)"
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:119
msgid "_Empty Trash"
msgstr "清空回收站(_E)"
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:120
msgid "_Expunge"
msgstr "销毁(_E)"
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:121
msgid "_Open Messages"
msgstr "打开信件(_O)"
-#: ../mail/mail.error.xml.h:122
-msgid "vFolders automatically updated."
-msgstr "虚拟文件夹已自动更新。"
-
#: ../mail/message-list.c:996
msgid "Unseen"
msgstr "未看"
@@ -14391,6 +14390,14 @@ msgstr "任务(_T):"
msgid "Permissions..."
msgstr "权限..."
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+msgid "Folder Name"
+msgstr "文件夹名称"
+
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+msgid "Folder Size"
+msgstr "文件夹大小"
+
#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
msgid "Exchange Folder Tree"
msgstr "Exchange 文件夹树"
@@ -14978,7 +14985,7 @@ msgstr "代理服务器登录"
#: ../plugins/groupwise-features/proxy-login.c:221
#: ../plugins/groupwise-features/proxy-login.c:263
-#: ../plugins/groupwise-features/proxy.c:470
+#: ../plugins/groupwise-features/proxy.c:490
#: ../plugins/groupwise-features/send-options.c:83
#, c-format
msgid "%sEnter password for %s (user %s)"
@@ -14988,7 +14995,7 @@ msgstr "%s输入 %s 的密码(用户 %s)"
msgid "_Proxy Login..."
msgstr "代理服务器登录(_P)..."
-#: ../plugins/groupwise-features/proxy.c:664
+#: ../plugins/groupwise-features/proxy.c:669
msgid "The Proxy tab will be available only when the account is enabled."
msgstr "代理服务器标签仅当账户启用时才可用。"
@@ -15004,7 +15011,7 @@ msgstr "输入用户及设定权限"
msgid "New _Shared Folder..."
msgstr "新建共享文件夹(_S)..."
-#: ../plugins/groupwise-features/share-folder-common.c:440
+#: ../plugins/groupwise-features/share-folder-common.c:444
msgid "Sharing"
msgstr "共享"
@@ -15101,26 +15108,26 @@ msgid ""
"imported"
msgstr "要处理这些全部项目,应该保存文件并导入日历"
-#: ../plugins/itip-formatter/itip-formatter.c:1907
+#: ../plugins/itip-formatter/itip-formatter.c:1913
msgid "Meetings and Tasks"
msgstr "会议和任务"
#. Delete message after acting
#. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:1930
+#: ../plugins/itip-formatter/itip-formatter.c:1936
msgid "_Delete message after acting"
msgstr "操作后删除消息(_D)"
-#: ../plugins/itip-formatter/itip-formatter.c:1940
+#: ../plugins/itip-formatter/itip-formatter.c:1946
msgid "<span weight=\"bold\">Conflict Search</span>"
msgstr "<span weight=\"bold\">冲突搜索</span>"
#. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:1953
+#: ../plugins/itip-formatter/itip-formatter.c:1959
msgid "Select the calendars to search for meeting conflicts"
msgstr "选择要搜索冲突会议的日历"
-#: ../plugins/itip-formatter/itip-formatter.c:1970
+#: ../plugins/itip-formatter/itip-formatter.c:1976
msgid "Conflict Search Table"
msgstr "冲突搜索表"
@@ -16235,23 +16242,23 @@ msgstr "导入(_I)"
msgid "Evolution Settings"
msgstr "Evolution 设置"
-#: ../shell/e-shell-utils.c:116
+#: ../shell/e-shell-utils.c:118
msgid "No folder name specified."
msgstr "没有指定文件夹名称。"
-#: ../shell/e-shell-utils.c:123
+#: ../shell/e-shell-utils.c:125
msgid "Folder name cannot contain the Return character."
msgstr "文件夹名不能含有回车符。"
-#: ../shell/e-shell-utils.c:129
+#: ../shell/e-shell-utils.c:131
msgid "Folder name cannot contain the character \"/\"."
msgstr "文件夹名不能含有字符“/”。"
-#: ../shell/e-shell-utils.c:135
+#: ../shell/e-shell-utils.c:137
msgid "Folder name cannot contain the character \"#\"."
msgstr "文件夹名不能含有字符“#”。"
-#: ../shell/e-shell-utils.c:141
+#: ../shell/e-shell-utils.c:143
msgid "'.' and '..' are reserved folder names."
msgstr "“.”和“..”是保留文件夹名。"
@@ -16297,19 +16304,19 @@ msgstr "脱机工作(_W)"
msgid "Work Offline"
msgstr "脱机工作"
-#: ../shell/e-shell-window.c:341
+#: ../shell/e-shell-window.c:343
msgid "Evolution is currently online. Click on this button to work offline."
msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
-#: ../shell/e-shell-window.c:349
+#: ../shell/e-shell-window.c:351
msgid "Evolution is in the process of going offline."
msgstr "Evolution 正在脱机过程中。"
-#: ../shell/e-shell-window.c:356
+#: ../shell/e-shell-window.c:358
msgid "Evolution is currently offline. Click on this button to work online."
msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
-#: ../shell/e-shell-window.c:717
+#: ../shell/e-shell-window.c:724
#, c-format
msgid "Switch to %s"
msgstr "切换到 %s"
@@ -17133,8 +17140,8 @@ msgid "Shutting down %s (%s)\n"
msgstr "关闭 %s (%s)\n"
#: ../ui/evolution-addressbook.xml.h:3
-msgid "Copy Contact(s) to Another Folder..."
-msgstr "把联系人复制到其它文件夹..."
+msgid "Copy Selected Contacts to Another Folder..."
+msgstr "把选中的联系人复制到其它文件夹..."
#: ../ui/evolution-addressbook.xml.h:4 ../ui/evolution-calendar.xml.h:2
msgid "Copy the selection"
@@ -17153,7 +17160,7 @@ msgid "Delete selected contacts"
msgstr "删除选中的联系人"
#: ../ui/evolution-addressbook.xml.h:11
-msgid "Move Contact(s) to Another Folder..."
+msgid "Move Selected Contacts to Another Folder..."
msgstr "把选中的联系人移动到其它文件夹..."
#: ../ui/evolution-addressbook.xml.h:12
@@ -17398,12 +17405,12 @@ msgid "Create a new folder for storing mail"
msgstr "创建存储邮件的新文件夹"
#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit rules for filtering new mail"
-msgstr "创建或编辑过滤新邮件的规则"
+msgid "Create or edit Search Folder definitions"
+msgstr "创建或编辑搜索文件夹定义"
#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit vFolder definitions"
-msgstr "创建或编辑虚拟文件夹定义"
+msgid "Create or edit rules for filtering new mail"
+msgstr "创建或编辑过滤新邮件的规则"
#: ../ui/evolution-mail-global.xml.h:7
msgid "Empty _Trash"
@@ -17617,36 +17624,36 @@ msgid "Create R_ule"
msgstr "创建规则(_U)"
#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a rule to filter messages from this sender"
-msgstr "根据此发件人创建信件过滤规则"
+msgid "Create a Search Folder for these recipients"
+msgstr "为这些收件人创建搜索文件夹"
#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a rule to filter messages to these recipients"
-msgstr "根据这些收件人创建信件过滤规则"
+msgid "Create a Search Folder for this mailing list"
+msgstr "为该邮件列表创建搜索文件夹"
#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "根据这封信列表创建信件过滤规则"
+msgid "Create a Search Folder for this sender"
+msgstr "为该发件人创建搜索文件夹"
#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a rule to filter messages with this subject"
-msgstr "根据此主题创建信件过滤规则"
+msgid "Create a Search Folder for this subject"
+msgstr "为该主题创建搜索文件夹"
#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a vFolder for these recipients"
-msgstr "为这些收件人创建虚拟文件夹"
+msgid "Create a rule to filter messages from this sender"
+msgstr "根据此发件人创建信件过滤规则"
#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a vFolder for this mailing list"
-msgstr "为该邮件列表创建虚拟文件夹"
+msgid "Create a rule to filter messages to these recipients"
+msgstr "根据这些收件人创建信件过滤规则"
#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a vFolder for this sender"
-msgstr "为该发件人创建虚拟文件夹"
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "根据这封信列表创建信件过滤规则"
#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a vFolder for this subject"
-msgstr "为该主题创建虚拟文件夹"
+msgid "Create a rule to filter messages with this subject"
+msgstr "根据此主题创建信件过滤规则"
#: ../ui/evolution-mail-message.xml.h:24
msgid "Decrease the text size"
@@ -17845,61 +17852,61 @@ msgid "Save the message as a text file"
msgstr "把信件存为文本文件"
#: ../ui/evolution-mail-message.xml.h:84
+msgid "Search Folder from Mailing _List..."
+msgstr "基于邮件列表的搜索文件夹(_L)..."
+
+#: ../ui/evolution-mail-message.xml.h:85
+msgid "Search Folder from Recipients..."
+msgstr "基于收件人的搜索文件夹..."
+
+#: ../ui/evolution-mail-message.xml.h:86
+msgid "Search Folder from S_ubject..."
+msgstr "基于主题的搜索文件夹(_U)..."
+
+#: ../ui/evolution-mail-message.xml.h:87
+msgid "Search Folder from Sen_der..."
+msgstr "基于发件人的搜索文件夹(_D)..."
+
+#: ../ui/evolution-mail-message.xml.h:88
msgid "Search for text in the body of the displayed message"
msgstr "在显示邮件的邮件体中搜索文本"
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:89
msgid "Select _All Text"
msgstr "选中所有文字(_A)"
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:90
msgid "Select all the text in a message"
msgstr "选中信件中的全部文本"
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:91
msgid "Set up the page settings for your current printer"
msgstr "设定您当前打印机的页面设置"
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:92
msgid "Show a blinking cursor in the body of displayed messages"
msgstr "在显示信件的信体中显示闪烁光标"
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:93
msgid "Show message in the normal style"
msgstr "以普通样式显示信件"
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:94
msgid "Show message with all email headers"
msgstr "显示邮件时显示所有信头"
-#: ../ui/evolution-mail-message.xml.h:91
+#: ../ui/evolution-mail-message.xml.h:95
msgid "Show the raw email source of the message"
msgstr "显示信件的原始邮件源代码"
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:96
msgid "Un-delete the selected messages"
msgstr "取消选中信件的删除"
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:97
msgid "Uni_mportant"
msgstr "不重要(_M)"
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "VFolder on Mailing _List..."
-msgstr "基于邮件列表的虚拟文件夹(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "VFolder on Recipients..."
-msgstr "基于收件人的虚拟文件夹..."
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "VFolder on S_ubject..."
-msgstr "基于主题的虚拟文件夹(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "VFolder on Sen_der..."
-msgstr "基于发件人的虚拟文件夹(_D)..."
-
#: ../ui/evolution-mail-message.xml.h:98
msgid "Zoom _Out"
msgstr "缩小(_O)"
@@ -18061,38 +18068,38 @@ msgid "Save As"
msgstr "另存为"
#: ../ui/evolution-message-composer.xml.h:20
+msgid "Save Draft"
+msgstr "保存草稿"
+
+#: ../ui/evolution-message-composer.xml.h:21
msgid "Save _As..."
msgstr "另存为(_A)..."
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:22
msgid "Save _Draft"
msgstr "保存草稿(_D)"
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:23
msgid "Save as draft"
msgstr "另存为草稿"
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:24
msgid "Save in folder..."
msgstr "保存到文件夹..."
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:25
#: ../ui/evolution-signature-editor.xml.h:9
msgid "Save the current file"
msgstr "保存当前文件"
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:26
msgid "Save the current file with a different name"
msgstr "用不同的文件名保存当前文件"
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:27
msgid "Save the message in a specified folder"
msgstr "在指定的文件夹中保存信件"
-#: ../ui/evolution-message-composer.xml.h:27
-msgid "SaveDraft"
-msgstr "保存草稿"
-
#: ../ui/evolution-message-composer.xml.h:29
#: ../ui/evolution-signature-editor.xml.h:11
msgid "Send the mail in HTML format"