Updated Simplified Chinese translation

svn path=/trunk/; revision=26630

2 files changed, 388 insertions, 592 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 6375b3fa2f..0857c9c6d4 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-07-13  Funda Wang  <fundawang@linux.net.cn>
+
+	* zh_CN.po: Updated Simplified Chinese translation.
+
 2004-07-12  Leonid Kanter <leon@asplinux.ru>
 
 	* ru.po: updated Russian translation
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 379d8aada4..3abbe609f7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-07-02 14:48-0400\n"
-"PO-Revision-Date: 2004-06-19 11:31+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-07-12 19:24+0200\n"
+"PO-Revision-Date: 2004-07-13 15:30+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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Report-Msgid-Bugs-To: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -52,43 +52,36 @@ msgstr "联系人头衔："
 msgid "evolution minicard"
 msgstr "evolution 袖珍卡"
 
-#. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
-#, fuzzy
 msgid "This addressbook could not be opened."
-msgstr "无法发送项目！\n"
+msgstr "无法打开此地址簿。"
 
-#. addressbook:ldap-init secondary
 #: addressbook/addressbook-errors.xml.h:4
 msgid ""
 "This addressbook server might unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr ""
+"地址簿服务器不可达，或者服务器名称拼错，又或者您的网络连接已断。"
 
 #. addressbook:ldap-auth primary
 #: addressbook/addressbook-errors.xml.h:6
-#, fuzzy
 msgid "Failed to authenticate with LDAP server."
-msgstr ""
-"无法认证到 IMAP 服务器。\n"
-"%s\n"
-"\n"
+msgstr "认证到 IMAP 服务器失败。"
 
 #. addressbook:ldap-auth secondary
 #: addressbook/addressbook-errors.xml.h:8
-#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr ""
-"选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；您的 Caps "
-"Lock 灯可能为开。"
+"选中此处以确保您的密码拼写正确，并确保您使用了支持的登录方式。"
+"请记住，很多密码都是区分大小写的；您的 Caps Lock 灯可能为开。"
 
 #. addressbook:ldap-search-base primary
 #: addressbook/addressbook-errors.xml.h:10
 msgid "This addressbook server does not have any suggested search bases."
-msgstr ""
+msgstr "此地址簿服务器不支持任何建议的搜索基础。"
 
 #. addressbook:ldap-search-base secondary
 #: addressbook/addressbook-errors.xml.h:12
@@ -97,32 +90,41 @@ msgid ""
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr ""
+"此 LDAP 服务器可能使用较早版本的 LDAP，所以无法支持此功能，或者是配置错误。"
+"请询问您的管理员有关支持的搜索基础一事。"
 
 #. addressbook:ldap-v3-schema primary
 #: addressbook/addressbook-errors.xml.h:14
-#, fuzzy
 msgid "This server does not support LDAPv3 schema information."
-msgstr "此存储不支持订阅，或订阅未启用。"
+msgstr "此服务器不支持 LDAPv3 大纲信息。"
 
 #. addressbook:ldap-get-schema primary
 #: addressbook/addressbook-errors.xml.h:16
-#, fuzzy
 msgid "Could not get schema information for LDAP server."
-msgstr "无法从服务器获取组列表。"
+msgstr "无法从 LDAP 服务器获取大纲信息。"
 
 #. addressbook:ldap-invalid-schema primary
 #: addressbook/addressbook-errors.xml.h:18
-#, fuzzy
 msgid "LDAP server did not respond with valid schema information."
-msgstr "IMAP 服务器应答不含有 %s 信息"
+msgstr "LDAP 服务器无法响应有效的大纲信息。"
 
 #. addressbook:remove-addressbook primary
 #: addressbook/addressbook-errors.xml.h:20
-#, fuzzy
 msgid "Could not remove addressbook."
-msgstr "无法装入地址簿"
+msgstr "无法删除地址簿。"
 
 #. addressbook:remove-addressbook secondary
+#. addressbook:generic-error primary
+#. addressbook:load-error secondary
+#. addressbook:search-error secondary
+#. mail:session-message-info secondary
+#. mail:session-message-info-cancel secondary
+#. mail:session-message-warning secondary
+#. mail:session-message-warning-cancel secondary
+#. mail:session-message-error secondary
+#. mail:session-message-error-cancel secondary
+#. mail:ask-session-password secondary
+#. mail:filter-load-error secondary
 #: addressbook/addressbook-errors.xml.h:22
 #: addressbook/addressbook-errors.xml.h:26
 #: addressbook/addressbook-errors.xml.h:34
@@ -136,11 +138,12 @@ msgstr "{0}"
 
 #. addressbook:edit-categories primary
 #: addressbook/addressbook-errors.xml.h:24
-#, fuzzy
 msgid "Category editor not available."
-msgstr "没有描述。"
+msgstr "类别编辑器不可用。"
 
 #. addressbook:generic-error secondary
+#. mail-composer:no-attach secondary
+#. mail:no-save-path secondary
 #: addressbook/addressbook-errors.xml.h:28
 #: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
 msgid "{1}"
@@ -148,25 +151,21 @@ msgstr "{1}"
 
 #. addressbook:load-error title
 #: addressbook/addressbook-errors.xml.h:30
-#, fuzzy
 msgid "Unable to open addressbook"
-msgstr "保存在地址簿中"
+msgstr "无法打开地址簿"
 
 #. addressbook:load-error primary
 #: addressbook/addressbook-errors.xml.h:32
-#, fuzzy
 msgid "Error loading addressbook."
 msgstr "装入默认地址簿错误。"
 
 #. addressbook:search-error primary
 #: addressbook/addressbook-errors.xml.h:36
-#, fuzzy
 msgid "Unable to perform search."
-msgstr "无法处理脱机文件夹"
+msgstr "无法执行搜索。"
 
 #. addressbook:prompt-save primary
 #: addressbook/addressbook-errors.xml.h:40
-#, fuzzy
 msgid "Would you like to save your changes?"
 msgstr "您希望保存更改吗？"
 
@@ -175,7 +174,7 @@ msgstr "您希望保存更改吗？"
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
-msgstr ""
+msgstr "您已对此联系人作出了修改。您想要保存这些更改吗？"
 
 #: addressbook/addressbook-errors.xml.h:43
 #: addressbook/gui/contact-editor/e-contact-editor.c:2803
@@ -185,13 +184,11 @@ msgstr "丢弃(_D)"
 
 #. addressbook:prompt-move primary
 #: addressbook/addressbook-errors.xml.h:45
-#, fuzzy
 msgid "Cannot move contact."
-msgstr "以及另外 %d 个联系人。"
+msgstr "无法移动联系人。"
 
 #. addressbook:prompt-move secondary
 #: addressbook/addressbook-errors.xml.h:47
-#, fuzzy
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -201,27 +198,24 @@ msgstr ""
 
 #. addressbook:save-error primary
 #: addressbook/addressbook-errors.xml.h:49
-#, fuzzy
 msgid "Unable to save contact(s)."
-msgstr "无法分析邮件内容"
+msgstr "无法保存联系人。"
 
 #. addressbook:save-error secondary
 #: addressbook/addressbook-errors.xml.h:51
-#, fuzzy
 msgid "Error saving contacts to {0}: {1}"
-msgstr "添加联系人出错"
+msgstr "将联系人保存到 {0}:{1} 出错"
 
 #. addressbook:backend-died primary
 #: addressbook/addressbook-errors.xml.h:53
-#, fuzzy
 msgid "The Evolution addressbook has quit unexpectedly."
-msgstr "Evolution 地址簿地址查看器"
+msgstr "Evolution 地址簿异常退出。"
 
 #. addressbook:backend-died secondary
 #: addressbook/addressbook-errors.xml.h:55
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
-msgstr ""
+msgstr "除非您重新启动 Evolution，否则 {0} 的联系人无法使用。"
 
 #: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
@@ -325,9 +319,8 @@ msgid "New Contacts Group"
 msgstr "新建联系人组"
 
 #: addressbook/gui/component/addressbook-component.c:110
-#, fuzzy
 msgid "Contacts Grou_p"
-msgstr "联系人组(_C)"
+msgstr "联系人组(_P)"
 
 #: addressbook/gui/component/addressbook-component.c:111
 msgid "Create a new contacts group"
@@ -349,6 +342,7 @@ msgid "Migrating `%s':"
 msgstr "升迁“%s”："
 
 #. create the local source group
+#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
@@ -357,6 +351,9 @@ msgid "On This Computer"
 msgstr "在此计算机中"
 
 #. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person task list
+#. orange
 #: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -465,7 +462,7 @@ msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
 msgid "Position of the vertical pane in main view"
-msgstr ""
+msgstr "主视图中垂直面板的位置"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
 msgid ""
@@ -475,7 +472,7 @@ msgstr ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
-msgstr ""
+msgstr "选择名称对话框中上次使用的文件夹 URI"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
@@ -864,9 +861,8 @@ msgid "_Find"
 msgstr "查找(_F)"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:8
-#, fuzzy
 msgid "_Search:"
-msgstr "搜索(_S)"
+msgstr "搜索(_S)："
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Email</b>"
@@ -2321,7 +2317,7 @@ msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "Add an email to the List"
-msgstr ""
+msgstr "将电子邮件添加到列表"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Insert email adresses from Adress Book"
@@ -2570,7 +2566,7 @@ msgid "Paste"
 msgstr "粘贴"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1123
-#: calendar/gui/e-calendar-view.c:1327
+#: calendar/gui/e-calendar-view.c:1340
 msgid "Current View"
 msgstr "当前视图"
 
@@ -3185,17 +3181,17 @@ msgstr "卡片视图"
 msgid "GTK Tree View"
 msgstr "GTK 树视图"
 
-#: addressbook/gui/widgets/test-reflow.c:106
+#: addressbook/gui/widgets/test-reflow.c:119
 msgid "Reflow Test"
 msgstr "回溯测试"
 
-#: addressbook/gui/widgets/test-reflow.c:107
+#: addressbook/gui/widgets/test-reflow.c:120
 #: addressbook/printing/test-contact-print-style-editor.c:54
 #: addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "版权 (C) 2000, Ximian, Inc."
 
-#: addressbook/gui/widgets/test-reflow.c:109
+#: addressbook/gui/widgets/test-reflow.c:122
 msgid "This should test the reflow canvas item"
 msgstr "这应该测试回溯原始项目"
 
@@ -3471,7 +3467,7 @@ msgstr ""
 
 #: addressbook/tools/evolution-addressbook-export.c:105
 msgid "Only support csv or vcard format."
-msgstr ""
+msgstr "仅支持 csv 或 vcard 格式。"
 
 #: addressbook/tools/evolution-addressbook-export.c:114
 msgid "In async mode, output must be file."
@@ -3502,9 +3498,10 @@ msgid "Unnamed List"
 msgstr "未命名的列表"
 
 #. calendar:prompt-cancel-meeting primary
+#. calendar:prompt-cancel-task primary
 #: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
 msgid "Would you like to send all the participants a cancellation notice?"
-msgstr ""
+msgstr "您是否想要给全部参与者发送取消通知？"
 
 #. calendar:prompt-cancel-meeting secondary
 #: calendar/calendar-errors.xml.h:4
@@ -3512,32 +3509,30 @@ msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr ""
+"如果您不发送取消通知，其他参与者也许不知道会议已经取消。"
 
 #: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
 #: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
 #: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
 #: calendar/calendar-errors.xml.h:97
-#, fuzzy
 msgid "Don't Send"
-msgstr "不删除"
+msgstr "不发送"
 
 #: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
 #: calendar/calendar-errors.xml.h:26
-#, fuzzy
 msgid "Send Notice"
-msgstr "发送给："
+msgstr "发送通知"
 
 #. calendar:prompt-delete-meeting primary
 #: calendar/calendar-errors.xml.h:8
-#, fuzzy
 msgid "Are you sure you want to delete this meeting?"
-msgstr "您确信您要删除该账户吗？"
+msgstr "您确信您要删除该会议吗？"
 
 #. calendar:prompt-delete-meeting secondary
 #: calendar/calendar-errors.xml.h:10
 msgid ""
 "All information on this meeting will be deleted and can not be restored."
-msgstr ""
+msgstr "此会议的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-cancel-task secondary
 #: calendar/calendar-errors.xml.h:14
@@ -3545,23 +3540,25 @@ msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
 msgstr ""
+"如果您不发送取消通知，其他参与者可能不知道任务已经删除。"
 
 #. calendar:prompt-delete-task primary
 #: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
-#, fuzzy
 msgid "Are you sure you want to delete this task?"
-msgstr "您确定要删除此联系人吗？"
+msgstr "您确定要删除此任务吗？"
 
 #. calendar:prompt-delete-task secondary
+#. calendar:prompt-delete-named-task secondary
+#. calendar:prompt-delete-task secondary
 #: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
 #: calendar/calendar-errors.xml.h:46
 msgid "All information on this task will be deleted and can not be restored."
-msgstr ""
+msgstr "此任务的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-cancel-journal primary
 #: calendar/calendar-errors.xml.h:22
 msgid "Would you like to send a cancellation notice for this journal entry?"
-msgstr ""
+msgstr "您是否想要为此日记项发送取消通知？"
 
 #. calendar:prompt-cancel-journal secondary
 #: calendar/calendar-errors.xml.h:24
@@ -3569,130 +3566,121 @@ msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr ""
+"如果您不发送取消通知，其他参与者人可能不知道日记项已经删除。"
 
 #. calendar:prompt-delete-journal primary
 #: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
-#, fuzzy
 msgid "Are you sure you want to delete this journal entry?"
-msgstr "您确信您要删除该账户吗？"
+msgstr "您确信您要删除该日记项吗？"
 
 #. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:30
 msgid ""
 "All information on this journal entry will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "此日记项的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-delete-titled-appointment primary
 #: calendar/calendar-errors.xml.h:32
-#, fuzzy
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
-msgstr "您确信您要删除该账户吗？"
+msgstr "您确信您要删除标题为“{0}”的约会吗？"
 
 #. calendar:prompt-delete-titled-appointment secondary
+#. calendar:prompt-delete-appointment secondary
 #: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
-msgstr ""
+msgstr "此约会的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-delete-appointment primary
 #: calendar/calendar-errors.xml.h:36
-#, fuzzy
 msgid "Are you sure you want to delete this appointment?"
-msgstr "您确信您要删除该账户吗？"
+msgstr "您确信您要删除该约会吗？"
 
 #. calendar:prompt-delete-named-task primary
 #: calendar/calendar-errors.xml.h:40
-#, fuzzy
 msgid "Are you sure you want to delete the '{0}' task?"
-msgstr "您确定要删除这些联系人吗？"
+msgstr "您确定要删除“{0}”任务吗？"
 
 #. calendar:prompt-delete-named-journal primary
 #: calendar/calendar-errors.xml.h:48
-#, fuzzy
 msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "您确信您要删除该账户吗？"
+msgstr "您确信您要删除日记项“{0}”吗？"
 
 #. calendar:prompt-delete-named-journal secondary
+#. calendar:prompt-delete-journal secondary
 #: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
 msgid ""
 "All information in this journal will be deleted and can not be restored."
-msgstr ""
+msgstr "此日记的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-delete-appointments primary
 #: calendar/calendar-errors.xml.h:56
-#, fuzzy
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "您确定要删除这些联系人吗？"
+msgstr "您确定要删除这 {0} 个约会吗？"
 
 #. calendar:prompt-delete-appointments secondary
 #: calendar/calendar-errors.xml.h:58
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "这些约会的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-delete-tasks primary
 #: calendar/calendar-errors.xml.h:60
-#, fuzzy
 msgid "Are you sure you want to delete these {0} tasks?"
-msgstr "您确定要删除这些联系人吗？"
+msgstr "您确定要删除这 {0} 个任务吗？"
 
 #. calendar:prompt-delete-tasks secondary
 #: calendar/calendar-errors.xml.h:62
 msgid "All information on these tasks will be deleted and can not be restored."
-msgstr ""
+msgstr "这些任务的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-delete-journals primary
 #: calendar/calendar-errors.xml.h:64
-#, fuzzy
 msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "您确定要删除这些联系人吗？"
+msgstr "您确定要删除这 {0} 个日记项吗？"
 
 #. calendar:prompt-delete-journals secondary
 #: calendar/calendar-errors.xml.h:66
 msgid ""
 "All information in these journal entries will be deleted and can not be "
 "restored."
-msgstr ""
+msgstr "这些日记项的全部信息将被删除，且无法恢复。"
 
 #. calendar:prompt-save-appointment title
 #: calendar/calendar-errors.xml.h:68
-#, fuzzy
 msgid "Save Appointment"
-msgstr "约会"
+msgstr "保存约会"
 
 #. calendar:prompt-save-appointment primary
 #: calendar/calendar-errors.xml.h:70
-#, fuzzy
 msgid "Would you like to save your changes to this appointment?"
-msgstr "您希望保存更改吗？"
+msgstr "您想要保存对约会的更改吗？"
 
 #. calendar:prompt-save-appointment secondary
 #: calendar/calendar-errors.xml.h:72
-#, fuzzy
 msgid "You have made changes to this appointment, but not yet saved them."
-msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗？"
+msgstr "您已经对此约会做出了更改，但尚未保存。"
 
 #: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
 msgid "Discard Changes"
 msgstr "丢弃更改"
 
 #: calendar/calendar-errors.xml.h:74
-#, fuzzy
 msgid "Save Changes"
-msgstr "保存邮件"
+msgstr "保存更改"
 
 #. calendar:prompt-meeting-invite primary
 #: calendar/calendar-errors.xml.h:76
 msgid "Would you like to send meeting invitations to participants?"
-msgstr ""
+msgstr "您是否想要给参与者发送会议邀请？"
 
 #. calendar:prompt-meeting-invite secondary
 #: calendar/calendar-errors.xml.h:78
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
-msgstr ""
+msgstr "将会向全部参与者发送电子邮件邀请，并要求他们答复。"
 
 #: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
 #: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
@@ -3703,7 +3691,7 @@ msgstr "发送"
 #. calendar:prompt-send-updated-meeting-info primary
 #: calendar/calendar-errors.xml.h:82
 msgid "Would you like to send updated meeting information to participants?"
-msgstr ""
+msgstr "您是否想要给参与者发送更新的会议信息？"
 
 #. calendar:prompt-send-updated-meeting-info secondary
 #: calendar/calendar-errors.xml.h:84
@@ -3711,23 +3699,24 @@ msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr ""
+"发送更新的信息将允许其他参与者使他们的日历保持最新。"
 
 #. calendar:prompt-send-task primary
 #: calendar/calendar-errors.xml.h:88
 msgid "Would you like to send this task to participants?"
-msgstr ""
+msgstr "您是否想要将此任务发送给参与者？"
 
 #. calendar:prompt-send-task secondary
 #: calendar/calendar-errors.xml.h:90
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr ""
+msgstr "将会向全部参与者发送电子邮件邀请，并允许他们接受此任务。"
 
 #. calendar:prompt-send-updated-task-info primary
 #: calendar/calendar-errors.xml.h:94
 msgid "Would you like to send updated task information to participants?"
-msgstr ""
+msgstr "您是否想要给参与者发送更新的任务信息？"
 
 #. calendar:prompt-send-updated-task-info secondary
 #: calendar/calendar-errors.xml.h:96
@@ -3735,27 +3724,27 @@ msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr ""
+"发送更新的信息允许其他参与者使他们的任务列表保持最新。"
 
 #. calendar:tasks-crashed primary
 #: calendar/calendar-errors.xml.h:100
 msgid "The Evolution tasks have quit unexpectedly."
-msgstr ""
+msgstr "Evolution 任务异常退出。"
 
 #. calendar:tasks-crashed secondary
 #: calendar/calendar-errors.xml.h:102
 msgid "Your tasks will not be available until Evolution is restarted."
-msgstr ""
+msgstr "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
 #. calendar:calendar-crashed primary
 #: calendar/calendar-errors.xml.h:104
-#, fuzzy
 msgid "The Evolution calendar has quit unexpectedly."
-msgstr "Evolution vCalendar 导入器"
+msgstr "Evolution 日历异常退出。"
 
 #. calendar:calendar-crashed secondary
 #: calendar/calendar-errors.xml.h:106
 msgid "Your calendars will not be available until Evolution is restarted."
-msgstr ""
+msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
@@ -3770,9 +3759,8 @@ msgstr "分割多日事件："
 #: calendar/conduits/calendar/calendar-conduit.c:1331
 #: calendar/conduits/todo/todo-conduit.c:852
 #: calendar/conduits/todo/todo-conduit.c:853
-#, fuzzy
 msgid "Could not start evolution-data-server"
-msgstr "无法启动 wombat 服务器"
+msgstr "无法启动 evolution-data-server"
 
 #: calendar/conduits/calendar/calendar-conduit.c:1439
 #: calendar/conduits/calendar/calendar-conduit.c:1442
@@ -3908,6 +3896,7 @@ msgid ""
 "Starting at %s\n"
 "Ending at %s"
 msgstr ""
+"%s 的提醒\n%s\n开始于 %s\n结束于 %s"
 
 #: calendar/gui/alarm-notify/alarm-queue.c:1069
 #: calendar/gui/alarm-notify/alarm-queue.c:1093
@@ -4016,27 +4005,27 @@ msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
 msgid "Position of the horizontal pane"
-msgstr ""
+msgstr "水平面板的位置"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Position of the horizontal pane in the month view"
-msgstr ""
+msgstr "月视图中水平面板的位置"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Position of the vertical pane"
-msgstr ""
+msgstr "垂直面板的位置"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Position of the vertical pane in the month view"
-msgstr ""
+msgstr "月视图中垂直面板的位置"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Position of the vertical pane in the task view"
-msgstr ""
+msgstr "任务视图中垂直面板的位置"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Programs that can run as part of alarms"
-msgstr ""
+msgstr "可运行为提醒部分的程序"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
 msgid "Show where events end in week and month views"
@@ -4048,7 +4037,7 @@ msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
 msgid "Units for determining when to hide tasks"
-msgstr ""
+msgstr "决定是否隐藏任务的单位"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
 msgid "Units of default reminder"
@@ -4108,7 +4097,7 @@ msgstr "无匹配"
 
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
 #: calendar/gui/dialogs/select-source-dialog.c:108
-#: calendar/gui/gnome-cal.c:1827
+#: calendar/gui/gnome-cal.c:1828
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -4124,7 +4113,7 @@ msgstr ""
 
 #: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
-msgstr ""
+msgstr "销毁较早的事件"
 
 #: calendar/gui/calendar-commands.c:363
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
@@ -4138,8 +4127,12 @@ msgstr "%Y年%m月%d日%A"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. %d = day of month, %b = abbreviated month name.
+#. You can change the order but don't change the
+#. specifiers or add anything.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
+#: calendar/gui/e-day-view-top-item.c:714 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%m月%d日%A"
@@ -4228,9 +4221,8 @@ msgid "New calendar"
 msgstr "新建日历"
 
 #: calendar/gui/calendar-component.c:1249
-#, fuzzy
 msgid "Cale_ndar"
-msgstr "日历"
+msgstr "日历(_N)"
 
 #: calendar/gui/calendar-component.c:1250
 msgid "Create a new calendar"
@@ -4280,38 +4272,32 @@ msgid "open_client(): %s"
 msgstr "open_client()：%s"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:2
-#, fuzzy
 msgid "<b>Alarm</b>\t"
-msgstr "<b>提醒</b>"
+msgstr "<b>提醒</b>\t"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Options</b>"
-msgstr "<b>日历列表选项</b>"
+msgstr "<b>选项</b>"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:4
-#, fuzzy
 msgid "<b>Repeat</b>"
-msgstr "<b>常规</b>"
+msgstr "<b>重复</b>"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:5
-#, fuzzy
 msgid "Add Alarm"
-msgstr "添加日历"
+msgstr "添加提醒"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:6
-#, fuzzy
 msgid "Custom _message"
-msgstr "撰写邮件"
+msgstr "自定义消息(_M)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Custom alarm sound"
-msgstr ""
+msgstr "自定义提醒声音"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:8
-#, fuzzy
 msgid "Mes_sage:"
-msgstr "邮件(_M)"
+msgstr "消息(_S)："
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
@@ -4337,24 +4323,20 @@ msgid "Send an email"
 msgstr "发送电子邮件"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:14
-#, fuzzy
 msgid "_Arguments:"
-msgstr "地址(_A)："
+msgstr "参数(_A)："
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:15
-#, fuzzy
 msgid "_Program:"
-msgstr "运行程序"
+msgstr "程序(_P)："
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:16
-#, fuzzy
 msgid "_Repeat the alarm"
-msgstr "重复提醒"
+msgstr "重复提醒(_R)"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:17
-#, fuzzy
 msgid "_Sound:"
-msgstr "发送(_S)"
+msgstr "声音(_S)："
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
@@ -4403,9 +4385,8 @@ msgid "A_dd"
 msgstr "添加(_D)"
 
 #: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#, fuzzy
 msgid "Alarms"
-msgstr "在 %s 时提醒"
+msgstr "提醒"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4912,9 +4893,8 @@ msgid "The item could not be deleted due to an error"
 msgstr "由于错误，无法删除项目"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-#, fuzzy
 msgid "Contacts..."
-msgstr "联系人"
+msgstr "联系人..."
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4939,9 +4919,8 @@ msgid "Scheduling"
 msgstr "调度"
 
 #: calendar/gui/dialogs/event-editor.c:176
-#, fuzzy
 msgid "Invitations"
-msgstr "方向"
+msgstr "邀请"
 
 #: calendar/gui/dialogs/event-editor.c:242
 #: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
@@ -4978,56 +4957,50 @@ msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
 
 #: calendar/gui/dialogs/event-page.c:1799
-#, fuzzy, c-format
+#, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
-msgstr[0] "在每次约会前"
+msgstr[0] "约会的 %d 天前"
 
 #: calendar/gui/dialogs/event-page.c:1807
-#, fuzzy, c-format
+#, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
-msgstr[0] "约会结束"
+msgstr[0] "约会的 %d 小时前"
 
 #: calendar/gui/dialogs/event-page.c:1815
-#, fuzzy, c-format
+#, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
-msgstr[0] "在每次约会前"
+msgstr[0] "约会的 %d 分钟前"
 
 #: calendar/gui/dialogs/event-page.glade.h:2
-#, fuzzy
 msgid "1 day before appointment"
-msgstr "在每次约会前"
+msgstr "约会的 1 天前"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-#, fuzzy
 msgid "1 hour before appointment"
-msgstr "在每次约会前"
+msgstr "约会的 1 小时前"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#, fuzzy
 msgid "15 minutes before appointment"
-msgstr "在每次约会前"
+msgstr "约会的 15 分钟前"
 
 #: calendar/gui/dialogs/event-page.glade.h:5
-#, fuzzy
 msgid "<b>Basics</b>"
-msgstr "<b>任务列表</b>"
+msgstr "<b>基本</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
 msgid "<b>Date and Time</b>"
-msgstr "<b>时间</b>"
+msgstr "<b>日期和时间</b>"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 msgid "A_ll day event"
 msgstr "全天事务(_L)"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#, fuzzy
 msgid "C_ustomize..."
-msgstr "保存当前视图..."
+msgstr "自定义(_U)..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
 #: calendar/gui/dialogs/task-page.glade.h:4
@@ -5035,15 +5008,13 @@ msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-#, fuzzy
 msgid "Cale_ndar:"
-msgstr "日历："
+msgstr "日历(_N)："
 
 #: calendar/gui/dialogs/event-page.glade.h:11
 #: calendar/gui/dialogs/task-page.glade.h:5
-#, fuzzy
 msgid "Classi_fication:"
-msgstr "分类"
+msgstr "分类(_F)："
 
 #: calendar/gui/dialogs/event-page.glade.h:12
 #: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
@@ -5069,9 +5040,8 @@ msgid "Public"
 msgstr "公开"
 
 #: calendar/gui/dialogs/event-page.glade.h:16
-#, fuzzy
 msgid "Show time as _busy"
-msgstr "将时间显示为"
+msgstr "将时间显示为忙(_B)"
 
 #: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
@@ -5080,17 +5050,15 @@ msgstr "概要(_U)："
 
 #: calendar/gui/dialogs/event-page.glade.h:18
 msgid "This appointment has customized alarms"
-msgstr ""
+msgstr "此约会有自定义提醒"
 
 #: calendar/gui/dialogs/event-page.glade.h:19
-#, fuzzy
 msgid "_Alarm"
-msgstr "清除(_C)"
+msgstr "提醒(_A)"
 
 #: calendar/gui/dialogs/event-page.glade.h:20
-#, fuzzy
 msgid "_Description:"
-msgstr "描述："
+msgstr "描述(_D)："
 
 #: calendar/gui/dialogs/event-page.glade.h:21
 #: calendar/gui/e-meeting-time-sel.c:613
@@ -5103,6 +5071,11 @@ msgid "_Start time:"
 msgstr "开始时间(_S)："
 
 #. an empty string is the same as 'None'
+#. add a "None" option to the stores menu
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
 #: calendar/gui/dialogs/meeting-page.c:313
 #: calendar/gui/dialogs/meeting-page.glade.h:6
 #: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
@@ -5189,30 +5162,25 @@ msgid "Status"
 msgstr "状态"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
-#, fuzzy
 msgid "<b>Attendees</b>"
-msgstr "<b>提醒</b>"
+msgstr "<b>与会者</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
-#, fuzzy
 msgid "<b>Organizer</b>"
-msgstr "<b>其它</b>"
+msgstr "<b>组织者</b>"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:4
-#, fuzzy
 msgid "Change Or_ganizer"
-msgstr "改变组织者(_C)"
+msgstr "更改组织者(_G)"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-meeting-time-sel.c:415
-#, fuzzy
 msgid "Con_tacts..."
-msgstr "联系人"
+msgstr "联系人(_T)..."
 
 #: calendar/gui/dialogs/meeting-page.glade.h:7
-#, fuzzy
 msgid "_Organizer:"
-msgstr "组织者："
+msgstr "组织者(_O)："
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
@@ -5332,27 +5300,24 @@ msgid "Date/Time"
 msgstr "日期/时间"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:1
-#, fuzzy
 msgid "<b>Exceptions</b>"
-msgstr "例外"
+msgstr "<b>例外</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
 msgid "<b>Preview</b>"
 msgstr "<b>预览</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:3
-#, fuzzy
 msgid "<b>Recurrence</b>"
-msgstr "再现"
+msgstr "<b>再现</b>"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:4
 msgid "Every"
 msgstr "每"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:5
-#, fuzzy
 msgid "This appointment rec_urs"
-msgstr "编辑约会(_E)"
+msgstr "此约会重现(_U)"
 
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
@@ -5395,14 +5360,12 @@ msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:1
-#, fuzzy
 msgid "<span weight=\"bold\">Miscellaneous\t</span>"
-msgstr "<span weight=\"bold\">邮件字体</span>"
+msgstr "<span weight=\"bold\">杂项\t</span>"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy
 msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">警告</span>"
+msgstr "<span weight=\"bold\">状态</span>"
 
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
@@ -5449,9 +5412,8 @@ msgid "Not Started"
 msgstr "尚未开始"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-#, fuzzy
 msgid "P_ercent complete:"
-msgstr "完成率：%i"
+msgstr "完成百分比(_E)："
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5494,14 +5456,12 @@ msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
 
 #: calendar/gui/dialogs/task-page.glade.h:2
-#, fuzzy
 msgid "<span weight=\"bold\">Basics</span>"
-msgstr "<span weight=\"bold\">选项</span>"
+msgstr "<span weight=\"bold\">基本</span>"
 
 #: calendar/gui/dialogs/task-page.glade.h:3
-#, fuzzy
 msgid "<span weight=\"bold\">Date and Time</span>"
-msgstr "<span weight=\"bold\">删除邮件</span>"
+msgstr "<span weight=\"bold\">日期和时间</span>"
 
 #: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
@@ -5519,58 +5479,48 @@ msgid "_Due date:"
 msgstr "到期日期(_D)："
 
 #: calendar/gui/dialogs/task-page.glade.h:13
-#, fuzzy
 msgid "_Group:"
-msgstr "组"
+msgstr "组(_G)："
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-#, fuzzy
 msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>日历选项</b>"
+msgstr "<b>忙/闲日历(_A)</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
 msgid "<b>Publishing Frequency</b>"
-msgstr "公布频率"
+msgstr "<b>公布频率</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
-#, fuzzy
 msgid "<b>Publishing _Location</b>"
-msgstr "忙/闲公布位置"
+msgstr "<b>公布位置(_L)</b>"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 msgid "Free/Busy Editor"
 msgstr "忙闲编辑器"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
-#, fuzzy
 msgid "_Daily"
-msgstr "每日"
+msgstr "每日(_D)"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#, fuzzy
 msgid "_Manual"
-msgstr "邮件(_M)"
+msgstr "手动(_M)"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#, fuzzy
 msgid "_Password:"
-msgstr "密码："
+msgstr "密码(_P)："
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#, fuzzy
 msgid "_Remember password"
-msgstr "记住密码"
+msgstr "记住密码(_R)"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-#, fuzzy
 msgid "_Username:"
-msgstr "用户名(_N)："
+msgstr "用户名(_U)："
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-#, fuzzy
 msgid "_Weekly"
-msgstr "每周"
+msgstr "每周(_W)"
 
 #: calendar/gui/e-alarm-list.c:395
 #, c-format
@@ -5824,7 +5774,7 @@ msgid "Updating objects"
 msgstr "更新对象"
 
 #: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: calendar/gui/e-calendar-view.c:1353 calendar/gui/e-calendar-view.c:1433
 #: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "打开(_O)"
@@ -5834,15 +5784,15 @@ msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
 #: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
-#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: calendar/gui/e-calendar-view.c:1354 calendar/gui/e-calendar-view.c:1439
 #: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存为(_S)..."
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
-#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
-#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-view.c:1332 calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1437 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
@@ -5850,14 +5800,14 @@ msgid "_Print..."
 msgstr "打印(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
-#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1403
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
 
 #: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
-#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1401
 #: mail/em-folder-tree.c:965 mail/message-list.c:1650
 #: 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:109
@@ -5866,8 +5816,8 @@ msgid "_Copy"
 msgstr "复制(_C)"
 
 #: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
-#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
-#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-view.c:1336 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1435 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
@@ -5891,7 +5841,7 @@ msgstr "把任务标记为完成(_M)"
 
 #. FIXME: need to disable for undeletable folders
 #: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
-#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: calendar/gui/e-calendar-view.c:1373 calendar/gui/e-calendar-view.c:1405
 #: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
 #: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
 #: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
@@ -5943,85 +5893,93 @@ msgstr "开始日期"
 msgid "Task sort"
 msgstr "任务排序"
 
-#: calendar/gui/e-calendar-view.c:1156
+#: calendar/gui/e-calendar-view.c:1169
 msgid "Moving items"
 msgstr "移动项目"
 
-#: calendar/gui/e-calendar-view.c:1158
+#: calendar/gui/e-calendar-view.c:1171
 msgid "Copying items"
 msgstr "复制项目"
 
-#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
+#: calendar/gui/e-calendar-view.c:1325 calendar/gui/e-calendar-view.c:1413
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
+#: calendar/gui/e-calendar-view.c:1326 calendar/gui/e-calendar-view.c:1418
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
+#: calendar/gui/e-calendar-view.c:1327 calendar/gui/e-calendar-view.c:1423
 msgid "New Meeting"
 msgstr "新会议"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
+#: calendar/gui/e-calendar-view.c:1328 calendar/gui/e-calendar-view.c:1428
 msgid "New Task"
 msgstr "新建任务"
 
-#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1342 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: calendar/gui/e-calendar-view.c:1330
+#: calendar/gui/e-calendar-view.c:1343
 msgid "_Select Date..."
 msgstr "选择日期(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1347 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "发布忙闲信息(_P)"
 
-#: calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1366
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: calendar/gui/e-calendar-view.c:1354
+#: calendar/gui/e-calendar-view.c:1367
 msgid "Mo_ve to Calendar..."
 msgstr "移动到日历(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1355
+#: calendar/gui/e-calendar-view.c:1368
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1356
+#: calendar/gui/e-calendar-view.c:1369
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
+#: calendar/gui/e-calendar-view.c:1374 calendar/gui/e-calendar-view.c:1406
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
+#: calendar/gui/e-calendar-view.c:1375 calendar/gui/e-calendar-view.c:1407
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
-#: calendar/gui/e-calendar-view.c:1396
+#: calendar/gui/e-calendar-view.c:1409
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
-#: calendar/gui/e-calendar-view.c:1398
+#: calendar/gui/e-calendar-view.c:1411
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1441 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "设置(_S)..."
 
 #. strftime format of a weekday, a date and a time, 24-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 24-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
+#. strptime format of a weekday, a date and a time,
+#. in 12-hour format.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format.
 #: calendar/gui/e-cell-date-edit-text.c:120 e-util/e-time-utils.c:175
 #: e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
@@ -6045,14 +6003,21 @@ msgstr "%02i 分钟分割"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
+#. strftime format %A = full weekday name, %d = day of
+#. month, %B = full month name. You can change the
+#. order but don't change the specifiers or add
+#. anything.
+#: calendar/gui/e-day-view-top-item.c:710 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: calendar/gui/e-day-view-top-item.c:718 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%B%d日"
@@ -6563,6 +6528,10 @@ msgstr "%Y年%m月%d日%A"
 
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
+#. This is a strftime() format string %a = abbreviated weekday name,
+#. %m = month number, %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. strftime format of a weekday and a date.
 #: calendar/gui/e-meeting-time-sel-item.c:456
 #: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
 #: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
@@ -6571,6 +6540,10 @@ msgstr "%Y年%m月%d日%A"
 
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
+#. strptime format of a weekday and a date.
+#. This is the preferred date format for the locale.
+#. This is a strftime() format for a short date. %m = month,
+#. %d = day of month, %Y = year (all digits).
 #: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
 #: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
 msgid "%m/%d/%Y"
@@ -6585,9 +6558,8 @@ msgid "No Information"
 msgstr "没有信息"
 
 #: calendar/gui/e-meeting-time-sel.c:432
-#, fuzzy
 msgid "O_ptions"
-msgstr "选项"
+msgstr "选项(_P)"
 
 #: calendar/gui/e-meeting-time-sel.c:449
 msgid "Show _only working hours"
@@ -6634,7 +6606,7 @@ msgstr "必需的人和一个资源(_O)"
 msgid "Enter the password for %s"
 msgstr "为 %s 输入密码"
 
-#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2160
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6668,22 +6640,22 @@ msgstr "销毁"
 msgid "Updating query"
 msgstr "更新查询"
 
-#: calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2007
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "装入位于 %s 的约会"
 
-#: calendar/gui/gnome-cal.c:2025
+#: calendar/gui/gnome-cal.c:2026
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "装入位于 %s 的任务"
 
-#: calendar/gui/gnome-cal.c:2048
+#: calendar/gui/gnome-cal.c:2049
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: calendar/gui/gnome-cal.c:3003
+#: calendar/gui/gnome-cal.c:3004
 msgid "Purging"
 msgstr "销毁"
 
@@ -7123,9 +7095,8 @@ msgid "New tasks group"
 msgstr "新建任务组"
 
 #: calendar/gui/tasks-component.c:1039
-#, fuzzy
 msgid "Tasks Gro_up"
-msgstr "任务组(_T)"
+msgstr "任务组(_U)"
 
 #: calendar/gui/tasks-component.c:1040
 msgid "Create a new tasks group"
@@ -8911,11 +8882,11 @@ msgstr "(match-all) 需要一个布尔结果"
 
 #: camel/camel-folder-search.c:755
 msgid "(match-threads) not allowed inside match-all"
-msgstr ""
+msgstr "(match-threads) 不允许在 match-all 中使用"
 
 #: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
 msgid "(match-threads) requires a match type string"
-msgstr ""
+msgstr "(match-threads) 需要一个匹配类型字符串"
 
 #: camel/camel-folder-search.c:784
 msgid "(match-threads) expects an array result"
@@ -9641,7 +9612,6 @@ msgid "Certificate only message, certificates imported and verified"
 msgstr "只有证书的邮件，证书已导入并校验"
 
 #: camel/camel-smime-context.c:635
-#, fuzzy
 msgid "Cannot find signature digests"
 msgstr "找不到签名摘要"
 
@@ -9655,48 +9625,40 @@ msgid "Decoder failed"
 msgstr "解码器失败"
 
 #: camel/camel-smime-context.c:804
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot find certificate for `%s'"
 msgstr "找不到“%s”的证书"
 
 #: camel/camel-smime-context.c:811
-#, fuzzy
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "找不到公共批量加密算法"
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-#, fuzzy
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "无法为加密批量密钥分配密钥槽"
 
 #: camel/camel-smime-context.c:831
-#, fuzzy
 msgid "Cannot create CMS Message"
 msgstr "无法创建 CMS 邮件"
 
 #: camel/camel-smime-context.c:837
-#, fuzzy
 msgid "Cannot create CMS EnvelopedData"
 msgstr "无法创建 CMS 信封数据"
 
 #: camel/camel-smime-context.c:843
-#, fuzzy
 msgid "Cannot attach CMS EnvelopedData"
 msgstr "无法附加 CMS 信封数据"
 
 #: camel/camel-smime-context.c:849
-#, fuzzy
 msgid "Cannot attach CMS data object"
 msgstr "无法附加 CMS 数据对象"
 
 #: camel/camel-smime-context.c:858
-#, fuzzy
 msgid "Cannot create CMS RecipientInfo"
 msgstr "无法创建 CMS 收件人信息"
 
 #: camel/camel-smime-context.c:863
-#, fuzzy
 msgid "Cannot add CMS RecipientInfo"
 msgstr "无法添加 CMS 收件人信息"
 
@@ -11492,13 +11454,13 @@ msgstr ""
 "发送密码错误：%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:547
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username: %s"
 msgstr ""
 "无法连接到 POP 服务器 %s。\n"
-"发送密码错误：%s"
+"发送用户名错误：%s"
 
 #: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
@@ -12064,6 +12026,11 @@ msgid "Could not retrieve messages to attach from {0}."
 msgstr "无法从 {0} 获取要附加的邮件。"
 
 #. mail-composer:attach-nomessages secondary
+#. mail-composer:no-sig-file secondary
+#. mail:no-create-tmp-path secondary
+#. mail:no-delete-folder secondary
+#. system:no-save-file secondary
+#. system:no-load-file secondary
 #: composer/mail-composer-errors.xml.h:14
 #: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
 #: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
@@ -12158,6 +12125,7 @@ msgid "You need to configure an account before you can compose mail."
 msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
 
 #. mail-composer:no-address-control primary
+#. mail-composer:no-editor-control primary
 #: composer/mail-composer-errors.xml.h:48
 #: composer/mail-composer-errors.xml.h:52
 msgid "Could not create composer window."
@@ -12325,12 +12293,16 @@ msgstr "同步类别："
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 12-hour format, without seconds.
 #: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%Y-%m-%d %A %p %I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
+#. strftime format of a weekday, a date and a
+#. time, in 24-hour format, without seconds.
 #: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%Y-%m-%d %A %H:%M"
@@ -12382,23 +12354,31 @@ msgid "%m/%d/%Y %H"
 msgstr "%Y-%m-%d %H点"
 
 #. strptime format for a time of day, in 12-hour format.
+#. strftime format of a time in 12-hour format.
 #: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
 msgstr "%p %I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
+#. strftime format of a time in 24-hour format.
 #: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
+#. strftime format of a time in 12-hour format,
+#. without seconds.
+#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
 #: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
 msgid "%I:%M %p"
 msgstr "%p %I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
+#. strftime format of a time in 24-hour format,
+#. without seconds.
+#. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
 #: widgets/misc/e-dateedit.c:1411 widgets/misc/e-dateedit.c:1636
 msgid "%H:%M"
@@ -12484,6 +12464,7 @@ msgid "Missing file name."
 msgstr "缺少文件名。"
 
 #. filter:no-file secondary
+#. filter:bad-file secondary
 #: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 msgid "You must specify a file name."
 msgstr "您必须指定文件名。"
@@ -12504,6 +12485,7 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "无法编译正则表达式“{1}”。"
 
 #. filter:no-name primary
+#. mail:no-name-vfolder primary
 #: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 msgid "Missing name."
 msgstr "缺少名称。"
@@ -13016,8 +12998,8 @@ msgstr "开始于"
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
-#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1550
+#: mail/em-format-quote.c:305 mail/em-format.c:805 mail/em-mailer-prefs.c:87
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
 #: smime/lib/e-cert.c:1131
 msgid "Subject"
@@ -13337,7 +13319,7 @@ msgstr "单击以给 %s 发送邮件"
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:582
 msgid "Unsigned"
 msgstr "未签名"
 
@@ -13347,7 +13329,7 @@ msgid ""
 "authentic."
 msgstr "此邮件未签名。无法保证此邮件是可信的。"
 
-#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:583
 msgid "Valid signature"
 msgstr "有效签名"
 
@@ -13357,7 +13339,7 @@ msgid ""
 "message is authentic."
 msgstr "此邮件已签名，而且签名是有效的。这意味着这封邮件应该是可信的。"
 
-#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:584
 msgid "Invalid signature"
 msgstr "无效签名"
 
@@ -13377,7 +13359,7 @@ msgid ""
 "cannot be verified."
 msgstr "此邮件的签名有效，但是无法校验邮件的发送者。"
 
-#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:591
 msgid "Unencrypted"
 msgstr "未加密"
 
@@ -13387,7 +13369,7 @@ msgid ""
 "The Internet."
 msgstr "此邮件未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:592
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
@@ -13400,7 +13382,7 @@ msgstr ""
 "此邮件已加密，但使用的是弱加密算法。如果外人想要查看此邮件的内容，可能要花大"
 "量时间进行暴力破解，这很困难但并不是不可能。"
 
-#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:593
 msgid "Encrypted"
 msgstr "加密"
 
@@ -13410,7 +13392,7 @@ msgid ""
 "the content of this message."
 msgstr "此邮件已加密。外人要想查看此邮件的内容十分困难。"
 
-#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:594
 msgid "Encrypted, strong"
 msgstr "强加密"
 
@@ -13443,11 +13425,11 @@ msgstr "延误："
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%H:%M"
 
-#: mail/em-format-html-display.c:1085
+#: mail/em-format-html-display.c:1054
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: mail/em-format-html-display.c:1086
+#: mail/em-format-html-display.c:1055
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
@@ -13456,125 +13438,125 @@ msgstr "隐藏(_H)"
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#: mail/em-format-html.c:475 mail/em-format-html.c:477
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "收取“%s”"
 
-#: mail/em-format-html.c:562
+#: mail/em-format-html.c:585
 msgid "Valid signature but cannot verify sender"
 msgstr "签名有效但是无法校验发送者"
 
-#: mail/em-format-html.c:820
+#: mail/em-format-html.c:848
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: mail/em-format-html.c:850
+#: mail/em-format-html.c:878
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: mail/em-format-html.c:861
+#: mail/em-format-html.c:889
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: mail/em-format-html.c:863
+#: mail/em-format-html.c:891
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:912
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: mail/em-format-html.c:895
+#: mail/em-format-html.c:923
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
-#: mail/em-format-html.c:1137
+#: mail/em-format-html.c:1165
 msgid "Formatting message"
 msgstr "格式化邮件"
 
-#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:800
 #: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
 #: mail/message-tag-followup.c:325
 msgid "From"
 msgstr "发件人"
 
-#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:801
 #: mail/em-mailer-prefs.c:83
 msgid "Reply-To"
 msgstr "回复至"
 
-#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:802
 #: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件人"
 
-#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:803
 #: mail/em-mailer-prefs.c:85
 msgid "Cc"
 msgstr "抄送"
 
-#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-format-html.c:1441 mail/em-format-quote.c:192 mail/em-format.c:804
 #: mail/em-mailer-prefs.c:86
 msgid "Bcc"
 msgstr "密件抄送"
 
 #. pseudo-header
-#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-format-html.c:1554 mail/em-format-quote.c:312
 #: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "邮件程序"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1550
+#: mail/em-format-html.c:1581
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%A，%R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1553
+#: mail/em-format-html.c:1584
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-format-html.c:1594 mail/em-format-quote.c:319 mail/em-format.c:806
 #: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
-#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+#: mail/em-format-html.c:1617 mail/em-format.c:807 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "新闻组"
 
-#: mail/em-format.c:993
+#: mail/em-format.c:1056
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附件"
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format.c:1095 mail/em-format.c:1228
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "无法解析 S/MIME 邮件：未知错误"
 
-#: mail/em-format.c:1133
+#: mail/em-format.c:1218
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1279
+#: mail/em-format.c:1379
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "无法解析 MIME 邮件。显示源文本。"
 
-#: mail/em-format.c:1298
+#: mail/em-format.c:1398
 msgid "Unsupported signature format"
 msgstr "不支持的签名格式"
 
-#: mail/em-format.c:1306
+#: mail/em-format.c:1406
 msgid "Error verifying signature"
 msgstr "校验签名错误"
 
-#: mail/em-format.c:1306
+#: mail/em-format.c:1406
 msgid "Unknown error verifying signature"
 msgstr "校验签名发生了未知错误"
 
@@ -13913,9 +13895,8 @@ msgid ""
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:39
-#, fuzzy
 msgid "Log filter actions"
-msgstr "执行动作"
+msgstr "记录过滤动作"
 
 #: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
@@ -13926,9 +13907,8 @@ msgid "Logfile to log filter actions"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:42
-#, fuzzy
 msgid "Logfile to log filter actions."
-msgstr "装入过滤规则信息错误。"
+msgstr "记录过滤动作的日志文件。"
 
 #: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
@@ -13947,13 +13927,12 @@ msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:47
-#, fuzzy
 msgid "Message Window default height"
-msgstr "默认窗口高度"
+msgstr "邮件窗口默认高度"
 
 #: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
-msgstr ""
+msgstr "邮件窗口默认宽度"
 
 #: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
@@ -13969,12 +13948,11 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
-msgstr ""
+msgstr "新建邮件通知声音文件"
 
 #: mail/evolution-mail.schemas.in.in.h:53
-#, fuzzy
 msgid "New Mail Notify type"
-msgstr "新建邮件文件夹"
+msgstr "新建邮件通知类型"
 
 #: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
@@ -14090,9 +14068,8 @@ msgid "The terminal font for mail display"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:81
-#, fuzzy
 msgid "The variable width font for mail display"
-msgstr "选择用于打印的 HTML 变宽度字体"
+msgstr "用于显示邮件的变宽字体"
 
 #: mail/evolution-mail.schemas.in.in.h:82
 msgid ""
@@ -14103,14 +14080,12 @@ msgid ""
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:83
-#, fuzzy
 msgid "Thread the message list."
-msgstr "按线索编排的邮件列表"
+msgstr "按线索编排邮件列表。"
 
 #: mail/evolution-mail.schemas.in.in.h:84
-#, fuzzy
 msgid "Thread the message-list"
-msgstr "按线索编排的邮件列表"
+msgstr "按线索编排邮件列表"
 
 #: mail/evolution-mail.schemas.in.in.h:85
 msgid "Thread the message-list based on Subject"
@@ -14125,9 +14100,8 @@ msgid "Timeout for marking message as Seen."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:88
-#, fuzzy
 msgid "UID string of the default account."
-msgstr "使它成为我的默认账户(_M)"
+msgstr "默认账户的 UID 字符串。"
 
 #: mail/evolution-mail.schemas.in.in.h:89
 msgid "Use Spamasssassin daemon and client"
@@ -15309,7 +15283,6 @@ msgstr "您以登录到服务器“{0}”失败。"
 
 #. mail:camel-service-auth-failed secondary
 #: mail/mail-errors.xml.h:8
-#, fuzzy
 msgid ""
 "Check to make sure your password is spelled correctly.  Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -15336,9 +15309,8 @@ msgstr ""
 
 #: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
 #: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
-#, fuzzy
 msgid "_Send"
-msgstr "发送"
+msgstr "发送(_S)"
 
 #. mail:ask-send-no-subject primary
 #: mail/mail-errors.xml.h:17
@@ -15353,6 +15325,7 @@ msgid ""
 msgstr "在您的邮件中添加有意义的主题行可以让您的收件人更容易明白您邮件的内容。"
 
 #. mail:ask-send-only-bcc-contact primary
+#. mail:ask-send-only-bcc primary
 #: mail/mail-errors.xml.h:22 mail/mail-errors.xml.h:29
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "您确定想要发送只有 BCC 收件人的邮件吗？"
@@ -15393,14 +15366,14 @@ msgstr ""
 #. mail:ask-default-drafts primary
 #: mail/mail-errors.xml.h:38
 msgid "Use default drafts folder?"
-msgstr ""
+msgstr "使用默认草稿文件夹吗？"
 
 #. mail:ask-default-drafts secondary
 #: mail/mail-errors.xml.h:40
 msgid ""
 "Unable to open the drafts folder for this account.  Use the system drafts "
 "folder instead?"
-msgstr ""
+msgstr "无法打开此账户的草稿文件夹。换用系统的草稿文件夹吗？"
 
 #: mail/mail-errors.xml.h:41
 msgid "Use _Default"
@@ -15408,16 +15381,16 @@ msgstr "使用默认值(_D)"
 
 #. mail:ask-expunge primary
 #: mail/mail-errors.xml.h:43
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
-msgstr "从该文件夹永久删除所有已删除的邮件"
+msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部邮件？"
 
 #. mail:ask-expunge secondary
+#. mail:ask-empty-trash secondary
 #: mail/mail-errors.xml.h:45 mail/mail-errors.xml.h:50
 msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+msgstr "如果您继续的话，您将无法恢复这些邮件。"
 
 #: mail/mail-errors.xml.h:46
 msgid "_Expunge"
@@ -15425,11 +15398,10 @@ msgstr "销毁(_E)"
 
 #. mail:ask-empty-trash primary
 #: mail/mail-errors.xml.h:48
-#, fuzzy
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "永久删除所有文件夹中的所有已删除的邮件"
+msgstr "您确定想要永久删除全部文件夹中已删除的全部邮件？"
 
 #: mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
@@ -15446,11 +15418,12 @@ msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr ""
+"如果您退出的话，这些邮件将直到 Evolution 下次启动时才会发出。"
 
 #. mail:camel-exception primary
 #: mail/mail-errors.xml.h:57
 msgid "Your message with the subject \"{0}\" was not delivered."
-msgstr ""
+msgstr "您主题为“{0}”的邮件未投递。"
 
 #. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
@@ -15497,6 +15470,8 @@ msgid "Cannot save to directory \"{0}\"."
 msgstr "无法保存到目录“{0}”。"
 
 #. mail:no-create-path primary
+#. mail:no-write-path-exists primary
+#. mail:no-write-path-notfile primary
 #: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
 #: mail/mail-errors.xml.h:106
 msgid "Cannot save to file \"{0}\"."
@@ -15533,6 +15508,7 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "无法删除系统文件夹“{0}”。"
 
 #. mail:no-delete-spethal-folder secondary
+#. mail:no-rename-spethal-folder secondary
 #: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
 "System folders are required for Ximian Evolution to function correctly and "
@@ -15563,11 +15539,13 @@ msgstr ""
 "如果您删除了文件夹，其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
 
 #. mail:no-rename-folder-exists primary
+#. mail:no-rename-folder primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "无法将“{0}”重命名为“{1}”。"
 
 #. mail:no-rename-folder-exists secondary
+#. mail:vfolder-notunique secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr "名为“{1}”的文件夹已经存在。请使用不同的名称。"
@@ -15578,21 +15556,25 @@ msgid "Because \"{2}\"."
 msgstr "原因是“{2}”。"
 
 #. mail:no-move-folder-nostore primary
+#. mail:no-move-folder-to-nostore primary
 #: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”移动到“{1}”。"
 
 #. mail:no-move-folder-nostore secondary
+#. mail:no-copy-folder-nostore secondary
 #: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 msgid "Cannot open source \"{2}\"."
 msgstr "无法打开源“{2}”。"
 
 #. mail:no-move-folder-to-nostore secondary
+#. mail:no-copy-folder-to-nostore secondary
 #: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 msgid "Cannot open target \"{2}\"."
 msgstr "无法打开目标“{2}”。"
 
 #. mail:no-copy-folder-nostore primary
+#. mail:no-copy-folder-to-nostore primary
 #: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”复制到“{1}”。"
@@ -15608,6 +15590,7 @@ msgid "Cannot open source \"{1}\""
 msgstr "无法打开源“{1}”"
 
 #. mail:account-incomplete primary
+#. mail:account-notunique primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
 msgid "Cannot save changes to account."
 msgstr "无法将更改保存到账户。"
@@ -15629,21 +15612,18 @@ msgstr "删除账户吗？"
 
 #. mail:ask-delete-account primary
 #: mail/mail-errors.xml.h:166
-#, fuzzy
 msgid "Are you sure you want to delete this account?"
-msgstr "您确定要删除此联系人吗？"
+msgstr "您确定要删除此账户吗？"
 
 #. mail:ask-delete-account secondary
 #: mail/mail-errors.xml.h:168
-#, fuzzy
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"如果您删除了文件夹，其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
+"如果您删除了文件夹，账户信息将会被永久删除。"
 
 #: mail/mail-errors.xml.h:169
-#, fuzzy
 msgid "Don't delete"
-msgstr "取消删除(_U)"
+msgstr "不删除"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15672,14 +15652,13 @@ msgstr "丢弃更改吗？"
 
 #. mail:ask-signature-changed primary
 #: mail/mail-errors.xml.h:181
-#, fuzzy
 msgid "Do you wish to save your changes?"
 msgstr "您希望保存更改吗？"
 
 #. mail:ask-signature-changed secondary
 #: mail/mail-errors.xml.h:183
 msgid "This signature has been changed, but has not been saved."
-msgstr ""
+msgstr "签名已经更改，但尚未保存。"
 
 #: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
@@ -15696,6 +15675,7 @@ msgid ""
 "This folder may have been added implictly, go to the virtual folder editor "
 "to add it explictly, if required."
 msgstr ""
+"此文件夹可能是隐式添加的。若需要的话，请前往虚拟文件夹编辑器显示添加。"
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
@@ -16034,14 +16014,14 @@ msgid "Name:"
 msgstr "名称："
 
 #: mail/mail-tools.c:114
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create spool directory `%s': %s"
-msgstr "无法创建目录 %s：%s"
+msgstr "无法创建脱机目录“%s”：%s"
 
 #: mail/mail-tools.c:141
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr ""
+msgstr "试图将邮件移动到非 mbox 源“%s”"
 
 #: mail/mail-tools.c:276
 #, c-format
@@ -16213,14 +16193,12 @@ msgid "Review"
 msgstr "回顾"
 
 #: mail/searchtypes.xml.h:1
-#, fuzzy
 msgid "Body contains"
-msgstr "含有"
+msgstr "邮件体含有"
 
 #: mail/searchtypes.xml.h:2
-#, fuzzy
 msgid "Body does not contain"
-msgstr "不含有"
+msgstr "邮件体不含有"
 
 #: mail/searchtypes.xml.h:3
 msgid "Body or subject contains"
@@ -16231,9 +16209,8 @@ msgid "Message contains"
 msgstr "邮件含有"
 
 #: mail/searchtypes.xml.h:5
-#, fuzzy
 msgid "Recipients contain"
-msgstr "描述含有"
+msgstr "收件人含有"
 
 #: mail/searchtypes.xml.h:6
 msgid "Sender contains"
@@ -16280,22 +16257,20 @@ msgid "Evolution configuration version"
 msgstr "Evolution 配置版本"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:6
-#, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
-msgstr "默认让附件只能嵌入显示。"
+msgstr "启动时默认显示的组件 ID 或别名。"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:7
-#, fuzzy
 msgid ""
 "If set to true, Evolution will start up in offline mode instead of online "
 "mode."
-msgstr "Evolution 是否要以脱机模式启动"
+msgstr "若设为 true，Evolution 将以脱机模式启动，而不是联机模式启动。"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:8
 msgid ""
 "If set to true, the warning dialog in development versions of Evolution is "
 "not displayed."
-msgstr ""
+msgstr "若设为 true，将不会显示 Evoltuion 开发版本的警告。"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:9
 msgid ""
@@ -16318,23 +16293,17 @@ msgstr "工具栏是否可见。"
 msgid "Whether to skip the development warning dialog"
 msgstr "是否跳过开发警告对话框"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "mail"
-msgstr "邮件"
-
 #: shell/e-active-connection-dialog.glade.h:1
-#, fuzzy
 msgid "<b>Active Connections</b>"
-msgstr "<b>身份验证</b>"
+msgstr "<b>当前连接</b>"
 
 #: shell/e-active-connection-dialog.glade.h:2
-#, fuzzy
 msgid "Active Connections"
-msgstr "执行动作"
+msgstr "当前连接"
 
 #: shell/e-active-connection-dialog.glade.h:3
 msgid "Click OK to close these connections and go offline"
-msgstr ""
+msgstr "单击确定关闭这些连接，并转入脱机操作"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16591,23 +16560,20 @@ msgid "New"
 msgstr "新建"
 
 #: shell/evolution-startup-wizard.glade.h:2
-#, fuzzy
 msgid "Evolution Setup Assistant"
-msgstr "Evolution 导入助手"
+msgstr "Evolution 设置助手"
 
 #: shell/evolution-startup-wizard.glade.h:3
-#, fuzzy
 msgid "Importing Files"
 msgstr "导入文件"
 
 #: shell/evolution-startup-wizard.glade.h:4
-#, fuzzy
 msgid "Timezone "
-msgstr "时区(_Z)："
+msgstr "时区"
 
 #: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
-msgstr ""
+msgstr "欢迎"
 
 #: shell/evolution-startup-wizard.glade.h:6
 msgid ""
@@ -16617,6 +16583,9 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
+"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的\n"
+"电子邮件账户，并从其它应用程序中导入文件。\n\n"
+"请单击“下一步”按钮继续。"
 
 #: shell/evolution-startup-wizard.glade.h:11
 msgid ""
@@ -16625,6 +16594,8 @@ msgid ""
 "\n"
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
+"您已经成功输入了设置 Evolution 所需的全部信息。\n\n"
+"请单击“应用”按钮保存您的设置。"
 
 #: shell/evolution-test-component.c:140
 msgid "New Test"
@@ -16809,21 +16780,20 @@ msgid ""
 msgstr ""
 
 #: shell/shell-errors.xml.h:15
-#, fuzzy
 msgid "Continue"
-msgstr "含有"
+msgstr "继续"
 
 #. shell:noshell title
+#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
-#, fuzzy
 msgid "Cannot start Evolution"
-msgstr "无法启动 wombat 服务器"
+msgstr "无法启动 Evolution"
 
 #. shell:noshell primary
+#. shell:noshell-reason primary
 #: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
-#, fuzzy
 msgid "Evolution can not start."
-msgstr "Evolution 账户助手"
+msgstr "Evolution 无法启动。"
 
 #. shell:noshell secondary
 #: shell/shell-errors.xml.h:21
@@ -16832,6 +16802,7 @@ msgid ""
 "\n"
 "Click help for details"
 msgstr ""
+"您的系统配置与您的 Evolution 配置不符。\n\n请单击帮助查看详情"
 
 #. shell:noshell-reason secondary
 #: shell/shell-errors.xml.h:29
@@ -16842,6 +16813,10 @@ msgid ""
 "\n"
 "Click help for details."
 msgstr ""
+"您的系统配置与您的 Evolution 配置不符：\n\n"
+"{0}\n"
+"\n"
+"请单击帮助查看详情。"
 
 #: smime/gui/ca-trust-dialog.c:91
 #, c-format
@@ -16850,6 +16825,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
+"证书“%s”是 CA 证书。\n\n编辑信任设置："
 
 #: smime/gui/cert-trust-dialog.c:145
 msgid ""
@@ -16857,6 +16833,7 @@ msgid ""
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
 msgstr ""
+"由于您信任颁发此证书的机构，您就将信任此证书的权威性，除非在此声明"
 
 #: smime/gui/cert-trust-dialog.c:149
 msgid ""
@@ -16864,6 +16841,7 @@ msgid ""
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
 msgstr ""
+"由于您不信任颁发此证书的机构，您就将不信任此证书的权威性，除非在此声明"
 
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
@@ -16987,6 +16965,7 @@ msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr ""
+"在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
 
 #: smime/gui/smime-ui.glade.h:14 smime/lib/e-cert.c:1076
 msgid "Certificate"
@@ -17014,7 +16993,7 @@ msgstr "不信任此证书的颁发机构"
 
 #: smime/gui/smime-ui.glade.h:21
 msgid "Dummy window only"
-msgstr ""
+msgstr "只对哑窗口"
 
 #: smime/gui/smime-ui.glade.h:22
 msgid "Edit"
@@ -17141,15 +17120,15 @@ msgstr "版本 3"
 
 #: smime/lib/e-cert.c:633
 msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr ""
+msgstr "带 RSA 加密的 PKCS #1 MD2"
 
 #: smime/lib/e-cert.c:636
 msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr ""
+msgstr "带 RSA 加密的 PKCS #1 MD5"
 
 #: smime/lib/e-cert.c:639
 msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr ""
+msgstr "带 RSA 加密的 PKCS #1 SHA-1"
 
 #: smime/lib/e-cert.c:642
 msgid "C"
@@ -17188,19 +17167,16 @@ msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
 #: smime/lib/e-cert.c:669
-#, fuzzy
 msgid "Certificate Key Usage"
-msgstr "证书名称"
+msgstr "证书密钥用途"
 
 #: smime/lib/e-cert.c:672
-#, fuzzy
 msgid "Netscape Certificate Type"
-msgstr "证书名称"
+msgstr "Netscape 证书类型"
 
 #: smime/lib/e-cert.c:675
-#, fuzzy
 msgid "Certificate Authority Key Identifier"
-msgstr "证书颁发机构信任"
+msgstr "证书颁发密钥身份"
 
 #: smime/lib/e-cert.c:678
 msgid "UID"
@@ -17209,49 +17185,43 @@ msgstr "UID"
 #: smime/lib/e-cert.c:687
 #, c-format
 msgid "Object Identifier (%s)"
-msgstr ""
+msgstr "对象标识符(%s)"
 
 #: smime/lib/e-cert.c:738
 msgid "Algorithm Identifier"
-msgstr ""
+msgstr "算法标识符"
 
 #: smime/lib/e-cert.c:746
 msgid "Algorithm Parameters"
-msgstr ""
+msgstr "算法参数"
 
 #: smime/lib/e-cert.c:768
-#, fuzzy
 msgid "Subject Public Key Info"
-msgstr "主题唯一 ID"
+msgstr "主题公钥信息"
 
 #: smime/lib/e-cert.c:773
 msgid "Subject Public Key Algorithm"
-msgstr ""
+msgstr "主题公钥算法"
 
 #: smime/lib/e-cert.c:788
-#, fuzzy
 msgid "Subject's Public Key"
-msgstr "主题是 %s"
+msgstr "主题公钥"
 
 #: smime/lib/e-cert.c:809 smime/lib/e-cert.c:858
-#, fuzzy
 msgid "Error: Unable to process extension"
-msgstr "无法处理脱机文件夹"
+msgstr "错误：无法处理扩展"
 
 #: smime/lib/e-cert.c:830 smime/lib/e-cert.c:842
-#, fuzzy
 msgid "Object Signer"
-msgstr "证书签名者"
+msgstr "对象签名者"
 
 #: smime/lib/e-cert.c:834
-#, fuzzy
 msgid "SSL Certificate Authority"
-msgstr "证书颁发机构信任"
+msgstr "SSL 证书颁发机构"
 
 #: smime/lib/e-cert.c:838
-#, fuzzy
 msgid "Email Certificate Authority"
-msgstr "无效的证书颁发机构(CA)"
+msgstr "电子邮件证书颁发机构"
 
 #: smime/lib/e-cert.c:866
 msgid "Signing"
@@ -19015,7 +18985,7 @@ msgstr ""
 
 #: widgets/misc/e-expander.c:215
 msgid "Label widget"
-msgstr ""
+msgstr "标签部件"
 
 #: widgets/misc/e-expander.c:216
 msgid "A widget to display in place of the usual expander label"
@@ -19027,7 +18997,7 @@ msgstr "扩展器大小"
 
 #: widgets/misc/e-expander.c:223
 msgid "Size of the expander arrow"
-msgstr ""
+msgstr "扩展器箭头的大小"
 
 #: widgets/misc/e-expander.c:231
 msgid "Indicator Spacing"
@@ -19035,7 +19005,7 @@ msgstr "标识器间距"
 
 #: widgets/misc/e-expander.c:232
 msgid "Spacing around expander arrow"
-msgstr ""
+msgstr "扩展器箭头旁边的间距"
 
 #: widgets/misc/e-filter-bar.c:195
 msgid "_Searches"
@@ -19045,7 +19015,6 @@ msgstr "搜索(_S)"
 msgid "Search Editor"
 msgstr "搜索编辑器"
 
-#. FIXME: get the toplevel window...
 #: widgets/misc/e-filter-bar.c:220
 msgid "Save Search"
 msgstr "保存搜索"
@@ -19124,180 +19093,3 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-#~ msgid "Calendars selected for publishing"
-#~ msgstr "选中要发布的日历"
-
-#~ msgid "Login name:"
-#~ msgstr "登录名："
-
-#~ msgid "URL:"
-#~ msgstr "URL："
-
-#~ msgid "User Publishes"
-#~ msgstr "用户发布"
-
-#~ msgid "Could not start wombat"
-#~ msgstr "无法启动 wombat"
-
-#~ msgid "C_alendar"
-#~ msgstr "日历(_A)"
-
-#~ msgid "Audio Alarm Options"
-#~ msgstr "音频提醒选项"
-
-#~ msgid "Message Alarm Options"
-#~ msgstr "邮件提醒选项"
-
-#~ msgid "Email Alarm Options"
-#~ msgstr "邮件提醒选项"
-
-#~ msgid "Program Alarm Options"
-#~ msgstr "程序提醒选项"
-
-#~ msgid "Unknown Alarm Options"
-#~ msgstr "未知提醒选项"
-
-#~ msgid "Alarm Repeat"
-#~ msgstr "提醒重复"
-
-#~ msgid "Message to Display:"
-#~ msgstr "要显示的邮件："
-
-#~ msgid "Message to Send"
-#~ msgstr "要发送的邮件"
-
-#~ msgid "Play sound:"
-#~ msgstr "播放声音："
-
-#~ msgid "Run program:"
-#~ msgstr "运行程序："
-
-#~ msgid "With these arguments:"
-#~ msgstr "使用这些参数："
-
-#~ msgid "Basics"
-#~ msgstr "基本"
-
-#~ msgid "Date/Time:"
-#~ msgstr "日期/时间："
-
-#~ msgid "Reminders"
-#~ msgstr "提醒"
-
-#~ msgid "_Options..."
-#~ msgstr "选项(_O)..."
-
-#~ msgid "Addressbook..."
-#~ msgstr "地址簿..."
-
-#~ msgid "Reminder"
-#~ msgstr "提醒"
-
-#~ msgid "B_usy"
-#~ msgstr "忙(_U)"
-
-#~ msgid "Co_nfidential"
-#~ msgstr "机密(_N)"
-
-#~ msgid "Date & Time"
-#~ msgstr "日期和时间"
-
-#~ msgid "F_ree"
-#~ msgstr "闲(_R)"
-
-#~ msgid "Pri_vate"
-#~ msgstr "私有(_V)"
-
-#~ msgid "Pu_blic"
-#~ msgstr "公开(_B)"
-
-#~ msgid "Add A_ttendee"
-#~ msgstr "添加出席者(_T)"
-
-#~ msgid "Add attendees from addressbook."
-#~ msgstr "从地址簿添加出席者。"
-
-#~ msgid "Preview"
-#~ msgstr "预览"
-
-#~ msgid "Recurrence Rule"
-#~ msgstr "再现规则"
-
-#~ msgid "_Custom recurrence"
-#~ msgstr "定制再现(_C)"
-
-#~ msgid "_Modify"
-#~ msgstr "修改(_M)"
-
-#~ msgid "_No recurrence"
-#~ msgstr "不再现(_N)"
-
-#~ msgid "_Simple recurrence"
-#~ msgstr "简单再现(_S)"
-
-#~ msgid "% _Complete"
-#~ msgstr "完成百分比(_C)"
-
-#~ msgid "Progress"
-#~ msgstr "进度"
-
-#~ msgid "Con_fidential"
-#~ msgstr "机密(_F)"
-
-#~ msgid "Folder:"
-#~ msgstr "文件夹："
-
-#~ msgid "There was an error on the CORBA system\n"
-#~ msgstr "CORBA 系统出错\n"
-
-#~ msgid "Object could not be found\n"
-#~ msgstr "找不到对象\n"
-
-#~ msgid "You don't have the right permissions to update the calendar\n"
-#~ msgstr "您没有适当的权限打开日历\n"
-
-#~ msgid "Attendee status could not be updated!\n"
-#~ msgstr "无法更新参与者状态！\n"
-
-#~ msgid "Add attendees from addressbook"
-#~ msgstr "从地址簿添加出席者"
-
-#~ msgid "_Options"
-#~ msgstr "选项(_O)"
-
-#~ msgid "Meeting _start time:"
-#~ msgstr "会议开始时间(_S)："
-
-#~ msgid "Meeting _end time:"
-#~ msgstr "会议结束时间(_E)："
-
-#~ msgid "Can't find certificate for `%s'"
-#~ msgstr "找不到“%s”的证书"
-
-#~ msgid "Can't create CMS Message"
-#~ msgstr "无法创建 CMS 邮件"
-
-#~ msgid "Can't create encoder context"
-#~ msgstr "无法创建编码器上下文"
-
-#~ msgid ""
-#~ "Selected calendar is read-only, events cannot be created. Please select a "
-#~ "read-write calendar."
-#~ msgstr "选中的日历只读，无法创建事件。请选择可写的日历。"
-
-#~ msgid ""
-#~ "Selected task list is read-only, events cannot be created. Please select "
-#~ "a read-write calendar."
-#~ msgstr "选中的任务列表只读，无法创建事件。请选择可写的日历。"
-
-#~ msgid "_Score Rules"
-#~ msgstr "计分规则(_S)"
-
-#~ msgid "Properties"
-#~ msgstr "属性"
-
-#~ msgid "Folder Name"
-#~ msgstr "文件夹名称"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-#~ msgstr "在%Y年%m月%d日的%H:%M%%+05d，%%s写道："