Updated Simplified Chinese translation

svn path=/trunk/; revision=28144

1 files changed, 3173 insertions, 2832 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5923cde623..55c1aadb20 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-12 05:36+0800\n"
+"POT-Creation-Date: 2004-12-18 01:28+0800\n"
 "PO-Revision-Date: 2004-12-12 05:54+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -24,6 +24,24 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution 地址簿"
 
+#: a11y/addressbook/ea-minicard.c:31
+#: calendar/gui/alarm-notify/alarm-queue.c:863
+#: ui/evolution-message-composer.xml.h:10
+msgid "Open"
+msgstr "打开"
+
+#: a11y/addressbook/ea-minicard.c:138
+msgid "Contact List: "
+msgstr "联系人列表："
+
+#: a11y/addressbook/ea-minicard.c:139
+msgid "Contact: "
+msgstr "联系人："
+
+#: a11y/addressbook/ea-minicard.c:165
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
 #: a11y/addressbook/ea-minicard-view.c:34
 #: addressbook/gui/component/addressbook-component.c:97
 msgid "New Contact"
@@ -54,23 +72,210 @@ msgstr " 张名片"
 msgid " card"
 msgstr " 张名片"
 
-#: a11y/addressbook/ea-minicard.c:31
-#: calendar/gui/alarm-notify/alarm-queue.c:863
-#: ui/evolution-message-composer.xml.h:10
-msgid "Open"
-msgstr "打开"
+#: a11y/calendar/ea-cal-view.c:306
+#, fuzzy
+msgid "New Appointment"
+msgstr "新建约会"
 
-#: a11y/addressbook/ea-minicard.c:138
-msgid "Contact List: "
-msgstr "联系人列表："
+#: a11y/calendar/ea-cal-view.c:307
+#, fuzzy
+msgid "New All Day Event"
+msgstr "新建全天事件(_E)"
 
-#: a11y/addressbook/ea-minicard.c:139
-msgid "Contact: "
-msgstr "联系人："
+#: a11y/calendar/ea-cal-view.c:308 calendar/gui/e-calendar-view.c:1366
+msgid "New Meeting"
+msgstr "新会议"
 
-#: a11y/addressbook/ea-minicard.c:165
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
+#: a11y/calendar/ea-cal-view.c:309
+#, fuzzy
+msgid "Go to Today"
+msgstr "转到今天(_T)"
+
+#: a11y/calendar/ea-cal-view.c:310
+#, fuzzy
+msgid "Go to Date"
+msgstr "转到日期(_G)..."
+
+#: a11y/calendar/ea-cal-view-event.c:235
+#, fuzzy
+msgid "alarm "
+msgstr "提醒(_A)"
+
+#: a11y/calendar/ea-cal-view-event.c:241
+#, fuzzy
+msgid "recurrence "
+msgstr "再现"
+
+#: a11y/calendar/ea-cal-view-event.c:247
+#, fuzzy
+msgid "time-zone "
+msgstr "时区"
+
+#: a11y/calendar/ea-cal-view-event.c:253
+#, fuzzy
+msgid "meeting "
+msgstr "会议"
+
+#: a11y/calendar/ea-cal-view-event.c:258
+msgid "event. Summary is "
+msgstr ""
+
+#: a11y/calendar/ea-cal-view-event.c:269
+#, fuzzy
+msgid "empty"
+msgstr "回复"
+
+#: a11y/calendar/ea-cal-view-event.c:288
+#, fuzzy
+msgid "calendar view event"
+msgstr "日历事件"
+
+#: a11y/calendar/ea-cal-view-event.c:505
+#, fuzzy
+msgid "Grab Focus"
+msgstr "有焦点"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, fuzzy, c-format
+msgid ", %d event"
+msgstr "%d 已发"
+
+#: a11y/calendar/ea-day-view.c:147 a11y/calendar/ea-week-view.c:148
+#, fuzzy, c-format
+msgid ", %d events"
+msgstr "%d 已发"
+
+#: a11y/calendar/ea-day-view.c:150
+#, fuzzy
+msgid "work week view :"
+msgstr "周工作视图"
+
+#: a11y/calendar/ea-day-view.c:154
+#, fuzzy
+msgid "day view :"
+msgstr "日视图"
+
+#: a11y/calendar/ea-day-view.c:181
+#, fuzzy
+msgid "calendar view for a work week"
+msgstr "日历信息"
+
+#: a11y/calendar/ea-day-view.c:183
+msgid "calendar view for one or more days"
+msgstr ""
+
+#: a11y/calendar/ea-day-view-main-item.c:299
+#: a11y/calendar/ea-week-view-main-item.c:301
+#, fuzzy
+msgid "a table to view and select the current time range"
+msgstr "相对于当前时间的时间"
+
+#: a11y/calendar/ea-gnome-calendar.c:187 calendar/gui/calendar-component.c:519
+msgid "%A %d %b %Y"
+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.
+#: a11y/calendar/ea-gnome-calendar.c:190 calendar/gui/calendar-component.c:522
+#: calendar/gui/e-day-view.c:1572 calendar/gui/e-day-view-top-item.c:708
+#: calendar/gui/e-week-view-main-item.c:321
+msgid "%a %d %b"
+msgstr "%-m月%-d日%A"
+
+#: a11y/calendar/ea-gnome-calendar.c:192 a11y/calendar/ea-gnome-calendar.c:197
+#: a11y/calendar/ea-gnome-calendar.c:199 calendar/gui/calendar-component.c:524
+#: calendar/gui/calendar-component.c:529 calendar/gui/calendar-component.c:531
+msgid "%a %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
+
+#: a11y/calendar/ea-gnome-calendar.c:216 a11y/calendar/ea-gnome-calendar.c:222
+#: a11y/calendar/ea-gnome-calendar.c:228 a11y/calendar/ea-gnome-calendar.c:230
+#: calendar/gui/calendar-component.c:543 calendar/gui/calendar-component.c:550
+#: calendar/gui/calendar-component.c:556 calendar/gui/calendar-component.c:558
+msgid "%d %b %Y"
+msgstr "%Y年%-m月%-d日"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. month name. You can change the order but don't
+#. change the specifiers or add anything.
+#: a11y/calendar/ea-gnome-calendar.c:220 calendar/gui/calendar-component.c:548
+#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:712
+#: calendar/gui/e-week-view-main-item.c:335
+msgid "%d %b"
+msgstr "%B%-d日"
+
+#: a11y/calendar/ea-gnome-calendar.c:247 a11y/calendar/ea-gnome-calendar.c:255
+#: calendar/importers/icalendar-importer.c:734
+msgid "Gnome Calendar"
+msgstr "Gnome 日历"
+
+#: a11y/calendar/ea-gnome-calendar.c:290
+#, fuzzy
+msgid "search bar"
+msgstr "搜索基础(_B)："
+
+#: a11y/calendar/ea-gnome-calendar.c:291
+#, fuzzy
+msgid "evolution calendar search bar"
+msgstr "Evolution 日历和任务"
+
+#: a11y/calendar/ea-jump-button.c:149
+msgid "Jump button"
+msgstr ""
+
+#: a11y/calendar/ea-jump-button.c:158
+#, fuzzy
+msgid "Click here, you can find more events."
+msgstr "单击此处添加出席者"
+
+#: a11y/calendar/ea-week-view.c:153
+#, fuzzy
+msgid "month view :"
+msgstr "月视图"
+
+#: a11y/calendar/ea-week-view.c:158
+#, fuzzy
+msgid "week view :"
+msgstr "周视图"
+
+#: a11y/calendar/ea-week-view.c:185
+#, fuzzy
+msgid "calendar view for a month"
+msgstr "日历信息"
+
+#: a11y/calendar/ea-week-view.c:187
+msgid "calendar view for one or more weeks"
+msgstr ""
+
+#: a11y/widgets/ea-calendar-item.c:293 a11y/widgets/ea-calendar-item.c:299
+#, fuzzy
+msgid " %d %B %Y"
+msgstr "%Y年%-m月%-d日"
+
+#: a11y/widgets/ea-calendar-item.c:301
+#, fuzzy
+msgid "calendar (from "
+msgstr "日历组"
+
+#: a11y/widgets/ea-calendar-item.c:303
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
+msgid " to "
+msgstr " 到 "
+
+#: a11y/widgets/ea-calendar-item.c:305
+msgid ")"
+msgstr ""
+
+#: a11y/widgets/ea-calendar-item.c:337
+#, fuzzy
+msgid "evolution calendar item"
+msgstr "Evolution vCalendar 导入器"
 
 #. addressbook:ldap-init primary
 #: addressbook/addressbook-errors.xml.h:2
@@ -152,29 +357,16 @@ msgstr "类别编辑器不可用。"
 #. 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:28
 #: addressbook/addressbook-errors.xml.h:36
-#: addressbook/addressbook-errors.xml.h:40 mail/mail-errors.xml.h:70
-#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
-#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
-#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
-#: mail/mail-errors.xml.h:88
+#: addressbook/addressbook-errors.xml.h:40
 msgid "{0}"
 msgstr "{0}"
 
 #. addressbook:generic-error secondary
 #. mail-composer:no-attach secondary
-#. mail:no-save-path secondary
 #: addressbook/addressbook-errors.xml.h:30
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+#: composer/mail-composer-errors.xml.h:4
 msgid "{1}"
 msgstr "{1}"
 
@@ -254,10 +446,10 @@ msgstr "地址“{0}”已经存在。"
 msgid ""
 "A contact already exists with this address.  Would you like to add a new "
 "card with the same address anyway?"
-msgstr ""
-"已经存在此地址的联系人了。您想要仍然想要以相同地址添加新名片吗？"
+msgstr "已经存在此地址的联系人了。您想要仍然想要以相同地址添加新名片吗？"
 
 #: addressbook/addressbook-errors.xml.h:62 mail/em-vfolder-rule.c:494
+#: plugins/shared-folder/properties.glade.h:17
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -275,60 +467,22 @@ msgstr "无法装入地址簿"
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "自动补全"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "C_ontacts"
-msgstr "联系人(_O)"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Certificates"
-msgstr "证书"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Configure autocomplete here"
-msgstr "在此配置自动补全"
-
-#. Create the contacts group
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: addressbook/gui/component/addressbook-view.c:1118
-#: calendar/gui/migration.c:377
-msgid "Contacts"
-msgstr "联系人"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook"
-msgstr "Evolution 地址簿"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 地址簿名片查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook component"
-msgstr "Evolution 地址簿组件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 证书管理控件"
+#: addressbook/gui/component/addressbook.c:98
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名访问 LDAP 服务器"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 文件夹配置控件"
+#: addressbook/gui/component/addressbook.c:184
+#: camel/providers/groupwise/camel-gw-listener.c:494
+#: plugins/groupwise-account-setup/camel-gw-listener.c:494
+msgid "Failed to authenticate.\n"
+msgstr "认证失败。\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manage your S/MIME certificates here"
-msgstr "在此管理您的 S/MIME 证书"
+#: addressbook/gui/component/addressbook.c:191
+#: camel/providers/groupwise/camel-gw-listener.c:483
+#: plugins/groupwise-account-setup/camel-gw-listener.c:483
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s为 %s 输入口令 (用户 %s)"
 
 #: addressbook/gui/component/addressbook-component.c:98
 msgid "_Contact"
@@ -347,6 +501,7 @@ msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
 #: addressbook/gui/component/addressbook-component.c:113
+#: addressbook/gui/component/addressbook-config.c:1073
 #: addressbook/gui/component/addressbook-view.c:757
 msgid "New Address Book"
 msgstr "新地址簿"
@@ -375,10 +530,11 @@ msgstr "类型(_T)："
 
 #: addressbook/gui/component/addressbook-config.c:862
 #: addressbook/gui/component/ldap-config.glade.h:23
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/calendar-setup.c:324
-#: calendar/gui/dialogs/calendar-setup.c:334 mail/em-folder-properties.c:213
-#: mail/mail-config.glade.h:85 smime/gui/smime-ui.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.c:334
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/em-folder-properties.c:213 mail/mail-config.glade.h:85
+#: smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "常规"
 
@@ -409,7 +565,7 @@ msgstr "搜索"
 msgid "Downloading"
 msgstr "下载"
 
-#: addressbook/gui/component/addressbook-config.c:1070
+#: addressbook/gui/component/addressbook-config.c:1071
 #: addressbook/gui/component/ldap-config.glade.h:14
 msgid "Address Book Properties"
 msgstr "地址簿属性"
@@ -516,20 +672,12 @@ msgstr "删除"
 msgid "Properties..."
 msgstr "属性..."
 
-#: addressbook/gui/component/addressbook.c:98
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名访问 LDAP 服务器"
-
-#: addressbook/gui/component/addressbook.c:184
-#: camel/providers/groupwise/camel-gw-listener.c:494
-msgid "Failed to authenticate.\n"
-msgstr "认证失败。\n"
-
-#: addressbook/gui/component/addressbook.c:191
-#: camel/providers/groupwise/camel-gw-listener.c:483
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s为 %s 输入口令 (用户 %s)"
+#. Create the contacts group
+#: addressbook/gui/component/addressbook-view.c:1118
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: calendar/gui/migration.c:377
+msgid "Contacts"
+msgstr "联系人"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList XML for the list of completion URIs"
@@ -577,6 +725,54 @@ msgstr "选择名称对话框中上次使用的文件夹 URI"
 msgid "URI for the folder last used in the select names dialog."
 msgstr "选择名称对话框中上次使用的文件夹 URI。"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Autocompletion"
+msgstr "自动补全"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "C_ontacts"
+msgstr "联系人(_O)"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "Certificates"
+msgstr "证书"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Configure autocomplete here"
+msgstr "在此配置自动补全"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+msgid "Evolution Addressbook"
+msgstr "Evolution 地址簿"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 地址簿地址弹出框"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿地址查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿名片查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿组件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime 证书管理控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 文件夹配置控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Manage your S/MIME certificates here"
+msgstr "在此管理您的 S/MIME 证书"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -594,6 +790,7 @@ msgstr "选择名称对话框中上次使用的文件夹 URI。"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
 #: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
+#: plugins/shared-folder/properties.glade.h:3
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -647,7 +844,8 @@ msgstr "<b>类型：</b>"
 msgid "Add Address Book"
 msgstr "添加地址簿"
 
-#: addressbook/gui/component/ldap-config.glade.h:15 mail/mail-account-gui.c:86
+#: addressbook/gui/component/ldap-config.glade.h:15
+#: mail/em-account-editor.c:292
 msgid "Always"
 msgstr "总是"
 
@@ -680,7 +878,8 @@ msgstr "查找可能的搜索基础"
 msgid "Lo_gin:"
 msgstr "登录(_G)："
 
-#: addressbook/gui/component/ldap-config.glade.h:25 mail/mail-account-gui.c:88
+#: addressbook/gui/component/ldap-config.glade.h:25
+#: mail/em-account-editor.c:290
 msgid "Never"
 msgstr "从不"
 
@@ -792,7 +991,8 @@ msgstr "使用已识别的姓名(DN)"
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:42 mail/mail-account-gui.c:87
+#: addressbook/gui/component/ldap-config.glade.h:42
+#: mail/em-account-editor.c:291
 msgid "Whenever Possible"
 msgstr "可能时"
 
@@ -846,23 +1046,33 @@ msgstr "名片"
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:12
 #: calendar/gui/dialogs/alarm-dialog.glade.h:27
 #: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:16
+#: mail/em-account-editor.c:1793 plugins/calendar-http/calendar-http.c:263
 msgid "minutes"
 msgstr "分钟"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 的地址簿名称选择界面"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:207
-msgid "Remove All"
-msgstr "全部删除"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+msgid "Select Contacts from Address Book"
+msgstr "从地址簿中选择联系人"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:214
 #: addressbook/gui/component/select-names/e-select-names.c:690
+#: addressbook/gui/component/select-names/e-select-names-popup.c:214
 #: calendar/gui/dialogs/cal-prefs-dialog.c:723
 msgid "Remove"
 msgstr "删除"
 
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+#: plugins/plugin-manager/plugin-manager.c:44
+#: plugins/save-attachments/save-attachments.c:350
+msgid "Name"
+msgstr "姓名"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:207
+msgid "Remove All"
+msgstr "全部删除"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:221
 msgid "View Contact List"
 msgstr "查看联系人列表"
@@ -885,22 +1095,15 @@ msgstr "添加到联系人"
 msgid "Unnamed Contact"
 msgstr "未命名的联系人"
 
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "姓名"
-
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
 #: addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "来源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "从地址簿中选择联系人"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 的地址簿名称选择界面"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -1097,8 +1300,8 @@ msgstr "Web 日志："
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:235
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:147
 msgid "Work"
@@ -1121,6 +1324,18 @@ msgstr "存档于(_F)："
 msgid "_Where:"
 msgstr "何处(_W)："
 
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除这些联系人吗？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:322
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr "您确定要删除此联系人吗？"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #: addressbook/gui/widgets/eab-contact-display.c:365
 #: addressbook/gui/widgets/eab-contact-display.c:380
@@ -1128,16 +1343,16 @@ msgid "Address"
 msgstr "地址"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 #: 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:300
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:187
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
+#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #: addressbook/gui/widgets/e-minicard-view.c:519
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "可编辑"
 
@@ -2109,50 +2324,12 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL 即时通讯程序"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:64
 #: addressbook/gui/widgets/eab-contact-display.c:349
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "雅虎通"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
-#: addressbook/gui/widgets/eab-contact-display.c:348
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "服务"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:577
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Location"
-msgstr "位置"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "用户名"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
-#: 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:203
-msgid "Other"
-msgstr "其它"
-
 #: addressbook/gui/contact-editor/e-contact-editor.c:186
 #: addressbook/gui/widgets/eab-contact-display.c:351
 msgid "Yahoo"
@@ -2163,11 +2340,27 @@ msgstr "雅虎"
 msgid "MSN"
 msgstr "MSN"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "ICQ"
+msgstr "ICQ"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:189
 #: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "GroupWise"
 msgstr "GroupWise"
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:231
+msgid "Home"
+msgstr "家庭"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:239
+msgid "Other"
+msgstr "其它"
+
 #: addressbook/gui/contact-editor/e-contact-editor.c:258
 msgid "Source Book"
 msgstr "来源地址簿"
@@ -2216,6 +2409,28 @@ msgstr ""
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL 即时通讯程序"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "雅虎通"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "服务"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:577
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Location"
+msgstr "位置"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "用户名"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
@@ -2233,18 +2448,6 @@ msgstr "全名(_F)："
 msgid "E-_mail:"
 msgstr "电子邮件(_M)："
 
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "您确定要删除这些联系人吗？"
-
-#: addressbook/gui/contact-editor/eab-editor.c:322
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除此联系人吗？"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "地址 _2："
@@ -2408,8 +2611,8 @@ msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)�
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:377
 #: addressbook/gui/widgets/e-addressbook-view.c:222
-#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:505
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "地址簿"
 
@@ -2466,390 +2669,6 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "高级搜索"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-msgid "No contacts"
-msgstr "无联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "%d 个联系人"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: addressbook/gui/widgets/e-addressbook-view.c:236
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#: addressbook/gui/widgets/e-minicard-view.c:512
-msgid "Query"
-msgstr "查询"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "获取名簿视图出错"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
-msgid "Model"
-msgstr "模型"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "修改名片错误"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:168
-msgid "Name begins with"
-msgstr "姓名以此开头"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:169
-msgid "Email begins with"
-msgstr "邮件以此开头"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:170
-#: calendar/gui/cal-search-bar.c:53
-msgid "Category is"
-msgstr "类别为"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:171
-#: calendar/gui/cal-search-bar.c:48
-msgid "Any field contains"
-msgstr "任何域含有"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-#: addressbook/gui/widgets/e-addressbook-view.c:177
-msgid "Advanced..."
-msgstr "高级..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:243
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:13
-#: calendar/gui/e-meeting-list-view.c:228
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "类型"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:540
-msgid "Address Book"
-msgstr "地址簿"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:803
-#: addressbook/gui/widgets/e-addressbook-view.c:921
-#: addressbook/gui/widgets/e-addressbook-view.c:1972
-#: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard..."
-msgstr "另存为 VCard..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:917
-msgid "New Contact..."
-msgstr "新建联系人..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:918
-msgid "New Contact List..."
-msgstr "新建联系人列表..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:922
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:923
-msgid "Send Message to Contact"
-msgstr "给联系人发信件"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "打印"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:927
-msgid "Copy to Address Book..."
-msgstr "复制到地址簿..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:928
-msgid "Move to Address Book..."
-msgstr "移动到地址簿..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:931
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪切"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:932
-#: calendar/gui/calendar-component.c:384 calendar/gui/tasks-component.c:329
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:933
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "粘贴"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1526
-#: calendar/gui/cal-search-bar.c:346
-msgid "Any Category"
-msgstr "任何类别"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "助手"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "助手电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "商务传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "商务电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "商务电话 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "回拨电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "车载电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#: calendar/gui/e-calendar-table.etspec.h:3
-msgid "Categories"
-msgstr "类别"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "公司电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:560 smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "电子邮件"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:441
-msgid "Email 2"
-msgstr "电子邮件 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:451
-msgid "Email 3"
-msgstr "电子邮件 3"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "姓"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "存档为"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-msgid "Given Name"
-msgstr "名"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "家庭传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "家庭电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "家庭电话 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "ISDN Phone"
-msgstr "ISDN 电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-msgid "Journal"
-msgstr "日记"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "经理"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:379
-msgid "Mobile Phone"
-msgstr "移动电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "昵称"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:390
-msgid "Note"
-msgstr "注释"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "办公室"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:360
-msgid "Organization"
-msgstr "组织"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "其它传真"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "其它电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "寻呼机"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "主要电话"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "收音机"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:235
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "角色"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "配偶"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-msgid "TTYTDD"
-msgstr "TTYTDD"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "电传"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "头衔"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-msgid "Unit"
-msgstr "单位"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "网站"
-
-#: addressbook/gui/widgets/e-minicard-label.c:115
-#: addressbook/gui/widgets/e-minicard.c:137
-msgid "Width"
-msgstr "宽度"
-
-#: addressbook/gui/widgets/e-minicard-label.c:122
-#: addressbook/gui/widgets/e-minicard.c:144
-msgid "Height"
-msgstr "高度"
-
-#: addressbook/gui/widgets/e-minicard-label.c:129
-#: addressbook/gui/widgets/e-minicard.c:152
-msgid "Has Focus"
-msgstr "有焦点"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "域"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "域名"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "文字模型"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "最大域名长度"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "列宽"
-
-#: addressbook/gui/widgets/e-minicard-view.c:171
-msgid ""
-"\n"
-"\n"
-"Search for the Contact\n"
-"\n"
-"or double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"搜索联系人\n"
-"\n"
-"或在此双击以创建新联系人。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:174
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项。\n"
-"\n"
-"请在此双击以创建新联系人。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:179
-msgid ""
-"\n"
-"\n"
-"Search for the Contact."
-msgstr "\n\n搜索联系人。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:181
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"本视图中没有可显示的项。"
-
-#: addressbook/gui/widgets/e-minicard-view.c:498
-msgid "Adapter"
-msgstr "适配器"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "已选择"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "有光标"
-
 #: addressbook/gui/widgets/eab-contact-display.c:133
 #: addressbook/gui/widgets/eab-contact-display.c:196
 msgid "(map)"
@@ -2870,6 +2689,11 @@ msgstr "列出成员"
 msgid "E-mail"
 msgstr "电子邮件"
 
+#: addressbook/gui/widgets/eab-contact-display.c:360
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "组织"
+
 #: addressbook/gui/widgets/eab-contact-display.c:361
 msgid "Position"
 msgstr "位置"
@@ -2900,14 +2724,30 @@ msgstr "WWW"
 msgid "Blog"
 msgstr "Blog"
 
+#: addressbook/gui/widgets/eab-contact-display.c:379
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "移动电话"
+
 #: addressbook/gui/widgets/eab-contact-display.c:383
 msgid "personal"
 msgstr "个人"
 
+#: addressbook/gui/widgets/eab-contact-display.c:390
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "注释"
+
 #: addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Job Title"
 msgstr "职称"
 
+#: addressbook/gui/widgets/eab-contact-display.c:560
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "电子邮件"
+
 #: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Home page"
 msgstr "主页"
@@ -2964,9 +2804,10 @@ msgstr "不支持的协议"
 #: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:231
-#: calendar/gui/e-cal-model-tasks.c:347 calendar/gui/e-cal-model-tasks.c:650
-#: calendar/gui/e-calendar-table.c:457 calendar/gui/print.c:2352
-#: camel/providers/pop3/camel-pop3-store.c:439
+#: calendar/gui/e-calendar-table.c:457 calendar/gui/e-cal-model-tasks.c:347
+#: calendar/gui/e-cal-model-tasks.c:650 calendar/gui/print.c:2352
+#: camel/camel-net-utils.c:446 camel/camel-net-utils.c:608
+#: camel/camel-net-utils.c:739 camel/providers/pop3/camel-pop3-store.c:439
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "已经取消"
@@ -3170,6 +3011,16 @@ msgstr "(无)"
 msgid "Primary Email"
 msgstr "主电子邮件"
 
+#: addressbook/gui/widgets/eab-popup-control.c:441
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "电子邮件 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:451
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "电子邮件 3"
+
 #: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "选择一项活动"
@@ -3215,6 +3066,364 @@ msgstr "显示紧凑 VCard"
 msgid "Save in addressbook"
 msgstr "保存在地址簿中"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+msgid "No contacts"
+msgstr "无联系人"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "%d 个联系人"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
+#: addressbook/gui/widgets/e-addressbook-view.c:236
+#: addressbook/gui/widgets/e-minicard-view.c:512
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+msgid "Query"
+msgstr "查询"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "获取名簿视图出错"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+msgid "Model"
+msgstr "模型"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "修改名片错误"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Name begins with"
+msgstr "姓名以此开头"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Email begins with"
+msgstr "邮件以此开头"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:53
+msgid "Category is"
+msgstr "类别为"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: calendar/gui/cal-search-bar.c:48
+msgid "Any field contains"
+msgstr "任何域含有"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:172
+#: addressbook/gui/widgets/e-addressbook-view.c:177
+msgid "Advanced..."
+msgstr "高级..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:243
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:228
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "类型"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:540
+#: plugins/shared-folder/properties.glade.h:6
+msgid "Address Book"
+msgstr "地址簿"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:803
+#: addressbook/gui/widgets/e-addressbook-view.c:921
+#: addressbook/gui/widgets/e-addressbook-view.c:1972
+#: ui/evolution-addressbook.xml.h:19
+msgid "Save as VCard..."
+msgstr "另存为 VCard..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:917
+msgid "New Contact..."
+msgstr "新建联系人..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:918
+msgid "New Contact List..."
+msgstr "新建联系人列表..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:922
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "转发联系人"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:923
+msgid "Send Message to Contact"
+msgstr "给联系人发信件"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:924 calendar/gui/print.c:2483
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "打印"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:927
+msgid "Copy to Address Book..."
+msgstr "复制到地址簿..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:928
+msgid "Move to Address Book..."
+msgstr "移动到地址簿..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:931
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "剪切"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:932
+#: calendar/gui/calendar-component.c:384 calendar/gui/tasks-component.c:329
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "复制"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:933
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "粘贴"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1526
+#: calendar/gui/cal-search-bar.c:346
+msgid "Any Category"
+msgstr "任何类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "助手"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "助手电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "商务传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "商务电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "商务电话 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "回拨电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "车载电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/dialogs/task-page.glade.h:5
+#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "Categories"
+msgstr "类别"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "公司电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "姓"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "存档为"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+msgid "Given Name"
+msgstr "名"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "家庭传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "家庭电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "家庭电话 2"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "ISDN Phone"
+msgstr "ISDN 电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+msgid "Journal"
+msgstr "日记"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "经理"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "昵称"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "办公室"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "其它传真"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "其它电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "寻呼机"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "主要电话"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "收音机"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:235
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "角色"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "配偶"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+msgid "TTYTDD"
+msgstr "TTYTDD"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "电传"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "头衔"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+msgid "Unit"
+msgstr "单位"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "网站"
+
+#: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
+msgid "Width"
+msgstr "宽度"
+
+#: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
+msgid "Height"
+msgstr "高度"
+
+#: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
+msgid "Has Focus"
+msgstr "有焦点"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "已选择"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "有光标"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "域"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "域名"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "文字模型"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "最大域名长度"
+
+#: addressbook/gui/widgets/e-minicard-view.c:171
+msgid ""
+"\n"
+"\n"
+"Search for the Contact\n"
+"\n"
+"or double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"搜索联系人\n"
+"\n"
+"或在此双击以创建新联系人。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:174
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。\n"
+"\n"
+"请在此双击以创建新联系人。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:179
+msgid ""
+"\n"
+"\n"
+"Search for the Contact."
+msgstr ""
+"\n"
+"\n"
+"搜索联系人。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:181
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"本视图中没有可显示的项。"
+
+#: addressbook/gui/widgets/e-minicard-view.c:498
+msgid "Adapter"
+msgstr "适配器"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "列宽"
+
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "名片视图"
@@ -3223,20 +3432,6 @@ msgstr "名片视图"
 msgid "GTK Tree View"
 msgstr "GTK 树视图"
 
-#: addressbook/gui/widgets/test-reflow.c:119
-msgid "Reflow Test"
-msgstr "回溯测试"
-
-#: 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:122
-msgid "This should test the reflow canvas item"
-msgstr "这应该测试回溯原始项目"
-
 #: addressbook/importers/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
@@ -3253,11 +3448,6 @@ msgstr "Evolution VCard 导入器"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vfg, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "打印信封"
-
 #: addressbook/printing/e-contact-print.c:1000
 msgid "Print contacts"
 msgstr "打印联系人"
@@ -3267,6 +3457,11 @@ msgstr "打印联系人"
 msgid "Print contact"
 msgstr "打印联系人"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "打印信封"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3357,15 +3552,15 @@ msgstr "列数："
 
 #: addressbook/printing/e-contact-print.glade.h:23
 #: camel/providers/groupwise/camel-groupwise-provider.c:59
-#: camel/providers/imap/camel-imap-provider.c:64
 #: camel/providers/imap4/camel-imap4-provider.c:49
+#: camel/providers/imap/camel-imap-provider.c:64
 #: camel/providers/local/camel-local-provider.c:43
 #: camel/providers/local/camel-local-provider.c:79
 #: camel/providers/local/camel-local-provider.c:99
 msgid "Options"
 msgstr "选项"
 
-#: addressbook/printing/e-contact-print.glade.h:24
+#: addressbook/printing/e-contact-print.glade.h:24 e-util/eggtrayicon.c:118
 msgid "Orientation"
 msgstr "方向"
 
@@ -3442,36 +3637,6 @@ msgstr "宽度："
 msgid "_Font..."
 msgstr "字体(_F)..."
 
-#: addressbook/printing/test-contact-print-style-editor.c:53
-msgid "Contact Print Style Editor Test"
-msgstr "联系人打印样式编辑器测试"
-
-#: addressbook/printing/test-contact-print-style-editor.c:56
-msgid "This should test the contact print style editor widget"
-msgstr "这应该测试联系人打印样式编辑器部件"
-
-#: addressbook/printing/test-print.c:52
-msgid "Contact Print Test"
-msgstr "联系人打印测试"
-
-#: addressbook/printing/test-print.c:55
-msgid "This should test the contact print code"
-msgstr "这应该测试联系人打印代码"
-
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-msgid "Can not open file"
-msgstr "无法打开文件"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-msgid "Couldn't get list of addressbooks"
-msgstr "无法获得地址簿列表"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-msgid "failed to open book"
-msgstr "打开地址簿失败"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
@@ -3830,8 +3995,6 @@ msgid ""
 msgstr "在您的约会中添加有意义的概览可以让您的收件人更容易明白您约会的内容。"
 
 #: calendar/calendar-errors.xml.h:127 calendar/calendar-errors.xml.h:132
-#: mail/mail-errors.xml.h:15 mail/mail-errors.xml.h:20
-#: mail/mail-errors.xml.h:27 mail/mail-errors.xml.h:32
 msgid "_Send"
 msgstr "发送(_S)"
 
@@ -3877,65 +4040,6 @@ msgstr "默认优先级："
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:1082
-msgid "Calendars"
-msgstr "日历"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在此配置您的时区、日历和任务列表 "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 日历配置控件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 日历调度信件查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 日历/任务新闻编辑器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution's Calendar component"
-msgstr "Evolution 日历组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution's Tasks component"
-msgstr "Evolution 任务组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#: calendar/gui/e-tasks.c:1189 calendar/gui/print.c:1822
-#: calendar/gui/tasks-component.c:408 calendar/gui/tasks-component.c:878
-#: calendar/gui/tasks-control.c:410 calendar/importers/icalendar-importer.c:83
-#: calendar/importers/icalendar-importer.c:709
-#: camel/providers/groupwise/camel-gw-listener.c:406
-msgid "Tasks"
-msgstr "任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "_Calendars"
-msgstr "日历(_C)"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "任务(_T)"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution 日历提醒通知服务"
-
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: calendar/gui/dialogs/event-editor.c:138 calendar/gui/print.c:2298
 msgid "Appointment"
@@ -3970,7 +4074,7 @@ msgstr "开始时间："
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:43
 #: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:22
+#: ui/evolution-tasks.xml.h:22 ui/evolution.xml.h:30
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -4065,6 +4169,10 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution 日历提醒通知服务"
+
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "无法初始化 Bonobo"
@@ -4205,30 +4313,12 @@ msgstr "是以 24 小时格式还是以 12 小时格式显示时间"
 msgid "Whether to show week numbers in date navigator"
 msgstr "是否在日期浏览器中显示周数"
 
-#: calendar/gui/cal-search-bar.c:49
-msgid "Summary contains"
-msgstr "概要含有"
-
-#: calendar/gui/cal-search-bar.c:50
-msgid "Description contains"
-msgstr "描述含有"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Comment contains"
-msgstr "注释含有"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Location contains"
-msgstr "位置含有"
-
-#: calendar/gui/cal-search-bar.c:350 camel/camel-vee-store.c:343
-msgid "Unmatched"
-msgstr "无匹配"
-
 #: calendar/gui/calendar-commands.c:120 calendar/gui/calendar-component.c:567
 #: calendar/gui/dialogs/calendar-setup.c:325 calendar/gui/gnome-cal.c:1925
 #: camel/providers/groupwise/camel-gw-listener.c:405
 #: camel/providers/groupwise/camel-gw-listener.c:435
+#: plugins/groupwise-account-setup/camel-gw-listener.c:405
+#: plugins/groupwise-account-setup/camel-gw-listener.c:435
 msgid "Calendar"
 msgstr "日历"
 
@@ -4247,50 +4337,15 @@ msgstr "销毁较早的事件"
 #: calendar/gui/calendar-commands.c:366
 #: calendar/gui/dialogs/alarm-dialog.glade.h:21
 #: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:14
+#: plugins/calendar-http/calendar-http.c:265
 msgid "days"
 msgstr "天数"
 
 #: calendar/gui/calendar-component.c:383
+#: calendar/gui/dialogs/calendar-setup.c:403
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: calendar/gui/calendar-component.c:519
-msgid "%A %d %b %Y"
-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-component.c:522
-#: calendar/gui/e-day-view-top-item.c:708 calendar/gui/e-day-view.c:1572
-#: calendar/gui/e-week-view-main-item.c:321
-msgid "%a %d %b"
-msgstr "%-m月%-d日%A"
-
-#: calendar/gui/calendar-component.c:524 calendar/gui/calendar-component.c:529
-#: calendar/gui/calendar-component.c:531
-msgid "%a %d %b %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#: calendar/gui/calendar-component.c:543 calendar/gui/calendar-component.c:550
-#: calendar/gui/calendar-component.c:556 calendar/gui/calendar-component.c:558
-msgid "%d %b %Y"
-msgstr "%Y年%-m月%-d日"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. Don't use any other specifiers.
-#. 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/calendar-component.c:548
-#: calendar/gui/e-day-view-top-item.c:712 calendar/gui/e-day-view.c:1588
-#: calendar/gui/e-week-view-main-item.c:335
-msgid "%d %b"
-msgstr "%B%-d日"
-
 #: calendar/gui/calendar-component.c:638
 msgid "Failed upgrading calendars."
 msgstr "升级日历失败。"
@@ -4304,6 +4359,11 @@ msgstr "无法打开日历“%s”来创建事件和会议"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "没有可创建事件和会议的日历"
 
+#: calendar/gui/calendar-component.c:1082
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Calendars"
+msgstr "日历"
+
 #: calendar/gui/calendar-component.c:1248
 msgid "New appointment"
 msgstr "新建约会"
@@ -4378,6 +4438,26 @@ msgstr "周视图"
 msgid "Month View"
 msgstr "月视图"
 
+#: calendar/gui/cal-search-bar.c:49
+msgid "Summary contains"
+msgstr "概要含有"
+
+#: calendar/gui/cal-search-bar.c:50
+msgid "Description contains"
+msgstr "描述含有"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Comment contains"
+msgstr "注释含有"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Location contains"
+msgstr "位置含有"
+
+#: calendar/gui/cal-search-bar.c:350 camel/camel-vee-store.c:343
+msgid "Unmatched"
+msgstr "无匹配"
+
 #: calendar/gui/comp-editor-factory.c:413
 msgid "Error while opening the calendar"
 msgstr "打开日历时出错"
@@ -4391,9 +4471,9 @@ msgid "Permission denied to open the calendar"
 msgstr "没有权限打开日历"
 
 #: calendar/gui/comp-editor-factory.c:437
+#: camel/providers/imap4/camel-imap4-store.c:288
 #: camel/providers/imap/camel-imap-command.c:303
 #: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/imap4/camel-imap4-store.c:288
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533
 #: camel/providers/pop3/camel-pop3-store.c:539 shell/e-shell.c:1247
@@ -4499,6 +4579,7 @@ msgstr "小时"
 
 #: calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:15
+#: plugins/calendar-http/calendar-http.c:264
 msgid "hours"
 msgstr "小时"
 
@@ -4538,10 +4619,64 @@ msgstr "添加(_D)"
 msgid "Alarms"
 msgstr "提醒"
 
+#: calendar/gui/dialogs/calendar-setup.c:299
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+msgid "C_olor:"
+msgstr "颜色(_O)："
+
+#: calendar/gui/dialogs/calendar-setup.c:335
+msgid "Tasks List"
+msgstr "任务列表"
+
+#: calendar/gui/dialogs/calendar-setup.c:401
+msgid "Calendar Properties"
+msgstr "日历属性"
+
+#: calendar/gui/dialogs/calendar-setup.c:467
+msgid "Task List Properties"
+msgstr "任务列表属性"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "添加日历"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Task List"
+msgstr "添加任务列表"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
+msgid "Pick a color"
+msgstr "选取一种颜色"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+msgid "_Add Calendar"
+msgstr "添加日历(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+msgid "_Add Task List"
+msgstr "添加任务列表(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#: plugins/calendar-http/calendar-http.c:248
+msgid "_Refresh:"
+msgstr "刷新(_R)："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#: plugins/calendar-http/calendar-http.c:120
+msgid "_URL:"
+msgstr "_URL："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
+#: plugins/calendar-http/calendar-http.c:266
+msgid "weeks"
+msgstr "周"
+
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
+#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: calendar/gui/dialogs/cal-prefs-dialog.c:566 mail/em-account-prefs.c:480
 #: mail/em-composer-prefs.c:678 mail/em-composer-prefs.c:945
+#: plugins/plugin-manager/plugin-manager.c:213
 msgid "Enabled"
 msgstr "已启用"
 
@@ -4802,55 +4937,6 @@ msgstr "选择提醒单位的选项菜单"
 msgid "option menu to choose time units"
 msgstr "选择时间单位的选项菜单"
 
-#: calendar/gui/dialogs/calendar-setup.c:299
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "颜色(_O)："
-
-#: calendar/gui/dialogs/calendar-setup.c:335
-msgid "Tasks List"
-msgstr "任务列表"
-
-#: calendar/gui/dialogs/calendar-setup.c:400
-msgid "Calendar Properties"
-msgstr "日历属性"
-
-#: calendar/gui/dialogs/calendar-setup.c:464
-msgid "Task List Properties"
-msgstr "任务列表属性"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "添加日历"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Task List"
-msgstr "添加任务列表"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:103
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Calendar"
-msgstr "添加日历(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-msgid "_Add Task List"
-msgstr "添加任务列表(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-msgid "_Refresh:"
-msgstr "刷新(_R)："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URL："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:21
-msgid "weeks"
-msgstr "周"
-
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "该事件已经被删除。"
@@ -4895,31 +4981,6 @@ msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器吗？"
 
-#: calendar/gui/dialogs/comp-editor-page.c:464
-#, c-format
-msgid "Validation error: %s"
-msgstr "校验错误：%s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2261
-msgid " to "
-msgstr " 到 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
-msgid " (Completed "
-msgstr " (完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
-msgid " (Due "
-msgstr " (预定 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
-msgid "Due "
-msgstr "预定 "
-
 #: calendar/gui/dialogs/comp-editor.c:257
 msgid "Could not update object"
 msgstr "无法更新对象"
@@ -4974,6 +5035,27 @@ msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "校验错误：%s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2265
+msgid " (Completed "
+msgstr " (完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2267
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2272
+msgid " (Due "
+msgstr " (预定 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2274
+msgid "Due "
+msgstr "预定 "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "无法打开源"
@@ -5152,8 +5234,9 @@ msgid "Classi_fication:"
 msgstr "分类(_F)："
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:7 calendar/gui/e-cal-list-view.c:255
-#: calendar/gui/e-cal-model.c:346 calendar/gui/e-calendar-table.c:361
+#: calendar/gui/dialogs/task-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:361 calendar/gui/e-cal-list-view.c:255
+#: calendar/gui/e-cal-model.c:346
 msgid "Confidential"
 msgstr "机密"
 
@@ -5166,15 +5249,16 @@ msgid "Locat_ion:"
 msgstr "位置(_I)："
 
 #: calendar/gui/dialogs/event-page.glade.h:15
-#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:254
-#: calendar/gui/e-cal-model.c:344 calendar/gui/e-calendar-table.c:360
+#: calendar/gui/dialogs/task-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:360 calendar/gui/e-cal-list-view.c:254
+#: calendar/gui/e-cal-model.c:344
 msgid "Private"
 msgstr "保密"
 
 #: calendar/gui/dialogs/event-page.glade.h:16
 #: calendar/gui/dialogs/task-page.glade.h:10
-#: calendar/gui/e-cal-list-view.c:253 calendar/gui/e-cal-model.c:335
-#: calendar/gui/e-cal-model.c:342 calendar/gui/e-calendar-table.c:359
+#: calendar/gui/e-calendar-table.c:359 calendar/gui/e-cal-list-view.c:253
+#: calendar/gui/e-cal-model.c:335 calendar/gui/e-cal-model.c:342
 msgid "Public"
 msgstr "公开"
 
@@ -5210,7 +5294,6 @@ 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
@@ -5219,8 +5302,8 @@ msgstr "开始时间(_S)："
 #: calendar/gui/dialogs/meeting-page.glade.h:5
 #: calendar/gui/e-cal-model-tasks.c:642 calendar/gui/e-itip-control.c:1104
 #: composer/e-msg-composer.c:2115 filter/filter-rule.c:878
+#: mail/em-account-editor.c:675 mail/em-account-editor.c:1264
 #: mail/em-account-prefs.c:441 mail/em-folder-view.c:961
-#: mail/mail-account-gui.c:1579 mail/mail-account-gui.c:2024
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:190
 #: widgets/misc/e-cell-date-edit.c:248 widgets/misc/e-dateedit.c:458
 #: widgets/misc/e-dateedit.c:1497 widgets/misc/e-dateedit.c:1651
@@ -5245,6 +5328,7 @@ msgstr "授权于(_D)..."
 
 #: calendar/gui/dialogs/meeting-page.c:781
 #: composer/e-msg-composer-attachment-bar.c:440
+#: plugins/shared-folder/properties.glade.h:19
 msgid "_Remove"
 msgstr "删除(_R)"
 
@@ -5503,8 +5587,8 @@ msgstr "<span weight=\"bold\">状态</span>"
 #. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:228
-#: calendar/gui/e-cal-model-tasks.c:345 calendar/gui/e-cal-model-tasks.c:648
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-tasks.c:345
+#: calendar/gui/e-cal-model-tasks.c:648 calendar/gui/e-itip-control.c:896
 #: calendar/gui/e-meeting-store.c:188 calendar/gui/e-meeting-store.c:211
 #: calendar/gui/print.c:2349
 msgid "Completed"
@@ -5518,8 +5602,8 @@ msgstr "高"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:225
-#: calendar/gui/e-cal-model-tasks.c:343 calendar/gui/e-cal-model-tasks.c:646
-#: calendar/gui/e-cal-model-tasks.c:721 calendar/gui/e-calendar-table.c:455
+#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-tasks.c:343
+#: calendar/gui/e-cal-model-tasks.c:646 calendar/gui/e-cal-model-tasks.c:721
 #: calendar/gui/print.c:2346
 msgid "In Progress"
 msgstr "进行中"
@@ -5531,15 +5615,16 @@ msgid "Low"
 msgstr "低"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:249 calendar/gui/e-cal-model.c:940
-#: calendar/gui/e-calendar-table.c:382 mail/message-list.c:1010
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:940
+#: mail/message-list.c:1010
 msgid "Normal"
 msgstr "中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:235
-#: calendar/gui/e-cal-model-tasks.c:341 calendar/gui/e-cal-model-tasks.c:644
-#: calendar/gui/e-calendar-table.c:454 calendar/gui/print.c:2343
+#: calendar/gui/e-calendar-table.c:454 calendar/gui/e-cal-model-tasks.c:341
+#: calendar/gui/e-cal-model-tasks.c:644 calendar/gui/print.c:2343
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -5772,94 +5857,6 @@ msgstr "描述："
 msgid "Web Page:"
 msgstr "网页："
 
-#: calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "结束日期"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-msgid "Start Date"
-msgstr "开始日期"
-
-#: calendar/gui/e-cal-list-view.etspec.h:5
-#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:21
-msgid "Summary"
-msgstr "概要"
-
-#: calendar/gui/e-cal-model-calendar.c:175 calendar/gui/e-calendar-table.c:433
-msgid "Free"
-msgstr "空闲"
-
-#: calendar/gui/e-cal-model-calendar.c:178 calendar/gui/e-calendar-table.c:434
-#: calendar/gui/e-meeting-time-sel.c:403
-msgid "Busy"
-msgstr "繁忙"
-
-#: calendar/gui/e-cal-model-tasks.c:297
-msgid "N"
-msgstr "北"
-
-#: calendar/gui/e-cal-model-tasks.c:297
-msgid "S"
-msgstr "南"
-
-#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "东"
-
-#: calendar/gui/e-cal-model-tasks.c:299
-msgid "W"
-msgstr "西"
-
-#: calendar/gui/e-cal-model-tasks.c:596
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理位置必须以此格式输入：\n"
-"\n"
-"45.436845,125.862501"
-
-#: calendar/gui/e-cal-model-tasks.c:1007 calendar/gui/e-cal-model.c:946
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:160
-#: calendar/gui/e-meeting-store.c:170 calendar/gui/e-meeting-store.c:773
-msgid "Yes"
-msgstr "是"
-
-#: calendar/gui/e-cal-model-tasks.c:1007 calendar/gui/e-cal-model.c:946
-#: calendar/gui/e-meeting-list-view.c:148 calendar/gui/e-meeting-store.c:172
-msgid "No"
-msgstr "否"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:348 calendar/gui/e-cal-model.c:351
-#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
-#: calendar/gui/e-meeting-list-view.c:123
-#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:116
-#: calendar/gui/e-meeting-store.c:151 calendar/gui/e-meeting-store.c:216
-#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1465
-#: camel/providers/imap4/camel-imap4-engine.c:1504
-#: camel/providers/imap4/camel-imap4-engine.c:1549
-#: camel/providers/imap4/camel-imap4-engine.c:1605
-#: camel/providers/imap4/camel-imap4-store.c:1241
-#: camel/providers/imap4/camel-imap4-utils.c:575
-#: camel/providers/smtp/camel-smtp-transport.c:163
-#: camel/providers/smtp/camel-smtp-transport.c:218 mail/em-utils.c:1157
-#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "未知"
-
-#: calendar/gui/e-cal-model.c:942
-msgid "Recurring"
-msgstr "重复"
-
-#: calendar/gui/e-cal-model.c:944
-msgid "Assigned"
-msgstr "已指派"
-
 #: calendar/gui/e-calendar-table.c:403
 msgid "0%"
 msgstr "0%"
@@ -5904,6 +5901,15 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: calendar/gui/e-calendar-table.c:433 calendar/gui/e-cal-model-calendar.c:175
+msgid "Free"
+msgstr "空闲"
+
+#: calendar/gui/e-calendar-table.c:434 calendar/gui/e-cal-model-calendar.c:178
+#: calendar/gui/e-meeting-time-sel.c:403
+msgid "Busy"
+msgstr "繁忙"
+
 #: calendar/gui/e-calendar-table.c:689 calendar/gui/e-calendar-view.c:652
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
@@ -6021,6 +6027,11 @@ msgstr "优先级"
 msgid "Start date"
 msgstr "开始日期"
 
+#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-cal-list-view.etspec.h:5 mail/mail-dialogs.glade.h:21
+msgid "Summary"
+msgstr "概要"
+
 #: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "任务排序"
@@ -6041,10 +6052,6 @@ msgstr "新建约会(_A)..."
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: calendar/gui/e-calendar-view.c:1366
-msgid "New Meeting"
-msgstr "新会议"
-
 #: calendar/gui/e-calendar-view.c:1367
 msgid "New Task"
 msgstr "新建任务"
@@ -6095,6 +6102,80 @@ msgstr "删除此次出现(_O)"
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "结束日期"
+
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "开始日期"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:348 calendar/gui/e-cal-model.c:351
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1290
+#: calendar/gui/e-meeting-list-view.c:123
+#: calendar/gui/e-meeting-list-view.c:137 calendar/gui/e-meeting-store.c:116
+#: calendar/gui/e-meeting-store.c:151 calendar/gui/e-meeting-store.c:216
+#: camel/camel-gpg-context.c:1767 camel/camel-gpg-context.c:1818
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1465
+#: camel/providers/imap4/camel-imap4-engine.c:1504
+#: camel/providers/imap4/camel-imap4-engine.c:1549
+#: camel/providers/imap4/camel-imap4-engine.c:1605
+#: camel/providers/imap4/camel-imap4-store.c:1241
+#: camel/providers/imap4/camel-imap4-utils.c:575
+#: camel/providers/smtp/camel-smtp-transport.c:163
+#: camel/providers/smtp/camel-smtp-transport.c:218 mail/em-utils.c:1157
+#: plugins/plugin-manager/plugin-manager.c:72 shell/e-component-registry.c:207
+#: shell/e-component-registry.c:211 widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "未知"
+
+#: calendar/gui/e-cal-model.c:942
+msgid "Recurring"
+msgstr "重复"
+
+#: calendar/gui/e-cal-model.c:944
+msgid "Assigned"
+msgstr "已指派"
+
+#: calendar/gui/e-cal-model.c:946 calendar/gui/e-cal-model-tasks.c:1007
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:160
+#: calendar/gui/e-meeting-store.c:170 calendar/gui/e-meeting-store.c:773
+msgid "Yes"
+msgstr "是"
+
+#: calendar/gui/e-cal-model.c:946 calendar/gui/e-cal-model-tasks.c:1007
+#: calendar/gui/e-meeting-list-view.c:148 calendar/gui/e-meeting-store.c:172
+msgid "No"
+msgstr "否"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "N"
+msgstr "北"
+
+#: calendar/gui/e-cal-model-tasks.c:297
+msgid "S"
+msgstr "南"
+
+#: calendar/gui/e-cal-model-tasks.c:299 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "东"
+
+#: calendar/gui/e-cal-model-tasks.c:299
+msgid "W"
+msgstr "西"
+
+#: calendar/gui/e-cal-model-tasks.c:596
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"地理位置必须以此格式输入：\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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.
@@ -6126,22 +6207,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:527
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分钟分割"
-
-#. strftime format %A = full weekday name, %d = day of month,
-#. %B = full month name. Don't use any other specifiers.
-#. 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:704 calendar/gui/e-day-view.c:1555
-#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
-msgid "%A %d %B"
-msgstr "%B%d日%A"
-
 #. String to use in 12-hour time format for times in the morning.
 #: calendar/gui/e-day-view.c:811 calendar/gui/e-week-view.c:578
 #: calendar/gui/print.c:841
@@ -6154,6 +6219,22 @@ msgstr "上午"
 msgid "pm"
 msgstr "下午"
 
+#. strftime format %A = full weekday name, %d = day of month,
+#. %B = full month name. Don't use any other specifiers.
+#. 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.c:1555 calendar/gui/e-day-view-top-item.c:704
+#: calendar/gui/e-week-view-main-item.c:312 calendar/gui/print.c:1517
+msgid "%A %d %B"
+msgstr "%B%d日%A"
+
+#: calendar/gui/e-day-view-time-item.c:527
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分钟分割"
+
 #: calendar/gui/e-itip-control.c:761
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(复杂重现)"
@@ -6635,37 +6716,7 @@ msgstr "被委任的"
 msgid "In Process"
 msgstr "处理中"
 
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:444
-#: calendar/gui/e-meeting-time-sel.c:2089
-msgid "%A, %B %d, %Y"
-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:448
-#: calendar/gui/e-meeting-time-sel.c:2122 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-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:452 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
-msgid "%m/%d/%Y"
-msgstr "%Y-%m-%d"
-
-#: calendar/gui/e-meeting-time-sel.c:404 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-time-sel.c:404
 msgid "Out of Office"
 msgstr "办公室以外"
 
@@ -6717,6 +6768,36 @@ msgstr "必需的人(_R)"
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel.c:2089
+#: calendar/gui/e-meeting-time-sel-item.c:444
+msgid "%A, %B %d, %Y"
+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.c:2122
+#: calendar/gui/e-meeting-time-sel-item.c:448 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+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:452 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1660
+msgid "%m/%d/%Y"
+msgstr "%Y-%m-%d"
+
 #: calendar/gui/e-pub-utils.c:300
 #, c-format
 msgid "Enter the password for %s"
@@ -6752,6 +6833,17 @@ msgstr "正在删除选中的对象..."
 msgid "Expunging"
 msgstr "销毁"
 
+#: calendar/gui/e-tasks.c:1189
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/print.c:1822 calendar/gui/tasks-component.c:408
+#: calendar/gui/tasks-component.c:878 calendar/gui/tasks-control.c:410
+#: calendar/importers/icalendar-importer.c:83
+#: calendar/importers/icalendar-importer.c:709
+#: camel/providers/groupwise/camel-gw-listener.c:406
+#: plugins/groupwise-account-setup/camel-gw-listener.c:406
+msgid "Tasks"
+msgstr "任务"
+
 #: calendar/gui/e-timezone-entry.c:133
 msgid "Timezone Button"
 msgstr "时区按钮"
@@ -6799,6 +6891,47 @@ msgstr "打开 %s"
 msgid "Purging"
 msgstr "销毁"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "Calendar and Tasks"
+msgstr "日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "在此配置您的时区、日历和任务列表 "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution 日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 日历配置控件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历调度信件查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 日历/任务新闻编辑器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution's Calendar component"
+msgstr "Evolution 日历组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution's Tasks component"
+msgstr "Evolution 任务组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "_Calendars"
+msgstr "日历(_C)"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "任务(_T)"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "四月"
@@ -7312,10 +7445,6 @@ msgstr ""
 "Evolution 已找到 Gnome 日历文件。\n"
 "您是否原意把它们导入 Evolution？"
 
-#: calendar/importers/icalendar-importer.c:734
-msgid "Gnome Calendar"
-msgstr "Gnome 日历"
-
 #.
 #. * These are the timezone names from the Olson timezone data.
 #. * We only place them here so gettext picks them up for translation.
@@ -9026,6 +9155,41 @@ msgstr "创建子进程“%s”失败：%s"
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误：%s：%s"
 
+#: camel/camel-folder.c:610
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "不支持的操作：附加信件：为 %s"
+
+#: camel/camel-folder.c:1200
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "不支持的操作：按表达式搜索：搜索 %s"
+
+#: camel/camel-folder.c:1240
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "不支持的操作：按 uid 搜索：搜索 %s"
+
+#: camel/camel-folder.c:1352
+msgid "Moving messages"
+msgstr "移动信件"
+
+#: camel/camel-folder.c:1352
+msgid "Copying messages"
+msgstr "复制信件"
+
+#: camel/camel-folder.c:1601
+msgid "Learning junk"
+msgstr "学习垃圾邮件"
+
+#: camel/camel-folder.c:1618
+msgid "Learning non-junk"
+msgstr "学习非垃圾邮件"
+
+#: camel/camel-folder.c:1637
+msgid "Filtering new message(s)"
+msgstr "过滤新信件"
+
 #: camel/camel-folder-search.c:357 camel/camel-folder-search.c:478
 #, c-format
 msgid ""
@@ -9069,41 +9233,6 @@ msgstr "(match-threads) 需要文件夹集"
 msgid "Performing query on unknown header: %s"
 msgstr "对未知的头进行查询：%s"
 
-#: camel/camel-folder.c:610
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "不支持的操作：附加信件：为 %s"
-
-#: camel/camel-folder.c:1200
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "不支持的操作：按表达式搜索：搜索 %s"
-
-#: camel/camel-folder.c:1240
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "不支持的操作：按 uid 搜索：搜索 %s"
-
-#: camel/camel-folder.c:1352
-msgid "Moving messages"
-msgstr "移动信件"
-
-#: camel/camel-folder.c:1352
-msgid "Copying messages"
-msgstr "复制信件"
-
-#: camel/camel-folder.c:1601
-msgid "Learning junk"
-msgstr "学习垃圾邮件"
-
-#: camel/camel-folder.c:1618
-msgid "Learning non-junk"
-msgstr "学习非垃圾邮件"
-
-#: camel/camel-folder.c:1637
-msgid "Filtering new message(s)"
-msgstr "过滤新信件"
-
 #: camel/camel-gpg-context.c:735
 #, c-format
 msgid ""
@@ -9134,8 +9263,8 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:804 camel/camel-gpg-context.c:1314
 #: camel/camel-gpg-context.c:1498 camel/camel-gpg-context.c:1589
-#: camel/camel-gpg-context.c:1701 camel/providers/nntp/camel-nntp-store.c:1262
-#: mail/mail-ops.c:718 mail/mail-send-recv.c:607
+#: camel/camel-gpg-context.c:1701 mail/mail-ops.c:718
+#: mail/mail-send-recv.c:607
 msgid "Cancelled."
 msgstr "已取消。"
 
@@ -9222,26 +9351,6 @@ msgstr "加密内容"
 msgid "Unable to parse message content"
 msgstr "无法分析信件内容"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "无法创建锁定助手管道：%s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "无法创建锁定助手进程：%s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "无法锁定“%s”：lock-helper 协议错误"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "无法锁定“%s”"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9262,6 +9371,26 @@ msgstr "用 fcntl(2) 获取锁失败：%s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "用 flock(2) 获取锁失败：%s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "无法创建锁定助手管道：%s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "无法创建锁定助手进程：%s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "无法锁定“%s”：lock-helper 协议错误"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "无法锁定“%s”"
+
 #: camel/camel-movemail.c:104
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9320,6 +9449,37 @@ msgstr "复制邮件临时文件错误：%s"
 msgid "parse error"
 msgstr "解析错误"
 
+#: camel/camel-net-utils.c:465
+msgid "cannot create thread"
+msgstr "无法创建线索"
+
+#: camel/camel-net-utils.c:612
+#, c-format
+msgid "Resolving: %s"
+msgstr "解析：%s"
+
+#: camel/camel-net-utils.c:634
+msgid "Host lookup failed"
+msgstr "主机查阅失败"
+
+#: camel/camel-net-utils.c:636
+#, c-format
+msgid "Host lookup failed: %s: %s"
+msgstr "主机查阅失败：%s：%s"
+
+#: camel/camel-net-utils.c:743
+msgid "Resolving address"
+msgstr "解析地址"
+
+#: camel/camel-net-utils.c:763
+msgid "Name lookup failed"
+msgstr "名称查阅失败"
+
+#: camel/camel-net-utils.c:766
+#, c-format
+msgid "Name lookup failed: %s"
+msgstr "名称查阅失败：%s"
+
 #: camel/camel-provider.c:59
 msgid "Virtual folder email provider"
 msgstr "虚拟文件夹电子邮件提供者"
@@ -10135,10 +10295,9 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "访问 Novell GroupWise 服务器"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:111
-#: camel/providers/imap/camel-imap-provider.c:96
 #: camel/providers/imap4/camel-imap4-provider.c:81
+#: camel/providers/imap/camel-imap-provider.c:96
 #: camel/providers/imapp/camel-imapp-provider.c:66
-#: camel/providers/nntp/camel-nntp-provider.c:72
 #: camel/providers/pop3/camel-pop3-provider.c:72
 msgid "Password"
 msgstr "密码"
@@ -10150,341 +10309,10 @@ msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 
 #: camel/providers/groupwise/camel-gw-listener.c:436
+#: plugins/groupwise-account-setup/camel-gw-listener.c:436
 msgid "Checklist"
 msgstr "待办清单"
 
-#: camel/providers/imap/camel-imap-command.c:218
-#: camel/providers/imap/camel-imap-command.c:257
-#: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3200
-msgid "Operation cancelled"
-msgstr "操作已取消"
-
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3203
-#, c-format
-msgid "Server unexpectedly disconnected: %s"
-msgstr "服务器意外地中止了连接：%s"
-
-#. for imap ALERT codes, account user@host
-#: camel/providers/imap/camel-imap-command.c:320
-#, c-format
-msgid ""
-"Alert from IMAP server %s@%s:\n"
-"%s"
-msgstr ""
-"来自 IMAP 服务器 %s@%s 的提醒：\n"
-"%s"
-
-#: camel/providers/imap/camel-imap-command.c:389
-#, c-format
-msgid "Unexpected response from IMAP server: %s"
-msgstr "来自 IMAP 服务器的意外应答：%s"
-
-#: camel/providers/imap/camel-imap-command.c:399
-#, c-format
-msgid "IMAP command failed: %s"
-msgstr "IMAP 命令失败：%s"
-
-#: camel/providers/imap/camel-imap-command.c:457
-msgid "Server response ended too soon."
-msgstr "服务器应答结束太快。"
-
-#: camel/providers/imap/camel-imap-command.c:649
-#, c-format
-msgid "IMAP server response did not contain %s information"
-msgstr "IMAP 服务器应答不含有 %s 信息"
-
-#: camel/providers/imap/camel-imap-command.c:685
-#, c-format
-msgid "Unexpected OK response from IMAP server: %s"
-msgstr "来自 IMAP 服务器意外的 OK 应答：%s"
-
-#: camel/providers/imap/camel-imap-folder.c:226
-#, c-format
-msgid "Could not create directory %s: %s"
-msgstr "无法创建目录 %s：%s"
-
-#: camel/providers/imap/camel-imap-folder.c:245
-#, c-format
-msgid "Could not load summary for %s"
-msgstr "无法为 %s 装入概要"
-
-#: camel/providers/imap/camel-imap-folder.c:330
-msgid "Folder was destroyed and recreated on server."
-msgstr "文件夹已被删除并在服务器上重建了。"
-
-#. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:573
-msgid "Scanning for changed messages"
-msgstr "扫描更改了的信件"
-
-#: camel/providers/imap/camel-imap-folder.c:1939
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "无法获取信件：%s"
-
-#: camel/providers/imap/camel-imap-folder.c:1979
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"无法获取信件：%s\n"
-"  %s"
-
-#: camel/providers/imap/camel-imap-folder.c:1979
-#: camel/providers/local/camel-maildir-folder.c:245
-#: camel/providers/local/camel-mbox-folder.c:403
-#: camel/providers/local/camel-mh-folder.c:203
-msgid "No such message"
-msgstr "没有该信件"
-
-#: camel/providers/imap/camel-imap-folder.c:2021
-#: camel/providers/imap/camel-imap-folder.c:2623
-#: camel/providers/nntp/camel-nntp-folder.c:221
-msgid "This message is not currently available"
-msgstr "该信件目前不可用"
-
-#: camel/providers/imap/camel-imap-folder.c:2287
-#: camel/providers/imap/camel-imap-folder.c:2357
-msgid "Fetching summary information for new messages"
-msgstr "从新信件中获取概要信息"
-
-#: camel/providers/imap/camel-imap-folder.c:2464
-#, c-format
-msgid "Incomplete server response: no information provided for message %d"
-msgstr "不完整的服务器响应：没有为第%d封信提供信息"
-
-#: camel/providers/imap/camel-imap-folder.c:2472
-#, c-format
-msgid "Incomplete server response: no UID provided for message %d"
-msgstr "不完整的服务器响应：没有为第%d封信提供 UID"
-
-#: camel/providers/imap/camel-imap-folder.c:2485
-#, c-format
-msgid ""
-"Unexpected server response: Identical UIDs provided for messages %d and %d"
-msgstr "意外的服务器响应：为第%d封信和第%d封信提供了同样的 UID"
-
-#: camel/providers/imap/camel-imap-folder.c:2661
-msgid "Could not find message body in FETCH response."
-msgstr "无法在 FETCH 应答中找到信体。"
-
-#: camel/providers/imap/camel-imap-message-cache.c:156
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "无法打开缓冲器目录：%s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:253
-#: camel/providers/imap/camel-imap-message-cache.c:310
-#: camel/providers/imap/camel-imap-message-cache.c:341
-#: camel/providers/imap/camel-imap-message-cache.c:373
-#, c-format
-msgid "Failed to cache message %s: %s"
-msgstr "缓存信件 %s 失败：%s"
-
-#: camel/providers/imap/camel-imap-message-cache.c:418
-#, c-format
-msgid "Failed to cache %s: %s"
-msgstr "缓存 %s 失败：%s"
-
-#: camel/providers/imap/camel-imap-provider.c:44
-msgid "Checking for New Mail"
-msgstr "检查新邮件"
-
-#: camel/providers/imap/camel-imap-provider.c:46
-msgid "C_heck for new messages in all folders"
-msgstr "在所有文件夹中检查新信件(_H)"
-
-#: camel/providers/imap/camel-imap-provider.c:49
-msgid "Connection to Server"
-msgstr "连接服务器"
-
-#: camel/providers/imap/camel-imap-provider.c:51
-msgid "_Use custom command to connect to server"
-msgstr "使用自定义命令连接到服务器(_U)"
-
-#: camel/providers/imap/camel-imap-provider.c:53
-msgid "Command:"
-msgstr "命令："
-
-#: camel/providers/imap/camel-imap-provider.c:56
-#: camel/providers/imap4/camel-imap4-provider.c:41
-#: camel/providers/nntp/camel-nntp-provider.c:42
-msgid "Folders"
-msgstr "文件夹"
-
-#: camel/providers/imap/camel-imap-provider.c:58
-msgid "_Show only subscribed folders"
-msgstr "只显示订阅了的文件夹(_S)"
-
-#: camel/providers/imap/camel-imap-provider.c:60
-msgid "O_verride server-supplied folder namespace"
-msgstr "覆盖服务器提供的文件夹命名空间(_V)"
-
-#: camel/providers/imap/camel-imap-provider.c:62
-#: camel/providers/imap4/camel-imap4-provider.c:47
-msgid "Namespace"
-msgstr "命名空间"
-
-#: camel/providers/imap/camel-imap-provider.c:66
-msgid "_Apply filters to new messages in INBOX on this server"
-msgstr "应用过滤规则到本服务器上收件箱中的新信件(_A)"
-
-#: camel/providers/imap/camel-imap-provider.c:68
-msgid "Check new messages for _Junk contents"
-msgstr "检查新信件的垃圾内容(_J)"
-
-#: camel/providers/imap/camel-imap-provider.c:70
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "仅在收件箱中检查垃圾邮件(_G)"
-
-#: camel/providers/imap/camel-imap-provider.c:72
-msgid "Automatically synchroni_ze remote mail locally"
-msgstr "自动将远程邮件同步到本地(_Z)"
-
-#: camel/providers/imap/camel-imap-provider.c:79
-msgid "IMAP"
-msgstr "IMAP"
-
-#: camel/providers/imap/camel-imap-provider.c:81
-msgid "For reading and storing mail on IMAP servers."
-msgstr "IMAP 服务器上的邮件的读写。"
-
-#: camel/providers/imap/camel-imap-store.c:421
-#: camel/providers/imap4/camel-imap4-store.c:203
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 服务器 %s"
-
-#: camel/providers/imap/camel-imap-store.c:423
-#: camel/providers/imap4/camel-imap4-store.c:205
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
-#: camel/providers/imap/camel-imap-store.c:533
-#: camel/providers/imap/camel-imap-store.c:548
-#: camel/providers/imap4/camel-imap4-store.c:235
-#: camel/providers/imap4/camel-imap4-store.c:250
-#: camel/providers/nntp/camel-nntp-store.c:198
-#: camel/providers/nntp/camel-nntp-store.c:213
-#: camel/providers/pop3/camel-pop3-store.c:167
-#: camel/providers/pop3/camel-pop3-store.c:182
-#: camel/providers/smtp/camel-smtp-transport.c:255
-#: camel/providers/smtp/camel-smtp-transport.c:270
-#, c-format
-msgid "Could not connect to %s: %s"
-msgstr "无法连接到 %s：%s"
-
-#: camel/providers/imap/camel-imap-store.c:534
-#: camel/providers/imap4/camel-imap4-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:199
-#: camel/providers/pop3/camel-pop3-store.c:168
-#: camel/providers/smtp/camel-smtp-transport.c:256
-msgid "SSL unavailable"
-msgstr "SSL 不可用"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:808
-#: camel/providers/imap4/camel-imap4-store.c:247
-#: camel/providers/imapp/camel-imapp-store.c:248
-#: camel/providers/nntp/camel-nntp-store.c:210
-#: camel/providers/nntp/camel-nntp-store.c:229
-#: camel/providers/pop3/camel-pop3-store.c:179
-#: camel/providers/smtp/camel-smtp-transport.c:267
-msgid "Connection cancelled"
-msgstr "连接已取消"
-
-#: camel/providers/imap/camel-imap-store.c:652
-#: camel/providers/imap/camel-imap-store.c:674
-#: camel/providers/imap4/camel-imap4-store.c:274
-#: camel/providers/imap4/camel-imap4-store.c:287
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
-
-#: camel/providers/imap/camel-imap-store.c:653
-#: camel/providers/smtp/camel-smtp-transport.c:323
-msgid "STARTTLS not supported"
-msgstr "不支持 STARTTLS"
-
-#: camel/providers/imap/camel-imap-store.c:675
-#: camel/providers/imap4/camel-imap4-store.c:275
-#: camel/providers/pop3/camel-pop3-store.c:243
-msgid "SSL negotiations failed"
-msgstr "SSL 协商失败"
-
-#: camel/providers/imap/camel-imap-store.c:811
-#, c-format
-msgid "Could not connect with command \"%s\": %s"
-msgstr "无法使用命令“%s”连接：%s"
-
-#: camel/providers/imap/camel-imap-store.c:1245
-#, c-format
-msgid "IMAP server %s does not support requested authentication type %s"
-msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
-
-#: camel/providers/imap/camel-imap-store.c:1255
-#: camel/providers/smtp/camel-smtp-transport.c:489
-#, c-format
-msgid "No support for authentication type %s"
-msgstr "不支持验证类型 %s"
-
-#: camel/providers/imap/camel-imap-store.c:1278
-#: camel/providers/imapp/camel-imapp-store.c:364
-#, c-format
-msgid "%sPlease enter the IMAP password for %s@%s"
-msgstr "%s请为 %s@%s 输入 IMAP 密码"
-
-#: camel/providers/imap/camel-imap-store.c:1292
-msgid "You didn't enter a password."
-msgstr "您没有输入密码。"
-
-#: camel/providers/imap/camel-imap-store.c:1321
-#, c-format
-msgid ""
-"Unable to authenticate to IMAP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"无法认证到 IMAP 服务器。\n"
-"%s\n"
-"\n"
-
-#: camel/providers/imap/camel-imap-store.c:1843
-#: camel/providers/imap/camel-imap-store.c:2033
-#, c-format
-msgid "No such folder %s"
-msgstr "没有文件夹 %s"
-
-#: camel/providers/imap/camel-imap-store.c:1861
-#: camel/providers/imap/camel-imap-store.c:2239
-#: camel/providers/imap4/camel-imap4-store.c:759
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
-
-#: camel/providers/imap/camel-imap-store.c:1919
-#: camel/providers/imap/camel-imap-store.c:2300
-msgid "The parent folder is not allowed to contain subfolders"
-msgstr "父文件夹不允许含有子文件夹"
-
-#: camel/providers/imap/camel-imap-store.c:1974
-#: camel/providers/local/camel-maildir-store.c:140
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mh-store.c:237
-#, c-format
-msgid "Cannot create folder `%s': folder exists."
-msgstr "无法创建文件夹：%s：文件夹已存在。"
-
-#: camel/providers/imap/camel-imap-store.c:2250
-#, c-format
-msgid "Unknown parent folder: %s"
-msgstr "未知的父文件夹：%s"
-
 #: camel/providers/imap4/camel-imap4-command.c:551
 #: camel/providers/imap4/camel-imap4-command.c:558
 #, c-format
@@ -10545,9 +10373,6 @@ msgid "Cannot expunge folder `%s': Bad command"
 msgstr "无法销毁文件夹“%s”：无效的命令"
 
 #: camel/providers/imap4/camel-imap4-folder.c:749
-#: camel/providers/nntp/camel-nntp-folder.c:157
-#: camel/providers/nntp/camel-nntp-folder.c:233
-#: camel/providers/nntp/camel-nntp-folder.c:372
 #: camel/providers/pop3/camel-pop3-folder.c:263
 #: camel/providers/pop3/camel-pop3-folder.c:431
 #: camel/providers/pop3/camel-pop3-folder.c:492
@@ -10556,10 +10381,6 @@ msgid "User cancelled"
 msgstr "用户已取消"
 
 #: camel/providers/imap4/camel-imap4-folder.c:754
-#: camel/providers/nntp/camel-nntp-folder.c:148
-#: camel/providers/nntp/camel-nntp-folder.c:150
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/nntp/camel-nntp-folder.c:235
 #: camel/providers/pop3/camel-pop3-folder.c:434
 #: camel/providers/pop3/camel-pop3-folder.c:495
 #: camel/providers/pop3/camel-pop3-folder.c:502
@@ -10624,6 +10445,11 @@ msgstr "无法将信件从文件夹“%s”移动到文件夹“%s”：无效�
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
 msgstr "无法将信件从文件夹“%s”复制到文件夹“%s”：无效的命令"
 
+#: camel/providers/imap4/camel-imap4-provider.c:41
+#: camel/providers/imap/camel-imap-provider.c:56
+msgid "Folders"
+msgstr "文件夹"
+
 #: camel/providers/imap4/camel-imap4-provider.c:43
 msgid "Show only subscribed folders"
 msgstr "只显示订阅了的文件夹"
@@ -10632,6 +10458,11 @@ msgstr "只显示订阅了的文件夹"
 msgid "Override server-supplied folder namespace"
 msgstr "覆盖服务器提供的文件夹命名空间"
 
+#: camel/providers/imap4/camel-imap4-provider.c:47
+#: camel/providers/imap/camel-imap-provider.c:62
+msgid "Namespace"
+msgstr "命名空间"
+
 #: camel/providers/imap4/camel-imap4-provider.c:51
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "应用过滤规则到本服务器上收件箱中的新信件"
@@ -10653,6 +10484,60 @@ msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr "该选项将使用纯文本密码连接到 IMAPv4rev1 服务器。"
 
+#: camel/providers/imap4/camel-imap4-store.c:203
+#: camel/providers/imap/camel-imap-store.c:421
+#, c-format
+msgid "IMAP server %s"
+msgstr "IMAP 服务器 %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:205
+#: camel/providers/imap/camel-imap-store.c:423
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
+
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imap4/camel-imap4-store.c:250
+#: camel/providers/imap/camel-imap-store.c:533
+#: camel/providers/imap/camel-imap-store.c:548
+#: camel/providers/pop3/camel-pop3-store.c:167
+#: camel/providers/pop3/camel-pop3-store.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:255
+#: camel/providers/smtp/camel-smtp-transport.c:270
+#, c-format
+msgid "Could not connect to %s: %s"
+msgstr "无法连接到 %s：%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:236
+#: camel/providers/imap/camel-imap-store.c:534
+#: camel/providers/pop3/camel-pop3-store.c:168
+#: camel/providers/smtp/camel-smtp-transport.c:256
+msgid "SSL unavailable"
+msgstr "SSL 不可用"
+
+#: camel/providers/imap4/camel-imap4-store.c:247
+#: camel/providers/imap/camel-imap-store.c:545
+#: camel/providers/imap/camel-imap-store.c:808
+#: camel/providers/imapp/camel-imapp-store.c:248
+#: camel/providers/pop3/camel-pop3-store.c:179
+#: camel/providers/smtp/camel-smtp-transport.c:267
+msgid "Connection cancelled"
+msgstr "连接已取消"
+
+#: camel/providers/imap4/camel-imap4-store.c:274
+#: camel/providers/imap4/camel-imap4-store.c:287
+#: camel/providers/imap/camel-imap-store.c:652
+#: camel/providers/imap/camel-imap-store.c:674
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:275
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/pop3/camel-pop3-store.c:243
+msgid "SSL negotiations failed"
+msgstr "SSL 协商失败"
+
 #: camel/providers/imap4/camel-imap4-store.c:378
 #, c-format
 msgid ""
@@ -10679,6 +10564,14 @@ msgstr "无法在脱机模式下创建 IMAP 文件夹。"
 msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "无法获取 IMAP 服务器 %2$s 上的文件夹 %1$s：未知"
 
+#: camel/providers/imap4/camel-imap4-store.c:759
+#: camel/providers/imap/camel-imap-store.c:1861
+#: camel/providers/imap/camel-imap-store.c:2239
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
+
 #: camel/providers/imap4/camel-imap4-store.c:817
 #, c-format
 msgid "Cannot create folder `%s': Invalid mailbox name"
@@ -10764,6 +10657,17 @@ msgstr "无法退订文件夹“%s”：无效的邮箱名"
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "无法退订文件夹“%s”：无效的命令"
 
+#. Check UIDs and flags of all messages we already know of.
+#: camel/providers/imap4/camel-imap4-summary.c:1266
+#: camel/providers/imap/camel-imap-folder.c:573
+msgid "Scanning for changed messages"
+msgstr "扫描更改了的信件"
+
+#: camel/providers/imap4/camel-imap4-summary.c:1290
+#, fuzzy
+msgid "Fetching envelopes for new messages"
+msgstr "检查新信件"
+
 #: camel/providers/imap4/camel-imap4-utils.c:368
 #, c-format
 msgid "Unexpected token in response from IMAP server %s: "
@@ -10778,6 +10682,255 @@ msgstr "无数据"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "IMAP4 服务器 %s 意外断开连接：%s"
 
+#: camel/providers/imap/camel-imap-command.c:218
+#: camel/providers/imap/camel-imap-command.c:257
+#: camel/providers/imap/camel-imap-command.c:447
+#: camel/providers/imap/camel-imap-store.c:3200
+msgid "Operation cancelled"
+msgstr "操作已取消"
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3203
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr "服务器意外地中止了连接：%s"
+
+#. for imap ALERT codes, account user@host
+#: camel/providers/imap/camel-imap-command.c:320
+#, c-format
+msgid ""
+"Alert from IMAP server %s@%s:\n"
+"%s"
+msgstr ""
+"来自 IMAP 服务器 %s@%s 的提醒：\n"
+"%s"
+
+#: camel/providers/imap/camel-imap-command.c:389
+#, c-format
+msgid "Unexpected response from IMAP server: %s"
+msgstr "来自 IMAP 服务器的意外应答：%s"
+
+#: camel/providers/imap/camel-imap-command.c:399
+#, c-format
+msgid "IMAP command failed: %s"
+msgstr "IMAP 命令失败：%s"
+
+#: camel/providers/imap/camel-imap-command.c:457
+msgid "Server response ended too soon."
+msgstr "服务器应答结束太快。"
+
+#: camel/providers/imap/camel-imap-command.c:649
+#, c-format
+msgid "IMAP server response did not contain %s information"
+msgstr "IMAP 服务器应答不含有 %s 信息"
+
+#: camel/providers/imap/camel-imap-command.c:685
+#, c-format
+msgid "Unexpected OK response from IMAP server: %s"
+msgstr "来自 IMAP 服务器意外的 OK 应答：%s"
+
+#: camel/providers/imap/camel-imap-folder.c:226
+#, c-format
+msgid "Could not create directory %s: %s"
+msgstr "无法创建目录 %s：%s"
+
+#: camel/providers/imap/camel-imap-folder.c:245
+#, c-format
+msgid "Could not load summary for %s"
+msgstr "无法为 %s 装入概要"
+
+#: camel/providers/imap/camel-imap-folder.c:330
+msgid "Folder was destroyed and recreated on server."
+msgstr "文件夹已被删除并在服务器上重建了。"
+
+#: camel/providers/imap/camel-imap-folder.c:1939
+#, c-format
+msgid "Unable to retrieve message: %s"
+msgstr "无法获取信件：%s"
+
+#: camel/providers/imap/camel-imap-folder.c:1979
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"无法获取信件：%s\n"
+"  %s"
+
+#: camel/providers/imap/camel-imap-folder.c:1979
+#: camel/providers/local/camel-maildir-folder.c:245
+#: camel/providers/local/camel-mbox-folder.c:403
+#: camel/providers/local/camel-mh-folder.c:203
+msgid "No such message"
+msgstr "没有该信件"
+
+#: camel/providers/imap/camel-imap-folder.c:2021
+#: camel/providers/imap/camel-imap-folder.c:2623
+msgid "This message is not currently available"
+msgstr "该信件目前不可用"
+
+#: camel/providers/imap/camel-imap-folder.c:2287
+#: camel/providers/imap/camel-imap-folder.c:2357
+msgid "Fetching summary information for new messages"
+msgstr "从新信件中获取概要信息"
+
+#: camel/providers/imap/camel-imap-folder.c:2464
+#, c-format
+msgid "Incomplete server response: no information provided for message %d"
+msgstr "不完整的服务器响应：没有为第%d封信提供信息"
+
+#: camel/providers/imap/camel-imap-folder.c:2472
+#, c-format
+msgid "Incomplete server response: no UID provided for message %d"
+msgstr "不完整的服务器响应：没有为第%d封信提供 UID"
+
+#: camel/providers/imap/camel-imap-folder.c:2485
+#, c-format
+msgid ""
+"Unexpected server response: Identical UIDs provided for messages %d and %d"
+msgstr "意外的服务器响应：为第%d封信和第%d封信提供了同样的 UID"
+
+#: camel/providers/imap/camel-imap-folder.c:2661
+msgid "Could not find message body in FETCH response."
+msgstr "无法在 FETCH 应答中找到信体。"
+
+#: camel/providers/imap/camel-imap-message-cache.c:156
+#, c-format
+msgid "Could not open cache directory: %s"
+msgstr "无法打开缓冲器目录：%s"
+
+#: camel/providers/imap/camel-imap-message-cache.c:253
+#: camel/providers/imap/camel-imap-message-cache.c:310
+#: camel/providers/imap/camel-imap-message-cache.c:341
+#: camel/providers/imap/camel-imap-message-cache.c:373
+#, c-format
+msgid "Failed to cache message %s: %s"
+msgstr "缓存信件 %s 失败：%s"
+
+#: camel/providers/imap/camel-imap-message-cache.c:418
+#, c-format
+msgid "Failed to cache %s: %s"
+msgstr "缓存 %s 失败：%s"
+
+#: camel/providers/imap/camel-imap-provider.c:44 mail/em-account-editor.c:2055
+#: mail/em-account-editor.c:2133
+msgid "Checking for New Mail"
+msgstr "检查新邮件"
+
+#: camel/providers/imap/camel-imap-provider.c:46
+msgid "C_heck for new messages in all folders"
+msgstr "在所有文件夹中检查新信件(_H)"
+
+#: camel/providers/imap/camel-imap-provider.c:49
+msgid "Connection to Server"
+msgstr "连接服务器"
+
+#: camel/providers/imap/camel-imap-provider.c:51
+msgid "_Use custom command to connect to server"
+msgstr "使用自定义命令连接到服务器(_U)"
+
+#: camel/providers/imap/camel-imap-provider.c:53
+msgid "Command:"
+msgstr "命令："
+
+#: camel/providers/imap/camel-imap-provider.c:58
+msgid "_Show only subscribed folders"
+msgstr "只显示订阅了的文件夹(_S)"
+
+#: camel/providers/imap/camel-imap-provider.c:60
+msgid "O_verride server-supplied folder namespace"
+msgstr "覆盖服务器提供的文件夹命名空间(_V)"
+
+#: camel/providers/imap/camel-imap-provider.c:66
+msgid "_Apply filters to new messages in INBOX on this server"
+msgstr "应用过滤规则到本服务器上收件箱中的新信件(_A)"
+
+#: camel/providers/imap/camel-imap-provider.c:68
+msgid "Check new messages for _Junk contents"
+msgstr "检查新信件的垃圾内容(_J)"
+
+#: camel/providers/imap/camel-imap-provider.c:70
+msgid "Only check for Junk messa_ges in the INBOX folder"
+msgstr "仅在收件箱中检查垃圾邮件(_G)"
+
+#: camel/providers/imap/camel-imap-provider.c:72
+msgid "Automatically synchroni_ze remote mail locally"
+msgstr "自动将远程邮件同步到本地(_Z)"
+
+#: camel/providers/imap/camel-imap-provider.c:79
+msgid "IMAP"
+msgstr "IMAP"
+
+#: camel/providers/imap/camel-imap-provider.c:81
+msgid "For reading and storing mail on IMAP servers."
+msgstr "IMAP 服务器上的邮件的读写。"
+
+#: camel/providers/imap/camel-imap-store.c:653
+#: camel/providers/smtp/camel-smtp-transport.c:323
+msgid "STARTTLS not supported"
+msgstr "不支持 STARTTLS"
+
+#: camel/providers/imap/camel-imap-store.c:811
+#, c-format
+msgid "Could not connect with command \"%s\": %s"
+msgstr "无法使用命令“%s”连接：%s"
+
+#: camel/providers/imap/camel-imap-store.c:1245
+#, c-format
+msgid "IMAP server %s does not support requested authentication type %s"
+msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
+
+#: camel/providers/imap/camel-imap-store.c:1255
+#: camel/providers/smtp/camel-smtp-transport.c:489
+#, c-format
+msgid "No support for authentication type %s"
+msgstr "不支持验证类型 %s"
+
+#: camel/providers/imap/camel-imap-store.c:1278
+#: camel/providers/imapp/camel-imapp-store.c:364
+#, c-format
+msgid "%sPlease enter the IMAP password for %s@%s"
+msgstr "%s请为 %s@%s 输入 IMAP 密码"
+
+#: camel/providers/imap/camel-imap-store.c:1292
+msgid "You didn't enter a password."
+msgstr "您没有输入密码。"
+
+#: camel/providers/imap/camel-imap-store.c:1321
+#, c-format
+msgid ""
+"Unable to authenticate to IMAP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"无法认证到 IMAP 服务器。\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap/camel-imap-store.c:1843
+#: camel/providers/imap/camel-imap-store.c:2033
+#, c-format
+msgid "No such folder %s"
+msgstr "没有文件夹 %s"
+
+#: camel/providers/imap/camel-imap-store.c:1919
+#: camel/providers/imap/camel-imap-store.c:2300
+msgid "The parent folder is not allowed to contain subfolders"
+msgstr "父文件夹不允许含有子文件夹"
+
+#: camel/providers/imap/camel-imap-store.c:1974
+#: camel/providers/local/camel-maildir-store.c:140
+#: camel/providers/local/camel-mbox-store.c:210
+#: camel/providers/local/camel-mh-store.c:237
+#, c-format
+msgid "Cannot create folder `%s': folder exists."
+msgstr "无法创建文件夹：%s：文件夹已存在。"
+
+#: camel/providers/imap/camel-imap-store.c:2250
+#, c-format
+msgid "Unknown parent folder: %s"
+msgstr "未知的父文件夹：%s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:40
 #: camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
@@ -11332,190 +11485,6 @@ msgstr ""
 "无法同步脱机文件夹 %s：%s\n"
 "文件夹可能已损坏，副本保存在“%s”"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#: camel/providers/nntp/camel-nntp-store.c:1144
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "请输入 %s@%s 的 NNTP 密码"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "服务器拒绝了密码"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "向服务器发送用户名失败"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "服务器拒绝了用户名/密码"
-
-#: camel/providers/nntp/camel-nntp-folder.c:177
-#: camel/providers/nntp/camel-nntp-folder.c:209
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "内部错误：uid 的格式无效：%s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:329
-#: camel/providers/nntp/camel-nntp-folder.c:332
-#: camel/providers/nntp/camel-nntp-folder.c:374
-#: camel/providers/nntp/camel-nntp-folder.c:376
-#, c-format
-msgid "Posting failed: %s"
-msgstr "投递失败：%s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:394
-msgid "You cannot post NNTP messages while working offline!"
-msgstr "您离线时无法投递 NNTP 信件！"
-
-#: camel/providers/nntp/camel-nntp-folder.c:405
-msgid "You cannot copy messages from a NNTP folder!"
-msgstr "您无法从 NNTP 文件夹复制信件！"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:44
-msgid "Could not get group list from server."
-msgstr "无法从服务器获取组列表。"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:97
-#: camel/providers/nntp/camel-nntp-grouplist.c:106
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "无法装入 %s 的组列表文件：%s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:157
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "无法保存 %s 的组列表文件：%s"
-
-#: camel/providers/nntp/camel-nntp-provider.c:44
-msgid ""
-"Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
-msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)"
-
-#: camel/providers/nntp/camel-nntp-provider.c:46
-msgid "In the subscription dialog, show relative folder names"
-msgstr "在订阅对话框中显示相对文件夹名称"
-
-#: camel/providers/nntp/camel-nntp-provider.c:53
-msgid "USENET news"
-msgstr "USENET 新闻"
-
-#: camel/providers/nntp/camel-nntp-provider.c:55
-msgid "This is a provider for reading from and posting toUSENET newsgroups."
-msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
-
-#: camel/providers/nntp/camel-nntp-provider.c:74
-msgid ""
-"This option will authenticate with the NNTP server using a plaintext "
-"password."
-msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
-
-#: camel/providers/nntp/camel-nntp-store.c:232
-#, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "无法阅读来自 %s 的欢迎信息：%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:244
-#, c-format
-msgid "NNTP server %s returned error code %d: %s"
-msgstr "NNTP 服务器 %s 返回错误码 %d：%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:420
-#, c-format
-msgid "USENET News via %s"
-msgstr "USENET 新闻 %s"
-
-#: camel/providers/nntp/camel-nntp-store.c:799
-#, c-format
-msgid ""
-"Error retrieving newsgroups:\n"
-"\n"
-"%s"
-msgstr ""
-"收取新闻组出错：\n"
-"\n"
-"%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:893
-msgid ""
-"You cannot subscribe to this newsgroup:\n"
-"\n"
-"No such newsgroup. The selected item is a probably a parent folder."
-msgstr ""
-"您无法订阅此新闻组：\n"
-"\n"
-"没有这样的新闻组。选中项目可能是父文件夹。"
-
-#: camel/providers/nntp/camel-nntp-store.c:925
-msgid ""
-"You cannot unsubscribe to this newsgroup:\n"
-"\n"
-"newsgroup does not exist!"
-msgstr ""
-"您无法订阅此新闻组：\n"
-"\n"
-"新闻组不存在！"
-
-#: camel/providers/nntp/camel-nntp-store.c:950
-msgid "You cannot create a folder in a News store: subscribe instead."
-msgstr "您无法在新闻存储中创建文件夹：应该订阅。"
-
-#: camel/providers/nntp/camel-nntp-store.c:958
-msgid "You cannot rename a folder in a News store."
-msgstr "您无法在新闻存储中重命名文件夹。"
-
-#: camel/providers/nntp/camel-nntp-store.c:966
-msgid "You cannot remove a folder in a News store: unsubscribe instead."
-msgstr "您无法在新闻存储中删除文件夹：应该退订。"
-
-#: camel/providers/nntp/camel-nntp-store.c:1136
-msgid "Authentication requested but no username provided"
-msgstr "请求了身份验证，但未提供用户名"
-
-#: camel/providers/nntp/camel-nntp-store.c:1148
-#, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "无法认证到服务器：%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:1264
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP 命令失败：%s"
-
-#: camel/providers/nntp/camel-nntp-store.c:1320
-msgid "Not connected."
-msgstr "未连接。"
-
-#: camel/providers/nntp/camel-nntp-store.c:1373
-#, c-format
-msgid "No such folder: %s"
-msgstr "没有文件夹：%s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:221
-#: camel/providers/nntp/camel-nntp-summary.c:317
-#, c-format
-msgid "%s: Scanning new messages"
-msgstr "%s：正在扫描新信件"
-
-#: camel/providers/nntp/camel-nntp-summary.c:228
-#, c-format
-msgid "Unexpected server response from xover: %s"
-msgstr "来自 xover 的意外服务器应答：%s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:331
-#, c-format
-msgid "Unexpected server response from head: %s"
-msgstr "来自 head 的意外服务器应答：%s"
-
-#: camel/providers/nntp/camel-nntp-summary.c:371
-msgid "Use cancel"
-msgstr "使用取消"
-
-#: camel/providers/nntp/camel-nntp-summary.c:373
-#, c-format
-msgid "Operation failed: %s"
-msgstr "操作失败：%s"
-
 #: camel/providers/pop3/camel-pop3-folder.c:247
 msgid "Retrieving POP summary"
 msgstr "正在获取 POP 概要"
@@ -12031,88 +12000,6 @@ msgstr "MIME 类型："
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
-#: composer/e-msg-composer-hdrs.c:513
-msgid "Posting destination"
-msgstr "投递目的"
-
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Choose folders to post the message to."
-msgstr "选择要将信件投递到哪个文件夹。"
-
-#: composer/e-msg-composer-hdrs.c:548
-msgid "Click here for the address book"
-msgstr "单击此处以使用地址簿"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:578
-msgid "_Reply-To:"
-msgstr "回复到(_R)："
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:585
-msgid "Fr_om:"
-msgstr "发件人(_O)："
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:592
-msgid "S_ubject:"
-msgstr "主题(_U)："
-
-#: composer/e-msg-composer-hdrs.c:602
-msgid "_To:"
-msgstr "收信人(_T)："
-
-#: composer/e-msg-composer-hdrs.c:603
-msgid "Enter the recipients of the message"
-msgstr "输入信件的收件人"
-
-#: composer/e-msg-composer-hdrs.c:606
-msgid "_Cc:"
-msgstr "抄送(_C)："
-
-#: composer/e-msg-composer-hdrs.c:607
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "输入将接收该信件副本的收件人地址"
-
-#: composer/e-msg-composer-hdrs.c:610
-msgid "_Bcc:"
-msgstr "暗送(_B)："
-
-#: composer/e-msg-composer-hdrs.c:611
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr "输入将接收该信件副本，但不出现在收件人列表中的收件人地址。"
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:618
-msgid "_Post To:"
-msgstr "投递到(_P)："
-
-#: composer/e-msg-composer-hdrs.c:623
-msgid "Click here to select folders to post to"
-msgstr "单击此处以选择要投递到的文件夹"
-
-#: composer/e-msg-composer-hdrs.c:629
-msgid "Post To:"
-msgstr "投递到："
-
-#: composer/e-msg-composer-select-file.c:187
-msgid "Attach file(s)"
-msgstr "添加附件"
-
 #: composer/e-msg-composer.c:720
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -12140,7 +12027,8 @@ msgstr "无标题信件"
 msgid "Open file"
 msgstr "打开文件"
 
-#: composer/e-msg-composer.c:1999 mail/mail-account-gui.c:1499
+#: composer/e-msg-composer.c:1999 mail/em-account-editor.c:578
+#: mail/em-account-editor.c:623 mail/em-account-editor.c:690
 msgid "Autogenerated"
 msgstr "自动生成的"
 
@@ -12196,6 +12084,88 @@ msgid ""
 "<b>"
 msgstr "<b>(编写器含有不可编辑的非文本信体。)<b>"
 
+#: composer/e-msg-composer-hdrs.c:513
+msgid "Posting destination"
+msgstr "投递目的"
+
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Choose folders to post the message to."
+msgstr "选择要将信件投递到哪个文件夹。"
+
+#: composer/e-msg-composer-hdrs.c:548
+msgid "Click here for the address book"
+msgstr "单击此处以使用地址簿"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:578
+msgid "_Reply-To:"
+msgstr "回复到(_R)："
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:585
+msgid "Fr_om:"
+msgstr "发件人(_O)："
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:592
+msgid "S_ubject:"
+msgstr "主题(_U)："
+
+#: composer/e-msg-composer-hdrs.c:602
+msgid "_To:"
+msgstr "收信人(_T)："
+
+#: composer/e-msg-composer-hdrs.c:603
+msgid "Enter the recipients of the message"
+msgstr "输入信件的收件人"
+
+#: composer/e-msg-composer-hdrs.c:606
+msgid "_Cc:"
+msgstr "抄送(_C)："
+
+#: composer/e-msg-composer-hdrs.c:607
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "输入将接收该信件副本的收件人地址"
+
+#: composer/e-msg-composer-hdrs.c:610
+msgid "_Bcc:"
+msgstr "暗送(_B)："
+
+#: composer/e-msg-composer-hdrs.c:611
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr "输入将接收该信件副本，但不出现在收件人列表中的收件人地址。"
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:618
+msgid "_Post To:"
+msgstr "投递到(_P)："
+
+#: composer/e-msg-composer-hdrs.c:623
+msgid "Click here to select folders to post to"
+msgstr "单击此处以选择要投递到的文件夹"
+
+#: composer/e-msg-composer-hdrs.c:629
+msgid "Post To:"
+msgstr "投递到："
+
+#: composer/e-msg-composer-select-file.c:187
+msgid "Attach file(s)"
+msgstr "添加附件"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 msgid "You cannot attach the file `{0}' to this message."
@@ -12227,14 +12197,11 @@ 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
-#: widgets/misc/e-system-errors.xml.h:15
+#: composer/mail-composer-errors.xml.h:42
+#: widgets/misc/e-system-errors.xml.h:11 widgets/misc/e-system-errors.xml.h:15
 msgid "Because \"{1}\"."
 msgstr "原因是“{1}”。"
 
@@ -12367,105 +12334,6 @@ msgstr "地址卡"
 msgid "calendar information"
 msgstr "日历信息"
 
-#: designs/OOA/ooa.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>您目前的状态是“办公室以外”。</b>\n"
-"\n"
-"您想要将您的状态更改为“办公室内”吗？"
-
-#: designs/OOA/ooa.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>办公室以外信件：</b>"
-
-#: designs/OOA/ooa.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>状态：</b>"
-
-#: designs/OOA/ooa.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>在您位于办公室外势，如果有人给您发送邮件，则会自动将下面指定的信件\n"
-"送回。</small>"
-
-#: designs/OOA/ooa.glade.h:8
-msgid "I am currently in the office"
-msgstr "我正在办公室内"
-
-#: designs/OOA/ooa.glade.h:9
-msgid "I am currently out of the office"
-msgstr "我正在办公室外"
-
-#: designs/OOA/ooa.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "不，请不要更改状态"
-
-#: designs/OOA/ooa.glade.h:12
-msgid "Out of Office Assistant"
-msgstr "离开办公室助手"
-
-#: designs/OOA/ooa.glade.h:13
-msgid "Yes, Change Status"
-msgstr "是，更改状态"
-
-#: designs/read_receipts/read.glade.h:1
-msgid "      "
-msgstr "      "
-
-#: designs/read_receipts/read.glade.h:2
-msgid "<b>Receiving Email</b>"
-msgstr "<b>接收电子邮件</b>"
-
-#: designs/read_receipts/read.glade.h:3
-msgid "<b>Sending Email:</b>"
-msgstr "<b>发送电子邮件：</b>"
-
-#: designs/read_receipts/read.glade.h:4
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>此页面允许您选择是否要对您发出的信件是用阅读收条进行通知，\n"
-"以及指定在别人请求您的阅读收条时 Evolution 应该怎么做。</small>"
-
-#: designs/read_receipts/read.glade.h:6
-msgid "Always send back a read reciept"
-msgstr "总是发回阅读收条"
-
-#: designs/read_receipts/read.glade.h:7
-msgid "Ask me if I want to send back a read receipt"
-msgstr "询问我是否想要发回阅读收条"
-
-#: designs/read_receipts/read.glade.h:8
-msgid "Never send back a read receipt"
-msgstr "从不发回阅读收条"
-
-#: designs/read_receipts/read.glade.h:9
-msgid "Read Receipts"
-msgstr "阅读收条"
-
-#: designs/read_receipts/read.glade.h:10
-msgid "Request a read receipt for all messages I send"
-msgstr "我发出的所有信件都要求阅读收条"
-
-#: designs/read_receipts/read.glade.h:11
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "除非信件发送给邮件列表，或者是给我自己发的"
-
-#: designs/read_receipts/read.glade.h:12
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "当您收到请求阅读收条的邮件，Evolution 应该做什么？"
-
 #: e-util/e-dialog-utils.c:267
 msgid ""
 "A file by that name already exists.\n"
@@ -12479,6 +12347,11 @@ msgstr ""
 msgid "Overwrite file?"
 msgstr "覆盖文件吗？"
 
+#: e-util/eggtrayicon.c:119
+#, fuzzy
+msgid "The orientation of the tray."
+msgstr "附件描述。"
+
 #: e-util/e-passwords.c:468
 msgid "_Remember this password"
 msgstr "记住该密码(_R)"
@@ -12681,8 +12554,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
+#: filter/filter-errors.xml.h:18
 msgid "Missing name."
 msgstr "缺少名称。"
 
@@ -12705,6 +12577,68 @@ msgstr "请另选一个名称。"
 msgid "Choose a file"
 msgstr "选择文件"
 
+#: filter/filter.glade.h:1
+msgid "<b>_Filter Rules</b>"
+msgstr "<b>过滤规则(_F)</b>"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "比较对象"
+
+#: filter/filter.glade.h:3 filter/filter-rule.c:975
+msgid "Incoming"
+msgstr "接收"
+
+#: filter/filter.glade.h:4
+msgid "Show filters for mail:"
+msgstr "显示邮件过滤器："
+
+#: filter/filter.glade.h:5
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr "信件的日期将会与指定日期的午夜12:00进行比较。"
+
+#: filter/filter.glade.h:7
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr "信件的日期将会在过滤执行时与指定时间进行比较。"
+
+#: filter/filter.glade.h:9
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr "信件的日期将会在过滤执行时与当前时间进行比较。"
+
+#: filter/filter.glade.h:12
+msgid "a time relative to the current time"
+msgstr "相对于当前时间的时间"
+
+#: filter/filter.glade.h:13
+msgid "ago"
+msgstr "过去"
+
+#: filter/filter.glade.h:17
+msgid "months"
+msgstr "月"
+
+#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
+msgid "seconds"
+msgstr "秒"
+
+#: filter/filter.glade.h:19
+msgid "the current time"
+msgstr "当前时间"
+
+#: filter/filter.glade.h:20
+msgid "the time you specify"
+msgstr "您指定的时间"
+
+#: filter/filter.glade.h:22
+msgid "years"
+msgstr "年"
+
 #: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
 #: mail/mail-config.c:76 mail/mail-config.glade.h:91
 msgid "Important"
@@ -12762,72 +12696,10 @@ msgstr "回复及原始邮件"
 msgid "Include threads"
 msgstr "包含线索"
 
-#: filter/filter-rule.c:975 filter/filter.glade.h:3
-msgid "Incoming"
-msgstr "接收"
-
 #: filter/filter-rule.c:975
 msgid "Outgoing"
 msgstr "寄出"
 
-#: filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>过滤规则(_F)</b>"
-
-#: filter/filter.glade.h:2
-msgid "Compare against"
-msgstr "比较对象"
-
-#: filter/filter.glade.h:4
-msgid "Show filters for mail:"
-msgstr "显示邮件过滤器："
-
-#: filter/filter.glade.h:5
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr "信件的日期将会与指定日期的午夜12:00进行比较。"
-
-#: filter/filter.glade.h:7
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr "信件的日期将会在过滤执行时与指定时间进行比较。"
-
-#: filter/filter.glade.h:9
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr "信件的日期将会在过滤执行时与当前时间进行比较。"
-
-#: filter/filter.glade.h:12
-msgid "a time relative to the current time"
-msgstr "相对于当前时间的时间"
-
-#: filter/filter.glade.h:13
-msgid "ago"
-msgstr "过去"
-
-#: filter/filter.glade.h:17
-msgid "months"
-msgstr "月"
-
-#: filter/filter.glade.h:18 mail/mail-config.glade.h:173
-msgid "seconds"
-msgstr "秒"
-
-#: filter/filter.glade.h:19
-msgid "the current time"
-msgstr "当前时间"
-
-#: filter/filter.glade.h:20
-msgid "the time you specify"
-msgstr "您指定的时间"
-
-#: filter/filter.glade.h:22
-msgid "years"
-msgstr "年"
-
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "添加规则"
@@ -12840,65 +12712,44 @@ msgstr "编辑规则"
 msgid "Rule name"
 msgstr "规则名"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "编写器首选项"
+#: mail/em-account-editor.c:377
+#, c-format
+msgid "%s License Agreement"
+msgstr "%s 许可协议"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/em-account-editor.c:384
+#, c-format
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项，包括安全和信件显示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和信件编写器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账户"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+"\n"
+"请仔细阅读下方显示的 %s 许可协议\n"
+"并选中复选框表明您接受该协议\n"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
+#: mail/em-account-editor.c:454 mail/em-filter-folder-element.c:237
+#: mail/em-vfolder-rule.c:494
+msgid "Select Folder"
+msgstr "选择文件夹"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11 mail/em-folder-view.c:426
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "邮件"
+#: mail/em-account-editor.c:1785
+msgid "Automatically check for _new mail every"
+msgstr "自动检查新邮件的间隔(_N)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Mail Accounts"
-msgstr "邮件账户"
+#. Most sections for this is auto-generated fromt the camel config
+#: mail/em-account-editor.c:2054 mail/em-account-editor.c:2132
+msgid "Receiving Options"
+msgstr "接收选项"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "邮件首选项"
+#: mail/em-account-editor.c:2477 mail/mail-config.glade.h:34
+msgid "Account Editor"
+msgstr "账户编辑器"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14
-msgid "_Mail"
-msgstr "邮件(_M)"
+#: mail/em-account-editor.c:2477 mail/mail-config.glade.h:80
+msgid "Evolution Account Assistant"
+msgstr "Evolution 账户助手"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:432
@@ -12953,11 +12804,6 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "过滤规则(_F)"
 
-#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
-#: mail/mail-account-gui.c:1355
-msgid "Select Folder"
-msgstr "选择文件夹"
-
 #. Automatically generated. Do not edit.
 #: mail/em-filter-i18n.h:2
 msgid "Adjust Score"
@@ -13196,10 +13042,10 @@ msgstr "开始于"
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: mail/em-filter-i18n.h:65 mail/em-format-html.c:1534
-#: mail/em-format-quote.c:306 mail/em-format.c:853 mail/em-mailer-prefs.c:88
+#: mail/em-filter-i18n.h:65 mail/em-format.c:853 mail/em-format-html.c:1534
+#: mail/em-format-quote.c:306 mail/em-mailer-prefs.c:88
 #: mail/message-list.etspec.h:13 mail/message-tag-followup.c:330
-#: smime/lib/e-cert.c:1131
+#: plugins/shared-folder/properties.glade.h:14 smime/lib/e-cert.c:1131
 msgid "Subject"
 msgstr "主题"
 
@@ -13227,7 +13073,7 @@ msgid "Unread message:"
 msgid_plural "Unread messages:"
 msgstr[0] "未读信件数："
 
-#: mail/em-folder-properties.c:269
+#: mail/em-folder-properties.c:269 plugins/shared-folder/properties.glade.h:9
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
@@ -13240,7 +13086,7 @@ msgid "Create New Folder"
 msgstr "创建新文件夹"
 
 #: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2459
-#: mail/mail-component.c:732
+#: mail/mail-component.c:732 plugins/shared-folder/share-folder-common.c:311
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
@@ -13252,20 +13098,6 @@ msgstr "创建"
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
-#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
-#: mail/mail-vfolder.c:880
-msgid "VFolders"
-msgstr "虚拟文件夹"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
-msgid "UNMATCHED"
-msgstr "不匹配"
-
-#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
-msgid "Loading..."
-msgstr "正在装入..."
-
 #: mail/em-folder-tree.c:899
 #, c-format
 msgid "Moving folder %s"
@@ -13314,12 +13146,13 @@ msgstr "选择文件夹"
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: mail/em-folder-tree.c:2270
+#: mail/em-folder-tree.c:2270 plugins/shared-folder/share-folder-common.c:115
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s”"
 
 #: mail/em-folder-tree.c:2459 mail/mail-component.c:732
+#: plugins/shared-folder/share-folder-common.c:311
 msgid "Create folder"
 msgstr "创建文件夹"
 
@@ -13334,7 +13167,7 @@ msgstr "重命名文件夹"
 
 #: mail/em-folder-tree.c:2730 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
+#: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:38
 msgid "_View"
 msgstr "查看(_V)"
 
@@ -13359,6 +13192,27 @@ msgstr "新建文件夹(_N)..."
 msgid "_Rename..."
 msgstr "重命名(_R)..."
 
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:880
+msgid "VFolders"
+msgstr "虚拟文件夹"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr "不匹配"
+
+#: mail/em-folder-tree-model.c:491 mail/em-folder-tree-model.c:795
+msgid "Loading..."
+msgstr "正在装入..."
+
+#: mail/em-folder-view.c:426 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:531
+#: mail/mail-component.c:582
+msgid "Mail"
+msgstr "邮件"
+
 #: mail/em-folder-view.c:928 ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "作为新信件进行编辑(_E)..."
@@ -13500,36 +13354,174 @@ msgstr "复制链接位置(_C)"
 msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
+#: mail/em-format.c:848 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:83 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:326
+msgid "From"
+msgstr "发件人"
+
+#: mail/em-format.c:849 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:84
+msgid "Reply-To"
+msgstr "回复至"
+
+#: mail/em-format.c:850 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "收件人"
+
+#: mail/em-format.c:851 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:86
+msgid "Cc"
+msgstr "抄送"
+
+#: mail/em-format.c:852 mail/em-format-html.c:1425 mail/em-format-quote.c:193
+#: mail/em-mailer-prefs.c:87
+msgid "Bcc"
+msgstr "密件抄送"
+
+#: mail/em-format.c:854 mail/em-format-html.c:1578 mail/em-format-quote.c:322
+#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "日期"
+
+#: mail/em-format.c:855 mail/em-format-html.c:1601 mail/em-mailer-prefs.c:90
+msgid "Newsgroups"
+msgstr "新闻组"
+
+#: mail/em-format.c:1104
+#, c-format
+msgid "%s attachment"
+msgstr "%s 附件"
+
+#: mail/em-format.c:1143 mail/em-format.c:1276
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 S/MIME 信件：未知错误"
+
+#: mail/em-format.c:1266
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "不支持 multipart/encrypted 的加密类型"
+
+#: mail/em-format.c:1414
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "无法解析 MIME 信件。显示源文本。"
+
+#: mail/em-format.c:1433
+msgid "Unsupported signature format"
+msgstr "不支持的签名格式"
+
+#: mail/em-format.c:1441
+msgid "Error verifying signature"
+msgstr "校验签名错误"
+
+#: mail/em-format.c:1441
+msgid "Unknown error verifying signature"
+msgstr "校验签名发生了未知错误"
+
+#: mail/em-format-html.c:473 mail/em-format-html.c:475
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "收取“%s”"
+
+#: mail/em-format-html.c:580 mail/em-format-html-display.c:638
+msgid "Unsigned"
+msgstr "未签名"
+
+#: mail/em-format-html.c:581 mail/em-format-html-display.c:639
+msgid "Valid signature"
+msgstr "有效签名"
+
+#: mail/em-format-html.c:582 mail/em-format-html-display.c:640
+msgid "Invalid signature"
+msgstr "无效签名"
+
+#: mail/em-format-html.c:583
+msgid "Valid signature but cannot verify sender"
+msgstr "签名有效但是无法校验发送者"
+
+#: mail/em-format-html.c:589 mail/em-format-html-display.c:647
+msgid "Unencrypted"
+msgstr "未加密"
+
+#: mail/em-format-html.c:590 mail/em-format-html-display.c:648
+msgid "Encrypted, weak"
+msgstr "弱加密"
+
+#: mail/em-format-html.c:591 mail/em-format-html-display.c:649
+msgid "Encrypted"
+msgstr "加密"
+
+#: mail/em-format-html.c:592 mail/em-format-html-display.c:650
+msgid "Encrypted, strong"
+msgstr "强加密"
+
+#: mail/em-format-html.c:841
+msgid "Malformed external-body part."
+msgstr "格式不正确的 external-body 部分。"
+
+#: mail/em-format-html.c:871
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "指向 FTP 站点 (%s)"
+
+#: mail/em-format-html.c:882
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "指向本地文件 (%s)"
+
+#: mail/em-format-html.c:905
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "指向远程数据 (%s)"
+
+#: mail/em-format-html.c:916
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "指向未知的外部数据 (“%s”类型)"
+
+#: mail/em-format-html.c:1138
+msgid "Formatting message"
+msgstr "格式化信件"
+
+#. pseudo-header
+#: mail/em-format-html.c:1538 mail/em-format-quote.c:315
+#: mail/em-mailer-prefs.c:984
+msgid "Mailer"
+msgstr "邮件程序"
+
+#. translators: strftime format for local time equivalent in Date header display, with day
+#: mail/em-format-html.c:1565
+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:1568
+msgid "<I> (%R %Z)</I>"
+msgstr "<I> (%R %Z)</I>"
+
 #. message-search popup match count string
 #: mail/em-format-html-display.c:405
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: mail/em-format-html-display.c:638 mail/em-format-html.c:580
-msgid "Unsigned"
-msgstr "未签名"
-
 #: mail/em-format-html-display.c:638
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: mail/em-format-html-display.c:639 mail/em-format-html.c:581
-msgid "Valid signature"
-msgstr "有效签名"
-
 #: mail/em-format-html-display.c:639
 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:640 mail/em-format-html.c:582
-msgid "Invalid signature"
-msgstr "无效签名"
-
 #: mail/em-format-html-display.c:640
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
@@ -13546,20 +13538,12 @@ msgid ""
 "cannot be verified."
 msgstr "这封信的签名有效，但是无法校验邮件的发送者。"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:589
-msgid "Unencrypted"
-msgstr "未加密"
-
 #: mail/em-format-html-display.c:647
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:590
-msgid "Encrypted, weak"
-msgstr "弱加密"
-
 #: mail/em-format-html-display.c:648
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm.  It would "
@@ -13569,20 +13553,12 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这很困难但并不是不可能。"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:591
-msgid "Encrypted"
-msgstr "加密"
-
 #: mail/em-format-html-display.c:649
 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:650 mail/em-format-html.c:592
-msgid "Encrypted, strong"
-msgstr "强加密"
-
 #: mail/em-format-html-display.c:650
 msgid ""
 "This message is encrypted, with a strong encryption algorithm.  It would be "
@@ -13629,128 +13605,6 @@ msgstr "附件按钮"
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
 
-#: mail/em-format-html.c:473 mail/em-format-html.c:475
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "收取“%s”"
-
-#: mail/em-format-html.c:583
-msgid "Valid signature but cannot verify sender"
-msgstr "签名有效但是无法校验发送者"
-
-#: mail/em-format-html.c:841
-msgid "Malformed external-body part."
-msgstr "格式不正确的 external-body 部分。"
-
-#: mail/em-format-html.c:871
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "指向 FTP 站点 (%s)"
-
-#: mail/em-format-html.c:882
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "指向本地文件 (%s)"
-
-#: mail/em-format-html.c:905
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "指向远程数据 (%s)"
-
-#: mail/em-format-html.c:916
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "指向未知的外部数据 (“%s”类型)"
-
-#: mail/em-format-html.c:1138
-msgid "Formatting message"
-msgstr "格式化信件"
-
-#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:848
-#: 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:1425 mail/em-format-quote.c:193 mail/em-format.c:849
-#: mail/em-mailer-prefs.c:84
-msgid "Reply-To"
-msgstr "回复至"
-
-#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:850
-#: mail/em-mailer-prefs.c:85 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件人"
-
-#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:851
-#: mail/em-mailer-prefs.c:86
-msgid "Cc"
-msgstr "抄送"
-
-#: mail/em-format-html.c:1425 mail/em-format-quote.c:193 mail/em-format.c:852
-#: mail/em-mailer-prefs.c:87
-msgid "Bcc"
-msgstr "密件抄送"
-
-#. pseudo-header
-#: mail/em-format-html.c:1538 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:984
-msgid "Mailer"
-msgstr "邮件程序"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1565
-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:1568
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1578 mail/em-format-quote.c:322 mail/em-format.c:854
-#: mail/em-mailer-prefs.c:89 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
-
-#: mail/em-format-html.c:1601 mail/em-format.c:855 mail/em-mailer-prefs.c:90
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: mail/em-format.c:1104
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附件"
-
-#: mail/em-format.c:1143 mail/em-format.c:1276
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 S/MIME 信件：未知错误"
-
-#: mail/em-format.c:1266
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "不支持 multipart/encrypted 的加密类型"
-
-#: mail/em-format.c:1414
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 信件。显示源文本。"
-
-#: mail/em-format.c:1433
-msgid "Unsupported signature format"
-msgstr "不支持的签名格式"
-
-#: mail/em-format.c:1441
-msgid "Error verifying signature"
-msgstr "校验签名错误"
-
-#: mail/em-format.c:1441
-msgid "Unknown error verifying signature"
-msgstr "校验签名发生了未知错误"
-
 #: mail/em-junk-filter.c:110
 msgid "Spamassassin (built-in)"
 msgstr "垃圾克星(内置)"
@@ -14373,33 +14227,58 @@ msgstr "启动用户运行的 spamd 的端口"
 msgid "spamd port"
 msgstr "spamd 端口"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "Composer Preferences"
+msgstr "编写器首选项"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape 邮件导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此配置邮件首选项，包括安全和信件显示"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此配置拼写检查、签名和信件编写器"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure your email accounts here"
+msgstr "在这里配置您的电子邮件账户"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Evolution Mail"
+msgstr "Evolution 邮件"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 邮件账户配置控制"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail component"
+msgstr "Evolution 邮件组件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 邮件撰写控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件首选项控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+msgid "Mail Accounts"
+msgstr "邮件账户"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14
+msgid "_Mail"
+msgstr "邮件(_M)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14457,6 +14336,34 @@ msgstr "导入“%s”"
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape 邮件导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
 #: mail/importers/mail-importer.c:363
 #, c-format
 msgid "Scanning %s"
@@ -14557,39 +14464,6 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/mail-account-gui.c:253
-#, c-format
-msgid ""
-"\n"
-"Please read carefully the license agreement\n"
-"for %s displayed below\n"
-"and tick the check box for accepting it\n"
-msgstr ""
-"\n"
-"请仔细阅读下方显示的 %s 许可协议\n"
-"并选中复选框表明您接受该协议\n"
-
-#: mail/mail-account-gui.c:259
-#, c-format
-msgid "%s License Agreement"
-msgstr "%s 许可协议"
-
-#: mail/mail-account-gui.c:964 mail/mail-config.glade.h:157
-msgid "_Host:"
-msgstr "主机(_H)："
-
-#: mail/mail-account-gui.c:968 mail/mail-config.glade.h:142
-msgid "User_name:"
-msgstr "用户名(_N)："
-
-#: mail/mail-account-gui.c:972 mail/mail-config.glade.h:163
-msgid "_Path:"
-msgstr "路径(_P)："
-
-#: mail/mail-account-gui.c:1784 shell/e-shell-importer.c:643
-msgid "Select a file"
-msgstr "选择一个文件"
-
 #: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
@@ -14820,10 +14694,6 @@ msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">服务器配置</span>"
 
-#: mail/mail-config.glade.h:34
-msgid "Account Editor"
-msgstr "账户编辑器"
-
 #: mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "账户管理"
@@ -14987,10 +14857,6 @@ msgstr "加密证书(_P)："
 msgid "Encrypt out_going messages (by default)"
 msgstr "加密寄出的信件(默认)(_G)"
 
-#: mail/mail-config.glade.h:80
-msgid "Evolution Account Assistant"
-msgstr "Evolution 账户助手"
-
 #: mail/mail-config.glade.h:81
 msgid "Execute Command..."
 msgstr "执行命令..."
@@ -15215,6 +15081,10 @@ msgstr ""
 "输入您想要给此帐户起的名字。\n"
 "如：“工作”或“私人”"
 
+#: mail/mail-config.glade.h:142
+msgid "User_name:"
+msgstr "用户名(_N)："
+
 #: mail/mail-config.glade.h:143
 msgid "V_ariable-width:"
 msgstr "变宽(_A)："
@@ -15264,6 +15134,10 @@ msgstr "启用(_E)"
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
+#: mail/mail-config.glade.h:157
+msgid "_Host:"
+msgstr "主机(_H)："
+
 #: mail/mail-config.glade.h:158
 msgid "_Load images if sender is in address book"
 msgstr "如果发件人在地址簿中就装入图像(_L)"
@@ -15280,6 +15154,10 @@ msgstr "把信件标记为已读前等(_M)"
 msgid "_Never load images from the Internet"
 msgstr "绝不从 Internet 装入图像(_N)"
 
+#: mail/mail-config.glade.h:163
+msgid "_Path:"
+msgstr "路径(_P)："
+
 #: mail/mail-config.glade.h:164
 msgid "_Prompt when sending HTML messages to contacts that don't want them"
 msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
@@ -15426,577 +15304,6 @@ msgstr "以全部本地和活跃远程文件夹"
 msgid "with all local folders"
 msgstr "以所有本地文件夹"
 
-#. mail:camel-service-auth-invalid primary
-#: mail/mail-errors.xml.h:2
-msgid "Invalid authentication"
-msgstr "无效的身份验证"
-
-#. mail:camel-service-auth-invalid secondary
-#: mail/mail-errors.xml.h:4
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "此服务器不支持此类型的身份验证，而且可能根本不支持身份验证。"
-
-#. mail:camel-service-auth-failed primary
-#: mail/mail-errors.xml.h:6
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "您以登录到服务器“{0}”失败。"
-
-#. mail:camel-service-auth-failed secondary
-#: mail/mail-errors.xml.h:8
-msgid ""
-"Check to make sure your password is spelled correctly.  Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；您的 Caps "
-"Lock 灯可能为开。"
-
-#. mail:ask-send-html primary
-#: mail/mail-errors.xml.h:10
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "您确定想要以 HTML 格式发送信件吗？"
-
-#. mail:ask-send-html secondary
-#: mail/mail-errors.xml.h:12
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email:\n"
-"{0}\n"
-"Send anyway?"
-msgstr ""
-"请确定下列受检人想要并可以接收 HTML 邮件：\n"
-"{0}\n"
-"仍然发送吗？"
-
-#. mail:ask-send-no-subject primary
-#: mail/mail-errors.xml.h:17
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "您确定想要发送没有主题的信件吗？"
-
-#. mail:ask-send-no-subject secondary
-#: mail/mail-errors.xml.h:19
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-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 收件人的邮件吗？"
-
-#. mail:ask-send-only-bcc-contact secondary
-#: mail/mail-errors.xml.h:24
-msgid ""
-"The contact list you are sending to is configured to hide list recipients.\n"
-"\n"
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients in "
-"your message. To avoid this, you should add at least one To: or CC: "
-"recipient. "
-msgstr ""
-"您即将发送的联系人列表配置为隐藏列表收件人。\n"
-"\n"
-"许多邮件系统会在只有 Bcc 收件人的信件中添加 Apparently-To 信头。如果添加了该"
-"信头，将在您的邮件中列出您的全部收件人。要避免此特性，您应该至少添加一个 To: "
-"或 CC: 收件人。"
-
-#. mail:ask-send-only-bcc secondary
-#: mail/mail-errors.xml.h:31
-msgid ""
-"Many email systems add an Apparently-To header to messages that only have "
-"BCC recipients. This header, if added, will list all of your recipients to "
-"your message anyway. To avoid this, you should add at least one To: or CC: "
-"recipient."
-msgstr ""
-"许多邮件系统会在只有 Bcc 收件人的信件中添加 Apparently-To 信头。如果添加了该"
-"信头，将在您的邮件中列出您的全部收件人。要避免此特性，您应该至少添加一个 To: "
-"或 CC: 收件人。"
-
-#. mail:send-no-recipients primary
-#: mail/mail-errors.xml.h:34
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr "无法发送这封信，原因是您没有指定任何收件人"
-
-#. mail:send-no-recipients secondary
-#: mail/mail-errors.xml.h:36
-msgid ""
-"Please enter a valid email address in the To: field. You can search for "
-"email addresses by clicking on the To: button next to the entry box."
-msgstr ""
-"请在收件人域中输入有效的电子邮件地址。您可以单击输入框旁边的“收件人：”按钮来"
-"搜索电子邮件地址。"
-
-#. mail:ask-default-drafts primary
-#: mail/mail-errors.xml.h:38
-msgid "Use default drafts folder?"
-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 "无法打开此账户的草稿文件夹。换用系统的草稿文件夹吗？"
-
-#: mail/mail-errors.xml.h:41
-msgid "Use _Default"
-msgstr "使用默认值(_D)"
-
-#. mail:ask-expunge primary
-#: mail/mail-errors.xml.h:43
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-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 "如果您继续的话，您将无法恢复这些信件。"
-
-#: mail/mail-errors.xml.h:46
-msgid "_Expunge"
-msgstr "销毁(_E)"
-
-#. mail:ask-empty-trash primary
-#: mail/mail-errors.xml.h:48
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "您确定想要永久删除全部文件夹中已删除的全部信件吗？"
-
-#: mail/mail-errors.xml.h:51
-msgid "_Empty Trash"
-msgstr "清空回收站(_E)"
-
-#. mail:exit-unsaved primary
-#: mail/mail-errors.xml.h:53
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "您有未发的信件，您仍然想要退出吗？"
-
-#. mail:exit-unsaved secondary
-#: mail/mail-errors.xml.h:55
-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 "您主题为“{0}”的信件未投递。"
-
-#. mail:camel-exception secondary
-#: mail/mail-errors.xml.h:59
-msgid ""
-"The message was sent via the \"sendmail\" external application.  Sendmail "
-"reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder.  Check the message for errors "
-"and resend."
-msgstr ""
-"信件已通过外部应用程序“sendmail”发送。Sendmail 报告了如下错误：状态 67：邮件"
-"未发送。\n"
-"信件存储于发件箱文件夹中。请检查信件中的错误然后重新发送。"
-
-#. mail:async-error primary
-#: mail/mail-errors.xml.h:62
-msgid "Error while {0}."
-msgstr "{0} 时错误。"
-
-#. mail:async-error secondary
-#: mail/mail-errors.xml.h:64
-msgid "{1}."
-msgstr "{1}。"
-
-#. mail:async-error-nodescribe primary
-#: mail/mail-errors.xml.h:66
-msgid "Error while performing operation."
-msgstr "执行操作时错误。"
-
-#. mail:async-error-nodescribe secondary
-#: mail/mail-errors.xml.h:68
-msgid "{0}."
-msgstr "{0}。"
-
-#. mail:ask-session-password primary
-#: mail/mail-errors.xml.h:82
-msgid "Enter password."
-msgstr "输入密码。"
-
-#. mail:filter-load-error primary
-#: mail/mail-errors.xml.h:86
-msgid "Error loading filter definitions."
-msgstr "装入过滤规则信息错误。"
-
-#. mail:no-save-path primary
-#: mail/mail-errors.xml.h:90
-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}\"."
-msgstr "无法保存到文件“{0}”。"
-
-#. mail:no-create-path secondary
-#: mail/mail-errors.xml.h:96
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "无法创建保存目录，原因是“{0}”"
-
-#. mail:no-create-tmp-path primary
-#: mail/mail-errors.xml.h:98
-msgid "Cannot create temporary save directory."
-msgstr "无法创建临时保存目录。"
-
-#. mail:no-write-path-exists secondary
-#: mail/mail-errors.xml.h:104
-msgid "File exists but cannot overwrite it."
-msgstr "文件已存在，但无法覆盖。"
-
-#. mail:no-write-path-notfile secondary
-#: mail/mail-errors.xml.h:108
-msgid "File exists but is not a regular file."
-msgstr "文件已存在但并不是普通文件。"
-
-#. mail:no-delete-folder primary
-#: mail/mail-errors.xml.h:110
-msgid "Cannot delete folder \"{0}\"."
-msgstr "无法删除文件夹“{0}”。"
-
-#. mail:no-delete-special-folder primary
-#: mail/mail-errors.xml.h:114
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "无法删除系统文件夹“{0}”。"
-
-#. mail:no-delete-special-folder secondary
-#. mail:no-rename-special-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 "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-"Ximian Evolution 需要系统文件夹才能正常工作。您也不应该重命名、移动或删除系统"
-"文件夹。"
-
-#. mail:no-rename-special-folder primary
-#: mail/mail-errors.xml.h:118
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "无法重命名或移动系统文件夹“{0}”。"
-
-#. mail:ask-delete-folder title
-#: mail/mail-errors.xml.h:122
-msgid "Delete \"{0}\"?"
-msgstr "删除“{0}”吗？"
-
-#. mail:ask-delete-folder primary
-#: mail/mail-errors.xml.h:124
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?？"
-
-#. mail:ask-delete-folder secondary
-#: mail/mail-errors.xml.h:126
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-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}”的文件夹已经存在。请使用不同的名称。"
-
-#. mail:no-rename-folder secondary
-#: mail/mail-errors.xml.h:134
-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}”。"
-
-#. mail:no-create-folder-nostore primary
-#: mail/mail-errors.xml.h:152
-msgid "Cannot create folder \"{0}\"."
-msgstr "无法创建文件夹“{0}”。"
-
-#. mail:no-create-folder-nostore secondary
-#: mail/mail-errors.xml.h:154
-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 "无法将更改保存到账户。"
-
-#. mail:account-incomplete secondary
-#: mail/mail-errors.xml.h:158
-msgid "You have not filled in all of the required information."
-msgstr "您还没有填写所有必需的信息。"
-
-#. mail:account-notunique secondary
-#: mail/mail-errors.xml.h:162
-msgid "You may not create two accounts with the same name."
-msgstr "您不能以相同的名字创建两个账户。"
-
-#. mail:ask-delete-account title
-#: mail/mail-errors.xml.h:164
-msgid "Delete account?"
-msgstr "删除账户吗？"
-
-#. mail:ask-delete-account primary
-#: mail/mail-errors.xml.h:166
-msgid "Are you sure you want to delete this account?"
-msgstr "您确定要删除此账户吗？"
-
-#. mail:ask-delete-account secondary
-#: mail/mail-errors.xml.h:168
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "如果您删除了文件夹，账户信息将会被永久删除。"
-
-#: mail/mail-errors.xml.h:169
-msgid "Don't delete"
-msgstr "不删除"
-
-#. mail:no-save-signature primary
-#: mail/mail-errors.xml.h:171
-msgid "Could not save signature file."
-msgstr "无法保存签名文件。"
-
-#. mail:no-save-signature secondary
-#: mail/mail-errors.xml.h:173
-msgid "Because \"{0}\"."
-msgstr "原因是“{0}”。"
-
-#. mail:signature-notscript primary
-#: mail/mail-errors.xml.h:175
-msgid "Cannot set signature script \"{0}\"."
-msgstr "无法设置签名脚本“{0}”。"
-
-#. mail:signature-notscript secondary
-#: mail/mail-errors.xml.h:177
-msgid "The script file must exist and be executable."
-msgstr "脚本文件必须存在且可执行。"
-
-#. mail:ask-signature-changed title
-#: mail/mail-errors.xml.h:179
-msgid "Discard changed?"
-msgstr "丢弃更改吗？"
-
-#. mail:ask-signature-changed primary
-#: mail/mail-errors.xml.h:181
-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 "签名已经更改，但尚未保存。"
-
-#: mail/mail-errors.xml.h:184
-msgid "_Discard changes"
-msgstr "丢弃更改(_D)"
-
-#. mail:vfolder-notexist primary
-#: mail/mail-errors.xml.h:186
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "无法编辑虚拟文件夹“{0}”，因为它不存在。"
-
-#. mail:vfolder-notexist secondary
-#: mail/mail-errors.xml.h:188
-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
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "无法添加虚拟文件夹“{0}”。"
-
-#. mail:vfolder-updated primary
-#: mail/mail-errors.xml.h:194
-msgid "vFolders automatically updated."
-msgstr "虚拟文件夹已自动更新。"
-
-#. mail:vfolder-updated secondary
-#: mail/mail-errors.xml.h:196
-msgid ""
-"The following vFolder(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"下列虚拟文件夹：\n"
-"{0}\n"
-"使用了新删除的文件夹：\n"
-"   “{1}”\n"
-"因此也将更新。"
-
-#. mail:filter-updated primary
-#: mail/mail-errors.xml.h:202
-msgid "Mail filters automatically updated."
-msgstr "邮件过滤器已自动更新。"
-
-#. mail:filter-updated secondary
-#: mail/mail-errors.xml.h:204
-msgid ""
-"The following filter rule(s):\n"
-"{0}\n"
-"Used the now removed folder:\n"
-"    \"{1}\"\n"
-"And have been updated."
-msgstr ""
-"下列过滤规则：\n"
-"{0}\n"
-"使用了新删除的文件夹：\n"
-"   “{1}”\n"
-"因此也将更新。"
-
-#. mail:no-folder primary
-#: mail/mail-errors.xml.h:210
-msgid "Missing folder."
-msgstr "缺少文件夹。"
-
-#. mail:no-folder secondary
-#: mail/mail-errors.xml.h:212
-msgid "You must specify a folder."
-msgstr "您必须指定文件夹。"
-
-#. mail:no-name-vfolder secondary
-#: mail/mail-errors.xml.h:216
-msgid "You must name this vFolder."
-msgstr "您必须为该虚拟文件夹命名。"
-
-#. mail:vfolder-no-source primary
-#: mail/mail-errors.xml.h:218
-msgid "No sources selected."
-msgstr "没有选定来源。"
-
-#. mail:vfolder-no-source secondary
-#: mail/mail-errors.xml.h:220
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-"您必须至少指定一个文件夹作为来源。\n"
-"您即可以逐一选择文件夹，也可以选择全部本地文件夹、全部远程文件夹或二者。"
-
-#. mail:ask-migrate-existing primary
-#: mail/mail-errors.xml.h:224
-msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "升迁旧的邮件文件夹“{0}”有问题。"
-
-#. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:226
-msgid ""
-"A non-empty folder at \"{1}\" already exists.\n"
-"\n"
-"You can choose to ignore this folder, overwrite or append its contents, or "
-"quit.\n"
-msgstr ""
-"已经存在非空文件夹“{1}”。\n"
-"\n"
-"您可以选择忽略此文件夹、覆盖、追加内容或退出。\n"
-
-#: mail/mail-errors.xml.h:230
-msgid "Ignore"
-msgstr "忽略"
-
-#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
-msgid "_Overwrite"
-msgstr "覆盖(_O)"
-
-#: mail/mail-errors.xml.h:232
-msgid "_Append"
-msgstr "追加(_A)"
-
-#. mail:no-load-license primary
-#: mail/mail-errors.xml.h:234
-msgid "Unable to read license file."
-msgstr "无法读取协议文件。"
-
-#. mail:no-load-license secondary
-#: mail/mail-errors.xml.h:236
-msgid ""
-"Cannot read the license file \"{0}\", due to an\n"
-"      installation problem.  You will not be able to use this provider "
-"until\n"
-"      you can accept its license."
-msgstr ""
-"无法读取协议文件“{0}”，可能是安装出现问题。\n"
-"      除非您接受其协议，否则您无法使用此服务。"
-
-#. mail:checking-service title
-#: mail/mail-errors.xml.h:240
-msgid "Querying server"
-msgstr "查询服务器"
-
-#. mail:checking-service primary
-#: mail/mail-errors.xml.h:242
-msgid "Please wait."
-msgstr "请稍候。"
-
-#. mail:checking-service secondary
-#: mail/mail-errors.xml.h:244
-msgid "Querying server for a list of supported authentication mechanisms."
-msgstr "正在查询服务器支持的身份验证机制列表。"
-
-#. mail:gw-accountsetup-error primary
-#: mail/mail-errors.xml.h:246
-msgid ""
-"Unable to connect to the GroupWise\n"
-"server."
-msgstr "无法连接到 GroupWise 服务器。"
-
-#. mail:gw-accountsetup-error secondary
-#: mail/mail-errors.xml.h:249
-msgid ""
-"\n"
-"Please check your account settings and try again.\n"
-msgstr ""
-"\n"
-"请检查您的账户设置然后再试一次。\n"
-
 #: mail/mail-folder-cache.c:812
 #, c-format
 msgid "Pinging %s"
@@ -16232,6 +15539,7 @@ msgid "Enter a name for this signature."
 msgstr "输入该签名的名字。"
 
 #: mail/mail-signature-editor.c:414
+#: plugins/shared-folder/properties.glade.h:11
 msgid "Name:"
 msgstr "名称："
 
@@ -16450,17 +15758,450 @@ msgstr "主题含有"
 msgid "Subject does not contain"
 msgstr "主题不含有"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
+#: plugins/backup-restore/backup.c:109
+#, fuzzy
+msgid "Backup Evolution directory"
+msgstr "Evolution 错误"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 测试"
+#: plugins/backup-restore/backup.c:111
+#, fuzzy
+msgid "Restore Evolution directory"
+msgstr "Evolution 错误"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 测试组件"
+#: plugins/backup-restore/backup.c:113
+#, fuzzy
+msgid "Check Evolution archive"
+msgstr "Evolution 群件套件"
+
+#: plugins/backup-restore/backup.c:115
+#, fuzzy
+msgid "Restart Evolution"
+msgstr "无法启动 Evolution"
+
+#: plugins/backup-restore/backup-restore.c:51
+msgid "Select name of Evolution archive"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:61
+msgid "_Restart Evolution after backup"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:89
+msgid "Select Evolution archive to restore"
+msgstr ""
+
+#: plugins/backup-restore/backup-restore.c:97
+msgid "_Restart Evolution after restore"
+msgstr ""
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:1
+#, fuzzy
+msgid "Backup Settings..."
+msgstr "设置(_S)..."
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#, fuzzy
+msgid "Backup and restore Evolution data and settings"
+msgstr "更改 Evolution 的设置"
+
+#: plugins/backup-restore/org-gnome-backup-restore.xml.h:3
+#, fuzzy
+msgid "Restore Settings..."
+msgstr "Pilot 设置..."
+
+#: plugins/bbdb/bbdb.c:387
+#, fuzzy
+msgid "Automatic Contacts"
+msgstr "添加到联系人"
+
+#: plugins/bbdb/bbdb.c:396
+#, fuzzy
+msgid "<span weight=\"bold\">Automatic Contacts</span>"
+msgstr "<span weight=\"bold\">身份验证</span>"
+
+#. Enable BBDB checkbox
+#: plugins/bbdb/bbdb.c:409
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
+msgstr ""
+
+#: plugins/bbdb/bbdb.c:427
+#, fuzzy
+msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
+msgstr "<span weight=\"bold\">信件字体</span>"
+
+#. Enable Gaim Checkbox
+#: plugins/bbdb/bbdb.c:440
+msgid ""
+"Periodically synchronize contact information and images from my _instant "
+"messenger"
+msgstr ""
+
+#. Synchronize now button.
+#: plugins/bbdb/bbdb.c:447
+msgid "Synchronize with _buddy list now"
+msgstr ""
+
+#: plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#, fuzzy, c-format
+msgid "Unsubscribing from folder \"%s\""
+msgstr "无法退订文件夹“%s”：无效的命令"
+
+#. org.gnome.mailing-list-actions:no-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:2
+#, fuzzy
+msgid "Action not available"
+msgstr "没有可用的位置信息。"
+
+#. org.gnome.mailing-list-actions:no-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:4
+msgid ""
+"This message does not contain the header information required for this "
+"action."
+msgstr ""
+
+#. org.gnome.mailing-list-actions:posting-not-allowed primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:6
+#, fuzzy
+msgid "Posting not allowed"
+msgstr "投递失败：%s"
+
+#. org.gnome.mailing-list-actions:posting-not-allowed secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:8
+msgid ""
+"Posting to this mailing list is not allowed. Possibly, this is a read-only "
+"mailing list. Contact the list owner for details."
+msgstr ""
+
+#. org.gnome.mailing-list-actions:ask-send-message primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:10
+#, fuzzy
+msgid "Send e-mail message to mailing list?"
+msgstr "把信件发送到列表(_M)..."
+
+#. org.gnome.mailing-list-actions:ask-send-message secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:12
+msgid ""
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
+"\n"
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:15
+#, fuzzy
+msgid "_Send message"
+msgstr "发送信件"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:16
+#, fuzzy
+msgid "_Edit message"
+msgstr "发送信件"
+
+#. org.gnome.mailing-list-actions:malformed-header primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:18
+#, fuzzy
+msgid "Malformed header"
+msgstr "签名格式不对"
+
+#. org.gnome.mailing-list-actions:malformed-header secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:20
+msgid ""
+"The {0} header of this message is malformed and could not be processed.\n"
+"\n"
+"Header: {1}"
+msgstr ""
+
+#. org.gnome.mailing-list-actions:no-action primary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:24
+#, fuzzy
+msgid "No e-mail action"
+msgstr "记录过滤动作"
+
+#. org.gnome.mailing-list-actions:no-action secondary
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions-errors.xml.h:26
+msgid ""
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
+"\n"
+"Header: {0}"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
+#, fuzzy
+msgid "Contact list _owner"
+msgstr "联系人列表编辑器"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
+#, fuzzy
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "为选中邮件的邮件列表撰写回复"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
+msgid "Get an archive of the list this message belongs to"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
+msgid "Get information about the usage of the list this message belongs to"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
+msgid "Get list _archive"
+msgstr ""
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
+#, fuzzy
+msgid "Get list _usage information"
+msgstr "会议信息"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
+#, fuzzy
+msgid "Mailing _List"
+msgstr "邮件列表"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
+#, fuzzy
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "为选中邮件的邮件列表撰写回复"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
+#, fuzzy
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "为选中邮件的邮件列表撰写回复"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
+#, fuzzy
+msgid "Unsubscribe to the mailing list this message belongs to"
+msgstr "为选中邮件的邮件列表撰写回复"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
+#, fuzzy
+msgid "_Post message to list"
+msgstr "把信件发送到列表(_M)..."
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
+#, fuzzy
+msgid "_Subscribe to list"
+msgstr "订阅(_S)"
+
+#: plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
+#, fuzzy
+msgid "_Un-subscribe to list"
+msgstr "退订(_U)"
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:1
+msgid "Enable and disable plugins"
+msgstr ""
+
+#: plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
+#, fuzzy
+msgid "Manage Plugins..."
+msgstr "正在取消..."
+
+#: plugins/plugin-manager/plugin-manager.c:45
+#, fuzzy
+msgid "Author(s)"
+msgstr "小时"
+
+#: plugins/plugin-manager/plugin-manager.c:46
+#, fuzzy
+msgid "Id"
+msgstr "I"
+
+#: plugins/plugin-manager/plugin-manager.c:47
+#, fuzzy
+msgid "Path"
+msgstr "路径(_P)："
+
+#: plugins/plugin-manager/plugin-manager.c:48
+#, fuzzy
+msgid "Description"
+msgstr "描述："
+
+#. Setup the ui
+#: plugins/plugin-manager/plugin-manager.c:188
+#, fuzzy
+msgid "Plugin Manager"
+msgstr "经理"
+
+#: plugins/plugin-manager/plugin-manager.c:201
+msgid "Note: Some changes will not take effect until restart"
+msgstr ""
+
+#: plugins/plugin-manager/plugin-manager.c:210
+#, fuzzy
+msgid "Plugin"
+msgstr "销毁"
+
+#: plugins/prefer-plain/prefer-plain.c:105
+msgid "Show HTML if present"
+msgstr ""
+
+#: plugins/prefer-plain/prefer-plain.c:106
+msgid "Prefer PLAIN"
+msgstr ""
+
+#: plugins/prefer-plain/prefer-plain.c:107
+msgid "Only ever show PLAIN"
+msgstr ""
+
+#: plugins/prefer-plain/prefer-plain.c:150
+#, fuzzy
+msgid "HTML Mode"
+msgstr "HTML 邮件"
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:1
+#, fuzzy
+msgid "Save Attachments ..."
+msgstr "附件(_A)..."
+
+#: plugins/save-attachments/org-gnome-save-attachments.xml.h:2
+#, fuzzy
+msgid "Save all attachments"
+msgstr "保存附件"
+
+#: plugins/save-attachments/save-attachments.c:319
+#, fuzzy
+msgid "Select save base name"
+msgstr "选择一个时区"
+
+#: plugins/save-attachments/save-attachments.c:339
+#, fuzzy
+msgid "MIME Type"
+msgstr "MIME 类型："
+
+#: plugins/save-attachments/save-attachments.c:347
+#: ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:6
+msgid "Save"
+msgstr "保存"
+
+#: plugins/save-calendar/save-calendar.c:167
+#, c-format
+msgid "%s%d/%s%d/%s%d %s%d:%s%d:%s%d"
+msgstr ""
+
+#: plugins/save-calendar/save-calendar.c:307
+#, c-format
+msgid ""
+"Uid%sSummary%sDescription List%sCategories List%sComment List%sCompleted%"
+"sCreated%sContact List%sStart%sEnd%sDue%sPercent Done%sPriority%sUrl%"
+"sAttendees List%sLocation%sModified%s"
+msgstr ""
+
+#: plugins/save-calendar/save-calendar.c:576
+msgid "Prepend a header"
+msgstr ""
+
+#: plugins/save-calendar/save-calendar.c:581
+msgid "Advanced options for the CSV format"
+msgstr ""
+
+#: plugins/save-calendar/save-calendar.c:594
+#, fuzzy
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar 文件(.ics)"
+
+#: plugins/save-calendar/save-calendar.c:599
+msgid "Comma separated value format (.csv)"
+msgstr ""
+
+#: plugins/save-calendar/save-calendar.c:609
+#, fuzzy
+msgid "Value delimiter:"
+msgstr "本地发送"
+
+#: plugins/save-calendar/save-calendar.c:615
+msgid "Record delimiter:"
+msgstr ""
+
+#: plugins/save-calendar/save-calendar.c:621
+msgid "Encapsulate values with:"
+msgstr ""
+
+#. I haven't tested this yet
+#: plugins/save-calendar/save-calendar.c:636
+#: plugins/save-calendar/save-calendar.c:646
+#, fuzzy
+msgid "Select destination file"
+msgstr "选择目的"
+
+#: plugins/shared-folder/properties.glade.h:1
+#, fuzzy
+msgid ""
+"\n"
+"Share List"
+msgstr "电话列表(_P)"
+
+#: plugins/shared-folder/properties.glade.h:4
+#, fuzzy
+msgid "Ad_d"
+msgstr "添加(_A)"
+
+#: plugins/shared-folder/properties.glade.h:5
+msgid "Additional Access"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:7
+#, fuzzy
+msgid "Delet_e"
+msgstr "删除"
+
+#: plugins/shared-folder/properties.glade.h:8
+#, fuzzy
+msgid "Edi_t"
+msgstr "编辑"
+
+#: plugins/shared-folder/properties.glade.h:10
+#, fuzzy
+msgid "Message"
+msgstr "消息(_S)："
+
+#: plugins/shared-folder/properties.glade.h:12
+msgid "Sen_d Custom Notification"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:13
+msgid "Shared Folder Notification"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:15
+msgid "The participants will receive the following notification.\n"
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:18
+#, fuzzy
+msgid "_Not Shared"
+msgstr "尚未开始"
+
+#: plugins/shared-folder/properties.glade.h:20
+msgid "_Shared With ..."
+msgstr ""
+
+#: plugins/shared-folder/properties.glade.h:21
+#, fuzzy
+msgid "_Sharing"
+msgstr "阴影"
+
+#: plugins/shared-folder/share-folder-common.c:282
+#, fuzzy
+msgid "Users"
+msgstr "用户名"
+
+#: plugins/shared-folder/share-folder-common.c:283
+msgid "Enter the users and set permissions"
+msgstr ""
+
+#: plugins/shared-folder/share-folder-common.c:361
+#, fuzzy
+msgid "Sharing"
+msgstr "阴影"
+
+#. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
+#: plugins/subject-thread/subject-thread.c:54
+msgid "Fall back to threading messages by sub_ject"
+msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "Default width of the folder bar pane"
@@ -16531,6 +16272,35 @@ msgstr "当前连接"
 msgid "Click OK to close these connections and go offline"
 msgstr "单击确定关闭这些连接，并转入脱机操作"
 
+#: shell/e-shell.c:590
+msgid "Uknown system error."
+msgstr "未知的系统错误。"
+
+#: shell/e-shell.c:798 shell/e-shell.c:799
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: shell/e-shell.c:1237 widgets/misc/e-cell-date-edit.c:256
+msgid "OK"
+msgstr "确定"
+
+#: shell/e-shell.c:1239
+msgid "Invalid arguments"
+msgstr "无效参数"
+
+#: shell/e-shell.c:1241
+msgid "Cannot register on OAF"
+msgstr "无法注册到 OAF"
+
+#: shell/e-shell.c:1243
+msgid "Configuration Database not found"
+msgstr "找不到配置数据库"
+
+#: shell/e-shell.c:1245
+msgid "Generic error"
+msgstr "通用错误"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(无标题)"
@@ -16619,6 +16389,10 @@ msgstr "自动"
 msgid "F_ilename:"
 msgstr "文件名(_I)："
 
+#: shell/e-shell-importer.c:643
+msgid "Select a file"
+msgstr "选择一个文件"
+
 #: shell/e-shell-importer.c:655
 msgid "File _type:"
 msgstr "文件类型(_T)："
@@ -16706,6 +16480,23 @@ msgstr "文件夹名不能含有字符“#”。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是保留文件夹名。"
 
+#: 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:351
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution 正在脱机过程中。"
+
+#: 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:651
+#, c-format
+msgid "Switch to %s"
+msgstr "切换到 %s"
+
 #: shell/e-shell-window-commands.c:67
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具好像并未安装到系统中。"
@@ -16738,60 +16529,14 @@ msgstr "Groupwise 套件"
 msgid "_Work Online"
 msgstr "联机工作(_W)"
 
-#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:693 ui/evolution.xml.h:40
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:706 ui/evolution.xml.h:26
 msgid "Work Offline"
 msgstr "脱机工作"
 
-#: 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:351
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution 正在脱机过程中。"
-
-#: 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:651
-#, c-format
-msgid "Switch to %s"
-msgstr "切换到 %s"
-
-#: shell/e-shell.c:590
-msgid "Uknown system error."
-msgstr "未知的系统错误。"
-
-#: shell/e-shell.c:798 shell/e-shell.c:799
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
-
-#: shell/e-shell.c:1237 widgets/misc/e-cell-date-edit.c:256
-msgid "OK"
-msgstr "确定"
-
-#: shell/e-shell.c:1239
-msgid "Invalid arguments"
-msgstr "无效参数"
-
-#: shell/e-shell.c:1241
-msgid "Cannot register on OAF"
-msgstr "无法注册到 OAF"
-
-#: shell/e-shell.c:1243
-msgid "Configuration Database not found"
-msgstr "找不到配置数据库"
-
-#: shell/e-shell.c:1245
-msgid "Generic error"
-msgstr "通用错误"
-
 #: shell/e-user-creatable-items-handler.c:691
 msgid "New"
 msgstr "新建"
@@ -16819,8 +16564,8 @@ msgid ""
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
-"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的"
-"电子邮件账户，并从其它应用程序中导入文件。\n"
+"欢迎使用 Evolution。下面几屏将允许 Evolution 连接到您的电子邮件账户，并从其它"
+"应用程序中导入文件。\n"
 "\n"
 "请单击“下一步”按钮继续。"
 
@@ -16847,6 +16592,18 @@ msgstr "测试(_T)"
 msgid "Create a new test item"
 msgstr "创建新测试项"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution 外壳"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution 测试"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution 测试组件"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "单击“导入”以便开始将文件导入到 Evolution。"
@@ -17137,20 +16894,6 @@ msgstr ""
 "\n"
 "编辑信任设置："
 
-#: smime/gui/cert-trust-dialog.c:145
-msgid ""
-"Because you trust the certificate authority that issued this certificate, "
-"then you trust the authenticity of this certificate unless otherwise "
-"indicated here"
-msgstr "由于您信任颁发此证书的机构，您就将信任此证书的权威性，除非在此声明"
-
-#: smime/gui/cert-trust-dialog.c:149
-msgid ""
-"Because you do not trust the certificate authority that issued this "
-"certificate, then you do not trust the authenticity of this certificate "
-"unless otherwise indicated here"
-msgstr "由于您不信任颁发此证书的机构，您就将不信任此证书的权威性，除非在此声明"
-
 #: smime/gui/certificate-manager.c:134 smime/gui/certificate-manager.c:142
 #: smime/gui/certificate-manager.c:375 smime/gui/certificate-manager.c:383
 #: smime/gui/certificate-manager.c:595 smime/gui/certificate-manager.c:603
@@ -17184,6 +16927,20 @@ msgstr "电子邮件地址"
 msgid "Certificate Viewer: %s"
 msgstr "证书查看器：%s"
 
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr "由于您信任颁发此证书的机构，您就将信任此证书的权威性，除非在此声明"
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr "由于您不信任颁发此证书的机构，您就将不信任此证书的权威性，除非在此声明"
+
 #: smime/gui/component.c:45
 #, c-format
 msgid "Enter the password for `%s'"
@@ -17396,11 +17153,6 @@ msgstr "编辑 CA 信任(_E)"
 msgid "dialog1"
 msgstr "dialog1"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:612
-msgid "Certificate already exists"
-msgstr "证书已经存在"
-
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
@@ -17600,6 +17352,11 @@ msgstr "主题唯一 ID"
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+msgid "Certificate already exists"
+msgstr "证书已经存在"
+
 #: smime/lib/e-pkcs12.c:264
 msgid "PKCS12 File Password"
 msgstr "PKCS12 文件密码"
@@ -17739,9 +17496,9 @@ msgstr "查看当前联系人"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
+#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:28
 msgid "_Actions"
 msgstr "操作(_A)"
 
@@ -17956,7 +17713,7 @@ msgstr "把此项保存到磁盘"
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:44
 #: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
-#: ui/evolution.xml.h:29
+#: ui/evolution.xml.h:31
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -18217,6 +17974,16 @@ msgstr "反转选择(_I)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的信件列表(_T)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:29
+msgid "_Close"
+msgstr "关闭(_C)"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
@@ -18609,7 +18376,7 @@ msgstr "上一封信(_P)"
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:36
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:37
 msgid "_Tools"
 msgstr "工具(_T)"
 
@@ -18617,16 +18384,6 @@ msgstr "工具(_T)"
 msgid "_Undelete"
 msgstr "取消删除(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "关闭(_C)"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附件"
@@ -18679,11 +18436,6 @@ msgstr "S/MIME 加密"
 msgid "S/MIME Sign"
 msgstr "S/MIME 签名"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "保存"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "另存为"
@@ -18960,70 +18712,71 @@ msgid "Pi_lot Settings..."
 msgstr "Pilot 设置(_L)..."
 
 #: ui/evolution.xml.h:16
+#, fuzzy
+msgid "Prefere_nces"
+msgstr "邮件首选项"
+
+#: ui/evolution.xml.h:17
 msgid "Send / Receive"
 msgstr "发送/接收"
 
-#: ui/evolution.xml.h:17
+#: ui/evolution.xml.h:18
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ui/evolution.xml.h:18
+#: ui/evolution.xml.h:19
 msgid "Set up Pilot configuration"
 msgstr "配置 Pilot"
 
-#: ui/evolution.xml.h:19
+#: ui/evolution.xml.h:20
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ui/evolution.xml.h:20
+#: ui/evolution.xml.h:21
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
-#: ui/evolution.xml.h:21
+#: ui/evolution.xml.h:22
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
-#: ui/evolution.xml.h:22
+#: ui/evolution.xml.h:23
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ui/evolution.xml.h:23
+#: ui/evolution.xml.h:24
 msgid "Toggle whether we are working offline."
 msgstr "切换是否脱机工作。"
 
-#: ui/evolution.xml.h:24
+#: ui/evolution.xml.h:25
 msgid "Tool_bar"
 msgstr "工具栏(_B)"
 
-#: ui/evolution.xml.h:26
+#: ui/evolution.xml.h:27
 msgid "_About Evolution..."
 msgstr "关于 Evolution(_A)..."
 
-#: ui/evolution.xml.h:30
+#: ui/evolution.xml.h:32
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ui/evolution.xml.h:31
+#: ui/evolution.xml.h:33
 msgid "_Import..."
 msgstr "导入(_I)..."
 
-#: ui/evolution.xml.h:32
+#: ui/evolution.xml.h:34
 msgid "_New"
 msgstr "新建(_N)"
 
-#: ui/evolution.xml.h:33
+#: ui/evolution.xml.h:35
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
-#: ui/evolution.xml.h:34
+#: ui/evolution.xml.h:36
 msgid "_Send / Receive"
 msgstr "发送/接收(_S)"
 
-#: ui/evolution.xml.h:35
-msgid "_Settings..."
-msgstr "设置(_S)..."
-
-#: ui/evolution.xml.h:38
+#: ui/evolution.xml.h:39
 msgid "_Window"
 msgstr "窗口(_W)"
 
@@ -19129,6 +18882,14 @@ msgstr "当前视图(_C)"
 msgid "Save Custom View..."
 msgstr "保存当前视图..."
 
+#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
+msgid "Previous Button"
+msgstr "上一按钮"
+
+#: widgets/misc/e-calendar.c:226
+msgid "Month Calendar"
+msgstr "月历"
+
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
 #: widgets/misc/e-calendar-item.c:415
@@ -19136,18 +18897,10 @@ msgid "MTWTFSS"
 msgstr "一二三四五六日"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1120
+#: widgets/misc/e-calendar-item.c:1123
 msgid "%B %Y"
 msgstr "%Y年%B"
 
-#: widgets/misc/e-calendar.c:177 widgets/misc/e-calendar.c:201
-msgid "Previous Button"
-msgstr "上一按钮"
-
-#: widgets/misc/e-calendar.c:226
-msgid "Month Calendar"
-msgstr "月历"
-
 #: widgets/misc/e-cell-date-edit.c:232 widgets/misc/e-dateedit.c:444
 msgid "Now"
 msgstr "现在"
@@ -19384,6 +19137,16 @@ msgstr "高级(_A)..."
 msgid "Choose Image"
 msgstr "选择图像"
 
+#: widgets/misc/e-map.c:647
+msgid "World Map"
+msgstr ""
+
+#: widgets/misc/e-map.c:649
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+
 #: widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
 msgstr "同步对象："
@@ -19434,6 +19197,10 @@ msgstr "文件已存在“{0}”。"
 msgid "Do you wish to overwrite it?"
 msgstr "您打算覆盖它吗？"
 
+#: widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr "覆盖(_O)"
+
 #. system:no-save-file primary
 #: widgets/misc/e-system-errors.xml.h:9
 msgid "Cannot save file \"{0}\"."
@@ -19454,6 +19221,622 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#~ msgid "Reflow Test"
+#~ msgstr "回溯测试"
+
+#~ msgid "Copyright (C) 2000, Ximian, Inc."
+#~ msgstr "版权 (C) 2000, Ximian, Inc."
+
+#~ msgid "This should test the reflow canvas item"
+#~ msgstr "这应该测试回溯原始项目"
+
+#~ msgid "Contact Print Style Editor Test"
+#~ msgstr "联系人打印样式编辑器测试"
+
+#~ msgid "This should test the contact print style editor widget"
+#~ msgstr "这应该测试联系人打印样式编辑器部件"
+
+#~ msgid "Contact Print Test"
+#~ msgstr "联系人打印测试"
+
+#~ msgid "This should test the contact print code"
+#~ msgstr "这应该测试联系人打印代码"
+
+#~ msgid "Can not open file"
+#~ msgstr "无法打开文件"
+
+#~ msgid "Couldn't get list of addressbooks"
+#~ msgstr "无法获得地址簿列表"
+
+#~ msgid "failed to open book"
+#~ msgstr "打开地址簿失败"
+
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "请输入 %s@%s 的 NNTP 密码"
+
+#~ msgid "Server rejected username"
+#~ msgstr "服务器拒绝了密码"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "向服务器发送用户名失败"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "服务器拒绝了用户名/密码"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "内部错误：uid 的格式无效：%s"
+
+#~ msgid "You cannot post NNTP messages while working offline!"
+#~ msgstr "您离线时无法投递 NNTP 信件！"
+
+#~ msgid "You cannot copy messages from a NNTP folder!"
+#~ msgstr "您无法从 NNTP 文件夹复制信件！"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "无法从服务器获取组列表。"
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "无法装入 %s 的组列表文件：%s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "无法保存 %s 的组列表文件：%s"
+
+#~ msgid ""
+#~ "Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
+#~ msgstr "以短格式显示文件夹(如 c.o.linux 而不是 comp.os.linux)"
+
+#~ msgid "In the subscription dialog, show relative folder names"
+#~ msgstr "在订阅对话框中显示相对文件夹名称"
+
+#~ msgid "USENET news"
+#~ msgstr "USENET 新闻"
+
+#~ msgid "This is a provider for reading from and posting toUSENET newsgroups."
+#~ msgstr "这是一个从 USENET 新闻组和向 USENET 新闻组发布邮件的提供者。"
+
+#~ msgid ""
+#~ "This option will authenticate with the NNTP server using a plaintext "
+#~ "password."
+#~ msgstr "该选项将以明文密码向进行 NNTP 服务器进行认证。"
+
+#~ msgid "Could not read greeting from %s: %s"
+#~ msgstr "无法阅读来自 %s 的欢迎信息：%s"
+
+#~ msgid "NNTP server %s returned error code %d: %s"
+#~ msgstr "NNTP 服务器 %s 返回错误码 %d：%s"
+
+#~ msgid "USENET News via %s"
+#~ msgstr "USENET 新闻 %s"
+
+#~ msgid ""
+#~ "Error retrieving newsgroups:\n"
+#~ "\n"
+#~ "%s"
+#~ msgstr ""
+#~ "收取新闻组出错：\n"
+#~ "\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "You cannot subscribe to this newsgroup:\n"
+#~ "\n"
+#~ "No such newsgroup. The selected item is a probably a parent folder."
+#~ msgstr ""
+#~ "您无法订阅此新闻组：\n"
+#~ "\n"
+#~ "没有这样的新闻组。选中项目可能是父文件夹。"
+
+#~ msgid ""
+#~ "You cannot unsubscribe to this newsgroup:\n"
+#~ "\n"
+#~ "newsgroup does not exist!"
+#~ msgstr ""
+#~ "您无法订阅此新闻组：\n"
+#~ "\n"
+#~ "新闻组不存在！"
+
+#~ msgid "You cannot create a folder in a News store: subscribe instead."
+#~ msgstr "您无法在新闻存储中创建文件夹：应该订阅。"
+
+#~ msgid "You cannot rename a folder in a News store."
+#~ msgstr "您无法在新闻存储中重命名文件夹。"
+
+#~ msgid "You cannot remove a folder in a News store: unsubscribe instead."
+#~ msgstr "您无法在新闻存储中删除文件夹：应该退订。"
+
+#~ msgid "Authentication requested but no username provided"
+#~ msgstr "请求了身份验证，但未提供用户名"
+
+#~ msgid "Cannot authenticate to server: %s"
+#~ msgstr "无法认证到服务器：%s"
+
+#~ msgid "NNTP Command failed: %s"
+#~ msgstr "NNTP 命令失败：%s"
+
+#~ msgid "Not connected."
+#~ msgstr "未连接。"
+
+#~ msgid "No such folder: %s"
+#~ msgstr "没有文件夹：%s"
+
+#~ msgid "%s: Scanning new messages"
+#~ msgstr "%s：正在扫描新信件"
+
+#~ msgid "Unexpected server response from xover: %s"
+#~ msgstr "来自 xover 的意外服务器应答：%s"
+
+#~ msgid "Unexpected server response from head: %s"
+#~ msgstr "来自 head 的意外服务器应答：%s"
+
+#~ msgid "Use cancel"
+#~ msgstr "使用取消"
+
+#~ msgid "Operation failed: %s"
+#~ msgstr "操作失败：%s"
+
+#~ msgid ""
+#~ "<b>Currently, your status is \"Out of the Office\". </b>\n"
+#~ "\n"
+#~ "Would you like to change your status to \"In the Office\"? "
+#~ msgstr ""
+#~ "<b>您目前的状态是“办公室以外”。</b>\n"
+#~ "\n"
+#~ "您想要将您的状态更改为“办公室内”吗？"
+
+#~ msgid "<b>Out of Office Message:</b>"
+#~ msgstr "<b>办公室以外信件：</b>"
+
+#~ msgid "<b>Status:</b>"
+#~ msgstr "<b>状态：</b>"
+
+#~ msgid ""
+#~ "<small>The message specified below will be automatically sent to each "
+#~ "person who sends\n"
+#~ "mail to you while you are out of the office.</small>"
+#~ msgstr ""
+#~ "<small>在您位于办公室外势，如果有人给您发送邮件，则会自动将下面指定的信"
+#~ "件\n"
+#~ "送回。</small>"
+
+#~ msgid "I am currently in the office"
+#~ msgstr "我正在办公室内"
+
+#~ msgid "I am currently out of the office"
+#~ msgstr "我正在办公室外"
+
+#~ msgid "No, Don't Change Status"
+#~ msgstr "不，请不要更改状态"
+
+#~ msgid "Out of Office Assistant"
+#~ msgstr "离开办公室助手"
+
+#~ msgid "Yes, Change Status"
+#~ msgstr "是，更改状态"
+
+#~ msgid "      "
+#~ msgstr "      "
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>接收电子邮件</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>发送电子邮件：</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>此页面允许您选择是否要对您发出的信件是用阅读收条进行通知，\n"
+#~ "以及指定在别人请求您的阅读收条时 Evolution 应该怎么做。</small>"
+
+#~ msgid "Always send back a read reciept"
+#~ msgstr "总是发回阅读收条"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "询问我是否想要发回阅读收条"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "从不发回阅读收条"
+
+#~ msgid "Read Receipts"
+#~ msgstr "阅读收条"
+
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "我发出的所有信件都要求阅读收条"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "除非信件发送给邮件列表，或者是给我自己发的"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr "当您收到请求阅读收条的邮件，Evolution 应该做什么？"
+
+#~ msgid "Invalid authentication"
+#~ msgstr "无效的身份验证"
+
+#~ msgid ""
+#~ "This server does not support this type of authentication and may not "
+#~ "support authentication at all."
+#~ msgstr "此服务器不支持此类型的身份验证，而且可能根本不支持身份验证。"
+
+#~ msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#~ msgstr "您以登录到服务器“{0}”失败。"
+
+#~ msgid ""
+#~ "Check to make sure your password is spelled correctly.  Remember that "
+#~ "many passwords are case sensitive; your caps lock might be on."
+#~ msgstr ""
+#~ "选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；您的 "
+#~ "Caps Lock 灯可能为开。"
+
+#~ msgid "Are you sure you want to send a message in HTML format?"
+#~ msgstr "您确定想要以 HTML 格式发送信件吗？"
+
+#~ msgid ""
+#~ "Please make sure the following recipients are willing and able to receive "
+#~ "HTML email:\n"
+#~ "{0}\n"
+#~ "Send anyway?"
+#~ msgstr ""
+#~ "请确定下列受检人想要并可以接收 HTML 邮件：\n"
+#~ "{0}\n"
+#~ "仍然发送吗？"
+
+#~ msgid "Are you sure you want to send a message without a subject?"
+#~ msgstr "您确定想要发送没有主题的信件吗？"
+
+#~ msgid ""
+#~ "Adding a meaningful Subject line to your messages will give your "
+#~ "recipients an idea of what your mail is about."
+#~ msgstr ""
+#~ "在您的信件中添加有意义的主题行可以让您的收件人更容易明白您邮件的内容。"
+
+#~ msgid "Are you sure you want to send a message with only BCC recipients?"
+#~ msgstr "您确定想要发送只有 BCC 收件人的邮件吗？"
+
+#~ msgid ""
+#~ "The contact list you are sending to is configured to hide list "
+#~ "recipients.\n"
+#~ "\n"
+#~ "Many email systems add an Apparently-To header to messages that only have "
+#~ "BCC recipients. This header, if added, will list all of your recipients "
+#~ "in your message. To avoid this, you should add at least one To: or CC: "
+#~ "recipient. "
+#~ msgstr ""
+#~ "您即将发送的联系人列表配置为隐藏列表收件人。\n"
+#~ "\n"
+#~ "许多邮件系统会在只有 Bcc 收件人的信件中添加 Apparently-To 信头。如果添加了"
+#~ "该信头，将在您的邮件中列出您的全部收件人。要避免此特性，您应该至少添加一"
+#~ "个 To: 或 CC: 收件人。"
+
+#~ msgid ""
+#~ "Many email systems add an Apparently-To header to messages that only have "
+#~ "BCC recipients. This header, if added, will list all of your recipients "
+#~ "to your message anyway. To avoid this, you should add at least one To: or "
+#~ "CC: recipient."
+#~ msgstr ""
+#~ "许多邮件系统会在只有 Bcc 收件人的信件中添加 Apparently-To 信头。如果添加了"
+#~ "该信头，将在您的邮件中列出您的全部收件人。要避免此特性，您应该至少添加一"
+#~ "个 To: 或 CC: 收件人。"
+
+#~ msgid ""
+#~ "This message cannot be sent because you have not specified any Recipients"
+#~ msgstr "无法发送这封信，原因是您没有指定任何收件人"
+
+#~ msgid ""
+#~ "Please enter a valid email address in the To: field. You can search for "
+#~ "email addresses by clicking on the To: button next to the entry box."
+#~ msgstr ""
+#~ "请在收件人域中输入有效的电子邮件地址。您可以单击输入框旁边的“收件人：”按钮"
+#~ "来搜索电子邮件地址。"
+
+#~ msgid "Use default drafts folder?"
+#~ msgstr "使用默认草稿文件夹吗？"
+
+#~ msgid ""
+#~ "Unable to open the drafts folder for this account.  Use the system drafts "
+#~ "folder instead?"
+#~ msgstr "无法打开此账户的草稿文件夹。换用系统的草稿文件夹吗？"
+
+#~ msgid "Use _Default"
+#~ msgstr "使用默认值(_D)"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted message in "
+#~ "folder \"{0}\"?"
+#~ msgstr "您确定想要永久删除文件夹“{0}”中已删除的全部信件？"
+
+#~ msgid "If you continue, you will not be able to recover these messages."
+#~ msgstr "如果您继续的话，您将无法恢复这些信件。"
+
+#~ msgid "_Expunge"
+#~ msgstr "销毁(_E)"
+
+#~ msgid ""
+#~ "Are you sure you want to permanently remove all the deleted messages in "
+#~ "all folders?"
+#~ msgstr "您确定想要永久删除全部文件夹中已删除的全部信件吗？"
+
+#~ msgid "_Empty Trash"
+#~ msgstr "清空回收站(_E)"
+
+#~ msgid "You have unsent messages, do you wish to quit anyway?"
+#~ msgstr "您有未发的信件，您仍然想要退出吗？"
+
+#~ msgid ""
+#~ "If you quit, these messages will not be sent until Evolution is started "
+#~ "again."
+#~ msgstr "如果您退出的话，这些信件将直到 Evolution 下次启动时才会发出。"
+
+#~ msgid "Your message with the subject \"{0}\" was not delivered."
+#~ msgstr "您主题为“{0}”的信件未投递。"
+
+#~ msgid ""
+#~ "The message was sent via the \"sendmail\" external application.  Sendmail "
+#~ "reports the following error: status 67: mail not sent.\n"
+#~ "The message is stored in the Outbox folder.  Check the message for errors "
+#~ "and resend."
+#~ msgstr ""
+#~ "信件已通过外部应用程序“sendmail”发送。Sendmail 报告了如下错误：状态 67：邮"
+#~ "件未发送。\n"
+#~ "信件存储于发件箱文件夹中。请检查信件中的错误然后重新发送。"
+
+#~ msgid "Error while {0}."
+#~ msgstr "{0} 时错误。"
+
+#~ msgid "{1}."
+#~ msgstr "{1}。"
+
+#~ msgid "Error while performing operation."
+#~ msgstr "执行操作时错误。"
+
+#~ msgid "{0}."
+#~ msgstr "{0}。"
+
+#~ msgid "Enter password."
+#~ msgstr "输入密码。"
+
+#~ msgid "Error loading filter definitions."
+#~ msgstr "装入过滤规则信息错误。"
+
+#~ msgid "Cannot save to directory \"{0}\"."
+#~ msgstr "无法保存到目录“{0}”。"
+
+#~ msgid "Cannot save to file \"{0}\"."
+#~ msgstr "无法保存到文件“{0}”。"
+
+#~ msgid "Cannot create the save directory, because \"{1}\""
+#~ msgstr "无法创建保存目录，原因是“{0}”"
+
+#~ msgid "Cannot create temporary save directory."
+#~ msgstr "无法创建临时保存目录。"
+
+#~ msgid "File exists but cannot overwrite it."
+#~ msgstr "文件已存在，但无法覆盖。"
+
+#~ msgid "File exists but is not a regular file."
+#~ msgstr "文件已存在但并不是普通文件。"
+
+#~ msgid "Cannot delete folder \"{0}\"."
+#~ msgstr "无法删除文件夹“{0}”。"
+
+#~ msgid "Cannot delete system folder \"{0}\"."
+#~ msgstr "无法删除系统文件夹“{0}”。"
+
+#~ msgid ""
+#~ "System folders are required for Ximian Evolution to function correctly "
+#~ "and cannot be renamed, moved, or deleted."
+#~ msgstr ""
+#~ "Ximian Evolution 需要系统文件夹才能正常工作。您也不应该重命名、移动或删除"
+#~ "系统文件夹。"
+
+#~ msgid "Cannot rename or move system folder \"{0}\"."
+#~ msgstr "无法重命名或移动系统文件夹“{0}”。"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "删除“{0}”吗？"
+
+#~ msgid "Really delete folder \"{0}\" and all of its subfolders?"
+#~ msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗?？"
+
+#~ msgid ""
+#~ "If you delete the folder, all of its contents and its subfolders contents "
+#~ "will be deleted permanently."
+#~ msgstr ""
+#~ "如果您删除了文件夹，其中的全部内容及其子文件夹的全部内容都将会被永久删除。"
+
+#~ msgid "Cannot rename \"{0}\" to \"{1}\"."
+#~ msgstr "无法将“{0}”重命名为“{1}”。"
+
+#~ msgid "A folder named \"{1}\" already exists. Please use a different name."
+#~ msgstr "名为“{1}”的文件夹已经存在。请使用不同的名称。"
+
+#~ msgid "Because \"{2}\"."
+#~ msgstr "原因是“{2}”。"
+
+#~ msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#~ msgstr "无法将文件夹“{0}”移动到“{1}”。"
+
+#~ msgid "Cannot open source \"{2}\"."
+#~ msgstr "无法打开源“{2}”。"
+
+#~ msgid "Cannot open target \"{2}\"."
+#~ msgstr "无法打开目标“{2}”。"
+
+#~ msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#~ msgstr "无法将文件夹“{0}”复制到“{1}”。"
+
+#~ msgid "Cannot create folder \"{0}\"."
+#~ msgstr "无法创建文件夹“{0}”。"
+
+#~ msgid "Cannot open source \"{1}\""
+#~ msgstr "无法打开源“{1}”"
+
+#~ msgid "Cannot save changes to account."
+#~ msgstr "无法将更改保存到账户。"
+
+#~ msgid "You have not filled in all of the required information."
+#~ msgstr "您还没有填写所有必需的信息。"
+
+#~ msgid "You may not create two accounts with the same name."
+#~ msgstr "您不能以相同的名字创建两个账户。"
+
+#~ msgid "Delete account?"
+#~ msgstr "删除账户吗？"
+
+#~ msgid "Are you sure you want to delete this account?"
+#~ msgstr "您确定要删除此账户吗？"
+
+#~ msgid "If you proceed, the account information will be deleted permanently."
+#~ msgstr "如果您删除了文件夹，账户信息将会被永久删除。"
+
+#~ msgid "Don't delete"
+#~ msgstr "不删除"
+
+#~ msgid "Could not save signature file."
+#~ msgstr "无法保存签名文件。"
+
+#~ msgid "Because \"{0}\"."
+#~ msgstr "原因是“{0}”。"
+
+#~ msgid "Cannot set signature script \"{0}\"."
+#~ msgstr "无法设置签名脚本“{0}”。"
+
+#~ msgid "The script file must exist and be executable."
+#~ msgstr "脚本文件必须存在且可执行。"
+
+#~ msgid "Discard changed?"
+#~ msgstr "丢弃更改吗？"
+
+#~ msgid "Do you wish to save your changes?"
+#~ msgstr "您希望保存更改吗？"
+
+#~ msgid "This signature has been changed, but has not been saved."
+#~ msgstr "签名已经更改，但尚未保存。"
+
+#~ msgid "_Discard changes"
+#~ msgstr "丢弃更改(_D)"
+
+#~ msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+#~ msgstr "无法编辑虚拟文件夹“{0}”，因为它不存在。"
+
+#~ msgid ""
+#~ "This folder may have been added implictly, go to the virtual folder "
+#~ "editor to add it explictly, if required."
+#~ msgstr ""
+#~ "此文件夹可能是隐式添加的。若需要的话，请前往虚拟文件夹编辑器显示添加。"
+
+#~ msgid "Cannot add vFolder \"{0}\"."
+#~ msgstr "无法添加虚拟文件夹“{0}”。"
+
+#~ msgid "vFolders automatically updated."
+#~ msgstr "虚拟文件夹已自动更新。"
+
+#~ msgid ""
+#~ "The following vFolder(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "下列虚拟文件夹：\n"
+#~ "{0}\n"
+#~ "使用了新删除的文件夹：\n"
+#~ "   “{1}”\n"
+#~ "因此也将更新。"
+
+#~ msgid "Mail filters automatically updated."
+#~ msgstr "邮件过滤器已自动更新。"
+
+#~ msgid ""
+#~ "The following filter rule(s):\n"
+#~ "{0}\n"
+#~ "Used the now removed folder:\n"
+#~ "    \"{1}\"\n"
+#~ "And have been updated."
+#~ msgstr ""
+#~ "下列过滤规则：\n"
+#~ "{0}\n"
+#~ "使用了新删除的文件夹：\n"
+#~ "   “{1}”\n"
+#~ "因此也将更新。"
+
+#~ msgid "Missing folder."
+#~ msgstr "缺少文件夹。"
+
+#~ msgid "You must specify a folder."
+#~ msgstr "您必须指定文件夹。"
+
+#~ msgid "You must name this vFolder."
+#~ msgstr "您必须为该虚拟文件夹命名。"
+
+#~ msgid "No sources selected."
+#~ msgstr "没有选定来源。"
+
+#~ msgid ""
+#~ "You must specify at least one folder as a source.\n"
+#~ "Either by selecting the folders individually, and/or by selecting\n"
+#~ "all local folders, all remote folders, or both."
+#~ msgstr ""
+#~ "您必须至少指定一个文件夹作为来源。\n"
+#~ "您即可以逐一选择文件夹，也可以选择全部本地文件夹、全部远程文件夹或二者。"
+
+#~ msgid "Problem migrating old mail folder \"{0}\"."
+#~ msgstr "升迁旧的邮件文件夹“{0}”有问题。"
+
+#~ msgid ""
+#~ "A non-empty folder at \"{1}\" already exists.\n"
+#~ "\n"
+#~ "You can choose to ignore this folder, overwrite or append its contents, "
+#~ "or quit.\n"
+#~ msgstr ""
+#~ "已经存在非空文件夹“{1}”。\n"
+#~ "\n"
+#~ "您可以选择忽略此文件夹、覆盖、追加内容或退出。\n"
+
+#~ msgid "Ignore"
+#~ msgstr "忽略"
+
+#~ msgid "_Append"
+#~ msgstr "追加(_A)"
+
+#~ msgid "Unable to read license file."
+#~ msgstr "无法读取协议文件。"
+
+#~ msgid ""
+#~ "Cannot read the license file \"{0}\", due to an\n"
+#~ "      installation problem.  You will not be able to use this provider "
+#~ "until\n"
+#~ "      you can accept its license."
+#~ msgstr ""
+#~ "无法读取协议文件“{0}”，可能是安装出现问题。\n"
+#~ "      除非您接受其协议，否则您无法使用此服务。"
+
+#~ msgid "Querying server"
+#~ msgstr "查询服务器"
+
+#~ msgid "Please wait."
+#~ msgstr "请稍候。"
+
+#~ msgid "Querying server for a list of supported authentication mechanisms."
+#~ msgstr "正在查询服务器支持的身份验证机制列表。"
+
+#~ msgid ""
+#~ "Unable to connect to the GroupWise\n"
+#~ "server."
+#~ msgstr "无法连接到 GroupWise 服务器。"
+
+#~ msgid ""
+#~ "\n"
+#~ "Please check your account settings and try again.\n"
+#~ msgstr ""
+#~ "\n"
+#~ "请检查您的账户设置然后再试一次。\n"
+
 #~ msgid "contact's header: "
 #~ msgstr "联系人头衔："
 
@@ -19470,9 +19853,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Address Book Sources..."
 #~ msgstr "地址簿来源..."
 
-#~ msgid "Pilot Settings..."
-#~ msgstr "Pilot 设置..."
-
 #~ msgid "Print Envelope"
 #~ msgstr "打印信封"
 
@@ -19503,9 +19883,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "%A %d %B %Y"
 #~ msgstr "%Y年%-m月%-d日%A"
 
-#~ msgid "%d %B %Y"
-#~ msgstr "%Y年%-m月%-d日"
-
 #~ msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 #~ msgstr "即将删除日历“%s”。您确定想要继续吗？"
 
@@ -19526,45 +19903,15 @@ msgstr "%s (%d%% 完成)"
 #~ "from"
 #~ msgstr "“%s”是远程组。您必须指定可获取日历的位置"
 
-#~ msgid "Select destination"
-#~ msgstr "选择目的"
-
 #~ msgid "_Destination"
 #~ msgstr "目的(_D)"
 
-#~ msgid "Go to _Today"
-#~ msgstr "转到今天(_T)"
-
-#~ msgid "_Go to Date..."
-#~ msgstr "转到日期(_G)..."
-
 #~ msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 #~ msgstr "即将删除任务列表“%s”。您确定想要继续吗？"
 
 #~ msgid "Failed to decrypt MIME part: invalid structure"
 #~ msgstr "解密 MIME 部分失败：无效的结构"
 
-#~ msgid "cannot create thread"
-#~ msgstr "无法创建线索"
-
-#~ msgid "Resolving: %s"
-#~ msgstr "解析：%s"
-
-#~ msgid "Host lookup failed"
-#~ msgstr "主机查阅失败"
-
-#~ msgid "Host lookup failed: %s: %s"
-#~ msgstr "主机查阅失败：%s：%s"
-
-#~ msgid "Resolving address"
-#~ msgstr "解析地址"
-
-#~ msgid "Name lookup failed"
-#~ msgstr "名称查阅失败"
-
-#~ msgid "Name lookup failed: %s"
-#~ msgstr "名称查阅失败：%s"
-
 #~ msgid "Enter security pass-phrase for `%s'"
 #~ msgstr "为“%s”输入安全密码句"
 
@@ -19602,9 +19949,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "<span weight=\"bold\">Checking for New Mail</span>"
 #~ msgstr "<span weight=\"bold\">检查新邮件</span>"
 
-#~ msgid "Automatically check for _new mail every"
-#~ msgstr "自动检查新邮件的间隔(_N)"
-
 #~ msgid "IMAPv4 "
 #~ msgstr "IMAPv4"
 
@@ -19614,9 +19958,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Qmail maildir "
 #~ msgstr "Qmail maildir "
 
-#~ msgid "Receiving Options"
-#~ msgstr "接收选项"
-
 #~ msgid "Standard Unix mbox"
 #~ msgstr "标准 Unix mbox"