Update Simplified Chinese translation.

author: Ray Wang <raywang@gnome.org> 2009-12-01 15:15:40 +0800
committer: Ray Wang <raywang@gnome.org> 2009-12-01 15:15:40 +0800
commit: 551a4ed9b2145440a7b257e1637a98b213113456 (patch)
tree: 015651cacb97af6904ef0bee7641bcbf5c44e1b3 /po
parent: d94534c3673956164f9fb2c7f6b12188994503ae (diff)
download: gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar
gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.gz
gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.bz2
gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.lz
gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.xz
gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.zst
gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.zip
1 files changed, 11654 insertions, 11612 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f9302f252f..65d79d7180 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,335 +5,20 @@
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
 #
-#: ../shell/main.c:603
+#: ../shell/main.c:510
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.8\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=evolution\n"
-"POT-Creation-Date: 2009-01-19 17:15+0000\n"
-"PO-Revision-Date: 2009-01-29 02:49+0800\n"
-"Last-Translator: YangZhang <zyangmath@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-12-01 14:12+0700\n"
+"PO-Revision-Date: 2009-11-26 21:17+0100\n"
+"Last-Translator: Tao Wei <weitao1979@gmail.com>\n"
 "Language-Team: Chinese i18n <i18n-zh@googlegroup.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../a11y/addressbook/ea-addressbook-view.c:94
-#: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:179
-msgid "evolution address book"
-msgstr "evolution 地址簿"
-
-#: ../a11y/addressbook/ea-minicard-view.c:33
-#: ../addressbook/gui/component/addressbook-component.c:228
-msgid "New Contact"
-msgstr "新建联系人"
-
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:236
-msgid "New Contact List"
-msgstr "新建联系人列表"
-
-#: ../a11y/addressbook/ea-minicard-view.c:162
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
-
-#: ../a11y/addressbook/ea-minicard.c:31
-msgid "Open"
-msgstr "打开"
-
-#: ../a11y/addressbook/ea-minicard.c:141
-msgid "Contact List: "
-msgstr "联系人列表："
-
-#: ../a11y/addressbook/ea-minicard.c:142
-msgid "Contact: "
-msgstr "联系人："
-
-#: ../a11y/addressbook/ea-minicard.c:168
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
-
-#: ../a11y/calendar/ea-cal-view-event.c:265
-msgid "It has alarms."
-msgstr "有提醒。"
-
-#: ../a11y/calendar/ea-cal-view-event.c:268
-msgid "It has recurrences."
-msgstr "有再现。"
-
-#: ../a11y/calendar/ea-cal-view-event.c:271
-msgid "It is a meeting."
-msgstr "为会议。"
-
-#: ../a11y/calendar/ea-cal-view-event.c:277
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "日历事件：摘要为 %s。"
-
-#: ../a11y/calendar/ea-cal-view-event.c:279
-msgid "Calendar Event: It has no summary."
-msgstr "日历事件：无摘要。"
-
-#: ../a11y/calendar/ea-cal-view-event.c:299
-msgid "calendar view event"
-msgstr "日历视图事件"
-
-#: ../a11y/calendar/ea-cal-view-event.c:527
-msgid "Grab Focus"
-msgstr "获得焦点"
-
-#: ../a11y/calendar/ea-cal-view.c:299
-msgid "New Appointment"
-msgstr "新建约会"
-
-#: ../a11y/calendar/ea-cal-view.c:300
-msgid "New All Day Event"
-msgstr "新建全天事件"
-
-#: ../a11y/calendar/ea-cal-view.c:301
-msgid "New Meeting"
-msgstr "新会议"
-
-#: ../a11y/calendar/ea-cal-view.c:302
-msgid "Go to Today"
-msgstr "转到今天"
-
-#: ../a11y/calendar/ea-cal-view.c:303
-msgid "Go to Date"
-msgstr "转到日期"
-
-#: ../a11y/calendar/ea-day-view-main-item.c:301
-#: ../a11y/calendar/ea-week-view-main-item.c:298
-msgid "a table to view and select the current time range"
-msgstr "可查看并选择当前时间范围的表"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:147
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "有 %d 个事件。"
-
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../a11y/calendar/ea-day-view.c:152 ../a11y/calendar/ea-week-view.c:149
-msgid "It has no events."
-msgstr "无事件。"
-
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:159
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "工作日视图：%s。%s"
-
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../a11y/calendar/ea-day-view.c:165
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "日视图：%s。%s"
-
-#: ../a11y/calendar/ea-day-view.c:196
-msgid "calendar view for a work week"
-msgstr "工作日的日历视图"
-
-#: ../a11y/calendar/ea-day-view.c:198
-msgid "calendar view for one or more days"
-msgstr "一天或多天的日历视图"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:186
-#: ../calendar/gui/calendar-component.c:803
-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:189
-#: ../calendar/gui/calendar-component.c:806
-#: ../calendar/gui/e-day-view-top-item.c:855 ../calendar/gui/e-day-view.c:1601
-#: ../calendar/gui/e-week-view-main-item.c:335
-msgid "%a %d %b"
-msgstr "%-m月%-d日%A"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../a11y/calendar/ea-gnome-calendar.c:196
-#: ../a11y/calendar/ea-gnome-calendar.c:198
-#: ../calendar/gui/calendar-component.c:808
-#: ../calendar/gui/calendar-component.c:813
-#: ../calendar/gui/calendar-component.c:815
-msgid "%a %d %b %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:215
-#: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../a11y/calendar/ea-gnome-calendar.c:227
-#: ../a11y/calendar/ea-gnome-calendar.c:229
-#: ../calendar/gui/calendar-component.c:827
-#: ../calendar/gui/calendar-component.c:834
-#: ../calendar/gui/calendar-component.c:840
-#: ../calendar/gui/calendar-component.c:842
-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:219
-#: ../calendar/gui/calendar-component.c:832
-#: ../calendar/gui/e-day-view-top-item.c:859 ../calendar/gui/e-day-view.c:1617
-#: ../calendar/gui/e-week-view-main-item.c:349
-msgid "%d %b"
-msgstr "%B%-d日"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:245
-#: ../a11y/calendar/ea-gnome-calendar.c:253
-#: ../calendar/importers/icalendar-importer.c:780
-msgid "Gnome Calendar"
-msgstr "Gnome 日历"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:288
-msgid "search bar"
-msgstr "搜索栏"
-
-#: ../a11y/calendar/ea-gnome-calendar.c:289
-msgid "evolution calendar search bar"
-msgstr "Evolution 日历和搜索栏"
-
-#: ../a11y/calendar/ea-jump-button.c:147
-msgid "Jump button"
-msgstr "跳转按钮"
-
-#: ../a11y/calendar/ea-jump-button.c:156
-msgid "Click here, you can find more events."
-msgstr "单击此处可查找更多事件。"
-
-#: ../a11y/calendar/ea-week-view.c:154
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "月视图：%s。%s"
-
-#: ../a11y/calendar/ea-week-view.c:158
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "周视图：%s。%s"
-
-#: ../a11y/calendar/ea-week-view.c:189
-msgid "calendar view for a month"
-msgstr "月日历视图"
-
-#: ../a11y/calendar/ea-week-view.c:191
-msgid "calendar view for one or more weeks"
-msgstr "一周或多周的日历视图"
-
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:121
-msgid "popup"
-msgstr "弹出"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-popup.c:122
-msgid "popup a child"
-msgstr "弹出子对象"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:628
-msgid "edit"
-msgstr "编辑"
-
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:629
-msgid "begin editing this cell"
-msgstr "开始编辑此单元格"
-
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:172
-msgid "toggle"
-msgstr "切换"
-
-#. action name
-#: ../a11y/e-table/gal-a11y-e-cell-toggle.c:173
-msgid "toggle the cell"
-msgstr "切换单元格"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:208
-msgid "expand"
-msgstr "展开"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:209
-msgid "expands the row in the ETree containing this cell"
-msgstr "在包含此单元格的 ETree 中展开行"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:214
-msgid "collapse"
-msgstr "折叠"
-
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:215
-msgid "collapses the row in the ETree containing this cell"
-msgstr "在包含此单元格的 ETree 中折叠行"
-
-#: ../a11y/e-table/gal-a11y-e-cell.c:121
-msgid "Table Cell"
-msgstr "表格单元格"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:59
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:134
-#: ../widgets/table/e-table-click-to-add.c:580
-msgid "click to add"
-msgstr "单击可添加"
-
-#: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:68
-msgid "click"
-msgstr "单击"
-
-#: ../a11y/e-table/gal-a11y-e-table-column-header.c:152
-msgid "sort"
-msgstr "排序"
-
-#: ../a11y/widgets/ea-calendar-item.c:295
-#: ../a11y/widgets/ea-calendar-item.c:301
-msgid "%d %B %Y"
-msgstr "%Y年%-m月%-d日"
-
-#: ../a11y/widgets/ea-calendar-item.c:303
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "日历：从 %s 到 %s"
-
-#: ../a11y/widgets/ea-calendar-item.c:338
-msgid "evolution calendar item"
-msgstr "Evolution 日历项目"
-
-#: ../a11y/widgets/ea-combo-button.c:56
-msgid "Combo Button"
-msgstr "组合按钮"
-
-#: ../a11y/widgets/ea-combo-button.c:66
-msgid "Activate Default"
-msgstr "激活默认"
-
-#: ../a11y/widgets/ea-combo-button.c:68
-msgid "Popup Menu"
-msgstr "弹出菜单"
-
-#: ../a11y/widgets/ea-expander.c:40
-msgid "Toggle Attachment Bar"
-msgstr "切换附件栏"
-
-#: ../a11y/widgets/ea-expander.c:50
-msgid "activate"
-msgstr "激活"
-
 #. For Translators: {0} is the name of the address book source
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -382,10 +67,11 @@ msgid "Could not remove address book."
 msgstr "无法删除地址簿。"
 
 #: ../addressbook/addressbook.error.xml.h:11
+#, fuzzy
 msgid ""
-"Currently you can access only GroupWise System Address Book from Evolution. "
-"Please use some other GroupWise mail client once, to get your GroupWise "
-"Frequent Contacts and GroupWise Personal Contacts folders."
+"Currently you can only access the GroupWise System Address Book from "
+"Evolution. Please use some other GroupWise mail client once to get your "
+"GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr ""
 "目前您只能从 Evolution 中访问 GroupWise 系统地址簿。请使用其它 GroupWise 邮件"
 "客户程序获得 GroupWise 中您最常联系的联系人以及 GroupWise 个人联系人文件夹。"
@@ -408,7 +94,7 @@ msgstr "认证到 IMAP 服务器失败。"
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1745
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1022
 msgid "Failed to delete contact"
 msgstr "删除联系人失败"
 
@@ -421,7 +107,7 @@ msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 服务器无法响应有效的大纲信息。"
 
 #: ../addressbook/addressbook.error.xml.h:19
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:56
 msgid "Server Version"
 msgstr "服务器版本"
 
@@ -517,10 +203,10 @@ msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则 {0} 的联系人无法使用。"
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:513
-#: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:521
+#: ../plugins/groupwise-features/junk-settings.ui.h:4
+#: ../plugins/groupwise-features/properties.ui.h:10
+#: ../widgets/table/e-table-config.ui.h:18
 msgid "_Add"
 msgstr "添加(_A)"
 
@@ -542,7 +228,6 @@ msgstr "原样使用(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this address book was unable to parse this query."
 #: ../addressbook/addressbook.error.xml.h:44 ../mail/mail.error.xml.h:143
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0}"
 msgstr "{0}"
 
@@ -551,2052 +236,377 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:491
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "默认同步地址："
 
-#: ../addressbook/conduit/address-conduit.c:1521
-#: ../addressbook/conduit/address-conduit.c:1522
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "无法装入地址簿"
 
-#: ../addressbook/conduit/address-conduit.c:1599
-#: ../addressbook/conduit/address-conduit.c:1602
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#: ../addressbook/gui/component/autocompletion-config.c:173
-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:1213
-#: ../calendar/gui/calendar-component.c:307 ../calendar/gui/migration.c:396
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:582
-msgid "Contacts"
-msgstr "联系人"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Address Book"
-msgstr "Evolution 地址簿"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Address Book address popup"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Address Book address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Address Book card viewer"
-msgstr "Evolution 地址簿名片查看器"
-
-#: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Address Book 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 证书"
-
-#. create the local source group
-#. On This Computer is always first and Search Folders is always last
-#: ../addressbook/gui/component/addressbook-component.c:143
-#: ../addressbook/gui/component/addressbook-migrate.c:500
-#: ../calendar/gui/calendar-component.c:244
-#: ../calendar/gui/memos-component.c:199 ../calendar/gui/migration.c:475
-#: ../calendar/gui/migration.c:577 ../calendar/gui/migration.c:1091
-#: ../calendar/gui/tasks-component.c:195 ../mail/em-folder-tree-model.c:200
-#: ../mail/em-folder-tree-model.c:202 ../mail/em-migrate.c:2967
-#: ../mail/mail-component.c:316 ../mail/mail-vfolder.c:223
-#: ../mail/message-list.c:1516
-msgid "On This Computer"
-msgstr "在此计算机中"
-
-#. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. Create the default Person addressbook
-#. orange
-#: ../addressbook/gui/component/addressbook-component.c:151
-#: ../addressbook/gui/component/addressbook-migrate.c:508
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: ../addressbook/gui/widgets/eab-contact-display.c:652
-#: ../calendar/gui/calendar-component.c:255
-#: ../calendar/gui/memos-component.c:208 ../calendar/gui/migration.c:485
-#: ../calendar/gui/migration.c:585 ../calendar/gui/migration.c:1099
-#: ../calendar/gui/tasks-component.c:204 ../mail/em-migrate.c:1058
-msgid "Personal"
-msgstr "个人"
-
-#. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:162
-#: ../addressbook/gui/component/addressbook-migrate.c:518
-msgid "On LDAP Servers"
-msgstr "在 LDAP 服务器上"
-
-#: ../addressbook/gui/component/addressbook-component.c:229
-msgctxt "New"
-msgid "_Contact"
-msgstr "联系人(_C)"
-
-#: ../addressbook/gui/component/addressbook-component.c:230
-msgid "Create a new contact"
-msgstr "创建一个新联系人"
-
-#: ../addressbook/gui/component/addressbook-component.c:237
-msgctxt "New"
-msgid "Contact _List"
-msgstr "联系人列表(_L)"
-
-#: ../addressbook/gui/component/addressbook-component.c:238
-msgid "Create a new contact list"
-msgstr "创建一个新的联系人列表"
-
-#: ../addressbook/gui/component/addressbook-component.c:244
-#: ../addressbook/gui/component/addressbook-config.c:1223
-msgid "New Address Book"
-msgstr "新地址簿"
-
-#: ../addressbook/gui/component/addressbook-component.c:245
-msgctxt "New"
-msgid "Address _Book"
-msgstr "地址簿(_B)"
-
-#: ../addressbook/gui/component/addressbook-component.c:246
-msgid "Create a new address book"
-msgstr "创建新地址簿"
-
-#: ../addressbook/gui/component/addressbook-component.c:409
-msgid "Failed upgrading Address Book settings or folders."
-msgstr "升级地址簿设置或文件夹失败。"
-
-#: ../addressbook/gui/component/addressbook-config.c:332
-msgid "Base"
-msgstr "基础"
-
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:170
-msgid "_Type:"
-msgstr "类型(_T)："
-
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy _book content locally for offline operation"
-msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
-
-#: ../addressbook/gui/component/addressbook-config.c:998
-#: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
-#: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../calendar/gui/dialogs/calendar-setup.c:379
-#: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:283 ../mail/mail-config.glade.h:90
-#: ../plugins/itip-formatter/itip-formatter.c:2532
-#: ../smime/gui/smime-ui.glade.h:28
-msgid "General"
-msgstr "常规"
-
-#: ../addressbook/gui/component/addressbook-config.c:999
-#: ../addressbook/gui/widgets/e-addressbook-view.c:554
-#: ../mail/importers/pine-importer.c:383
-msgid "Address Book"
-msgstr "地址簿"
-
-#: ../addressbook/gui/component/addressbook-config.c:1003
-msgid "Server Information"
-msgstr "服务器信息"
-
-#: ../addressbook/gui/component/addressbook-config.c:1005
-msgid "Authentication"
-msgstr "身份验证"
-
-#: ../addressbook/gui/component/addressbook-config.c:1008
-#: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../smime/gui/smime-ui.glade.h:20
-msgid "Details"
-msgstr "细节"
-
-#: ../addressbook/gui/component/addressbook-config.c:1009
-#: ../mail/em-folder-browser.c:985
-msgid "Searching"
-msgstr "搜索"
-
-#: ../addressbook/gui/component/addressbook-config.c:1011
-msgid "Downloading"
-msgstr "下载"
-
-#: ../addressbook/gui/component/addressbook-config.c:1221
-#: ../addressbook/gui/component/ldap-config.glade.h:11
-msgid "Address Book Properties"
-msgstr "地址簿属性"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:74
-#: ../calendar/gui/migration.c:148 ../mail/em-migrate.c:1207
-msgid "Migrating..."
-msgstr "正在升迁..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:126
-#: ../calendar/gui/migration.c:195 ../mail/em-migrate.c:1247
-#, c-format
-msgid "Migrating '%s':"
-msgstr "升迁“%s”："
-
-#: ../addressbook/gui/component/addressbook-migrate.c:646
-msgid "LDAP Servers"
-msgstr "LDAP 服务器"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:761
-msgid "Autocompletion Settings"
-msgstr "自动补全设置"
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1137
-msgid ""
-"The location and hierarchy of the Evolution contact folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1151
-msgid ""
-"The format of mailing list contacts has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"邮件列表联系人的格式已经更改。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1160
-msgid ""
-"The way Evolution stores some phone numbers has changed.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 存储某些电话号码的方式已经更改。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#: ../addressbook/gui/component/addressbook-migrate.c:1170
-msgid ""
-"Evolution's Palm Sync changelog and map files have changed.\n"
-"\n"
-"Please be patient while Evolution migrates your Pilot Sync data..."
-msgstr ""
-"Evolution Palm 同步更新日志和地图文件已经更改。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
-
-#: ../addressbook/gui/component/addressbook-view.c:422
-#: ../mail/em-folder-utils.c:448
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "将“%s”文件夹重命名为："
-
-#: ../addressbook/gui/component/addressbook-view.c:425
-#: ../mail/em-folder-utils.c:450
-msgid "Rename Folder"
-msgstr "重命名文件夹"
-
-#: ../addressbook/gui/component/addressbook-view.c:430
-#: ../mail/em-folder-utils.c:456
-msgid "Folder names cannot contain '/'"
-msgstr "文件夹名不能含有字符“/”"
-
-#: ../addressbook/gui/component/addressbook-view.c:949
-msgid "_New Address Book"
-msgstr "新建地址簿(_N)"
-
-#: ../addressbook/gui/component/addressbook-view.c:950
-msgid "Save As vCard..."
-msgstr "另存为 vCard..."
-
-#: ../addressbook/gui/component/addressbook-view.c:951
-#: ../calendar/gui/calendar-component.c:660
-#: ../calendar/gui/memos-component.c:501 ../calendar/gui/tasks-component.c:492
-#: ../mail/em-folder-tree.c:2132 ../ui/evolution-mail-list.xml.h:39
-msgid "_Rename..."
-msgstr "重命名(_R)..."
-
-#: ../addressbook/gui/component/addressbook-view.c:954
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
-#: ../calendar/gui/calendar-component.c:663
-#: ../calendar/gui/e-calendar-table.c:1610
-#: ../calendar/gui/e-calendar-view.c:1797 ../calendar/gui/e-memo-table.c:940
-#: ../calendar/gui/memos-component.c:504 ../calendar/gui/tasks-component.c:495
-#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-view.c:1337
-#: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
-msgid "_Delete"
-msgstr "删除(_D)"
-
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../calendar/gui/calendar-component.c:668
-#: ../calendar/gui/dialogs/comp-editor.c:2084
-#: ../calendar/gui/memos-component.c:509 ../calendar/gui/tasks-component.c:500
-#: ../composer/e-msg-composer.c:1040 ../mail/em-folder-tree.c:2138
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
-msgid "_Properties"
-msgstr "属性(_P)"
-
-#: ../addressbook/gui/component/addressbook-view.c:1223
-msgid "Contact Source Selector"
-msgstr "联系人源选择器"
-
-#: ../addressbook/gui/component/addressbook.c:102
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名访问 LDAP 服务器"
-
-#: ../addressbook/gui/component/addressbook.c:207
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:535
-msgid "Failed to authenticate.\n"
-msgstr "认证失败。\n"
-
-#: ../addressbook/gui/component/addressbook.c:214
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:515
-#, c-format
-msgid "Enter password for %s (user %s)"
-msgstr "输入 %s 的密码(用户 %s)"
-
-#: ../addressbook/gui/component/addressbook.c:222
-#: ../calendar/common/authentication.c:51
-#: ../plugins/google-account-setup/google-source.c:441
-#: ../plugins/publish-calendar/publish-calendar.c:191
-#: ../smime/gui/component.c:49
-msgid "Enter password"
-msgstr "输入密码"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
-msgid "Autocomplete length"
-msgstr "自动补全长度"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
-msgid "EFolderList XML for the list of completion URIs"
-msgstr "补全 URI 列表的 EFolderList xml"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
-msgid "EFolderList XML for the list of completion URIs."
-msgstr "补全 URI 列表的 EFolderList xml。"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
-msgid ""
-"Position of the vertical pane, between the card and list views and the "
-"preview pane, in pixels."
-msgstr "卡片和列表视图及预览面板之间垂直面板的位置，以像素计。"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
-msgid "Show autocompleted name with an address"
-msgstr ""
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
-msgid "Show preview pane"
-msgstr "显示预览面板"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
-msgid ""
-"The number of characters that must be typed before Evolution will attempt to "
-"autocomplete."
-msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符。"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
-msgid "URI for the folder last used in the select names dialog"
-msgstr "选择名称对话框中上次使用的文件夹 URI"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
-msgid "URI for the folder last used in the select names dialog."
-msgstr "选择名称对话框中上次使用的文件夹 URI。"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
-msgid "Vertical pane position"
-msgstr "垂直面板的位置"
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:11
-msgid ""
-"Whether force showing the mail address with the name of the autocompleted "
-"contact in the entry."
-msgstr ""
-
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:12
-msgid "Whether to show the preview pane."
-msgstr "是否显示预览面板。"
-
-#: ../addressbook/gui/component/autocompletion-config.c:175
-msgid "Always _show address of the autocompleted contact"
-msgstr "总是显示自动补全的联系人的地址(_S)"
-
-#: ../addressbook/gui/component/autocompletion-config.c:180
-msgid "Look up in address books"
-msgstr "在地址簿中查阅"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:1
-msgid "1"
-msgstr "1"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:2
-msgid "3268"
-msgstr "3268"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:3
-msgid "389"
-msgstr "389"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:4
-msgid "5"
-msgstr "5"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:5
-msgid "636"
-msgstr "636"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:6
-msgid "<b>Authentication</b>"
-msgstr "<b>身份验证</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:7
-msgid "<b>Downloading</b>"
-msgstr "<b>下载</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:8
-msgid "<b>Searching</b>"
-msgstr "<b>搜索</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:9
-msgid "<b>Type:</b>"
-msgstr "<b>类型：</b>"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:10
-msgid "Add Address Book"
-msgstr "添加地址簿"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:12
-#: ../mail/em-account-editor.c:760
-msgid "Always"
-msgstr "总是"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:13
-msgid "Anonymously"
-msgstr "匿名"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../addressbook/gui/component/ldap-config.glade.h:15
-msgid "B_rowse this book until limit reached"
-msgstr "浏览此地址簿直到达到极限(_R)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:16
-msgid "Basic"
-msgstr "基本"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:18
-msgid "Distinguished name"
-msgstr "识别性名称"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:19
-msgid "Email address"
-msgstr "电子邮件地址"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid ""
-"Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:21
-msgid "Find Possible Search Bases"
-msgstr "查找可能的搜索基础"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:23
-msgid "Lo_gin:"
-msgstr "登录(_G)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:759
-msgid "Never"
-msgstr "从不"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. It will not use an encrypted connection.
-#: ../addressbook/gui/component/ldap-config.glade.h:25
-#: ../mail/em-account-editor.c:287
-msgid "No encryption"
-msgstr "不加密"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:26
-msgid "One"
-msgstr "一次"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
-#. abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:27
-#: ../mail/em-account-editor.c:295
-msgid "SSL encryption"
-msgstr "SSL 加密"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:28
-msgid "Search Filter"
-msgstr "搜索过滤器"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:29
-msgid "Search _base:"
-msgstr "搜索基础(_B)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:30
-msgid "Search _filter:"
-msgstr "搜索过滤器(_F)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Search filter"
-msgstr "搜索过滤器"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid ""
-"Search filter is the type of the objects searched for, while performing the "
-"search. If this is not modified, by  default search will be performed on "
-"objectclass of the type \"person\"."
-msgstr ""
-"搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话，默认情况下搜索"
-"将会在“个人”类型的对象类型。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:33
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports SSL."
-msgstr ""
-"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 SSL 时才连接到您的 LDAP "
-"服务器。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:34
-msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP "
-"server if your LDAP server supports TLS."
-msgstr ""
-"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 TLS 时才连接到您的 LDAP "
-"服务器。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:35
-msgid ""
-"Selecting this option means that your server does not support either SSL or "
-"TLS. This means that your connection will be insecure, and that you will be "
-"vulnerable to security exploits."
-msgstr ""
-"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
-"接不太安全，您也易于受到安全漏洞的攻击。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:36
-msgid "Sub"
-msgstr "子"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "Supported Search Bases"
-msgstr "支持的搜索起点"
-
-#. Translators: This string is a "Use secure connection" option for
-#. the Mailer. TLS (Transport Layer Security) is commonly known by
-#. this abbreviation.
-#: ../addressbook/gui/component/ldap-config.glade.h:38
-#: ../mail/em-account-editor.c:291
-msgid "TLS encryption"
-msgstr "TLS 加密"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid ""
-"The search base is the distinguished name (DN) of the entry where your "
-"searches will begin. If you leave this blank, the search will begin at the "
-"root of the directory tree."
-msgstr ""
-"搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空，搜索将从目录树的根"
-"开始。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:40
-msgid ""
-"The search scope defines how deep you would like the search to extend down "
-"the directory tree. A search scope of \"sub\" will include all entries below "
-"your search base. A search scope of \"one\" will only include the entries "
-"one level beneath your base."
-msgstr ""
-"搜索范围定义了您想要在目录树中搜索多深。搜索范围若为“子级”，则将包含您指定的"
-"搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜索基础之下一"
-"级的项目。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid ""
-"This is the full name of your LDAP server. For example, \"ldap.mycompany.com"
-"\"."
-msgstr "这是您的 LDAP 服务器的完整名字。例如，“ldap.mycompany.com”。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:42
-msgid ""
-"This is the maximum number of entries to download. Setting this number to be "
-"too large will slow down your address book."
-msgstr "这是可下载条目的最大数量。将此数值设定得太大将导致地址簿变慢。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:43
-msgid ""
-"This is the method Evolution will use to authenticate you.  Note that "
-"setting this to \"Email Address\" requires anonymous access to your LDAP "
-"server."
-msgstr ""
-"这是 Evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
-"对 LDAP 服务器的匿名访问权限。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:44
-msgid ""
-"This is the name for this server that will appear in your Evolution folder "
-"list. It is for display purposes only. "
-msgstr "这是此服务器在 Evolution 文件夹列表中显示的名称。它只用于显示。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:45
-msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A "
-"list of standard ports has been provided. Ask your system administrator what "
-"port you should specify."
-msgstr ""
-"这是 LDAP 服务器上的端口，Evolution 将试图连接到您所给出的标准端口列表。如果"
-"您不清楚要指定的端口，请询问您的系统管理员。"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:46
-msgid "Using distinguished name (DN)"
-msgstr "使用已识别的姓名(DN)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:47
-msgid "Using email address"
-msgstr "使用电子邮件地址"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:48
-msgid "Whenever Possible"
-msgstr "可能时"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:49
-msgid "_Add Address Book"
-msgstr "添加地址簿(_A)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:50
-msgid "_Download limit:"
-msgstr "下载限制(_D)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:51
-msgid "_Find Possible Search Bases"
-msgstr "查找可能的搜索基础(_F)"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:52
-msgid "_Login method:"
-msgstr "登录方式(_L)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:227
-#: ../mail/mail-config.glade.h:178
-#: ../plugins/groupwise-features/properties.glade.h:11
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
-msgid "_Name:"
-msgstr "名称(_N)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:54
-msgid "_Port:"
-msgstr "端口(_P)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:55
-msgid "_Search scope:"
-msgstr "搜索范围(_S)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:56
-#: ../mail/mail-config.glade.h:187
-#: ../plugins/publish-calendar/publish-calendar.glade.h:26
-msgid "_Server:"
-msgstr "服务器(_S)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:57
-msgid "_Timeout:"
-msgstr "超时(_T)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:58
-msgid "_Use secure connection:"
-msgstr "使用安全连接(_U)："
-
-#: ../addressbook/gui/component/ldap-config.glade.h:59
-msgid "cards"
-msgstr "名片"
-
-#: ../addressbook/gui/component/ldap-config.glade.h:60
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:9
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
-#: ../plugins/caldav/caldav-source.c:430
-#: ../plugins/calendar-http/calendar-http.c:279
-#: ../plugins/calendar-weather/calendar-weather.c:524
-#: ../plugins/google-account-setup/google-source.c:671
-#: ../plugins/google-account-setup/google-contacts-source.c:338
-msgid "minutes"
-msgstr "分钟"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
-msgid "<b>Email</b>"
-msgstr "<b>电子邮件</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
-msgid "<b>Home</b>"
-msgstr "<b>家庭</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
-msgid "<b>Instant Messaging</b>"
-msgstr "<b>即时通讯</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:4
-msgid "<b>Job</b>"
-msgstr "<b>职位</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>杂项</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:6
-msgid "<b>Other</b>"
-msgstr "<b>其它</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:7
-msgid "<b>Telephone</b>"
-msgstr "<b>电话</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
-msgid "<b>Web Addresses</b>"
-msgstr "<b>Web 地址</b>"
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
-msgid "<b>Work</b>"
-msgstr "<b>工作</b>"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-display.c:583
+#: ../calendar/gui/e-calendar-view.c:1834
+msgid "Anniversary"
+msgstr "纪念日"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:605
-msgid "AIM"
-msgstr "AIM"
+#. XXX Allow the category icons to be referenced as named
+#. *     icons, since GtkAction does not support GdkPixbufs.
+#. Get the icon file for some default category.  Doesn't matter
+#. * which, so long as it has an icon.  We're just interested in
+#. * the directory components.
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-display.c:582
+#: ../calendar/gui/e-calendar-view.c:1833 ../shell/main.c:113
+msgid "Birthday"
+msgstr "生日"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:7
+#: ../calendar/gui/dialogs/memo-page.ui.h:1
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1158
-#: ../addressbook/gui/widgets/e-minicard.c:199
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:4
+msgid "Calendar:"
+msgstr "日历："
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:311
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1265
+#: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "联系人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:543
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:558
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:591
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2497
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:7
+#: ../addressbook/gui/merging/eab-contact-merging.c:285
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:517
+#: ../addressbook/gui/widgets/eab-contact-display.c:525
+#: ../addressbook/gui/widgets/eab-contact-display.c:811
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:808
+msgid "Email"
+msgstr "电子邮件"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
+msgid "Free/Busy:"
+msgstr "闲/忙："
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
-#: ../composer/e-msg-composer.c:2473
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:70
+msgid "Home"
+msgstr "家庭"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "Home Page:"
+msgstr "主页："
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Image"
 msgstr "图像"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:58
-msgid "MSN Messenger"
-msgstr "MSN Messenger"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+msgid "Instant Messaging"
+msgstr "即时通讯"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+msgid "Job"
+msgstr "工作"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 msgid "Mailing Address"
 msgstr "邮政地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+msgid "Miscellaneous"
+msgstr "杂项"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "Nic_kname:"
 msgstr "昵称(_K)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:54
-msgid "Novell GroupWise"
-msgstr "Novell GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../modules/calendar/e-memo-shell-migrate.c:250
+#: ../plugins/groupwise-features/camel-gw-listener.c:422
+#: ../plugins/groupwise-features/camel-gw-listener.c:452
+#: ../plugins/groupwise-features/camel-gw-listener.c:567
+msgid "Notes"
+msgstr "笔记"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-msgid "Novell Groupwise"
-msgstr "Novell Groupwise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:71
+#: ../addressbook/gui/widgets/eab-contact-display.c:460
+#: ../calendar/gui/e-calendar-view.c:1542
+msgid "Other"
+msgstr "其它"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Telephone"
 msgstr "电话"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
+msgid "Video Chat:"
+msgstr "视频聊天："
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+msgid "Web Addresses"
+msgstr "网络地址"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
+msgid "Web Log:"
+msgstr "网络日志："
+
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:268
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:635
-#: ../mail/em-migrate.c:1057
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:69
+#: ../addressbook/gui/widgets/eab-contact-display.c:569
+#: ../modules/mail/e-mail-shell-migrate.c:957
 msgid "Work"
 msgstr "工作"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
 msgid "_Address:"
 msgstr "地址(_A)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
 msgid "_Anniversary:"
 msgstr "周年(_A)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:28
 msgid "_Assistant:"
 msgstr "助手(_A)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:29
 msgid "_Birthday:"
 msgstr "生日(_B)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../calendar/gui/dialogs/event-page.c:792
-#: ../calendar/gui/dialogs/event-page.glade.h:14
-#: ../plugins/itip-formatter/itip-view.c:1893
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+#: ../calendar/gui/dialogs/event-page.c:823
+#: ../calendar/gui/dialogs/event-page.ui.h:15
+#: ../plugins/itip-formatter/itip-view.c:1928
 msgid "_Calendar:"
 msgstr "日历(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_City:"
 msgstr "城市(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Company:"
 msgstr "公司(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "_Country:"
 msgstr "国家/地区(_C)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Department:"
 msgstr "部门(_D)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:35
 msgid "_File under:"
 msgstr "存档为(_F)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:36
 msgid "_Free/Busy:"
 msgstr "忙/闲(_F)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
 msgid "_Home Page:"
 msgstr "主页(_H)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 msgid "_Manager:"
 msgstr "经理(_M)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
-msgid "_Notes:"
-msgstr "注释(_N)："
-
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:39
 msgid "_Office:"
 msgstr "办公室(_O)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:6
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:40
 msgid "_PO Box:"
 msgstr "邮政邮箱(_P)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:41
 msgid "_Profession:"
 msgstr "职业(_P)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:42
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:42
 msgid "_Spouse:"
 msgstr "配偶(_S)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:43
 msgid "_State/Province:"
 msgstr "州/省(_S)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
-#: ../addressbook/gui/contact-editor/fullname.glade.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:44
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Title:"
 msgstr "头衔(_T):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:45
 msgid "_Video Chat:"
 msgstr "视频聊天(_V)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
 msgid "_Wants to receive HTML mail"
 msgstr "愿意接收 HTML 邮件(_W)"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 msgid "_Web Log:"
 msgstr "_Web 日志："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:7
 msgid "_Where:"
 msgstr "何处(_W)："
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:49
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 msgid "_Zip/Postal Code:"
 msgstr "邮政编码(_Z)："
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:91
-#: ../addressbook/gui/widgets/eab-contact-display.c:632
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-msgid "Address"
-msgstr "地址"
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
+#: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/menus/gal-define-views-dialog.c:338
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
+#: ../widgets/menus/gal-view-new-dialog.c:61
+msgid "Name"
+msgstr "姓名"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:98
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:91
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:173
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1178
-#: ../addressbook/gui/widgets/e-addressbook-model.c:325
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:419
-#: ../addressbook/gui/widgets/e-minicard-label.c:165
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:131
-#: ../addressbook/gui/widgets/e-minicard-view.c:545
-#: ../addressbook/gui/widgets/e-minicard.c:192
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:339
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1285
+#: ../addressbook/gui/widgets/e-addressbook-model.c:523
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
+#: ../addressbook/gui/widgets/e-minicard-label.c:164
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:133
+#: ../addressbook/gui/widgets/e-minicard-view.c:541
+#: ../addressbook/gui/widgets/e-minicard.c:191
 #: ../widgets/menus/gal-define-views-model.c:178
-#: ../widgets/table/e-cell-text.c:1822 ../widgets/text/e-text.c:3688
-#: ../widgets/text/e-text.c:3689
+#: ../widgets/table/e-cell-text.c:1829 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3675
 msgid "Editable"
 msgstr "可编辑"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:131
-msgid "United States"
-msgstr "美国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:132
-msgid "Afghanistan"
-msgstr "阿富汗"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:133
-msgid "Albania"
-msgstr "阿尔巴尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:134
-msgid "Algeria"
-msgstr "阿尔及利亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:135
-msgid "American Samoa"
-msgstr "美洲萨摩亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:136
-msgid "Andorra"
-msgstr "安道尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:137
-msgid "Angola"
-msgstr "安哥拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:138
-msgid "Anguilla"
-msgstr "安圭拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:139
-msgid "Antarctica"
-msgstr "南极洲"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:140
-msgid "Antigua And Barbuda"
-msgstr "安提瓜和巴布达"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:141
-msgid "Argentina"
-msgstr "阿根廷"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:142
-msgid "Armenia"
-msgstr "亚美尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:143
-msgid "Aruba"
-msgstr "阿鲁巴岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:144
-msgid "Australia"
-msgstr "澳大利亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:145
-msgid "Austria"
-msgstr "奥地利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
-msgid "Azerbaijan"
-msgstr "阿塞拜疆"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
-msgid "Bahamas"
-msgstr "巴哈马群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:148
-msgid "Bahrain"
-msgstr "巴林岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:149
-msgid "Bangladesh"
-msgstr "孟加拉国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:150
-msgid "Barbados"
-msgstr "巴巴多斯岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:151
-msgid "Belarus"
-msgstr "白俄罗斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
-msgid "Belgium"
-msgstr "比利时"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
-msgid "Belize"
-msgstr "伯利兹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:154
-msgid "Benin"
-msgstr "贝宁"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:155
-msgid "Bermuda"
-msgstr "百慕大群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
-msgid "Bhutan"
-msgstr "不丹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
-msgid "Bolivia"
-msgstr "玻利维亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:158
-msgid "Bosnia And Herzegowina"
-msgstr "波斯尼亚和黑赛哥维纳"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
-msgid "Botswana"
-msgstr "博茨瓦纳"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
-msgid "Bouvet Island"
-msgstr "布维岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
-msgid "Brazil"
-msgstr "巴西"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:162
-msgid "British Indian Ocean Territory"
-msgstr "英属印度洋地区"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:163
-msgid "Brunei Darussalam"
-msgstr "文莱德鲁萨兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:164
-msgid "Bulgaria"
-msgstr "保加利亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
-msgid "Burkina Faso"
-msgstr "布基纳法索"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
-msgid "Burundi"
-msgstr "布隆迪"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:167
-msgid "Cambodia"
-msgstr "柬埔寨"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:168
-msgid "Cameroon"
-msgstr "喀麦隆"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:169
-msgid "Canada"
-msgstr "加拿大"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:170
-msgid "Cape Verde"
-msgstr "佛得角"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
-msgid "Cayman Islands"
-msgstr "开曼群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
-msgid "Central African Republic"
-msgstr "中非共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
-msgid "Chad"
-msgstr "乍得"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:174
-msgid "Chile"
-msgstr "智利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:175
-msgid "China"
-msgstr "中国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
-msgid "Christmas Island"
-msgstr "圣诞岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
-msgid "Cocos (Keeling) Islands"
-msgstr "科科斯群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
-msgid "Colombia"
-msgstr "哥伦比亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
-msgid "Comoros"
-msgstr "科摩罗群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
-msgid "Congo"
-msgstr "刚果"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:181
-msgid "Congo, The Democratic Republic Of The"
-msgstr "刚果人民民主共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:182
-msgid "Cook Islands"
-msgstr "库克群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
-msgid "Costa Rica"
-msgstr "哥斯达黎加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
-msgid "Cote d'Ivoire"
-msgstr "科特迪瓦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
-msgid "Croatia"
-msgstr "克罗地亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
-msgid "Cuba"
-msgstr "古巴"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:187
-msgid "Cyprus"
-msgstr "塞浦路斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
-msgid "Czech Republic"
-msgstr "捷克共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
-msgid "Denmark"
-msgstr "丹麦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:190
-msgid "Djibouti"
-msgstr "吉布提群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:191
-msgid "Dominica"
-msgstr "多米尼加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:192
-msgid "Dominican Republic"
-msgstr "多米尼加共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:193
-msgid "Ecuador"
-msgstr "厄瓜多尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:194
-msgid "Egypt"
-msgstr "埃及"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:195
-msgid "El Salvador"
-msgstr "萨尔瓦多"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
-msgid "Equatorial Guinea"
-msgstr "赤道几内亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
-msgid "Eritrea"
-msgstr "厄立特里亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:198
-msgid "Estonia"
-msgstr "爱沙尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:199
-msgid "Ethiopia"
-msgstr "埃塞俄比亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:200
-msgid "Falkland Islands"
-msgstr "福克兰群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:201
-msgid "Faroe Islands"
-msgstr "法罗群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
-msgid "Fiji"
-msgstr "斐济"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
-msgid "Finland"
-msgstr "芬兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
-msgid "France"
-msgstr "法国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
-msgid "French Guiana"
-msgstr "法属圭亚那"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
-msgid "French Polynesia"
-msgstr "法属波利尼西亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
-msgid "French Southern Territories"
-msgstr "法属南部地区"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
-msgid "Gabon"
-msgstr "加蓬"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
-msgid "Gambia"
-msgstr "冈比亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:210
-msgid "Georgia"
-msgstr "格鲁吉亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:211
-msgid "Germany"
-msgstr "德国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
-msgid "Ghana"
-msgstr "加纳"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
-msgid "Gibraltar"
-msgstr "直布罗陀"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
-msgid "Greece"
-msgstr "希腊"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
-msgid "Greenland"
-msgstr "格陵兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
-msgid "Grenada"
-msgstr "格林纳达"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:217
-msgid "Guadeloupe"
-msgstr "瓜德罗普岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
-msgid "Guam"
-msgstr "关岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
-msgid "Guatemala"
-msgstr "危地马拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:220
-msgid "Guernsey"
-msgstr "格恩西岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:221
-msgid "Guinea"
-msgstr "几内亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
-msgid "Guinea-Bissau"
-msgstr "几内亚比绍"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
-msgid "Guyana"
-msgstr "圭亚那"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:224
-msgid "Haiti"
-msgstr "海地"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:225
-msgid "Heard And McDonald Islands"
-msgstr "赫德和麦克唐纳群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:226
-msgid "Holy See"
-msgstr "圣座"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
-msgid "Honduras"
-msgstr "洪都拉斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
-msgid "Hong Kong"
-msgstr "中国香港特别行政区"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
-msgid "Hungary"
-msgstr "匈牙利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
-msgid "Iceland"
-msgstr "冰岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
-msgid "India"
-msgstr "印度"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
-msgid "Indonesia"
-msgstr "印度尼西亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
-msgid "Iran"
-msgstr "伊朗"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:234
-msgid "Iraq"
-msgstr "伊拉克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:235
-msgid "Ireland"
-msgstr "爱尔兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:236
-msgid "Isle of Man"
-msgstr "Isle of Man"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:237
-msgid "Israel"
-msgstr "以色列"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:238
-msgid "Italy"
-msgstr "意大利"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:239
-msgid "Jamaica"
-msgstr "牙买加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:240
-msgid "Japan"
-msgstr "日本"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:241
-msgid "Jersey"
-msgstr "杰尔西"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
-msgid "Jordan"
-msgstr "约旦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
-msgid "Kazakhstan"
-msgstr "哈萨克斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:244
-msgid "Kenya"
-msgstr "肯尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:245
-msgid "Kiribati"
-msgstr "基里巴斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:246
-msgid "Korea, Democratic People's Republic Of"
-msgstr "韩国人民民主共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:247
-msgid "Korea, Republic Of"
-msgstr "韩国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:248
-msgid "Kuwait"
-msgstr "科威特"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:249
-msgid "Kyrgyzstan"
-msgstr "吉尔吉斯斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
-msgid "Laos"
-msgstr "老挝"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
-msgid "Latvia"
-msgstr "拉脱维亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
-msgid "Lebanon"
-msgstr "黎巴嫩"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:253
-msgid "Lesotho"
-msgstr "莱索托"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:254
-msgid "Liberia"
-msgstr "利比里亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:255
-msgid "Libya"
-msgstr "利比亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:256
-msgid "Liechtenstein"
-msgstr "列支敦士登"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:257
-msgid "Lithuania"
-msgstr "立陶宛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:258
-msgid "Luxembourg"
-msgstr "卢森堡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
-msgid "Macao"
-msgstr "中国澳门特别行政区"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
-msgid "Macedonia"
-msgstr "马其顿"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
-msgid "Madagascar"
-msgstr "马达加斯加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
-msgid "Malawi"
-msgstr "马拉维"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
-msgid "Malaysia"
-msgstr "马来西亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:264
-msgid "Maldives"
-msgstr "马尔代夫"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:265
-msgid "Mali"
-msgstr "马里"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:266
-msgid "Malta"
-msgstr "马耳他"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:267
-msgid "Marshall Islands"
-msgstr "马绍尔群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
-msgid "Martinique"
-msgstr "马提尼可岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
-msgid "Mauritania"
-msgstr "毛里塔尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:270
-msgid "Mauritius"
-msgstr "毛里求斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
-msgid "Mayotte"
-msgstr "马约特岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
-msgid "Mexico"
-msgstr "墨西哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
-msgid "Micronesia"
-msgstr "密克罗尼西亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
-msgid "Moldova, Republic Of"
-msgstr "摩尔多瓦共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
-msgid "Monaco"
-msgstr "摩纳哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
-msgid "Mongolia"
-msgstr "蒙古"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
-msgid "Montserrat"
-msgstr "蒙特塞拉特群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:278
-msgid "Morocco"
-msgstr "摩洛哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:279
-msgid "Mozambique"
-msgstr "莫桑比克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:280
-msgid "Myanmar"
-msgstr "缅甸"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
-msgid "Namibia"
-msgstr "纳米比亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:282
-msgid "Nauru"
-msgstr "瑙鲁"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:283
-msgid "Nepal"
-msgstr "尼泊尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:284
-msgid "Netherlands"
-msgstr "荷兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:285
-msgid "Netherlands Antilles"
-msgstr "荷属安的列斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:286
-msgid "New Caledonia"
-msgstr "新喀里多尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:287
-msgid "New Zealand"
-msgstr "新西兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
-msgid "Nicaragua"
-msgstr "尼加拉瓜"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
-msgid "Niger"
-msgstr "尼日尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:290
-msgid "Nigeria"
-msgstr "尼日利亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
-msgid "Niue"
-msgstr "纽埃岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
-msgid "Norfolk Island"
-msgstr "诺福克岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
-msgid "Northern Mariana Islands"
-msgstr "北马里亚那群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
-msgid "Norway"
-msgstr "挪威"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
-msgid "Oman"
-msgstr "阿曼"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
-msgid "Pakistan"
-msgstr "巴基斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
-msgid "Palau"
-msgstr "帕劳群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
-msgid "Palestinian Territory"
-msgstr "巴勒斯坦地区"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
-msgid "Panama"
-msgstr "巴拿马"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
-msgid "Papua New Guinea"
-msgstr "巴布亚新几内亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:301
-msgid "Paraguay"
-msgstr "巴拉圭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:302
-msgid "Peru"
-msgstr "秘鲁"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
-msgid "Philippines"
-msgstr "菲利宾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
-msgid "Pitcairn"
-msgstr "皮特克恩岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
-msgid "Poland"
-msgstr "波兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
-msgid "Portugal"
-msgstr "葡萄牙"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
-msgid "Puerto Rico"
-msgstr "波多黎各"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
-msgid "Qatar"
-msgstr "卡塔尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:309
-msgid "Reunion"
-msgstr "留尼汪"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
-msgid "Romania"
-msgstr "罗马尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:311
-msgid "Russian Federation"
-msgstr "俄罗斯联邦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:312
-msgid "Rwanda"
-msgstr "卢旺达"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:313
-msgid "Saint Kitts And Nevis"
-msgstr "圣基德和吉维斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
-msgid "Saint Lucia"
-msgstr "圣卢西亚岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
-msgid "Saint Vincent And The Grenadines"
-msgstr "圣文森特和格林纳达"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:316
-msgid "Samoa"
-msgstr "萨摩亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:317
-msgid "San Marino"
-msgstr "圣马力诺"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:318
-msgid "Sao Tome And Principe"
-msgstr "圣多美和普林西比"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
-msgid "Saudi Arabia"
-msgstr "沙特阿拉伯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
-msgid "Senegal"
-msgstr "塞内加尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
-msgid "Serbia And Montenegro"
-msgstr "塞尔维亚和黑山"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
-msgid "Seychelles"
-msgstr "塞舌尔"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
-msgid "Sierra Leone"
-msgstr "塞拉利昂"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
-msgid "Singapore"
-msgstr "新加坡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
-msgid "Slovakia"
-msgstr "斯洛伐克"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:326
-msgid "Slovenia"
-msgstr "斯洛文尼亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:327
-msgid "Solomon Islands"
-msgstr "所罗门群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
-msgid "Somalia"
-msgstr "索马里"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
-msgid "South Africa"
-msgstr "南非"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
-msgid "South Georgia And The South Sandwich Islands"
-msgstr "南乔治亚和南三文治群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:331
-msgid "Spain"
-msgstr "西班牙"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:332
-msgid "Sri Lanka"
-msgstr "斯里兰卡"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
-msgid "St. Helena"
-msgstr "圣赫勒拿岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
-msgid "St. Pierre And Miquelon"
-msgstr "圣皮埃尔和麦克伦群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
-msgid "Sudan"
-msgstr "苏丹"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
-msgid "Suriname"
-msgstr "苏里南"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
-msgid "Svalbard And Jan Mayen Islands"
-msgstr "斯瓦巴和尖棉群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:338
-msgid "Swaziland"
-msgstr "斯威士兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:339
-msgid "Sweden"
-msgstr "瑞典"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
-msgid "Switzerland"
-msgstr "瑞士"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
-msgid "Syria"
-msgstr "叙利亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
-msgid "Taiwan"
-msgstr "中国台湾"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
-msgid "Tajikistan"
-msgstr "塔吉克斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
-msgid "Tanzania, United Republic Of"
-msgstr "坦桑尼亚联邦共和国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
-msgid "Thailand"
-msgstr "泰国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:346
-msgid "Timor-Leste"
-msgstr "东帝汶"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:347
-msgid "Togo"
-msgstr "多哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:348
-msgid "Tokelau"
-msgstr "托克劳群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
-msgid "Tonga"
-msgstr "汤加"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
-msgid "Trinidad And Tobago"
-msgstr "特里尼达和多巴哥"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:351
-msgid "Tunisia"
-msgstr "突尼斯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:352
-msgid "Turkey"
-msgstr "土耳其"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:353
-msgid "Turkmenistan"
-msgstr "土库曼斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
-msgid "Turks And Caicos Islands"
-msgstr "特克斯和凯科斯群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
-msgid "Tuvalu"
-msgstr "图瓦卢"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
-msgid "Uganda"
-msgstr "乌干达"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
-msgid "Ukraine"
-msgstr "乌克兰"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
-msgid "United Arab Emirates"
-msgstr "阿拉伯联合酋长国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:359
-msgid "United Kingdom"
-msgstr "英国"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
-msgid "United States Minor Outlying Islands"
-msgstr "美国小型外岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
-msgid "Uruguay"
-msgstr "乌拉圭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
-msgid "Uzbekistan"
-msgstr "乌兹别克斯坦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:363
-msgid "Vanuatu"
-msgstr "努瓦阿图"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
-msgid "Venezuela"
-msgstr "委内瑞拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
-msgid "Viet Nam"
-msgstr "越南"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
-msgid "Virgin Islands, British"
-msgstr "英属处女群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
-msgid "Virgin Islands, U.S."
-msgstr "美属处女群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:368
-msgid "Wallis And Futuna Islands"
-msgstr "瓦利斯和富图纳群岛"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
-msgid "Western Sahara"
-msgstr "西撒哈拉"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
-msgid "Yemen"
-msgstr "也门"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:371
-msgid "Zambia"
-msgstr "赞比亚"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
-msgid "Zimbabwe"
-msgstr "津巴布韦"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:85
-#: ../mail/em-mailer-prefs.c:467
-#: ../plugins/exchange-operations/exchange-delegates.c:954
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:711
-#: ../plugins/plugin-manager/plugin-manager.c:57
-#: ../plugins/save-attachments/save-attachments.c:351
-#: ../widgets/menus/gal-define-views-dialog.c:346
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:63
-msgid "Name"
-msgstr "姓名"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:53
-msgid "AOL Instant Messenger"
-msgstr "AOL 即时通讯程序"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-display.c:539
+msgid "AIM"
+msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:55
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:608
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:56
-msgid "Yahoo Messenger"
-msgstr "雅虎通"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:57
-msgid "Gadu-Gadu Messenger"
-msgstr "Gadu-Gadu 即时通讯"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:59
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:607
-msgid "ICQ"
-msgstr "ICQ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:60
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:612
-msgid "Skype"
-msgstr "Skype"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:150
-msgid "Service"
-msgstr "服务"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:159
-#: ../calendar/gui/caltypes.xml.h:12
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:694
-#: ../plugins/save-calendar/csv-format.c:376
-msgid "Location"
-msgstr "位置"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:166
-msgid "Username"
-msgstr "用户名"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:264
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:58
-msgid "Home"
-msgstr "家庭"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor-im.c:272
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:59
-#: ../addressbook/gui/widgets/eab-contact-display.c:519
-#: ../calendar/gui/e-calendar-view.c:2259
-msgid "Other"
-msgstr "其它"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:610
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:611
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-display.c:541
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:252
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-display.c:546
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:369
+msgid "Error adding contact"
+msgstr "添加联系人出错"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:224
+msgid "Error modifying contact"
+msgstr "修改联系人出错"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:238
+msgid "Error removing contact"
+msgstr "删除联系人出错"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
 msgid "Source Book"
 msgstr "来源地址簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:304
 msgid "Target Book"
 msgstr "目标地址簿"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:325
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:332
 msgid "Required Fields"
 msgstr "必需域"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:346
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2492
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2814
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2815
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3089
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3163
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2604,255 +614,209 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3093
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3100
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3174
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3115
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3126
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3200
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3141
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3214
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:324
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:327
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:401
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:412
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "电子邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:423
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "选择地址簿(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact list (%s)?"
-msgstr "您确定要删除联系人列表(%s)吗？"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
-msgid ""
-"Are you sure you want\n"
-"to delete these contact lists?"
-msgstr "您确定要删除这些联系人列表吗？"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
-#, c-format
-msgid ""
-"Are you sure you want\n"
-"to delete contact (%s)?"
-msgstr "您确定要删除联系人(%s)吗？"
-
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "您确定要删除这些联系人吗？"
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:1
-msgid "Address _2:"
-msgstr "地址 _2："
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:2
-msgid "Ci_ty:"
-msgstr "城市(_T)："
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:3
-msgid "Countr_y:"
-msgstr "国家/地区(_Y)："
-
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
-msgid "Full Address"
-msgstr "完整地址"
+#: ../addressbook/gui/contact-editor/eab-editor.c:167
+#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:355
+#, fuzzy
+msgid "Shell"
+msgstr "塞舌尔"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
-msgid "_ZIP Code:"
-msgstr "邮政编码(_Z)："
+#: ../addressbook/gui/contact-editor/eab-editor.c:168
+#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:356
+msgid "The EShell singleton"
+msgstr ""
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:1
+#: ../addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Dr."
 msgstr "博士"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:2
+#: ../addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Esq."
 msgstr "先生"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:3
+#: ../addressbook/gui/contact-editor/fullname.ui.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "全名"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:4
+#: ../addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "I"
 msgstr "I"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:5
+#: ../addressbook/gui/contact-editor/fullname.ui.h:5
 msgid "II"
 msgstr "II"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:6
+#: ../addressbook/gui/contact-editor/fullname.ui.h:6
 msgid "III"
 msgstr "III"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:7
+#: ../addressbook/gui/contact-editor/fullname.ui.h:7
 msgid "Jr."
 msgstr "晚辈"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:8
+#: ../addressbook/gui/contact-editor/fullname.ui.h:8
 msgid "Miss"
 msgstr "小姐"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:9
+#: ../addressbook/gui/contact-editor/fullname.ui.h:9
 msgid "Mr."
 msgstr "先生"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:10
+#: ../addressbook/gui/contact-editor/fullname.ui.h:10
 msgid "Mrs."
 msgstr "夫人"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:11
+#: ../addressbook/gui/contact-editor/fullname.ui.h:11
 msgid "Ms."
 msgstr "女士"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:12
+#: ../addressbook/gui/contact-editor/fullname.ui.h:12
 msgid "Sr."
 msgstr "长辈"
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
 msgid "_First:"
 msgstr "姓(_F)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
 msgid "_Last:"
 msgstr "名(_L)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "中间名(_M)："
 
-#: ../addressbook/gui/contact-editor/fullname.glade.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgid "_Suffix:"
 msgstr "后缀(_S)："
 
-#: ../addressbook/gui/contact-editor/im.glade.h:1
-msgid "Add IM Account"
-msgstr "添加即时通讯账户"
-
-#: ../addressbook/gui/contact-editor/im.glade.h:2
-msgid "_Account name:"
-msgstr "账户名(_A)："
-
-#: ../addressbook/gui/contact-editor/im.glade.h:3
-msgid "_IM Service:"
-msgstr "即时通讯服务(_I)："
-
-#: ../addressbook/gui/contact-editor/im.glade.h:4
-#: ../calendar/gui/dialogs/event-page.glade.h:16
-#: ../plugins/calendar-weather/calendar-weather.c:372
-#: ../plugins/exchange-operations/exchange-calendar.c:247
-#: ../plugins/exchange-operations/exchange-contacts.c:239
-msgid "_Location:"
-msgstr "位置(_L)："
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "<b>Members</b>"
-msgstr "<b>成员</b>"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:668
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:695
 msgid "Contact List Editor"
 msgstr "联系人列表编辑器"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:220
-#: ../calendar/gui/e-day-view-time-item.c:815
-#: ../calendar/gui/e-timezone-entry.c:121
-msgid "Select..."
-msgstr "选择..."
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
+msgid "Members"
+msgstr "成员"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 msgid "_Hide addresses when sending mail to this list"
 msgstr "在往该列表发送邮件时隐藏地址(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
 msgstr "列表名称(_L)："
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:5
+#: ../mail/mail-config.ui.h:154
+msgid "_Select..."
+msgstr "选择(_S)..."
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)："
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:761
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:788
 msgid "Contact List Members"
 msgstr "联系人列表成员"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:900
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1239
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:936
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1343
 msgid "_Members"
 msgstr "成员(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1148
-#: ../addressbook/gui/widgets/e-addressbook-model.c:311
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../addressbook/gui/widgets/e-addressbook-view.c:211
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:117
-#: ../addressbook/gui/widgets/e-minicard-view.c:531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1183
+msgid "Error adding list"
+msgstr "添加列表出错"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1197
+msgid "Error modifying list"
+msgstr "修改列表出错"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1211
+msgid "Error removing list"
+msgstr "删除列表出错"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1255
+#: ../addressbook/gui/widgets/e-addressbook-model.c:513
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: ../addressbook/gui/widgets/e-minicard-view.c:527
 msgid "Book"
 msgstr "地址簿"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1168
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1275
 msgid "Is New List"
 msgstr "为新列表"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
 msgid "Changed Contact:"
 msgstr "更改了的联系人："
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
 msgid "Conflicting Contact:"
 msgstr "冲突的联系人："
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:3
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:1
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
 msgid "Duplicate Contact Detected"
 msgstr "复制检测到的联系人"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
 msgid ""
 "The name or email of this contact already exists in this folder.  Would you "
 "like to add it anyway?"
 msgstr "此联系人的姓名或地址已经在本文件夹中存在了。您一定要添加吗？"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
 msgid "New Contact:"
 msgstr "新联系人："
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
 msgid "Original Contact:"
 msgstr "原联系人："
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:4
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:4
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
@@ -2860,69 +824,70 @@ msgstr ""
 "此联系人的姓名或地址已经在本文件夹中存在了。\n"
 "您一定要添加吗？"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:6
-#: ../addressbook/gui/merging/eab-contact-merging.c:214
+#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/merging/eab-contact-merging.c:231
 msgid "_Merge"
 msgstr "合并(_M)"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:199
+#: ../addressbook/gui/merging/eab-contact-merging.c:216
 msgid "Merge Contact"
 msgstr "合并联系人"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:267
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-contact-display.c:583
-#: ../addressbook/gui/widgets/eab-contact-display.c:588
-#: ../addressbook/gui/widgets/eab-contact-display.c:591
-#: ../addressbook/gui/widgets/eab-contact-display.c:871
-#: ../plugins/groupwise-features/junk-settings.c:416 ../smime/lib/e-cert.c:810
-msgid "Email"
-msgstr "电子邮件"
-
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:160
-#: ../calendar/gui/cal-search-bar.c:80 ../calendar/gui/caltypes.xml.h:2
-#: ../calendar/gui/memotypes.xml.h:2 ../calendar/gui/tasktypes.xml.h:4
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:4
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Any field contains"
 msgstr "任何域含有"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:159
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Email begins with"
 msgstr "邮件以此开头"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "Name contains"
 msgstr "姓名含有"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:143
 msgid "No contacts"
 msgstr "无联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:166
+#: ../addressbook/gui/widgets/e-addressbook-model.c:147
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 个联系人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:318
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:412
-#: ../addressbook/gui/widgets/e-addressbook-view.c:225
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:124
-#: ../addressbook/gui/widgets/e-minicard-view.c:538
+#: ../addressbook/gui/widgets/e-addressbook-model.c:308
+msgid "Error getting book view"
+msgstr "获取名簿视图出错"
+
+#: ../addressbook/gui/widgets/e-addressbook-model.c:533
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:421
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:126
+#: ../addressbook/gui/widgets/e-minicard-view.c:534
 msgid "Query"
 msgstr "查询"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:461
-msgid "Error getting book view"
-msgstr "获取名簿视图出错"
+#: ../addressbook/gui/widgets/e-addressbook-model.c:707
+msgid "Search Interrupted"
+msgstr "搜索中断了"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:426
-#: ../widgets/table/e-table-click-to-add.c:509
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
+#: ../addressbook/gui/widgets/e-addressbook-view.c:560
+#: ../calendar/gui/e-calendar-table.c:877 ../calendar/gui/e-memo-table.c:660
+#: ../modules/calendar/e-memo-shell-content.c:601
+#: ../modules/calendar/e-task-shell-content.c:624
+#: ../widgets/table/e-table-click-to-add.c:505
 #: ../widgets/table/e-table-selection-model.c:302
-#: ../widgets/table/e-table.c:3354
-#: ../widgets/table/e-tree-selection-model.c:820 ../widgets/text/e-text.c:3552
-#: ../widgets/text/e-text.c:3553
+#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-tree-selection-model.c:817 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3542
 msgid "Model"
 msgstr "模型"
 
@@ -2930,114 +895,61 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "修改名片错误"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:158
-msgid "Name begins with"
-msgstr "姓名以此开头"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:570
+#: ../calendar/gui/e-calendar-table.c:888 ../calendar/gui/e-memo-table.c:671
+#, fuzzy
+msgid "Shell View"
+msgstr "选择视图：%s"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:218
+#: ../addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Source"
 msgstr "来源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-#: ../calendar/gui/e-meeting-list-view.c:524
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Type"
-msgstr "类型"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:812
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1964
-msgid "Save as vCard..."
-msgstr "另存为 VCard..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:933
-#: ../calendar/gui/dialogs/comp-editor.c:2082
-#: ../calendar/gui/e-calendar-table.c:1588
-#: ../calendar/gui/e-calendar-view.c:1775 ../calendar/gui/e-memo-table.c:923
-#: ../ui/evolution-addressbook.xml.h:56
-msgid "_Open"
-msgstr "打开(_O)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:935
-msgid "_New Contact..."
-msgstr "新建联系人(_N)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:936
-msgid "New Contact _List..."
-msgstr "新建联系人列表(_L)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1040
+msgid "Are you sure you want to delete these contact lists?"
+msgstr "您确定要删除这些联系人列表吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:939
-msgid "_Save as vCard..."
-msgstr "另存为 vCard(_S)..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1044
+msgid "Are you sure you want to delete this contact list?"
+msgstr "您确定要删除这些联系人列表吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:940
-msgid "_Forward Contact"
-msgstr "转发联系人(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1048
+#, c-format
+msgid "Are you sure you want to delete this contact list (%s)?"
+msgstr "您确定要删除联系人列表(%s)吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:941
-msgid "_Forward Contacts"
-msgstr "转发联系人(_F)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1054
+msgid "Are you sure you want to delete these contacts?"
+msgstr "您确定要删除这些联系人吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:942
-msgid "Send _Message to Contact"
-msgstr "给联系人发信件(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1058
+msgid "Are you sure you want to delete this contact?"
+msgstr "您确定要删除这些联系人吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:943
-msgid "Send _Message to List"
-msgstr "给列表发信件(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1062
+#, c-format
+msgid "Are you sure you want to delete this contact (%s)?"
+msgstr "您确定要删除联系人(%s)吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
-msgid "Send _Message to Contacts"
-msgstr "给联系人发信件(_M)"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1224
+#, c-format
+msgid ""
+"Opening %d contacts will open %d new windows as well.\n"
+"Do you really want to display all of these contacts?"
+msgstr ""
+"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
+"您真的想要显示所有联系人吗？"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:945
-msgid "_Print"
-msgstr "打印(_P)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:948
-msgid "Cop_y to Address Book..."
-msgstr "复制到地址簿(_Y)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:949
-msgid "Mo_ve to Address Book..."
-msgstr "移至地址簿(_V)..."
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
-msgid "Cu_t"
-msgstr "剪切(_T)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
-#: ../calendar/gui/dialogs/comp-editor.c:487
-#: ../calendar/gui/e-calendar-table.c:1596
-#: ../calendar/gui/e-calendar-view.c:1782 ../calendar/gui/e-memo-table.c:931
-#: ../composer/e-msg-composer.c:2051 ../mail/em-folder-tree.c:1005
-#: ../mail/em-folder-view.c:1322 ../mail/message-list.c:2104
-#: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
-msgid "_Copy"
-msgstr "复制(_C)"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
-msgid "P_aste"
-msgstr "粘贴(_A)"
-
-#. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1527
-#: ../calendar/gui/cal-search-bar.c:628 ../calendar/gui/cal-search-bar.c:671
-#: ../calendar/gui/cal-search-bar.c:690
-msgid "Any Category"
-msgstr "任何类别"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1229
+msgid "_Don't Display"
+msgstr "不显示(_D)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1530
-#: ../calendar/gui/cal-search-bar.c:632 ../calendar/gui/cal-search-bar.c:675
-#: ../calendar/gui/cal-search-bar.c:694
-msgid "Unmatched"
-msgstr "无匹配"
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1230
+msgid "Display _All Contacts"
+msgstr "显示全部联系人(_A)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:626
+#: ../addressbook/gui/widgets/eab-contact-display.c:560
 msgid "Assistant"
 msgstr "助手"
 
@@ -3066,8 +978,7 @@ msgid "Car Phone"
 msgstr "车载电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/e-cal-component-memo-preview.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3075,7 +986,7 @@ msgid "Categories"
 msgstr "类别"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-#: ../addressbook/gui/widgets/eab-contact-display.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:555
 msgid "Company"
 msgstr "公司"
 
@@ -3124,22 +1035,22 @@ msgid "Journal"
 msgstr "日记"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:625
+#: ../addressbook/gui/widgets/eab-contact-display.c:559
 msgid "Manager"
 msgstr "经理"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:646
+#: ../addressbook/gui/widgets/eab-contact-display.c:580
 msgid "Mobile Phone"
 msgstr "移动电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:532
 msgid "Nickname"
 msgstr "昵称"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-#: ../addressbook/gui/widgets/eab-contact-display.c:659
+#: ../addressbook/gui/widgets/eab-contact-display.c:594
 msgid "Note"
 msgstr "注释"
 
@@ -3168,14 +1079,13 @@ msgid "Radio"
 msgstr "收音机"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/e-meeting-list-view.c:536
+#: ../calendar/gui/e-meeting-list-view.c:578
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:715
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:650
+#: ../addressbook/gui/widgets/eab-contact-display.c:584
 msgid "Spouse"
 msgstr "配偶"
 
@@ -3194,6 +1104,7 @@ msgid "Telex"
 msgstr "电传"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
+#: ../shell/e-shell-view.c:520
 msgid "Title"
 msgstr "头衔"
 
@@ -3205,63 +1116,59 @@ msgstr "单位"
 msgid "Web Site"
 msgstr "网站"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:116
-#: ../addressbook/gui/widgets/e-minicard.c:155
-#: ../widgets/misc/e-canvas-vbox.c:85 ../widgets/misc/e-canvas-vbox.c:86
-#: ../widgets/misc/e-reflow.c:1424 ../widgets/misc/e-reflow.c:1425
-#: ../widgets/table/e-table-click-to-add.c:523
+#: ../addressbook/gui/widgets/e-minicard-label.c:115
+#: ../addressbook/gui/widgets/e-minicard.c:154
+#: ../widgets/misc/e-canvas-vbox.c:83 ../widgets/misc/e-canvas-vbox.c:84
+#: ../widgets/table/e-table-click-to-add.c:519
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:654
-#: ../widgets/table/e-table-group-container.c:992
-#: ../widgets/table/e-table-group-container.c:993
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-group-leaf.c:638
-#: ../widgets/table/e-table-item.c:3077 ../widgets/table/e-table-item.c:3078
-#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
+#: ../widgets/table/e-table-group-container.c:994
+#: ../widgets/table/e-table-group-container.c:995
+#: ../widgets/table/e-table-group-leaf.c:642
+#: ../widgets/table/e-table-group-leaf.c:643
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "宽度"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:123
-#: ../addressbook/gui/widgets/e-minicard.c:162
-#: ../widgets/misc/e-canvas-vbox.c:97 ../widgets/misc/e-canvas-vbox.c:98
-#: ../widgets/misc/e-reflow.c:1432 ../widgets/misc/e-reflow.c:1433
-#: ../widgets/table/e-table-click-to-add.c:530
-#: ../widgets/table/e-table-field-chooser-item.c:661
-#: ../widgets/table/e-table-group-container.c:985
-#: ../widgets/table/e-table-group-container.c:986
-#: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-group-leaf.c:631
-#: ../widgets/table/e-table-item.c:3083 ../widgets/table/e-table-item.c:3084
-#: ../widgets/text/e-text.c:3738 ../widgets/text/e-text.c:3739
+#: ../addressbook/gui/widgets/e-minicard-label.c:122
+#: ../addressbook/gui/widgets/e-minicard.c:161
+#: ../widgets/misc/e-canvas-vbox.c:95 ../widgets/misc/e-canvas-vbox.c:96
+#: ../widgets/table/e-table-click-to-add.c:526
+#: ../widgets/table/e-table-group-container.c:987
+#: ../widgets/table/e-table-group-container.c:988
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-group-leaf.c:636
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "高度"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:130
-#: ../addressbook/gui/widgets/e-minicard.c:170
+#: ../addressbook/gui/widgets/e-minicard-label.c:129
+#: ../addressbook/gui/widgets/e-minicard.c:169
 msgid "Has Focus"
 msgstr "有焦点"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:137
+#: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "域"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:144
+#: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "域名"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:151
+#: ../addressbook/gui/widgets/e-minicard-label.c:150
 msgid "Text Model"
 msgstr "文字模型"
 
-#: ../addressbook/gui/widgets/e-minicard-label.c:158
+#: ../addressbook/gui/widgets/e-minicard-label.c:157
 msgid "Max field name length"
 msgstr "最大域名长度"
 
-#: ../addressbook/gui/widgets/e-minicard-view-widget.c:138
+#: ../addressbook/gui/widgets/e-minicard-view-widget.c:140
 msgid "Column Width"
 msgstr "列宽"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:178
+#: ../addressbook/gui/widgets/e-minicard-view.c:179
 msgid ""
 "\n"
 "\n"
@@ -3271,7 +1178,7 @@ msgstr ""
 "\n"
 "正在搜索联系人..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:181
+#: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
 "\n"
@@ -3285,7 +1192,7 @@ msgstr ""
 "\n"
 "或在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:184
+#: ../addressbook/gui/widgets/e-minicard-view.c:185
 msgid ""
 "\n"
 "\n"
@@ -3299,7 +1206,7 @@ msgstr ""
 "\n"
 "请在此双击以创建新联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
 "\n"
 "\n"
@@ -3309,7 +1216,7 @@ msgstr ""
 "\n"
 "搜索联系人。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -3319,256 +1226,305 @@ msgstr ""
 "\n"
 "本视图中没有可显示的项。"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:524
+#: ../addressbook/gui/widgets/e-minicard-view.c:520
 msgid "Adapter"
 msgstr "适配器"
 
-#: ../addressbook/gui/widgets/e-minicard.c:100
+#: ../addressbook/gui/widgets/e-minicard.c:99
 msgid "Work Email"
 msgstr "工作电子邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:100
 msgid "Home Email"
 msgstr "家庭电子邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:102
-#: ../addressbook/gui/widgets/e-minicard.c:831
+#: ../addressbook/gui/widgets/e-minicard.c:101
+#: ../addressbook/gui/widgets/e-minicard.c:797
 msgid "Other Email"
 msgstr "其它电子邮件"
 
-#: ../addressbook/gui/widgets/e-minicard.c:178
+#: ../addressbook/gui/widgets/e-minicard.c:177
 msgid "Selected"
 msgstr "已选择"
 
-#: ../addressbook/gui/widgets/e-minicard.c:185
+#: ../addressbook/gui/widgets/e-minicard.c:184
 msgid "Has Cursor"
 msgstr "有光标"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:169 ../mail/em-popup.c:623
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:178
+msgid "evolution address book"
+msgstr "evolution 地址簿"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:170
-#: ../mail/em-folder-view.c:2752
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
+#: ../addressbook/gui/widgets/ea-minicard-view.c:33
+msgid "New Contact"
+msgstr "新建联系人"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:171 ../mail/em-popup.c:624
-msgid "_Send New Message To..."
-msgstr "把新信发送到(_S)..."
+#: ../addressbook/gui/widgets/ea-minicard-view.c:34
+msgid "New Contact List"
+msgstr "新建联系人列表"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:161
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "当前地址簿文件夹 %s 有 %d 张名片"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:31
+msgid "Open"
+msgstr "打开"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:141
+msgid "Contact List: "
+msgstr "联系人列表："
+
+#: ../addressbook/gui/widgets/ea-minicard.c:142
+msgid "Contact: "
+msgstr "联系人："
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:172
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
+#: ../addressbook/gui/widgets/ea-minicard.c:168
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:174
 msgid "Copy _Email Address"
 msgstr "复制电子邮件地址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:287
-#: ../addressbook/gui/widgets/eab-contact-display.c:361
-#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-display.c:176
+#: ../widgets/misc/e-web-view.c:362
+msgid "Copy the email address to the clipboard"
+msgstr "复制电子邮件地址到剪贴板"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:181
+#: ../widgets/misc/e-web-view.c:367
+msgid "_Send New Message To..."
+msgstr "把新信发送到(_S)..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:183
+#: ../widgets/misc/e-web-view.c:369
+msgid "Send a mail message to this address"
+msgstr "发送一个邮件信息到这个地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:258
+#: ../addressbook/gui/widgets/eab-contact-display.c:260
 msgid "(map)"
 msgstr "(地图)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:297
-#: ../addressbook/gui/widgets/eab-contact-display.c:381
-#: ../addressbook/gui/widgets/eab-contact-display.c:393
+#: ../addressbook/gui/widgets/eab-contact-display.c:278
+#: ../addressbook/gui/widgets/eab-contact-display.c:289
 msgid "map"
 msgstr "地图"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:478
-#: ../addressbook/gui/widgets/eab-contact-display.c:838
+#: ../addressbook/gui/widgets/eab-contact-display.c:415
+#: ../addressbook/gui/widgets/eab-contact-display.c:778
 msgid "List Members"
 msgstr "列出成员"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:622
+#: ../addressbook/gui/widgets/eab-contact-display.c:556
 msgid "Department"
 msgstr "部门"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:623
+#: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "Profession"
 msgstr "职业"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:624
+#: ../addressbook/gui/widgets/eab-contact-display.c:558
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:627
+#: ../addressbook/gui/widgets/eab-contact-display.c:561
 msgid "Video Chat"
 msgstr "视频聊天"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:628
-#: ../calendar/gui/calendar-commands.c:90
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2512
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:576
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:424
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:455
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:568
-#: ../plugins/hula-account-setup/camel-hula-listener.c:377
-#: ../plugins/hula-account-setup/camel-hula-listener.c:406
-#: ../plugins/publish-calendar/publish-calendar.glade.h:5
+#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../calendar/gui/dialogs/calendar-setup.c:368
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../modules/calendar/e-cal-shell-view.c:475
+#: ../plugins/groupwise-features/camel-gw-listener.c:420
+#: ../plugins/groupwise-features/camel-gw-listener.c:450
+#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
+#: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "日历"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:629
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../addressbook/gui/widgets/eab-contact-display.c:563
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:17
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "Free/Busy"
 msgstr "忙/闲"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:630
-#: ../addressbook/gui/widgets/eab-contact-display.c:645
+#: ../addressbook/gui/widgets/eab-contact-display.c:564
+#: ../addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Phone"
 msgstr "电话"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:631
+#: ../addressbook/gui/widgets/eab-contact-display.c:565
 msgid "Fax"
 msgstr "传真"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:642
+#: ../addressbook/gui/widgets/eab-contact-display.c:566
+#: ../addressbook/gui/widgets/eab-contact-display.c:581
+msgid "Address"
+msgstr "地址"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Home Page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Web Log"
 msgstr "Web 日志"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:648
-#: ../calendar/gui/e-calendar-view.c:2538
-msgid "Birthday"
-msgstr "生日"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:649
-#: ../calendar/gui/e-calendar-view.c:2539
-msgid "Anniversary"
-msgstr "纪念日"
+#. Create the default Person addressbook
+#. Create the default Person calendar
+#. Create the default Person memo list
+#. Create the default Person task list
+#. orange
+#: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../modules/addressbook/e-book-shell-backend.c:175
+#: ../modules/addressbook/e-book-shell-migrate.c:507
+#: ../modules/calendar/e-cal-shell-backend.c:167
+#: ../modules/calendar/e-cal-shell-migrate.c:574
+#: ../modules/calendar/e-memo-shell-backend.c:152
+#: ../modules/calendar/e-memo-shell-migrate.c:112
+#: ../modules/calendar/e-task-shell-backend.c:156
+#: ../modules/calendar/e-task-shell-migrate.c:511
+#: ../modules/mail/e-mail-shell-migrate.c:958
+#: ../plugins/email-custom-header/email-custom-header.c:322
+msgid "Personal"
+msgstr "个人"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:856
+#: ../addressbook/gui/widgets/eab-contact-display.c:796
 msgid "Job Title"
 msgstr "职称"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:892
+#: ../addressbook/gui/widgets/eab-contact-display.c:833
 msgid "Home page"
 msgstr "主页"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:900
+#: ../addressbook/gui/widgets/eab-contact-display.c:842
 msgid "Blog"
 msgstr "Blog"
 
+#: ../addressbook/gui/widgets/eab-contact-display.c:1042
+#: ../widgets/misc/e-web-view.c:708
+#, c-format
+msgid "Click to mail %s"
+msgstr "单击以给 %s 发送邮件"
+
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Backend busy"
 msgstr "后台忙"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:56
 msgid "Repository offline"
 msgstr "仓库脱机"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Address Book does not exist"
 msgstr "地址簿不存在"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "No Self Contact defined"
 msgstr "未定义自身联系人"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Permission denied"
 msgstr "没有权限"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:67
+#: ../addressbook/gui/widgets/eab-gui-util.c:62
 msgid "Contact not found"
 msgstr "找不到联系人"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Contact ID already exists"
 msgstr "联系人 ID 已经存在"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Protocol not supported"
 msgstr "不支持的协议"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
-#: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-cal-model-tasks.c:364
-#: ../calendar/gui/e-cal-model-tasks.c:681
-#: ../calendar/gui/e-calendar-table.c:239
-#: ../calendar/gui/e-calendar-table.c:653 ../calendar/gui/print.c:2561
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../calendar/gui/dialogs/task-details-page.ui.h:1
+#: ../calendar/gui/e-cal-component-preview.c:293
+#: ../calendar/gui/e-cal-model-tasks.c:465
+#: ../calendar/gui/e-cal-model-tasks.c:735
+#: ../calendar/gui/e-calendar-table.c:215
+#: ../calendar/gui/e-calendar-table.c:226
+#: ../calendar/gui/e-calendar-table.c:791 ../calendar/gui/print.c:2619
 msgid "Canceled"
 msgstr "已取消"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Could not cancel"
 msgstr "无法取消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:72
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 msgid "Authentication Failed"
 msgstr "认证失败"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:73
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Authentication Required"
 msgstr "必须认证"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:74
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
 msgid "TLS not Available"
 msgstr "TLS 不可用"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:76
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "No such source"
 msgstr "没有来源"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:77
+#: ../addressbook/gui/widgets/eab-gui-util.c:72
 msgid "Not available in offline mode"
 msgstr "脱机模式下不可用"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/eab-gui-util.c:78
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "Other error"
 msgstr "其它错误"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:79
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Invalid server version"
 msgstr "无效的服务器版本"
 
 #. E_BOOK_ERROR_UNSUPPORTED_AUTHENTICATION_METHOD
-#: ../addressbook/gui/widgets/eab-gui-util.c:80
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Unsupported authentication method"
 msgstr "不支持的认证方式"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:110
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 #, fuzzy
-#| msgid ""
-#| "We were unable to open this address book. This either means this book is "
-#| "not marked for offline usage or not yet downloaded for offline usage. "
-#| "Please load the address book once in online mode to download its contents"
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3577,15 +1533,14 @@ msgstr ""
 "我们无法打开此地址簿。这可能意味着这本地址簿没有标为脱机使用，或者尚未下载完"
 "成以供脱机使用。请在联机模式中装入此地址簿以便下载其内容"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:119
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
 "and that permissions are set to access it."
-msgstr ""
-"无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
+msgstr "无法打开此地址簿。请检查路径 %s 是否存在以及您是否有足够的权限访问它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:131
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -3593,19 +1548,19 @@ msgstr ""
 "本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
 "LDAP，就必须安装启用了 LDAP 的 Evolution 包。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
 msgstr ""
-"无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经"
-"关闭。"
+"无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经关"
+"闭。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:148
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "错误细节消息："
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:171
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3616,7 +1571,7 @@ msgstr ""
 "Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
 "搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:177
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "configured for this address book.  Please make your search\n"
@@ -3627,465 +1582,198 @@ msgstr ""
 "请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
 "中将时间限制调高。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:183
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr "此地址簿的后端无法解析此查询。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:186
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr "此地址簿的后端拒绝执行此查询。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:189
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "此查询未成功完成。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid "Error adding list"
-msgstr "添加列表出错"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:687
-msgid "Error adding contact"
-msgstr "添加联系人出错"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying list"
-msgstr "修改列表出错"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:222
-msgid "Error modifying contact"
-msgstr "修改联系人出错"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-msgid "Error removing list"
-msgstr "删除列表出错"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:234
-#: ../addressbook/gui/widgets/eab-gui-util.c:637
-msgid "Error removing contact"
-msgstr "删除联系人出错"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-#, c-format
-msgid ""
-"Opening %d contact will open %d new window as well.\n"
-"Do you really want to display this contact?"
-msgid_plural ""
-"Opening %d contacts will open %d new windows as well.\n"
-"Do you really want to display all of these contacts?"
-msgstr[0] ""
-"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
-"您真的想要显示所有联系人吗？"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
-msgid "_Don't Display"
-msgstr "不显示(_D)"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:325
-msgid "Display _All Contacts"
-msgstr "显示全部联系人(_A)"
-
-#. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:351
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已经存在\n"
-"您打算覆盖它吗？"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:355
-msgid "Overwrite"
-msgstr "覆盖"
-
-#. more than one, finding the total number of contacts might
-#. * hit performance while saving large number of contacts
-#.
-#: ../addressbook/gui/widgets/eab-gui-util.c:396
-#: ../addressbook/gui/widgets/eab-gui-util.c:399
-msgid "contact"
-msgid_plural "contacts"
-msgstr[0] "联系人"
-
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:445
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:482
+#: ../addressbook/gui/widgets/eab-gui-util.c:245
 msgid "Select Address Book"
 msgstr "选择地址簿"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:596
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "list"
 msgstr "列表"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:748
+#: ../addressbook/gui/widgets/eab-gui-util.c:430
 msgid "Move contact to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:750
+#: ../addressbook/gui/widgets/eab-gui-util.c:432
 msgid "Copy contact to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:753
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "Move contacts to"
 msgstr "将联系人移至"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:755
+#: ../addressbook/gui/widgets/eab-gui-util.c:437
 msgid "Copy contacts to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:901
-msgid "Multiple vCards"
-msgstr "多个 vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:908
-#, c-format
-msgid "vCard for %s"
-msgstr "%s 的 vCard"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:920
-#: ../addressbook/gui/widgets/eab-gui-util.c:946
-#, c-format
-msgid "Contact information"
-msgstr "联系人信息"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:948
-#, c-format
-msgid "Contact information for %s"
-msgstr "%s 的联系人信息"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:293
-msgid "Querying Address Book..."
-msgstr "正在查询地址簿..."
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:141
-#, c-format
-msgid "There is one other contact."
-msgid_plural "There are %d other contacts."
-msgstr[0] "有另外 %d 个联系人。"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:226
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
-msgid "Show Full vCard"
-msgstr "显示完整 vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:230
-msgid "Show Compact vCard"
-msgstr "显示紧凑 vCard"
-
-#: ../addressbook/gui/widgets/eab-vcard-control.c:282
-msgid "Save in address book"
-msgstr "保存在地址簿中"
-
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:37
 msgid "Card View"
 msgstr "名片视图"
 
-#: ../addressbook/importers/evolution-csv-importer.c:661
-#: ../addressbook/importers/evolution-ldif-importer.c:513
+#: ../addressbook/importers/evolution-csv-importer.c:660
+#: ../addressbook/importers/evolution-ldif-importer.c:511
 #: ../addressbook/importers/evolution-vcard-importer.c:252
-#: ../calendar/importers/icalendar-importer.c:308
-#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:7
+#: ../calendar/importers/icalendar-importer.c:310
+#: ../calendar/importers/icalendar-importer.c:685 ../shell/shell.error.xml.h:5
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:863
+#: ../addressbook/importers/evolution-csv-importer.c:861
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:864
+#: ../addressbook/importers/evolution-csv-importer.c:862
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:872
+#: ../addressbook/importers/evolution-csv-importer.c:870
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:873
+#: ../addressbook/importers/evolution-csv-importer.c:871
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:881
+#: ../addressbook/importers/evolution-csv-importer.c:879
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:882
+#: ../addressbook/importers/evolution-csv-importer.c:880
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:680
+#: ../addressbook/importers/evolution-ldif-importer.c:678
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 数据交换格式(.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:681
+#: ../addressbook/importers/evolution-ldif-importer.c:679
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 导入器"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:549
+#: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vCard (.vfg, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:550
+#: ../addressbook/importers/evolution-vcard-importer.c:549
 msgid "Evolution vCard Importer"
 msgstr "Evolution vCard 导入器"
 
-#: ../addressbook/printing/e-contact-print.glade.h:1
-msgid "10 pt. Tahoma"
-msgstr "10 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:2
-msgid "8 pt. Tahoma"
-msgstr "8 pt. Tahoma"
-
-#: ../addressbook/printing/e-contact-print.glade.h:3
-msgid "Blank forms at end:"
-msgstr "结尾空白格式："
-
-#: ../addressbook/printing/e-contact-print.glade.h:4
-msgid "Body"
-msgstr "邮件体"
-
-#: ../addressbook/printing/e-contact-print.glade.h:5
-msgid "Bottom:"
-msgstr "底部："
-
-#: ../addressbook/printing/e-contact-print.glade.h:6
-msgid "Dimensions:"
-msgstr "尺寸："
-
-#: ../addressbook/printing/e-contact-print.glade.h:7
-msgid "F_ont..."
-msgstr "字体(_O)..."
-
-#: ../addressbook/printing/e-contact-print.glade.h:8
-msgid "Fonts"
-msgstr "字体"
-
-#: ../addressbook/printing/e-contact-print.glade.h:9
-msgid "Footer:"
-msgstr "页脚："
-
-#: ../addressbook/printing/e-contact-print.glade.h:10
-msgid "Format"
-msgstr "格式"
-
-#: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/em-mailer-prefs.c:433 ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-field-chooser-dialog.c:81
-#: ../widgets/table/e-table-field-chooser-item.c:647
-#: ../widgets/table/e-table-field-chooser.c:80
-#: ../widgets/table/e-table-header-item.c:1907
-#: ../widgets/table/e-table-selection-model.c:309
-msgid "Header"
-msgstr "页眉"
-
-#: ../addressbook/printing/e-contact-print.glade.h:12
-msgid "Header/Footer"
-msgstr "页眉/页脚"
-
-#: ../addressbook/printing/e-contact-print.glade.h:13
-msgid "Headings"
-msgstr "标题"
-
-#: ../addressbook/printing/e-contact-print.glade.h:14
-msgid "Headings for each letter"
-msgstr "每封信的标题"
-
-#: ../addressbook/printing/e-contact-print.glade.h:15
-msgid "Height:"
-msgstr "高度："
-
-#: ../addressbook/printing/e-contact-print.glade.h:16
-msgid "Immediately follow each other"
-msgstr "一个紧接一个"
-
-#: ../addressbook/printing/e-contact-print.glade.h:17
-msgid "Include:"
-msgstr "包含："
-
-#: ../addressbook/printing/e-contact-print.glade.h:18
-msgid "Landscape"
-msgstr "横向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:19
-msgid "Left:"
-msgstr "左："
-
-#: ../addressbook/printing/e-contact-print.glade.h:20
-msgid "Letter tabs on side"
-msgstr "旁边显示字母标签"
-
-#: ../addressbook/printing/e-contact-print.glade.h:21
-msgid "Margins"
-msgstr "边界"
-
-#: ../addressbook/printing/e-contact-print.glade.h:22
-msgid "Number of columns:"
-msgstr "列数："
-
-#: ../addressbook/printing/e-contact-print.glade.h:23
-msgid "Options"
-msgstr "选项"
-
-#: ../addressbook/printing/e-contact-print.glade.h:24
-msgid "Orientation"
-msgstr "方向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:25
-msgid "Page"
-msgstr "页面"
-
-#: ../addressbook/printing/e-contact-print.glade.h:26
-msgid "Page Setup:"
-msgstr "页面设置："
-
-#: ../addressbook/printing/e-contact-print.glade.h:27
-msgid "Paper"
-msgstr "纸张"
-
-#: ../addressbook/printing/e-contact-print.glade.h:28
-msgid "Paper source:"
-msgstr "纸张来源："
-
-#: ../addressbook/printing/e-contact-print.glade.h:29
-msgid "Portrait"
-msgstr "纵向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:30
-msgid "Preview:"
-msgstr "预览"
-
-#: ../addressbook/printing/e-contact-print.glade.h:31
-msgid "Print using gray shading"
-msgstr "用灰度阴影打印"
-
-#: ../addressbook/printing/e-contact-print.glade.h:32
-msgid "Reverse on even pages"
-msgstr "奇数页反向"
-
-#: ../addressbook/printing/e-contact-print.glade.h:33
-msgid "Right:"
-msgstr "右："
-
-#: ../addressbook/printing/e-contact-print.glade.h:34
-msgid "Sections:"
-msgstr "节："
-
-#: ../addressbook/printing/e-contact-print.glade.h:35
-msgid "Shading"
-msgstr "阴影"
-
-#. FIXME: Take care of i18n
-#: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:1141
-#: ../plugins/exchange-operations/exchange-calendar.c:236
-#: ../plugins/exchange-operations/exchange-contacts.c:222
-msgid "Size:"
-msgstr "大小："
-
-#: ../addressbook/printing/e-contact-print.glade.h:37
-msgid "Start on a new page"
-msgstr "从新页开始"
-
-#: ../addressbook/printing/e-contact-print.glade.h:38
-msgid "Style name:"
-msgstr "样式名："
-
-#: ../addressbook/printing/e-contact-print.glade.h:39
-msgid "Top:"
-msgstr "顶部："
-
-#: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:154
-msgid "Type:"
-msgstr "类型："
-
-#: ../addressbook/printing/e-contact-print.glade.h:41
-msgid "Width:"
-msgstr "宽度："
-
-#: ../addressbook/printing/e-contact-print.glade.h:42
-msgid "_Font..."
-msgstr "字体(_F)..."
-
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:656
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:692
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:643
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:678
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:48
 msgid "Can not open file"
 msgstr "无法打开文件"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:42
 msgid "Couldn't get list of address books"
 msgstr "无法获得地址簿列表"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:70
 msgid "failed to open book"
 msgstr "打开地址簿失败"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:48
+#: ../addressbook/tools/evolution-addressbook-export.c:45
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:49
+#: ../addressbook/tools/evolution-addressbook-export.c:46
 msgid "OUTPUTFILE"
 msgstr "输出文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:52
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "List local address book folders"
 msgstr "列出本地地址簿文件夹"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:55
+#: ../addressbook/tools/evolution-addressbook-export.c:52
 msgid "Show cards as vcard or csv file"
 msgstr "将名片显示为 vcard 还是 csv 文件"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Export in asynchronous mode"
 msgstr "以异步模式导出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid ""
 "The number of cards in one output file in asynchronous mode, default size "
 "100."
 msgstr "异步模式中一个输出文件中的名片数，默认大小为 100。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:64
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "NUMBER"
 msgstr "数字"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:101
+#: ../addressbook/tools/evolution-addressbook-export.c:99
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "命令行参数错误，请使用 --help 选项查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:115
+#: ../addressbook/tools/evolution-addressbook-export.c:113
 msgid "Only support csv or vcard format."
 msgstr "仅支持 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:124
+#: ../addressbook/tools/evolution-addressbook-export.c:122
 msgid "In async mode, output must be file."
 msgstr "在异步模式中，输出必须是文件。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:132
+#: ../addressbook/tools/evolution-addressbook-export.c:130
 msgid "In normal mode, there is no need for the size option."
 msgstr "在普通模式中，不应该有大小选项。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:163
+#: ../addressbook/tools/evolution-addressbook-export.c:161
 msgid "Unhandled error"
 msgstr "未处理的错误"
 
+#: ../addressbook/util/addressbook.c:103
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名访问 LDAP 服务器"
+
+#: ../addressbook/util/addressbook.c:210
+#: ../plugins/groupwise-features/camel-gw-listener.c:530
+msgid "Failed to authenticate.\n"
+msgstr "认证失败。\n"
+
+#: ../addressbook/util/addressbook.c:217
+#: ../plugins/groupwise-features/camel-gw-listener.c:510
+#, c-format
+msgid "Enter password for %s (user %s)"
+msgstr "输入 %s 的密码(用户 %s)"
+
+#: ../addressbook/util/addressbook.c:225
+#: ../calendar/common/authentication.c:51
+#: ../plugins/google-account-setup/google-source.c:518
+#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../smime/gui/component.c:49
+msgid "Enter password"
+msgstr "输入密码"
+
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:2
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar from the side bar in the Calendar view."
 msgstr ""
+"“{0}“是一个只读日历，不能被编辑。请从日历列表的侧边栏里选择一个不同的日历。"
 
 #. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:4
@@ -4151,266 +1839,281 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "您确信您要删除标题为“{0}”的约会吗？"
 
 #: ../calendar/calendar.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to delete the meeting titled '{0}'?"
+msgstr "您确信您要删除标题为“{0}”的约会吗？"
+
+#: ../calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete the memo '{0}'?"
 msgstr "您确定要删除“{0}”备忘吗？"
 
-#: ../calendar/calendar.error.xml.h:18
+#: ../calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "您确定要删除这 {0} 个约会吗？"
 
-#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/calendar.error.xml.h:20
 msgid "Are you sure you want to delete these {0} memos?"
 msgstr "您确定要删除这 {0} 个备忘吗？"
 
-#: ../calendar/calendar.error.xml.h:20
+#: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "您确定要删除这 {0} 个任务吗？"
 
-#: ../calendar/calendar.error.xml.h:21
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete this appointment?"
 msgstr "您确信您要删除该约会吗？"
 
-#: ../calendar/calendar.error.xml.h:22
-#: ../calendar/gui/dialogs/delete-comp.c:182
+#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/gui/dialogs/delete-comp.c:191
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "您确信您要删除该会议吗？"
 
-#: ../calendar/calendar.error.xml.h:23
-#: ../calendar/gui/dialogs/delete-comp.c:188
+#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/gui/dialogs/delete-comp.c:197
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "您确信您要删除该备忘吗？"
 
-#: ../calendar/calendar.error.xml.h:24
-#: ../calendar/gui/dialogs/delete-comp.c:185
+#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/gui/dialogs/delete-comp.c:194
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "您确定要删除此任务吗？"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "您确定想要保存没有摘要的备忘吗？"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "您确定想要发送没有摘要的约会吗？"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "您确定想要发送没有摘要的任务吗？"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Calendar repository is offline."
 msgstr "日历仓库脱机。"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Cannot create a new event"
 msgstr "无法创建新事件"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Cannot save event"
 msgstr "无法保存事件"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid "Delete calendar '{0}'?"
 msgstr "删除日历“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid "Delete memo list '{0}'?"
 msgstr "删除备忘列表“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Delete task list '{0}'?"
 msgstr "删除任务列表“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Do _not Send"
 msgstr "不发送(_N)"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下载进行中。您想要保存约会吗？"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:37
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下载进行中。您想要保存任务吗？"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:38
 msgid "Editor could not be loaded."
 msgstr "无法装入编辑器。"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "将会向全部出席者发送电子邮件邀请，并允许他们接受此任务。"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "将会向全部出席者发送电子邮件邀请，并允许他们答复。"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid "Error loading calendar"
 msgstr "装入日历时出错"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid "Error loading memo list"
 msgstr "装入备忘列表出错"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid "Error loading task list"
 msgstr "装入任务列表出错"
 
 #. For Translators: {0} is specify the backend server
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "Error on '{0}'"
 msgstr "{0} 出错"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "如果您不发送取消通知，其他出席者也许不知道会议已经取消。"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the memo has been deleted."
 msgstr "如果您不发送取消通知，其他出席者可能不知道备忘已经删除。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "如果您不发送取消通知，其他出席者可能不知道任务已经删除。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "No response from the server."
 msgstr "服务器无响应。"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "Save Appointment"
 msgstr "保存约会"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
+#, fuzzy
+msgid "Save Meeting"
+msgstr "新会议"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid "Save Memo"
 msgstr "保存备忘"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:53
 msgid "Save Task"
 msgstr "保存任务"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:54
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:55
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:57
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "附件正在下载中。保存约会将使得约会保存时无法包含后续的附件。"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:58
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "附件正在下载中。保存任务将使得任务保存时无法包含后续的附件。"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:59
 msgid "Some features may not work properly with your current server."
 msgstr "某些特性可能无法在您目前的服务器下工作。"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:60
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:61
 msgid "The Evolution calendars have quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:62
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 备忘异常退出。"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:63
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:64
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:65
 msgid "The memo list is not marked for offline usage."
 msgstr "备忘列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:66
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:67
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:68
 msgid "This memo list will be removed permanently."
 msgstr "此备忘列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:69
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 msgid "Unable to load the calendar"
 msgstr "无法装入日历"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:71
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
+#, fuzzy
+msgid "Would you like to save your changes to this meeting?"
+msgstr "您想要保存对此备忘的更改吗？"
+
+#: ../calendar/calendar.error.xml.h:73
 msgid "Would you like to save your changes to this memo?"
 msgstr "您想要保存对此备忘的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:74
 msgid "Would you like to save your changes to this task?"
 msgstr "您想要保存对此任务的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:75
 msgid "Would you like to send a cancelation notice for this memo?"
 msgstr "您是否想要为此备忘发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:76
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "您是否想要给全部出席者发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:77
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是否想要给出席者发送会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:78
 msgid "Would you like to send this task to participants?"
 msgstr "您是否想要将此任务发送给出席者？"
 
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:79
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是否想要给出席者发送更新的会议信息？"
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:80
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是否想要给出席者发送更新的任务信息？"
 
-#: ../calendar/calendar.error.xml.h:78
+#: ../calendar/calendar.error.xml.h:81
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4419,72 +2122,77 @@ msgstr ""
 "您正在连接到不支持的 GroupWise 服务器，此时使用 Evolution 可能遇到问题。为了"
 "得到最佳效果，服务器应该升级到支持的版本。"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:82
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:80
+#: ../calendar/calendar.error.xml.h:83
+#, fuzzy
+msgid "You have changed this meeting, but not yet saved it."
+msgstr "您已经对此任务做出了更改，但尚未保存。"
+
+#: ../calendar/calendar.error.xml.h:84
 msgid "You have changed this task, but not yet saved it."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "您已经对此备忘做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:83
+#: ../calendar/calendar.error.xml.h:87
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的备忘将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:85
-#: ../composer/mail-composer.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:89
+#: ../composer/mail-composer.error.xml.h:28
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:86 ../composer/e-composer-actions.c:497
+#: ../calendar/calendar.error.xml.h:90 ../composer/e-composer-actions.c:307
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:91
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:88
-#: ../composer/mail-composer.error.xml.h:34 ../mail/mail.error.xml.h:142
+#: ../calendar/calendar.error.xml.h:92
+#: ../composer/mail-composer.error.xml.h:32 ../mail/mail.error.xml.h:142
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:6
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:93
 msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:90
+#: ../calendar/calendar.error.xml.h:94
 msgid "{0}."
 msgstr "{0}。"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:258
+#: ../calendar/conduits/calendar/calendar-conduit.c:252
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件："
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1523
-#: ../calendar/conduits/calendar/calendar-conduit.c:1524
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
 #: ../calendar/conduits/memo/memo-conduit.c:821
 #: ../calendar/conduits/memo/memo-conduit.c:822
-#: ../calendar/conduits/todo/todo-conduit.c:1019
-#: ../calendar/conduits/todo/todo-conduit.c:1020
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "无法启动 evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1631
-#: ../calendar/conduits/calendar/calendar-conduit.c:1634
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
@@ -4498,195 +2206,126 @@ msgstr "无法读入 Pilot 的备忘应用程序块"
 msgid "Could not write pilot's Memo application block"
 msgstr "无法写入 Pilot 备忘应用程序块"
 
-#: ../calendar/conduits/todo/todo-conduit.c:241
+#: ../calendar/conduits/todo/todo-conduit.c:231
 msgid "Default Priority:"
 msgstr "默认优先级："
 
-#: ../calendar/conduits/todo/todo-conduit.c:1103
 #: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1148
 #: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "无法写入 Pilot ToDo 应用程序块"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2523
-msgid "Calendar and Tasks"
-msgstr "日历和任务"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:851
-#: ../calendar/gui/calendar-component.c:1325
-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 Memos component"
-msgstr "Evolution 备忘组件"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Tasks component"
-msgstr "Evolution 任务组件"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Memo_s"
-msgstr "备忘(_S)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:278 ../calendar/gui/e-memos.c:1133
-#: ../calendar/gui/gnome-cal.c:1821 ../calendar/gui/memos-component.c:586
-#: ../calendar/gui/memos-component.c:1016 ../calendar/gui/memos-control.c:350
-#: ../calendar/gui/memos-control.c:366
-msgid "Memos"
-msgstr "备忘"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:714 ../calendar/gui/e-tasks.c:1437
-#: ../calendar/gui/gnome-cal.c:1689 ../calendar/gui/print.c:1988
-#: ../calendar/gui/tasks-component.c:577
-#: ../calendar/gui/tasks-component.c:1005 ../calendar/gui/tasks-control.c:482
-#: ../calendar/gui/tasks-control.c:498
-#: ../calendar/importers/icalendar-importer.c:76
-#: ../calendar/importers/icalendar-importer.c:749
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:588
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:425
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:569
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
-msgid "Tasks"
-msgstr "任务"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-msgid "_Calendars"
-msgstr "日历(_C)"
-
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
-#: ../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-dialog.c:105
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:102
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分钟"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:120
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
-#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/caldav/caldav-source.c:431
-#: ../plugins/calendar-http/calendar-http.c:280
-#: ../plugins/calendar-weather/calendar-weather.c:525
-#: ../plugins/google-account-setup/google-source.c:672
-#: ../plugins/google-account-setup/google-contacts-source.c:339
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:117
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
+#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/calendar-file/calendar-file.c:294
+#: ../plugins/calendar-http/calendar-http.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:515
+#: ../plugins/google-account-setup/google-contacts-source.c:331
+#: ../plugins/google-account-setup/google-source.c:740
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "小时"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:298
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:287
 msgid "Start time"
 msgstr "开始时间"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:1
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:3
 msgid "Appointments"
 msgstr "约会"
 
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:2
+msgid "Dismiss _All"
+msgstr "全部错过(_A)"
+
 #. Location
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1608
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1614
-#: ../calendar/gui/e-itip-control.c:1167
-#: ../plugins/itip-formatter/itip-view.c:1018
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/e-itip-control.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "位置："
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:4
 msgid "Snooze _time:"
 msgstr "午睡时间(_T)："
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:5
 msgid "_Dismiss"
 msgstr "错过(_D)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:5
-#: ../calendar/gui/dialogs/comp-editor.c:1382
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:170
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:15
-#: ../plugins/publish-calendar/publish-calendar.glade.h:21
-#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:43
-#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-tasks.xml.h:25 ../ui/evolution.xml.h:42
-#: ../widgets/menus/gal-define-views.glade.h:5
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1065
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
+#: ../mail/e-mail-browser.c:111
+#: ../plugins/publish-calendar/publish-calendar.ui.h:23
+#: ../shell/e-shell-window-actions.c:1642
+#: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:7
 msgid "_Snooze"
 msgstr "午睡(_S)"
 
-#: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:9
 msgid "location of appointment"
 msgstr "约会位置"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1591
+#: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
+#: ../modules/addressbook/ldap-config.ui.h:32
+#: ../plugins/caldav/caldav-source.c:448
+#: ../plugins/calendar-file/calendar-file.c:293
+#: ../plugins/calendar-http/calendar-http.c:323
+#: ../plugins/calendar-weather/calendar-weather.c:514
+#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/google-account-setup/google-source.c:739
+msgid "minutes"
+msgstr "分钟"
+
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1436
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1558
 msgid "No summary available."
 msgstr "没有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1475
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1477
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1447
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1530
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1498
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个提醒"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1692
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1720
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1696
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1674
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4698,7 +2337,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1726
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1704
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4714,20 +2353,10 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1740
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
-#: ../calendar/gui/alarm-notify/notify-main.c:141
-msgid "Could not initialize Bonobo"
-msgstr "无法初始化 Bonobo"
-
-#: ../calendar/gui/alarm-notify/notify-main.c:154
-msgid ""
-"Could not create the alarm notify service factory, maybe it's already "
-"running..."
-msgstr "无法创建提醒服务车间，可能已经运行了..."
-
 #: ../calendar/gui/alarm-notify/util.c:44
 msgid "invalid time"
 msgstr "无效时间"
@@ -4763,7 +2392,7 @@ msgid "Alarm programs"
 msgstr "提醒程序"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
-#: ../mail/evolution-mail.schemas.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "在状态栏中显示错误的时间秒数。"
 
@@ -4784,270 +2413,336 @@ msgid "Calendars to run alarms for"
 msgstr "运行提醒的日历"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
+msgid "Check this to use system timezone in Evolution."
+msgstr "选中这个来在 Evolution 中使用系统时区。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在时间栏中绘制 Marcus Bains 线的颜色(默认为空)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日视图中绘制 Marcus Bains 线的颜色。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Compress weekends in month view"
 msgstr "在月视图中压缩周末"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Confirm expunge"
 msgstr "确认销毁"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+msgid "Count of default recurrence for a new event. -1 means forever."
+msgstr "一个新事件的默认重现次数。-1 代表永远重现。"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "标为工作日的日子。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Default appointment reminder"
 msgstr "默认约会提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#, fuzzy
+msgid "Default recurrence count"
+msgstr "默认提醒单位"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Default reminder units"
 msgstr "默认提醒单位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Default reminder value"
 msgstr "默认提醒值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Directory for saving alarm audio files"
 msgstr "保存提醒音频文件的目录"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Event Gradient"
 msgstr "事件渐变"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Event Transparency"
 msgstr "事件透明度"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Free/busy server URLs"
 msgstr "忙/闲服务器 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Free/busy template URL"
 msgstr "忙/闲模板 URL"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Gradient of the events in calendar views."
 msgstr "日历视图中事件的渐变。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hide completed tasks"
 msgstr "隐藏已完成的任务"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hide task units"
 msgstr "隐藏任务单位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Hide task value"
 msgstr "隐藏任务值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Horizontal pane position"
 msgstr "水平面板位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日结束的小时，以 24 小时格式表示，0 到 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "工作日开始的小时，以 24 小时格式表示，0 到 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+msgid "If \"true\", show the memo preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+msgid "If \"true\", show the task preview pane in the main window."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "日视图和工作日视图中显示的间隔，以分钟计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Last alarm time"
 msgstr "上次提醒时间"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
-#: ../mail/evolution-mail.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Level beyond which the message should be logged."
 msgstr "大于此级别的消息会被记录。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "List of recently used second time zones in a Day View."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "List of server URLs for free/busy publishing."
 msgstr "列出发表忙/闲的服务器 URL。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 线"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 线颜色 - 日视图"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 线颜色 - 日期栏"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Maximum number of recently used timezones to remember in a "
 "'day_second_zones' list."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid "Maximum number of recently used timezones to remember."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+msgid "Memo layout style"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+msgid "Memo preview pane position (horizontal)"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#, fuzzy
+msgid "Memo preview pane position (vertical)"
+msgstr "月视图中垂直面板的位置"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日结束的分钟，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日开始的分钟，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Month view horizontal pane position"
 msgstr "月视图水平面板的位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Month view vertical pane position"
 msgstr "月视图中垂直面板的位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Number of units for determining a default reminder."
 msgstr "确定默认提醒的单位数量。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Number of units for determining when to hide tasks."
 msgstr "决定何时隐藏任务的数字单位。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Overdue tasks color"
 msgstr "延期任务的颜色"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "非月视图中日期导航器日历和任务列表之间水平面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历之间水平面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+msgid "Position of the memo preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+msgid "Position of the task preview pane when oriented horizontally."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+msgid "Position of the task preview pane when oriented vertically."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "日历列表和日期导航器日历之间垂直面板的位置。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
-msgid ""
-"Position of the vertical pane, between the task list and the task preview "
-"pane, in pixels."
-msgstr "任务列表和任务预览面板间垂直面板的位置，以像素计。"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "月视图中视图和日期导航器日历及任务列表之间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr "非月视图中视图和日期导航器日历及任务列表之间垂直面板的位置，以像素计。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
+msgid "Primary calendar"
+msgstr "首选日历"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+msgid "Primary memo list"
+msgstr "首选备忘列表"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+msgid "Primary task list"
+msgstr "首选任务列表"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Programs that are allowed to be run by alarms."
 msgstr "允许提醒运行的程序。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Recently used second time zones in a Day View"
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
 msgid "Save directory for alarm audio"
 msgstr "保存提醒音频的目录"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
+msgid "Scroll Month View by a week"
+msgstr "通过一个周来滚动月视图"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示请回复域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid "Show appointment end times in week and month views"
 msgstr "在周视图和月视图中显示约会结束时间"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/会议/任务编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Show display alarms in notification tray"
 msgstr "在通知托盘中显示提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示状态域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
-#: ../mail/evolution-mail.schemas.in.h:126
-msgid "Show the \"Preview\" pane"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#, fuzzy
+msgid "Show the memo preview pane"
 msgstr "显示“预览”面板"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:60
-#: ../mail/evolution-mail.schemas.in.h:127
-msgid "Show the \"Preview\" pane."
-msgstr "显示“预览”面板。"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#, fuzzy
+msgid "Show the task preview pane"
+msgstr "显示“预览”面板"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Show week number in Day and Work Week View"
 msgstr "在日和工作日视图中显示周数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid "Show week numbers in date navigator"
 msgstr "在日期导航器中显示周数"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key."
 msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
-msgid "Tasks due today color"
-msgstr "今天到期的任务颜色"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
+msgid "Task layout style"
+msgstr ""
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
-msgid "Tasks vertical pane position"
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#, fuzzy
+msgid "Task preview pane position (horizontal)"
 msgstr "任务垂直面板位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#, fuzzy
+msgid "Task preview pane position (vertical)"
+msgstr "任务垂直面板位置"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+msgid "Tasks due today color"
+msgstr "今天到期的任务颜色"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -5056,7 +2751,7 @@ msgstr ""
 "用作忙/闲数据发布的 URL 模板，%u 将替换为电子邮件的用户部分，而 %d 将替换为域"
 "名。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -5064,342 +2759,192 @@ msgstr ""
 "日历中日期和时间所使用的默认时区，以未翻译的时区数据库位置表示，如“Asia/"
 "Shanghai”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the memo list. \"0\" (Classic View) places the preview pane below the memo "
+"list. \"1\" (Vertical View) places the preview pane next to the memo list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the task list. \"0\" (Classic View) places the preview pane below the task "
+"list. \"1\" (Vertical View) places the preview pane next to the task list."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "The second timezone for a Day View"
 msgstr "日视图的第二时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid ""
 "This can have three possible values. 0 for errors. 1 for warnings. 2 for "
 "debug messages."
 msgstr "此选项有三种可能值：0－错误，1－警告，2－调试信息。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Time divisions"
 msgstr "时间分割"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Time the last alarm ran, in time_t."
 msgstr "提醒上次运行的时间，以 time_t 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
-#: ../plugins/startup-wizard/startup-wizard.c:109
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Timezone"
 msgstr "时区"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "日历视图中事件的透明度，应该介于 0(透明)和 1(不透明)之间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "Twenty four hour time format"
 msgstr "二十四小时时间格式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+msgid "URI of the highlighted (\"primary\") calendar"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+msgid "URI of the highlighted (\"primary\") memo list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+msgid "URI of the highlighted (\"primary\") task list"
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "默认提醒的单位，可为“minutes”，“hours”或“days”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "决定是否隐藏任务的单位，可为“minutes”，“hours”或“days”。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+msgid "Use system timezone"
+msgstr "使用系统时区"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+msgid "Use the system timezone instead of the timezone selected in Evolution."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+msgid "Vertical pane position"
+msgstr "垂直面板的位置"
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
 msgid "Week start"
 msgstr "一周开始"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "一周开始的日子，从星期日(0)到星期六(6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
 msgid "Whether or not to use the notification tray for display alarms."
 msgstr "是否使用通知托盘来显示提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:107
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "删除约会或任务时是否要求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:108
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "销毁约会和任务时是否要求确认。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:109
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "在月视图中是否压缩周末；压缩时将把周六和周日用一个单元格显示。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:110
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在周视图和月视图中显示事件的结束时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:111
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在日历中绘制 Marcus Bains 线(当前时间线)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:112
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在任务视图中隐藏已完成的任务。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:113
+msgid "Whether to scroll a Month View by a week, not by a month."
+msgstr ""
+
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:114
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否为约会设置默认提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:115
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示请回复域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:116
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/会议编辑器中显示分类域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:117
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议中显示角色域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:118
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示状态域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:119
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是以 24 小时格式还是以 12 小时格式显示时间。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:96
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:120
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/会议编辑器中显示时区域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:97
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:121
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/任务/会议编辑器中显示类型域"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:98
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:122
 msgid "Whether to show week number in the Day and Work Week View."
 msgstr "是否在日视图和工作日视图中显示周数。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:99
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:123
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期导航器中显示周数。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:100
-msgid "Whether to use daylight savings time while displaying events."
-msgstr "在显示事件时使用是否夏时制时间。"
-
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:101
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:124
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:102
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:125
 msgid "Workday end hour"
 msgstr "工作日结束小时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:103
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:126
 msgid "Workday end minute"
 msgstr "工作日结束分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:104
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:127
 msgid "Workday start hour"
 msgstr "工作日开始小时"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:105
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:128
 msgid "Workday start minute"
 msgstr "工作日开始分钟"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:106
-msgid "daylight savings time"
-msgstr "夏时制时间"
-
-#: ../calendar/gui/cal-search-bar.c:75
-msgid "Summary contains"
-msgstr "概要含有"
-
-#: ../calendar/gui/cal-search-bar.c:76
-msgid "Description contains"
-msgstr "描述含有"
-
-#: ../calendar/gui/cal-search-bar.c:77
-msgid "Category is"
-msgstr "类别为"
-
-#: ../calendar/gui/cal-search-bar.c:78
-msgid "Comment contains"
-msgstr "注释含有"
-
-#: ../calendar/gui/cal-search-bar.c:79
-msgid "Location contains"
-msgstr "位置含有"
-
-#: ../calendar/gui/cal-search-bar.c:640
-msgid "Next 7 Days' Tasks"
-msgstr "下一周的任务"
-
-#: ../calendar/gui/cal-search-bar.c:644
-msgid "Active Tasks"
-msgstr "活动任务"
-
-#: ../calendar/gui/cal-search-bar.c:648
-msgid "Overdue Tasks"
-msgstr "延期任务"
-
-#: ../calendar/gui/cal-search-bar.c:652
-msgid "Completed Tasks"
-msgstr "已完成任务"
-
-#: ../calendar/gui/cal-search-bar.c:656
-msgid "Tasks with Attachments"
-msgstr "有附件的任务"
-
-#: ../calendar/gui/cal-search-bar.c:702
-msgid "Active Appointments"
-msgstr "活动约会"
-
-#: ../calendar/gui/cal-search-bar.c:706
-msgid "Next 7 Days' Appointments"
-msgstr "下一周的约会"
-
-#: ../calendar/gui/calendar-commands.c:90 ../ui/evolution-addressbook.xml.h:26
-#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "打印"
-
-#: ../calendar/gui/calendar-commands.c:315
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"该操作将永久删除所有比选中时间量早的事件。如果您继续，您将无法恢复这些事件。"
-
-#: ../calendar/gui/calendar-commands.c:321
-msgid "Purge events older than"
-msgstr "销毁较早的事件"
-
-#: ../calendar/gui/calendar-commands.c:326
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
-#: ../plugins/caldav/caldav-source.c:432
-#: ../plugins/calendar-http/calendar-http.c:281
-#: ../plugins/calendar-weather/calendar-weather.c:526
-#: ../plugins/google-account-setup/google-source.c:673
-#: ../plugins/google-account-setup/google-contacts-source.c:340
-#: ../widgets/misc/e-send-options.glade.h:39
-msgid "days"
-msgstr "天"
-
-#. Create the On the web source group
-#. Create the LDAP source group
-#. Create the Webcal source group
-#. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:281
-#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:505
-#: ../calendar/gui/migration.c:604 ../calendar/gui/migration.c:1118
-#: ../calendar/gui/tasks-component.c:231
-msgid "On The Web"
-msgstr "网上"
-
-#: ../calendar/gui/calendar-component.c:318 ../calendar/gui/migration.c:399
-msgid "Birthdays & Anniversaries"
-msgstr "生日和纪念日"
-
-#. Create the weather group
-#: ../calendar/gui/calendar-component.c:331
-#: ../plugins/calendar-weather/calendar-weather.c:126
-msgid "Weather"
-msgstr "天气"
-
-#: ../calendar/gui/calendar-component.c:658
-msgid "_New Calendar"
-msgstr "新建日历(_N)"
-
-#: ../calendar/gui/calendar-component.c:659
-#: ../calendar/gui/memos-component.c:500 ../calendar/gui/tasks-component.c:491
-#: ../mail/em-folder-tree.c:2124
-msgid "_Copy..."
-msgstr "复制(_C)..."
-
-#: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/memos-component.c:505 ../calendar/gui/tasks-component.c:496
-msgid "_Make available for offline use"
-msgstr "标为可脱机使用(_M)"
-
-#: ../calendar/gui/calendar-component.c:665
-#: ../calendar/gui/memos-component.c:506 ../calendar/gui/tasks-component.c:497
-msgid "_Do not make available for offline use"
-msgstr "不标为可脱机使用(_D)"
-
-#: ../calendar/gui/calendar-component.c:995
-msgid "Failed upgrading calendars."
-msgstr "升级日历失败。"
-
-#: ../calendar/gui/calendar-component.c:1176
-#, c-format
-msgid "Unable to open the calendar '%s' for creating events and meetings"
-msgstr "无法打开日历“%s”来创建事件和会议"
-
-#: ../calendar/gui/calendar-component.c:1192
-msgid "There is no calendar available for creating events and meetings"
-msgstr "没有可创建事件和会议的日历"
-
-#: ../calendar/gui/calendar-component.c:1305
-msgid "Calendar Source Selector"
-msgstr "日历源选择器"
-
-#: ../calendar/gui/calendar-component.c:1521
-msgid "New appointment"
-msgstr "新建约会"
-
-#: ../calendar/gui/calendar-component.c:1522
-msgctxt "New"
-msgid "_Appointment"
-msgstr "约会(_A)"
-
-#: ../calendar/gui/calendar-component.c:1523
-msgid "Create a new appointment"
-msgstr "创建新约会"
-
-#: ../calendar/gui/calendar-component.c:1529
-msgid "New meeting"
-msgstr "新建会议"
-
-#: ../calendar/gui/calendar-component.c:1530
-msgctxt "New"
-msgid "M_eeting"
-msgstr "会议(_E)"
-
-#: ../calendar/gui/calendar-component.c:1531
-msgid "Create a new meeting request"
-msgstr "创建一条新会议请求"
-
-#: ../calendar/gui/calendar-component.c:1537
-msgid "New all day appointment"
-msgstr "新建全天约会"
-
-#: ../calendar/gui/calendar-component.c:1538
-msgctxt "New"
-msgid "All Day A_ppointment"
-msgstr "全天约会(_P)"
-
-#: ../calendar/gui/calendar-component.c:1539
-msgid "Create a new all-day appointment"
-msgstr "创建新全天约会"
-
-#: ../calendar/gui/calendar-component.c:1545
-msgid "New calendar"
-msgstr "新建日历"
-
-#: ../calendar/gui/calendar-component.c:1546
-msgctxt "New"
-msgid "Cale_ndar"
-msgstr "日历(_N)"
-
-#: ../calendar/gui/calendar-component.c:1547
-msgid "Create a new calendar"
-msgstr "创建新日历"
+#: ../calendar/gui/cal-editor-utils.c:102
+msgid "Invalid object"
+msgstr "无效的对象"
 
 #: ../calendar/gui/calendar-view-factory.c:113
 msgid "Day View"
@@ -5439,20 +2984,22 @@ msgid "Category"
 msgstr "类别"
 
 #: ../calendar/gui/caltypes.xml.h:6 ../calendar/gui/memotypes.xml.h:5
-#: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "分类"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:249
-#: ../calendar/gui/e-cal-model.c:352 ../calendar/gui/e-calendar-table.c:557
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
 #: ../calendar/gui/memotypes.xml.h:6
+#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "机密"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:7
 #: ../calendar/gui/tasktypes.xml.h:10
-#: ../plugins/plugin-manager/plugin-manager.c:59
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../plugins/plugin-manager/plugin-manager.c:60
+#: ../widgets/misc/e-attachment-tree-view.c:496
+#: ../widgets/table/e-table-config.ui.h:6
 msgid "Description"
 msgstr "描述"
 
@@ -5471,35 +3018,43 @@ msgstr "不存在"
 msgid "Exist"
 msgstr "存在"
 
-#: ../calendar/gui/caltypes.xml.h:13
-#: ../calendar/gui/dialogs/meeting-page.glade.h:6
-#: ../calendar/gui/memotypes.xml.h:11 ../calendar/gui/tasktypes.xml.h:19
+#: ../calendar/gui/caltypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../plugins/save-calendar/csv-format.c:368
+msgid "Location"
+msgstr "位置"
+
+#: ../calendar/gui/caltypes.xml.h:13 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/tasktypes.xml.h:19
 msgid "Organizer"
 msgstr "组织者"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:248
-#: ../calendar/gui/e-cal-model.c:350 ../calendar/gui/e-calendar-table.c:556
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "保密"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:247
-#: ../calendar/gui/e-cal-model.c:341 ../calendar/gui/e-cal-model.c:348
-#: ../calendar/gui/e-calendar-table.c:555 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
+#: ../calendar/gui/e-calendar-table.c:693 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "公开"
 
 #: ../calendar/gui/caltypes.xml.h:16
-#: ../calendar/gui/dialogs/event-editor.c:304
+#: ../calendar/gui/dialogs/event-editor.c:294
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
 msgid "Recurrence"
 msgstr "再现"
 
 #: ../calendar/gui/caltypes.xml.h:17
-#: ../calendar/gui/e-cal-list-view.etspec.h:5
-#: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:14
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:13
+#: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "概要"
 
@@ -5519,504 +3074,521 @@ msgid "does not contain"
 msgstr "不含有"
 
 #: ../calendar/gui/caltypes.xml.h:21 ../calendar/gui/memotypes.xml.h:18
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:30
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:31
 msgid "is"
 msgstr "是"
 
 #: ../calendar/gui/caltypes.xml.h:22 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:36
+#: ../calendar/gui/tasktypes.xml.h:30 ../mail/em-filter-i18n.h:37
 msgid "is not"
 msgstr "不是"
 
-#: ../calendar/gui/comp-editor-factory.c:409
-msgid "Error while opening the calendar"
-msgstr "打开日历时出错"
-
-#: ../calendar/gui/comp-editor-factory.c:415
-msgid "Method not supported when opening the calendar"
-msgstr "打开日历的方法不支持"
-
-#: ../calendar/gui/comp-editor-factory.c:421
-msgid "Permission denied to open the calendar"
-msgstr "没有权限打开日历"
-
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1271
-msgid "Unknown error"
-msgstr "未知的错误"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:601
+#: ../calendar/gui/dialogs/alarm-dialog.c:626
 msgid "Edit Alarm"
 msgstr "编辑提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
-msgid "<b>Alarm</b>"
-msgstr "<b>提醒</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:817
+#: ../calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr "弹出警告"
+
+#: ../calendar/gui/dialogs/alarm-dialog.c:818
+#: ../calendar/gui/e-alarm-list.c:444
+msgid "Play a sound"
+msgstr "播放声音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
-msgid "<b>Options</b>"
-msgstr "<b>选项</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:819
+#: ../calendar/gui/e-alarm-list.c:456
+msgid "Run a program"
+msgstr "运行程序"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
-msgid "<b>Repeat</b>"
-msgstr "<b>重复</b>"
+#: ../calendar/gui/dialogs/alarm-dialog.c:820
+#: ../calendar/gui/e-alarm-list.c:452
+msgid "Send an email"
+msgstr "发送电子邮件"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
 msgid "Add Alarm"
 msgstr "添加提醒"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
+msgid "Alarm"
+msgstr "提醒"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
 msgid "Custom _message"
 msgstr "自定义消息(_M)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 msgid "Custom alarm sound"
 msgstr "自定义提醒声音"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 msgid "Mes_sage:"
 msgstr "消息(_S)："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
-#: ../calendar/gui/e-alarm-list.c:444
-msgid "Play a sound"
-msgstr "播放声音"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:9
-#: ../calendar/gui/e-alarm-list.c:448
-msgid "Pop up an alert"
-msgstr "弹出警告"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../mail/mail-config.ui.h:76
+msgid "Options"
+msgstr "选项"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
-#: ../calendar/gui/e-alarm-list.c:456
-msgid "Run a program"
-msgstr "运行程序"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
+msgid "Repeat"
+msgstr "重复"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 msgid "Select A File"
 msgstr "选择一个文件"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
 msgid "Send To:"
 msgstr "发送给："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
-#: ../calendar/gui/e-alarm-list.c:452
-msgid "Send an email"
-msgstr "发送电子邮件"
-
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
 msgid "_Arguments:"
 msgstr "参数(_A)："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "_Program:"
 msgstr "程序(_P)："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the alarm"
 msgstr "重复提醒(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13
 msgid "_Sound:"
 msgstr "声音(_S)："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "after"
 msgstr "之后"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
 msgid "before"
 msgstr "之前"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:7
 msgid "day(s)"
 msgstr "天"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
+#: ../modules/calendar/e-cal-shell-view-actions.c:335
+#: ../plugins/caldav/caldav-source.c:450
+#: ../plugins/calendar-file/calendar-file.c:295
+#: ../plugins/calendar-http/calendar-http.c:325
+#: ../plugins/calendar-weather/calendar-weather.c:516
+#: ../plugins/google-account-setup/google-contacts-source.c:332
+#: ../plugins/google-account-setup/google-source.c:741
+#: ../plugins/publish-calendar/publish-calendar.ui.h:30
+#: ../widgets/misc/e-send-options.ui.h:38
+msgid "days"
+msgstr "天"
+
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "end of appointment"
 msgstr "约会结束"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "extra times every"
 msgstr "每个额外时间"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "hour(s)"
 msgstr "小时"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "minute(s)"
 msgstr "分钟"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:24
 msgid "start of appointment"
 msgstr "约会开始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:244
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:242
 msgid "Action/Trigger"
 msgstr "动作/触发器"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 msgid "A_dd"
 msgstr "添加(_D)"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
-#: ../calendar/gui/dialogs/event-page.glade.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:4
 msgid "Alarms"
 msgstr "提醒"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:81
-#: ../composer/e-composer-actions.c:62
-msgid "_Suggest automatic display of attachment"
-msgstr "建议自动显示附件(_S)"
-
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:142
-msgid "Attach file(s)"
-msgstr "添加附件"
-
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:144
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:193
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-#: ../calendar/gui/dialogs/event-page.c:2954
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:673
-#: ../calendar/gui/e-day-view-time-item.c:788
-#: ../calendar/gui/e-itip-control.c:1153 ../filter/filter-rule.c:945
-#: ../mail/em-account-editor.c:684 ../mail/em-account-editor.c:1408
-#: ../mail/em-account-prefs.c:438 ../mail/em-junk-hook.c:93
-#: ../plugins/calendar-weather/calendar-weather.c:333
-#: ../plugins/calendar-weather/calendar-weather.c:387
-#: ../plugins/email-custom-header/email-custom-header.c:370
-#: ../plugins/exchange-operations/exchange-delegates-user.c:195
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:2179
-#: ../widgets/misc/e-cell-date-edit.c:305 ../widgets/misc/e-dateedit.c:1511
-#: ../widgets/misc/e-dateedit.c:1725
-#: ../widgets/misc/e-signature-combo-box.c:74
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:106
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:155
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:23
+#: ../calendar/gui/dialogs/event-page.c:2940
+#: ../calendar/gui/e-cal-model-tasks.c:727
+#: ../calendar/gui/e-day-view-time-item.c:798
+#: ../calendar/gui/e-itip-control.c:1148 ../filter/e-filter-rule.c:744
+#: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
+#: ../modules/mail/e-mail-junk-hook.c:88
+#: ../plugins/calendar-weather/calendar-weather.c:324
+#: ../plugins/calendar-weather/calendar-weather.c:378
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/itip-formatter/itip-formatter.c:2300
+#: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
+#: ../widgets/misc/e-dateedit.c:1894 ../widgets/misc/e-send-options.ui.h:11
+#: ../widgets/misc/e-signature-combo-box.c:75
+#: ../widgets/table/e-cell-date-edit.c:312
 msgid "None"
 msgstr "无"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:621
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:182
+#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-timezone-entry.c:319
+msgid "Select..."
+msgstr "选择..."
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
 msgid "Selected Calendars for Alarms"
 msgstr "已选择用于提醒的日历"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
-msgid "(Shown in a Day View)"
-msgstr "(在日视图中显示)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:787
+msgid "Time and date:"
+msgstr "时间和日期："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:2
-msgid ""
-"60 minutes\n"
-"30 minutes\n"
-"15 minutes\n"
-"10 minutes\n"
-"05 minutes"
-msgstr ""
-"60 分钟\n"
-"30 分钟\n"
-"15 分钟\n"
-"10 分钟\n"
-"5 分钟"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:788
+msgid "Date only:"
+msgstr "只有日期："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#, no-c-format
-msgid ""
-"<i>%u and %d will be replaced by user and domain from the email address.</i>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:2
+#, fuzzy, no-c-format
+msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
-#: ../mail/mail-config.glade.h:10
-msgid "<span weight=\"bold\">Alerts</span>"
-msgstr "<span weight=\"bold\">警告</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:3
+msgid "(Shown in a Day View)"
+msgstr "(在日视图中显示)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
-msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
-msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:4
+msgid "05 minutes"
+msgstr "05 分钟"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-#: ../mail/mail-config.glade.h:17
-#: ../plugins/publish-calendar/publish-calendar.glade.h:1
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">常规</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:5
+msgid "10 minutes"
+msgstr "10 分钟"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
-msgid "<span weight=\"bold\">Task List</span>"
-msgstr "<span weight=\"bold\">任务列表</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:6
+msgid "15 minutes"
+msgstr "15 分钟"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
-msgid "<span weight=\"bold\">Time</span>"
-msgstr "<span weight=\"bold\">时间</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:7
+msgid "30 minutes"
+msgstr "30 分钟"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-msgid "<span weight=\"bold\">Work Week</span>"
-msgstr "<span weight=\"bold\">工作日</span>"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:8
+msgid "60 minutes"
+msgstr "60 分钟"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
-msgid "Adjust for daylight sa_ving time"
-msgstr "调整夏时制时间(_V)"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:10 ../mail/mail-config.ui.h:6
+msgid "Alerts"
+msgstr "提醒"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:11
+#: ../mail/mail-config.ui.h:28
+#: ../modules/addressbook/autocompletion-config.c:153
+msgid "Date/Time Format"
+msgstr "日期/时间格式"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:12
 msgid "Day _ends:"
 msgstr "一天结束(_E)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:13
+msgid "Days"
+msgstr "天"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:14
+msgid "Default Free/Busy Server"
+msgstr "默认闲/忙服务器"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:15
 msgid "Display"
 msgstr "显示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../calendar/gui/dialogs/recurrence-page.c:1120
-#: ../calendar/gui/e-itip-control.c:733
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:16
+msgid "Display alarms in _notification area only"
+msgstr "只在通知区域显示提醒(_N)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-msgid ""
-"Minutes\n"
-"Hours\n"
-"Days"
-msgstr ""
-"分钟\n"
-"小时\n"
-"天"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:19
+#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:389
+#: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
+#: ../modules/addressbook/addressbook-config.c:985
+#: ../plugins/itip-formatter/itip-formatter.c:2654
+#: ../plugins/publish-calendar/publish-calendar.ui.h:7
+#: ../smime/gui/smime-ui.ui.h:24
+msgid "General"
+msgstr "常规"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/recurrence-page.c:1116
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:20
+msgid "Hours"
+msgstr "小时"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:21
+msgid "Minutes"
+msgstr "分钟"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.c:1109
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid ""
-"Monday\n"
-"Tuesday\n"
-"Wednesday\n"
-"Thursday\n"
-"Friday\n"
-"Saturday\n"
-"Sunday"
-msgstr ""
-"星期一\n"
-"星期二\n"
-"星期三\n"
-"星期四\n"
-"星期五\n"
-"星期六\n"
-"星期日"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../mail/mail-config.glade.h:114
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:24
+#: ../mail/mail-config.ui.h:80
 msgid "Pick a color"
 msgstr "选取一种颜色"
 
-#. Sunday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:25
 msgid "S_un"
 msgstr "周日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1121
-#: ../calendar/gui/e-itip-control.c:734
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:26
+#: ../calendar/gui/dialogs/recurrence-page.c:1114
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Saturday"
 msgstr "星期六"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:27
+msgid "Sc_roll Month View by a week"
+msgstr "通过一个周来滚动月视图(_R)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:28
 msgid "Se_cond zone:"
 msgstr "第二时区(_C)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:29
 msgid "Select the calendars for alarm notification"
 msgstr "选择用于提醒的日历"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:30
 msgid "Sh_ow a reminder"
 msgstr "显示一条提醒(_O)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:31
 msgid "Show a _reminder"
 msgstr "显示一条提醒(_R)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:32
 msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:33
 msgid "Show week n_umber in Day and Work Week View"
 msgstr "在日视图和工作日视图中显示周数(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1122
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:34
+#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/e-itip-control.c:734
 msgid "Sunday"
 msgstr "星期日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:35
 msgid "T_asks due today:"
 msgstr "今天到期的任务(_A)："
 
-#. Thursday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:36
 msgid "T_hu"
 msgstr "周四(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:37
+#: ../calendar/gui/dialogs/calendar-setup.c:379
+msgid "Task List"
+msgstr "任务列表"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:38
 msgid "Template:"
 msgstr "模板："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: ../calendar/gui/dialogs/recurrence-page.c:1119
-#: ../calendar/gui/e-itip-control.c:732
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:39
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Thursday"
 msgstr "星期四"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:40
+#: ../e-util/e-non-intrusive-error-dialog.c:282
+#: ../widgets/misc/e-dateedit.c:608
+msgid "Time"
+msgstr "时间"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:41
+#: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Time _zone:"
 msgstr "时区(_Z)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:42
 msgid "Time format:"
 msgstr "时间格式："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-#: ../calendar/gui/dialogs/recurrence-page.c:1117
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:43
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Tuesday"
 msgstr "星期二"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:44
+msgid "Use s_ystem time zone"
+msgstr "显示系统时区(_Y)"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:45
+#: ../calendar/gui/dialogs/recurrence-page.c:1111
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Wednesday"
 msgstr "星期三"
 
-#. A weekday like "Monday" follows
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:46
 msgid "Wee_k starts on:"
 msgstr "一周开始于(_K)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
+#: ../modules/calendar/e-cal-shell-view-actions.c:1617
+msgid "Work Week"
+msgstr "工作日"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:48
 msgid "Work days:"
 msgstr "工作日："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小时(上/下午)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:50
 msgid "_24 hour"
 msgstr "_24 小时"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:52
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:53
 msgid "_Day begins:"
 msgstr "一天开始(_D)："
 
-#. Friday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:54
 msgid "_Fri"
 msgstr "周五(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:55
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
-#. Monday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:66
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:56
 msgid "_Mon"
 msgstr "周一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:67
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:57
 msgid "_Overdue tasks:"
 msgstr "延期任务(_O)："
 
-#. Saturday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:69
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:58
 msgid "_Sat"
 msgstr "周六(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:70
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "在周视图和月视图中显示约会结束时间(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:60
 msgid "_Time divisions:"
 msgstr "时间分割(_T)："
 
-#. Tuesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:73
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:61
 msgid "_Tue"
 msgstr "周二(_T)"
 
-#. Wednesday
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:75
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:62
 msgid "_Wed"
 msgstr "周三(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:76
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:63
 msgid "before every anniversary/birthday"
-msgstr ""
+msgstr "在每个周年/生日前"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:77
+#: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:64
 msgid "before every appointment"
 msgstr "在每次约会前"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:271
+#: ../calendar/gui/dialogs/calendar-setup.c:153
+msgid "Type:"
+msgstr "类型："
+
+#: ../calendar/gui/dialogs/calendar-setup.c:169
+#: ../modules/addressbook/addressbook-config.c:500
+msgid "_Type:"
+msgstr "类型(_T)："
+
+#: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
+#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../plugins/groupwise-features/properties.ui.h:11
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
+#: ../widgets/misc/e-signature-script-dialog.c:282
+msgid "_Name:"
+msgstr "名称(_N)："
+
+#: ../calendar/gui/dialogs/calendar-setup.c:270
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "将日历内容复制到本地以进行脱机操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:273
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "将任务列表内容复制到本地以进行脱机操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:275
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "将备忘列表内容复制到本地以进行脱机操作(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:345
+#: ../calendar/gui/dialogs/calendar-setup.c:344
 msgid "Colo_r:"
 msgstr "颜色(_R)："
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
-msgid "Task List"
-msgstr "任务列表"
-
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:390
 msgid "Memo List"
 msgstr "备忘列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:476
+#: ../calendar/gui/dialogs/calendar-setup.c:475
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:532
+#: ../calendar/gui/dialogs/calendar-setup.c:531
 msgid "New Task List"
 msgstr "新建任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "Memo List Properties"
 msgstr "备忘列表属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:588
+#: ../calendar/gui/dialogs/calendar-setup.c:587
 msgid "New Memo List"
 msgstr "新建备忘列表"
 
@@ -6069,295 +3641,234 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:186 ../calendar/gui/print.c:2362
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2391
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:190 ../calendar/gui/print.c:2366
+#: ../calendar/gui/dialogs/comp-editor-util.c:195 ../calendar/gui/print.c:2395
 msgid " (Completed "
 msgstr " (完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:192 ../calendar/gui/print.c:2368
+#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2397
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:197 ../calendar/gui/print.c:2373
+#: ../calendar/gui/dialogs/comp-editor-util.c:202 ../calendar/gui/print.c:2402
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:199 ../calendar/gui/print.c:2375
+#: ../calendar/gui/dialogs/comp-editor-util.c:204 ../calendar/gui/print.c:2404
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:239
-#, c-format
-msgid "Attached message - %s"
-msgstr "附加的信件 - %s"
-
-#. translators, this count will always be >1
-#: ../calendar/gui/dialogs/comp-editor.c:244
-#: ../calendar/gui/dialogs/comp-editor.c:417 ../composer/e-msg-composer.c:1765
-#: ../composer/e-msg-composer.c:1984
-#, c-format
-msgid "Attached message"
-msgid_plural "%d attached messages"
-msgstr[0] "%d 封附加的信件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:488 ../composer/e-msg-composer.c:2052
-#: ../mail/em-folder-tree.c:1006 ../mail/em-folder-utils.c:364
-#: ../mail/em-folder-view.c:1183 ../mail/message-list.c:2105
-msgid "_Move"
-msgstr "移动(_M)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:490 ../composer/e-msg-composer.c:2054
-#: ../mail/em-folder-tree.c:1008 ../mail/message-list.c:2107
-msgid "Cancel _Drag"
-msgstr "取消拖曳(_D)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:623
-#: ../calendar/gui/dialogs/comp-editor.c:3301 ../mail/em-utils.c:372
-#: ../plugins/prefer-plain/prefer-plain.c:91
-#: ../widgets/misc/e-attachment-bar.c:453
-msgid "attachment"
-msgstr "附件"
+#: ../calendar/gui/dialogs/comp-editor.c:241
+msgid "Could not save attachments"
+msgstr "不能保存附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:849
+#: ../calendar/gui/dialogs/comp-editor.c:504
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:938
+#: ../calendar/gui/dialogs/comp-editor.c:599
 msgid "Edit Appointment"
 msgstr "编辑约会"
 
-#: ../calendar/gui/dialogs/comp-editor.c:945
+#: ../calendar/gui/dialogs/comp-editor.c:606
 #, c-format
 msgid "Meeting - %s"
 msgstr "会议 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:947
+#: ../calendar/gui/dialogs/comp-editor.c:608
 #, c-format
 msgid "Appointment - %s"
 msgstr "约会 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:953
+#: ../calendar/gui/dialogs/comp-editor.c:614
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "分配的任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:955
+#: ../calendar/gui/dialogs/comp-editor.c:616
 #, c-format
 msgid "Task - %s"
 msgstr "任务 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:960
+#: ../calendar/gui/dialogs/comp-editor.c:621
 #, c-format
 msgid "Memo - %s"
 msgstr "备忘 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:976
+#: ../calendar/gui/dialogs/comp-editor.c:637
 msgid "No Summary"
 msgstr "没有概要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1117
+#: ../calendar/gui/dialogs/comp-editor.c:791
 msgid "Keep original item?"
-msgstr ""
+msgstr "保留原始条目？"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1312
+#: ../calendar/gui/dialogs/comp-editor.c:995
 msgid "Click here to close the current window"
 msgstr "单击此处可关闭当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1319
+#: ../calendar/gui/dialogs/comp-editor.c:1002
 msgid "Copy selected text to the clipboard"
 msgstr "将选中文字复制到剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1326
+#: ../calendar/gui/dialogs/comp-editor.c:1009
 msgid "Cut selected text to the clipboard"
 msgstr "将选中文字剪切到剪贴板"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1333
+#: ../calendar/gui/dialogs/comp-editor.c:1016
 msgid "Click here to view help available"
 msgstr "单击此处可查看可用的帮助"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1340
+#: ../calendar/gui/dialogs/comp-editor.c:1023
 msgid "Paste text from the clipboard"
 msgstr "从剪贴板中粘贴文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1044
 msgid "Click here to save the current window"
 msgstr "单击此处可保存当前窗口"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../calendar/gui/dialogs/comp-editor.c:1051
 msgid "Select all text"
 msgstr "选中所有文字"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1375
+#: ../calendar/gui/dialogs/comp-editor.c:1058
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
-#: ../mail/mail-signature-editor.c:208
-#: ../ui/evolution-mail-messagedisplay.xml.h:6 ../ui/evolution.xml.h:43
+#: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
+#: ../shell/e-shell-window-actions.c:1649
+#: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../ui/evolution-calendar.xml.h:44 ../ui/evolution-mail-global.xml.h:24
-#: ../ui/evolution.xml.h:46
+#: ../calendar/gui/dialogs/comp-editor.c:1079
+#: ../shell/e-shell-window-actions.c:1656
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1086
 msgid "_Insert"
 msgstr "插入(_I)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1093
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1417 ../mail/em-folder-tree.c:2116
-#: ../ui/evolution-addressbook.xml.h:64 ../ui/evolution-mail-global.xml.h:34
-#: ../ui/evolution-mail-messagedisplay.xml.h:8 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:55
+#: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:118
+#: ../shell/e-shell-window-actions.c:1691
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1427
-#: ../composer/e-composer-actions.c:469
+#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../composer/e-composer-actions.c:279
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1429
+#: ../calendar/gui/dialogs/comp-editor.c:1112
 msgid "Click here to attach a file"
 msgstr "单击此处可便附加文件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1437
+#: ../calendar/gui/dialogs/comp-editor.c:1120
 msgid "_Categories"
 msgstr "类别(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1439
+#: ../calendar/gui/dialogs/comp-editor.c:1122
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1445
+#: ../calendar/gui/dialogs/comp-editor.c:1128
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1447
+#: ../calendar/gui/dialogs/comp-editor.c:1130
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1456
+#: ../calendar/gui/dialogs/comp-editor.c:1139
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1458
+#: ../calendar/gui/dialogs/comp-editor.c:1141
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1463
+#: ../calendar/gui/dialogs/comp-editor.c:1146
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1465
+#: ../calendar/gui/dialogs/comp-editor.c:1148
 msgid "Classify as private"
 msgstr "分类为私人"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1470
+#: ../calendar/gui/dialogs/comp-editor.c:1153
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1472
+#: ../calendar/gui/dialogs/comp-editor.c:1155
 msgid "Classify as confidential"
 msgstr "分类为机密"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1480
+#: ../calendar/gui/dialogs/comp-editor.c:1163
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1482
+#: ../calendar/gui/dialogs/comp-editor.c:1165
 msgid "Toggles whether the Role field is displayed"
 msgstr "切换是否显示角色域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1488
+#: ../calendar/gui/dialogs/comp-editor.c:1171
 msgid "_RSVP"
 msgstr "请回复(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1490
+#: ../calendar/gui/dialogs/comp-editor.c:1173
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切换是否显示请回复域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1496
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "_Status Field"
 msgstr "状态域(_S)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1498
+#: ../calendar/gui/dialogs/comp-editor.c:1181
 msgid "Toggles whether the Status field is displayed"
 msgstr "切换是否显示状态域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1504
+#: ../calendar/gui/dialogs/comp-editor.c:1187
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1506
+#: ../calendar/gui/dialogs/comp-editor.c:1189
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "切换是否显示出席者类型域"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1820
-#: ../composer/e-composer-private.c:64 ../widgets/misc/e-attachment-bar.c:1376
+#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../composer/e-composer-private.c:70
 msgid "Recent _Documents"
 msgstr "最近文档(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1839
-#: ../composer/e-composer-actions.c:696
+#: ../calendar/gui/dialogs/comp-editor.c:1690
+#: ../composer/e-composer-actions.c:475
 msgid "Attach"
 msgstr "附件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1934
-#, c-format
-msgid "<b>%d</b> Attachment"
-msgid_plural "<b>%d</b> Attachments"
-msgstr[0] "<b>%d</b> 个附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1966
-msgid "Hide Attachment _Bar"
-msgstr "隐藏附件栏(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1969
-#: ../calendar/gui/dialogs/comp-editor.c:2272
-msgid "Show Attachment _Bar"
-msgstr "显示附件栏(_B)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2083
-#: ../calendar/gui/dialogs/event-page.c:1876
-#: ../calendar/gui/dialogs/task-page.c:1198 ../composer/e-msg-composer.c:1039
-#: ../plugins/groupwise-features/junk-settings.glade.h:8
-#: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "_Remove"
-msgstr "删除(_R)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2086
-#: ../composer/e-msg-composer.c:1042
-#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
-msgid "_Add attachment..."
-msgstr "添加附件(_A)..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:2294
-#: ../mail/em-format-html-display.c:2380
-msgid "Show Attachments"
-msgstr "显示附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2295
-msgid "Press space key to toggle attachment bar"
-msgstr "按空格键可切换附件栏"
+#: ../calendar/gui/dialogs/comp-editor.c:1745
+msgid "Save"
+msgstr "保存"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2440
-#: ../calendar/gui/dialogs/comp-editor.c:2488
-#: ../calendar/gui/dialogs/comp-editor.c:3334
+#: ../calendar/gui/dialogs/comp-editor.c:2022
+#: ../calendar/gui/dialogs/comp-editor.c:2071
+#: ../calendar/gui/dialogs/comp-editor.c:2960
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3363
+#: ../calendar/gui/dialogs/comp-editor.c:2928
+#: ../plugins/prefer-plain/prefer-plain.c:67
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:2990
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
@@ -6373,7 +3884,7 @@ msgstr "无法打开目的"
 msgid "Destination is read only"
 msgstr "目的只读"
 
-#: ../calendar/gui/dialogs/delete-comp.c:205
+#: ../calendar/gui/dialogs/delete-comp.c:214
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr "从全部其它收件人的邮箱中删除此项吗？(_D)"
 
@@ -6425,280 +3936,285 @@ msgstr "由于错误，无法删除备忘"
 msgid "The item could not be deleted due to an error"
 msgstr "由于错误，无法删除项目"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Contacts..."
 msgstr "联系人..."
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:2
-#: ../plugins/exchange-operations/exchange-delegates.c:417
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 msgid "Delegate To:"
 msgstr "授权给："
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:202
+#: ../calendar/gui/dialogs/event-editor.c:201
 msgid "_Alarms"
 msgstr "提醒(_A)"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
+#: ../calendar/gui/dialogs/event-editor.c:203
 msgid "Click here to set or unset alarms for this event"
 msgstr "单击此处以设定或取消此事件的提醒"
 
-#: ../calendar/gui/dialogs/event-editor.c:209
+#: ../calendar/gui/dialogs/event-editor.c:208
 msgid "_Recurrence"
 msgstr "再现(_R)"
 
-#: ../calendar/gui/dialogs/event-editor.c:211
+#: ../calendar/gui/dialogs/event-editor.c:210
 msgid "Make this a recurring event"
 msgstr "将此事件标为重复发生"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:215
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../plugins/groupwise-features/send-options.c:212
-#: ../widgets/misc/e-send-options.glade.h:19
+#: ../plugins/groupwise-features/send-options.c:211
+#: ../widgets/misc/e-send-options.ui.h:18
 msgid "Send Options"
 msgstr "发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
-#: ../calendar/gui/dialogs/task-editor.c:125
+#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/task-editor.c:124
 msgid "Insert advanced send options"
 msgstr "插入高级发送选项"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Toggles whether to have All Day Event"
 msgstr "切换是否有全天事件"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/event-editor.c:233
 msgid "Show Time as _Busy"
 msgstr "将时间显示为忙(_B)"
 
-#: ../calendar/gui/dialogs/event-editor.c:236
+#: ../calendar/gui/dialogs/event-editor.c:235
 msgid "Toggles whether to show time as busy"
 msgstr "切换是否将时间显示为忙"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "_Free/Busy"
 msgstr "忙/闲(_F)"
 
-#: ../calendar/gui/dialogs/event-editor.c:247
+#: ../calendar/gui/dialogs/event-editor.c:246
 msgid "Query free / busy information for the attendees"
 msgstr "查询出席者的忙闲信息"
 
-#: ../calendar/gui/dialogs/event-editor.c:301
+#: ../calendar/gui/dialogs/event-editor.c:291
 msgid "Appoint_ment"
 msgstr "约会(_M)"
 
-#: ../calendar/gui/dialogs/event-page.c:736
-#: ../calendar/gui/dialogs/event-page.c:2724
+#: ../calendar/gui/dialogs/event-page.c:751
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr "因所选的日程为只读，您无法编辑该事件。"
+
+#: ../calendar/gui/dialogs/event-page.c:755
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "您并非组织者，因此无法编辑全部事件。"
+
+#: ../calendar/gui/dialogs/event-page.c:767
+#: ../calendar/gui/dialogs/event-page.c:2695
 msgid "This event has alarms"
 msgstr "此事件有提醒"
 
-#: ../calendar/gui/dialogs/event-page.c:799
-#: ../calendar/gui/dialogs/event-page.glade.h:10
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.c:830
+#: ../calendar/gui/dialogs/event-page.ui.h:11
+#: ../calendar/gui/dialogs/memo-page.ui.h:2
 msgid "Or_ganizer:"
 msgstr "组织者(_G)："
 
-#: ../calendar/gui/dialogs/event-page.c:845
+#: ../calendar/gui/dialogs/event-page.c:877
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:847
+#: ../calendar/gui/dialogs/event-page.c:879
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1031
+#: ../calendar/gui/dialogs/event-page.c:1069
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1034
+#: ../calendar/gui/dialogs/event-page.c:1072
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1203
-#: ../calendar/gui/dialogs/memo-page.c:641
-#: ../calendar/gui/dialogs/task-page.c:813
+#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/memo-page.c:657
+#: ../calendar/gui/dialogs/task-page.c:836
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1213
+#: ../calendar/gui/dialogs/event-page.c:1253
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1236
+#: ../calendar/gui/dialogs/event-page.c:1276
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1243
+#: ../calendar/gui/dialogs/event-page.c:1283
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1406
-#: ../calendar/gui/dialogs/memo-page.c:682
-#: ../calendar/gui/dialogs/task-page.c:873
+#: ../calendar/gui/dialogs/event-page.c:1445
+#: ../calendar/gui/dialogs/memo-page.c:698
+#: ../calendar/gui/dialogs/task-page.c:896
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: ../calendar/gui/dialogs/event-page.c:1412
-#: ../calendar/gui/dialogs/memo-page.c:688
-#: ../calendar/gui/dialogs/task-page.c:879
+#: ../calendar/gui/dialogs/event-page.c:1451
+#: ../calendar/gui/dialogs/memo-page.c:704
+#: ../calendar/gui/dialogs/task-page.c:902
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1437
-#: ../calendar/gui/dialogs/task-page.c:903
+#: ../calendar/gui/dialogs/event-page.c:1476
+#: ../calendar/gui/dialogs/task-page.c:926
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1877
-#: ../calendar/gui/dialogs/task-page.c:1199
-msgid "_Add "
-msgstr "添加(_A)"
-
-#: ../calendar/gui/dialogs/event-page.c:2600
+#: ../calendar/gui/dialogs/event-page.c:2568
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
 
-#: ../calendar/gui/dialogs/event-page.c:2644
-#: ../calendar/gui/dialogs/memo-page.c:896
-#: ../calendar/gui/dialogs/task-page.c:1803
+#. Translators: This string is used when we are creating an Event
+#. (meeting or appointment)  on behalf of some other user
+#. Translators: This string is used when we are creating a Memo
+#. on behalf of some other user
+#. Translators: This string is used when we are creating a Task
+#. on behalf of some other user
+#: ../calendar/gui/dialogs/event-page.c:2612
+#: ../calendar/gui/dialogs/memo-page.c:916
+#: ../calendar/gui/dialogs/task-page.c:1720
 #, c-format
 msgid "You are acting on behalf of %s"
 msgstr "您正在以 %s 的身份行动"
 
-#: ../calendar/gui/dialogs/event-page.c:2924
+#: ../calendar/gui/dialogs/event-page.c:2914
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2920
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:2926
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.c:2949
+#: ../calendar/gui/dialogs/event-page.c:2939
 msgid "Customize"
 msgstr "自定义"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/event-page.ui.h:1
 msgid "1 day before appointment"
 msgstr "约会的 1 天前"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:2
+#: ../calendar/gui/dialogs/event-page.ui.h:2
 msgid "1 hour before appointment"
 msgstr "约会的 1 小时前"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:3
+#: ../calendar/gui/dialogs/event-page.ui.h:3
 msgid "15 minutes before appointment"
 msgstr "约会的 15 分钟前"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:5
 msgid "Attendee_s..."
 msgstr "出席者(_S)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:6
+#: ../calendar/gui/e-meeting-list-view.c:148
+msgid "Attendees"
+msgstr "出席者"
+
+#: ../calendar/gui/dialogs/event-page.ui.h:9
 msgid "Custom Alarm:"
 msgstr "自定义提醒："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.ui.h:10
 msgid "Event Description"
 msgstr "事件描述"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
-#: ../calendar/gui/dialogs/memo-page.glade.h:4
-#: ../calendar/gui/dialogs/task-page.glade.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:12
+#: ../calendar/gui/dialogs/memo-page.ui.h:4
+#: ../calendar/gui/dialogs/task-page.ui.h:6
 msgid "Su_mmary:"
 msgstr "概要(_M)："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.ui.h:14
 msgid "_Alarm"
 msgstr "提醒(_A)"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/dialogs/task-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.ui.h:16
+#: ../calendar/gui/dialogs/memo-page.ui.h:6
+#: ../calendar/gui/dialogs/task-page.ui.h:8
+#: ../widgets/misc/e-attachment-dialog.c:345
 msgid "_Description:"
 msgstr "描述(_D)："
 
-#: ../calendar/gui/dialogs/event-page.glade.h:17
+#: ../calendar/gui/dialogs/event-page.ui.h:17
+#: ../plugins/calendar-weather/calendar-weather.c:363
+msgid "_Location:"
+msgstr "位置(_L)："
+
+#: ../calendar/gui/dialogs/event-page.ui.h:18
 msgid "_Time:"
 msgstr "时间(_T)："
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:18
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:16
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
 msgid "for"
 msgstr "持续时间"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/event-page.glade.h:21
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:11
 msgid "until"
 msgstr "直到"
 
-#: ../calendar/gui/dialogs/meeting-page.glade.h:1
-msgid "<b>Att_endees</b>"
-msgstr "<b>与会者(_E)</b>"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:2
-msgid "C_hange Organizer"
-msgstr "更改组织者(_H)"
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:3
-msgid "Co_ntacts..."
-msgstr "联系人(_N)..."
-
-#: ../calendar/gui/dialogs/meeting-page.glade.h:7
-#: ../calendar/gui/e-itip-control.glade.h:7
-msgid "Organizer:"
-msgstr "组织者："
-
-#: ../calendar/gui/dialogs/memo-editor.c:111 ../calendar/gui/print.c:2482
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:2540
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-page.c:857
+#: ../calendar/gui/dialogs/memo-page.c:350
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "因所选的备忘列表为只读，您无法编辑该备忘。"
+
+#: ../calendar/gui/dialogs/memo-page.c:354
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "您并非组织者，因此无法编辑全部备忘。"
+
+#: ../calendar/gui/dialogs/memo-page.c:877
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s”中的备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1012 ../mail/em-format-html.c:1562
-#: ../mail/em-format-html.c:1620 ../mail/em-format-html.c:1646
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:886
-#: ../mail/em-mailer-prefs.c:77 ../mail/message-list.etspec.h:20
+#: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
+#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
+#: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
+#: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "收件人"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
-#: ../calendar/gui/dialogs/task-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:5
 msgid "Sta_rt date:"
 msgstr "开始日期(_R)："
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.ui.h:5
 msgid "T_o:"
 msgstr "到(_O)："
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:365
-#: ../calendar/gui/dialogs/task-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.ui.h:7
+#: ../calendar/gui/dialogs/task-page.c:380
+#: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_Group:"
 msgstr "组(_G)："
 
@@ -6722,37 +4238,37 @@ msgstr "您即将修改再现任务。您想要修改何内容？"
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "您即将修改再现备忘。您想要修改何内容？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "只是本次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "本次和以前各次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "本次和以后各次"
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "所有各次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:562
+#: ../calendar/gui/dialogs/recurrence-page.c:558
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会含有 Evolution 无法编辑的再现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:892
+#: ../calendar/gui/dialogs/recurrence-page.c:889
 msgid "Recurrence date is invalid"
 msgstr "再现日期无效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:929
 msgid "End time of the recurrence was before event's start"
-msgstr ""
+msgstr "重复事件条目的结束时间小于开始时间"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:961
+#: ../calendar/gui/dialogs/recurrence-page.c:958
 msgid "on"
 msgstr "在"
 
@@ -6760,7 +4276,7 @@ msgstr "在"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1025
+#: ../calendar/gui/dialogs/recurrence-page.c:1015
 msgid "first"
 msgstr "第一个"
 
@@ -6769,7 +4285,7 @@ msgstr "第一个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1031
+#: ../calendar/gui/dialogs/recurrence-page.c:1021
 msgid "second"
 msgstr "第二"
 
@@ -6777,7 +4293,7 @@ msgstr "第二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1036
+#: ../calendar/gui/dialogs/recurrence-page.c:1026
 msgid "third"
 msgstr "第三个"
 
@@ -6785,21 +4301,29 @@ msgstr "第三个"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1041
+#: ../calendar/gui/dialogs/recurrence-page.c:1031
 msgid "fourth"
 msgstr "第四个"
 
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] [Monday] [forever]'
+#. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
+#. * the name of a week day (like 'Monday' or 'Friday') always follow.
+#.
+#: ../calendar/gui/dialogs/recurrence-page.c:1036
+msgid "fifth"
+msgstr "第五个"
+
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/recurrence-page.c:1041
 msgid "last"
 msgstr "最后一个"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1072
+#: ../calendar/gui/dialogs/recurrence-page.c:1065
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -6807,7 +4331,7 @@ msgstr "其它日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1080
+#: ../calendar/gui/dialogs/recurrence-page.c:1071
 msgid "1st to 10th"
 msgstr "上旬"
 
@@ -6815,7 +4339,7 @@ msgstr "上旬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1077
 msgid "11th to 20th"
 msgstr "中旬"
 
@@ -6823,245 +4347,254 @@ msgstr "中旬"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
+#: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "21st to 31st"
 msgstr "下旬"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1115
+#: ../calendar/gui/dialogs/recurrence-page.c:1108
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1241
+#: ../calendar/gui/dialogs/recurrence-page.c:1237
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1417
+#: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2120
+#: ../calendar/gui/dialogs/recurrence-page.c:2117
 msgid "Add exception"
 msgstr "添加例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2161
+#: ../calendar/gui/dialogs/recurrence-page.c:2158
 msgid "Could not get a selection to modify."
 msgstr "无法获得要修改的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2167
+#: ../calendar/gui/dialogs/recurrence-page.c:2164
 msgid "Modify exception"
 msgstr "修改例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2211
+#: ../calendar/gui/dialogs/recurrence-page.c:2208
 msgid "Could not get a selection to delete."
 msgstr "无法获得要删除的选中项。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2335
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Date/Time"
 msgstr "日期/时间"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "<b>Exceptions</b>"
-msgstr "<b>例外</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:3
-msgid "<b>Preview</b>"
-msgstr "<b>预览</b>"
-
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "<b>Recurrence</b>"
-msgstr "<b>再现</b>"
-
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:6
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:1
 msgid "Every"
 msgstr "每"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:9
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
+#, fuzzy
+msgid "Exceptions"
+msgstr "<b>例外</b>"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:3 ../mail/mail-config.ui.h:84
+msgid "Preview"
+msgstr "预览"
+
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:5
 msgid "This appointment rec_urs"
 msgstr "此约会重现(_U)"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:19
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:9
 msgid "forever"
 msgstr "永远"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
 msgid "month(s)"
 msgstr "月"
 
-#. TRANSLATORS: Entire string is for example:
-#. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:28
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
 msgid "week(s)"
 msgstr "周"
 
-#: ../calendar/gui/dialogs/recurrence-page.glade.h:29
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:13
 msgid "year(s)"
 msgstr "年"
 
-#: ../calendar/gui/dialogs/send-comp.c:116
+#: ../calendar/gui/dialogs/send-comp.c:160
 msgid "Send my alarms with this event"
-msgstr ""
+msgstr "在这个事件里发送我的提醒"
+
+#: ../calendar/gui/dialogs/send-comp.c:162
+#, fuzzy
+msgid "Notify new attendees _only"
+msgstr "只通知收件箱中的新信件(_I)"
 
-#: ../calendar/gui/dialogs/task-details-page.c:377
-#: ../calendar/gui/dialogs/task-details-page.c:397
+#: ../calendar/gui/dialogs/task-details-page.c:379
+#: ../calendar/gui/dialogs/task-details-page.c:399
 msgid "Completed date is wrong"
 msgstr "完成日期有错"
 
-#: ../calendar/gui/dialogs/task-details-page.c:482
+#: ../calendar/gui/dialogs/task-details-page.c:485
 msgid "Web Page"
 msgstr "网页"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:1
-msgid "<span weight=\"bold\">Miscellaneous</span>"
-msgstr "<span weight=\"bold\">杂项</span>"
-
-#: ../calendar/gui/dialogs/task-details-page.glade.h:2
-msgid "<span weight=\"bold\">Status</span>"
-msgstr "<span weight=\"bold\">状态</span>"
-
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
-#: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:247
-#: ../calendar/gui/e-cal-model-tasks.c:362
-#: ../calendar/gui/e-cal-model-tasks.c:679
-#: ../calendar/gui/e-calendar-table.c:237
-#: ../calendar/gui/e-calendar-table.c:652 ../calendar/gui/e-itip-control.c:941
-#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
-#: ../calendar/gui/print.c:2558 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:290
+#: ../calendar/gui/e-cal-model-tasks.c:463
+#: ../calendar/gui/e-cal-model-tasks.c:733
+#: ../calendar/gui/e-calendar-table.c:213
+#: ../calendar/gui/e-calendar-table.c:224
+#: ../calendar/gui/e-calendar-table.c:790 ../calendar/gui/e-itip-control.c:934
+#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
+#: ../calendar/gui/print.c:2616 ../calendar/gui/tasktypes.xml.h:9
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Completed"
 msgstr "已完成"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:266
-#: ../calendar/gui/e-calendar-table.c:577 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1064
+#: ../calendar/gui/dialogs/task-details-page.ui.h:3
+#: ../calendar/gui/e-cal-component-preview.c:312
+#: ../calendar/gui/e-calendar-table.c:715 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1081 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "高"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:244
-#: ../calendar/gui/e-cal-model-tasks.c:360
-#: ../calendar/gui/e-cal-model-tasks.c:677
-#: ../calendar/gui/e-cal-model-tasks.c:754
-#: ../calendar/gui/e-calendar-table.c:235
-#: ../calendar/gui/e-calendar-table.c:651 ../calendar/gui/print.c:2555
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:287
+#: ../calendar/gui/e-cal-model-tasks.c:461
+#: ../calendar/gui/e-cal-model-tasks.c:731
+#: ../calendar/gui/e-cal-model-tasks.c:808
+#: ../calendar/gui/e-calendar-table.c:211
+#: ../calendar/gui/e-calendar-table.c:222
+#: ../calendar/gui/e-calendar-table.c:789 ../calendar/gui/print.c:2613
 msgid "In Progress"
 msgstr "进行中"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:270
-#: ../calendar/gui/e-calendar-table.c:579 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1062
+#: ../calendar/gui/dialogs/task-details-page.ui.h:5
+#: ../calendar/gui/e-cal-component-preview.c:316
+#: ../calendar/gui/e-calendar-table.c:717 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1079 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "低"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:268
-#: ../calendar/gui/e-cal-model.c:1006 ../calendar/gui/e-calendar-table.c:578
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1063
+#: ../calendar/gui/dialogs/task-details-page.ui.h:7
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
+#: ../widgets/misc/e-send-options.ui.h:12
 msgid "Normal"
 msgstr "中"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-cal-model-tasks.c:358
-#: ../calendar/gui/e-cal-model-tasks.c:675
-#: ../calendar/gui/e-calendar-table.c:233
-#: ../calendar/gui/e-calendar-table.c:650 ../calendar/gui/print.c:2552
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-model-tasks.c:459
+#: ../calendar/gui/e-cal-model-tasks.c:729
+#: ../calendar/gui/e-calendar-table.c:209
+#: ../calendar/gui/e-calendar-table.c:220
+#: ../calendar/gui/e-calendar-table.c:788 ../calendar/gui/print.c:2610
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "尚未开始"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:9
 msgid "P_ercent complete:"
 msgstr "完成百分比(_E)："
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
 msgid "Stat_us:"
 msgstr "状态(_U)："
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:580 ../calendar/gui/tasktypes.xml.h:24
+#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
+#. Status: Accepted: X   Declined: Y   ...
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-calendar-view.c:1590
+#: ../calendar/gui/e-meeting-list-view.c:603
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
+#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:72
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "状态"
+
+#: ../calendar/gui/dialogs/task-details-page.ui.h:12
+#: ../calendar/gui/e-calendar-table.c:718 ../calendar/gui/tasktypes.xml.h:24
+#: ../widgets/misc/e-send-options.ui.h:23
 msgid "Undefined"
 msgstr "未定义"
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
 msgid "_Date completed:"
 msgstr "完成日期(_D)："
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:14
-#: ../widgets/misc/e-send-options.glade.h:34
+#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Priority:"
 msgstr "优先级(_P)："
 
-#: ../calendar/gui/dialogs/task-details-page.glade.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
 msgid "_Web Page:"
 msgstr "网页(_W)："
 
-#: ../calendar/gui/dialogs/task-editor.c:113
+#: ../calendar/gui/dialogs/task-editor.c:112
 msgid "_Status Details"
 msgstr "状态细节(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:115
+#: ../calendar/gui/dialogs/task-editor.c:114
 msgid "Click to change or view the status details of the task"
 msgstr "单击可更改或查看任务的状态细节"
 
-#: ../calendar/gui/dialogs/task-editor.c:123
-#: ../composer/e-composer-actions.c:525
+#: ../calendar/gui/dialogs/task-editor.c:122
+#: ../plugins/groupwise-features/mail-send-options.c:198
 msgid "_Send Options"
 msgstr "发送选项(_S)"
 
-#: ../calendar/gui/dialogs/task-editor.c:317
+#: ../calendar/gui/dialogs/task-editor.c:334
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:320
+#: ../calendar/gui/dialogs/task-editor.c:337
 msgid "Task Details"
 msgstr "任务细节"
 
-#: ../calendar/gui/dialogs/task-page.c:373
-#: ../calendar/gui/dialogs/task-page.glade.h:4
+#: ../calendar/gui/dialogs/task-page.c:336
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "任务不能被编辑，因为选择的任务列表是只读的"
+
+#: ../calendar/gui/dialogs/task-page.c:340
+#, fuzzy
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "无法发送此信件，因为您没有指定任何收件人"
+
+#: ../calendar/gui/dialogs/task-page.c:388
+#: ../calendar/gui/dialogs/task-page.ui.h:4
 msgid "Organi_zer:"
 msgstr "组织者(_Z)："
 
-#: ../calendar/gui/dialogs/task-page.c:786
+#: ../calendar/gui/dialogs/task-page.c:809
 msgid "Due date is wrong"
 msgstr "到期日期错误"
 
-#: ../calendar/gui/dialogs/task-page.c:1760
+#: ../calendar/gui/dialogs/task-page.c:1677
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "无法打开“%s”中的任务。"
 
-#: ../calendar/gui/dialogs/task-page.glade.h:1
+#: ../calendar/gui/dialogs/task-page.ui.h:1
 msgid "Atte_ndees..."
 msgstr "出席者(_N)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:2
+#: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Categor_ies..."
 msgstr "类别(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.ui.h:3
 msgid "D_ue date:"
 msgstr "到期日期(_U)："
 
-#: ../calendar/gui/dialogs/task-page.glade.h:7
+#: ../calendar/gui/dialogs/task-page.ui.h:7
 msgid "Time zone:"
 msgstr "时区："
 
@@ -7139,80 +4672,84 @@ msgstr "在 %2$s 时 %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:69
-#: ../calendar/gui/e-cal-component-preview.c:67 ../mail/em-folder-view.c:3268
-#, c-format
-msgid "Click to open %s"
-msgstr "单击以打开 %s"
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:129
-#: ../calendar/gui/e-cal-component-preview.c:171 ../filter/filter-rule.c:858
+#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:658
 msgid "Untitled"
 msgstr "无标题"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:181
-#: ../calendar/gui/e-cal-component-preview.c:211
-#: ../calendar/gui/e-cal-component-preview.c:222
-msgid "Start Date:"
-msgstr "开始日期："
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:194
-#: ../calendar/gui/e-cal-component-preview.c:285
-#: ../calendar/gui/e-itip-control.c:1213
-#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:2
-msgid "Description:"
-msgstr "描述："
-
-#: ../calendar/gui/e-cal-component-memo-preview.c:218
-#: ../calendar/gui/e-cal-component-preview.c:309
-msgid "Web Page:"
-msgstr "网页："
+#: ../calendar/gui/e-cal-component-preview.c:196
+#, fuzzy
+msgid "Categories:"
+msgstr "类别"
 
-#: ../calendar/gui/e-cal-component-preview.c:204
-#: ../calendar/gui/e-itip-control.c:1157
-#: ../calendar/gui/e-itip-control.glade.h:9
+#: ../calendar/gui/e-cal-component-preview.c:235
+#: ../calendar/gui/e-itip-control.c:1152 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "概要："
 
-#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-component-preview.c:244
+#: ../calendar/gui/e-cal-component-preview.c:257
+msgid "Start Date:"
+msgstr "开始日期："
+
+#: ../calendar/gui/e-cal-component-preview.c:270
 msgid "Due Date:"
 msgstr "到期日期："
 
-#. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:240
-#: ../calendar/gui/e-itip-control.c:1181
-#: ../plugins/exchange-operations/exchange-account-setup.c:284
-#: ../plugins/itip-formatter/itip-view.c:1043
+#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-itip-control.c:1177
+#: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "状态："
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:310
 msgid "Priority:"
 msgstr "优先级："
 
+#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-itip-control.c:1215 ../calendar/gui/e-itip-control.ui.h:4
+#: ../mail/mail-config.ui.h:34
+msgid "Description:"
+msgstr "描述："
+
+#: ../calendar/gui/e-cal-component-preview.c:366
+msgid "Web Page:"
+msgstr "网页："
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
+#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../plugins/save-calendar/csv-format.c:359
+msgid "Created"
+msgstr "创建时间"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:3
 msgid "End Date"
 msgstr "结束日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:4
+msgid "Last modified"
+msgstr "上次修改"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
 msgstr "开始日期"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:629
+#: ../calendar/gui/e-calendar-table.c:767
 msgid "Free"
 msgstr "空闲"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:630
-#: ../calendar/gui/e-meeting-time-sel.c:399
+#: ../calendar/gui/e-calendar-table.c:768
+#: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Busy"
 msgstr "繁忙"
 
-#: ../calendar/gui/e-cal-model-tasks.c:627
+#: ../calendar/gui/e-cal-model-tasks.c:681
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7222,234 +4759,166 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:190
-#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/e-meeting-store.c:745
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-meeting-list-view.c:187
+#: ../calendar/gui/e-meeting-store.c:162 ../calendar/gui/e-meeting-store.c:172
+#: ../calendar/gui/e-meeting-store.c:856
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1029 ../calendar/gui/e-cal-model.c:1012
-#: ../calendar/gui/e-meeting-list-view.c:191
-#: ../calendar/gui/e-meeting-store.c:164
+#: ../calendar/gui/e-cal-model-tasks.c:1083 ../calendar/gui/e-cal-model.c:1286
+#: ../calendar/gui/e-meeting-list-view.c:188
+#: ../calendar/gui/e-meeting-store.c:174
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
 
+#: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
+#: ../shell/e-shell.c:791
+#, fuzzy
+msgid "Shell Settings"
+msgstr "Exchange 设置"
+
+#: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
+#: ../shell/e-shell.c:792
+#, fuzzy
+msgid "Application-wide settings"
+msgstr "自动补全设置"
+
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:354 ../calendar/gui/e-cal-popup.c:106
-#: ../calendar/gui/e-cal-popup.c:123 ../calendar/gui/e-cal-popup.c:178
-#: ../calendar/gui/e-itip-control.c:1198 ../calendar/gui/e-itip-control.c:1338
-#: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:145
-#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/print.c:984
-#: ../calendar/gui/print.c:1001 ../mail/em-utils.c:1341
-#: ../plugins/itip-formatter/itip-formatter.c:447
-#: ../plugins/itip-formatter/itip-formatter.c:2204
+#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1198
+#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-meeting-list-view.c:163
+#: ../calendar/gui/e-meeting-list-view.c:177
+#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:975
+#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:961
+#: ../plugins/itip-formatter/itip-formatter.c:461
+#: ../plugins/itip-formatter/itip-formatter.c:2325
 #: ../plugins/plugin-manager/plugin-manager.c:89
-#: ../widgets/misc/e-attachment-bar.c:821
-#: ../widgets/misc/e-charset-picker.c:56
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:1008
+#: ../calendar/gui/e-cal-model.c:1282
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:1010
+#: ../calendar/gui/e-cal-model.c:1284
 msgid "Assigned"
 msgstr "已分配"
 
-#: ../calendar/gui/e-cal-popup.c:184 ../mail/em-popup.c:414
-msgid "Save As..."
-msgstr "另存为..."
-
-#: ../calendar/gui/e-cal-popup.c:200 ../mail/em-format-html-display.c:2214
-msgid "Select folder to save selected attachments..."
-msgstr "选择保存选中附件的文件夹..."
-
-#: ../calendar/gui/e-cal-popup.c:232 ../mail/em-popup.c:442
+#: ../calendar/gui/e-cal-model.c:2179 ../calendar/gui/gnome-cal.c:2035
 #, c-format
-msgid "untitled_image.%s"
-msgstr "无标题图像.%s"
-
-#: ../calendar/gui/e-cal-popup.c:286 ../calendar/gui/e-calendar-table.c:1590
-#: ../calendar/gui/e-calendar-view.c:1776 ../calendar/gui/e-memo-table.c:925
-#: ../mail/em-folder-view.c:1333 ../mail/em-popup.c:559 ../mail/em-popup.c:570
-msgid "_Save As..."
-msgstr "另存为(_S)..."
-
-#: ../calendar/gui/e-cal-popup.c:287 ../mail/em-popup.c:560
-#: ../mail/em-popup.c:571
-msgid "Set as _Background"
-msgstr "设为背景(_B)"
-
-#: ../calendar/gui/e-cal-popup.c:288
-msgid "_Save Selected"
-msgstr "保存选中(_S)"
-
-#: ../calendar/gui/e-cal-popup.c:430 ../mail/em-popup.c:828
-#, c-format
-msgid "Open in %s..."
-msgstr "在 %s 中打开..."
+msgid "Opening %s"
+msgstr "打开 %s"
 
-#: ../calendar/gui/e-calendar-table.c:337
+#: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
 msgid "* No Summary *"
 msgstr "* 没有概要 *"
 
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-table.c:373
-#: ../calendar/gui/e-calendar-view.c:2399
+#. To Translators: It will display "Organizer: NameOfTheUser <email@ofuser.com>"
+#: ../calendar/gui/e-calendar-table.c:364
+#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:297
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者：%s <%s>"
 
 #. With SunOne accounts, there may be no ':' in organiser.value
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:376
-#: ../calendar/gui/e-calendar-view.c:2403
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:300
 #, c-format
 msgid "Organizer: %s"
 msgstr "组织者：%s"
 
-#: ../calendar/gui/e-calendar-table.c:407
+#: ../calendar/gui/e-calendar-table.c:406 ../calendar/gui/e-memo-table.c:339
 msgid "Start: "
 msgstr "开始："
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:424 ../calendar/gui/e-memo-table.c:357
 msgid "Due: "
 msgstr "到期："
 
-#: ../calendar/gui/e-calendar-table.c:599
+#: ../calendar/gui/e-calendar-table.c:737
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:600
+#: ../calendar/gui/e-calendar-table.c:738
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:601
+#: ../calendar/gui/e-calendar-table.c:739
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:602
+#: ../calendar/gui/e-calendar-table.c:740
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:603
+#: ../calendar/gui/e-calendar-table.c:741
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:604
+#: ../calendar/gui/e-calendar-table.c:742
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:605
+#: ../calendar/gui/e-calendar-table.c:743
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:606
+#: ../calendar/gui/e-calendar-table.c:744
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:607
+#: ../calendar/gui/e-calendar-table.c:745
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:608
+#: ../calendar/gui/e-calendar-table.c:746
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:609
+#: ../calendar/gui/e-calendar-table.c:747
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:889
-#: ../calendar/gui/e-calendar-view.c:672 ../calendar/gui/e-memo-table.c:437
+#: ../calendar/gui/e-calendar-table.c:855 ../calendar/gui/print.c:2014
+#: ../calendar/importers/icalendar-importer.c:76
+#: ../calendar/importers/icalendar-importer.c:749
+#: ../modules/calendar/e-cal-shell-content.c:432
+#: ../modules/calendar/e-task-shell-view-actions.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:302
+#: ../modules/calendar/e-task-shell-view.c:439
+#: ../plugins/groupwise-features/camel-gw-listener.c:421
+#: ../plugins/groupwise-features/camel-gw-listener.c:566
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
+msgid "Tasks"
+msgstr "任务"
+
+#: ../calendar/gui/e-calendar-table.c:1097
+#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:883
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
-#: ../calendar/gui/e-calendar-table.c:1173
-#: ../calendar/gui/e-calendar-view.c:837 ../calendar/gui/e-memo-table.c:643
+#: ../calendar/gui/e-calendar-table.c:1366
+#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1081
 msgid "Updating objects"
 msgstr "更新对象"
 
-#: ../calendar/gui/e-calendar-table.c:1361
-#: ../calendar/gui/e-calendar-view.c:1298 ../calendar/gui/e-memo-table.c:819
-#: ../composer/e-composer-actions.c:275
-msgid "Save as..."
-msgstr "另存为..."
-
-#: ../calendar/gui/e-calendar-table.c:1585
-#: ../calendar/gui/e-calendar-view.c:1758
-msgid "New _Task"
-msgstr "新建任务(_T)"
-
-#: ../calendar/gui/e-calendar-table.c:1589 ../calendar/gui/e-memo-table.c:924
-msgid "Open _Web Page"
-msgstr "打开网页(_W)"
-
-#: ../calendar/gui/e-calendar-table.c:1591
-#: ../calendar/gui/e-calendar-view.c:1761 ../calendar/gui/e-memo-table.c:926
-msgid "P_rint..."
-msgstr "打印(_R)..."
-
-#: ../calendar/gui/e-calendar-table.c:1595
-#: ../calendar/gui/e-calendar-view.c:1781 ../calendar/gui/e-memo-table.c:930
-#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
-msgid "C_ut"
-msgstr "剪切(_U)"
-
-#: ../calendar/gui/e-calendar-table.c:1597
-#: ../calendar/gui/e-calendar-view.c:1764
-#: ../calendar/gui/e-calendar-view.c:1783 ../calendar/gui/e-memo-table.c:932
-#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:46
-#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
-msgid "_Paste"
-msgstr "粘贴(_P)"
-
-#: ../calendar/gui/e-calendar-table.c:1601 ../ui/evolution-tasks.xml.h:22
-msgid "_Assign Task"
-msgstr "分配任务(_A)"
-
-#: ../calendar/gui/e-calendar-table.c:1602 ../calendar/gui/e-memo-table.c:936
-#: ../ui/evolution-tasks.xml.h:26
-msgid "_Forward as iCalendar"
-msgstr "作为 iCalendar 转发(_F)"
-
-#: ../calendar/gui/e-calendar-table.c:1603
-msgid "_Mark as Complete"
-msgstr "标记为完成(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1604
-msgid "_Mark Selected Tasks as Complete"
-msgstr "把任务标记为完成(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1605
-msgid "_Mark as Incomplete"
-msgstr "标记为未完成(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1606
-msgid "_Mark Selected Tasks as Incomplete"
-msgstr "把任务标记为未完成(_M)"
-
-#: ../calendar/gui/e-calendar-table.c:1611
-msgid "_Delete Selected Tasks"
-msgstr "删除选中任务(_D)"
-
-#: ../calendar/gui/e-calendar-table.c:1848
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-msgid "Click to add a task"
-msgstr "单击以添加任务"
-
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% 完成"
 
+#: ../calendar/gui/e-calendar-table.etspec.h:4
+msgid "Click to add a task"
+msgstr "单击以添加任务"
+
 #: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "完成"
@@ -7458,167 +4927,85 @@ msgstr "完成"
 msgid "Completion date"
 msgstr "完成日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
+#: ../calendar/gui/e-calendar-table.etspec.h:8
 msgid "Due date"
 msgstr "到期日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:8
+#: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:373
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "优先级"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
+#: ../calendar/gui/e-calendar-table.etspec.h:11
 msgid "Start date"
 msgstr "开始日期"
 
-#. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
-#. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-calendar-view.c:2307
-#: ../calendar/gui/e-meeting-list-view.c:561
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:21 ../mail/em-filter-i18n.h:70
-#: ../mail/message-list.etspec.h:17
-msgid "Status"
-msgstr "状态"
-
-#: ../calendar/gui/e-calendar-view.c:1444
-msgid "Moving items"
-msgstr "移动项目"
-
-#: ../calendar/gui/e-calendar-view.c:1446
-msgid "Copying items"
-msgstr "复制项目"
-
-#: ../calendar/gui/e-calendar-view.c:1755
-msgid "New _Appointment..."
-msgstr "新建约会(_A)..."
-
-#: ../calendar/gui/e-calendar-view.c:1756
-msgid "New All Day _Event"
-msgstr "新建全天事件(_E)"
-
-#: ../calendar/gui/e-calendar-view.c:1757
-msgid "New _Meeting"
-msgstr "新建会议(_M)"
-
-#. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1768
-msgid "_Current View"
-msgstr "当前视图(_C)"
-
-#: ../calendar/gui/e-calendar-view.c:1770
-msgid "Select T_oday"
-msgstr "选择今天(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1771
-msgid "_Select Date..."
-msgstr "选择日期(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1777
-msgid "Pri_nt..."
-msgstr "打印(_N)..."
-
-#: ../calendar/gui/e-calendar-view.c:1787
-msgid "Cop_y to Calendar..."
-msgstr "复制到日历(_Y)..."
-
-#: ../calendar/gui/e-calendar-view.c:1788
-msgid "Mo_ve to Calendar..."
-msgstr "移至日历(_V)..."
-
-#: ../calendar/gui/e-calendar-view.c:1789
-msgid "_Delegate Meeting..."
-msgstr "代理会议(_D)..."
-
-#: ../calendar/gui/e-calendar-view.c:1790
-msgid "_Schedule Meeting..."
-msgstr "调度会议(_S)..."
-
-#: ../calendar/gui/e-calendar-view.c:1791
-msgid "_Forward as iCalendar..."
-msgstr "作为 iCalendar 转发(_F)..."
-
-#: ../calendar/gui/e-calendar-view.c:1792
-msgid "_Reply"
-msgstr "回复(_R)"
-
-#: ../calendar/gui/e-calendar-view.c:1793 ../mail/em-folder-view.c:1327
-#: ../mail/em-popup.c:564 ../mail/em-popup.c:575
-#: ../ui/evolution-mail-message.xml.h:82
-msgid "Reply to _All"
-msgstr "回复所有人(_A)"
-
-#: ../calendar/gui/e-calendar-view.c:1798
-msgid "Make this Occurrence _Movable"
-msgstr "将此次发生变为可移动(_M)"
-
-#: ../calendar/gui/e-calendar-view.c:1799 ../ui/evolution-calendar.xml.h:9
-msgid "Delete this _Occurrence"
-msgstr "删除此次出现(_O)"
-
-#: ../calendar/gui/e-calendar-view.c:1800
-msgid "Delete _All Occurrences"
-msgstr "删除所有出现(_A)"
+#: ../calendar/gui/e-calendar-table.etspec.h:14
+#: ../calendar/gui/e-meeting-list-view.c:566
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../widgets/misc/e-attachment-tree-view.c:554
+msgid "Type"
+msgstr "类型"
 
-#: ../calendar/gui/e-calendar-view.c:2254
-#: ../calendar/gui/e-itip-control.c:1186
-#: ../calendar/gui/e-meeting-list-view.c:202
-#: ../calendar/gui/e-meeting-store.c:172 ../calendar/gui/e-meeting-store.c:195
-#: ../plugins/itip-formatter/itip-formatter.c:2192
+#: ../calendar/gui/e-calendar-view.c:1537
+#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../plugins/itip-formatter/itip-formatter.c:2313
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-calendar-view.c:2255
-#: ../calendar/gui/e-itip-control.c:1194
-#: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
-#: ../plugins/itip-formatter/itip-formatter.c:2198
+#: ../calendar/gui/e-calendar-view.c:1538
+#: ../calendar/gui/e-itip-control.c:1193
+#: ../calendar/gui/e-meeting-list-view.c:200
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../plugins/itip-formatter/itip-formatter.c:2319
 msgid "Declined"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-calendar-view.c:2256
-#: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
-#: ../calendar/gui/e-meeting-time-sel.c:398
+#: ../calendar/gui/e-calendar-view.c:1539
+#: ../calendar/gui/e-meeting-list-view.c:201
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
+#: ../calendar/gui/e-meeting-time-sel.c:542
 msgid "Tentative"
 msgstr "暂时的"
 
-#: ../calendar/gui/e-calendar-view.c:2257
-#: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
-#: ../plugins/itip-formatter/itip-formatter.c:2201
+#: ../calendar/gui/e-calendar-view.c:1540
+#: ../calendar/gui/e-meeting-list-view.c:202
+#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "Delegated"
 msgstr "被委任的"
 
-#: ../calendar/gui/e-calendar-view.c:2258
+#: ../calendar/gui/e-calendar-view.c:1541
 msgid "Needs action"
 msgstr "需要动作"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2419 ../calendar/gui/print.c:2514
+#: ../calendar/gui/e-calendar-view.c:1702 ../calendar/gui/print.c:2572
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2453
+#: ../calendar/gui/e-calendar-view.c:1733
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间：%s %s"
 
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:109
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%Y年%m月%d日%A%H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:112
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:120
+#: ../calendar/gui/e-cell-date-edit-text.c:173
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7631,12 +5018,12 @@ msgstr ""
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
 #.
-#: ../calendar/gui/e-day-view-time-item.c:750
+#: ../calendar/gui/e-day-view-time-item.c:760
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
 
-#: ../calendar/gui/e-day-view-time-item.c:771
+#: ../calendar/gui/e-day-view-time-item.c:781
 msgid "Show the second time zone"
 msgstr "显示第二时区"
 
@@ -7646,133 +5033,157 @@ msgstr "显示第二时区"
 #. 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:851 ../calendar/gui/e-day-view.c:1584
-#: ../calendar/gui/e-week-view-main-item.c:326 ../calendar/gui/print.c:1678
+#: ../calendar/gui/e-day-view-top-item.c:870 ../calendar/gui/e-day-view.c:1887
+#: ../calendar/gui/e-week-view-main-item.c:218 ../calendar/gui/print.c:1706
 msgid "%A %d %B"
 msgstr "%B%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/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-week-view-main-item.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:189
+#: ../modules/calendar/e-cal-shell-view-private.c:910
+msgid "%a %d %b"
+msgstr "%-m月%-d日%A"
+
+#. 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/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1920
+#: ../calendar/gui/e-week-view-main-item.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../modules/calendar/e-cal-shell-view-private.c:946
+msgid "%d %b"
+msgstr "%B%-d日"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:805 ../calendar/gui/e-week-view.c:541
-#: ../calendar/gui/print.c:828
+#: ../calendar/gui/e-day-view.c:1123 ../calendar/gui/e-week-view.c:750
+#: ../calendar/gui/print.c:822
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:808 ../calendar/gui/e-week-view.c:544
-#: ../calendar/gui/print.c:830
+#: ../calendar/gui/e-day-view.c:1126 ../calendar/gui/e-week-view.c:753
+#: ../calendar/gui/print.c:824
 msgid "pm"
 msgstr "下午"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2322
+#: ../calendar/gui/e-day-view.c:2625
 #, c-format
 msgid "Week %d"
 msgstr "第%d周"
 
-#: ../calendar/gui/e-itip-control.c:760
+#: ../calendar/gui/e-itip-control.c:766
 msgid "Yes. (Complex Recurrence)"
 msgstr "是(复杂重现)"
 
-#: ../calendar/gui/e-itip-control.c:777
+#: ../calendar/gui/e-itip-control.c:783
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
 msgstr[0] "每 %d 天"
 
-#: ../calendar/gui/e-itip-control.c:790
+#: ../calendar/gui/e-itip-control.c:796
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
 msgstr[0] "每 %d 周"
 
-#: ../calendar/gui/e-itip-control.c:797
+#: ../calendar/gui/e-itip-control.c:803
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
 msgstr[0] "每 %d 周的"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:808
+#: ../calendar/gui/e-itip-control.c:814
 msgid " and "
 msgstr " 和 "
 
-#: ../calendar/gui/e-itip-control.c:817
+#: ../calendar/gui/e-itip-control.c:823
 #, c-format
 msgid "The %s day of "
 msgstr "第 %s 天属于"
 
-#: ../calendar/gui/e-itip-control.c:833
+#: ../calendar/gui/e-itip-control.c:839
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 属于"
 
-#: ../calendar/gui/e-itip-control.c:844
+#: ../calendar/gui/e-itip-control.c:850
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
 msgstr[0] "每 %d 月"
 
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:862
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
 msgstr[0] "每 %d 年"
 
-#: ../calendar/gui/e-itip-control.c:869
+#: ../calendar/gui/e-itip-control.c:875
 #, c-format
 msgid "a total of %d time"
 msgid_plural "a total of %d times"
 msgstr[0] "总计 %d 次"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:880
+#: ../calendar/gui/e-itip-control.c:886
 msgid ", ending on "
 msgstr "，结束于 "
 
-#. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:902
+#. For Translators : 'Starts' is part of "Starts: date", showing when the event starts
+#: ../calendar/gui/e-itip-control.c:907
 msgid "Starts"
 msgstr "开始"
 
-#. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:916
+#. For Translators : 'Ends' is part of "Ends: date", showing when the event ends
+#: ../calendar/gui/e-itip-control.c:917
 msgid "Ends"
 msgstr "结束"
 
-#: ../calendar/gui/e-itip-control.c:956
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../calendar/gui/e-itip-control.c:945
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "到期"
 
-#: ../calendar/gui/e-itip-control.c:998 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:988 ../calendar/gui/e-itip-control.c:1049
 msgid "iCalendar Information"
 msgstr "iCalendar 信息"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1015
+#: ../calendar/gui/e-itip-control.c:1010
 msgid "iCalendar Error"
 msgstr "iCalendar 错误"
 
-#: ../calendar/gui/e-itip-control.c:1087 ../calendar/gui/e-itip-control.c:1103
-#: ../calendar/gui/e-itip-control.c:1114 ../calendar/gui/e-itip-control.c:1131
-#: ../plugins/itip-formatter/itip-view.c:346
-#: ../plugins/itip-formatter/itip-view.c:347
-#: ../plugins/itip-formatter/itip-view.c:434
-#: ../plugins/itip-formatter/itip-view.c:435
-#: ../plugins/itip-formatter/itip-view.c:522
-#: ../plugins/itip-formatter/itip-view.c:523
+#: ../calendar/gui/e-itip-control.c:1082 ../calendar/gui/e-itip-control.c:1098
+#: ../calendar/gui/e-itip-control.c:1109 ../calendar/gui/e-itip-control.c:1126
+#: ../plugins/itip-formatter/itip-view.c:349
+#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:437
+#: ../plugins/itip-formatter/itip-view.c:438
+#: ../plugins/itip-formatter/itip-view.c:525
+#: ../plugins/itip-formatter/itip-view.c:526
 msgid "An unknown person"
 msgstr "未知的人"
 
-#. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1138
+#: ../calendar/gui/e-itip-control.c:1134
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作。"
 
-#: ../calendar/gui/e-itip-control.c:1190
-#: ../plugins/itip-formatter/itip-formatter.c:2195
+#: ../calendar/gui/e-itip-control.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:2316
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
@@ -7787,376 +5198,378 @@ msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "任务已经被取消，但无法在您的任务列表中找到该任务"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1357
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 发布了会议信息。"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1358
 msgid "Meeting Information"
 msgstr "会议信息"
 
-#: ../calendar/gui/e-itip-control.c:1365
+#: ../calendar/gui/e-itip-control.c:1364
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 请求 %s 参加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1366
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 请求您参加一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1368
+#: ../calendar/gui/e-itip-control.c:1367
 msgid "Meeting Proposal"
 msgstr "会议建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1373
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> 希望加入到已有的会议。"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1374
 msgid "Meeting Update"
 msgstr "会议更新"
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1378
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的会议信息。"
 
-#: ../calendar/gui/e-itip-control.c:1380
+#: ../calendar/gui/e-itip-control.c:1379
 msgid "Meeting Update Request"
 msgstr "会议更新请求"
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1386
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已回复一个会议请求。"
 
-#: ../calendar/gui/e-itip-control.c:1388
+#: ../calendar/gui/e-itip-control.c:1387
 msgid "Meeting Reply"
 msgstr "会议答复"
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1394
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 取消了一个会议。"
 
-#: ../calendar/gui/e-itip-control.c:1396
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Meeting Cancelation"
 msgstr "会议取消"
 
-#: ../calendar/gui/e-itip-control.c:1406 ../calendar/gui/e-itip-control.c:1483
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1405 ../calendar/gui/e-itip-control.c:1482
+#: ../calendar/gui/e-itip-control.c:1522
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 发送了一个无法理解的信件。"
 
-#: ../calendar/gui/e-itip-control.c:1407
+#: ../calendar/gui/e-itip-control.c:1406
 msgid "Bad Meeting Message"
 msgstr "错误的会议信件"
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1433
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 发布了任务信息。"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1434
 msgid "Task Information"
 msgstr "任务信息"
 
-#: ../calendar/gui/e-itip-control.c:1442
+#: ../calendar/gui/e-itip-control.c:1441
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 请求 %s 完成一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1443
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 请求您完成一个任务。"
 
-#: ../calendar/gui/e-itip-control.c:1445
+#: ../calendar/gui/e-itip-control.c:1444
 msgid "Task Proposal"
 msgstr "任务建议"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1450
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s<b> 希望加入到已有的任务。"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1451
 msgid "Task Update"
 msgstr "任务更新"
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1455
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望获取最新的任务信息。"
 
-#: ../calendar/gui/e-itip-control.c:1457
+#: ../calendar/gui/e-itip-control.c:1456
 msgid "Task Update Request"
 msgstr "任务更新请求"
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1463
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已经回复了任务分配。"
 
-#: ../calendar/gui/e-itip-control.c:1465
+#: ../calendar/gui/e-itip-control.c:1464
 msgid "Task Reply"
 msgstr "任务回复"
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1471
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 取消了任务。"
 
-#: ../calendar/gui/e-itip-control.c:1473
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Task Cancelation"
 msgstr "任务取消"
 
-#: ../calendar/gui/e-itip-control.c:1484
+#: ../calendar/gui/e-itip-control.c:1483
 msgid "Bad Task Message"
 msgstr "错误的任务信件"
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1507
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 发布了忙闲信息。"
 
-#: ../calendar/gui/e-itip-control.c:1509
+#: ../calendar/gui/e-itip-control.c:1508
 msgid "Free/Busy Information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1512
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 请求您的忙闲信息。"
 
-#: ../calendar/gui/e-itip-control.c:1514
+#: ../calendar/gui/e-itip-control.c:1513
 msgid "Free/Busy Request"
 msgstr "忙/闲请求"
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1517
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 应答了忙闲请求。"
 
-#: ../calendar/gui/e-itip-control.c:1519
+#: ../calendar/gui/e-itip-control.c:1518
 msgid "Free/Busy Reply"
 msgstr "忙闲应答"
 
-#: ../calendar/gui/e-itip-control.c:1524
+#: ../calendar/gui/e-itip-control.c:1523
 msgid "Bad Free/Busy Message"
 msgstr "错误的忙闲信件"
 
-#: ../calendar/gui/e-itip-control.c:1600
+#: ../calendar/gui/e-itip-control.c:1599
 msgid "The message does not appear to be properly formed"
 msgstr "信件的格式可能不正确"
 
-#: ../calendar/gui/e-itip-control.c:1659
+#: ../calendar/gui/e-itip-control.c:1658
 msgid "The message contains only unsupported requests."
 msgstr "信件只含有不支持的请求。"
 
-#: ../calendar/gui/e-itip-control.c:1692
+#: ../calendar/gui/e-itip-control.c:1691
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件中没有有效的日历信件"
 
-#: ../calendar/gui/e-itip-control.c:1730
+#: ../calendar/gui/e-itip-control.c:1729
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日历项目"
 
-#: ../calendar/gui/e-itip-control.c:1975
+#: ../calendar/gui/e-itip-control.c:1971
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:2009
+#: ../calendar/gui/e-itip-control.c:2005
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
-#: ../calendar/gui/e-itip-control.c:2026
+#: ../calendar/gui/e-itip-control.c:2022
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "此响应并非来自当前出席者。将响应者加为出席者吗？"
 
-#: ../calendar/gui/e-itip-control.c:2044
+#: ../calendar/gui/e-itip-control.c:2040
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新出席者状态！\n"
 
-#: ../calendar/gui/e-itip-control.c:2068
+#: ../calendar/gui/e-itip-control.c:2064
 msgid "Attendee status updated\n"
 msgstr "更新出席者状态\n"
 
-#: ../calendar/gui/e-itip-control.c:2075
-#: ../plugins/itip-formatter/itip-formatter.c:1379
+#: ../calendar/gui/e-itip-control.c:2071
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
-#: ../calendar/gui/e-itip-control.c:2106 ../calendar/gui/e-itip-control.c:2163
+#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2112 ../calendar/gui/e-itip-control.c:2171
+#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
-#: ../calendar/gui/e-itip-control.c:2251
+#: ../calendar/gui/e-itip-control.c:2260
 msgid "Choose an action:"
 msgstr "选择一项活动："
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2280
-#: ../calendar/gui/e-meeting-list-view.c:549
+#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "请回复"
 
-#: ../calendar/gui/e-itip-control.c:2322
+#: ../calendar/gui/e-itip-control.c:2329
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2350
-#: ../plugins/groupwise-features/process-meeting.c:51
+#: ../calendar/gui/e-itip-control.c:2353
+#: ../plugins/groupwise-features/gw-ui.c:332
 msgid "Accept"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:2351
+#: ../calendar/gui/e-itip-control.c:2354
 msgid "Tentatively accept"
 msgstr "暂时接受"
 
-#: ../calendar/gui/e-itip-control.c:2352
-#: ../plugins/groupwise-features/process-meeting.c:53
+#: ../calendar/gui/e-itip-control.c:2355
+#: ../plugins/groupwise-features/gw-ui.c:346
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../calendar/gui/e-itip-control.c:2381
+#: ../calendar/gui/e-itip-control.c:2380
 msgid "Send Free/Busy Information"
 msgstr "发送忙闲信息"
 
-#: ../calendar/gui/e-itip-control.c:2409
+#: ../calendar/gui/e-itip-control.c:2404
 msgid "Update respondent status"
 msgstr "更新应答者状态"
 
-#: ../calendar/gui/e-itip-control.c:2437
+#: ../calendar/gui/e-itip-control.c:2428
 msgid "Send Latest Information"
 msgstr "发送最新的信息"
 
-#: ../calendar/gui/e-itip-control.c:2465 ../ui/evolution-mail-global.xml.h:1
+#: ../calendar/gui/e-itip-control.c:2452
+#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "取消"
 
-#: ../calendar/gui/e-itip-control.glade.h:1
+#: ../calendar/gui/e-itip-control.ui.h:1
 msgid "--to--"
 msgstr "--到--"
 
-#: ../calendar/gui/e-itip-control.glade.h:2
+#: ../calendar/gui/e-itip-control.ui.h:2
 msgid "Calendar Message"
 msgstr "日历信件"
 
-#: ../calendar/gui/e-itip-control.glade.h:3
+#: ../calendar/gui/e-itip-control.ui.h:3
 msgid "Date:"
 msgstr "日期："
 
-#: ../calendar/gui/e-itip-control.glade.h:5
+#: ../calendar/gui/e-itip-control.ui.h:5
 msgid "Loading Calendar"
 msgstr "装入日历"
 
-#: ../calendar/gui/e-itip-control.glade.h:6
+#: ../calendar/gui/e-itip-control.ui.h:6
 msgid "Loading calendar..."
 msgstr "正在装入日历..."
 
-#: ../calendar/gui/e-itip-control.glade.h:8
+#: ../calendar/gui/e-itip-control.ui.h:7
+msgid "Organizer:"
+msgstr "组织者："
+
+#: ../calendar/gui/e-itip-control.ui.h:8
 msgid "Server Message:"
 msgstr "服务器消息："
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "主席人员"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:69
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:70
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:151
-msgid "Attendees"
-msgstr "出席者"
-
-#: ../calendar/gui/e-meeting-list-view.c:162
-#: ../calendar/gui/e-meeting-store.c:85 ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:739 ../calendar/gui/print.c:980
+#: ../calendar/gui/e-meeting-list-view.c:159
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/e-meeting-store.c:850 ../calendar/gui/print.c:971
 msgid "Individual"
 msgstr "个人"
 
-#: ../calendar/gui/e-meeting-list-view.c:163
-#: ../calendar/gui/e-meeting-store.c:87 ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/print.c:981 ../widgets/table/e-table-config.glade.h:7
+#: ../calendar/gui/e-meeting-list-view.c:160
+#: ../calendar/gui/e-meeting-store.c:97 ../calendar/gui/e-meeting-store.c:114
+#: ../calendar/gui/print.c:972 ../widgets/table/e-table-config.ui.h:7
 msgid "Group"
 msgstr "组"
 
-#: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/print.c:982
+#: ../calendar/gui/e-meeting-list-view.c:161
+#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
+#: ../calendar/gui/print.c:973
 msgid "Resource"
 msgstr "资源"
 
-#: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
-#: ../calendar/gui/print.c:983
+#: ../calendar/gui/e-meeting-list-view.c:162
+#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
+#: ../calendar/gui/print.c:974
 msgid "Room"
 msgstr "房间"
 
-#: ../calendar/gui/e-meeting-list-view.c:176
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:997
+#: ../calendar/gui/e-meeting-list-view.c:173
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:988
 msgid "Chair"
 msgstr "主席"
 
-#: ../calendar/gui/e-meeting-list-view.c:177
-#: ../calendar/gui/e-meeting-store.c:122 ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:742 ../calendar/gui/print.c:998
+#: ../calendar/gui/e-meeting-list-view.c:174
+#: ../calendar/gui/e-meeting-store.c:132 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:853 ../calendar/gui/print.c:989
 msgid "Required Participant"
 msgstr "必需的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/print.c:999
+#: ../calendar/gui/e-meeting-list-view.c:175
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/print.c:990
 msgid "Optional Participant"
 msgstr "可选的出席者"
 
-#: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
-#: ../calendar/gui/print.c:1000
+#: ../calendar/gui/e-meeting-list-view.c:176
+#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
+#: ../calendar/gui/print.c:991
 msgid "Non-Participant"
 msgstr "不参加"
 
-#: ../calendar/gui/e-meeting-list-view.c:201
-#: ../calendar/gui/e-meeting-store.c:170 ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:752
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-store.c:863
 msgid "Needs Action"
 msgstr "需要动作"
 
 #. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:505
+#: ../calendar/gui/e-meeting-list-view.c:546
 msgid "Attendee                          "
 msgstr "出席者                            "
 
-#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 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:467
-#: ../calendar/gui/e-meeting-time-sel.c:2124
+#: ../calendar/gui/e-meeting-time-sel-item.c:458
+#: ../calendar/gui/e-meeting-time-sel.c:2285
 msgid "%A, %B %d, %Y"
 msgstr "%Y年%m月%d日%A"
 
@@ -8164,78 +5577,78 @@ msgstr "%Y年%m月%d日%A"
 #. 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:471
-#: ../calendar/gui/e-meeting-time-sel.c:2155
+#: ../calendar/gui/e-meeting-time-sel-item.c:462
+#: ../calendar/gui/e-meeting-time-sel.c:2316
 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.
-#: ../calendar/gui/e-meeting-time-sel-item.c:475
+#: ../calendar/gui/e-meeting-time-sel-item.c:466
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:400
+#: ../calendar/gui/e-meeting-time-sel.c:544
 msgid "Out of Office"
 msgstr "办公室以外"
 
-#: ../calendar/gui/e-meeting-time-sel.c:401
+#: ../calendar/gui/e-meeting-time-sel.c:545
 msgid "No Information"
 msgstr "没有信息"
 
-#: ../calendar/gui/e-meeting-time-sel.c:416
+#: ../calendar/gui/e-meeting-time-sel.c:560
 msgid "A_ttendees..."
 msgstr "出席者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:437
+#: ../calendar/gui/e-meeting-time-sel.c:581
 msgid "O_ptions"
 msgstr "选项(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:454
+#: ../calendar/gui/e-meeting-time-sel.c:598
 msgid "Show _only working hours"
 msgstr "只显示工作小时(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:464
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "显示缩放的输出(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:479
+#: ../calendar/gui/e-meeting-time-sel.c:623
 msgid "_Update free/busy"
 msgstr "更新忙闲(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:494
+#: ../calendar/gui/e-meeting-time-sel.c:638
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:512
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "自动获取(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:544
+#: ../calendar/gui/e-meeting-time-sel.c:688
 msgid "_All people and resources"
 msgstr "全部人和资源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:553
+#: ../calendar/gui/e-meeting-time-sel.c:697
 msgid "All _people and one resource"
 msgstr "全部人和一个资源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:562
+#: ../calendar/gui/e-meeting-time-sel.c:706
 msgid "_Required people"
 msgstr "必需的人(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:571
+#: ../calendar/gui/e-meeting-time-sel.c:715
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:761
 msgid "_Start time:"
 msgstr "开始时间(_S)："
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:798
 msgid "_End time:"
 msgstr "结束时间(_E)："
 
@@ -8263,182 +5676,269 @@ msgstr "语言"
 msgid "Member"
 msgstr "成员"
 
-#: ../calendar/gui/e-memo-table.c:941
-msgid "_Delete Selected Memos"
-msgstr "删除选中备忘(_D)"
+#: ../calendar/gui/e-memo-table.c:638
+#: ../modules/calendar/e-cal-shell-content.c:461
+#: ../modules/calendar/e-memo-shell-view-actions.c:254
+#: ../modules/calendar/e-memo-shell-view-actions.c:271
+#: ../modules/calendar/e-memo-shell-view.c:292
+msgid "Memos"
+msgstr "备忘"
 
-#: ../calendar/gui/e-memo-table.c:1092 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
-#: ../calendar/gui/e-memos.c:760 ../calendar/gui/e-tasks.c:910
+#: ../calendar/gui/e-timezone-entry.c:330
+msgid "Select Timezone"
+msgstr "选择时区"
+
+#. strftime format %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-week-view-main-item.c:235 ../calendar/gui/print.c:1687
+msgid "%d %B"
+msgstr "%-m月%-d日"
+
+#: ../calendar/gui/ea-cal-view-event.c:263
+msgid "It has alarms."
+msgstr "有提醒。"
+
+#: ../calendar/gui/ea-cal-view-event.c:266
+msgid "It has recurrences."
+msgstr "有再现。"
+
+#: ../calendar/gui/ea-cal-view-event.c:269
+msgid "It is a meeting."
+msgstr "为会议。"
+
+#: ../calendar/gui/ea-cal-view-event.c:275
 #, c-format
-msgid ""
-"Error on %s:\n"
-" %s"
-msgstr ""
-"%s 错误：\n"
-" %s"
+msgid "Calendar Event: Summary is %s."
+msgstr "日历事件：摘要为 %s。"
 
-#: ../calendar/gui/e-memos.c:812
-msgid "Loading memos"
-msgstr "装入备忘"
+#: ../calendar/gui/ea-cal-view-event.c:277
+msgid "Calendar Event: It has no summary."
+msgstr "日历事件：无摘要。"
 
-#: ../calendar/gui/e-memos.c:903
+#: ../calendar/gui/ea-cal-view-event.c:297
+msgid "calendar view event"
+msgstr "日历视图事件"
+
+#: ../calendar/gui/ea-cal-view-event.c:525
+msgid "Grab Focus"
+msgstr "获得焦点"
+
+#: ../calendar/gui/ea-cal-view.c:298
+msgid "New Appointment"
+msgstr "新建约会"
+
+#: ../calendar/gui/ea-cal-view.c:299
+msgid "New All Day Event"
+msgstr "新建全天事件"
+
+#: ../calendar/gui/ea-cal-view.c:300
+msgid "New Meeting"
+msgstr "新会议"
+
+#: ../calendar/gui/ea-cal-view.c:301
+msgid "Go to Today"
+msgstr "转到今天"
+
+#: ../calendar/gui/ea-cal-view.c:302
+msgid "Go to Date"
+msgstr "转到日期"
+
+#: ../calendar/gui/ea-day-view-main-item.c:305
+#: ../calendar/gui/ea-week-view-main-item.c:302
+msgid "a table to view and select the current time range"
+msgstr "可查看并选择当前时间范围的表"
+
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:147 ../calendar/gui/ea-week-view.c:146
 #, c-format
-msgid "Opening memos at %s"
-msgstr "在 %s 打开备忘"
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "有 %d 个事件。"
 
-#: ../calendar/gui/e-memos.c:1075 ../calendar/gui/e-tasks.c:1329
-msgid "Deleting selected objects..."
-msgstr "正在删除选中的对象..."
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:148
+msgid "It has no events."
+msgstr "无事件。"
 
-#: ../calendar/gui/e-tasks.c:963
-msgid "Loading tasks"
-msgstr "装入任务"
+#. To translators: First %s is the week, for example "July 10th -
+#. July 14th, 2006". Second %s is the number of events in this work
+#. week, for example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:158
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "工作日视图：%s。%s"
 
-#: ../calendar/gui/e-tasks.c:1061
+#. To translators: First %s is the day, for example "Thursday July
+#. 13th, 2006". Second %s is the number of events on this day, for
+#. example "It has %d event/events." or  "It has no events."
+#: ../calendar/gui/ea-day-view.c:164
 #, c-format
-msgid "Opening tasks at %s"
-msgstr "在 %s 打开任务"
+msgid "Day View: %s. %s"
+msgstr "日视图：%s。%s"
 
-#: ../calendar/gui/e-tasks.c:1306
-msgid "Completing tasks..."
-msgstr "正在完成任务..."
+#: ../calendar/gui/ea-day-view.c:195
+msgid "calendar view for a work week"
+msgstr "工作日的日历视图"
 
-#: ../calendar/gui/e-tasks.c:1356
-msgid "Expunging"
-msgstr "销毁"
+#: ../calendar/gui/ea-day-view.c:197
+msgid "calendar view for one or more days"
+msgstr "一天或多天的日历视图"
 
-#: ../calendar/gui/e-timezone-entry.c:127
-msgid "Select Timezone"
-msgstr "选择时区"
+#: ../calendar/gui/ea-gnome-calendar.c:186
+#: ../modules/calendar/e-cal-shell-view-private.c:906
+msgid "%A %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
 
-#. strftime format %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-week-view-main-item.c:343 ../calendar/gui/print.c:1659
-msgid "%d %B"
-msgstr "%-m月%-d日"
+#: ../calendar/gui/ea-gnome-calendar.c:191
+#: ../calendar/gui/ea-gnome-calendar.c:196
+#: ../calendar/gui/ea-gnome-calendar.c:198
+#: ../modules/calendar/e-cal-shell-view-private.c:913
+#: ../modules/calendar/e-cal-shell-view-private.c:919
+#: ../modules/calendar/e-cal-shell-view-private.c:922
+msgid "%a %d %b %Y"
+msgstr "%Y年%-m月%-d日%A"
 
-#: ../calendar/gui/gnome-cal.c:2637
-msgid "_Custom View"
-msgstr "自定义视图(_C)"
+#: ../calendar/gui/ea-gnome-calendar.c:215
+#: ../calendar/gui/ea-gnome-calendar.c:221
+#: ../calendar/gui/ea-gnome-calendar.c:227
+#: ../calendar/gui/ea-gnome-calendar.c:229
+#: ../modules/calendar/e-cal-shell-view-private.c:939
+#: ../modules/calendar/e-cal-shell-view-private.c:950
+#: ../modules/calendar/e-cal-shell-view-private.c:957
+#: ../modules/calendar/e-cal-shell-view-private.c:960
+msgid "%d %b %Y"
+msgstr "%Y年%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:2638
-msgid "_Save Custom View"
-msgstr "保存自定义视图(_S)"
+#: ../calendar/gui/ea-gnome-calendar.c:245
+#: ../calendar/gui/ea-gnome-calendar.c:253
+#: ../calendar/importers/icalendar-importer.c:780
+msgid "Gnome Calendar"
+msgstr "Gnome 日历"
 
-#: ../calendar/gui/gnome-cal.c:2643
-msgid "_Define Views..."
-msgstr "定义视图(_D)..."
+#: ../calendar/gui/ea-jump-button.c:146
+msgid "Jump button"
+msgstr "跳转按钮"
 
-#: ../calendar/gui/gnome-cal.c:2880
-#, c-format
-msgid "Loading appointments at %s"
-msgstr "装入位于 %s 的约会"
+#: ../calendar/gui/ea-jump-button.c:155
+msgid "Click here, you can find more events."
+msgstr "单击此处可查找更多事件。"
 
-#: ../calendar/gui/gnome-cal.c:2895
+#: ../calendar/gui/ea-week-view.c:153
 #, c-format
-msgid "Loading tasks at %s"
-msgstr "装入位于 %s 的任务"
+msgid "Month View: %s. %s"
+msgstr "月视图：%s。%s"
 
-#: ../calendar/gui/gnome-cal.c:2904
+#: ../calendar/gui/ea-week-view.c:157
 #, c-format
-msgid "Loading memos at %s"
-msgstr "装入位于 %s 的备忘"
+msgid "Week View: %s. %s"
+msgstr "周视图：%s。%s"
+
+#: ../calendar/gui/ea-week-view.c:188
+msgid "calendar view for a month"
+msgstr "月日历视图"
 
-#: ../calendar/gui/gnome-cal.c:3016
+#: ../calendar/gui/ea-week-view.c:190
+msgid "calendar view for one or more weeks"
+msgstr "一周或多周的日历视图"
+
+#: ../calendar/gui/gnome-cal.c:1946
 #, c-format
-msgid "Opening %s"
-msgstr "打开 %s"
+msgid "Loading appointments at %s"
+msgstr "装入位于 %s 的约会"
 
-#: ../calendar/gui/gnome-cal.c:3984
+#: ../calendar/gui/gnome-cal.c:2567
 msgid "Purging"
 msgstr "销毁"
 
-#: ../calendar/gui/goto-dialog.glade.h:1
+#: ../calendar/gui/goto-dialog.ui.h:1
 msgid "April"
 msgstr "四月"
 
-#: ../calendar/gui/goto-dialog.glade.h:2
+#: ../calendar/gui/goto-dialog.ui.h:2
 msgid "August"
 msgstr "八月"
 
-#: ../calendar/gui/goto-dialog.glade.h:3
+#: ../calendar/gui/goto-dialog.ui.h:3
 msgid "December"
 msgstr "十二月"
 
-#: ../calendar/gui/goto-dialog.glade.h:4
+#: ../calendar/gui/goto-dialog.ui.h:4
 msgid "February"
 msgstr "二月"
 
-#: ../calendar/gui/goto-dialog.glade.h:5
+#: ../calendar/gui/goto-dialog.ui.h:5
 msgid "January"
 msgstr "一月"
 
-#: ../calendar/gui/goto-dialog.glade.h:6
+#: ../calendar/gui/goto-dialog.ui.h:6
 msgid "July"
 msgstr "七月"
 
-#: ../calendar/gui/goto-dialog.glade.h:7
+#: ../calendar/gui/goto-dialog.ui.h:7
 msgid "June"
 msgstr "六月"
 
-#: ../calendar/gui/goto-dialog.glade.h:8
+#: ../calendar/gui/goto-dialog.ui.h:8
 msgid "March"
 msgstr "三月"
 
-#: ../calendar/gui/goto-dialog.glade.h:9
+#: ../calendar/gui/goto-dialog.ui.h:9
 msgid "May"
 msgstr "五月"
 
-#: ../calendar/gui/goto-dialog.glade.h:10
+#: ../calendar/gui/goto-dialog.ui.h:10
 msgid "November"
 msgstr "十一月"
 
-#: ../calendar/gui/goto-dialog.glade.h:11
+#: ../calendar/gui/goto-dialog.ui.h:11
 msgid "October"
 msgstr "十月"
 
-#: ../calendar/gui/goto-dialog.glade.h:12
+#: ../calendar/gui/goto-dialog.ui.h:12
 msgid "Select Date"
 msgstr "选择日期"
 
-#: ../calendar/gui/goto-dialog.glade.h:13
+#: ../calendar/gui/goto-dialog.ui.h:13
 msgid "September"
 msgstr "九月"
 
-#: ../calendar/gui/goto-dialog.glade.h:14
+#: ../calendar/gui/goto-dialog.ui.h:14
 msgid "_Select Today"
 msgstr "选择今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:404 ../calendar/gui/itip-utils.c:456
-#: ../calendar/gui/itip-utils.c:544
+#: ../calendar/gui/itip-utils.c:409 ../calendar/gui/itip-utils.c:460
+#: ../calendar/gui/itip-utils.c:552
 msgid "An organizer must be set."
 msgstr "必须设定组织者。"
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:452
 msgid "At least one attendee is necessary"
 msgstr "至少需要一个参加者"
 
-#: ../calendar/gui/itip-utils.c:626 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:634 ../calendar/gui/itip-utils.c:780
 msgid "Event information"
 msgstr "事件信息"
 
-#: ../calendar/gui/itip-utils.c:628 ../calendar/gui/itip-utils.c:775
+#: ../calendar/gui/itip-utils.c:636 ../calendar/gui/itip-utils.c:783
 msgid "Task information"
 msgstr "任务信息"
 
-#: ../calendar/gui/itip-utils.c:630 ../calendar/gui/itip-utils.c:778
+#: ../calendar/gui/itip-utils.c:638 ../calendar/gui/itip-utils.c:786
 msgid "Memo information"
 msgstr "备忘信息"
 
-#: ../calendar/gui/itip-utils.c:632 ../calendar/gui/itip-utils.c:796
+#: ../calendar/gui/itip-utils.c:640 ../calendar/gui/itip-utils.c:804
 msgid "Free/Busy information"
 msgstr "忙闲信息"
 
-#: ../calendar/gui/itip-utils.c:634
+#: ../calendar/gui/itip-utils.c:642
 msgid "Calendar information"
 msgstr "日历信息"
 
@@ -8446,7 +5946,7 @@ msgstr "日历信息"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:668
+#: ../calendar/gui/itip-utils.c:676
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "接受"
@@ -8455,7 +5955,7 @@ msgstr "接受"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:675
+#: ../calendar/gui/itip-utils.c:683
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
@@ -8467,7 +5967,7 @@ msgstr "暂时接受"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:682 ../calendar/gui/itip-utils.c:730
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:738
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "拒绝"
@@ -8476,7 +5976,7 @@ msgstr "拒绝"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:689
+#: ../calendar/gui/itip-utils.c:697
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "被委任的"
@@ -8484,7 +5984,7 @@ msgstr "被委任的"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:702
+#: ../calendar/gui/itip-utils.c:710
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "更新"
@@ -8492,7 +5992,7 @@ msgstr "更新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:709
+#: ../calendar/gui/itip-utils.c:717
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "取消"
@@ -8500,7 +6000,7 @@ msgstr "取消"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:716
+#: ../calendar/gui/itip-utils.c:724
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "刷新"
@@ -8508,426 +6008,230 @@ msgstr "刷新"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:723
+#: ../calendar/gui/itip-utils.c:731
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "投票表决"
 
-#: ../calendar/gui/itip-utils.c:793
+#: ../calendar/gui/itip-utils.c:801
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "忙闲信息 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:801
+#: ../calendar/gui/itip-utils.c:809
 msgid "iCalendar information"
 msgstr "iCalendar 信息"
 
-#: ../calendar/gui/itip-utils.c:972
-msgid "You must be an attendee of the event."
-msgstr "您必须是事件的出席者。"
-
-#: ../calendar/gui/memos-component.c:499
-msgid "_New Memo List"
-msgstr "新建备忘列表(_N)"
-
-#: ../calendar/gui/memos-component.c:582
-#, c-format
-msgid "%d memo"
-msgid_plural "%d memos"
-msgstr[0] "%d 个备忘"
-
-#: ../calendar/gui/memos-component.c:584 ../calendar/gui/tasks-component.c:575
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "，已选中 %d 个"
-
-#: ../calendar/gui/memos-component.c:631
-msgid "Failed upgrading memos."
-msgstr "升级备忘失败。"
-
-#: ../calendar/gui/memos-component.c:873
-#, c-format
-msgid "Unable to open the memo list '%s' for creating events and meetings"
-msgstr "无法打开备忘列表“%s”来创建事件和会议"
-
-#: ../calendar/gui/memos-component.c:886
-msgid "There is no calendar available for creating memos"
-msgstr "没有可创建备忘的日历"
-
-#: ../calendar/gui/memos-component.c:996
-msgid "Memo Source Selector"
-msgstr "备忘来源选择器"
-
-#: ../calendar/gui/memos-component.c:1175
-msgid "New memo"
-msgstr "新建备忘"
-
-#: ../calendar/gui/memos-component.c:1176
-msgctxt "New"
-msgid "Mem_o"
-msgstr "备忘(_O)"
-
-#: ../calendar/gui/memos-component.c:1177
-msgid "Create a new memo"
-msgstr "创建新备忘"
-
-#: ../calendar/gui/memos-component.c:1183
-msgid "New shared memo"
-msgstr "新建共享备忘"
-
-#: ../calendar/gui/memos-component.c:1184
-msgctxt "New"
-msgid "_Shared memo"
-msgstr "共享备忘(_S)"
-
-#: ../calendar/gui/memos-component.c:1185
-msgid "Create a shared new memo"
-msgstr "创建新的共享备忘"
-
-#: ../calendar/gui/memos-component.c:1191
-msgid "New memo list"
-msgstr "新建备忘列表"
-
-#: ../calendar/gui/memos-component.c:1192
-msgctxt "New"
-msgid "Memo li_st"
-msgstr "备忘列表(_S)"
-
-#: ../calendar/gui/memos-component.c:1193
-msgid "Create a new memo list"
-msgstr "创建新备忘列表"
-
-#: ../calendar/gui/memos-control.c:350 ../calendar/gui/memos-control.c:366
-msgid "Print Memos"
-msgstr "打印备忘"
-
-#: ../calendar/gui/migration.c:157
-msgid ""
-"The location and hierarchy of the Evolution task folders has changed since "
-"Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:829
+msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
-"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../calendar/gui/migration.c:161
-msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
+#: ../calendar/gui/itip-utils.c:831
+msgid "Unable to book a resource, error: "
 msgstr ""
-"Evolution 日历文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:775 ../calendar/gui/migration.c:943
-#, c-format
-msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
 
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:804
-#, c-format
-msgid "Unable to migrate calendar `%s'"
-msgstr "无法升迁日历“%s”"
-
-#. FIXME: domain/code
-#: ../calendar/gui/migration.c:972
-#, c-format
-msgid "Unable to migrate tasks `%s'"
-msgstr "无法升迁任务“%s”"
-
-#: ../calendar/gui/migration.c:1227
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:426
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:457
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:570
-msgid "Notes"
-msgstr "笔记"
+#: ../calendar/gui/itip-utils.c:985
+msgid "You must be an attendee of the event."
+msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:514
+#: ../calendar/gui/print.c:508
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:515
+#: ../calendar/gui/print.c:509
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:516
+#: ../calendar/gui/print.c:510
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:517
+#: ../calendar/gui/print.c:511
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:518
+#: ../calendar/gui/print.c:512
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:519
+#: ../calendar/gui/print.c:513
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:520
+#: ../calendar/gui/print.c:514
 msgid "31st"
 msgstr "31日"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:590
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:591
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:591
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:596
+#: ../calendar/gui/print.c:591
 msgid "Sa"
 msgstr "六"
 
-#: ../calendar/gui/print.c:2478
+#: ../calendar/gui/print.c:2536
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2480
+#: ../calendar/gui/print.c:2538
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2505
+#: ../calendar/gui/print.c:2563
 #, c-format
 msgid "Summary: %s"
 msgstr "概要：%s"
 
-#: ../calendar/gui/print.c:2528
+#: ../calendar/gui/print.c:2586
 msgid "Attendees: "
 msgstr "出席者："
 
-#: ../calendar/gui/print.c:2568
+#: ../calendar/gui/print.c:2626
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: ../calendar/gui/print.c:2585
+#: ../calendar/gui/print.c:2640
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2597
+#: ../calendar/gui/print.c:2655
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: ../calendar/gui/print.c:2609
+#: ../calendar/gui/print.c:2666
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2622
+#: ../calendar/gui/print.c:2679
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2633
+#: ../calendar/gui/print.c:2690
 msgid "Contacts: "
 msgstr "联系人："
 
-#: ../calendar/gui/tasks-component.c:490
-msgid "_New Task List"
-msgstr "新建任务列表(_N)"
-
-#: ../calendar/gui/tasks-component.c:573
-#, c-format
-msgid "%d task"
-msgid_plural "%d tasks"
-msgstr[0] "%d 个任务"
-
-#: ../calendar/gui/tasks-component.c:622
-msgid "Failed upgrading tasks."
-msgstr "升级任务失败。"
-
-#: ../calendar/gui/tasks-component.c:861
-#, c-format
-msgid "Unable to open the task list '%s' for creating events and meetings"
-msgstr "无法打开任务列表“%s”来创建事件和会议"
-
-#: ../calendar/gui/tasks-component.c:874
-msgid "There is no calendar available for creating tasks"
-msgstr "没有可创建任务的日历"
-
-#: ../calendar/gui/tasks-component.c:985
-msgid "Task Source Selector"
-msgstr "任务来源选择器"
-
-#: ../calendar/gui/tasks-component.c:1239
-msgid "New task"
-msgstr "新建任务"
-
-#: ../calendar/gui/tasks-component.c:1241
-msgid "Create a new task"
-msgstr "创建新任务"
-
-#: ../calendar/gui/tasks-component.c:1247
-msgid "New assigned task"
-msgstr "新建分配的任务"
-
-#: ../calendar/gui/tasks-component.c:1248
-msgctxt "New"
-msgid "Assigne_d Task"
-msgstr "分配的任务(_D)"
-
-#: ../calendar/gui/tasks-component.c:1249
-msgid "Create a new assigned task"
-msgstr "创建新分配的任务"
-
-#: ../calendar/gui/tasks-component.c:1255
-msgid "New task list"
-msgstr "新建任务列表"
-
-#: ../calendar/gui/tasks-component.c:1256
-msgctxt "New"
-msgid "Tas_k list"
-msgstr "任务列表(_K)"
-
-#: ../calendar/gui/tasks-component.c:1257
-msgid "Create a new task list"
-msgstr "创建新任务列表"
-
-#: ../calendar/gui/tasks-control.c:442
-msgid ""
-"This operation will permanently erase all tasks marked as completed. If you "
-"continue, you will not be able to recover these tasks.\n"
-"\n"
-"Really erase these tasks?"
-msgstr ""
-"该操作将永久删除所有标记为完成的任务。如果您继续，您将无法恢复这些任务。\n"
-"\n"
-"确实删除这些任务吗？"
-
-#: ../calendar/gui/tasks-control.c:445 ../mail/em-folder-view.c:1123
-msgid "Do not ask me again."
-msgstr "不要再次询问。"
-
-#: ../calendar/gui/tasks-control.c:482 ../calendar/gui/tasks-control.c:498
-msgid "Print Tasks"
-msgstr "打印任务"
-
 #: ../calendar/gui/tasktypes.xml.h:2
 #, no-c-format
 msgid "% Completed"
@@ -8941,11 +6245,11 @@ msgstr "已取消"
 msgid "In progress"
 msgstr "进行中"
 
-#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:34
+#: ../calendar/gui/tasktypes.xml.h:28 ../mail/em-filter-i18n.h:35
 msgid "is greater than"
 msgstr "大于"
 
-#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:35
+#: ../calendar/gui/tasktypes.xml.h:29 ../mail/em-filter-i18n.h:36
 msgid "is less than"
 msgstr "小于"
 
@@ -8953,29 +6257,29 @@ msgstr "小于"
 msgid "Appointments and Meetings"
 msgstr "约会和会议"
 
-#: ../calendar/importers/icalendar-importer.c:333
+#: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1723
+#: ../plugins/itip-formatter/itip-formatter.c:1821
 msgid "Opening calendar"
 msgstr "打开日历"
 
-#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:442
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 文件(.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:443
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 导入器"
 
-#: ../calendar/importers/icalendar-importer.c:529
+#: ../calendar/importers/icalendar-importer.c:531
 msgid "Reminder!"
 msgstr "提醒!!"
 
-#: ../calendar/importers/icalendar-importer.c:581
+#: ../calendar/importers/icalendar-importer.c:583
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 文件(.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:582
+#: ../calendar/importers/icalendar-importer.c:584
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 导入器"
 
@@ -9536,7 +6840,7 @@ msgid "America/Nassau"
 msgstr "美洲/拿骚"
 
 #: ../calendar/zones.h:157
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:3
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
 msgid "America/New_York"
 msgstr "美洲/纽约"
 
@@ -10536,301 +7840,267 @@ msgstr "太平洋/沃利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦"
 
-#: ../composer/e-composer-autosave.c:273
-msgid "Could not open autosave file"
-msgstr "无法打开自动保存文件"
-
-#: ../composer/e-composer-autosave.c:280
-msgid "Unable to retrieve message from editor"
-msgstr "无法从编辑器获取信件"
-
-#: ../composer/e-composer-actions.c:45
-msgid "Insert Attachment"
-msgstr "插入附件"
-
-#: ../composer/e-composer-actions.c:49
-msgid "A_ttach"
-msgstr "附件(_T)"
-
-#: ../composer/e-composer-actions.c:140
+#: ../composer/e-composer-actions.c:79
 msgid "Untitled Message"
 msgstr "无标题信件"
 
-#: ../composer/e-composer-actions.c:471
+#: ../composer/e-composer-actions.c:202
+msgid "Save as..."
+msgstr "另存为..."
+
+#: ../composer/e-composer-actions.c:281
+#: ../widgets/misc/e-attachment-view.c:328
 msgid "Attach a file"
 msgstr "添加附件"
 
-#: ../composer/e-composer-actions.c:476 ../mail/mail-signature-editor.c:194
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../composer/e-composer-actions.c:286
+#: ../widgets/misc/e-signature-editor.c:200
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: ../composer/e-composer-actions.c:478
+#: ../composer/e-composer-actions.c:288
 msgid "Close the current file"
 msgstr "关闭当前文件"
 
-#: ../composer/e-composer-actions.c:483 ../mail/em-folder-view.c:1334
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:47
-#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
+#: ../composer/e-composer-actions.c:293
 msgid "_Print..."
 msgstr "打印(_P)..."
 
-#: ../composer/e-composer-actions.c:490 ../ui/evolution-addressbook.xml.h:27
-#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12 ../ui/evolution-tasks.xml.h:15
+#: ../composer/e-composer-actions.c:300
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:309
 msgid "Save the current file"
 msgstr "保存当前文件"
 
-#: ../composer/e-composer-actions.c:504
+#: ../composer/e-composer-actions.c:314
 msgid "Save _As..."
 msgstr "另存为(_A)..."
 
-#: ../composer/e-composer-actions.c:506
+#: ../composer/e-composer-actions.c:316
 msgid "Save the current file with a different name"
 msgstr "用不同的文件名保存当前文件"
 
-#: ../composer/e-composer-actions.c:511
+#: ../composer/e-composer-actions.c:321
 msgid "Save as _Draft"
 msgstr "另存为草稿(_D)"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:323
 msgid "Save as draft"
 msgstr "另存为草稿"
 
-#: ../composer/e-composer-actions.c:518
+#: ../composer/e-composer-actions.c:328 ../composer/e-composer-private.c:202
 msgid "S_end"
 msgstr "发送(_E)"
 
-#: ../composer/e-composer-actions.c:520
+#: ../composer/e-composer-actions.c:330
 msgid "Send this message"
 msgstr "发送这封信"
 
-#: ../composer/e-composer-actions.c:527
-msgid "Insert Send options"
-msgstr "插入发送选项"
-
-#: ../composer/e-composer-actions.c:532
+#: ../composer/e-composer-actions.c:335
 msgid "New _Message"
 msgstr "新建信件(_M)"
 
-#: ../composer/e-composer-actions.c:534
+#: ../composer/e-composer-actions.c:337
 msgid "Open New Message window"
 msgstr "打开新建信件窗口"
 
-#: ../composer/e-composer-actions.c:541
+#: ../composer/e-composer-actions.c:344
 msgid "Character _Encoding"
 msgstr "字符编码(_E)"
 
-#: ../composer/e-composer-actions.c:548
+#: ../composer/e-composer-actions.c:351
 msgid "_Security"
 msgstr "安全(_S)"
 
-#: ../composer/e-composer-actions.c:558
+#: ../composer/e-composer-actions.c:361
 msgid "PGP _Encrypt"
 msgstr "PGP 加密(_E)"
 
-#: ../composer/e-composer-actions.c:560
+#: ../composer/e-composer-actions.c:363
 msgid "Encrypt this message with PGP"
 msgstr "用 PGP 加密该信件"
 
-#: ../composer/e-composer-actions.c:566
+#: ../composer/e-composer-actions.c:369
 msgid "PGP _Sign"
 msgstr "PGP 签名(_S)"
 
-#: ../composer/e-composer-actions.c:568
+#: ../composer/e-composer-actions.c:371
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 密钥签名该信件"
 
-#: ../composer/e-composer-actions.c:574
+#: ../composer/e-composer-actions.c:377
 msgid "_Prioritize Message"
 msgstr "标为优先(_P)"
 
-#: ../composer/e-composer-actions.c:576
+#: ../composer/e-composer-actions.c:379
 msgid "Set the message priority to high"
 msgstr "将信件设定为高优先级"
 
-#: ../composer/e-composer-actions.c:582
+#: ../composer/e-composer-actions.c:385
 msgid "Re_quest Read Receipt"
 msgstr "请求阅读收条(_Q)"
 
-#: ../composer/e-composer-actions.c:584
+#: ../composer/e-composer-actions.c:387
 msgid "Get delivery notification when your message is read"
 msgstr "当您的信件被阅读时得到投递通知"
 
-#: ../composer/e-composer-actions.c:590
+#: ../composer/e-composer-actions.c:393
 msgid "S/MIME En_crypt"
 msgstr "S/MIME 加密(_C)"
 
-#: ../composer/e-composer-actions.c:592
+#: ../composer/e-composer-actions.c:395
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "用您的 S/MIME 加密证书加密该信件"
 
-#: ../composer/e-composer-actions.c:598
+#: ../composer/e-composer-actions.c:401
 msgid "S/MIME Sig_n"
 msgstr "S/MIME 签名(_N)"
 
-#: ../composer/e-composer-actions.c:600
+#: ../composer/e-composer-actions.c:403
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 签名认证签名该信件"
 
-#: ../composer/e-composer-actions.c:606
+#: ../composer/e-composer-actions.c:409
 msgid "_Bcc Field"
 msgstr "暗送域(_B)"
 
-#: ../composer/e-composer-actions.c:608
+#: ../composer/e-composer-actions.c:411
 msgid "Toggles whether the BCC field is displayed"
 msgstr "是否显示暗中转发域"
 
-#: ../composer/e-composer-actions.c:614
+#: ../composer/e-composer-actions.c:417
 msgid "_Cc Field"
 msgstr "抄送域(_C)"
 
-#: ../composer/e-composer-actions.c:616
+#: ../composer/e-composer-actions.c:419
 msgid "Toggles whether the CC field is displayed"
 msgstr "是否显示转发域"
 
-#: ../composer/e-composer-actions.c:622
+#: ../composer/e-composer-actions.c:425
 msgid "_From Field"
 msgstr "发件人域(_F)"
 
-#: ../composer/e-composer-actions.c:624
+#: ../composer/e-composer-actions.c:427
 msgid "Toggles whether the From chooser is displayed"
 msgstr "是否显示发件人选择器"
 
-#: ../composer/e-composer-actions.c:630
-msgid "_Post-To Field"
-msgstr "投递到域(_P)"
-
-#: ../composer/e-composer-actions.c:632
-msgid "Toggles whether the Post-To field is displayed"
-msgstr "是否显示投递到域"
-
-#: ../composer/e-composer-actions.c:638
+#: ../composer/e-composer-actions.c:433
 msgid "_Reply-To Field"
 msgstr "回复域(_R)"
 
-#: ../composer/e-composer-actions.c:640
+#: ../composer/e-composer-actions.c:435
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "是否显示回复域"
 
-#: ../composer/e-composer-actions.c:646
-msgid "_Subject Field"
-msgstr "主题域(_C)"
-
-#: ../composer/e-composer-actions.c:648
-msgid "Toggles whether the Subject field is displayed"
-msgstr "切换是否显示主题域"
-
-#: ../composer/e-composer-actions.c:654
-msgid "_To Field"
-msgstr "收件人域(_T)"
-
-#: ../composer/e-composer-actions.c:656
-msgid "Toggles whether the To field is displayed"
-msgstr "是否显示寄给域"
-
-#: ../composer/e-composer-actions.c:699
+#: ../composer/e-composer-actions.c:478
 msgid "Save Draft"
 msgstr "保存草稿"
 
-#: ../composer/e-composer-header-table.c:64
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "输入信件的收件人"
 
-#: ../composer/e-composer-header-table.c:66
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "输入将接收该信件副本的收件人地址"
 
-#: ../composer/e-composer-header-table.c:69
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
 msgstr "输入将接收该信件副本，但不出现在收件人列表中的收件人地址"
 
-#: ../composer/e-composer-header-table.c:643
+#: ../composer/e-composer-header-table.c:949
 msgid "Fr_om:"
 msgstr "发件人(_O)："
 
-#: ../composer/e-composer-header-table.c:652
+#: ../composer/e-composer-header-table.c:949
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:959
+#: ../mail/e-mail-tag-editor.c:323 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:77
+msgid "From"
+msgstr "发件人"
+
+#: ../composer/e-composer-header-table.c:958
 msgid "_Reply-To:"
 msgstr "回复到(_R)："
 
-#: ../composer/e-composer-header-table.c:656
+#: ../composer/e-composer-header-table.c:963
 msgid "_To:"
 msgstr "收信人(_T)："
 
-#: ../composer/e-composer-header-table.c:661
+#: ../composer/e-composer-header-table.c:969
 msgid "_Cc:"
 msgstr "抄送(_C)："
 
-#: ../composer/e-composer-header-table.c:666
+#: ../composer/e-composer-header-table.c:969
+#, fuzzy
+msgid "Show CC"
+msgstr "显示(_W)："
+
+#: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "暗送(_B)："
 
-#: ../composer/e-composer-header-table.c:671
+#: ../composer/e-composer-header-table.c:975
+#, fuzzy
+msgid "Show BCC"
+msgstr "显示(_W)："
+
+#: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
 msgstr "投递到(_P)："
 
-#: ../composer/e-composer-header-table.c:675
+#: ../composer/e-composer-header-table.c:984
 msgid "S_ubject:"
 msgstr "主题(_U)："
 
-#: ../composer/e-composer-header-table.c:684
+#: ../composer/e-composer-header-table.c:993
 msgid "Si_gnature:"
 msgstr "签名(_G)："
 
-#: ../composer/e-composer-name-header.c:115
+#: ../composer/e-composer-name-header.c:134
 msgid "Click here for the address book"
 msgstr "单击此处以使用地址簿"
 
-#: ../composer/e-composer-post-header.c:137
-msgid "Posting destination"
-msgstr "投递目的"
-
-#: ../composer/e-composer-post-header.c:138
-msgid "Choose folders to post the message to."
-msgstr "选择要将信件投递到哪个文件夹。"
-
-#: ../composer/e-composer-post-header.c:172
+#: ../composer/e-composer-post-header.c:116
 msgid "Click here to select folders to post to"
 msgstr "单击此处以选择要投递到的文件夹"
 
-#: ../composer/e-composer-private.c:179 ../composer/e-msg-composer.c:1552
-msgid "Show _Attachment Bar"
-msgstr "显示附件栏(_A)"
+#: ../composer/e-composer-private.c:218
+#, fuzzy
+msgid "Save draft"
+msgstr "保存草稿"
+
+#. Check buttons
+#: ../composer/e-msg-composer.c:193 ../mail/em-utils.c:180
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
+msgid "_Do not show this message again."
+msgstr "不再显示此信息(_D)。"
 
-#: ../composer/e-msg-composer.c:866
+#: ../composer/e-msg-composer.c:989
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信件签名：未对此账户设置签名证书"
 
-#: ../composer/e-msg-composer.c:873
+#: ../composer/e-msg-composer.c:996
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密证书"
 
-#: ../composer/e-msg-composer.c:1494 ../mail/em-format-html-display.c:1949
-#: ../mail/em-format-html-display.c:2596 ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "附件"
-
-#: ../composer/e-msg-composer.c:1550
-msgid "Hide _Attachment Bar"
-msgstr "隐藏附件栏(_A)"
+#: ../composer/e-msg-composer.c:1385
+#, fuzzy
+msgid "Unable to reconstruct message from autosave file"
+msgstr "无法从编辑器获取信件"
 
-#: ../composer/e-msg-composer.c:1567 ../composer/e-msg-composer.c:2792
+#: ../composer/e-msg-composer.c:1451 ../composer/e-msg-composer.c:2178
 msgid "Compose Message"
 msgstr "撰写新信件"
 
-#: ../composer/e-msg-composer.c:4093
+#: ../composer/e-msg-composer.c:3408
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10912,20 +8182,10 @@ msgid ""
 msgstr "在您上次编写新信件时 Evolution 意外退出。恢复邮件将允许您继续完成。"
 
 #: ../composer/mail-composer.error.xml.h:17
-msgid ""
-"Send options available only for Novell GroupWise and Microsoft Exchange "
-"accounts."
-msgstr "发送选项只适用于 Novell GroupWise 和 Microsoft Exchange 账户。"
-
-#: ../composer/mail-composer.error.xml.h:18
-msgid "Send options not available."
-msgstr "发送选项不可用。"
-
-#: ../composer/mail-composer.error.xml.h:19
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
 msgstr "文件“{0}”不是普通文件，无法在邮件中发送。"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
@@ -10933,7 +8193,7 @@ msgstr ""
 "要将此目录的内容作为附件，您需要逐一添加此目录中的文件，或者创建一个此目录的"
 "归档文件，然后将此归档作为附件。"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
@@ -10943,51 +8203,66 @@ msgstr ""
 "无法激活 HTML 编辑器组件。\n"
 "请确定您的 gtkhtml 和 libgtkhtml 所安装的版本正确。"
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Unable to activate the address selector control."
 msgstr "无法激活地址选择控制。"
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "找到了未完成的信件"
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "警告：已修改的信件"
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "您无法将文件“{0}”作为这封信的附件。"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "在您可以撰写邮件之前您需要配置一个帐户。"
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:27
 msgid "_Continue Editing"
 msgstr "继续编辑(_C)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Do not Recover"
 msgstr "不恢复(_D)"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Recover"
 msgstr "恢复(_R)"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "_Save Draft"
 msgstr "保存草稿(_S)"
 
-#: ../data/evolution.desktop.in.in.h:1
+#: ../data/evolution-alarm-notify.desktop.in.in.h:1
+#, fuzzy
+msgid "Calendar event notifications"
+msgstr "日历信息"
+
+#: ../data/evolution-alarm-notify.desktop.in.in.h:2
+msgid "Evolution Alarm Notify"
+msgstr "Evolution 提醒通知"
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:715
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/e-shell-window-private.c:209
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../data/evolution.desktop.in.in.h:2
 msgid "Evolution Mail and Calendar"
 msgstr "Evolution 邮件及日历"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:951
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
 msgid "Groupware Suite"
 msgstr "Groupwise 套件"
 
-#: ../data/evolution.desktop.in.in.h:3
+#: ../data/evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "配置您的电子邮件，联系人和日程表"
 
@@ -10999,101 +8274,231 @@ msgstr "地址卡"
 msgid "calendar information"
 msgstr "日历信息"
 
-#: ../e-util/e-error.c:78 ../e-util/e-error.c:79 ../e-util/e-error.c:121
-msgid "Evolution Error"
-msgstr "Evolution 错误"
+#. Translators: This is a cancelled activity.
+#: ../e-util/e-activity.c:224
+#, c-format
+msgid "%s (cancelled)"
+msgstr "%s(取消的)"
+
+#. Translators: This is a completed activity.
+#: ../e-util/e-activity.c:227
+#, c-format
+msgid "%s (completed)"
+msgstr "%s(完成的)"
+
+#. Translators: This is an activity whose percent
+#. * complete is unknown.
+#: ../e-util/e-activity.c:231
+#, c-format
+msgid "%s..."
+msgstr "%s..."
+
+#: ../e-util/e-activity.c:236
+#, c-format
+msgid "%s (%d%% complete)"
+msgstr "%s (%d%% 完成)"
+
+#: ../e-util/e-charset.c:53
+msgid "Arabic"
+msgstr "阿拉伯语"
+
+#: ../e-util/e-charset.c:54
+msgid "Baltic"
+msgstr "波罗的语"
+
+#: ../e-util/e-charset.c:55
+msgid "Central European"
+msgstr "中欧"
+
+#: ../e-util/e-charset.c:56
+msgid "Chinese"
+msgstr "中文"
+
+#: ../e-util/e-charset.c:57
+msgid "Cyrillic"
+msgstr "西里尔语"
+
+#: ../e-util/e-charset.c:58
+msgid "Greek"
+msgstr "希腊语"
 
-#: ../e-util/e-error.c:80 ../e-util/e-error.c:81 ../e-util/e-error.c:119
-msgid "Evolution Warning"
-msgstr "Evolution 警告"
+#: ../e-util/e-charset.c:59
+msgid "Hebrew"
+msgstr "希伯来语"
+
+#: ../e-util/e-charset.c:60
+msgid "Japanese"
+msgstr "日文"
 
-#: ../e-util/e-error.c:118
-msgid "Evolution Information"
-msgstr "Evolution 信息"
+#: ../e-util/e-charset.c:61
+msgid "Korean"
+msgstr "韩语"
 
-#: ../e-util/e-error.c:120
-msgid "Evolution Query"
-msgstr "Evolution 查询"
+#: ../e-util/e-charset.c:62
+msgid "Thai"
+msgstr "泰语"
 
-#. setup a dummy error
-#: ../e-util/e-error.c:444
+#: ../e-util/e-charset.c:63
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: ../e-util/e-charset.c:64
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../e-util/e-charset.c:65
+msgid "Western European"
+msgstr "西欧"
+
+#: ../e-util/e-charset.c:66
+msgid "Western European, New"
+msgstr "西欧，新"
+
+#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:86 ../e-util/e-charset.c:87
+msgid "Traditional"
+msgstr "繁体"
+
+#: ../e-util/e-charset.c:88 ../e-util/e-charset.c:89 ../e-util/e-charset.c:90
+#: ../e-util/e-charset.c:91
+msgid "Simplified"
+msgstr "简体"
+
+#: ../e-util/e-charset.c:94
+msgid "Ukrainian"
+msgstr "乌克兰语"
+
+#: ../e-util/e-charset.c:97
+msgid "Visual"
+msgstr "可视"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:193
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../plugins/itip-formatter/itip-view.c:194
+#: ../widgets/table/e-cell-date-edit.c:304
+msgid "Today"
+msgstr "今天"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-datetime-format.c:202 ../plugins/itip-formatter/itip-view.c:222
+msgid "Tomorrow"
+msgstr "明天"
+
+#: ../e-util/e-datetime-format.c:204
+msgid "Yesterday"
+msgstr "昨天"
+
+#: ../e-util/e-datetime-format.c:207
 #, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "内部错误，请求了未知的错误“%s”"
+msgid "%d days from now"
+msgstr "距现在有 %d 天"
+
+#: ../e-util/e-datetime-format.c:209
+#, c-format
+msgid "%d days ago"
+msgstr "%d 天前"
+
+#: ../e-util/e-datetime-format.c:283 ../e-util/e-datetime-format.c:293
+#: ../e-util/e-datetime-format.c:302
+msgid "Use locale default"
+msgstr "使用本地默认值"
+
+#: ../e-util/e-datetime-format.c:496
+msgid "Format:"
+msgstr "格式："
+
+#: ../e-util/e-file-utils.c:135
+#, fuzzy
+msgid "(Unknown Filename)"
+msgstr "未知类型"
+
+#. Translators: The string value is the basename of a file.
+#: ../e-util/e-file-utils.c:139
+#, fuzzy, c-format
+msgid "Writing \"%s\""
+msgstr "查验 %s"
 
-#: ../e-util/e-logger.c:161
-msgid "Component"
-msgstr "组件"
+#. Translators: The first string value is the basename of a
+#. * remote file, the second string value is the hostname.
+#: ../e-util/e-file-utils.c:144
+#, fuzzy, c-format
+msgid "Writing \"%s\" to %s"
+msgstr "把“%s”复制到 %s"
 
-#: ../e-util/e-logger.c:162
-msgid "Name of the component being logged"
+#: ../e-util/e-logger.c:172
+#, fuzzy
+msgid "Name of the logger"
 msgstr "记录日志的组件名称"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:190
+#: ../e-util/e-module.c:188
+msgid "Filename"
+msgstr "文件名"
+
+#: ../e-util/e-module.c:189
+#, fuzzy
+msgid "The filename of the module"
+msgstr "更改此文件夹的名称"
+
+#: ../e-util/e-non-intrusive-error-dialog.c:191
 msgid "Debug Logs"
 msgstr "调试日志"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:204
+#: ../e-util/e-non-intrusive-error-dialog.c:205
 msgid "Show _errors in the status bar for"
 msgstr "在状态栏显示错误(_E)"
 
 #. Translators: This is the second part of the sentence
 #. * "Show _errors in the status bar for" - XXX - "second(s)."
-#: ../e-util/e-non-intrusive-error-dialog.c:222
+#: ../e-util/e-non-intrusive-error-dialog.c:223
 msgid "second(s)."
 msgstr "秒。"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:228
+#: ../e-util/e-non-intrusive-error-dialog.c:229
 msgid "Log Messages:"
 msgstr "日志消息："
 
-#: ../e-util/e-non-intrusive-error-dialog.c:273
+#: ../e-util/e-non-intrusive-error-dialog.c:274
 msgid "Log Level"
 msgstr "日志级别"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:281
-#: ../widgets/misc/e-dateedit.c:389
-msgid "Time"
-msgstr "时间"
-
-#: ../e-util/e-non-intrusive-error-dialog.c:291 ../mail/message-list.c:2522
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "信件"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:300
-#: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
+#: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
+#: ../shell/e-shell-window-actions.c:1502
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "错误"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "错误"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "警告和错误"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "调试"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:42
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "错误，警告和调试信息"
 
-#: ../e-util/e-plugin.c:308 ../filter/rule-editor.c:799
-#: ../mail/em-account-prefs.c:482 ../mail/em-composer-prefs.c:966
-#: ../plugins/plugin-manager/plugin-manager.c:355
-#: ../plugins/publish-calendar/publish-calendar.c:690
+#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:473
+#: ../plugins/plugin-manager/plugin-manager.c:349
+#: ../plugins/publish-calendar/publish-calendar.c:716
+#: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../e-util/e-plugin.c:309
+#: ../e-util/e-plugin.c:293
 msgid "Whether the plugin is enabled"
 msgstr "插件是否已启用"
 
@@ -11110,7 +8515,11 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "打印系统未报告关于错误的任何额外细节。"
 
-#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:19
+#: ../e-util/e-signature.c:695
+msgid "Autogenerated"
+msgstr "自动生成的"
+
+#: ../e-util/e-system.error.xml.h:1 ../mail/mail.error.xml.h:21
 msgid "Because \"{1}\"."
 msgstr "原因是“{1}”。"
 
@@ -11138,233 +8547,286 @@ msgstr "覆盖文件吗？"
 msgid "_Overwrite"
 msgstr "覆盖(_O)"
 
-#: ../e-util/e-util.c:127
+#: ../e-util/e-util.c:140
 msgid "Could not open the link."
 msgstr "无法打开链接。"
 
-#: ../e-util/e-util.c:174
+#: ../e-util/e-util.c:190
 msgid "Could not display help for Evolution."
 msgstr "无法显示 Evolution 的帮助。"
 
-#: ../e-util/e-util-labels.c:39
-msgid "I_mportant"
-msgstr "重要(_M)"
+#: ../e-util/gconf-bridge.c:1222
+#, c-format
+msgid "GConf error: %s"
+msgstr "GConf 错误：%s"
 
-#. red
-#: ../e-util/e-util-labels.c:40
-msgid "_Work"
-msgstr "工作(_W)"
+#: ../e-util/gconf-bridge.c:1233
+msgid "All further errors shown only on terminal."
+msgstr "后续所有的错误都只显示在终端。"
 
-#. orange
-#: ../e-util/e-util-labels.c:41
-msgid "_Personal"
-msgstr "个人(_P)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:960
+#: ../modules/mail/em-mailer-prefs.c:78
+msgid "Reply-To"
+msgstr "回复至"
 
-#. green
-#: ../e-util/e-util-labels.c:42
-msgid "_To Do"
-msgstr "待办(_T)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
+#: ../mail/em-format-html.c:2236 ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:2321 ../modules/mail/em-mailer-prefs.c:80
+msgid "Cc"
+msgstr "抄送"
 
-#. blue
-#: ../e-util/e-util-labels.c:43
-msgid "_Later"
-msgstr "稍候(_L)"
+#: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
+#: ../mail/em-format-html.c:2237 ../mail/em-format-html.c:2306
+#: ../mail/em-format-html.c:2324 ../modules/mail/em-mailer-prefs.c:81
+msgid "Bcc"
+msgstr "密件抄送"
 
-#: ../e-util/e-util-labels.c:315
-msgid "Label _Name:"
-msgstr "标签名称(_N)："
+#: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
+#: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
+#: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1112
+msgid "Subject"
+msgstr "主题"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Edit Label"
-msgstr "编辑标签"
+#. pseudo-header
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
+#: ../modules/mail/em-mailer-prefs.c:1131
+msgid "Mailer"
+msgstr "邮件程序"
 
-#: ../e-util/e-util-labels.c:338
-msgid "Add Label"
-msgstr "添加标签"
+#: ../em-format/em-format-quote.c:432 ../mail/em-composer-utils.c:1229
+msgid "-------- Forwarded Message --------"
+msgstr "-------- 转发的信件 --------"
 
-#: ../e-util/e-util-labels.c:357
-msgid "Label name cannot be empty."
-msgstr "标签名称不能为空。"
+#: ../em-format/em-format.c:965 ../mail/message-list.etspec.h:2
+#: ../modules/mail/em-mailer-prefs.c:83 ../widgets/misc/e-dateedit.c:544
+#: ../widgets/misc/e-dateedit.c:566
+msgid "Date"
+msgstr "日期"
 
-#: ../e-util/e-util-labels.c:362
-msgid ""
-"A label having the same tag already exists on the server. Please rename your "
-"label."
-msgstr "服务器上已存在同名的标签。请重命名您的标签。"
+#: ../em-format/em-format.c:966 ../modules/mail/em-mailer-prefs.c:84
+msgid "Newsgroups"
+msgstr "新闻组"
+
+#: ../em-format/em-format.c:967 ../modules/mail/em-mailer-prefs.c:85
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "头像"
 
-#: ../e-util/gconf-bridge.c:1221
+#: ../em-format/em-format.c:1320
 #, c-format
-msgid "GConf error: %s"
-msgstr "GConf 错误：%s"
+msgid "%s attachment"
+msgstr "%s 附件"
 
-#: ../e-util/gconf-bridge.c:1231
-msgid "All further errors shown only on terminal."
-msgstr "后续所有的错误都只显示在终端。"
+#: ../em-format/em-format.c:1375
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "无法解析 S/MIME 信件：未知错误"
+
+#: ../em-format/em-format.c:1513 ../em-format/em-format.c:1675
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "无法解析 MIME 信件。显示源文本。"
+
+#: ../em-format/em-format.c:1521
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "不支持 multipart/encrypted 的加密类型"
 
-#: ../filter/filter-datespec.c:81
+#: ../em-format/em-format.c:1533
+msgid "Could not parse PGP/MIME message"
+msgstr "无法解析 PGP/MIME 信件"
+
+#: ../em-format/em-format.c:1533
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "无法解析 PGP/MIME 信件：未知错误"
+
+#: ../em-format/em-format.c:1699
+msgid "Unsupported signature format"
+msgstr "不支持的签名格式"
+
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1848
+msgid "Error verifying signature"
+msgstr "校验签名错误"
+
+#: ../em-format/em-format.c:1707 ../em-format/em-format.c:1837
+#: ../em-format/em-format.c:1848
+msgid "Unknown error verifying signature"
+msgstr "校验签名发生了未知错误"
+
+#: ../em-format/em-format.c:1925
+msgid "Could not parse PGP message"
+msgstr "无法分析 PGP 信件"
+
+#: ../em-format/em-format.c:1925
+msgid "Could not parse PGP message: Unknown error"
+msgstr "无法解析 PGP 信件：未知错误"
+
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒前"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/e-filter-datespec.c:71
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
 msgstr[0] "%d 秒内"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/e-filter-datespec.c:72
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
 msgstr[0] "%d 分钟内"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/e-filter-datespec.c:73
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
 msgstr[0] "%d 小时内"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
 msgstr[0] "%d 内"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 周前"
 
-#: ../filter/filter-datespec.c:85
+#: ../filter/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
 msgstr[0] "%d 周内"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 个月前"
 
-#: ../filter/filter-datespec.c:86
+#: ../filter/e-filter-datespec.c:76
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
 msgstr[0] "%d 个月内"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "%d 年前"
 
-#: ../filter/filter-datespec.c:87
+#: ../filter/e-filter-datespec.c:77
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
 msgstr[0] "%d 年内"
 
-#: ../filter/filter-datespec.c:288
+#: ../filter/e-filter-datespec.c:116
 msgid "<click here to select a date>"
 msgstr "<单击此处以选择日期>"
 
-#: ../filter/filter-datespec.c:291 ../filter/filter-datespec.c:302
-#: ../filter/filter-datespec.c:313
+#: ../filter/e-filter-datespec.c:119 ../filter/e-filter-datespec.c:130
+#: ../filter/e-filter-datespec.c:141
 msgid "now"
 msgstr "现在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:298
+#: ../filter/e-filter-datespec.c:126
 msgid "%d-%b-%Y"
 msgstr "%Y-%m-%d"
 
-#: ../filter/filter-datespec.c:452
+#: ../filter/e-filter-datespec.c:269
 msgid "Select a time to compare against"
 msgstr "选择用于比较的时间"
 
-#: ../filter/filter-file.c:284
-msgid "Choose a file"
+#: ../filter/e-filter-file.c:184
+#, fuzzy
+msgid "Choose a File"
 msgstr "选择文件"
 
-#: ../filter/filter-part.c:532
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "测试"
-
-#: ../filter/filter-rule.c:853
+#: ../filter/e-filter-rule.c:653
 msgid "R_ule name:"
 msgstr "规则名(_U)："
 
-#: ../filter/filter-rule.c:881
+#: ../filter/e-filter-rule.c:682
 msgid "Find items that meet the following conditions"
 msgstr "查找符合下列条件的项目"
 
-#: ../filter/filter-rule.c:915
+#: ../filter/e-filter-rule.c:716
 msgid "A_dd Condition"
 msgstr "添加动作(_D)"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "如果满足所有条件"
 
-#: ../filter/filter-rule.c:921
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "如果满足任一条件"
 
-#: ../filter/filter-rule.c:923
+#: ../filter/e-filter-rule.c:724
 msgid "_Find items:"
 msgstr "查找项目(_F)："
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744 ../widgets/misc/e-send-options.ui.h:15
 msgid "Replies"
 msgstr "回复"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../filter/filter-rule.c:945
+#: ../filter/e-filter-rule.c:744
 msgid "No reply or parent"
 msgstr "无回复或原始邮件"
 
-#: ../filter/filter-rule.c:947
+#: ../filter/e-filter-rule.c:746
 msgid "I_nclude threads"
 msgstr "包含线索(_N)"
 
-#: ../filter/filter-rule.c:1045 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:309
+#: ../filter/e-filter-rule.c:1119 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:331
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/filter-rule.c:1045 ../mail/em-utils.c:310
+#: ../filter/e-filter-rule.c:1119 ../mail/em-utils.c:332
 msgid "Outgoing"
 msgstr "寄出"
 
+#: ../filter/e-rule-editor.c:265
+msgid "Add Rule"
+msgstr "添加规则"
+
+#: ../filter/e-rule-editor.c:352
+msgid "Edit Rule"
+msgstr "编辑规则"
+
 #: ../filter/filter.error.xml.h:1
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "无效的正则表达式“{0}”。"
@@ -11385,7 +8847,7 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少文件名。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:75
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:72
 msgid "Missing name."
 msgstr "缺少名称。"
 
@@ -11409,169 +8871,879 @@ msgstr "您必须为该过滤规则命名。"
 msgid "You must specify a file name."
 msgstr "您必须指定文件名。"
 
-#: ../filter/filter.glade.h:1
-msgid "<b>_Filter Rules</b>"
-msgstr "<b>过滤规则(_F)</b>"
-
-#: ../filter/filter.glade.h:2
+#: ../filter/filter.ui.h:1
 msgid "Compare against"
 msgstr "比较对象"
 
-#: ../filter/filter.glade.h:4
+#: ../filter/filter.ui.h:3
 msgid "Show filters for mail:"
 msgstr "显示邮件过滤器："
 
-#: ../filter/filter.glade.h:5
+#: ../filter/filter.ui.h:4
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr "信件的日期将会与指定日期的午夜12:00进行比较。"
 
-#: ../filter/filter.glade.h:7
+#: ../filter/filter.ui.h:6
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr "信件的日期将会在过滤执行时与指定时间进行比较。"
 
-#: ../filter/filter.glade.h:9
+#: ../filter/filter.ui.h:8
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr "信件的日期将会在过滤执行时与当前时间进行比较。"
 
-#: ../filter/filter.glade.h:12
+#: ../filter/filter.ui.h:11 ../mail/em-filter-editor.c:185
+msgid "_Filter Rules"
+msgstr "过滤规则(_F)"
+
+#: ../filter/filter.ui.h:12
 msgid "a time relative to the current time"
 msgstr "相对于当前时间的时间"
 
-#: ../filter/filter.glade.h:13
+#: ../filter/filter.ui.h:13
 msgid "ago"
 msgstr "过去"
 
-#: ../filter/filter.glade.h:16
+#: ../filter/filter.ui.h:16
 msgid "in the future"
 msgstr "未来"
 
-#: ../filter/filter.glade.h:18
+#: ../filter/filter.ui.h:18
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:198
+#: ../filter/filter.ui.h:19 ../mail/mail-config.ui.h:168
 msgid "seconds"
 msgstr "秒"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.ui.h:20
 msgid "the current time"
 msgstr "当前时间"
 
-#: ../filter/filter.glade.h:21
+#: ../filter/filter.ui.h:21
 msgid "the time you specify"
 msgstr "您指定的时间"
 
-#: ../filter/filter.glade.h:22 ../plugins/caldav/caldav-source.c:433
-#: ../plugins/calendar-http/calendar-http.c:282
-#: ../plugins/calendar-weather/calendar-weather.c:527
-#: ../plugins/google-account-setup/google-source.c:674
-#: ../plugins/google-account-setup/google-contacts-source.c:341
+#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:451
+#: ../plugins/calendar-file/calendar-file.c:296
+#: ../plugins/calendar-http/calendar-http.c:326
+#: ../plugins/calendar-weather/calendar-weather.c:517
+#: ../plugins/google-account-setup/google-contacts-source.c:333
+#: ../plugins/google-account-setup/google-source.c:742
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "weeks"
 msgstr "周"
 
-#: ../filter/filter.glade.h:23
+#: ../filter/filter.ui.h:23
 msgid "years"
 msgstr "年"
 
-#: ../filter/rule-editor.c:382
-msgid "Add Rule"
-msgstr "添加规则"
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
+#: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
+#: ../widgets/misc/e-attachment-paned.c:147
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "附件"
 
-#: ../filter/rule-editor.c:463
-msgid "Edit Rule"
-msgstr "编辑规则"
+#: ../mail/e-mail-attachment-bar.c:614
+#: ../widgets/misc/e-attachment-paned.c:607
+msgid "Icon View"
+msgstr "图标视图"
 
-#: ../filter/rule-editor.c:809
-msgid "Rule name"
-msgstr "规则名"
+#: ../mail/e-mail-attachment-bar.c:615
+#: ../widgets/misc/e-attachment-paned.c:608
+msgid "List View"
+msgstr "列表视图"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "编写器首选项"
+#: ../mail/e-mail-browser.c:668
+#, fuzzy
+msgid "Shell Module"
+msgstr "选择模式"
+
+#: ../mail/e-mail-browser.c:669 ../mail/message-list.c:2511
+msgid "The mail shell backend"
+msgstr ""
+
+#: ../mail/e-mail-browser.c:679
+msgid "Show Deleted"
+msgstr "显示删除的"
+
+#: ../mail/e-mail-browser.c:680
+msgid "Show deleted messages"
+msgstr "显示删除的信件"
+
+#: ../mail/e-mail-display.c:66
+msgid "_Add to Address Book..."
+msgstr "添加到地址簿(_A)..."
+
+#: ../mail/e-mail-display.c:73
+msgid "_To This Address"
+msgstr "到此地址(_T)"
+
+#: ../mail/e-mail-display.c:80
+msgid "_From This Address"
+msgstr "自此地址(_F)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: ../mail/e-mail-display.c:89
+#, fuzzy
+msgid "Create Search _Folder"
+msgstr "创建搜索文件夹(_S)"
+
+#: ../mail/e-mail-label-dialog.c:220
+msgid "_Label name:"
+msgstr "标签名称(_L)："
+
+#: ../mail/e-mail-label-list-store.c:41
+msgid "I_mportant"
+msgstr "重要(_M)"
+
+#. red
+#: ../mail/e-mail-label-list-store.c:42
+msgid "_Work"
+msgstr "工作(_W)"
+
+#. orange
+#: ../mail/e-mail-label-list-store.c:43
+msgid "_Personal"
+msgstr "个人(_P)"
+
+#. green
+#: ../mail/e-mail-label-list-store.c:44
+msgid "_To Do"
+msgstr "待办(_T)"
+
+#. blue
+#: ../mail/e-mail-label-list-store.c:45
+msgid "_Later"
+msgstr "稍候(_L)"
+
+#: ../mail/e-mail-label-manager.c:165
+#: ../modules/mail/e-mail-shell-view-actions.c:555
+msgid "Add Label"
+msgstr "添加标签"
+
+#: ../mail/e-mail-label-manager.c:216
+msgid "Edit Label"
+msgstr "编辑标签"
+
+#: ../mail/e-mail-label-manager.c:349
+#, fuzzy
 msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项，包括安全和信件显示"
+"Note: Underscore in the label name is used\n"
+"as mnemonic identifier in menu."
+msgstr "注意：标签名中的下划线被用作菜单中的助记符。"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和信件编写器"
+#: ../mail/e-mail-label-tree-view.c:86
+msgid "Color"
+msgstr "颜色"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账户"
+#: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
+#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
+#: ../modules/mail/e-mail-shell-view-private.c:907
+msgid "Inbox"
+msgstr "收件箱"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your network connection settings here"
-msgstr "在这里配置您的网络连接设置"
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+msgid "Drafts"
+msgstr "草稿"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
+msgid "Outbox"
+msgstr "发件箱"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+msgid "Sent"
+msgstr "已发箱"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
+#: ../plugins/templates/templates.c:574
+msgid "Templates"
+msgstr "模板"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
+#. XXX e-error should provide a widget layout and API suitable
+#. *     for packing additional widgets to the right of the alert
+#. *     icon.  But for now, screw it.
+#: ../mail/e-mail-reader-utils.c:108
+#: ../modules/calendar/e-task-shell-view-actions.c:606
+msgid "Do not ask me again"
+msgstr "不要再次询问"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
+#: ../mail/e-mail-reader.c:215 ../mail/em-filter-i18n.h:11
+msgid "Copy to Folder"
+msgstr "复制到文件夹"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
+#: ../mail/e-mail-reader.c:215 ../mail/em-folder-utils.c:381
+msgid "C_opy"
+msgstr "复制(_O)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-msgid "Evolution Network configuration control"
-msgstr "Evolution 网络配置控件"
+#: ../mail/e-mail-reader.c:621 ../mail/em-filter-i18n.h:51
+msgid "Move to Folder"
+msgstr "移至文件夹"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:13 ../mail/em-folder-view.c:602
-#: ../mail/importers/elm-importer.c:327 ../mail/importers/pine-importer.c:378
-#: ../mail/mail-component.c:597 ../mail/mail-component.c:598
-#: ../mail/mail-component.c:767
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
-msgid "Mail"
-msgstr "邮件"
+#: ../mail/e-mail-reader.c:621 ../mail/em-folder-utils.c:381
+msgid "_Move"
+msgstr "移动(_M)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
-#: ../mail/em-account-prefs.c:495
-msgid "Mail Accounts"
-msgstr "邮件账户"
+#: ../mail/e-mail-reader.c:852
+msgid "Save Message"
+msgid_plural "Save Messages"
+msgstr[0] "保存信息"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:15
-#: ../mail/mail-config.glade.h:104
-msgid "Mail Preferences"
-msgstr "邮件首选项"
+#: ../mail/e-mail-reader.c:1144
+msgid "A_dd Sender to Address Book"
+msgstr "将发件人添加到地址簿(_D)"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:16
-msgid "Network Preferences"
-msgstr "网络首选项"
+#: ../mail/e-mail-reader.c:1146
+msgid "Add sender to address book"
+msgstr "将发件人添加到地址簿"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:17
-msgid "_Mail"
-msgstr "邮件(_M)"
+#: ../mail/e-mail-reader.c:1151
+msgid "Check for _Junk"
+msgstr "检查垃圾信(_J)"
+
+#: ../mail/e-mail-reader.c:1153
+msgid "Filter the selected messages for junk status"
+msgstr "把选中的信件标记为垃圾邮件"
+
+#: ../mail/e-mail-reader.c:1160
+msgid "Copy selected messages to the clipboard"
+msgstr "将选中信件复制到剪贴板"
+
+#: ../mail/e-mail-reader.c:1165
+msgid "_Copy to Folder..."
+msgstr "复制到文件夹(_C)..."
+
+#: ../mail/e-mail-reader.c:1167
+msgid "Copy selected messages to another folder"
+msgstr "把选中的信件复制到其它文件夹"
+
+#: ../mail/e-mail-reader.c:1172
+msgid "_Delete Message"
+msgstr "删除信件(_D)"
+
+#: ../mail/e-mail-reader.c:1174
+msgid "Mark the selected messages for deletion"
+msgstr "为选中信件做删除标记"
+
+#: ../mail/e-mail-reader.c:1179
+msgid "Filter on Mailing _List..."
+msgstr "根据邮件列表过滤(_L)..."
+
+#: ../mail/e-mail-reader.c:1181
+msgid "Create a rule to filter messages to this mailing list"
+msgstr "创建可过滤寄往此邮件列表的信件的规则"
+
+#: ../mail/e-mail-reader.c:1186
+msgid "Filter on _Recipients..."
+msgstr "根据收件人过滤(_R)..."
+
+#: ../mail/e-mail-reader.c:1188
+msgid "Create a rule to filter messages to these recipients"
+msgstr "创建可过滤寄往这些收件人的信件的规则"
+
+#: ../mail/e-mail-reader.c:1193
+msgid "Filter on Se_nder..."
+msgstr "根据发件人过滤(_N)..."
+
+#: ../mail/e-mail-reader.c:1195
+msgid "Create a rule to filter messages from this sender"
+msgstr "创建可过滤此人寄来的信件的规则"
+
+#: ../mail/e-mail-reader.c:1200
+msgid "Filter on _Subject..."
+msgstr "根据主题过滤(_S)..."
+
+#: ../mail/e-mail-reader.c:1202
+msgid "Create a rule to filter messages with this subject"
+msgstr "创建可过滤此主题信件的规则"
+
+#: ../mail/e-mail-reader.c:1207
+msgid "A_pply Filters"
+msgstr "应用过滤规则(_P)"
+
+#: ../mail/e-mail-reader.c:1209
+msgid "Apply filter rules to the selected messages"
+msgstr "应用过滤规则到选中的信件"
+
+#: ../mail/e-mail-reader.c:1214
+msgid "_Find in Message..."
+msgstr "在信件中查找(_F)..."
+
+#: ../mail/e-mail-reader.c:1216
+msgid "Search for text in the body of the displayed message"
+msgstr "在显示信件的主体中搜索文本"
+
+#: ../mail/e-mail-reader.c:1221
+msgid "_Clear Flag"
+msgstr "清除标志(_C)"
+
+#: ../mail/e-mail-reader.c:1223
+#, fuzzy
+msgid "Remove the follow-up flag from the selected messages"
+msgstr "取消选中信件的删除"
+
+#: ../mail/e-mail-reader.c:1228
+msgid "_Flag Completed"
+msgstr "标志为已完成(_F)"
+
+#: ../mail/e-mail-reader.c:1230
+#, fuzzy
+msgid "Set the follow-up flag to completed on the selected messages"
+msgstr "把同一线索中的所有信件选择为选中信件"
+
+#: ../mail/e-mail-reader.c:1235
+msgid "Follow _Up..."
+msgstr "跟随(_U)..."
+
+#: ../mail/e-mail-reader.c:1237
+#, fuzzy
+msgid "Flag the selected messages for follow-up"
+msgstr "为选中信件做跟随标志"
+
+#: ../mail/e-mail-reader.c:1242
+msgid "_Attached"
+msgstr "附件(_A)"
+
+#: ../mail/e-mail-reader.c:1244 ../mail/e-mail-reader.c:1251
+msgid "Forward the selected message to someone as an attachment"
+msgstr "把选中信件作为附件转发给某人"
+
+#: ../mail/e-mail-reader.c:1249
+#, fuzzy
+msgid "Forward As _Attached"
+msgstr "作为 iCalendar 转发(_F)"
+
+#: ../mail/e-mail-reader.c:1256
+msgid "_Inline"
+msgstr "嵌入(_I)"
+
+#: ../mail/e-mail-reader.c:1258 ../mail/e-mail-reader.c:1265
+msgid "Forward the selected message in the body of a new message"
+msgstr "在新信体中转发选中信件"
+
+#: ../mail/e-mail-reader.c:1263
+#, fuzzy
+msgid "Forward As _Inline"
+msgstr "转发方式(_F)："
+
+#: ../mail/e-mail-reader.c:1270
+msgid "_Quoted"
+msgstr "引用(_Q)"
+
+#: ../mail/e-mail-reader.c:1272 ../mail/e-mail-reader.c:1279
+msgid "Forward the selected message quoted like a reply"
+msgstr "以类似于回复的引用方式转发选中的信件"
+
+#: ../mail/e-mail-reader.c:1277
+#, fuzzy
+msgid "Forward As _Quoted"
+msgstr "转发方式(_F)："
+
+#: ../mail/e-mail-reader.c:1284
+msgid "_Load Images"
+msgstr "装入图像(_L)"
+
+#: ../mail/e-mail-reader.c:1286
+msgid "Force images in HTML mail to be loaded"
+msgstr "强制装入 HTML 邮件中的图像"
+
+#: ../mail/e-mail-reader.c:1291
+msgid "_Important"
+msgstr "重要(_I)"
+
+#: ../mail/e-mail-reader.c:1293
+msgid "Mark the selected messages as important"
+msgstr "把选中信件标记为重要邮件"
+
+#: ../mail/e-mail-reader.c:1298
+msgid "_Junk"
+msgstr "垃圾(_J)"
+
+#: ../mail/e-mail-reader.c:1300
+msgid "Mark the selected messages as junk"
+msgstr "把选中信件标记为垃圾邮件"
+
+#: ../mail/e-mail-reader.c:1305
+msgid "_Not Junk"
+msgstr "非垃圾(_N)"
+
+#: ../mail/e-mail-reader.c:1307
+msgid "Mark the selected messages as not being junk"
+msgstr "把选中信件标记为非垃圾邮件"
+
+#: ../mail/e-mail-reader.c:1312
+msgid "_Read"
+msgstr "读取(_R)"
+
+#: ../mail/e-mail-reader.c:1314
+msgid "Mark the selected messages as having been read"
+msgstr "把选中信件标记为已读"
+
+#: ../mail/e-mail-reader.c:1319
+msgid "Uni_mportant"
+msgstr "不重要(_M)"
+
+#: ../mail/e-mail-reader.c:1321
+msgid "Mark the selected messages as unimportant"
+msgstr "把选中信件标记为不重要邮件"
+
+#: ../mail/e-mail-reader.c:1326
+msgid "_Unread"
+msgstr "未读(_U)"
+
+#: ../mail/e-mail-reader.c:1328
+msgid "Mark the selected messages as not having been read"
+msgstr "把选中信件标记为未读"
+
+#: ../mail/e-mail-reader.c:1333
+msgid "_Edit as New Message..."
+msgstr "作为新信件进行编辑(_E)..."
+
+#: ../mail/e-mail-reader.c:1335
+msgid "Open the selected messages in the composer for editing"
+msgstr "在撰写器中打开选中的信件以便编辑"
+
+#: ../mail/e-mail-reader.c:1340
+msgid "Compose _New Message"
+msgstr "撰写新信件(_N)"
+
+#: ../mail/e-mail-reader.c:1342
+msgid "Open a window for composing a mail message"
+msgstr "打开窗口以撰写信件"
+
+#: ../mail/e-mail-reader.c:1347
+msgid "_Open in New Window"
+msgstr "在新窗口中打开(_O)"
+
+#: ../mail/e-mail-reader.c:1349
+msgid "Open the selected messages in a new window"
+msgstr "在新窗口中打开选中的信件"
+
+#: ../mail/e-mail-reader.c:1354
+msgid "_Move to Folder..."
+msgstr "移至文件夹(_M)..."
+
+#: ../mail/e-mail-reader.c:1356
+msgid "Move selected messages to another folder"
+msgstr "把选中的信件移至其它文件夹"
+
+#: ../mail/e-mail-reader.c:1361
+msgid "_Next Message"
+msgstr "下一封信(_N)"
+
+#: ../mail/e-mail-reader.c:1363
+msgid "Display the next message"
+msgstr "显示下一封信件"
+
+#: ../mail/e-mail-reader.c:1368
+msgid "Next _Important Message"
+msgstr "下一封重要信件(_I)"
+
+#: ../mail/e-mail-reader.c:1370
+msgid "Display the next important message"
+msgstr "显示下一封重要信件"
+
+#: ../mail/e-mail-reader.c:1375
+msgid "Next _Thread"
+msgstr "下一条线索(_T)"
+
+#: ../mail/e-mail-reader.c:1377
+msgid "Display the next thread"
+msgstr "显示下一条线索"
+
+#: ../mail/e-mail-reader.c:1382
+msgid "Next _Unread Message"
+msgstr "下一封未读信件(_U)"
+
+#: ../mail/e-mail-reader.c:1384
+msgid "Display the next unread message"
+msgstr "显示下一封未读信件"
+
+#: ../mail/e-mail-reader.c:1389
+msgid "_Previous Message"
+msgstr "上一封信(_P)"
+
+#: ../mail/e-mail-reader.c:1391
+msgid "Display the previous message"
+msgstr "显示上一封信件"
+
+#: ../mail/e-mail-reader.c:1396
+msgid "Pr_evious Important Message"
+msgstr "上一封重要信件(_E)"
+
+#: ../mail/e-mail-reader.c:1398
+msgid "Display the previous important message"
+msgstr "显示上一封重要信件"
+
+#: ../mail/e-mail-reader.c:1403
+msgid "P_revious Unread Message"
+msgstr "上一封未读信件(_R)"
+
+#: ../mail/e-mail-reader.c:1405
+msgid "Display the previous unread message"
+msgstr "显示上一封未读信件"
+
+#: ../mail/e-mail-reader.c:1412
+msgid "Print this message"
+msgstr "打印该信件"
+
+#: ../mail/e-mail-reader.c:1419
+msgid "Preview the message to be printed"
+msgstr "预览要打印的信件"
+
+#: ../mail/e-mail-reader.c:1424
+msgid "Re_direct"
+msgstr "重发(_D)"
+
+#: ../mail/e-mail-reader.c:1426
+msgid "Redirect (bounce) the selected message to someone"
+msgstr "将选中信件重发(退回)给某人"
+
+#: ../mail/e-mail-reader.c:1431
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
+#: ../modules/mail/e-mail-attachment-handler.c:141
+msgid "Reply to _All"
+msgstr "回复所有人(_A)"
+
+#: ../mail/e-mail-reader.c:1433
+#, fuzzy
+msgid "Compose a reply to all the recipients of the selected message"
+msgstr "为选中信件的所有收件人撰写回复"
+
+#: ../mail/e-mail-reader.c:1438
+msgid "Reply to _List"
+msgstr "回复邮件列表(_L)"
+
+#: ../mail/e-mail-reader.c:1440
+msgid "Compose a reply to the mailing list of the selected message"
+msgstr "为选中信件的邮件列表撰写回复"
+
+#: ../mail/e-mail-reader.c:1445
+#: ../modules/mail/e-mail-attachment-handler.c:148
+msgid "_Reply to Sender"
+msgstr "回复发件人(_R)"
+
+#: ../mail/e-mail-reader.c:1447
+msgid "Compose a reply to the sender of the selected message"
+msgstr "为选中信件的发件人撰写回复"
+
+#: ../mail/e-mail-reader.c:1452
+#, fuzzy
+msgid "_Save as mbox..."
+msgstr "另存为..."
+
+#: ../mail/e-mail-reader.c:1454
+#, fuzzy
+msgid "Save selected messages as an mbox file"
+msgstr "把选中信件另存为文本文件"
+
+#: ../mail/e-mail-reader.c:1459
+msgid "Search Folder from Mailing _List..."
+msgstr "基于邮件列表的搜索文件夹(_L)..."
+
+#: ../mail/e-mail-reader.c:1461
+#, fuzzy
+msgid "Create a search folder for this mailing list"
+msgstr "为该邮件列表创建搜索文件夹"
+
+#: ../mail/e-mail-reader.c:1466
+msgid "Search Folder from Recipien_ts..."
+msgstr "基于收件人的搜索文件夹(_T)..."
+
+#: ../mail/e-mail-reader.c:1468
+#, fuzzy
+msgid "Create a search folder for these recipients"
+msgstr "为这些收件人创建搜索文件夹"
+
+#: ../mail/e-mail-reader.c:1473
+msgid "Search Folder from Sen_der..."
+msgstr "基于发件人的搜索文件夹(_D)..."
+
+#: ../mail/e-mail-reader.c:1475
+#, fuzzy
+msgid "Create a search folder for this sender"
+msgstr "为该发件人创建搜索文件夹"
+
+#: ../mail/e-mail-reader.c:1480
+msgid "Search Folder from S_ubject..."
+msgstr "基于主题的搜索文件夹(_U)..."
+
+#: ../mail/e-mail-reader.c:1482
+#, fuzzy
+msgid "Create a search folder for this subject"
+msgstr "为该主题创建搜索文件夹"
+
+#: ../mail/e-mail-reader.c:1487
+msgid "Select _All Text"
+msgstr "选中所有文字(_A)"
+
+#: ../mail/e-mail-reader.c:1489
+msgid "Select all the text in a message"
+msgstr "选中信件中的全部文本"
+
+#: ../mail/e-mail-reader.c:1494
+msgid "_Message Source"
+msgstr "信件源代码(_M)"
+
+#: ../mail/e-mail-reader.c:1496
+msgid "Show the raw email source of the message"
+msgstr "显示信件的原始邮件源代码"
+
+#: ../mail/e-mail-reader.c:1508
+msgid "_Undelete Message"
+msgstr "取消删除信件(_U)"
+
+#: ../mail/e-mail-reader.c:1510
+msgid "Undelete the selected messages"
+msgstr "取消选中信件的删除"
+
+#: ../mail/e-mail-reader.c:1515
+msgid "_Normal Size"
+msgstr "普通大小(_N)"
+
+#: ../mail/e-mail-reader.c:1517
+msgid "Reset the text to its original size"
+msgstr "把文本重新设置为原来的大小"
+
+#: ../mail/e-mail-reader.c:1522
+msgid "_Zoom In"
+msgstr "放大(_Z)"
+
+#: ../mail/e-mail-reader.c:1524
+msgid "Increase the text size"
+msgstr "增加文本大小"
+
+#: ../mail/e-mail-reader.c:1529
+msgid "Zoom _Out"
+msgstr "缩小(_O)"
+
+#: ../mail/e-mail-reader.c:1531
+msgid "Decrease the text size"
+msgstr "减少文本大小"
+
+#: ../mail/e-mail-reader.c:1538
+msgid "Create R_ule"
+msgstr "创建规则(_U)"
+
+#: ../mail/e-mail-reader.c:1545
+msgid "Ch_aracter Encoding"
+msgstr "字符编码(_A)"
+
+#: ../mail/e-mail-reader.c:1552
+msgid "F_orward As"
+msgstr "转发为(_O)"
+
+#: ../mail/e-mail-reader.c:1559
+msgid "_Go To"
+msgstr "转到(_G)"
+
+#: ../mail/e-mail-reader.c:1566
+msgid "Mar_k As"
+msgstr "标记为(_K)"
+
+#: ../mail/e-mail-reader.c:1573
+msgid "_Message"
+msgstr "信件(_M)"
+
+#: ../mail/e-mail-reader.c:1580
+msgid "_Zoom"
+msgstr "缩放(_Z)"
+
+#: ../mail/e-mail-reader.c:1609
+msgid "Mark for Follo_w Up..."
+msgstr "标记为跟随(_W)..."
+
+#: ../mail/e-mail-reader.c:1617
+msgid "Mark as _Important"
+msgstr "标记为重要(_I)"
+
+#: ../mail/e-mail-reader.c:1621
+msgid "Mark as _Junk"
+msgstr "标记为垃圾(_J)"
+
+#: ../mail/e-mail-reader.c:1625
+msgid "Mark as _Not Junk"
+msgstr "标记为非垃圾(_N)"
+
+#: ../mail/e-mail-reader.c:1629
+msgid "Mar_k as Read"
+msgstr "标记为已读(_K)"
+
+#: ../mail/e-mail-reader.c:1633
+msgid "Mark as Uni_mportant"
+msgstr "标记为不重要(_M)"
+
+#: ../mail/e-mail-reader.c:1637
+msgid "Mark as _Unread"
+msgstr "标记为未读(_U)"
+
+#: ../mail/e-mail-reader.c:1673
+msgid "_Caret Mode"
+msgstr "光标模式(_C)"
+
+#: ../mail/e-mail-reader.c:1675
+msgid "Show a blinking cursor in the body of displayed messages"
+msgstr "在显示信件的信体中显示闪烁光标"
+
+#: ../mail/e-mail-reader.c:1681
+msgid "All Message _Headers"
+msgstr "全部信头(_H)"
+
+#: ../mail/e-mail-reader.c:1683
+msgid "Show messages with all email headers"
+msgstr "显示邮件时显示所有信头"
 
-#: ../mail/em-account-editor.c:386
+#: ../mail/e-mail-reader.c:1904
+msgid "Unable to retrieve message"
+msgstr "无法获取信件"
+
+#. we changed user, thus reset the chosen calendar combo too, because
+#. other user means other calendars subscribed
+#: ../mail/e-mail-reader.c:2402
+#: ../plugins/google-account-setup/google-source.c:303
+#: ../plugins/google-account-setup/google-source.c:612
+#: ../plugins/google-account-setup/google-source.c:783
+#: ../widgets/misc/e-account-tree-view.c:234
+msgid "Default"
+msgstr "默认"
+
+#: ../mail/e-mail-reader.c:2518
+#: ../modules/mail/e-mail-attachment-handler.c:134
+msgid "_Forward"
+msgstr "转发(_F)"
+
+#: ../mail/e-mail-reader.c:2519
+msgid "Forward the selected message to someone"
+msgstr "把选中信件转发给某人"
+
+#: ../mail/e-mail-reader.c:2567 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:1132
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:979
+#: ../modules/calendar/e-task-shell-view-actions.c:1178
+#: ../plugins/groupwise-features/share-folder.c:754
+msgid "Delete"
+msgstr "删除"
+
+#: ../mail/e-mail-reader.c:2571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../widgets/misc/e-calendar.c:193
+msgid "Next"
+msgstr "下一项"
+
+#: ../mail/e-mail-reader.c:2575
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../widgets/misc/e-calendar.c:169
+msgid "Previous"
+msgstr "上一项"
+
+#: ../mail/e-mail-reader.c:2579 ../mail/mail-dialogs.ui.h:18
+msgid "Reply"
+msgstr "回复"
+
+#: ../mail/e-mail-search-bar.c:77
+#, c-format
+msgid "Matches: %d"
+msgstr "匹配：%d"
+
+#: ../mail/e-mail-search-bar.c:552
+msgid "Close the find bar"
+msgstr "关闭查找栏"
+
+#: ../mail/e-mail-search-bar.c:560
+msgid "Fin_d:"
+msgstr "查找(_D)："
+
+#: ../mail/e-mail-search-bar.c:572
+msgid "Clear the search"
+msgstr "清除搜索"
+
+#: ../mail/e-mail-search-bar.c:595
+msgid "_Previous"
+msgstr "上一项(_P)"
+
+#: ../mail/e-mail-search-bar.c:601
+msgid "Find the previous occurrence of the phrase"
+msgstr "寻找该词句出现的前一个位置"
+
+#: ../mail/e-mail-search-bar.c:611
+msgid "_Next"
+msgstr "下一项(_N)"
+
+#: ../mail/e-mail-search-bar.c:617
+msgid "Find the next occurrence of the phrase"
+msgstr "寻找该词句出现的下一个位置"
+
+#: ../mail/e-mail-search-bar.c:627
+msgid "Mat_ch case"
+msgstr "大小写匹配(_C)"
+
+#: ../mail/e-mail-search-bar.c:655
+msgid "Reached bottom of page, continued from top"
+msgstr "到达页面底部，移到顶部继续"
+
+#: ../mail/e-mail-search-bar.c:677
+msgid "Reached top of page, continued from bottom"
+msgstr "到达页面顶部，移到底部继续"
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
+#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
+#: ../mail/message-list.c:1563
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:120
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:107
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:110
+#: ../modules/calendar/e-task-shell-migrate.c:501
+#: ../modules/mail/e-mail-shell-migrate.c:2932
+msgid "On This Computer"
+msgstr "在此计算机中"
+
+#: ../mail/e-mail-tag-editor.c:292
+msgid "Flag to Follow Up"
+msgstr "跟随的标志"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. It will not use an encrypted connection.
+#: ../mail/em-account-editor.c:484 ../mail/mail-config.ui.h:72
+#: ../modules/addressbook/ldap-config.ui.h:10
+msgid "No encryption"
+msgstr "不加密"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. TLS (Transport Layer Security) is commonly known by
+#. this abbreviation.
+#: ../mail/em-account-editor.c:488 ../mail/mail-config.ui.h:120
+#: ../modules/addressbook/ldap-config.ui.h:19
+msgid "TLS encryption"
+msgstr "TLS 加密"
+
+#. Translators: This string is a "Use secure connection" option for
+#. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
+#. abbreviation.
+#: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
+#: ../modules/addressbook/ldap-config.ui.h:12
+msgid "SSL encryption"
+msgstr "SSL 加密"
+
+#: ../mail/em-account-editor.c:579
 #, c-format
 msgid "%s License Agreement"
 msgstr "%s 许可协议"
 
-#: ../mail/em-account-editor.c:393
+#: ../mail/em-account-editor.c:586
 #, c-format
 msgid ""
 "\n"
@@ -11583,118 +9755,148 @@ msgstr ""
 "请仔细阅读下方显示的 %s 许可协议\n"
 "并选中复选框表明您接受该协议\n"
 
-#: ../mail/em-account-editor.c:465 ../mail/em-filter-folder-element.c:258
-#: ../mail/em-vfolder-rule.c:513
-msgid "Select Folder"
-msgstr "选择文件夹"
+#: ../mail/em-account-editor.c:948
+msgid "Never"
+msgstr "从不"
 
-#: ../mail/em-account-editor.c:589 ../mail/em-account-editor.c:634
-#: ../mail/em-account-editor.c:701 ../widgets/misc/e-signature-combo-box.c:102
-msgid "Autogenerated"
-msgstr "自动生成的"
+#: ../mail/em-account-editor.c:949
+msgid "Always"
+msgstr "总是"
 
-#: ../mail/em-account-editor.c:761
+#: ../mail/em-account-editor.c:950
 msgid "Ask for each message"
 msgstr "每封信都询问"
 
-#: ../mail/em-account-editor.c:1809 ../mail/mail-config.glade.h:95
+#: ../mail/em-account-editor.c:2025
+msgid "Mail Configuration"
+msgstr "邮件配置"
+
+#: ../mail/em-account-editor.c:2026
+msgid ""
+"Welcome to the Evolution Mail Configuration Assistant.\n"
+"\n"
+"Click \"Forward\" to begin."
+msgstr ""
+"欢迎使用 Evolution 邮件配置助手。\n"
+"\n"
+"单击“前进”开始。"
+
+#: ../mail/em-account-editor.c:2028 ../mail/em-account-editor.c:2164
+#: ../mail/mail-config.ui.h:58
 msgid "Identity"
 msgstr "标识"
 
-#: ../mail/em-account-editor.c:1858 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2029
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
+"出的邮件中包含此信息。"
+
+#: ../mail/em-account-editor.c:2031 ../mail/em-account-editor.c:2201
+#: ../mail/mail-config.ui.h:90
 msgid "Receiving Email"
 msgstr "接收电子邮件"
 
-#: ../mail/em-account-editor.c:2130
+#: ../mail/em-account-editor.c:2032
+msgid "Please configure the following account settings."
+msgstr "请配置下列帐户设置。"
+
+#: ../mail/em-account-editor.c:2034 ../mail/em-account-editor.c:2657
+msgid "Sending Email"
+msgstr "发送电子邮件"
+
+#: ../mail/em-account-editor.c:2035
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
+"互联网服务提供商ISP。"
+
+#: ../mail/em-account-editor.c:2037
+msgid "Account Management"
+msgstr "账户管理"
+
+#: ../mail/em-account-editor.c:2038
+msgid ""
+"Please enter a descriptive name for this account in the space below.\n"
+"This name will be used for display purposes only."
+msgstr ""
+"请在下面的空白处输入此账户的描述性名称。\n"
+"此名称将只在显示时使用。"
+
+#: ../mail/em-account-editor.c:2042
+msgid "Done"
+msgstr "完成"
+
+#: ../mail/em-account-editor.c:2043
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click \"Apply\" to save your settings."
+msgstr ""
+"恭喜，您的邮件配置已经完成。\n"
+"\n"
+"您现在就可以用 Evolution 收发邮件了。\n"
+"\n"
+"单击“应用”可保存您的设置。"
+
+#: ../mail/em-account-editor.c:2473
 msgid "Check for _new messages every"
 msgstr "自动检查新邮件的间隔(_N)"
 
-#: ../mail/em-account-editor.c:2138
+#: ../mail/em-account-editor.c:2481
 msgid "minu_tes"
 msgstr "分钟(_T)"
 
-#: ../mail/em-account-editor.c:2326 ../mail/mail-config.glade.h:139
-msgid "Sending Email"
-msgstr "发送电子邮件"
-
-#: ../mail/em-account-editor.c:2385 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2715 ../mail/mail-config.ui.h:31
 msgid "Defaults"
 msgstr "默认"
 
-#. Security settings
-#: ../mail/em-account-editor.c:2451 ../mail/mail-config.glade.h:132
-#: ../plugins/exchange-operations/exchange-account-setup.c:332
+#: ../mail/em-account-editor.c:2777 ../mail/mail-config.ui.h:100
 msgid "Security"
 msgstr "安全"
 
+#. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2488 ../mail/em-account-editor.c:2579
+#: ../mail/em-account-editor.c:2814 ../mail/em-account-editor.c:2882
 msgid "Receiving Options"
 msgstr "接收选项"
 
-#: ../mail/em-account-editor.c:2489 ../mail/em-account-editor.c:2580
+#: ../mail/em-account-editor.c:2815 ../mail/em-account-editor.c:2883
 msgid "Checking for New Messages"
 msgstr "检查新邮件"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:3346
 msgid "Account Editor"
 msgstr "账户编辑器"
 
-#: ../mail/em-account-editor.c:2931 ../mail/mail-config.glade.h:84
+#: ../mail/em-account-editor.c:3346
 msgid "Evolution Account Assistant"
 msgstr "Evolution 账户助手"
 
-#. translators: default account indicator
-#: ../mail/em-account-prefs.c:429
-msgid "[Default]"
-msgstr "[默认]"
-
-#: ../mail/em-account-prefs.c:488
-msgid "Account name"
-msgstr "账户名"
-
-#: ../mail/em-account-prefs.c:490
-msgid "Protocol"
-msgstr "协议"
-
-#: ../mail/em-composer-prefs.c:303 ../mail/em-composer-prefs.c:438
-#: ../mail/mail-config.c:1190 ../mail/mail-signature-editor.c:478
-msgid "Unnamed"
-msgstr "未命名"
-
-#: ../mail/em-composer-prefs.c:970
-msgid "Language(s)"
-msgstr "语言"
-
-#: ../mail/em-composer-prefs.c:1019
-msgid "Add signature script"
-msgstr "添加签名脚本"
-
-#: ../mail/em-composer-prefs.c:1061
-msgid "Signature(s)"
-msgstr "签名"
-
-#: ../mail/em-composer-utils.c:1150 ../mail/em-format-quote.c:416
-msgid "-------- Forwarded Message --------"
-msgstr "-------- 转发的信件 --------"
-
-#: ../mail/em-composer-utils.c:1602
+#: ../mail/em-composer-utils.c:1687
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
-msgstr ""
+msgstr "缺少发送目标地址，邮件转发被取消。"
 
-#: ../mail/em-composer-utils.c:1608
+#: ../mail/em-composer-utils.c:1693
 msgid "No account found to use, forward of the message has been cancelled."
-msgstr ""
+msgstr "无可用账户，邮件转发被取消。"
 
-#: ../mail/em-composer-utils.c:2058
+#: ../mail/em-composer-utils.c:2136
 msgid "an unknown sender"
 msgstr "未知发件人"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:2105
+#: ../mail/em-composer-utils.c:2183
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11702,13 +9904,21 @@ msgstr ""
 "在 ${Year}-${Month}-${Day}${AbbrevWeekdayName}的 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender}写道："
 
-#: ../mail/em-composer-utils.c:2248
+#: ../mail/em-composer-utils.c:2327
 msgid "-----Original Message-----"
 msgstr "-------- 原始信件 --------"
 
-#: ../mail/em-filter-editor.c:156
-msgid "_Filter Rules"
-msgstr "过滤规则(_F)"
+#: ../mail/em-composer-utils.c:2507
+msgid "Posting destination"
+msgstr "投递目的"
+
+#: ../mail/em-composer-utils.c:2508
+msgid "Choose folders to post the message to."
+msgstr "选择要将信件投递到哪个文件夹。"
+
+#: ../mail/em-filter-folder-element.c:258
+msgid "Select Folder"
+msgstr "选择文件夹"
 
 #. Automatically generated. Do not edit.
 #: ../mail/em-filter-i18n.h:2
@@ -11739,10 +9949,6 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "完成于"
 
-#: ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "复制到文件夹"
-
 #: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "接收日期"
@@ -11751,14 +9957,6 @@ msgstr "接收日期"
 msgid "Date sent"
 msgstr "发送日期"
 
-#: ../mail/em-filter-i18n.h:14
-#: ../plugins/groupwise-features/share-folder.c:768
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
-#: ../ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "删除"
-
 #: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "已删除"
@@ -11803,229 +10001,176 @@ msgstr "表达式"
 msgid "Follow Up"
 msgstr "跟随"
 
-#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1056
+#: ../mail/em-filter-i18n.h:29
+msgid "Forward to"
+msgstr "转发至"
+
+#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
 msgid "Important"
 msgstr "重要"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "之后"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "is before"
 msgstr "之前"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:34
 msgid "is Flagged"
 msgstr "已标志"
 
-#: ../mail/em-filter-i18n.h:37
+#: ../mail/em-filter-i18n.h:38
 msgid "is not Flagged"
 msgstr "未标志"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:39
 msgid "is not set"
 msgstr "未设置"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:40
 msgid "is set"
 msgstr "已设置"
 
-#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:98
-#: ../ui/evolution-mail-message.xml.h:48
+#: ../mail/em-filter-i18n.h:41 ../mail/mail-config.ui.h:61
 msgid "Junk"
 msgstr "垃圾"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:43
 msgid "Label"
 msgstr "标签"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:44
 msgid "Mailing list"
 msgstr "邮件列表"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Match All"
 msgstr "全部匹配"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Body"
 msgstr "信体"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Message Header"
 msgstr "信头"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is Junk"
 msgstr "是垃圾邮件"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message is not Junk"
 msgstr "不是垃圾邮件"
 
-#: ../mail/em-filter-i18n.h:49
-msgid "Move to Folder"
-msgstr "移至文件夹"
-
 #: ../mail/em-filter-i18n.h:50
+msgid "Message Location"
+msgstr "信件位置"
+
+#: ../mail/em-filter-i18n.h:52
 msgid "Pipe to Program"
 msgstr "管道到程序"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:53
 msgid "Play Sound"
 msgstr "播放声音"
 
-#. Translators: "Read" as in "has been read" (message-tag-followup.c)
-#: ../mail/em-filter-i18n.h:52 ../mail/message-tag-followup.c:62
+#. Past tense, as in "has been read".
+#: ../mail/em-filter-i18n.h:54 ../mail/mail-dialogs.ui.h:17
 msgid "Read"
 msgstr "已读"
 
-#: ../mail/em-filter-i18n.h:53 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件人"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:56
 msgid "Regex Match"
 msgstr "正则表达式匹配"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:57
 msgid "Replied to"
 msgstr "已回复到"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:58
 msgid "returns"
 msgstr "返回"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:59
 msgid "returns greater than"
 msgstr "返回大于"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:60
 msgid "returns less than"
 msgstr "返回小于"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:61
 msgid "Run Program"
 msgstr "运行程序"
 
-#: ../mail/em-filter-i18n.h:60 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "分数"
 
-#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:14
+#: ../mail/em-filter-i18n.h:63 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "发送者"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:64
 msgid "Sender or Recipients"
 msgstr "发送者或接收者"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:65
 msgid "Set Label"
 msgstr "设置标签"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:66
 msgid "Set Status"
 msgstr "设置状态"
 
-#: ../mail/em-filter-i18n.h:65
+#: ../mail/em-filter-i18n.h:67
 msgid "Size (kB)"
 msgstr "大小(kB)"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:68
 msgid "sounds like"
 msgstr "发音类似"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:69
 msgid "Source Account"
 msgstr "来源账户"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:70
 msgid "Specific header"
 msgstr "指定信头"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:71
 msgid "starts with"
 msgstr "开始于"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:73
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: ../mail/em-filter-i18n.h:72 ../mail/em-format-quote.c:342
-#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:80
-#: ../mail/message-list.etspec.h:18 ../mail/message-tag-followup.c:311
-#: ../plugins/groupwise-features/properties.glade.h:7
-#: ../smime/lib/e-cert.c:1115
-msgid "Subject"
-msgstr "主题"
-
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:75
 msgid "Unset Status"
 msgstr "取消状态"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:522
+#: ../mail/em-filter-rule.c:521
 msgid "Then"
 msgstr "然后"
 
-#: ../mail/em-filter-rule.c:550
+#: ../mail/em-filter-rule.c:549
 msgid "Add Ac_tion"
 msgstr "添加动作(_T)"
 
-#: ../mail/em-folder-browser.c:192
-msgid "C_reate Search Folder From Search..."
-msgstr "从头创建搜索文件夹(_R)..."
-
-#: ../mail/em-folder-browser.c:217
-msgid "All Messages"
-msgstr "全部信件"
-
-#: ../mail/em-folder-browser.c:218
-msgid "Unread Messages"
-msgstr "未读信件"
-
-#: ../mail/em-folder-browser.c:220
-msgid "No Label"
-msgstr "无标签"
-
-#: ../mail/em-folder-browser.c:227
-msgid "Read Messages"
-msgstr "已读信件"
-
-#: ../mail/em-folder-browser.c:228
-msgid "Recent Messages"
-msgstr "最近信件"
-
-#: ../mail/em-folder-browser.c:229
-msgid "Last 5 Days' Messages"
-msgstr "前五天的信件"
-
-#: ../mail/em-folder-browser.c:230
-msgid "Messages with Attachments"
-msgstr "有附件的信件"
-
-#: ../mail/em-folder-browser.c:231
-msgid "Important Messages"
-msgstr "重要信件"
-
-#: ../mail/em-folder-browser.c:232
-msgid "Messages Not Junk"
-msgstr "不是垃圾邮件"
-
-#: ../mail/em-folder-browser.c:1173
-msgid "Account Search"
-msgstr "账户搜索"
-
-#: ../mail/em-folder-browser.c:1226
-msgid "All Account Search"
-msgstr "全部账户搜索"
-
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
 #: ../mail/em-folder-properties.c:174
 msgid "Unread messages:"
@@ -12049,70 +10194,56 @@ msgstr "配额使用(%s)："
 msgid "Quota usage"
 msgstr "配额使用"
 
-#. translators: standard local mailbox names
-#: ../mail/em-folder-properties.c:359 ../mail/em-folder-tree-model.c:509
-#: ../mail/em-folder-tree.c:2597 ../mail/mail-component.c:164
-#: ../mail/mail-component.c:585
-#: ../plugins/exchange-operations/exchange-delegates-user.c:78
-#: ../plugins/exchange-operations/exchange-folder.c:594
-msgid "Inbox"
-msgstr "收件箱"
-
-#: ../mail/em-folder-properties.c:390
-#: ../plugins/groupwise-features/properties.glade.h:4
+#: ../mail/em-folder-properties.c:399
+#: ../plugins/groupwise-features/properties.ui.h:4
 msgid "Folder Properties"
 msgstr "文件夹属性"
 
-#: ../mail/em-folder-selection-button.c:120
+#: ../mail/em-folder-selection-button.c:75
 msgid "<click here to select a folder>"
 msgstr "<单击此处以选择文件夹>"
 
-#: ../mail/em-folder-selector.c:254
+#: ../mail/em-folder-selector.c:267
 msgid "C_reate"
 msgstr "创建(_R)"
 
-#: ../mail/em-folder-selector.c:258
+#: ../mail/em-folder-selector.c:271
 msgid "Folder _name:"
 msgstr "文件夹名称(_N)："
 
 #. load store to mail component
-#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
-#: ../mail/mail-vfolder.c:980 ../mail/mail-vfolder.c:1047
+#: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
+#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
 msgid "Search Folders"
 msgstr "搜索文件夹"
 
-#. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
+#. UNMATCHED is always last.
+#: ../mail/em-folder-tree-model.c:154 ../mail/em-folder-tree-model.c:156
 msgid "UNMATCHED"
 msgstr "不匹配"
 
-#: ../mail/em-folder-tree-model.c:504 ../mail/mail-component.c:165
-msgid "Drafts"
-msgstr "草稿"
-
-#: ../mail/em-folder-tree-model.c:506 ../mail/mail-component.c:168
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-msgid "Templates"
-msgstr "模板"
-
-#: ../mail/em-folder-tree-model.c:512 ../mail/mail-component.c:166
-msgid "Outbox"
-msgstr "发件箱"
-
-#: ../mail/em-folder-tree-model.c:514 ../mail/mail-component.c:167
-msgid "Sent"
-msgstr "已发箱"
-
-#: ../mail/em-folder-tree-model.c:536 ../mail/em-folder-tree-model.c:843
+#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
 msgid "Loading..."
 msgstr "正在装入..."
 
+#: ../mail/em-folder-tree.c:188
+#, c-format
+msgid "Scanning folders in \"%s\""
+msgstr "在“%s”中扫描文件夹"
+
+#: ../mail/em-folder-tree.c:445
+msgid "Folder names cannot contain '/'"
+msgstr "文件夹名不能含有字符“/”"
+
 #. Translators: This is the string used for displaying the
-#. * folder names in folder trees. "%s" will be replaced by
-#. * the folder's name and "%u" will be replaced with the
-#. * number of unread messages in the folder.
+#. * folder names in folder trees. The first "%s" will be
+#. * replaced by the folder's name and "%u" will be replaced
+#. * with the number of unread messages in the folder. The
+#. * second %s will be replaced with a "+" letter for collapsed
+#. * folders with unread messages in some subfolder too,
+#. * or with an empty string for other cases.
 #. *
-#. * Most languages should translate this as "%s (%u)". The
+#. * Most languages should translate this as "%s (%u%s)". The
 #. * languages that use localized digits (like Persian) may
 #. * need to replace "%u" with "%Iu". Right-to-left languages
 #. * (like Arabic and Hebrew) may need to add bidirectional
@@ -12122,373 +10253,139 @@ msgstr "正在装入..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:380
-#, c-format
+#: ../mail/em-folder-tree.c:978
+#, fuzzy, c-format
 msgctxt "folder-display"
-msgid "%s (%u)"
+msgid "%s (%u%s)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:741
+#: ../mail/em-folder-tree.c:1309
 msgid "Mail Folder Tree"
 msgstr "邮件文件夹树"
 
-#: ../mail/em-folder-tree.c:900
+#: ../mail/em-folder-tree.c:1476
 #, c-format
 msgid "Moving folder %s"
 msgstr "移动文件夹“%s”"
 
-#: ../mail/em-folder-tree.c:902
+#: ../mail/em-folder-tree.c:1478
 #, c-format
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:909 ../mail/message-list.c:2013
+#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:911 ../mail/message-list.c:2015
+#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件复制到文件夹 %s"
 
-#: ../mail/em-folder-tree.c:926
+#: ../mail/em-folder-tree.c:1502
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将信件放到顶级文件夹存储"
 
-#: ../mail/em-folder-tree.c:1003 ../ui/evolution-mail-message.xml.h:104
-msgid "_Copy to Folder"
-msgstr "复制到文件夹(_C)"
-
-#: ../mail/em-folder-tree.c:1004 ../ui/evolution-mail-message.xml.h:117
-msgid "_Move to Folder"
-msgstr "移至文件夹(_M)"
-
-#: ../mail/em-folder-tree.c:1718 ../mail/mail-ops.c:1059
-#, c-format
-msgid "Scanning folders in \"%s\""
-msgstr "在“%s”中扫描文件夹"
-
-#: ../mail/em-folder-tree.c:2117
-msgid "Open in _New Window"
-msgstr "在新窗口中打开(_N)"
-
-#. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2122
-msgid "_New Folder..."
-msgstr "新建文件夹(_N)..."
-
-#: ../mail/em-folder-tree.c:2125
-msgid "_Move..."
-msgstr "移动(_M)..."
-
-#: ../mail/em-folder-tree.c:2133 ../ui/evolution-mail-list.xml.h:21
-msgid "Re_fresh"
-msgstr "刷新(_F)"
-
-#: ../mail/em-folder-tree.c:2134
-msgid "Fl_ush Outbox"
-msgstr "清空发件箱(_U)"
-
-#: ../mail/em-folder-tree.c:2140 ../mail/mail.error.xml.h:138
-msgid "_Empty Trash"
-msgstr "清空回收站(_E)"
-
-#: ../mail/em-folder-tree.c:2243
-msgid "_Unread Search Folder"
-msgstr "未读搜索文件夹(_U)"
-
-#: ../mail/em-folder-utils.c:101
+#: ../mail/em-folder-utils.c:98
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "把“%s”复制到 %s"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1183
-#: ../mail/em-folder-view.c:1198
-#: ../mail/importers/evolution-mbox-importer.c:82
-msgid "Select folder"
-msgstr "选择文件夹"
+#: ../mail/em-folder-utils.c:382
+msgid "Move Folder To"
+msgstr "移动文件夹到"
 
-#: ../mail/em-folder-utils.c:364 ../mail/em-folder-view.c:1198
-msgid "C_opy"
-msgstr "复制(_O)"
+#: ../mail/em-folder-utils.c:382
+msgid "Copy Folder To"
+msgstr "复制文件夹到"
 
-#: ../mail/em-folder-utils.c:532
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:495
+#: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "创建文件夹“%s”"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
-msgid "Create folder"
+#: ../mail/em-folder-utils.c:657
+msgid "Create Folder"
 msgstr "创建文件夹"
 
-#: ../mail/em-folder-utils.c:690
-#: ../plugins/groupwise-features/install-shared.c:169
-#: ../plugins/groupwise-features/share-folder-common.c:387
+#: ../mail/em-folder-utils.c:658
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
 msgid "Specify where to create the folder:"
 msgstr "指定在哪里创建文件夹："
 
-#: ../mail/em-folder-view.c:1087 ../mail/mail.error.xml.h:70
-msgid "Mail Deletion Failed"
-msgstr "邮件删除失败"
-
-#: ../mail/em-folder-view.c:1088 ../mail/mail.error.xml.h:126
-msgid "You do not have sufficient permissions to delete this mail."
-msgstr "您没有足够的权限删除此邮件。"
-
-#: ../mail/em-folder-view.c:1326 ../ui/evolution-mail-message.xml.h:127
-msgid "_Reply to Sender"
-msgstr "回复发件人(_R)"
-
-#: ../mail/em-folder-view.c:1328 ../mail/em-popup.c:566 ../mail/em-popup.c:577
-#: ../ui/evolution-mail-message.xml.h:109
-msgid "_Forward"
-msgstr "转发(_F)"
-
-#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
-#: ../mail/em-folder-view.c:1332 ../ui/evolution-mail-message.xml.h:106
-msgid "_Edit as New Message..."
-msgstr "作为新信件进行编辑(_E)..."
-
-#: ../mail/em-folder-view.c:1338
-msgid "U_ndelete"
-msgstr "取消删除(_N)"
-
-#: ../mail/em-folder-view.c:1339
-msgid "_Move to Folder..."
-msgstr "移至文件夹(_M)..."
-
-#: ../mail/em-folder-view.c:1340
-msgid "_Copy to Folder..."
-msgstr "复制到文件夹(_C)..."
-
-#: ../mail/em-folder-view.c:1343
-msgid "Mar_k as Read"
-msgstr "标记为已读(_K)"
-
-#: ../mail/em-folder-view.c:1344
-msgid "Mark as _Unread"
-msgstr "标记为未读(_U)"
-
-#: ../mail/em-folder-view.c:1345
-msgid "Mark as _Important"
-msgstr "标记为重要(_I)"
-
-#: ../mail/em-folder-view.c:1346
-msgid "Mark as Un_important"
-msgstr "标记为不重要(_I)"
-
-#: ../mail/em-folder-view.c:1347
-msgid "Mark as _Junk"
-msgstr "标记为垃圾(_J)"
-
-#: ../mail/em-folder-view.c:1348
-msgid "Mark as _Not Junk"
-msgstr "标记为非垃圾(_N)"
-
-#: ../mail/em-folder-view.c:1349
-msgid "Mark for Follo_w Up..."
-msgstr "标记为跟随(_W)..."
-
-#: ../mail/em-folder-view.c:1351
-msgid "_Label"
-msgstr "标签(_L)"
-
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../mail/em-folder-view.c:1352 ../widgets/misc/e-dateedit.c:478
-msgid "_None"
-msgstr "无(_N)"
-
-#: ../mail/em-folder-view.c:1355
-msgid "_New Label"
-msgstr "新建标签(_N)"
-
-#: ../mail/em-folder-view.c:1359
-msgid "Fla_g Completed"
-msgstr "已完成标志(_G)"
-
-#: ../mail/em-folder-view.c:1360
-msgid "Cl_ear Flag"
-msgstr "清除标志(_E)"
-
-#: ../mail/em-folder-view.c:1363
-msgid "Crea_te Rule From Message"
-msgstr "根据信件创建规则(_T)"
-
-#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
-#: ../mail/em-folder-view.c:1365
-msgid "Search Folder based on _Subject"
-msgstr "基于主题的搜索文件夹(_S)"
-
-#: ../mail/em-folder-view.c:1366
-msgid "Search Folder based on Se_nder"
-msgstr "基于发件人的搜索文件夹(_N)"
-
-#: ../mail/em-folder-view.c:1367
-msgid "Search Folder based on _Recipients"
-msgstr "基于收件人的搜索文件夹(_R)"
-
-#: ../mail/em-folder-view.c:1368
-msgid "Search Folder based on Mailing _List"
-msgstr "基于邮件列表的搜索文件夹(_L)"
-
-#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
-#: ../mail/em-folder-view.c:1373
-msgid "Filter based on Sub_ject"
-msgstr "基于主题过滤(_J)"
-
-#: ../mail/em-folder-view.c:1374
-msgid "Filter based on Sen_der"
-msgstr "基于发件人过滤(_D)"
-
-#: ../mail/em-folder-view.c:1375
-msgid "Filter based on Re_cipients"
-msgstr "基于收件人过滤(_C)"
-
-#: ../mail/em-folder-view.c:1376
-msgid "Filter based on _Mailing List"
-msgstr "基于邮件列表过滤(_M)"
-
-#. default charset used in mail view
-#. we changed user, thus reset the chosen calendar combo too, because
-#. other user means other calendars subscribed
-#: ../mail/em-folder-view.c:2252 ../mail/em-folder-view.c:2295
-#: ../plugins/google-account-setup/google-source.c:251
-#: ../plugins/google-account-setup/google-source.c:529
-#: ../plugins/google-account-setup/google-source.c:727
-msgid "Default"
-msgstr "默认"
-
-#: ../mail/em-folder-view.c:2513
-msgid "Unable to retrieve message"
-msgstr "无法获取信件"
-
-#: ../mail/em-folder-view.c:2532
-msgid "Retrieving Message..."
-msgstr "正在收取信件..."
-
-#: ../mail/em-folder-view.c:2751
-msgid "C_all To..."
-msgstr "呼叫到(_A)..."
-
-#: ../mail/em-folder-view.c:2754
-msgid "Create _Search Folder"
-msgstr "创建搜索文件夹(_S)"
-
-#: ../mail/em-folder-view.c:2755
-msgid "_From this Address"
-msgstr "自此地址(_F)"
-
-#: ../mail/em-folder-view.c:2756
-msgid "_To this Address"
-msgstr "到此地址(_T)"
-
-#: ../mail/em-folder-view.c:3249
+#: ../mail/em-folder-utils.c:674
 #, c-format
-msgid "Click to mail %s"
-msgstr "单击以给 %s 发送邮件"
-
-#: ../mail/em-folder-view.c:3261
-#, c-format
-msgid "Click to call %s"
-msgstr "单击以呼叫 %s"
-
-#: ../mail/em-folder-view.c:3266
-msgid "Click to hide/unhide addresses"
-msgstr "单击可隐藏/显示地址"
-
-#. message-search popup match count string
-#: ../mail/em-format-html-display.c:474
-#, c-format
-msgid "Matches: %d"
-msgstr "匹配：%d"
-
-#: ../mail/em-format-html-display.c:618
-msgid "Fin_d:"
-msgstr "查找(_D)："
-
-#. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:642
-msgid "_Previous"
-msgstr "上一项(_P)"
-
-#: ../mail/em-format-html-display.c:647
-msgid "_Next"
-msgstr "下一项(_N)"
-
-#: ../mail/em-format-html-display.c:652
-msgid "M_atch case"
-msgstr "匹配大小写(_A)"
+msgid "Unsubscribing from folder \"%s\""
+msgstr "无法退订文件夹“%s”"
 
-#: ../mail/em-format-html-display.c:951 ../mail/em-format-html.c:650
+#: ../mail/em-format-html-display.c:103 ../mail/em-format-html.c:1536
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html-display.c:951
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:952 ../mail/em-format-html.c:651
+#: ../mail/em-format-html-display.c:104 ../mail/em-format-html.c:1537
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html-display.c:952
+#: ../mail/em-format-html-display.c:104
 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:953 ../mail/em-format-html.c:652
+#: ../mail/em-format-html-display.c:105 ../mail/em-format-html.c:1538
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html-display.c:953
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:954 ../mail/em-format-html.c:653
+#: ../mail/em-format-html-display.c:106 ../mail/em-format-html.c:1539
 msgid "Valid signature, but cannot verify sender"
 msgstr "签名有效，但是无法校验发送者"
 
-#: ../mail/em-format-html-display.c:954
+#: ../mail/em-format-html-display.c:106
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "这封信的签名有效，但是无法校验邮件的发送者。"
 
-#: ../mail/em-format-html-display.c:955 ../mail/em-format-html.c:654
+#: ../mail/em-format-html-display.c:107 ../mail/em-format-html.c:1540
 msgid "Signature exists, but need public key"
 msgstr "签名已存在，但需要公钥"
 
-#: ../mail/em-format-html-display.c:955
+#: ../mail/em-format-html-display.c:107
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "这封信的签名有效，但是没有相应的公钥。"
 
-#: ../mail/em-format-html-display.c:962 ../mail/em-format-html.c:660
+#: ../mail/em-format-html-display.c:114 ../mail/em-format-html.c:1546
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:962
+#: ../mail/em-format-html-display.c:114
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:963 ../mail/em-format-html.c:661
+#: ../mail/em-format-html-display.c:115 ../mail/em-format-html.c:1547
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:963
+#: ../mail/em-format-html-display.c:115
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12497,21 +10394,21 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:964 ../mail/em-format-html.c:662
+#: ../mail/em-format-html-display.c:116 ../mail/em-format-html.c:1548
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:964
+#: ../mail/em-format-html-display.c:116
 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:965 ../mail/em-format-html.c:663
+#: ../mail/em-format-html-display.c:117 ../mail/em-format-html.c:1549
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:117
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12520,600 +10417,314 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:1066 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:48
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:1081
+#: ../mail/em-format-html-display.c:261
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:1407
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%m月%d日%A，%p%l:%M完成"
+#: ../mail/em-format-html-display.c:509
+msgid ""
+"Evolution cannot render this email as it is too large to process. You can "
+"view it unformatted or with an external text editor."
+msgstr ""
+"Evolution 无法渲染此电子邮件，原因是该邮件太大。您可以以无格式方式查看该邮"
+"件，或者使用外部文本编辑器查看。"
+
+#: ../mail/em-format-html-display.c:730
+msgid "Completed on"
+msgstr "完成于"
 
-#: ../mail/em-format-html-display.c:1415
+#: ../mail/em-format-html-display.c:738
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1418
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A，%p%l:%M"
-
-#: ../mail/em-format-html-display.c:1496
-msgid "_View Inline"
-msgstr "嵌入视图(_V)"
-
-#: ../mail/em-format-html-display.c:1497
-msgid "_Hide"
-msgstr "隐藏(_H)"
-
-#: ../mail/em-format-html-display.c:1498
-msgid "_Fit to Width"
-msgstr "适合宽度(_F)"
-
-#: ../mail/em-format-html-display.c:1499
-msgid "Show _Original Size"
-msgstr "显示原始大小(_O)"
-
-#: ../mail/em-format-html-display.c:2168
-msgid "Save attachment as"
-msgstr "附件另存为"
-
-#: ../mail/em-format-html-display.c:2172
-msgid "Select folder to save all attachments"
-msgstr "选择保存全部附件的文件夹..."
-
-#: ../mail/em-format-html-display.c:2223
-msgid "_Save Selected..."
-msgstr "保存所选(_S)..."
-
-#. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2290
-#, c-format
-msgid "%d at_tachment"
-msgid_plural "%d at_tachments"
-msgstr[0] "%d 个附件(_T)"
-
-#: ../mail/em-format-html-display.c:2297 ../mail/em-format-html-display.c:2386
-msgid "S_ave"
-msgstr "保存(_A)"
-
-#: ../mail/em-format-html-display.c:2308
-msgid "S_ave All"
-msgstr "全部保存(_A)"
-
-#: ../mail/em-format-html-display.c:2382
-msgid "No Attachment"
-msgstr "无附件"
+#. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
+#: ../mail/em-format-html-display.c:742
+msgid "by"
+msgstr ""
 
-#: ../mail/em-format-html-display.c:2529 ../mail/em-format-html-display.c:2568
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
 msgid "View _Unformatted"
 msgstr "无格式查看(_U)"
 
-#: ../mail/em-format-html-display.c:2531
+#: ../mail/em-format-html-display.c:928
 msgid "Hide _Unformatted"
 msgstr "无格式隐藏(_U)"
 
-#: ../mail/em-format-html-display.c:2588
+#: ../mail/em-format-html-display.c:985
 msgid "O_pen With"
 msgstr "打开方式(_P)"
 
-#: ../mail/em-format-html-display.c:2664
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"Evolution 无法渲染此电子邮件，原因是该邮件太大。您可以以无格式方式查看该邮"
-"件，或者使用外部文本编辑器查看。"
-
-#: ../mail/em-format-html-print.c:156
+#: ../mail/em-format-html-print.c:163
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d 页，共 %d 页"
 
-#: ../mail/em-format-html.c:504 ../mail/em-format-html.c:513
+#: ../mail/em-format-html.c:165
+msgid "Formatting message"
+msgstr "格式化信件"
+
+#: ../mail/em-format-html.c:356
+msgid "Formatting Message..."
+msgstr "正在格式化信件..."
+
+#: ../mail/em-format-html.c:1387 ../mail/em-format-html.c:1396
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "收取“%s”"
 
-#: ../mail/em-format-html.c:925
+#: ../mail/em-format-html.c:1848
 msgid "Unknown external-body part."
 msgstr "未知的 external-body 部分。"
 
-#: ../mail/em-format-html.c:933
+#: ../mail/em-format-html.c:1856
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: ../mail/em-format-html.c:963
+#: ../mail/em-format-html.c:1886
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: ../mail/em-format-html.c:974
+#: ../mail/em-format-html.c:1897
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: ../mail/em-format-html.c:976
+#: ../mail/em-format-html.c:1899
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: ../mail/em-format-html.c:997
+#: ../mail/em-format-html.c:1920
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: ../mail/em-format-html.c:1008
+#: ../mail/em-format-html.c:1931
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
-#: ../mail/em-format-html.c:1236
-msgid "Formatting message"
-msgstr "格式化信件"
-
-#: ../mail/em-format-html.c:1410
-msgid "Formatting Message..."
-msgstr "正在格式化信件..."
-
-#: ../mail/em-format-html.c:1563 ../mail/em-format-html.c:1627
-#: ../mail/em-format-html.c:1649 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:887 ../mail/em-mailer-prefs.c:78
-msgid "Cc"
-msgstr "抄送"
-
-#: ../mail/em-format-html.c:1564 ../mail/em-format-html.c:1633
-#: ../mail/em-format-html.c:1652 ../mail/em-format-quote.c:210
-#: ../mail/em-format.c:888 ../mail/em-mailer-prefs.c:79
-msgid "Bcc"
-msgstr "密件抄送"
-
-#. pseudo-header
-#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:353
-#: ../mail/em-mailer-prefs.c:1451
-msgid "Mailer"
-msgstr "邮件程序"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1771
-msgid " (%a, %R %Z)"
-msgstr " (%A，%R %Z)"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1776
-msgid " (%R %Z)"
-msgstr " (%R %Z)"
-
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:1912
+#: ../mail/em-format-html.c:2589
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "此消息由 <b>%s</b> 以 <b>%s</b> 的身份发送"
 
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:884
-#: ../mail/em-mailer-prefs.c:75 ../mail/message-list.etspec.h:7
-#: ../mail/message-tag-followup.c:307
-msgid "From"
-msgstr "发件人"
-
-#: ../mail/em-format-quote.c:210 ../mail/em-format.c:885
-#: ../mail/em-mailer-prefs.c:76
-msgid "Reply-To"
-msgstr "回复至"
-
-#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:81
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:325
-#: ../widgets/misc/e-dateedit.c:347
-msgid "Date"
-msgstr "日期"
-
-#: ../mail/em-format.c:891 ../mail/em-mailer-prefs.c:82
-msgid "Newsgroups"
-msgstr "新闻组"
-
-#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:83
-#: ../plugins/face/org-gnome-face.eplug.xml.h:2
-msgid "Face"
-msgstr "头像"
-
-#: ../mail/em-format.c:1158
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附件"
-
-#: ../mail/em-format.c:1200
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 S/MIME 信件：未知错误"
-
-#: ../mail/em-format.c:1337 ../mail/em-format.c:1493
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 信件。显示源文本。"
-
-#: ../mail/em-format.c:1345
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "不支持 multipart/encrypted 的加密类型"
-
-#: ../mail/em-format.c:1355
-msgid "Could not parse PGP/MIME message"
-msgstr "无法解析 PGP/MIME 信件"
-
-#: ../mail/em-format.c:1355
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "无法解析 PGP/MIME 信件：未知错误"
-
-#: ../mail/em-format.c:1512
-msgid "Unsupported signature format"
-msgstr "不支持的签名格式"
-
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1591
-msgid "Error verifying signature"
-msgstr "校验签名错误"
-
-#: ../mail/em-format.c:1520 ../mail/em-format.c:1582 ../mail/em-format.c:1591
-msgid "Unknown error verifying signature"
-msgstr "校验签名发生了未知错误"
-
-#: ../mail/em-format.c:1665
-msgid "Could not parse PGP message"
-msgstr "无法分析 PGP 信件"
-
-#: ../mail/em-format.c:1665
-msgid "Could not parse PGP message: Unknown error"
-msgstr "无法解析 PGP 信件：未知错误"
-
-#: ../mail/em-mailer-prefs.c:94
-msgid "Every time"
-msgstr "每次"
-
-#: ../mail/em-mailer-prefs.c:95
-msgid "Once per day"
-msgstr "每天一次"
-
-#: ../mail/em-mailer-prefs.c:96
-msgid "Once per week"
-msgstr "每周一次"
-
-#: ../mail/em-mailer-prefs.c:97
-msgid "Once per month"
-msgstr "每月一次"
-
-#: ../mail/em-mailer-prefs.c:327
-msgid "Add Custom Junk Header"
-msgstr "添加自定义垃圾信头"
-
-#: ../mail/em-mailer-prefs.c:331
-msgid "Header Name:"
-msgstr "信头名称："
-
-#: ../mail/em-mailer-prefs.c:332
-msgid "Header Value Contains:"
-msgstr "信头值含有："
-
-#: ../mail/em-mailer-prefs.c:437
-msgid "Contains Value"
-msgstr "包含值"
-
-#: ../mail/em-mailer-prefs.c:459
-msgid "Color"
-msgstr "颜色"
-
-#: ../mail/em-mailer-prefs.c:462
-msgid "Tag"
-msgstr "标签"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1079 ../mail/em-mailer-prefs.c:1133
-#, c-format
-msgid "%s plugin is available and the binary is installed."
-msgstr "%s 插件可用，二进制文件已经安装。"
-
-#. May be a better text
-#: ../mail/em-mailer-prefs.c:1087 ../mail/em-mailer-prefs.c:1142
-#, c-format
-msgid ""
-"%s plugin is not available. Please check whether the package is installed."
-msgstr "%s 插件不可用。请检查软件包是否已安装。"
-
-#: ../mail/em-mailer-prefs.c:1108
-msgid "No Junk plugin available"
-msgstr "没有可用的垃圾邮件插件"
-
-#. green
-#: ../mail/em-migrate.c:1059
-msgid "To Do"
-msgstr "待办"
-
-#. blue
-#: ../mail/em-migrate.c:1060
-msgid "Later"
-msgstr "稍候"
-
-#: ../mail/em-migrate.c:1652
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "无法创建新文件夹“%s”：%s"
-
-#: ../mail/em-migrate.c:1678
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "无法将文件夹“%s”复制为“%s”：%s"
-
-#: ../mail/em-migrate.c:1863
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "无法扫描位于“%s”的已有邮箱：%s"
-
-#: ../mail/em-migrate.c:1868
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#: ../mail/em-migrate.c:2069
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”：%s"
-
-#: ../mail/em-migrate.c:2083
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”：%s"
-
-#: ../mail/em-migrate.c:2112
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s"
-
-#: ../mail/em-migrate.c:2583 ../mail/em-migrate.c:2595
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "创建本地邮件存储“%s”失败：%s"
-
-#: ../mail/em-migrate.c:2952
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"自 Evolution 2.4 之后，Evolution 邮箱文件夹的摘要格式现已移至 SQLite。\n"
-"\n"
-"请稍候，Evolution 正在升迁您的文件夹..."
-
-#: ../mail/em-migrate.c:3034
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "无法在“%s”创建本地邮件文件夹：%s"
-
-#: ../mail/em-migrate.c:3053
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
-"坏。"
-
-#: ../mail/em-popup.c:562 ../mail/em-popup.c:573
-msgid "_Reply to sender"
-msgstr "回复发件人(_R)"
-
-#: ../mail/em-popup.c:563 ../mail/em-popup.c:574
-#: ../ui/evolution-mail-message.xml.h:83
-msgid "Reply to _List"
-msgstr "回复邮件列表(_L)"
-
-#. make it first item
-#: ../mail/em-popup.c:625 ../mail/em-popup.c:849
-msgid "_Add to Address Book"
-msgstr "添加到地址簿(_A)"
-
-#: ../mail/em-subscribe-editor.c:600
+#: ../mail/em-subscribe-editor.c:597
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此存储不支持订阅，或订阅未启用。"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:630
 msgid "Subscribed"
 msgstr "已订阅"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:634
 msgid "Folder"
 msgstr "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:839
+#: ../mail/em-subscribe-editor.c:846
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-#: ../mail/em-subscribe-editor.c:860
+#: ../mail/em-subscribe-editor.c:882
 msgid "No server has been selected"
 msgstr "没有选中服务器"
 
-#. Check buttons
-#: ../mail/em-utils.c:121
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
-msgid "_Do not show this message again."
-msgstr "不再显示此信息(_D)。"
-
-#: ../mail/em-utils.c:317
+#: ../mail/em-utils.c:341
 msgid "Message Filters"
 msgstr "邮件过滤器"
 
-#: ../mail/em-utils.c:370
-msgid "message"
-msgstr "信件"
-
-#: ../mail/em-utils.c:654
-msgid "Save Message..."
-msgstr "保存信件..."
-
-#: ../mail/em-utils.c:704
-msgid "Add address"
-msgstr "添加地址"
-
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1225
+#: ../mail/em-utils.c:845
 #, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的信件"
 
-#: ../mail/em-vfolder-editor.c:115
+#: ../mail/em-vfolder-editor.c:124
 msgid "Search _Folders"
 msgstr "搜索文件夹(_F)"
 
-#: ../mail/em-vfolder-rule.c:593
-msgid "Search Folder source"
-msgstr "搜索文件夹来源"
+#: ../mail/em-vfolder-rule.c:521
+msgid "Add Folder"
+msgstr "添加文件夹"
 
 #: ../mail/evolution-mail.schemas.in.h:1
+msgid "\"Filter Editor\" window height"
+msgstr "“过滤器编辑器”窗口高度"
+
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "\"Filter Editor\" window maximize state"
+msgstr "“过滤器编辑器”窗口最大化状态"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "\"Filter Editor\" window width"
+msgstr "“过滤器编辑器”窗口宽度"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "\"Search Folder Editor\" window height"
+msgstr "“搜索文件夹编辑器”窗口高度"
+
+#: ../mail/evolution-mail.schemas.in.h:5
+msgid "\"Search Folder Editor\" window maximize state"
+msgstr "“搜索文件夹编辑器”窗口最大化状态"
+
+#: ../mail/evolution-mail.schemas.in.h:6
+msgid "\"Search Folder Editor\" window width"
+msgstr "“搜索文件夹编辑器”窗口宽度"
+
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "\"Send and Receive Mail\" window height"
 msgstr "“发送和接收邮件”窗口高度"
 
-#: ../mail/evolution-mail.schemas.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "\"Send and Receive Mail\" window maximize state"
 msgstr "“发送和接收邮件”窗口最大化状态"
 
-#: ../mail/evolution-mail.schemas.in.h:3
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "\"Send and Receive Mail\" window width"
 msgstr "“发送和接收邮件”窗口宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Allows Evolution to display text part of limited size"
 msgstr "允许 Evolution 显示被限制大小的文本部分"
 
-#: ../mail/evolution-mail.schemas.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:11
 msgid "Always request read receipt"
 msgstr "总是请求阅读收条"
 
-#: ../mail/evolution-mail.schemas.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid "Automatic emoticon recognition"
 msgstr "自动识别表情图标"
 
-#: ../mail/evolution-mail.schemas.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Automatic link recognition"
 msgstr "自动识别链接"
 
-#: ../mail/evolution-mail.schemas.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Check incoming mail being junk"
 msgstr "检查收到的邮件是否是垃圾邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Citation highlight color"
 msgstr "引用突出颜色"
 
-#: ../mail/evolution-mail.schemas.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Citation highlight color."
 msgstr "引用突出颜色。"
 
-#: ../mail/evolution-mail.schemas.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Composer Window default height"
 msgstr "编写窗口的默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:19
 msgid "Composer Window default width"
 msgstr "编写窗口的默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:20
 msgid "Composer load/attach directory"
 msgstr "撰写器加载/附件目录"
 
-#: ../mail/evolution-mail.schemas.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:21
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "压缩 TO/CC/BCC 中地址的显示"
 
-#: ../mail/evolution-mail.schemas.in.h:16
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "将 TO/CC/BCC 的显示地址数压缩到 address_count 所指定的数量。"
 
-#: ../mail/evolution-mail.schemas.in.h:17
+#: ../mail/evolution-mail.schemas.in.h:23
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
 msgstr "控制与远程邮件服务器同步本地更改的频率。间隔必须至少为 30 秒。"
 
-#: ../mail/evolution-mail.schemas.in.h:18
+#: ../mail/evolution-mail.schemas.in.h:24
 msgid "Custom headers to use while checking for junk."
 msgstr "自定义用以检查垃圾邮件的信头。"
 
-#: ../mail/evolution-mail.schemas.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:25
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
 msgstr "自定义用以检查垃圾邮件的信头。列表元素的字符串格式为“信头名=值”。"
 
-#: ../mail/evolution-mail.schemas.in.h:20
+#: ../mail/evolution-mail.schemas.in.h:26
 msgid "Default charset in which to compose messages"
 msgstr "编写信件的默认字符集"
 
-#: ../mail/evolution-mail.schemas.in.h:21
+#: ../mail/evolution-mail.schemas.in.h:27
 msgid "Default charset in which to compose messages."
 msgstr "编写信件的默认字符集。"
 
-#: ../mail/evolution-mail.schemas.in.h:22
+#: ../mail/evolution-mail.schemas.in.h:28
 msgid "Default charset in which to display messages"
 msgstr "显示信件的默认字符集"
 
-#: ../mail/evolution-mail.schemas.in.h:23
+#: ../mail/evolution-mail.schemas.in.h:29
 msgid "Default charset in which to display messages."
 msgstr "显示信件的默认字符集。"
 
-#: ../mail/evolution-mail.schemas.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:30
 msgid "Default forward style"
 msgstr "默认转发方式"
 
-#: ../mail/evolution-mail.schemas.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:31
 msgid "Default height of the Composer Window."
 msgstr "撰写窗口的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:26
-msgid "Default height of the message window."
-msgstr "信件窗口的默认高度。"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Default height of the mail browser window."
+msgstr "邮件浏览器窗口的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Default height of the subscribe dialog."
 msgstr "订阅对话框的默认高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Default maximized state of the mail browser window."
+msgstr "邮件浏览器窗口的默认最大化状态。"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Default reply style"
 msgstr "默认回复样式"
 
-#: ../mail/evolution-mail.schemas.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:36
 msgid "Default value for thread expand state"
 msgstr "话题的默认展开状态"
 
-#: ../mail/evolution-mail.schemas.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Default width of the Composer Window."
 msgstr "撰写窗口的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:31
-msgid "Default width of the message window."
-msgstr "信件窗口的默认宽度。"
+#: ../mail/evolution-mail.schemas.in.h:38
+msgid "Default width of the mail browser window."
+msgstr "邮件浏览器窗口的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:39
 msgid "Default width of the subscribe dialog."
 msgstr "订阅对话框的默认宽度。"
 
-#: ../mail/evolution-mail.schemas.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
 msgstr "决定是否仅在本地地址簿中查找地址进行垃圾邮件过滤"
 
-#: ../mail/evolution-mail.schemas.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:41
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "决定是否在地址簿中查找发件人电子邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:42
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -13124,11 +10735,11 @@ msgstr ""
 "为自动补全的地址簿中查找，如果远程地址簿(如 LDAP)被标记为自动补全的话，可能会"
 "比较慢。"
 
-#: ../mail/evolution-mail.schemas.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "决定是否使用自定义信头检测垃圾邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:44
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -13137,131 +10748,132 @@ msgstr ""
 "决定是否使用自定义信头检测垃圾邮件。如果此选项被启用且信头被设置的话，将提高"
 "垃圾邮件检测速度。"
 
-#: ../mail/evolution-mail.schemas.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
 msgstr "决定是否在垂直视图中对“信件”列的“来自”和“主题”行使用相同的字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Directory for loading/attaching files to composer."
 msgstr "邮件写作器用来加载/附加文件的目录"
 
-#: ../mail/evolution-mail.schemas.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Directory for saving mail component files."
 msgstr "保存邮件组件文件的目录。"
 
-#: ../mail/evolution-mail.schemas.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Disable or enable ellipsizing of folder names in side bar"
 msgstr "禁用或启用侧边栏中文件夹名的省略显示"
 
-#: ../mail/evolution-mail.schemas.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:49
+#, fuzzy
+msgid "Do not add signature delimiter"
+msgstr "无法保存签名文件。"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid "Draw spelling error indicators on words as you type."
 msgstr "在您打字的时候就显示拼写错误标识。"
 
-#: ../mail/evolution-mail.schemas.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid "Empty Junk folders on exit"
 msgstr "退出时清空垃圾邮件文件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid "Empty Trash folders on exit"
 msgstr "退出时清空回收站"
 
-#: ../mail/evolution-mail.schemas.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "退出 Evolution 时清空垃圾邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:54
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "退出 Evolution 时清空回收站。"
 
-#: ../mail/evolution-mail.schemas.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"Enable animated images in HTML mail. Many users find animated images "
+"annoying and prefer to see a static image instead."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:56
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "启用光标模式，这样您在读取邮件时就能看到光标了。"
 
-#: ../mail/evolution-mail.schemas.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Enable or disable magic space bar"
 msgstr "启用或禁用魔术空格键"
 
-#: ../mail/evolution-mail.schemas.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:58
+#, fuzzy
+msgid "Enable or disable the prompt whilst marking multiple messages."
+msgstr "禁用/启用对多封邮件的标记。"
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "Enable or disable type ahead search feature"
 msgstr "启用或禁用自动前进功能"
 
-#: ../mail/evolution-mail.schemas.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "Enable search folders"
 msgstr "启用搜索文件夹"
 
-#: ../mail/evolution-mail.schemas.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "Enable search folders on startup."
 msgstr "启动时启用搜索文件夹。"
 
-#: ../mail/evolution-mail.schemas.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
-"Enable side bar search feature so that you can start interactive searching "
-"by typing in the text. Use is that you can easily find a folder in that side "
-"bar by just typing the folder name and the selection jumps automatically to "
-"that folder."
+"Enable the side bar search feature to allow interactive searching of folder "
+"names."
 msgstr ""
-"启用侧边栏搜索特性，以便可以在输入文本的同时进行交互式搜索。这么做的作用在于"
-"您可以更加轻松地在侧边栏中找到文件夹，只需输入文件夹名称，然后选中范围就会自"
-"动跳转到该文件夹。"
 
-#: ../mail/evolution-mail.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
 msgstr "启用以在消息预览、消息列表和文件夹中使用空格键。"
 
-#: ../mail/evolution-mail.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid "Enable to render message text part of limited size."
 msgstr "允许渲染被限制大小的信件文本部分。"
 
-#: ../mail/evolution-mail.schemas.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "Enable/disable caret mode"
 msgstr "启用/禁用光标模式"
 
-#: ../mail/evolution-mail.schemas.in.h:56 ../mail/mail-config.glade.h:81
+#: ../mail/evolution-mail.schemas.in.h:66 ../mail/mail-config.ui.h:45
 msgid "Encode file names in an Outlook/GMail way"
-msgstr ""
+msgstr "使用 Outlook/Gmail 的方式编码文件名"
 
-#: ../mail/evolution-mail.schemas.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid ""
-"Encode file names in the mail headers same as Outlook or GMail does, to let "
-"them understand localized file names sent by Evolution, because they do not "
-"follow the RFC 2231, but uses incorrect RFC 2047 standard."
+"Encode file names in the mail headers same as Outlook or GMail do, to let "
+"them display correctly file names with UTF-8 letters sent by Evolution, "
+"because they do not follow the RFC 2231, but use the incorrect RFC 2047 "
+"standard."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid "Height of the message-list pane"
 msgstr "信件列表面板的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Height of the message-list pane."
 msgstr "信件列表面板的高度。"
 
-#: ../mail/evolution-mail.schemas.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "隐藏单文件夹预览并移除选择"
 
-#: ../mail/evolution-mail.schemas.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果用户试图一次打开的信件大于等于十封，将会询问用户是否真的要这么做。"
 
-#: ../mail/evolution-mail.schemas.in.h:62
-msgid ""
-"If the \"Preview\" pane is on, then show it side-by-side rather than "
-"vertically."
-msgstr "如果开启了“预览”面板，则以并列方式显示，而不是垂直方式显示。"
-
-#: ../mail/evolution-mail.schemas.in.h:63
+#: ../mail/evolution-mail.schemas.in.h:72
 #, fuzzy
-#| msgid ""
-#| "If there isn't a builtin viewer for a particular mime-type inside "
-#| "Evolution, any mime-types appearing in this list which map to a bonobo-"
-#| "component viewer in GNOME's mime-type database may be used for displaying "
-#| "content."
 msgid ""
 "If there isn't a builtin viewer for a particular MIME type inside Evolution, "
 "any MIME types appearing in this list which map to a Bonobo component viewer "
@@ -13271,13 +10883,41 @@ msgstr ""
 "MIME 类型在 GNOME 的 MIME 类型数据库中映射的 bonobo 组件查看器将被用来显示其"
 "内容。"
 
-#: ../mail/evolution-mail.schemas.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:73
+msgid ""
+"Initial height of the \"Filter Editor\" window. The value updates as the "
+"user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:74
+msgid ""
+"Initial height of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window vertically."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid ""
 "Initial height of the \"Send and Receive Mail\" window. The value updates as "
 "the user resizes the window vertically."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:76
+msgid ""
+"Initial maximize state of the \"Filter Editor\" window. The value updates "
+"when the user maximizes or unmaximizes the window. Note, this particular "
+"value is not used by Evolution since the \"Filter Editor\" window cannot be "
+"maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:77
+msgid ""
+"Initial maximize state of the \"Search Folder Editor\" window. The value "
+"updates when the user maximizes or unmaximizes the window. Note, this "
+"particular value is not used by Evolution since the \"Search Folder Editor\" "
+"window cannot be maximized. This key exists only as an implementation detail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid ""
 "Initial maximize state of the \"Send and Receive Mail\" window. The value "
 "updates when the user maximizes or unmaximizes the window. Note, this "
@@ -13286,23 +10926,25 @@ msgid ""
 "detail."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid ""
-"Initial width of the \"Send and Receive Mail\" window. The value updates as "
-"the user resizes the window horizontally."
+"Initial width of the \"Filter Editor\" window. The value updates as the user "
+"resizes the window horizontally."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:67
-msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "禁用/启用对多封邮件的标记。"
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid ""
+"Initial width of the \"Search Folder Editor\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid ""
-"It disables/enables the repeated prompts to ask if offline sync is required "
-"before going into offline mode."
-msgstr "禁用/启用在进入离线模式前的是否需要离线同步的不停的提示。"
+"Initial width of the \"Send and Receive Mail\" window. The value updates as "
+"the user resizes the window horizontally."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:82
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -13310,31 +10952,36 @@ msgid ""
 msgstr ""
 "禁用/启用永久删除(而非简单地从结果中移除)搜索文件夹中的信件时不断弹出的提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Last time empty junk was run"
 msgstr "上次清空垃圾邮件的时间"
 
-#: ../mail/evolution-mail.schemas.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Last time empty trash was run"
 msgstr "上次清空回收站的时间"
 
-#: ../mail/evolution-mail.schemas.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:85
+#, fuzzy
+msgid "Layout style"
+msgstr "马约特岛"
+
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid "List of Labels and their associated colors"
 msgstr "标签及其对应颜色的列表"
 
-#: ../mail/evolution-mail.schemas.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:88
 msgid "List of MIME types to check for Bonobo component viewers"
 msgstr "列出要使用 bonobo 组件查看器查看的 MIME 类型"
 
-#: ../mail/evolution-mail.schemas.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:89
 msgid "List of accepted licenses"
 msgstr "列出接受的许可"
 
-#: ../mail/evolution-mail.schemas.in.h:76
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "List of accounts"
 msgstr "账户列表"
 
-#: ../mail/evolution-mail.schemas.in.h:77
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -13342,15 +10989,15 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的账户。此列表包含了相对于 /apps/evolution/mail/"
 "accounts 的子目录命名字符串。"
 
-#: ../mail/evolution-mail.schemas.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "List of custom headers and whether they are enabled."
 msgstr "自定义头及该头是否启用。"
 
-#: ../mail/evolution-mail.schemas.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -13358,15 +11005,15 @@ msgstr ""
 "列出了 Evolution 邮件组件已知的标签。列表中的字符串格式形如“名称:颜色”，其中"
 "颜色使用了 HTML 十六进制编码方式。"
 
-#: ../mail/evolution-mail.schemas.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "List of protocol names whose license has been accepted."
 msgstr "列出接受协议的协议名称。"
 
-#: ../mail/evolution-mail.schemas.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Load images for HTML messages over HTTP"
 msgstr "在 HTML 信件中装入 HTTP 图像"
 
-#: ../mail/evolution-mail.schemas.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:97
 msgid ""
 "Load images for HTML messages over HTTP(S). Possible values are: \"0\" - "
 "Never load images off the net. \"1\" - Load images in messages from "
@@ -13375,246 +11022,360 @@ msgstr ""
 "在 HTML 信件中装入 HTTP(S) 图像。可供选择的值有：0 - 绝不从网上装入图像，1 - "
 "如果发送者在地址簿中则装入图像，2 - 总是从网上装入图像。"
 
-#: ../mail/evolution-mail.schemas.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Log filter actions"
 msgstr "记录过滤动作"
 
-#: ../mail/evolution-mail.schemas.in.h:85
+#: ../mail/evolution-mail.schemas.in.h:99
 msgid "Log filter actions to the specified log file."
 msgstr "将过滤动作记录到指定日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.h:86
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Logfile to log filter actions"
 msgstr "记录过滤动作的日志文件"
 
-#: ../mail/evolution-mail.schemas.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:101
 msgid "Logfile to log filter actions."
 msgstr "记录过滤动作的日志文件。"
 
-#: ../mail/evolution-mail.schemas.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:102
+msgid "Mail browser height"
+msgstr "邮件浏览器高度"
+
+#: ../mail/evolution-mail.schemas.in.h:103
+msgid "Mail browser maximized"
+msgstr "邮件浏览器最大化"
+
+#: ../mail/evolution-mail.schemas.in.h:104
+msgid "Mail browser width"
+msgstr "邮件浏览器宽度"
+
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定超时过后标为已看"
 
-#: ../mail/evolution-mail.schemas.in.h:89
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定超时过后标为已看。"
 
-#: ../mail/evolution-mail.schemas.in.h:90
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Mark citations in the message \"Preview\""
 msgstr "在信件“预览”中标出引用"
 
-#: ../mail/evolution-mail.schemas.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:108
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在信件“预览”中标出引用。"
 
-#: ../mail/evolution-mail.schemas.in.h:92
-msgid "Message Window default height"
-msgstr "信件窗口默认高度"
-
-#: ../mail/evolution-mail.schemas.in.h:93
-msgid "Message Window default width"
-msgstr "信件窗口默认宽度"
-
-#: ../mail/evolution-mail.schemas.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "信件显示风格(“normal”普通、“full headers”全部邮件头、“source”源代码)"
 
-#: ../mail/evolution-mail.schemas.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Minimum days between emptying the junk on exit"
 msgstr "退出时清空垃圾信件的最少天数"
 
-#: ../mail/evolution-mail.schemas.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid "Minimum days between emptying the trash on exit"
 msgstr "退出时清空回收站的最少天数"
 
-#: ../mail/evolution-mail.schemas.in.h:97
+#: ../mail/evolution-mail.schemas.in.h:112
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "退出时清空垃圾信件的最少时间，以天计。"
 
-#: ../mail/evolution-mail.schemas.in.h:98
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "退出时清空回收站的最少天数。"
 
-#: ../mail/evolution-mail.schemas.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:114
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "要在 TO/CC/BCC 中显示的地址数"
 
-#: ../mail/evolution-mail.schemas.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:115
 msgid "Prompt on empty subject"
 msgstr "空主题时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "用户视图销毁文件夹时提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "用户视图发送没有主题的邮件时提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:103
-msgid "Prompt to check if the user wants to go offline immediately"
-msgstr "用户想立即离线时提示检查"
-
-#: ../mail/evolution-mail.schemas.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Prompt when deleting messages in search folder"
 msgstr "删除搜索文件夹中的信件时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:105
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Prompt when user expunges"
 msgstr "用户销毁时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:106
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Prompt when user only fills Bcc"
 msgstr "用户只填入 Bcc 时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:121
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "当用户试图一次打开超过十封信时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:108
+#: ../mail/evolution-mail.schemas.in.h:122
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "当用户试图给不想接收 HTML 的联系人发送 HTML 邮件时提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:109
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "当用户试图发送没有 To 或 Cc 收件人的邮件时提示。"
 
-#: ../mail/evolution-mail.schemas.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:124
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "当用户是否发送意外的 HTML 时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:111
+#: ../mail/evolution-mail.schemas.in.h:125
 msgid "Prompt while marking multiple messages"
 msgstr "标记多封信件时提示"
 
-#: ../mail/evolution-mail.schemas.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid "Put personalized signatures at the top of replies"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:127
+#, fuzzy
+msgid "Put the cursor at the bottom of replies"
+msgstr "回复时在底部开始打字(_T)"
+
+#: ../mail/evolution-mail.schemas.in.h:128
 msgid "Recognize emoticons in text and replace them with images."
 msgstr "识别文本中的表情，并将其替换为图像。"
 
-#: ../mail/evolution-mail.schemas.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:129
 msgid "Recognize links in text and replace them."
 msgstr "识别文本中的链接并进行替换。"
 
-#: ../mail/evolution-mail.schemas.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid "Run junk test on incoming mail."
 msgstr "对收到的邮件运行垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:131
 msgid "Save directory"
 msgstr "保存目录"
 
-#: ../mail/evolution-mail.schemas.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid "Search for the sender photo in local address books"
 msgstr "在本地地址薄中搜索发件人照片"
 
-#: ../mail/evolution-mail.schemas.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:133
 msgid "Send HTML mail by default"
 msgstr "默认以 HTML 发送邮件"
 
-#: ../mail/evolution-mail.schemas.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:134
 msgid "Send HTML mail by default."
 msgstr "默认以 HTML 发送邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Sender email-address column in the message list"
 msgstr "在信件列表中显示 email 地址列"
 
-#: ../mail/evolution-mail.schemas.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Server synchronization interval"
 msgstr "服务器同步间隔"
 
-#: ../mail/evolution-mail.schemas.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:137
+msgid ""
+"Set to TRUE in case you do not want to add signature delimiter before your "
+"signature when composing a mail."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Show \"Bcc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Show \"Cc\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:140
+msgid "Show \"From\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Show \"From\" field when sending a mail message"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Show \"Reply To\" field when posting to a newsgroup"
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:143
+#, fuzzy
+msgid "Show \"Reply To\" field when sending a mail message"
+msgstr "当发送加密邮件时也对自身加密(_F)"
+
+#: ../mail/evolution-mail.schemas.in.h:144
 msgid "Show Animations"
 msgstr "显示动画"
 
-#: ../mail/evolution-mail.schemas.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:145
+#, fuzzy
+msgid "Show all message headers"
+msgstr "折叠全部信件线索"
+
+#: ../mail/evolution-mail.schemas.in.h:146
+#, fuzzy
+msgid "Show all the headers when viewing a messages."
+msgstr "选中信件中的全部文本"
+
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Show animated images as animations."
 msgstr "将动画图像显示为动画。"
 
-#: ../mail/evolution-mail.schemas.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在信件列表中显示删除了的信件(带有删除线)。"
 
-#: ../mail/evolution-mail.schemas.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "Show deleted messages in the message-list"
 msgstr "在信件列表中显示删除了的信件"
 
-#: ../mail/evolution-mail.schemas.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:150
+msgid "Show image animations"
+msgstr "显示图像动画"
+
+#: ../mail/evolution-mail.schemas.in.h:151
+msgid "Show original \"Date\" header value."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "Show photo of the sender"
 msgstr "显示发件人照片"
 
-#: ../mail/evolution-mail.schemas.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:153
+msgid ""
+"Show the \"Bcc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:154
+msgid ""
+"Show the \"Cc\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:155
+msgid ""
+"Show the \"From\" field when posting to a newsgroup. This is controlled from "
+"the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:156
+msgid ""
+"Show the \"From\" field when sending a mail message. This is controlled from "
+"the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:157
+msgid "Show the \"Preview\" pane"
+msgstr "显示“预览”面板"
+
+#: ../mail/evolution-mail.schemas.in.h:158
+msgid "Show the \"Preview\" pane."
+msgstr "显示“预览”面板。"
+
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid ""
+"Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
+"from the View menu when a news account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:160
+msgid ""
+"Show the \"Reply To\" field when sending a mail message. This is controlled "
+"from the View menu when a mail account is chosen."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "在信件列表的以另外的列显示电子邮件的发送者。"
 
-#: ../mail/evolution-mail.schemas.in.h:129
+#: ../mail/evolution-mail.schemas.in.h:162
+msgid ""
+"Show the original \"Date\" header (with a local time only if the time zone "
+"differs). Otherwise always show \"Date\" header value in a user preferred "
+"format and local time zone."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "在信件阅读面板中显示发件人照片。"
 
-#: ../mail/evolution-mail.schemas.in.h:130
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell check inline"
 msgstr "内嵌拼写检查"
 
-#: ../mail/evolution-mail.schemas.in.h:131
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Spell checking color"
 msgstr "拼写检查颜色"
 
-#: ../mail/evolution-mail.schemas.in.h:132
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Spell checking languages"
 msgstr "拼写检查语言"
 
-#: ../mail/evolution-mail.schemas.in.h:133
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Subscribe dialog default height"
 msgstr "订阅对话框默认高度"
 
-#: ../mail/evolution-mail.schemas.in.h:134
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Subscribe dialog default width"
 msgstr "订阅对话框默认宽度"
 
-#: ../mail/evolution-mail.schemas.in.h:135
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "Terminal font"
 msgstr "终端字体"
 
-#: ../mail/evolution-mail.schemas.in.h:136
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "Text message part limit"
 msgstr "文本信件部分限制"
 
-#: ../mail/evolution-mail.schemas.in.h:137
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The default plugin for Junk hook"
 msgstr "默认的垃圾信件钩子插件"
 
-#: ../mail/evolution-mail.schemas.in.h:138
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "上次清空垃圾信件的时间，以自新纪元后的天数显示。"
 
-#: ../mail/evolution-mail.schemas.in.h:139
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次清空回收站的时间，以新纪元后的天数显示。"
 
-#: ../mail/evolution-mail.schemas.in.h:140
+#: ../mail/evolution-mail.schemas.in.h:174
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the message list. \"0\" (Classic View) places the preview pane below the "
+"message list. \"1\" (Vertical View) places the preview pane next to the "
+"message list."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid "The terminal font for mail display."
 msgstr "邮件显示用的终端字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:141
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid "The variable width font for mail display."
 msgstr "用于显示邮件的变宽字体。"
 
-#: ../mail/evolution-mail.schemas.in.h:142
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
 msgstr "此选项有三种可能值：0－错误，1－警告，2－调试信息。"
 
-#: ../mail/evolution-mail.schemas.in.h:143
+#: ../mail/evolution-mail.schemas.in.h:178
 #, fuzzy
-#| msgid ""
-#| "This decides the max size of the text part that can be formatted under "
-#| "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -13622,7 +11383,7 @@ msgstr ""
 "此选项决定了 Evolution 中可格式化的最大文本部分大小。默认为 4MB/4096 KB，单位"
 "为 KB。"
 
-#: ../mail/evolution-mail.schemas.in.h:144
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -13631,7 +11392,7 @@ msgstr ""
 "这是默认的垃圾邮件插件，即使启用了多个插件。如果默认列出的插件被禁用，它不会"
 "缺省到其它可用的插件。"
 
-#: ../mail/evolution-mail.schemas.in.h:145
+#: ../mail/evolution-mail.schemas.in.h:180
 #, fuzzy
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
@@ -13640,7 +11401,7 @@ msgstr ""
 "此键只被读取一次并在读取后被重设为 false。它取消选中列表中的邮件并移除相应文"
 "件夹的预览。"
 
-#: ../mail/evolution-mail.schemas.in.h:146
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -13650,30 +11411,30 @@ msgstr ""
 "此键应包含指定自定义邮件头的 XML 结构列表，以及是否显示这些邮件头。XML 结构的"
 "格式为：&lt;启用的邮件头&gt; - 设为 enabled 则在邮件视图中显示该邮件头。"
 
-#: ../mail/evolution-mail.schemas.in.h:147
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
 "mail sent by known contacts from junk filtering."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:148
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid "This option would help in improving the speed of fetching."
 msgstr "此选项能帮助提高获取信件的速度"
 
-#: ../mail/evolution-mail.schemas.in.h:149
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "设定默认信件视图中要显示的地址数，超过的部分显示为“...”。"
 
-#: ../mail/evolution-mail.schemas.in.h:150
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
 msgstr "此设置指定了默认情况下线索是被展开还是被折叠。需要重启 Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:151
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -13682,183 +11443,174 @@ msgstr ""
 "此设置指定了默认情况下是否将线索按线索中的最新消息而不是消息日期排序。需要重"
 "启 Evolution。"
 
-#: ../mail/evolution-mail.schemas.in.h:152
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Thread the message list."
 msgstr "按线索编排信件列表。"
 
-#: ../mail/evolution-mail.schemas.in.h:153
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "Thread the message-list"
 msgstr "按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:154
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Thread the message-list based on Subject"
 msgstr "基于主题按线索编排信件列表"
 
-#: ../mail/evolution-mail.schemas.in.h:155
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Timeout for marking message as seen"
 msgstr "将信件标为已看的超时时长"
 
-#: ../mail/evolution-mail.schemas.in.h:156
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Timeout for marking message as seen."
 msgstr "将信件标为已看的超时时长。"
 
-#: ../mail/evolution-mail.schemas.in.h:157
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "UID string of the default account."
 msgstr "默认账户的 UID 字符串。"
 
-#: ../mail/evolution-mail.schemas.in.h:158
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:159
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use SpamAssassin daemon and client"
 msgstr "使用垃圾克星守护程序和客户"
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "使用 SpamAssassin 守护程序和客户端(spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid "Use custom fonts"
 msgstr "使用自定义字体"
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid "Use custom fonts for displaying mail."
 msgstr "使用自定义字体显示邮件。"
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾邮件测试。"
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Use only the local spam tests (no DNS)."
 msgstr "之使用本地垃圾邮件测试(无 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.h:165
-msgid "Use side-by-side or wide layout"
-msgstr "使用并排还是宽屏布局"
+#: ../mail/evolution-mail.schemas.in.h:200
+msgid ""
+"Users get all up in arms over where the cursor should go when replying to a "
+"message. This determines whether the cursor is placed at the top of the "
+"message or the bottom."
+msgstr ""
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:201
+msgid ""
+"Users get all up in arms over where their signature should go when replying "
+"to a message. This determines whether the signature is placed at the top of "
+"the message or the bottom."
+msgstr ""
+
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Variable width font"
 msgstr "变宽字体"
 
-#: ../mail/evolution-mail.schemas.in.h:167
-msgid "View/Bcc menu item is checked"
-msgstr "选中了查看/Bcc 菜单项"
-
-#: ../mail/evolution-mail.schemas.in.h:168
-msgid "View/Bcc menu item is checked."
-msgstr "选中了查看/Bcc 菜单项。"
-
-#: ../mail/evolution-mail.schemas.in.h:169
-msgid "View/Cc menu item is checked"
-msgstr "选中了查看/Cc 菜单项"
-
-#: ../mail/evolution-mail.schemas.in.h:170
-msgid "View/Cc menu item is checked."
-msgstr "选中了查看/Cc 菜单项。"
-
-#: ../mail/evolution-mail.schemas.in.h:171
-msgid "View/From menu item is checked"
-msgstr "选中了查看/From 菜单项"
-
-#: ../mail/evolution-mail.schemas.in.h:172
-msgid "View/From menu item is checked."
-msgstr "选中了查看/From 菜单项。"
-
-#: ../mail/evolution-mail.schemas.in.h:173
-msgid "View/PostTo menu item is checked"
-msgstr "选中了查看/PostTo 菜单项"
-
-#: ../mail/evolution-mail.schemas.in.h:174
-msgid "View/PostTo menu item is checked."
-msgstr "选中了查看/PostTo 菜单项。"
-
-#: ../mail/evolution-mail.schemas.in.h:175
-msgid "View/ReplyTo menu item is checked"
-msgstr "选中了查看/ReplyTo 菜单项"
-
-#: ../mail/evolution-mail.schemas.in.h:176
-msgid "View/ReplyTo menu item is checked."
-msgstr "选中了查看/ReplyTo 菜单项。"
-
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "是否默认对所有信件添加阅读收条请求。"
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr "禁用或启用侧边栏中文件夹名的省略显示"
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr "是否在信件不包含 In-Reply-To 或 References 头时强制按主题编排线索。"
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:206
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "是否以线索中的最新信件来排序线索"
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:207
 msgid "Width of the message-list pane"
 msgstr "信件列表面板的高度"
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:208
 msgid "Width of the message-list pane."
 msgstr "信件列表面板的高度。"
 
-#: ../mail/importers/elm-importer.c:182
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "导入 Elm 数据"
 
-#: ../mail/importers/elm-importer.c:367
+#: ../mail/importers/elm-importer.c:323 ../mail/importers/pine-importer.c:377
+#: ../modules/mail/e-mail-shell-view.c:592
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
+msgid "Mail"
+msgstr "邮件"
+
+#: ../mail/importers/elm-importer.c:363
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 导入器"
 
-#: ../mail/importers/elm-importer.c:368
+#: ../mail/importers/elm-importer.c:364
 msgid "Import mail from Elm."
 msgstr "从 Elm 导入邮件。"
 
-#: ../mail/importers/evolution-mbox-importer.c:79
+#: ../mail/importers/evolution-mbox-importer.c:115
+#: ../plugins/pst-import/pst-importer.c:311
 msgid "Destination folder:"
 msgstr "目的文件夹："
 
-#: ../mail/importers/evolution-mbox-importer.c:82
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
+msgid "Select folder"
+msgstr "选择文件夹"
+
+#: ../mail/importers/evolution-mbox-importer.c:119
+#: ../plugins/pst-import/pst-importer.c:304
 msgid "Select folder to import into"
 msgstr "选择要导入到哪个文件夹"
 
-#: ../mail/importers/evolution-mbox-importer.c:219
+#: ../mail/importers/evolution-mbox-importer.c:258
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley 邮箱(mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:220
+#: ../mail/importers/evolution-mbox-importer.c:259
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "导入器 Berkeley 邮箱格式文件夹"
 
-#: ../mail/importers/mail-importer.c:147
+#: ../mail/importers/mail-importer.c:71
 msgid "Importing mailbox"
 msgstr "导入邮箱"
 
-#: ../mail/importers/mail-importer.c:231 ../shell/e-shell-importer.c:512
+#. Destination folder, was set in our widget
+#: ../mail/importers/mail-importer.c:155
+#: ../plugins/pst-import/pst-importer.c:456
+#: ../plugins/pst-import/pst-importer.c:562
 #, c-format
 msgid "Importing `%s'"
 msgstr "导入“%s”"
 
-#: ../mail/importers/mail-importer.c:371
+#: ../mail/importers/mail-importer.c:298
 #, c-format
 msgid "Scanning %s"
 msgstr "扫描 %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:224
 msgid "Importing Pine data"
 msgstr "导入 Pine 数据"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:382
+#: ../modules/addressbook/addressbook-config.c:986
+msgid "Address Book"
+msgstr "地址簿"
+
+#: ../mail/importers/pine-importer.c:423
 msgid "Evolution Pine importer"
 msgstr "Evolution Pine 导入器"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:424
 msgid "Import mail from Pine."
 msgstr "从 Pine 导入邮件。"
 
@@ -13867,17 +11619,17 @@ msgstr "从 Pine 导入邮件。"
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
 
-#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
+#: ../mail/mail-autofilter.c:235 ../mail/mail-autofilter.c:274
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: ../mail/mail-autofilter.c:259
+#: ../mail/mail-autofilter.c:258
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: ../mail/mail-autofilter.c:294
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
@@ -13886,627 +11638,437 @@ msgstr "%s 邮件列表"
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: ../mail/mail-component.c:550
-#, c-format
-msgid "%d selected, "
-msgid_plural "%d selected, "
-msgstr[0] "已选中 %d 个，"
-
-#: ../mail/mail-component.c:554
-#, c-format
-msgid "%d deleted"
-msgid_plural "%d deleted"
-msgstr[0] "%d 封已删除"
-
-#: ../mail/mail-component.c:561
-#, c-format
-msgid "%d junk"
-msgid_plural "%d junk"
-msgstr[0] "%d 封垃圾"
-
-#: ../mail/mail-component.c:564
-#, c-format
-msgid "%d draft"
-msgid_plural "%d drafts"
-msgstr[0] "%d 封草稿"
-
-#: ../mail/mail-component.c:566
-#, c-format
-msgid "%d sent"
-msgid_plural "%d sent"
-msgstr[0] "%d 封已发"
-
-#: ../mail/mail-component.c:568
-#, c-format
-msgid "%d unsent"
-msgid_plural "%d unsent"
-msgstr[0] "%d 封未发"
-
-#: ../mail/mail-component.c:574
-#, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "，%d 封未读，"
-
-#: ../mail/mail-component.c:575
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "总共 %d 封"
-
-#: ../mail/mail-component.c:927
-msgid "New Mail Message"
-msgstr "新建信件"
-
-#: ../mail/mail-component.c:928
-msgctxt "New"
-msgid "_Mail Message"
-msgstr "信件(_M)"
-
-#: ../mail/mail-component.c:929
-msgid "Compose a new mail message"
-msgstr "撰写一封新信"
-
-#: ../mail/mail-component.c:935
-msgid "New Mail Folder"
-msgstr "新建邮件文件夹"
-
-#: ../mail/mail-component.c:936
-msgctxt "New"
-msgid "Mail _Folder"
-msgstr "邮件文件夹(_F)"
-
-#: ../mail/mail-component.c:937
-msgid "Create a new mail folder"
-msgstr "创建新邮件文件夹"
-
-#: ../mail/mail-component.c:1084
-msgid "Failed upgrading Mail settings or folders."
-msgstr "升级邮件设置或文件夹失败。"
-
-#: ../mail/mail-config.glade.h:1
-msgid " Ch_eck for Supported Types "
-msgstr "检查支持的类型(_E)"
-
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.ui.h:1
 msgid "(Note: Requires restart of the application)"
 msgstr "(注意：需要重启应用程序)"
 
-#: ../mail/mail-config.glade.h:4
-msgid "<b>SSL is not supported in this build of Evolution</b>"
-msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
-
-#: ../mail/mail-config.glade.h:5
-msgid "<b>Sender Photograph</b>"
-msgstr "<b>发送者照片</b>"
-
-#: ../mail/mail-config.glade.h:6
-msgid "<b>Sig_natures</b>"
-msgstr "<b>签名(_N)</b>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.ui.h:2
 msgid "<b>Top Posting Option</b> (Not Recommended)"
 msgstr "<b>Top Posting 选项</b> (不推荐)"
 
-#: ../mail/mail-config.glade.h:8
-msgid "<b>_Languages</b>"
-msgstr "<b>语言(_L)</b>"
-
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Account Information</span>"
-msgstr "<span weight=\"bold\">账户信息</span>"
-
-#: ../mail/mail-config.glade.h:11
-msgid "<span weight=\"bold\">Authentication</span>"
-msgstr "<span weight=\"bold\">身份验证</span>"
-
-#: ../mail/mail-config.glade.h:12
-msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">撰写信件</span>"
-
-#: ../mail/mail-config.glade.h:13
-msgid "<span weight=\"bold\">Configuration</span>"
-msgstr "<span weight=\"bold\">配置</span>"
-
-#: ../mail/mail-config.glade.h:14
-msgid "<span weight=\"bold\">Default Behavior</span>"
-msgstr "<span weight=\"bold\">默认行为</span>"
-
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">删除邮件</span>"
-
-#: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
-msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
-
-#: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels</span>"
-msgstr "<span weight=\"bold\">标签</span>"
-
-#: ../mail/mail-config.glade.h:19
-msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">装入图像</span>"
-
-#: ../mail/mail-config.glade.h:20
-msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">信件显示</span>"
-
-#: ../mail/mail-config.glade.h:21
-msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">信件字体</span>"
-
-#: ../mail/mail-config.glade.h:22
-msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">信件收条</span>"
-
-#: ../mail/mail-config.glade.h:23
-#: ../plugins/publish-calendar/publish-calendar.glade.h:3
-msgid "<span weight=\"bold\">Optional Information</span>"
-msgstr "<span weight=\"bold\">可选信息</span>"
-
-#: ../mail/mail-config.glade.h:24
-msgid "<span weight=\"bold\">Options</span>"
-msgstr "<span weight=\"bold\">选项</span>"
-
-#: ../mail/mail-config.glade.h:25
-msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
-
-#: ../mail/mail-config.glade.h:26
-msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">打印字体</span>"
-
-#: ../mail/mail-config.glade.h:27
-msgid "<span weight=\"bold\">Proxy Settings</span>"
-msgstr "<span weight=\"bold\">代理服务器状态</span>"
-
-#: ../mail/mail-config.glade.h:28
-msgid "<span weight=\"bold\">Required Information</span>"
-msgstr "<span weight=\"bold\">请求的信息</span>"
-
-#: ../mail/mail-config.glade.h:29
-msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
-msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
+#: ../mail/mail-config.ui.h:3
+msgid "Account Information"
+msgstr "帐户信息"
 
-#: ../mail/mail-config.glade.h:30
-msgid "<span weight=\"bold\">Security</span>"
-msgstr "<span weight=\"bold\">安全</span>"
-
-#: ../mail/mail-config.glade.h:31
-msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
-
-#: ../mail/mail-config.glade.h:32
-msgid "<span weight=\"bold\">Server Configuration</span>"
-msgstr "<span weight=\"bold\">服务器配置</span>"
-
-#: ../mail/mail-config.glade.h:33
-msgid "<span weight=\"bold\">_Authentication Type</span>"
-msgstr "<span weight=\"bold\">认证类型(_A)</span>"
-
-#: ../mail/mail-config.glade.h:35
-msgid "Account Management"
-msgstr "账户管理"
-
-#: ../mail/mail-config.glade.h:36
+#: ../mail/mail-config.ui.h:4
 msgid "Add Ne_w Signature..."
 msgstr "添加新签名(_W)..."
 
-#: ../mail/mail-config.glade.h:37
-msgid "Add _Script"
-msgstr "添加脚本(_S)"
-
-#: ../mail/mail-config.glade.h:38
+#: ../mail/mail-config.ui.h:5
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "当使用该账户时总是发送签名信件(_W)"
 
-#: ../mail/mail-config.glade.h:39
+#: ../mail/mail-config.ui.h:7
 msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "当发送加密邮件时也对自身加密(_F)"
 
-#: ../mail/mail-config.glade.h:40
+#: ../mail/mail-config.ui.h:8
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "总是抄送到(_S)："
 
-#: ../mail/mail-config.glade.h:41
+#: ../mail/mail-config.ui.h:9
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "总是暗送到(_B)："
 
-#: ../mail/mail-config.glade.h:42
+#: ../mail/mail-config.ui.h:10
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密时总是信任我的密钥环中的密钥(_T)"
 
-#: ../mail/mail-config.glade.h:43
+#: ../mail/mail-config.ui.h:11
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "当发送加密邮件时总是对自身加密(_M)"
 
-#: ../mail/mail-config.glade.h:44
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "请求阅读收条(_D)"
 
-#: ../mail/mail-config.glade.h:46
+#: ../mail/mail-config.ui.h:14 ../modules/addressbook/addressbook-config.c:993
+msgid "Authentication"
+msgstr "身份验证"
+
+#: ../mail/mail-config.ui.h:15
 msgid "Automatically insert _emoticon images"
 msgstr "自动插入表情图像(_E)"
 
-#: ../mail/mail-config.glade.h:47
-msgid "Baltic (ISO-8859-13)"
-msgstr "波罗的语(ISO-8859-13)"
-
-#: ../mail/mail-config.glade.h:48
-msgid "Baltic (ISO-8859-4)"
-msgstr "波罗的语(ISO-8859-4)"
-
-#: ../mail/mail-config.glade.h:49
+#: ../mail/mail-config.ui.h:16
 msgid "C_haracter set:"
 msgstr "字符集(_H)："
 
-#: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
+#: ../mail/mail-config.ui.h:17
+msgid "Ch_eck for Supported Types"
 msgstr "检查支持的类型(_E)"
 
-#: ../mail/mail-config.glade.h:51
+#: ../mail/mail-config.ui.h:18
 msgid "Check cu_stom headers for junk"
 msgstr "检查自定义信头以判别垃圾邮件(_S)"
 
-#: ../mail/mail-config.glade.h:52
+#: ../mail/mail-config.ui.h:19
 msgid "Check incoming _messages for junk"
 msgstr "检查收到的邮件是否是垃圾邮件(_M)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.ui.h:20
 msgid "Check spelling while I _type"
 msgstr "在我输入时进行拼写检查(_T)"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.ui.h:21
 msgid "Checks incoming mail messages to be Junk"
 msgstr "检查收到的信件是否是垃圾邮件"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.ui.h:22
 msgid "Cle_ar"
 msgstr "清除(_A)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.ui.h:23
 msgid "Clea_r"
 msgstr "清除(_R)"
 
-#: ../mail/mail-config.glade.h:57
+#: ../mail/mail-config.ui.h:24
 msgid "Color for _misspelled words:"
 msgstr "给错误拼写的单词着色(_M)："
 
-#: ../mail/mail-config.glade.h:58
+#: ../mail/mail-config.ui.h:25
+msgid "Composing Messages"
+msgstr "撰写信件"
+
+#: ../mail/mail-config.ui.h:26 ../plugins/plugin-manager/plugin-manager.c:146
+msgid "Configuration"
+msgstr "配置"
+
+#: ../mail/mail-config.ui.h:27
 msgid "Confirm _when expunging a folder"
 msgstr "销毁文件夹时确认(_W)"
 
-#: ../mail/mail-config.glade.h:59
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email \n"
-"using Evolution. \n"
-"\n"
-"Click \"Apply\" to save your settings."
-msgstr ""
-"恭喜，您的邮件配置已经完成。\n"
-"\n"
-"您现在就可以用 Evolution 收发邮件了。\n"
-"\n"
-"单击“应用”可保存您的设置。"
-
-#: ../mail/mail-config.glade.h:65
-msgid "De_fault"
-msgstr "默认(_F)"
+#: ../mail/mail-config.ui.h:29
+msgid "Default Behavior"
+msgstr "默认行为"
 
-#: ../mail/mail-config.glade.h:66
+#: ../mail/mail-config.ui.h:30
 msgid "Default character e_ncoding:"
 msgstr "默认字符编码(_N)："
 
-#: ../mail/mail-config.glade.h:68
+#: ../mail/mail-config.ui.h:32
+msgid "Delete Mail"
+msgstr "删除邮件"
+
+#: ../mail/mail-config.ui.h:33
 msgid "Delete junk messages on e_xit"
 msgstr "退出时删除垃圾邮件(_X)"
 
-#: ../mail/mail-config.glade.h:70
+#: ../mail/mail-config.ui.h:35
 msgid "Digitally sign o_utgoing messages (by default)"
 msgstr "对寄出的信件进行数字签名(默认)(_U)"
 
-#: ../mail/mail-config.glade.h:71
+#: ../mail/mail-config.ui.h:36
+msgid "Displayed Message _Headers"
+msgstr "显示信头(_H)"
+
+#: ../mail/mail-config.ui.h:37
 msgid "Do not format messages when text si_ze exceeds"
 msgstr "如果文本超出大小限制，则不格式化邮件中的文本内容(_Z)"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.ui.h:38
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "如果信件发送者在地址簿中则不标记为垃圾邮件(_K)"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.ui.h:39
 msgid "Do not quote"
 msgstr "不引用"
 
-#: ../mail/mail-config.glade.h:74
-msgid "Done"
-msgstr "完成"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.ui.h:40
 msgid "Drafts _Folder:"
 msgstr "草稿文件夹(_F)："
 
-#: ../mail/mail-config.glade.h:76
-msgid "Email Accounts"
-msgstr "电子邮件"
-
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.ui.h:41
 msgid "Email _Address:"
 msgstr "电子邮件地址(_A)："
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.ui.h:42
 msgid "Empty trash folders on e_xit"
 msgstr "退出时清空已删除邮件(_X)"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.ui.h:43
 msgid "Enable Magic S_pacebar"
 msgstr "启用魔术空格键(_P)"
 
-#: ../mail/mail-config.glade.h:80
+#: ../mail/mail-config.ui.h:44
 msgid "Enable Sea_rch Folders"
 msgstr "启用搜索文件夹(_R)"
 
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.ui.h:46
 msgid "Encry_ption certificate:"
 msgstr "加密证书(_P)："
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.ui.h:47
 msgid "Encrypt out_going messages (by default)"
 msgstr "加密寄出的信件(默认)(_G)"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.ui.h:48
 msgid "Fi_xed-width:"
 msgstr "等宽(_X)："
 
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.ui.h:49
 msgid "Fix_ed width Font:"
 msgstr "等宽字体(_E)："
 
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.ui.h:50
 msgid "Font Properties"
 msgstr "字体属性"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.ui.h:51
 msgid "Format messages in _HTML"
 msgstr "用 HTML 格式化信件(_H)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.ui.h:52
 msgid "Full Nam_e:"
 msgstr "全名(_E)："
 
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.ui.h:54
 msgid "HTML Messages"
 msgstr "HTML 信件"
 
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.ui.h:55
 msgid "H_TTP Proxy:"
 msgstr "HTTP 代理服务器(_T)："
 
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.ui.h:56
 msgid "Headers"
 msgstr "信头"
 
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.ui.h:57
 msgid "Highlight _quotations with"
 msgstr "突出显示引用(_Q)"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.ui.h:59
 msgid "Inline"
 msgstr "嵌入"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.ui.h:60
 msgid "Inline (Outlook style)"
 msgstr "嵌入(Outlook 风格)"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.ui.h:62
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:100 ../mail/message-list.etspec.h:8
+#: ../mail/mail-config.ui.h:63 ../mail/message-list.etspec.h:8
 msgid "Labels"
 msgstr "标签"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.ui.h:64
 msgid "Languages Table"
 msgstr "语言表"
 
-#: ../mail/mail-config.glade.h:102
-msgid "Mail Configuration"
-msgstr "邮件配置"
+#: ../mail/mail-config.ui.h:65
+msgid "Loading Images"
+msgstr "装入图像"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.ui.h:66
 msgid "Mail Headers Table"
 msgstr "邮件头表"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.ui.h:67
 msgid "Mailbox location"
 msgstr "邮件箱位置"
 
-#: ../mail/mail-config.glade.h:106
-msgid "Message Composer"
-msgstr "信件撰写器"
+#: ../mail/mail-config.ui.h:68
+msgid "Message Display"
+msgstr "信件显示"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.ui.h:69
+msgid "Message Fonts"
+msgstr "信件字体"
+
+#: ../mail/mail-config.ui.h:70
+#, fuzzy
+msgid "Message Receipts"
+msgstr "信件状态"
+
+#: ../mail/mail-config.ui.h:71
 msgid "No _Proxy for:"
 msgstr "不使用代理的情况(_P)："
 
-#: ../mail/mail-config.glade.h:108
-msgid ""
-"Note: Underscore in the label name is used as mnemonic identifier in menu."
-msgstr "注意：标签名中的下划线被用作菜单中的助记符。"
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.ui.h:73
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：直到您第一次连接的时候，才会询问密码。"
 
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.ui.h:74
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr "如果找到匹配的自定义垃圾信头，此选项将被覆盖。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.ui.h:75
+#: ../plugins/publish-calendar/publish-calendar.ui.h:10
+msgid "Optional Information"
+msgstr "可选信息"
+
+#: ../mail/mail-config.ui.h:77
 msgid "Or_ganization:"
 msgstr "组织(_G)："
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.ui.h:78
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 键标识(_K)："
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.ui.h:79
 msgid "Pass_word:"
 msgstr "密码(_W)："
 
-#: ../mail/mail-config.glade.h:115
-msgid ""
-"Please enter a descriptive name for this account in the space below.\n"
-"This name will be used for display purposes only."
-msgstr ""
-"请在下面的空白处输入此账户的描述性名称。\n"
-"此名称将只在显示时使用。"
-
-#: ../mail/mail-config.glade.h:117
-msgid ""
-"Please enter information about the way you will send mail. If you are not "
-"sure, ask your system administrator or Internet Service Provider."
-msgstr ""
-"请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
-"互联网服务提供商ISP。"
-
-#: ../mail/mail-config.glade.h:118
-msgid ""
-"Please enter your name and email address below. The \"optional\" fields "
-"below do not need to be filled in, unless you wish to include this "
-"information in email you send."
-msgstr ""
-"请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
-"出的邮件中包含此信息。"
-
-#: ../mail/mail-config.glade.h:119
-msgid "Please select among the following options"
-msgstr "请从以下选项中选择"
-
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.ui.h:81
 msgid "Port:"
 msgstr "端口："
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.ui.h:82
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "发送只有暗送收件人的信件时提示(_O)"
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.ui.h:83
+#, fuzzy
+msgid "Pretty Good Privacy (PGP/GPG)"
+msgstr "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
+
+#: ../mail/mail-config.ui.h:85
+msgid "Printed Fonts"
+msgstr "打印字体"
+
+#: ../mail/mail-config.ui.h:86
+msgid "Proxy Settings"
+msgstr "代理设置"
+
+#: ../mail/mail-config.ui.h:87
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.ui.h:88
 msgid "Re_member password"
 msgstr "记住密码(_M)"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.ui.h:89
 msgid "Re_ply-To:"
 msgstr "回复到(_P)："
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.ui.h:91
 msgid "Remember _password"
 msgstr "记住密码(_P)"
 
-#: ../mail/mail-config.glade.h:127
-msgid "S_OCKS Host:"
-msgstr "SOCKS 主机(_O)："
+#: ../mail/mail-config.ui.h:92
+msgid "Required Information"
+msgstr "需要的信息"
+
+#: ../mail/mail-config.ui.h:94
+#, fuzzy
+msgid "SSL is not supported in this build of Evolution"
+msgstr "<b>(在此版本的 Evolution 中不支持 SSL)</b>"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.ui.h:95
 msgid "S_earch for sender photograph only in local address books"
 msgstr "仅在本地地址簿中搜索发件人照片(_E)"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.ui.h:96
 msgid "S_elect..."
 msgstr "选择(_E)..."
 
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.ui.h:97
 msgid "S_end message receipts:"
 msgstr "发送信件收条(_E)："
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.ui.h:98
 msgid "S_tandard Font:"
 msgstr "标准字体(_T)："
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.ui.h:99
+msgid "Secure MIME (S/MIME)"
+msgstr "安全 MIME(S/MIME)"
+
+#: ../mail/mail-config.ui.h:101
 msgid "Select Drafts Folder"
 msgstr "选择草稿文件夹"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.ui.h:102
 msgid "Select HTML fixed width font"
 msgstr "选择 HTML 固定宽度字体"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.ui.h:103
 msgid "Select HTML fixed width font for printing"
 msgstr "选择用于打印的 HTML 固定宽度字体"
 
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.ui.h:104
 msgid "Select HTML variable width font"
 msgstr "选择 HTML 变宽度字体"
 
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.ui.h:105
 msgid "Select HTML variable width font for printing"
 msgstr "选择用于打印的 HTML 变宽度字体"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.ui.h:106
 msgid "Select Sent Folder"
 msgstr "选择已发文件夹"
 
-#: ../mail/mail-config.glade.h:140
+#: ../mail/mail-config.ui.h:107
+#, fuzzy
+msgid "Sender Photograph"
+msgstr "<b>发送者照片</b>"
+
+#: ../mail/mail-config.ui.h:108
 msgid "Sending Mail"
 msgstr "发送邮件"
 
-#: ../mail/mail-config.glade.h:141
+#: ../mail/mail-config.ui.h:109
 msgid "Sent _Messages Folder:"
 msgstr "已发送信件文件夹(_M)："
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.ui.h:110
+#, fuzzy
+msgid "Sent and Draft Messages"
+msgstr "已发信件"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Ser_ver requires authentication"
 msgstr "服务器需要认证(_V)"
 
-#: ../mail/mail-config.glade.h:143
-msgid "Server _Type: "
+#: ../mail/mail-config.ui.h:112
+msgid "Server Configuration"
+msgstr "服务器配置"
+
+#: ../mail/mail-config.ui.h:113
+msgid "Server _Type:"
 msgstr "服务器类型(_T)："
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.ui.h:114
+msgid "Sig_natures"
+msgstr "签名(_N)"
+
+#: ../mail/mail-config.ui.h:115
 msgid "Sig_ning certificate:"
 msgstr "签名证书(_N)："
 
-#: ../mail/mail-config.glade.h:145
+#: ../mail/mail-config.ui.h:116
 msgid "Signat_ure:"
 msgstr "签名(_U)："
 
-#: ../mail/mail-config.glade.h:146
+#: ../mail/mail-config.ui.h:117
 msgid "Signatures"
 msgstr "签名"
 
-#: ../mail/mail-config.glade.h:147
-msgid "Signatures Table"
-msgstr "签名表"
-
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.ui.h:118
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../mail/mail-config.glade.h:149
+#: ../mail/mail-config.ui.h:119
 msgid "Start _typing at the bottom on replying"
 msgstr "回复时在底部开始打字(_T)"
 
-#: ../mail/mail-config.glade.h:150
-msgid "T_ype: "
+#: ../mail/mail-config.ui.h:121
+msgid "T_ype:"
 msgstr "类型(_Y)："
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.ui.h:122
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "在此列出的语言反映了您所安装的字典。"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.ui.h:123
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -14515,7 +12077,7 @@ msgstr ""
 "此脚本的输出将用于您的签名。您指定的名称将只会\n"
 "用于显示。"
 
-#: ../mail/mail-config.glade.h:155
+#: ../mail/mail-config.ui.h:126
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -14523,229 +12085,246 @@ msgstr ""
 "输入您想要给此帐户起的名字。\n"
 "如：“工作”或“私人”"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.ui.h:128
 msgid "Us_ername:"
 msgstr "用户名(_E)："
 
-#: ../mail/mail-config.glade.h:158
+#: ../mail/mail-config.ui.h:129
 msgid "Use Authe_ntication"
 msgstr "使用身份验证(_N)"
 
-#: ../mail/mail-config.glade.h:159 ../plugins/caldav/caldav-source.c:387
-#: ../plugins/google-account-setup/google-source.c:634
-#: ../plugins/google-account-setup/google-contacts-source.c:288
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:323
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:405
+#: ../plugins/google-account-setup/google-contacts-source.c:280
+#: ../plugins/google-account-setup/google-source.c:700
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
 msgid "User_name:"
 msgstr "用户名(_N)："
 
-#: ../mail/mail-config.glade.h:160
+#: ../mail/mail-config.ui.h:131
 msgid "V_ariable-width:"
 msgstr "变宽(_A)："
 
-#: ../mail/mail-config.glade.h:161
-msgid ""
-"Welcome to the Evolution Mail Configuration Assistant.\n"
-"\n"
-"Click \"Forward\" to begin. "
-msgstr ""
-"欢迎使用 Evolution 邮件配置助手。\n"
-"\n"
-"单击“前进”开始。"
-
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.ui.h:132
 msgid "_Add Signature"
 msgstr "添加签名(_A)"
 
-#: ../mail/mail-config.glade.h:165
+#: ../mail/mail-config.ui.h:133
 msgid "_Always load images from the Internet"
 msgstr "总是从 Internet 上装入图像(_A)"
 
-#: ../mail/mail-config.glade.h:166
-msgid "_Automatic proxy configuration URL:"
-msgstr "自动代理服务器配置 URL(_A)："
+#: ../mail/mail-config.ui.h:134
+msgid "_Authentication Type"
+msgstr "身份验证类型(_A)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.ui.h:135
 msgid "_Default junk plugin:"
 msgstr "默认的垃圾邮件插件(_D)："
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.ui.h:136
 msgid "_Direct connection to the Internet"
 msgstr "直接连接到 Internet(_D)"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.ui.h:137
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不要签名会议请求(同 Outlook 兼容)(_D)"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.ui.h:138
 msgid "_Forward style:"
 msgstr "转发方式(_F)："
 
-#: ../mail/mail-config.glade.h:172
+#: ../mail/mail-config.ui.h:139
 msgid "_Keep Signature above the original message on replying"
 msgstr "回复时保留原始信件的签名(_K)"
 
-#: ../mail/mail-config.glade.h:173
+#: ../mail/mail-config.ui.h:140
+msgid "_Languages"
+msgstr "语言(_L)"
+
+#: ../mail/mail-config.ui.h:141
 msgid "_Load images in messages from contacts"
 msgstr "装入来自联系人的邮件中的图像(_L)"
 
-#: ../mail/mail-config.glade.h:174
+#: ../mail/mail-config.ui.h:142
 msgid "_Lookup in local address book only"
 msgstr "仅在本地地址簿中查阅(_L)"
 
-#: ../mail/mail-config.glade.h:175
+#: ../mail/mail-config.ui.h:143
 msgid "_Make this my default account"
 msgstr "使它成为我的默认账户(_M)"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.ui.h:144
 msgid "_Manual proxy configuration:"
 msgstr "手动代理服务器配置(_M)："
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.ui.h:145
 msgid "_Mark messages as read after"
 msgstr "把信件标记为已读前等(_M)"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.ui.h:147
 msgid "_Never load images from the Internet"
 msgstr "绝不从 Internet 装入图像(_N)"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.ui.h:148
 msgid "_Path:"
 msgstr "路径(_P)："
 
-#: ../mail/mail-config.glade.h:181
+#: ../mail/mail-config.ui.h:149
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
 
-#: ../mail/mail-config.glade.h:182
+#: ../mail/mail-config.ui.h:150
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "发送空主题行的信件时提示(_P)"
 
-#: ../mail/mail-config.glade.h:183
+#: ../mail/mail-config.ui.h:151
 msgid "_Reply style:"
 msgstr "回复风格(_R)："
 
-#: ../mail/mail-config.glade.h:184
+#: ../mail/mail-config.ui.h:152
 msgid "_Script:"
 msgstr "脚本(_S)："
 
-#: ../mail/mail-config.glade.h:185
+#: ../mail/mail-config.ui.h:153
 msgid "_Secure HTTP Proxy:"
 msgstr "安全 HTTP 代理(_S)："
 
-#: ../mail/mail-config.glade.h:186
-msgid "_Select..."
-msgstr "选择(_S)..."
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:28
+#: ../plugins/publish-calendar/publish-calendar.ui.h:28
+msgid "_Server:"
+msgstr "服务器(_S)："
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.glade.h:189
+#: ../mail/mail-config.ui.h:157
 msgid "_Show image animations"
 msgstr "显示图像动画(_S)"
 
-#: ../mail/mail-config.glade.h:190
+#: ../mail/mail-config.ui.h:158
 msgid "_Show the photograph of sender in the message preview"
 msgstr "在电子邮件预览中显示发送者的照片(_S)"
 
-#: ../mail/mail-config.glade.h:191
+#: ../mail/mail-config.ui.h:159
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
 
-#: ../mail/mail-config.glade.h:192
+#: ../mail/mail-config.ui.h:160
 msgid "_Use Secure Connection:"
 msgstr "使用安全连接(_U)："
 
-#: ../mail/mail-config.glade.h:193
+#: ../mail/mail-config.ui.h:161
 msgid "_Use system defaults"
 msgstr "使用默认值(_U)"
 
-#: ../mail/mail-config.glade.h:194
+#: ../mail/mail-config.ui.h:162
 msgid "_Use the same fonts as other applications"
 msgstr "使用与其它应用程序相同的字体(_U)"
 
-#: ../mail/mail-config.glade.h:195
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:49
+#, fuzzy
+msgid "a"
+msgstr "上午"
+
+#: ../mail/mail-config.ui.h:164
 msgid "addresses"
 msgstr "个地址"
 
-#: ../mail/mail-config.glade.h:196
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:50
+msgid "b"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:166
 msgid "color"
 msgstr "颜色"
 
-#: ../mail/mail-config.glade.h:197
+#: ../mail/mail-config.ui.h:167
 msgid "description"
 msgstr "描述"
 
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-dialogs.ui.h:1
 msgid "    "
 msgstr "    "
 
-#: ../mail/mail-dialogs.glade.h:2
-msgid "<b>Search Folder Sources</b>"
-msgstr "<b>搜索文件夹来源</b>"
-
-#: ../mail/mail-dialogs.glade.h:3
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">数字签名</span>"
-
-#: ../mail/mail-dialogs.glade.h:4
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr "<span weight=\"bold\">加密</span>"
-
-#: ../mail/mail-dialogs.glade.h:5
+#: ../mail/mail-dialogs.ui.h:2
 msgid "All active remote folders"
 msgstr "全部活跃远程文件夹"
 
-#: ../mail/mail-dialogs.glade.h:6
+#: ../mail/mail-dialogs.ui.h:3
 msgid "All local and active remote folders"
 msgstr "全部本地和活跃远程文件夹"
 
-#: ../mail/mail-dialogs.glade.h:7
+#: ../mail/mail-dialogs.ui.h:4
 msgid "All local folders"
 msgstr "全部本地文件夹"
 
-#: ../mail/mail-dialogs.glade.h:8
-msgid "Case _sensitive"
-msgstr "区分大小写(_S)"
+#: ../mail/mail-dialogs.ui.h:5
+msgid "Call"
+msgstr "呼叫"
 
-#: ../mail/mail-dialogs.glade.h:9
+#: ../mail/mail-dialogs.ui.h:6
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
-#: ../mail/mail-dialogs.glade.h:10
-msgid "F_ind:"
-msgstr "查找(_I)："
+#: ../mail/mail-dialogs.ui.h:7
+msgid "Digital Signature"
+msgstr "数字签名"
 
-#: ../mail/mail-dialogs.glade.h:11
-msgid "Find in Message"
-msgstr "在信件中查找"
+#: ../mail/mail-dialogs.ui.h:8
+msgid "Do Not Forward"
+msgstr "不要转发"
 
-#: ../mail/mail-dialogs.glade.h:12 ../mail/message-tag-followup.c:276
-msgid "Flag to Follow Up"
-msgstr "跟随的标志"
+#: ../mail/mail-dialogs.ui.h:9
+msgid "Encryption"
+msgstr "加密"
 
-#: ../mail/mail-dialogs.glade.h:13
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Folder Subscriptions"
 msgstr "文件夹订阅"
 
-#: ../mail/mail-dialogs.glade.h:14
+#: ../mail/mail-dialogs.ui.h:11
+msgid "Follow-Up"
+msgstr "跟随"
+
+#: ../mail/mail-dialogs.ui.h:12
+msgid "For Your Information"
+msgstr "给您的信息"
+
+#: ../mail/mail-dialogs.ui.h:13
+msgid "Forward"
+msgstr "转发"
+
+#: ../mail/mail-dialogs.ui.h:14
 msgid "License Agreement"
 msgstr "许可协议"
 
-#: ../mail/mail-dialogs.glade.h:15
-msgid "None Selected"
-msgstr "没有选中"
+#: ../mail/mail-dialogs.ui.h:15
+msgid "No Response Necessary"
+msgstr "不必回复"
+
+#: ../mail/mail-dialogs.ui.h:19
+msgid "Reply to All"
+msgstr "全部回复"
+
+#: ../mail/mail-dialogs.ui.h:20
+msgid "Review"
+msgstr "回顾"
 
-#: ../mail/mail-dialogs.glade.h:16
+#: ../mail/mail-dialogs.ui.h:21
 msgid "S_erver:"
 msgstr "服务器(_E)："
 
-#: ../mail/mail-dialogs.glade.h:17
+#: ../mail/mail-dialogs.ui.h:22
+#, fuzzy
+msgid "Search Folder Sources"
+msgstr "搜索文件夹来源"
+
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "安全信息"
 
-#: ../mail/mail-dialogs.glade.h:18
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Specific folders"
 msgstr "指定文件夹"
 
-#: ../mail/mail-dialogs.glade.h:19
+#: ../mail/mail-dialogs.ui.h:25
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14753,42 +12332,42 @@ msgstr ""
 "您选中进行跟随的信件已经在下面列出。\n"
 "请从“标志”菜单中选择跟随操作。"
 
-#: ../mail/mail-dialogs.glade.h:21
+#: ../mail/mail-dialogs.ui.h:27
 msgid "_Accept License"
 msgstr "接受协议(_A)"
 
-#: ../mail/mail-dialogs.glade.h:22
+#: ../mail/mail-dialogs.ui.h:28
 msgid "_Due By:"
 msgstr "延期人(_D)："
 
-#: ../mail/mail-dialogs.glade.h:23
+#: ../mail/mail-dialogs.ui.h:29
 msgid "_Flag:"
 msgstr "标志(_F)："
 
-#: ../mail/mail-dialogs.glade.h:24
+#: ../mail/mail-dialogs.ui.h:30
 msgid "_Tick this to accept the license agreement"
 msgstr "选中此处以表明您接受许可协议(_T)"
 
-#: ../mail/mail-folder-cache.c:834
+#: ../mail/mail-folder-cache.c:890
 #, c-format
 msgid "Pinging %s"
 msgstr "查验 %s"
 
-#: ../mail/mail-ops.c:106
+#: ../mail/mail-ops.c:110
 msgid "Filtering Selected Messages"
 msgstr "过滤选中的信件"
 
-#: ../mail/mail-ops.c:265
+#: ../mail/mail-ops.c:269
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:561
+#: ../mail/mail-ops.c:600
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: ../mail/mail-ops.c:573 ../mail/mail-ops.c:602
+#: ../mail/mail-ops.c:612 ../mail/mail-ops.c:639
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14797,121 +12376,129 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: ../mail/mail-ops.c:619
+#: ../mail/mail-ops.c:656
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: ../mail/mail-ops.c:725
+#: ../mail/mail-ops.c:767 ../mail/mail-ops.c:848
 msgid "Sending message"
 msgstr "发送信件"
 
-#: ../mail/mail-ops.c:735
+#: ../mail/mail-ops.c:777
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第%d封信，共%d封"
 
-#: ../mail/mail-ops.c:762
+#: ../mail/mail-ops.c:804
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "在第%d封信失败，共%d封"
 
-#: ../mail/mail-ops.c:764 ../mail/mail-send-recv.c:700
+#: ../mail/mail-ops.c:806 ../mail/mail-send-recv.c:761
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:766 ../mail/mail-send-recv.c:702
+#: ../mail/mail-ops.c:808 ../mail/mail-send-recv.c:763
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:872
-msgid "Saving message to folder"
+#: ../mail/mail-ops.c:920
+#, fuzzy, c-format
+msgid "Saving message to folder '%s'"
 msgstr "把信件保存到文件夹中"
 
-#: ../mail/mail-ops.c:950
-#, c-format
-msgid "Moving messages to %s"
+#: ../mail/mail-ops.c:997
+#, fuzzy, c-format
+msgid "Moving messages to '%s'"
 msgstr "把信件移至 %s"
 
-#: ../mail/mail-ops.c:950
-#, c-format
-msgid "Copying messages to %s"
+#: ../mail/mail-ops.c:997
+#, fuzzy, c-format
+msgid "Copying messages to '%s'"
 msgstr "把信件复制到 %s"
 
-#: ../mail/mail-ops.c:1167
+#: ../mail/mail-ops.c:1106
+#, fuzzy, c-format
+msgid "Scanning folders in '%s'"
+msgstr "在“%s”中扫描文件夹"
+
+#: ../mail/mail-ops.c:1214
 msgid "Forwarded messages"
 msgstr "转发的信件"
 
-#: ../mail/mail-ops.c:1208
-#, c-format
-msgid "Opening folder %s"
+#: ../mail/mail-ops.c:1255
+#, fuzzy, c-format
+msgid "Opening folder '%s'"
 msgstr "打开文件夹 %s"
 
-#: ../mail/mail-ops.c:1273
-#, c-format
-msgid "Retrieving quota information for folder %s"
+#: ../mail/mail-ops.c:1321
+#, fuzzy, c-format
+msgid "Retrieving quota information for folder '%s'"
 msgstr "正在获取文件加 %s 的配额信息"
 
-#: ../mail/mail-ops.c:1342
-#, c-format
-msgid "Opening store %s"
+#: ../mail/mail-ops.c:1393
+#, fuzzy, c-format
+msgid "Opening store '%s'"
 msgstr "打开存储 %s"
 
-#: ../mail/mail-ops.c:1413
-#, c-format
-msgid "Removing folder %s"
+#: ../mail/mail-ops.c:1464
+#, fuzzy, c-format
+msgid "Removing folder '%s'"
 msgstr "删除文件夹 %s"
 
-#: ../mail/mail-ops.c:1531
+#: ../mail/mail-ops.c:1582
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "存储文件夹“%s”"
 
-#: ../mail/mail-ops.c:1594
+#: ../mail/mail-ops.c:1645
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "销毁并存储账户“%s”"
 
-#: ../mail/mail-ops.c:1595
+#: ../mail/mail-ops.c:1646
 #, c-format
 msgid "Storing account '%s'"
 msgstr "存储账户“%s”"
 
-#: ../mail/mail-ops.c:1649
-msgid "Refreshing folder"
+#: ../mail/mail-ops.c:1700
+#, fuzzy, c-format
+msgid "Refreshing folder '%s'"
 msgstr "刷新文件夹"
 
-#: ../mail/mail-ops.c:1689 ../mail/mail-ops.c:1739
-msgid "Expunging folder"
+#: ../mail/mail-ops.c:1740
+#, fuzzy, c-format
+msgid "Expunging folder '%s'"
 msgstr "销毁文件夹"
 
-#: ../mail/mail-ops.c:1736
+#: ../mail/mail-ops.c:1785
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空“%s”中的回收站"
 
-#: ../mail/mail-ops.c:1737
+#: ../mail/mail-ops.c:1786
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: ../mail/mail-ops.c:1818
-#, c-format
-msgid "Retrieving message %s"
+#: ../mail/mail-ops.c:1864
+#, fuzzy, c-format
+msgid "Retrieving message '%s'"
 msgstr "收取信件 %s"
 
-#: ../mail/mail-ops.c:1925
+#: ../mail/mail-ops.c:1982
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "收取 %d 封信"
 
-#: ../mail/mail-ops.c:2010
+#: ../mail/mail-ops.c:2071
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "保存 %d 封信"
 
-#: ../mail/mail-ops.c:2088
+#: ../mail/mail-ops.c:2151
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -14920,11 +12507,11 @@ msgstr ""
 "在将信件保存到 %s 时发生错误：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2160
+#: ../mail/mail-ops.c:2223
 msgid "Saving attachment"
 msgstr "保存附件"
 
-#: ../mail/mail-ops.c:2178 ../mail/mail-ops.c:2186
+#: ../mail/mail-ops.c:2241 ../mail/mail-ops.c:2249
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -14933,134 +12520,121 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2201
+#: ../mail/mail-ops.c:2264
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: ../mail/mail-ops.c:2347
-#, c-format
-msgid "Disconnecting from %s"
+#: ../mail/mail-ops.c:2409
+#, fuzzy, c-format
+msgid "Disconnecting from '%s'"
 msgstr "断开与 %s 的连接"
 
-#: ../mail/mail-ops.c:2347
-#, c-format
-msgid "Reconnecting to %s"
+#: ../mail/mail-ops.c:2409
+#, fuzzy, c-format
+msgid "Reconnecting to '%s'"
 msgstr "重新连接到 %s"
 
-#: ../mail/mail-ops.c:2443
+#: ../mail/mail-ops.c:2505
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "正在准备脱机使用账户“%s”"
 
-#: ../mail/mail-ops.c:2529
+#: ../mail/mail-ops.c:2591
 msgid "Checking Service"
 msgstr "检查服务"
 
-#: ../mail/mail-send-recv.c:181
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:383
+#: ../mail/mail-send-recv.c:432
 msgid "Send & Receive Mail"
 msgstr "发送和接收邮件"
 
-#: ../mail/mail-send-recv.c:394
+#: ../mail/mail-send-recv.c:445
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:503
+#: ../mail/mail-send-recv.c:554
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:503 ../mail/mail-send-recv.c:580
+#: ../mail/mail-send-recv.c:554 ../mail/mail-send-recv.c:631
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:806
+#: ../mail/mail-send-recv.c:874
 #, c-format
 msgid "Checking for new mail"
 msgstr "检查新邮件"
 
-#: ../mail/mail-session.c:212
+#: ../mail/mail-session.c:214
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "输入 %s 的密码"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:216
 msgid "Enter Passphrase"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:217
-#: ../plugins/exchange-operations/exchange-config-listener.c:708
+#: ../mail/mail-session.c:219
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:221
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: ../mail/mail-session.c:261
+#: ../mail/mail-session.c:263
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
-#: ../mail/mail-signature-editor.c:201
-msgid "_Save and Close"
-msgstr "保存并关闭(_S)"
-
-#: ../mail/mail-signature-editor.c:355
-msgid "Edit Signature"
-msgstr "编辑签名"
-
-#: ../mail/mail-signature-editor.c:370
-msgid "_Signature Name:"
-msgstr "签名(_S)："
-
-#: ../mail/mail-tools.c:120
+#: ../mail/mail-tools.c:136
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "无法创建脱机目录“%s”：%s"
 
-#: ../mail/mail-tools.c:150
+#: ../mail/mail-tools.c:166
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "试图将邮件移至非 mbox 源“%s”"
 
-#: ../mail/mail-tools.c:256
+#: ../mail/mail-tools.c:272
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "转发的信件 - %s"
 
-#: ../mail/mail-tools.c:258
+#: ../mail/mail-tools.c:274
 msgid "Forwarded message"
 msgstr "转发的信件"
 
-#: ../mail/mail-tools.c:298
+#: ../mail/mail-tools.c:314
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "无效的文件夹：“%s”"
 
-#: ../mail/mail-vfolder.c:89
+#: ../mail/mail-vfolder.c:88
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "设置搜索文件夹：%s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新“%s:%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新“%s”的搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1086
+#: ../mail/mail-vfolder.c:1075
 msgid "Edit Search Folder"
 msgstr "编辑搜索文件夹"
 
-#: ../mail/mail-vfolder.c:1175
+#: ../mail/mail-vfolder.c:1168
 msgid "New Search Folder"
 msgstr "新建搜索文件夹"
 
@@ -15135,74 +12709,84 @@ msgid "Are you sure you want to send a message in HTML format?"
 msgstr "您确定想要以 HTML 格式发送信件吗？"
 
 #: ../mail/mail.error.xml.h:16
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid address?"
 msgstr "您确信您要发送只有密件抄送收件人的信件吗？"
 
 #: ../mail/mail.error.xml.h:17
+#, fuzzy
+msgid "Are you sure you want to send a message with invalid addresses?"
+msgstr "您确信您要发送只有密件抄送收件人的信件吗？"
+
+#: ../mail/mail.error.xml.h:18
+msgid "Are you sure you want to send a message with only BCC recipients?"
+msgstr "您确信您要发送只有密件抄送收件人的信件吗？"
+
+#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "您确定想要发送没有主题的信件吗？"
 
-#: ../mail/mail.error.xml.h:18
+#: ../mail/mail.error.xml.h:20
 msgid "Because \"{0}\"."
 msgstr "原因是“{0}”。"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:22
 msgid "Because \"{2}\"."
 msgstr "原因是“{2}”。"
 
-#: ../mail/mail.error.xml.h:21
+#: ../mail/mail.error.xml.h:23
 msgid "Blank Signature"
 msgstr "空签名"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:24
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "无法添加搜索文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:25
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”复制到“{1}”。"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:26
 msgid "Cannot create folder \"{0}\"."
 msgstr "无法创建文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:27
 msgid "Cannot create temporary save directory."
 msgstr "无法创建临时保存目录。"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:28
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "无法创建保存目录，原因是“{1}”"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:29
 msgid "Cannot delete folder \"{0}\"."
 msgstr "无法删除文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:30
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "无法删除系统文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:31
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "无法编辑搜索文件夹“{0}”，原因是该文件夹不存在。"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:32
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "无法将文件夹“{0}”移至“{1}”。"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:33
 msgid "Cannot open source \"{1}\""
 msgstr "无法打开源“{0}”"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:34
 msgid "Cannot open source \"{2}\"."
 msgstr "无法打开源“{2}”。"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:35
 msgid "Cannot open target \"{2}\"."
 msgstr "无法打开目标“{2}”。"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Cannot read the license file \"{0}\", due to an installation problem. You "
 "will not be able to use this provider until you can accept its license."
@@ -15210,35 +12794,35 @@ msgstr ""
 "无法读取许可文件“{0}”，原因是安装有问题。您将无法使用此提供者，除非您接受其许"
 "可协议。"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:37
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "无法将“{0}”重命名为“{1}”。"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:38
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "无法重命名或移动系统文件夹“{0}”。"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:39
 msgid "Cannot save changes to account."
 msgstr "无法将更改保存到账户。"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:40
 msgid "Cannot save to directory \"{0}\"."
 msgstr "无法保存到目录“{0}”。"
 
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:41
 msgid "Cannot save to file \"{0}\"."
 msgstr "无法保存到文件“{0}”。"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:42
 msgid "Cannot set signature script \"{0}\"."
 msgstr "无法设定签名脚本“{0}”。"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:43
 msgid "Check Junk Failed"
 msgstr "检查垃圾信失败"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
@@ -15246,123 +12830,111 @@ msgstr ""
 "选中此处以确保您的密码拼写正确。请记住，很多密码都是区分大小写的；您的 Caps "
 "Lock 灯可能为开。"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:45
 msgid "Could not save signature file."
 msgstr "无法保存签名文件。"
 
-#: ../mail/mail.error.xml.h:44
-msgid "Delete \"{0}\"?"
-msgstr "删除“{0}”吗？"
-
-#: ../mail/mail.error.xml.h:45
-msgid "Delete account?"
-msgstr "删除账户吗？"
-
 #: ../mail/mail.error.xml.h:46
 msgid "Delete messages in Search Folder \"{0}\"?"
 msgstr "删除搜索文件夹“{0}”中的信件吗？"
 
 #: ../mail/mail.error.xml.h:47
-msgid "Delete messages in Search Folder?"
-msgstr "删除搜索文件夹中的信件吗？"
-
-#: ../mail/mail.error.xml.h:48
-msgid "Discard changes?"
-msgstr "丢弃更改吗？"
-
-#: ../mail/mail.error.xml.h:49
 msgid "Do not d_elete"
 msgstr "不删除(_E)"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:48
 msgid "Do not delete"
 msgstr "不删除"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Do not disable"
 msgstr "不禁用"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
 msgstr "您想要同步那些标记为离线使用的文件夹吗？"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Do you want to mark all messages as read?"
 msgstr "您是否想要把所有信件标记为已读？"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 msgid "Do you wish to save your changes?"
 msgstr "您希望保存更改吗？"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:53
 msgid "Enter password."
 msgstr "输入密码。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Error loading filter definitions."
 msgstr "装入过滤器定义错误。"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Error while performing operation."
 msgstr "执行操作时出错。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "Error while {0}."
 msgstr "{0} 时出错。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but cannot overwrite it."
 msgstr "文件存在但无法覆盖。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but is not a regular file."
 msgstr "文件存在但不是普通文件。"
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您继续的话，您将无法恢复这些信件。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "如果您删除文件夹，其中的全部内容及其子文件夹内容将被永久删除。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果您继续的话，全部代理服务器账户都将被永久删除。"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
 msgstr "如果您继续的话，账户信息及其全部代理服务器信息将被永久删除。"
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果您继续的话，账户信息将被永久删除。"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "如果您退出，这些信件将会等到 Evolution 下次启动才会发出。"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:67
 msgid "Invalid authentication"
 msgstr "无效的身份验证"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:68
+msgid "Mail Deletion Failed"
+msgstr "邮件删除失败"
+
+#: ../mail/mail.error.xml.h:69
 msgid "Mail filters automatically updated."
 msgstr "邮件过滤器已自动更新。"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 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 "
@@ -15373,31 +12945,27 @@ msgstr ""
 "个邮件头，将在您的信件中列出您的全部收件人。为了避免这种情况，您应该至少填入"
 "一个 To: 或 CC: 收件人。"
 
-#: ../mail/mail.error.xml.h:73
-msgid "Mark all messages as read"
-msgstr "把所有信件标记为已读"
-
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:71
 msgid "Missing folder."
 msgstr "缺少文件夹。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:73
 msgid "No sources selected."
 msgstr "没有选中源。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:74
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次打开太多封信可能要花一点时间。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:75
 msgid "Please check your account settings and try again."
 msgstr "请检查您的账户设置，然后再试一次。"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:76
 msgid "Please enable the account or send using another account."
 msgstr "请启用账户或者使用其它账户发送。"
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:77
 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."
@@ -15405,7 +12973,7 @@ msgstr ""
 "请在 To: 中输入有效的电子邮件地址。您可以单击输入框旁边的 To: 按钮来搜索电子"
 "邮件地址。"
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:78
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
@@ -15414,69 +12982,65 @@ msgstr ""
 "请确定下列收件人愿意并且能够接收 HTML 邮件：\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:80
 msgid "Please provide an unique name to identify this signature."
 msgstr "请提供此签名的唯一标识名称。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:81
 msgid "Please wait."
 msgstr "请稍候。"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "升迁旧的邮件文件夹“{0}”出现问题。"
 
-#: ../mail/mail.error.xml.h:86
-msgid "Querying server"
-msgstr "查询服务器"
-
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:83
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "查询服务器所支持的身份验证算法列表。"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:84
 msgid "Read receipt requested."
 msgstr "阅读收条已请求。"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:85
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "真的要删除文件夹“{0}”及其全部子文件夹吗？"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:86
 msgid "Report Junk Failed"
 msgstr "报告垃圾邮件失败"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:87
 msgid "Report Not Junk Failed"
 msgstr "报告非垃圾邮件失败"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:88
 msgid "Search Folders automatically updated."
 msgstr "搜索文件夹已自动更新。"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:89
 msgid "Send Receipt"
 msgstr "发送收条"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:90
 msgid "Signature Already Exists"
 msgstr "签名已经存在"
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:91
 msgid "Synchronize"
 msgstr "同步"
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:92
 msgid "Synchronize folders locally for offline usage?"
 msgstr "同步文件夹到本地以脱机使用吗？"
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "您无法重命名、移动或删除要让 Evolution 正常运作所需的系统文件夹。"
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:94
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -15491,7 +13055,7 @@ msgstr ""
 "个邮件头，将在您的信件中列出您的全部收件人。为了避免这种情况，您应该至少填入"
 "一个 To: 或 CC: 收件人。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -15505,7 +13069,7 @@ msgstr ""
 "   “{1}”\n"
 "已经更新。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:102
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -15519,6 +13083,18 @@ msgstr ""
 "   “{1}”\n"
 "已经更新。"
 
+#: ../mail/mail.error.xml.h:107
+msgid ""
+"The following recipient was not recognized as a valid mail address:\n"
+"{0}"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:109
+msgid ""
+"The following recipients were not recognized as valid mail addresses:\n"
+"{0}"
+msgstr ""
+
 #: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "脚本文件必须存在且可执行。"
@@ -15589,6 +13165,10 @@ msgstr ""
 "件。\n"
 "您真的想要这么做吗？"
 
+#: ../mail/mail.error.xml.h:126
+msgid "You do not have sufficient permissions to delete this mail."
+msgstr "您没有足够的权限删除此邮件。"
+
 #: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "您没有填入所需的全部信息。"
@@ -15634,6 +13214,11 @@ msgstr "丢弃更改(_D)"
 msgid "_Do not Synchronize"
 msgstr "不同步(_D)"
 
+#: ../mail/mail.error.xml.h:138
+#: ../modules/mail/e-mail-shell-view-actions.c:1021
+msgid "_Empty Trash"
+msgstr "清空回收站(_E)"
+
 #: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "销毁(_E)"
@@ -15642,85 +13227,94 @@ msgstr "销毁(_E)"
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/message-list.c:1051
+#: ../mail/message-list.c:1068
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1052
+#: ../mail/message-list.c:1069
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1053
+#: ../mail/message-list.c:1070
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1054
+#: ../mail/message-list.c:1071
 msgid "Forwarded"
 msgstr "已转发"
 
-#: ../mail/message-list.c:1055
+#: ../mail/message-list.c:1072
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信件"
 
-#: ../mail/message-list.c:1056
+#: ../mail/message-list.c:1073
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1060
+#: ../mail/message-list.c:1077
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1061
+#: ../mail/message-list.c:1078
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1065
+#: ../mail/message-list.c:1082
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1066
+#: ../mail/message-list.c:1083
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1655 ../widgets/table/e-cell-date.c:55
+#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1662 ../plugins/itip-formatter/itip-view.c:205
-#: ../widgets/table/e-cell-date.c:70
+#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M %p"
 msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:1671 ../widgets/table/e-cell-date.c:80
+#: ../mail/message-list.c:1728
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1683 ../widgets/table/e-cell-date.c:92
+#: ../mail/message-list.c:1740
 msgid "%a %l:%M %p"
 msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1691 ../widgets/table/e-cell-date.c:100
+#: ../mail/message-list.c:1748
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1693 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1750
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
+#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
+msgid "Shell Backend"
+msgstr ""
+
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:3984 ../mail/message-list.c:4449
+#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
 msgid "Generating message list"
 msgstr "生成信件列表"
 
-#: ../mail/message-list.c:4288
+#: ../mail/message-list.c:4578
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
 msgstr ""
 
-#: ../mail/message-list.c:4290
+#: ../mail/message-list.c:4580
+msgid ""
+"There are only hidden messages in this folder. Use View->Show Hidden "
+"Messages to show them."
+msgstr ""
+
+#: ../mail/message-list.c:4582
 msgid "There are no messages in this folder."
 msgstr "此文件夹中没有信件。"
 
@@ -15749,7 +13343,7 @@ msgid "Sent Messages"
 msgstr "已发信件"
 
 #: ../mail/message-list.etspec.h:16
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
+#: ../widgets/misc/e-attachment-tree-view.c:542
 msgid "Size"
 msgstr "大小"
 
@@ -15757,77 +13351,2232 @@ msgstr "大小"
 msgid "Subject - Trimmed"
 msgstr "主题 - 被截断"
 
-#: ../mail/message-tag-followup.c:55
-msgid "Call"
-msgstr "呼叫"
-
-#: ../mail/message-tag-followup.c:56
-msgid "Do Not Forward"
-msgstr "不要转发"
-
-#: ../mail/message-tag-followup.c:57
-msgid "Follow-Up"
-msgstr "跟随"
-
-#: ../mail/message-tag-followup.c:58
-msgid "For Your Information"
-msgstr "给您的信息"
-
-#: ../mail/message-tag-followup.c:59 ../ui/evolution-mail-message.xml.h:42
-msgid "Forward"
-msgstr "转发"
-
-#: ../mail/message-tag-followup.c:60
-msgid "No Response Necessary"
-msgstr "不必回复"
-
-#: ../mail/message-tag-followup.c:63 ../ui/evolution-mail-message.xml.h:80
-msgid "Reply"
-msgstr "回复"
-
-#: ../mail/message-tag-followup.c:64 ../ui/evolution-mail-message.xml.h:81
-msgid "Reply to All"
-msgstr "全部回复"
-
-#: ../mail/message-tag-followup.c:65
-msgid "Review"
-msgstr "回顾"
-
 #: ../mail/searchtypes.xml.h:1
+#: ../modules/mail/e-mail-shell-view-actions.c:1418
 msgid "Body contains"
 msgstr "邮件体含有"
 
 #: ../mail/searchtypes.xml.h:2
+#: ../modules/mail/e-mail-shell-view-actions.c:1425
 msgid "Message contains"
 msgstr "信件含有"
 
 #: ../mail/searchtypes.xml.h:3
+#: ../modules/mail/e-mail-shell-view-actions.c:1432
 msgid "Recipients contain"
 msgstr "收件人含有"
 
 #: ../mail/searchtypes.xml.h:4
+#: ../modules/mail/e-mail-shell-view-actions.c:1439
 msgid "Sender contains"
 msgstr "发件人含有"
 
 #: ../mail/searchtypes.xml.h:5
+#: ../modules/mail/e-mail-shell-view-actions.c:1446
 msgid "Subject contains"
 msgstr "主题含有"
 
 #: ../mail/searchtypes.xml.h:6
-msgid "Subject or Recipients contains"
-msgstr "主题或接收者含有"
+#, fuzzy
+msgid "Subject or Addresses contains"
+msgstr "主题或发送者含有"
+
+#: ../modules/addressbook/addressbook-config.c:206
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL."
+msgstr ""
+"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 SSL 时才连接到您的 LDAP "
+"服务器。"
+
+#: ../modules/addressbook/addressbook-config.c:208
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports TLS."
+msgstr ""
+"选中此选项意味着 Evolution 只在您的 LDAP 服务器支持 TLS 时才连接到您的 LDAP "
+"服务器。"
+
+#: ../modules/addressbook/addressbook-config.c:210
+msgid ""
+"Selecting this option means that your server does not support either SSL or "
+"TLS. This means that your connection will be insecure, and that you will be "
+"vulnerable to security exploits."
+msgstr ""
+"选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是您的连"
+"接不太安全，您也易于受到安全漏洞的攻击。"
+
+#: ../modules/addressbook/addressbook-config.c:592
+#, fuzzy
+msgid "Use in _Birthday & Anniversaries calendar"
+msgstr "生日和纪念日"
+
+#: ../modules/addressbook/addressbook-config.c:628
+msgid "Copy _book content locally for offline operation"
+msgstr "将地址簿内容复制到本地以进行脱机操作(_B)"
+
+#: ../modules/addressbook/addressbook-config.c:736
+msgid ""
+"This is the port on the LDAP server that Evolution will try to connect to. A "
+"list of standard ports has been provided. Ask your system administrator what "
+"port you should specify."
+msgstr ""
+"这是 LDAP 服务器上的端口，Evolution 将试图连接到您所给出的标准端口列表。如果"
+"您不清楚要指定的端口，请询问您的系统管理员。"
+
+#: ../modules/addressbook/addressbook-config.c:810
+msgid ""
+"This is the method Evolution will use to authenticate you.  Note that "
+"setting this to \"Email Address\" requires anonymous access to your LDAP "
+"server."
+msgstr ""
+"这是 Evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
+"对 LDAP 服务器的匿名访问权限。"
+
+#: ../modules/addressbook/addressbook-config.c:885
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"the directory tree. A search scope of \"sub\" will include all entries below "
+"your search base. A search scope of \"one\" will only include the entries "
+"one level beneath your base."
+msgstr ""
+"搜索范围定义了您想要在目录树中搜索多深。搜索范围若为“子级”，则将包含您指定的"
+"搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜索基础之下一"
+"级的项目。"
+
+#: ../modules/addressbook/addressbook-config.c:991
+msgid "Server Information"
+msgstr "服务器信息"
+
+#: ../modules/addressbook/addressbook-config.c:996
+#: ../smime/gui/smime-ui.ui.h:14
+msgid "Details"
+msgstr "细节"
+
+#: ../modules/addressbook/addressbook-config.c:997
+msgid "Searching"
+msgstr "搜索"
 
-#: ../mail/searchtypes.xml.h:7
-msgid "Subject or Sender contains"
+#: ../modules/addressbook/addressbook-config.c:999
+msgid "Downloading"
+msgstr "下载"
+
+#: ../modules/addressbook/addressbook-config.c:1205
+msgid "Address Book Properties"
+msgstr "地址簿属性"
+
+#: ../modules/addressbook/addressbook-config.c:1207
+msgid "New Address Book"
+msgstr "新地址簿"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:1
+msgid "Autocomplete length"
+msgstr "自动补全长度"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:2
+#, fuzzy
+msgid "Contact layout style"
+msgstr "联系人列表"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:3
+msgid "Contact preview pane position (horizontal)"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:4
+#, fuzzy
+msgid "Contact preview pane position (vertical)"
+msgstr "月视图中垂直面板的位置"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:5
+msgid "EFolderList XML for the list of completion URIs"
+msgstr "补全 URI 列表的 EFolderList xml"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:6
+msgid "EFolderList XML for the list of completion URIs."
+msgstr "补全 URI 列表的 EFolderList xml。"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:7
+msgid "Position of the contact preview pane when oriented horizontally."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:8
+msgid "Position of the contact preview pane when oriented vertically."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:9
+msgid "Show autocompleted name with an address"
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:10
+msgid "Show preview pane"
+msgstr "显示预览面板"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:11
+msgid ""
+"The layout style determines where to place the preview pane in relation to "
+"the contact list. \"0\" (Classic View) places the preview pane below the "
+"contact list. \"1\" (Vertical View) places the preview pane next to the "
+"contact list."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:12
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
+msgstr "在 Evolution 试图进行自动补全之前应该输入多少个字符。"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:13
+msgid "URI for the folder last used in the select names dialog"
+msgstr "选择名称对话框中上次使用的文件夹 URI"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:14
+msgid "URI for the folder last used in the select names dialog."
+msgstr "选择名称对话框中上次使用的文件夹 URI。"
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:15
+msgid ""
+"Whether force showing the mail address with the name of the autocompleted "
+"contact in the entry."
+msgstr ""
+
+#: ../modules/addressbook/apps_evolution_addressbook.schemas.in.h:16
+msgid "Whether to show the preview pane."
+msgstr "是否显示预览面板。"
+
+#: ../modules/addressbook/autocompletion-config.c:159
+#: ../modules/mail/em-mailer-prefs.c:1152
+msgid "Table column:"
+msgstr "表格栏："
+
+#: ../modules/addressbook/autocompletion-config.c:162
+msgid "Autocompletion"
+msgstr "自动补全"
+
+#: ../modules/addressbook/autocompletion-config.c:165
+msgid "Always _show address of the autocompleted contact"
+msgstr "总是显示自动补全的联系人的地址(_S)"
+
+#. Create the LDAP source group
+#: ../modules/addressbook/e-book-shell-backend.c:190
+#: ../modules/addressbook/e-book-shell-migrate.c:517
+msgid "On LDAP Servers"
+msgstr "在 LDAP 服务器上"
+
+#: ../modules/addressbook/e-book-shell-backend.c:340
+msgctxt "New"
+msgid "_Contact"
+msgstr "联系人(_C)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:342
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
+msgid "Create a new contact"
+msgstr "创建一个新联系人"
+
+#: ../modules/addressbook/e-book-shell-backend.c:347
+msgctxt "New"
+msgid "Contact _List"
+msgstr "联系人列表(_L)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:349
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
+msgid "Create a new contact list"
+msgstr "创建一个新的联系人列表"
+
+#: ../modules/addressbook/e-book-shell-backend.c:357
+msgctxt "New"
+msgid "Address _Book"
+msgstr "地址簿(_B)"
+
+#: ../modules/addressbook/e-book-shell-backend.c:359
+#: ../modules/addressbook/e-book-shell-view-actions.c:730
+msgid "Create a new address book"
+msgstr "创建新地址簿"
+
+#. Create the contacts group
+#: ../modules/addressbook/e-book-shell-backend.c:376
+#: ../modules/addressbook/e-book-shell-view.c:396
+#: ../modules/calendar/e-cal-shell-backend.c:121
+#: ../modules/calendar/e-cal-shell-migrate.c:480
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../modules/addressbook/e-book-shell-backend.c:596
+#: ../modules/calendar/e-cal-shell-backend.c:759
+#: ../modules/calendar/e-memo-shell-backend.c:583
+#: ../modules/calendar/e-task-shell-backend.c:593
+msgid "Source List"
+msgstr "来源列表"
+
+#: ../modules/addressbook/e-book-shell-backend.c:597
+#, fuzzy
+msgid "The registry of address books"
+msgstr "无法获得地址簿列表"
+
+#: ../modules/addressbook/e-book-shell-content.c:380
+msgid "Current View"
+msgstr "当前视图"
+
+#: ../modules/addressbook/e-book-shell-content.c:381
+msgid "The currently selected address book view"
+msgstr ""
+
+#: ../modules/addressbook/e-book-shell-content.c:390
+#, fuzzy
+msgid "Previewed Contact"
+msgstr "新建联系人"
+
+#: ../modules/addressbook/e-book-shell-content.c:391
+#, fuzzy
+msgid "The contact being shown in the preview pane"
+msgstr "是否显示预览面板。"
+
+#: ../modules/addressbook/e-book-shell-content.c:400
+#: ../modules/calendar/e-memo-shell-content.c:611
+#: ../modules/calendar/e-task-shell-content.c:634
+#: ../modules/mail/e-mail-shell-content.c:726
+#, fuzzy
+msgid "Preview is Visible"
+msgstr "侧边栏可见"
+
+#: ../modules/addressbook/e-book-shell-content.c:401
+#: ../modules/calendar/e-memo-shell-content.c:612
+#: ../modules/calendar/e-task-shell-content.c:635
+#: ../modules/mail/e-mail-shell-content.c:727
+#, fuzzy
+msgid "Whether the preview pane is visible"
+msgstr "是否显示预览面板。"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+#: ../modules/mail/e-mail-shell-migrate.c:1106
+msgid "Migrating..."
+msgstr "正在升迁..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#: ../modules/mail/e-mail-shell-migrate.c:1179
+#, c-format
+msgid "Migrating '%s':"
+msgstr "升迁“%s”："
+
+#: ../modules/addressbook/e-book-shell-migrate.c:645
+msgid "LDAP Servers"
+msgstr "LDAP 服务器"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:765
+msgid "Autocompletion Settings"
+msgstr "自动补全设置"
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1152
+msgid ""
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 联系人文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1166
+msgid ""
+"The format of mailing list contacts has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"邮件列表联系人的格式已经更改。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1175
+msgid ""
+"The way Evolution stores some phone numbers has changed.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 存储某些电话号码的方式已经更改。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#: ../modules/addressbook/e-book-shell-migrate.c:1185
+msgid ""
+"Evolution's Palm Sync changelog and map files have changed.\n"
+"\n"
+"Please be patient while Evolution migrates your Pilot Sync data..."
+msgstr ""
+"Evolution Palm 同步更新日志和地图文件已经更改。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:181
+#: ../modules/calendar/e-cal-shell-sidebar.c:608
+#: ../modules/calendar/e-memo-shell-sidebar.c:543
+#: ../modules/calendar/e-task-shell-sidebar.c:541
+#, fuzzy
+msgid "Source Selector Widget"
+msgstr "备忘来源选择器"
+
+#: ../modules/addressbook/e-book-shell-sidebar.c:182
+#, fuzzy
+msgid "This widget displays groups of address books"
+msgstr "无法获得地址簿列表"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:262
+#: ../modules/addressbook/e-book-shell-view-actions.c:563
+msgid "Save as vCard"
+msgstr "另存为 VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:707
+msgid "Co_py All Contacts To..."
+msgstr "将全部联系人复制到(_P)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:709
+#, fuzzy
+msgid "Copy the contacts of the selected address book to another"
+msgstr "把选中文件夹中的联系人复制到其它文件夹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:714
+msgid "Del_ete Address Book"
+msgstr "删除地址簿(_E)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:716
+#, fuzzy
+msgid "Delete the selected address book"
+msgstr "删除选中的文件夹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:721
+msgid "Mo_ve All Contacts To..."
+msgstr "将全部联系人移至(_V)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:723
+#, fuzzy
+msgid "Move the contacts of the selected address book to another"
+msgstr "把选中文件夹中的联系人移至其它文件夹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:728
+msgid "_New Address Book"
+msgstr "新建地址簿(_N)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:735
+msgid "Address _Book Properties"
+msgstr "地址簿属性(_B)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:737
+#, fuzzy
+msgid "Show properties of the selected address book"
+msgstr "更改选中文件夹的属性"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:742
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/mail/e-mail-shell-view-actions.c:1091
+msgid "_Rename..."
+msgstr "重命名(_R)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:744
+#, fuzzy
+msgid "Rename the selected address book"
+msgstr "重命名选中文件夹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:749
+msgid "S_ave Address Book as vCard"
+msgstr "保存地址簿为 VCard(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:751
+#, fuzzy
+msgid "Save the contacts of the selected address book as a vCard"
+msgstr "把选中文件夹中的的联系人保存为 VCard"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:758
+msgid "Stop loading"
+msgstr "停止载入"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:765
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
+msgid "Copy the selection"
+msgstr "复制选中内容"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/calendar/e-cal-shell-view-actions.c:1329
+msgid "Cut the selection"
+msgstr "剪切选中内容"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:779
+#: ../modules/calendar/e-cal-shell-view-actions.c:1336
+msgid "Paste the clipboard"
+msgstr "粘贴剪贴板"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:784
+#, fuzzy
+msgid "_Copy Contact To..."
+msgstr "将联系人复制到(_C)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:786
+#, fuzzy
+msgid "Copy selected contacts to another address book"
+msgstr "把选中的联系人复制到其它文件夹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:791
+msgid "_Delete Contact"
+msgstr "删除联系人(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:793
+msgid "Delete selected contacts"
+msgstr "删除选中的联系人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:798
+msgid "_Forward Contact..."
+msgstr "转发联系人(_F)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:800
+msgid "Send selected contacts to another person"
+msgstr "把选中的联系人发送给其他人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
+#, fuzzy
+msgid "_Move Contact To..."
+msgstr "将联系人移至(_M)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
+#, fuzzy
+msgid "Move selected contacts to another address book"
+msgstr "把选中的联系人移至其它文件夹"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
+msgid "_New Contact..."
+msgstr "新建联系人(_N)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
+msgid "New Contact _List..."
+msgstr "新建联系人列表(_L)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
+msgid "_Open Contact"
+msgstr "打开联系人(_O)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
+msgid "View the current contact"
+msgstr "查看当前联系人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
+msgid "Select all contacts"
+msgstr "选中全部联系人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
+msgid "_Send Message to Contact..."
+msgstr "给联系人发信件(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
+msgid "Send a message to the selected contacts"
+msgstr "给选中的联系人发信件"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:848
+msgid "_Actions"
+msgstr "操作(_A)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
+#: ../modules/calendar/e-memo-shell-view-actions.c:703
+#: ../modules/calendar/e-task-shell-view-actions.c:855
+#: ../modules/mail/e-mail-shell-view-actions.c:1233
+msgid "_Preview"
+msgstr "预览(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:865
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-task-shell-view-actions.c:762
+msgid "_Delete"
+msgstr "删除(_D)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:869
+msgid "_Properties"
+msgstr "属性(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
+msgid "_Save as vCard..."
+msgstr "另存为 vCard(_S)..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:921
+msgid "Contact _Preview"
+msgstr "联系人预览(_P)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
+msgid "Show contact preview window"
+msgstr "显示联系人预览窗口"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/calendar/e-memo-shell-view-actions.c:789
+#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/mail/e-mail-shell-view-actions.c:1328
+msgid "_Classic View"
+msgstr "分类视图(_C)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#, fuzzy
+msgid "Show contact preview below the contact list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/calendar/e-memo-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:960
+#: ../modules/mail/e-mail-shell-view-actions.c:1335
+msgid "_Vertical View"
+msgstr "垂直视图(_V)"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#, fuzzy
+msgid "Show contact preview alongside the contact list"
+msgstr "显示联系人预览窗口"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
+#: ../modules/calendar/e-cal-shell-view-actions.c:1634
+#: ../modules/calendar/e-memo-shell-view-actions.c:806
+#: ../modules/calendar/e-task-shell-view-actions.c:977
+msgid "Any Category"
+msgstr "任何类别"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
+#: ../modules/calendar/e-cal-shell-view-actions.c:1648
+#: ../modules/calendar/e-memo-shell-view-actions.c:813
+#: ../modules/calendar/e-task-shell-view-actions.c:1012
+msgid "Unmatched"
+msgstr "无匹配"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/mail/e-mail-shell-view-actions.c:1411
+msgid "Advanced search"
+msgstr "高级搜索"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#, fuzzy
+msgid "Print all shown contacts"
+msgstr "打印选中的联系人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#, fuzzy
+msgid "Preview the contacts to be printed"
+msgstr "预览将要打印的联系人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+msgid "Print selected contacts"
+msgstr "打印选中的联系人"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
+msgid "Save as vCard..."
+msgstr "另存为 VCard..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1040
+#, fuzzy
+msgid "Save selected contacts as a vCard"
+msgstr "把选中的联系人保存为 VCard"
+
+#: ../modules/addressbook/e-book-shell-view.c:336
+msgid "_Forward Contacts"
+msgstr "转发联系人(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:338
+msgid "_Forward Contact"
+msgstr "转发联系人(_F)"
+
+#: ../modules/addressbook/e-book-shell-view.c:373
+#, fuzzy
+msgid "_Send Message to Contacts"
+msgstr "给联系人发信件(_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:375
+#, fuzzy
+msgid "_Send Message to List"
+msgstr "给列表发信件(_M)"
+
+#: ../modules/addressbook/e-book-shell-view.c:377
+#, fuzzy
+msgid "_Send Message to Contact"
+msgstr "给联系人发信件(_M)"
+
+#: ../modules/addressbook/eab-composer-util.c:137
+msgid "Multiple vCards"
+msgstr "多个 vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:145
+#, c-format
+msgid "vCard for %s"
+msgstr "%s 的 vCard"
+
+#: ../modules/addressbook/eab-composer-util.c:157
+#: ../modules/addressbook/eab-composer-util.c:184
+#, c-format
+msgid "Contact information"
+msgstr "联系人信息"
+
+#: ../modules/addressbook/eab-composer-util.c:186
+#, c-format
+msgid "Contact information for %s"
+msgstr "%s 的联系人信息"
+
+#: ../modules/addressbook/ldap-config.ui.h:1
+msgid "1"
+msgstr "1"
+
+#: ../modules/addressbook/ldap-config.ui.h:2
+msgid "3268"
+msgstr "3268"
+
+#: ../modules/addressbook/ldap-config.ui.h:3
+msgid "389"
+msgstr "389"
+
+#: ../modules/addressbook/ldap-config.ui.h:4
+msgid "5"
+msgstr "5"
+
+#: ../modules/addressbook/ldap-config.ui.h:5
+msgid "636"
+msgstr "636"
+
+#: ../modules/addressbook/ldap-config.ui.h:6
+msgid "Anonymously"
+msgstr "匿名"
+
+#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
+#: ../modules/addressbook/ldap-config.ui.h:8
+msgid "B_rowse this book until limit reached"
+msgstr "浏览此地址簿直到达到极限(_R)"
+
+#: ../modules/addressbook/ldap-config.ui.h:9
+msgid "Lo_gin:"
+msgstr "登录(_G)："
+
+#: ../modules/addressbook/ldap-config.ui.h:11
+msgid "One"
+msgstr "一次"
+
+#: ../modules/addressbook/ldap-config.ui.h:13
+msgid "Search Filter"
+msgstr "搜索过滤器"
+
+#: ../modules/addressbook/ldap-config.ui.h:14
+msgid "Search _base:"
+msgstr "搜索基础(_B)："
+
+#: ../modules/addressbook/ldap-config.ui.h:15
+msgid "Search _filter:"
+msgstr "搜索过滤器(_F)："
+
+#: ../modules/addressbook/ldap-config.ui.h:16
+#, fuzzy
+msgid ""
+"Search filter is the type of object to be searched for. If this is not "
+"modified, the default search will be performed on the type \"person\"."
+msgstr ""
+"搜索过滤器是指执行搜索时要搜索的对象类型。如果没有修改过的话，默认情况下搜索"
+"将会在“个人”类型的对象类型。"
+
+#: ../modules/addressbook/ldap-config.ui.h:17
+msgid "Sub"
+msgstr "子"
+
+#: ../modules/addressbook/ldap-config.ui.h:18
+msgid "Supported Search Bases"
+msgstr "支持的搜索起点"
+
+#: ../modules/addressbook/ldap-config.ui.h:20
+msgid "Using distinguished name (DN)"
+msgstr "使用已识别的姓名(DN)"
+
+#: ../modules/addressbook/ldap-config.ui.h:21
+msgid "Using email address"
+msgstr "使用电子邮件地址"
+
+#: ../modules/addressbook/ldap-config.ui.h:22
+msgid "_Download limit:"
+msgstr "下载限制(_D)："
+
+#: ../modules/addressbook/ldap-config.ui.h:23
+msgid "_Find Possible Search Bases"
+msgstr "查找可能的搜索基础(_F)"
+
+#: ../modules/addressbook/ldap-config.ui.h:24
+msgid "_Login method:"
+msgstr "登录方式(_L)："
+
+#: ../modules/addressbook/ldap-config.ui.h:26
+msgid "_Port:"
+msgstr "端口(_P)："
+
+#: ../modules/addressbook/ldap-config.ui.h:27
+msgid "_Search scope:"
+msgstr "搜索范围(_S)："
+
+#: ../modules/addressbook/ldap-config.ui.h:29
+msgid "_Timeout:"
+msgstr "超时(_T)："
+
+#: ../modules/addressbook/ldap-config.ui.h:30
+msgid "_Use secure connection:"
+msgstr "使用安全连接(_U)："
+
+#: ../modules/addressbook/ldap-config.ui.h:31
+msgid "cards"
+msgstr "名片"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:259
+msgid "I_mport"
+msgstr "导入(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Select a Calendar"
+msgstr "选择一个日历"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:368
+msgid "Select a Task List"
+msgstr "选择一个任务列表"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:378
+msgid "I_mport to Calendar"
+msgstr "导入到日历(_M)"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:385
+msgid "I_mport to Tasks"
+msgstr "导入到任务(_M)"
+
+#. Create the Webcal source group
+#: ../modules/calendar/e-cal-shell-backend.c:122
+#: ../modules/calendar/e-cal-shell-migrate.c:599
+#: ../modules/calendar/e-memo-shell-backend.c:108
+#: ../modules/calendar/e-memo-shell-migrate.c:136
+#: ../modules/calendar/e-task-shell-backend.c:111
+#: ../modules/calendar/e-task-shell-migrate.c:535
+msgid "On The Web"
+msgstr "网上"
+
+#: ../modules/calendar/e-cal-shell-backend.c:123
+#: ../plugins/calendar-weather/calendar-weather.c:117
+msgid "Weather"
+msgstr "天气"
+
+#: ../modules/calendar/e-cal-shell-backend.c:238
+#: ../modules/calendar/e-cal-shell-migrate.c:483
+msgid "Birthdays & Anniversaries"
+msgstr "生日和纪念日"
+
+#: ../modules/calendar/e-cal-shell-backend.c:424
+msgctxt "New"
+msgid "_Appointment"
+msgstr "约会(_A)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+msgid "Create a new appointment"
+msgstr "创建新约会"
+
+#: ../modules/calendar/e-cal-shell-backend.c:431
+msgctxt "New"
+msgid "All Day A_ppointment"
+msgstr "全天约会(_P)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:433
+msgid "Create a new all-day appointment"
+msgstr "创建新全天约会"
+
+#: ../modules/calendar/e-cal-shell-backend.c:438
+msgctxt "New"
+msgid "M_eeting"
+msgstr "会议(_E)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:440
+msgid "Create a new meeting request"
+msgstr "创建一条新会议请求"
+
+#: ../modules/calendar/e-cal-shell-backend.c:448
+msgctxt "New"
+msgid "Cale_ndar"
+msgstr "日历(_N)"
+
+#: ../modules/calendar/e-cal-shell-backend.c:450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1280
+msgid "Create a new calendar"
+msgstr "创建新日历"
+
+#: ../modules/calendar/e-cal-shell-backend.c:485
+#: ../plugins/itip-formatter/itip-formatter.c:2645
+msgid "Calendar and Tasks"
+msgstr "日历和任务"
+
+#: ../modules/calendar/e-cal-shell-backend.c:760
+msgid "The registry of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-migrate.c:131
+msgid ""
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 日历文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#. FIXME: set proper domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:664
+#: ../modules/calendar/e-task-shell-migrate.c:591
+#, c-format
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr "无法从 evolution/config.xmldb 中升迁旧设置"
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-cal-shell-migrate.c:693
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "无法升迁日历“%s”"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:152
+#: ../modules/calendar/e-memo-shell-sidebar.c:149
+#: ../modules/calendar/e-task-shell-sidebar.c:147
+#, c-format
+msgid ""
+"Error on %s\n"
+"%s"
+msgstr ""
+"%s 错误：\n"
+" %s"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:188
+msgid "Loading calendars"
+msgstr "装入日历"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:428
+msgid "Calendar Selector"
+msgstr "日历选择器"
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:598
+msgid "Date Navigator Widget"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:599
+msgid "This widget displays a miniature calendar"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:609
+msgid "This widget displays groups of calendars"
+msgstr ""
+
+#: ../modules/calendar/e-cal-shell-sidebar.c:770
+#, c-format
+msgid "Opening calendar at %s"
+msgstr "在 %s 打开日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:246
+msgid "Print"
+msgstr "打印"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:305
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"该操作将永久删除所有比选中时间量早的事件。如果您继续，您将无法恢复这些事件。"
+
+#. Translators: This is the first part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
+msgid "Purge events older than"
+msgstr "销毁较早的事件"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:558
+msgid "Copying Items"
+msgstr "复制项目"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:808
+msgid "Moving Items"
+msgstr "移动项目"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1109
+#: ../modules/calendar/e-cal-shell-view-memopad.c:262
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-memo-shell-view-actions.c:530
+#: ../modules/calendar/e-task-shell-view-actions.c:655
+msgid "Save as iCalendar"
+msgstr "保存为 iCalendar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-memo-shell-view-actions.c:631
+msgid "_Copy..."
+msgstr "复制(_C)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
+msgid "Go Back"
+msgstr "后退"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
+msgid "Go Forward"
+msgstr "前进"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+msgid "Select _Today"
+msgstr "选择今天(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Select today"
+msgstr "选择今天"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+msgid "Select _Date"
+msgstr "选择日期(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
+msgid "Select a specific date"
+msgstr "选择特定日期"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1278
+msgid "_New Calendar"
+msgstr "新建日历(_N)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-task-shell-view-actions.c:839
+msgid "Purg_e"
+msgstr "销毁(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
+msgid "Purge old appointments and meetings"
+msgstr "销毁旧约会和会议"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-task-shell-view-actions.c:783
+msgid "Re_fresh"
+msgstr "刷新(_F)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
+#, fuzzy
+msgid "Refresh the selected calendar"
+msgstr "重命名选中的日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
+msgid "Rename the selected calendar"
+msgstr "重命名选中的日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
+msgid "Show _Only This Calendar"
+msgstr "只显示此日历(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+msgid "Cop_y to Calendar..."
+msgstr "复制到日历(_Y)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
+msgid "_Delegate Meeting..."
+msgstr "代理会议(_D)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+msgid "Delete the appointment"
+msgstr "删除约会"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
+msgid "Delete This _Occurrence"
+msgstr "删除此次出现(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+msgid "Delete this occurrence"
+msgstr "删除此次发生"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+msgid "Delete _All Occurrences"
+msgstr "删除所有出现(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+msgid "Delete all occurrences"
+msgstr "删除全部发生"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
+msgid "New All Day _Event..."
+msgstr "新建全天事件(_E)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+msgid "Create a new all day event"
+msgstr "创建一个新的全天事件"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:322
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
+#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-task-shell-view-actions.c:748
+msgid "_Forward as iCalendar..."
+msgstr "作为 iCalendar 转发(_F)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
+msgid "New _Meeting..."
+msgstr "新建会议(_M)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+msgid "Create a new meeting"
+msgstr "创建一个新的会议"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
+msgid "Mo_ve to Calendar..."
+msgstr "移至日历(_V)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
+msgid "New _Appointment..."
+msgstr "新建约会(_A)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
+msgid "Make this Occurrence _Movable"
+msgstr "将此次发生变为可移动(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
+msgid "_Open Appointment"
+msgstr "打开约会(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+msgid "View the current appointment"
+msgstr "查看当前约会"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
+msgid "_Reply"
+msgstr "回复(_R)"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../modules/calendar/e-cal-shell-view-memopad.c:350
+msgid "Save as iCalendar..."
+msgstr "保存为 iCalendar..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
+msgid "_Schedule Meeting..."
+msgstr "调度会议(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#, fuzzy
+msgid "Converts an appointment to a meeting"
+msgstr "销毁旧约会和会议"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
+msgid "Conv_ert to Appointment..."
+msgstr "转换到约会(_E)..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#, fuzzy
+msgid "Converts a meeting to an appointment"
+msgstr "在约会结束时 %s"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
+msgid "Day"
+msgstr "天"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1591
+msgid "Show one day"
+msgstr "显示一天"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1596
+msgid "List"
+msgstr "列表"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1598
+msgid "Show as list"
+msgstr "显示为列表"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+msgid "Month"
+msgstr "月"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1605
+msgid "Show one month"
+msgstr "显示一个月"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1610
+msgid "Week"
+msgstr "周"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1612
+msgid "Show one week"
+msgstr "显示一周"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
+#, fuzzy
+msgid "Show one work week"
+msgstr "显示一周"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1627
+msgid "Active Appointments"
+msgstr "活动约会"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1641
+msgid "Next 7 Days' Appointments"
+msgstr "下一周的约会"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-memo-shell-view-actions.c:837
+#: ../modules/calendar/e-task-shell-view-actions.c:1036
+msgid "Description contains"
+msgstr "描述含有"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-memo-shell-view-actions.c:844
+#: ../modules/calendar/e-task-shell-view-actions.c:1043
+msgid "Summary contains"
+msgstr "概要含有"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1691
+msgid "Print this calendar"
+msgstr "打印此日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1698
+#, fuzzy
+msgid "Preview the calendar to be printed"
+msgstr "预览将要打印的日历"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
+msgid "Go To"
+msgstr "转到"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:76
+#: ../modules/calendar/e-memo-shell-view-actions.c:97
+msgid "Deleting selected memos..."
+msgstr "删除选中的备忘..."
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:296
+#: ../modules/calendar/e-memo-shell-view-actions.c:598
+msgid "Copy selected memo"
+msgstr "复制选中的备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:303
+#: ../modules/calendar/e-memo-shell-view-actions.c:605
+msgid "Cut selected memo"
+msgstr "剪切选中的备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:310
+#: ../modules/calendar/e-memo-shell-view-actions.c:612
+msgid "Paste memo from the clipboard"
+msgstr "从剪贴板中粘贴备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:315
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
+msgid "_Delete Memo"
+msgstr "删除备忘(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:619
+msgid "Delete selected memos"
+msgstr "删除选中的备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:329
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
+msgid "New _Memo"
+msgstr "新建备忘(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:331
+#: ../modules/calendar/e-memo-shell-backend.c:318
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+msgid "Create a new memo"
+msgstr "创建新备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:336
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
+msgid "_Open Memo"
+msgstr "打开备忘(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:338
+#: ../modules/calendar/e-memo-shell-view-actions.c:689
+msgid "View the selected memo"
+msgstr "查看选中的备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:343
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:431
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-task-shell-view-actions.c:832
+msgid "Open _Web Page"
+msgstr "打开网页(_W)"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:870
+msgid "Print the selected memo"
+msgstr "打印选中的备忘"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:444
+#: ../modules/calendar/e-memo-shell-view.c:232
+msgid "Delete Memo"
+msgid_plural "Delete Memos"
+msgstr[0] "删除备忘"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:99
+#: ../modules/calendar/e-task-shell-view-actions.c:128
+msgid "Deleting selected tasks..."
+msgstr "删除选中的任务..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-task-shell-view-actions.c:713
+msgid "_Assign Task"
+msgstr "分配任务(_A)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
+#: ../modules/calendar/e-task-shell-view-actions.c:722
+msgid "Copy selected tasks"
+msgstr "复制选中的任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
+#: ../modules/calendar/e-task-shell-view-actions.c:729
+msgid "Cut selected tasks"
+msgstr "剪切选中的任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:736
+msgid "Paste tasks from the clipboard"
+msgstr "从剪贴板中粘贴任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
+#: ../modules/calendar/e-task-shell-view-actions.c:741
+msgid "_Delete Task"
+msgstr "删除任务(_D)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
+#: ../modules/calendar/e-task-shell-view-actions.c:743
+msgid "Delete selected tasks"
+msgstr "删除选中的任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
+#: ../modules/calendar/e-task-shell-view-actions.c:804
+msgid "_Mark as Complete"
+msgstr "标记为完成(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
+#: ../modules/calendar/e-task-shell-view-actions.c:806
+msgid "Mark selected tasks as complete"
+msgstr "把选中任务标记为完成"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+msgid "_Mark as Incomplete"
+msgstr "标记为未完成(_M)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:412
+#: ../modules/calendar/e-task-shell-view-actions.c:813
+#, fuzzy
+msgid "Mark selected tasks as incomplete"
+msgstr "把选中任务标记为完成"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
+#: ../modules/calendar/e-task-shell-view-actions.c:818
+msgid "New _Task"
+msgstr "新建任务(_T)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:419
+#: ../modules/calendar/e-task-shell-backend.c:322
+#: ../modules/calendar/e-task-shell-view-actions.c:820
+msgid "Create a new task"
+msgstr "创建新任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:424
+#: ../modules/calendar/e-task-shell-view-actions.c:825
+msgid "_Open Task"
+msgstr "打开任务(_O)"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:426
+#: ../modules/calendar/e-task-shell-view-actions.c:827
+msgid "View the selected task"
+msgstr "查看选中的任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:438
+#: ../modules/calendar/e-memo-shell-view-actions.c:885
+#: ../modules/calendar/e-task-shell-view-actions.c:1084
+msgid "_Save as iCalendar..."
+msgstr "保存为 iCalendar(_S)..."
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:450
+#: ../modules/calendar/e-task-shell-view-actions.c:1069
+msgid "Print the selected task"
+msgstr "打印选中的任务"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:555
+#: ../modules/calendar/e-task-shell-view.c:359
+msgid "Delete Task"
+msgid_plural "Delete Tasks"
+msgstr[0] "删除任务"
+
+#: ../modules/calendar/e-memo-shell-backend.c:316
+msgctxt "New"
+msgid "Mem_o"
+msgstr "备忘(_O)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:323
+msgctxt "New"
+msgid "_Shared Memo"
+msgstr "共享的备忘(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:325
+msgid "Create a new shared memo"
+msgstr "创建一个新的共享备忘"
+
+#: ../modules/calendar/e-memo-shell-backend.c:333
+msgctxt "New"
+msgid "Memo Li_st"
+msgstr "备忘列表(_S)"
+
+#: ../modules/calendar/e-memo-shell-backend.c:335
+#: ../modules/calendar/e-memo-shell-view-actions.c:647
+msgid "Create a new memo list"
+msgstr "创建新备忘列表"
+
+#: ../modules/calendar/e-memo-shell-backend.c:584
+#, fuzzy
+msgid "The registry of memo lists"
+msgstr "打印备忘列表"
+
+#: ../modules/calendar/e-memo-shell-content.c:602
+#, fuzzy
+msgid "The memo table model"
+msgstr "表格模型"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:185
+msgid "Loading memos"
+msgstr "装入备忘"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:399
+msgid "Memo List Selector"
+msgstr "备忘列表选择器"
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:544
+msgid "This widget displays groups of memo lists"
+msgstr ""
+
+#: ../modules/calendar/e-memo-shell-sidebar.c:697
+#, c-format
+msgid "Opening memos at %s"
+msgstr "在 %s 打开备忘"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:254
+#: ../modules/calendar/e-memo-shell-view-actions.c:271
+msgid "Print Memos"
+msgstr "打印备忘"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
+msgid "_New Memo List"
+msgstr "新建备忘列表(_N)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:661
+#, fuzzy
+msgid "Refresh the selected memo list"
+msgstr "重命名选中文件夹"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:668
+#, fuzzy
+msgid "Rename the selected memo list"
+msgstr "重命名选中文件夹"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#, fuzzy
+msgid "Show _Only This Memo List"
+msgstr "只显示此备忘列表(_O)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:768
+msgid "Memo _Preview"
+msgstr "备忘预览(_P)"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:770
+#, fuzzy
+msgid "Show memo preview pane"
+msgstr "显示预览面板"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#, fuzzy
+msgid "Show memo preview below the memo list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#, fuzzy
+msgid "Show memo preview alongside the memo list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:856
+msgid "Print the list of memos"
+msgstr "打印备忘列表"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:863
+#, fuzzy
+msgid "Preview the list of memos to be printed"
+msgstr "预览要打印的备忘列表"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:417
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d 个备忘"
+
+#: ../modules/calendar/e-memo-shell-view-private.c:421
+#: ../modules/calendar/e-task-shell-view-private.c:572
+#, fuzzy, c-format
+msgid "%d selected"
+msgstr "，已选中 %d 个"
+
+#: ../modules/calendar/e-memo-shell-view.c:230
+msgid "Delete Memos"
+msgstr "删除备忘"
+
+#: ../modules/calendar/e-task-shell-backend.c:320
+msgctxt "New"
+msgid "_Task"
+msgstr "任务(_T)"
+
+#: ../modules/calendar/e-task-shell-backend.c:327
+msgctxt "New"
+msgid "Assigne_d Task"
+msgstr "分配的任务(_D)"
+
+#: ../modules/calendar/e-task-shell-backend.c:329
+msgid "Create a new assigned task"
+msgstr "创建新分配的任务"
+
+#: ../modules/calendar/e-task-shell-backend.c:337
+msgctxt "New"
+msgid "Tas_k List"
+msgstr "任务列表(_K)"
+
+#: ../modules/calendar/e-task-shell-backend.c:339
+#: ../modules/calendar/e-task-shell-view-actions.c:771
+msgid "Create a new task list"
+msgstr "创建新任务列表"
+
+#: ../modules/calendar/e-task-shell-backend.c:594
+#, fuzzy
+msgid "The registry of task lists"
+msgstr "打印任务列表"
+
+#: ../modules/calendar/e-task-shell-content.c:625
+#, fuzzy
+msgid "The task table model"
+msgstr "表格模型"
+
+#: ../modules/calendar/e-task-shell-migrate.c:98
+msgid ""
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#. FIXME: domain/code
+#: ../modules/calendar/e-task-shell-migrate.c:620
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "无法升迁任务“%s”"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:183
+msgid "Loading tasks"
+msgstr "装入任务"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:397
+#, fuzzy
+msgid "Task List Selector"
+msgstr "任务来源选择器"
+
+#: ../modules/calendar/e-task-shell-sidebar.c:542
+msgid "This widget displays groups of task lists"
+msgstr ""
+
+#: ../modules/calendar/e-task-shell-sidebar.c:695
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "在 %s 打开任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:285
+#: ../modules/calendar/e-task-shell-view-actions.c:302
+msgid "Print Tasks"
+msgstr "打印任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:600
+msgid ""
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
+"\n"
+"Really erase these tasks?"
+msgstr ""
+"该操作将永久删除所有标记为完成的任务。如果您继续，您将无法恢复这些任务。\n"
+"\n"
+"确实删除这些任务吗？"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:755
+msgid "Copy..."
+msgstr "复制..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:769
+msgid "_New Task List"
+msgstr "新建任务列表(_N)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:785
+#, fuzzy
+msgid "Refresh the selected task list"
+msgstr "重命名选中文件夹"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:792
+#, fuzzy
+msgid "Rename the selected task list"
+msgstr "重命名选中文件夹"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:797
+msgid "Show _Only This Task List"
+msgstr "只显示此任务列表(_O)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:811
+msgid "Mar_k as Incomplete"
+msgstr "标记为未完成(_K)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:841
+msgid "Delete completed tasks"
+msgstr "删除已完成的任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:932
+msgid "Task _Preview"
+msgstr "任务预览(_P)"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:934
+#, fuzzy
+msgid "Show task preview pane"
+msgstr "显示预览面板"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:955
+#, fuzzy
+msgid "Show task preview below the task list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:962
+#, fuzzy
+msgid "Show task preview alongside the task list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:970
+msgid "Active Tasks"
+msgstr "活动任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:984
+msgid "Completed Tasks"
+msgstr "已完成任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:991
+msgid "Next 7 Days' Tasks"
+msgstr "下一周的任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:998
+msgid "Overdue Tasks"
+msgstr "延期任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1005
+msgid "Tasks with Attachments"
+msgstr "有附件的任务"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1055
+msgid "Print the list of tasks"
+msgstr "打印任务列表"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:1062
+#, fuzzy
+msgid "Preview the list of tasks to be printed"
+msgstr "预览要打印的任务列表"
+
+#: ../modules/calendar/e-task-shell-view-private.c:464
+msgid "Expunging"
+msgstr "销毁"
+
+#: ../modules/calendar/e-task-shell-view-private.c:568
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d 个任务"
+
+#: ../modules/calendar/e-task-shell-view.c:357
+msgid "Delete Tasks"
+msgstr "删除任务"
+
+#. Translators: This is only for multiple messages.
+#: ../modules/mail/e-mail-attachment-handler.c:335
+#, c-format
+msgid "%d attached messages"
+msgstr "%d 个附加的信息"
+
+#: ../modules/mail/e-mail-shell-backend.c:174
+msgctxt "New"
+msgid "_Mail Message"
+msgstr "信件(_M)"
+
+#: ../modules/mail/e-mail-shell-backend.c:176
+msgid "Compose a new mail message"
+msgstr "撰写一封新信"
+
+#: ../modules/mail/e-mail-shell-backend.c:184
+msgctxt "New"
+msgid "Mail _Folder"
+msgstr "邮件文件夹(_F)"
+
+#: ../modules/mail/e-mail-shell-backend.c:186
+msgid "Create a new mail folder"
+msgstr "创建新邮件文件夹"
+
+#: ../modules/mail/e-mail-shell-backend.c:205
+msgid "Mail Accounts"
+msgstr "邮件账户"
+
+#: ../modules/mail/e-mail-shell-backend.c:213
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
+#: ../modules/mail/e-mail-shell-backend.c:221
+msgid "Composer Preferences"
+msgstr "编写器首选项"
+
+#: ../modules/mail/e-mail-shell-backend.c:229
+msgid "Network Preferences"
+msgstr "网络首选项"
+
+#. green
+#: ../modules/mail/e-mail-shell-migrate.c:959
+msgid "To Do"
+msgstr "待办"
+
+#. blue
+#: ../modules/mail/e-mail-shell-migrate.c:960
+msgid "Later"
+msgstr "稍候"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1139
+msgid "Migration"
+msgstr "迁移"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1589
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "无法创建新文件夹“%s”：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1617
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "无法将文件夹“%s”复制为“%s”：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1812
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "无法扫描位于“%s”的已有邮箱：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1818
+#: ../modules/mail/e-mail-shell-migrate.c:2915
+msgid "Migrating Folders"
+msgstr "迁移文件夹"
+
+#: ../modules/mail/e-mail-shell-migrate.c:1819
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"Evolution 任务文件夹的位置和层次与 Evolution 1.x 不同。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:2022
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "无法打开旧的 POP 保留在服务器上的数据“%s”：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2038
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "无法创建 POP3 保留在服务器上的数据目录“%s”：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2070
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "无法复制 POP3 在服务器上保留的数据“%s”：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2541
+#: ../modules/mail/e-mail-shell-migrate.c:2555
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "创建本地邮件存储“%s”失败：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:2916
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"自 Evolution 2.4 之后，Evolution 邮箱文件夹的摘要格式现已移至 SQLite。\n"
+"\n"
+"请稍候，Evolution 正在升迁您的文件夹..."
+
+#: ../modules/mail/e-mail-shell-migrate.c:3013
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "无法在“%s”创建本地邮件文件夹：%s"
+
+#: ../modules/mail/e-mail-shell-migrate.c:3031
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
+"坏。"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:993
+#: ../modules/mail/e-mail-shell-view.c:511
+msgid "_Disable Account"
+msgstr "禁用账户(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:995
+msgid "Disable this account"
+msgstr "禁用这个账户"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1000
+msgid "C_reate Search Folder From Search..."
+msgstr "从头创建搜索文件夹(_R)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1007
+msgid "_Download Messages for Offline Usage"
+msgstr "下载信件以离线使用(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1009
+#, fuzzy
+msgid "Download messages of accounts and folders marked for offline"
+msgstr "为标记为脱机的帐户/文件夹下载信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1014
+msgid "Empty _Trash"
+msgstr "清空回收站(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1016
+#: ../modules/mail/e-mail-shell-view-actions.c:1023
+#, fuzzy
+msgid "Permanently remove all the deleted messages from all folders"
+msgstr "永久删除所有文件夹中的所有已删除的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
+msgid "Fl_ush Outbox"
+msgstr "清空发件箱(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1035
+msgid "_Copy Folder To..."
+msgstr "文件夹复制到(_C)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1037
+msgid "Copy the selected folder into another folder"
+msgstr "把选中的文件夹复制到其它文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1044
+msgid "Permanently remove this folder"
+msgstr "永久删除此文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1049
+msgid "E_xpunge"
+msgstr "销毁(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1051
+msgid "Permanently remove all deleted messages from this folder"
+msgstr "从该文件夹永久删除所有已删除的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1056
+msgid "Mar_k All Messages as Read"
+msgstr "把全部信件标记为已读(_K)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1058
+msgid "Mark all messages in the folder as read"
+msgstr "将此文件夹中的所有信件标记为已读"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1063
+msgid "_Move Folder To..."
+msgstr "文件夹移至(_M)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1065
+msgid "Move the selected folder into another folder"
+msgstr "把选中的文件夹移至其它文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1070
+msgid "_New..."
+msgstr "新建(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1072
+msgid "Create a new folder for storing mail"
+msgstr "创建存储邮件的新文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1079
+msgid "Change the properties of this folder"
+msgstr "更改此文件夹的属性"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1086
+msgid "Refresh the folder"
+msgstr "刷新文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1093
+msgid "Change the name of this folder"
+msgstr "更改此文件夹的名称"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1098
+msgid "Select _All Messages"
+msgstr "选中全部信件(_A)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1100
+msgid "Select all visible messages"
+msgstr "选中所有可见的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1105
+msgid "Select Message _Thread"
+msgstr "选择信件线索(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1107
+msgid "Select all messages in the same thread as the selected message"
+msgstr "把同一线索中的所有信件选择为选中信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1112
+msgid "Select Message S_ubthread"
+msgstr "选择信件子线索(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1114
+msgid "Select all replies to the currently selected message"
+msgstr "选择当前选中信件的所有回复"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1119
+msgid "_Unsubscribe"
+msgstr "退订(_U)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1121
+#, fuzzy
+msgid "Unsubscribe from the selected folder"
+msgstr "重命名选中文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1126
+msgid "_New Label"
+msgstr "新建标签(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1133
+msgid "N_one"
+msgstr "无(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1140
+msgid "Hide _Read Messages"
+msgstr "隐藏已读的信件(_R)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1142
+msgid "Temporarily hide all messages that have already been read"
+msgstr "暂时隐藏所有已读信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1147
+msgid "Hide S_elected Messages"
+msgstr "隐藏选中的信件(_E)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1149
+msgid "Temporarily hide the selected messages"
+msgstr "暂时隐藏选中信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1154
+msgid "Show Hidde_n Messages"
+msgstr "显示隐藏的信件(_N)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1156
+msgid "Show messages that have been temporarily hidden"
+msgstr "显示暂时被隐藏的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1177
+msgid "Cancel the current mail operation"
+msgstr "取消当前邮件操作"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1182
+msgid "Collapse All _Threads"
+msgstr "折叠全部线索(_T)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1184
+msgid "Collapse all message threads"
+msgstr "折叠全部信件线索"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1189
+msgid "E_xpand All Threads"
+msgstr "展开全部线索(_X)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1191
+msgid "Expand all message threads"
+msgstr "展开全部信件线索"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1196
+msgid "_Message Filters"
+msgstr "信件过滤(_M)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1198
+msgid "Create or edit rules for filtering new mail"
+msgstr "创建或编辑过滤新邮件的规则"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1203
+msgid "Search F_olders"
+msgstr "搜索文件夹(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1205
+#, fuzzy
+msgid "Create or edit search folder definitions"
+msgstr "创建或编辑搜索文件夹定义"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
+msgid "_Subscriptions..."
+msgstr "订阅(_S)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1212
+msgid "Subscribe or unsubscribe to folders on remote servers"
+msgstr "订阅或退订远程服务器上的文件夹"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1219
+msgid "F_older"
+msgstr "文件夹(_O)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1226
+msgid "_Label"
+msgstr "标签(_L)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
+msgid "_New Folder..."
+msgstr "新建文件夹(_N)..."
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1290
+msgid "Hide _Deleted Messages"
+msgstr "隐藏已删除的信件(_D)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1292
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
+msgstr "隐藏已删除的信件而不是在上面显示一条线"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
+msgid "Show Message _Preview"
+msgstr "显示信件预览(_P)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#, fuzzy
+msgid "Show message preview pane"
+msgstr "显示信件预览窗口"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
+msgid "_Group By Threads"
+msgstr "按线索分组(_G)"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
+#, fuzzy
+msgid "Threaded message list"
+msgstr "按线索编排的信件列表"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
+msgid "Show message preview below the message list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
+#, fuzzy
+msgid "Show message preview alongside the message list"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1345
+msgid "All Messages"
+msgstr "全部信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1352
+msgid "Important Messages"
+msgstr "重要信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
+msgid "Last 5 Days' Messages"
+msgstr "前五天的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
+msgid "Messages Not Junk"
+msgstr "不是垃圾邮件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
+msgid "Messages with Attachments"
+msgstr "有附件的信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
+msgid "No Label"
+msgstr "无标签"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1387
+msgid "Read Messages"
+msgstr "已读信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1394
+msgid "Recent Messages"
+msgstr "最近信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1401
+msgid "Unread Messages"
+msgstr "未读信件"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1453
+#, fuzzy
+msgid "Subject or Addresses contain"
 msgstr "主题或发送者含有"
 
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
+msgid "All Accounts"
+msgstr "全部账户"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1470
+msgid "Current Account"
+msgstr "当前账户"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1477
+msgid "Current Folder"
+msgstr "当前文件夹"
+
+#: ../modules/mail/e-mail-shell-view-private.c:835
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "已选中 %d 个，"
+
+#: ../modules/mail/e-mail-shell-view-private.c:846
+#, c-format
+msgid "%d deleted"
+msgid_plural "%d deleted"
+msgstr[0] "%d 封已删除"
+
+#: ../modules/mail/e-mail-shell-view-private.c:852
+#: ../modules/mail/e-mail-shell-view-private.c:859
+#, c-format
+msgid "%d junk"
+msgid_plural "%d junk"
+msgstr[0] "%d 封垃圾"
+
+#: ../modules/mail/e-mail-shell-view-private.c:865
+#, c-format
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "%d 封草稿"
+
+#: ../modules/mail/e-mail-shell-view-private.c:871
+#, c-format
+msgid "%d unsent"
+msgid_plural "%d unsent"
+msgstr[0] "%d 封未发"
+
+#: ../modules/mail/e-mail-shell-view-private.c:877
+#, c-format
+msgid "%d sent"
+msgid_plural "%d sent"
+msgstr[0] "%d 封已发"
+
+#: ../modules/mail/e-mail-shell-view-private.c:889
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "，%d 封未读，"
+
+#: ../modules/mail/e-mail-shell-view-private.c:892
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "总共 %d 封"
+
+#: ../modules/mail/e-mail-shell-view.c:509
+msgid "Proxy _Logout"
+msgstr "代理服务器注销(_L)"
+
+#: ../modules/mail/em-composer-prefs.c:477
+msgid "Language(s)"
+msgstr "语言"
+
+#: ../modules/mail/em-mailer-prefs.c:96
+msgid "Every time"
+msgstr "每次"
+
+#: ../modules/mail/em-mailer-prefs.c:97
+msgid "Once per day"
+msgstr "每天一次"
+
+#: ../modules/mail/em-mailer-prefs.c:98
+msgid "Once per week"
+msgstr "每周一次"
+
+#: ../modules/mail/em-mailer-prefs.c:99
+msgid "Once per month"
+msgstr "每月一次"
+
+#: ../modules/mail/em-mailer-prefs.c:221
+msgid "Add Custom Junk Header"
+msgstr "添加自定义垃圾信头"
+
+#: ../modules/mail/em-mailer-prefs.c:225
+msgid "Header Name:"
+msgstr "信头名称："
+
+#: ../modules/mail/em-mailer-prefs.c:226
+msgid "Header Value Contains:"
+msgstr "信头值含有："
+
+#: ../modules/mail/em-mailer-prefs.c:326
+#: ../widgets/table/e-table-click-to-add.c:498
+#: ../widgets/table/e-table-selection-model.c:309
+msgid "Header"
+msgstr "页眉"
+
+#: ../modules/mail/em-mailer-prefs.c:330
+msgid "Contains Value"
+msgstr "包含值"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:723 ../modules/mail/em-mailer-prefs.c:794
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s 插件可用，二进制文件已经安装。"
+
+#. May be a better text
+#: ../modules/mail/em-mailer-prefs.c:731 ../modules/mail/em-mailer-prefs.c:803
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s 插件不可用。请检查软件包是否已安装。"
+
+#: ../modules/mail/em-mailer-prefs.c:767
+#, fuzzy
+msgid "No junk plugin available"
+msgstr "没有可用的垃圾邮件插件"
+
+#: ../modules/mail/em-mailer-prefs.c:1151
+#, fuzzy
+msgid "Date header:"
+msgstr "表头"
+
+#: ../modules/mail/em-mailer-prefs.c:1153
+#, fuzzy
+msgid "Show _original header value"
+msgstr "显示原始大小(_O)"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:1
+msgid "Hello Python"
+msgstr "你好 Python"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python-ui.xml.h:2
+msgid "Python Plugin Loader tests"
+msgstr "Python 插件加载器测试"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:1
+msgid "Python Test Plugin"
+msgstr "Python 测试插件"
+
+#: ../modules/plugin-python/example/org-gnome-hello-python.eplug.xml.h:2
+msgid "Test Plugin for Python EPlugin loader."
+msgstr "Python Eplugin 加载器测试插件。"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
-msgid "Local Address Books"
-msgstr "本地地址簿"
+#, fuzzy
+msgid "Add local address books to Evolution."
+msgstr "列出本地地址簿文件夹"
 
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:2
-msgid "Provides core functionality for local address books."
-msgstr "提供本地地址簿的核心功能。"
+msgid "Local Address Books"
+msgstr "本地地址簿"
 
 #: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
 msgid ""
@@ -15841,22 +15590,16 @@ msgid ""
 "body."
 msgstr "消息主体中的用于附件提醒插件的线索列表。"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:475
-#: ../plugins/templates/templates.c:390
+#: ../plugins/attachment-reminder/attachment-reminder.c:514
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "关键字"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
 msgid "Attachment Reminder"
 msgstr "附件提醒"
 
-#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
-msgid ""
-"Looks for clues in a message for mention of attachments and warns if the "
-"attachment is missing"
-msgstr "在信件中搜索提及附件的线索并在无附件时警告"
-
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
 msgid ""
 "Evolution has found some keywords that suggest that this message should "
@@ -15867,177 +15610,201 @@ msgstr "Evolution 找到一些关键字表明此信件应当包含附件，但�
 msgid "Message has no attachments"
 msgstr "信件无附件"
 
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Add attachment..."
+msgstr "添加附件(_A)..."
+
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Edit Message"
 msgstr "编辑信件(_E)"
 
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid "Reminds you when you forgot to add an attachment to a mail message."
+msgstr ""
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 #, fuzzy
-#| msgid ""
-#| "A formatter plugin which displays audio attachments inline and allows you "
-#| "to play them directly from evolution."
-msgid ""
-"A formatter plugin which displays audio attachments inline and allows you to "
-"play them directly from Evolution."
-msgstr ""
-"一个格式化插件，该插件将就地显示音频附件，允许您从 Evolution 中直接播放。"
+msgid "Inline Audio"
+msgstr "嵌入"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
-msgid "Audio inline plugin"
-msgstr "内嵌音频插件"
+msgid "Play audio attachments directly in mail messages."
+msgstr ""
 
-#: ../plugins/backup-restore/backup-restore.c:127
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "选择 Evolution 备份文件名称"
 
-#: ../plugins/backup-restore/backup-restore.c:156
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "备份后重新启动 Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr "选择要恢复的 Evolution 备份文件名称"
 
-#: ../plugins/backup-restore/backup-restore.c:203
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "恢复后重新启动 Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:276
-msgid "Restore from backup"
-msgstr "从备份中恢复"
-
-#: ../plugins/backup-restore/backup-restore.c:278
+#: ../plugins/backup-restore/backup-restore.c:290
+#, fuzzy
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
-"Calendars, Tasks, Memos, Contacts. \n"
-"It also restores all your personal settings, mail filters etc."
+"Calendars, Tasks, Memos, Contacts. It also restores all your personal "
+"settings, mail filters etc."
 msgstr ""
 "您可以从备份中恢复 Evolution。它能够恢复所有邮件、日历、任务、备忘和联系"
 "人。\n"
 "它还能恢复您的所有的个人设置和邮件过滤器等。"
 
-#: ../plugins/backup-restore/backup-restore.c:284
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "从备份文件中恢复 Evolution(_R)"
 
-#: ../plugins/backup-restore/backup-restore.c:291
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "选择要恢复的 Evolution 存档："
 
-#: ../plugins/backup-restore/backup-restore.c:294
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "选择要恢复的文件"
 
-#: ../plugins/backup-restore/backup.c:66
+#: ../plugins/backup-restore/backup-restore.c:315
+msgid "Restore from backup"
+msgstr "从备份中恢复"
+
+#: ../plugins/backup-restore/backup-restore.c:353
+msgid "_Backup Settings..."
+msgstr "备份设置(_B)..."
+
+#: ../plugins/backup-restore/backup-restore.c:355
+#, fuzzy
+msgid "Backup Evolution data and settings to an archive file"
+msgstr "备份及恢复 Evolution 的数据和设置"
+
+#: ../plugins/backup-restore/backup-restore.c:360
+msgid "R_estore Settings..."
+msgstr "恢复设置(_E)..."
+
+#: ../plugins/backup-restore/backup-restore.c:362
+#, fuzzy
+msgid "Restore Evolution data and settings from an archive file"
+msgstr "备份及恢复 Evolution 的数据和设置"
+
+#: ../plugins/backup-restore/backup.c:62
 msgid "Backup Evolution directory"
 msgstr "备份 Evolution 目录"
 
-#: ../plugins/backup-restore/backup.c:68
+#: ../plugins/backup-restore/backup.c:64
 msgid "Restore Evolution directory"
 msgstr "恢复 Evolution 目录"
 
-#: ../plugins/backup-restore/backup.c:70
+#: ../plugins/backup-restore/backup.c:66
 msgid "Check Evolution Backup"
 msgstr "检查 Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:72
+#: ../plugins/backup-restore/backup.c:68
 msgid "Restart Evolution"
 msgstr "重新启动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:74
+#: ../plugins/backup-restore/backup.c:70
 msgid "With Graphical User Interface"
 msgstr "带图形用户界面"
 
-#: ../plugins/backup-restore/backup.c:125
-#: ../plugins/backup-restore/backup.c:258
+#: ../plugins/backup-restore/backup.c:188
+#: ../plugins/backup-restore/backup.c:250
 msgid "Shutting down Evolution"
 msgstr "关闭 Evolution"
 
-#: ../plugins/backup-restore/backup.c:132
+#: ../plugins/backup-restore/backup.c:195
 msgid "Backing Evolution accounts and settings"
 msgstr "备份 Evolution 的账户及设置"
 
-#: ../plugins/backup-restore/backup.c:136
+#: ../plugins/backup-restore/backup.c:201
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr "备份 Evolution 数据(邮件、联系人、日历、任务、备忘)"
 
-#: ../plugins/backup-restore/backup.c:147
+#: ../plugins/backup-restore/backup.c:212
 msgid "Backup complete"
 msgstr "备份完成"
 
-#: ../plugins/backup-restore/backup.c:152
-#: ../plugins/backup-restore/backup.c:339
+#: ../plugins/backup-restore/backup.c:217
+#: ../plugins/backup-restore/backup.c:238
+#: ../plugins/backup-restore/backup.c:284
 msgid "Restarting Evolution"
 msgstr "重新启动 Evolution"
 
-#: ../plugins/backup-restore/backup.c:262
+#: ../plugins/backup-restore/backup.c:254
 msgid "Backup current Evolution data"
 msgstr "备份当前 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:267
+#: ../plugins/backup-restore/backup.c:259
 msgid "Extracting files from backup"
 msgstr "从备份中提取文件"
 
-#: ../plugins/backup-restore/backup.c:274
+#: ../plugins/backup-restore/backup.c:266
 msgid "Loading Evolution settings"
 msgstr "装入 Evolution 的设置"
 
-#: ../plugins/backup-restore/backup.c:278
+#: ../plugins/backup-restore/backup.c:273
 msgid "Removing temporary backup files"
 msgstr "删除临时备份文件"
 
-#: ../plugins/backup-restore/backup.c:285
+#: ../plugins/backup-restore/backup.c:280
 msgid "Ensuring local sources"
 msgstr "确保本地源"
 
-#: ../plugins/backup-restore/backup.c:455
+#: ../plugins/backup-restore/backup.c:429
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "正在备份到文件夹 %s"
 
-#: ../plugins/backup-restore/backup.c:460
+#: ../plugins/backup-restore/backup.c:434
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "正在从文件夹 %s 中恢复"
 
 #. Backup / Restore only can have GUI. We should restrict the rest
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Backup"
 msgstr "Evolution 备份"
 
-#: ../plugins/backup-restore/backup.c:479
+#: ../plugins/backup-restore/backup.c:454
 msgid "Evolution Restore"
 msgstr "Evolution 恢复"
 
-#: ../plugins/backup-restore/backup.c:514
+#: ../plugins/backup-restore/backup.c:489
 msgid "Backing up Evolution Data"
 msgstr "正在备份 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:515
+#: ../plugins/backup-restore/backup.c:490
 msgid "Please wait while Evolution is backing up your data."
 msgstr "请稍候，Evolution 正在备份您的数据。"
 
-#: ../plugins/backup-restore/backup.c:517
+#: ../plugins/backup-restore/backup.c:492
 msgid "Restoring Evolution Data"
 msgstr "正在恢复 Evolution 数据"
 
-#: ../plugins/backup-restore/backup.c:518
+#: ../plugins/backup-restore/backup.c:493
 msgid "Please wait while Evolution is restoring your data."
 msgstr "请稍候，Evolution 正在恢复您的数据。"
 
-#: ../plugins/backup-restore/backup.c:536
+#: ../plugins/backup-restore/backup.c:511
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "这可能要花一点时间，取决于您帐户中的数据总量。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
-msgid "A plugin for backing up and restore Evolution data and settings."
-msgstr "备份及恢复 Evolution 数据和设置的插件。"
-
 #. the path to the shared library
-#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
-msgid "Backup and restore plugin"
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
+#, fuzzy
+msgid "Backup and Restore"
 msgstr "备份及恢复插件"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
+#, fuzzy
+msgid "Backup and restore your Evolution data and settings."
+msgstr "备份及恢复 Evolution 的数据和设置"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
 msgid "Are you sure you want to close Evolution?"
 msgstr "您确定要关闭 Evolution 吗？"
@@ -16086,85 +15853,82 @@ msgstr ""
 "复只能在 Evolution 未运行时启动。请确保在开始之前您保存和关闭了您的所有的未保"
 "存的窗口。如果您想让 Evolution 在恢复后自动重启动，请启用切换按钮。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup and restore Evolution data and settings"
-msgstr "备份及恢复 Evolution 的数据和设置"
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
-msgid "R_estore Settings..."
-msgstr "恢复设置(_E)..."
-
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "_Backup Settings..."
-msgstr "备份设置(_B)..."
-
-#: ../plugins/bbdb/bbdb.c:615 ../plugins/bbdb/bbdb.c:624
+#: ../plugins/bbdb/bbdb.c:670 ../plugins/bbdb/bbdb.c:679
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:639
-msgid "_Auto-create address book entries when replying to messages"
+#: ../plugins/bbdb/bbdb.c:694
+#, fuzzy
+msgid "Create _address book entries when sending mails"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
 
-#: ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:700
 msgid "Select Address book for Automatic Contacts"
 msgstr "选择自动联系人的地址簿"
 
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:715
 msgid "Instant Messaging Contacts"
 msgstr "即时通讯联系人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:675
+#: ../plugins/bbdb/bbdb.c:730
 msgid "Synchronize contact info and images from Pidgin buddy list"
 msgstr "定时从 Pidgin 好友列表中同步联系人信息和图像"
 
-#: ../plugins/bbdb/bbdb.c:681
+#: ../plugins/bbdb/bbdb.c:736
 msgid "Select Address book for Pidgin buddy list"
 msgstr "选择 Pidgin 好友列表的地址簿"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:692
+#: ../plugins/bbdb/bbdb.c:747
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
+msgid "BBDB"
+msgstr "BBDB"
+
+#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
+#, fuzzy
 msgid ""
+"Takes the gruntwork out of managing your address book.\n"
+"\n"
 "Automatically fills your address book with names and email addresses as you "
-"reply to messages. Also fills in IM contact information from your buddy "
+"reply to messages.  Also fills in IM contact information from your buddy "
 "lists."
 msgstr ""
 "在您回复邮件时自动用姓名和电子邮件地址填入您的地址簿。同时还将填入您好友列表"
 "的即时通讯联系信息。"
 
-#: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
-msgid "BBDB"
-msgstr "BBDB"
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:158
+#, c-format
+msgid "Bogofilter is not available. Please install it first."
+msgstr ""
 
 #. For Translators: The first %s stands for the executable full path with a file name, the second is the error message itself.
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:155
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:162
 #, fuzzy, c-format
 msgid "Error occurred while spawning %s: %s."
 msgstr "打印时发生了错误"
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:179
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:190
 #, c-format
 msgid "Bogofilter child process does not respond, killing..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:181
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:192
 #, c-format
 msgid "Wait for Bogofilter child process interrupted, terminating..."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:200
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:215
 #, c-format
 msgid "Pipe to Bogofilter failed, error code: %d."
 msgstr ""
 
-#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:363
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:397
 msgid "Convert message text to _Unicode"
 msgstr "将信件文本转换为 _Unicode"
 
@@ -16180,151 +15944,187 @@ msgstr ""
 "将信件文本转换到 Unicode UTF-8 以一致化来自于不同字符集的垃圾信件特征。"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
-msgid "Bogofilter Options"
-msgstr "Bogofilter 选项"
+#, fuzzy
+msgid "Bogofilter Junk Filter"
+msgstr "Bogofilter 垃圾选项"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
-msgid "Bogofilter junk plugin"
-msgstr "Bogofilter 垃圾选项"
+msgid "Bogofilter Options"
+msgstr "Bogofilter 选项"
 
 #: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:3
-msgid "Filters junk messages using Bogofilter."
+#, fuzzy
+msgid "Filter junk messages using Bogofilter."
 msgstr "使用 Bogofilter 过滤垃圾信件。"
 
-#. we found the group, change the name based on the actual language
-#: ../plugins/caldav/caldav-source.c:80 ../plugins/caldav/caldav-source.c:92
+#: ../plugins/caldav/caldav-source.c:64
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:348
-#: ../plugins/calendar-http/calendar-http.c:126
+#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL："
 
-#: ../plugins/caldav/caldav-source.c:372
-#: ../plugins/google-account-setup/google-source.c:627
-#: ../plugins/google-account-setup/google-contacts-source.c:311
+#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:415
-#: ../plugins/calendar-http/calendar-http.c:264
-#: ../plugins/calendar-weather/calendar-weather.c:509
-#: ../plugins/google-account-setup/google-source.c:651
-#: ../plugins/google-account-setup/google-contacts-source.c:330
+#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/calendar-file/calendar-file.c:274
+#: ../plugins/calendar-http/calendar-http.c:308
+#: ../plugins/calendar-weather/calendar-weather.c:499
+#: ../plugins/google-account-setup/google-contacts-source.c:322
+#: ../plugins/google-account-setup/google-source.c:717
 msgid "Re_fresh:"
 msgstr "刷新(_F)："
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:1
-msgid "CalDAV Calendar sources"
-msgstr "CalDAV 日历资源"
+msgid "Add CalDAV support to Evolution."
+msgstr ""
 
 #: ../plugins/caldav/org-gnome-evolution-caldav.eplug.xml.h:2
-msgid "CalDAV sources"
+#, fuzzy
+msgid "CalDAV Support"
 msgstr "CalDAV 源"
 
+#: ../plugins/calendar-file/calendar-file.c:208
+#, fuzzy
+msgid "_Customize options"
+msgstr "自定义"
+
+#: ../plugins/calendar-file/calendar-file.c:227
+msgid "File _name:"
+msgstr "文件名(_N)："
+
+#: ../plugins/calendar-file/calendar-file.c:231
+#, fuzzy
+msgid "Choose calendar file"
+msgstr "选择文件"
+
+#: ../plugins/calendar-file/calendar-file.c:279
+#, fuzzy
+msgid "On open"
+msgstr "打开"
+
+#: ../plugins/calendar-file/calendar-file.c:280
+msgid "On file change"
+msgstr "在文件改变时"
+
+#: ../plugins/calendar-file/calendar-file.c:281
+#, fuzzy
+msgid "Periodically"
+msgstr "个人"
+
+#: ../plugins/calendar-file/calendar-file.c:308
+msgid "Force read _only"
+msgstr "强制只读(_O)"
+
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
-msgid "Local Calendars"
-msgstr "装入日历"
+msgid "Add local calendars to Evolution."
+msgstr "添加本地日历到 Evolution。"
 
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:2
-msgid "Provides core functionality for local calendars."
-msgstr "提供本地日历的核心功能。"
+msgid "Local Calendars"
+msgstr "装入日历"
 
-#: ../plugins/calendar-http/calendar-http.c:332
+#: ../plugins/calendar-http/calendar-http.c:369
 msgid "_Secure connection"
 msgstr "安全连接(_S)"
 
-#: ../plugins/calendar-http/calendar-http.c:397
+#: ../plugins/calendar-http/calendar-http.c:455
 msgid "Userna_me:"
 msgstr "用户名(_M)："
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
-msgid "HTTP Calendars"
-msgstr "HTTP 日历"
+msgid "Add web calendars to Evolution."
+msgstr "添加网络日历到 Evolution。"
 
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:2
-msgid "Provides core functionality for webcal and http calendars."
-msgstr "提供 webcal 和 http 日历的核心功能。"
+msgid "Web Calendars"
+msgstr "网络日历"
 
-#: ../plugins/calendar-weather/calendar-weather.c:61
+#: ../plugins/calendar-weather/calendar-weather.c:60
 msgid "Weather: Fog"
 msgstr "天气：雾"
 
-#: ../plugins/calendar-weather/calendar-weather.c:62
+#: ../plugins/calendar-weather/calendar-weather.c:61
 msgid "Weather: Cloudy"
 msgstr "天气：多云"
 
-#: ../plugins/calendar-weather/calendar-weather.c:63
-#, fuzzy
-#| msgid "Weather: Cloudy"
+#: ../plugins/calendar-weather/calendar-weather.c:62
 msgid "Weather: Cloudy Night"
-msgstr "天气：多云"
+msgstr "天气： 夜间多云"
 
-#: ../plugins/calendar-weather/calendar-weather.c:64
-#, fuzzy
-#| msgid "Weather: Rain"
+#: ../plugins/calendar-weather/calendar-weather.c:63
 msgid "Weather: Overcast"
-msgstr "天气：雨"
+msgstr "天气： 阴"
 
-#: ../plugins/calendar-weather/calendar-weather.c:65
-#, fuzzy
-#| msgid "Weather: Snow"
+#: ../plugins/calendar-weather/calendar-weather.c:64
 msgid "Weather: Showers"
-msgstr "天气：雪"
+msgstr "天气： 阵雨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:66
+#: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Snow"
 msgstr "天气：雪"
 
-#: ../plugins/calendar-weather/calendar-weather.c:67
+#: ../plugins/calendar-weather/calendar-weather.c:66
 msgid "Weather: Sunny"
 msgstr "天气：晴"
 
-#: ../plugins/calendar-weather/calendar-weather.c:68
-#, fuzzy
-#| msgid "Weather Calendars"
+#: ../plugins/calendar-weather/calendar-weather.c:67
 msgid "Weather: Clear Night"
-msgstr "天气月历"
+msgstr "天气： 夜间晴"
 
-#: ../plugins/calendar-weather/calendar-weather.c:69
+#: ../plugins/calendar-weather/calendar-weather.c:68
 msgid "Weather: Thunderstorms"
 msgstr "天气：暴风雨"
 
-#: ../plugins/calendar-weather/calendar-weather.c:230
+#: ../plugins/calendar-weather/calendar-weather.c:221
 msgid "Select a location"
 msgstr "选择一个位置"
 
-#: ../plugins/calendar-weather/calendar-weather.c:615
+#: ../plugins/calendar-weather/calendar-weather.c:597
 msgid "_Units:"
 msgstr "单位(_U)："
 
-#: ../plugins/calendar-weather/calendar-weather.c:622
+#: ../plugins/calendar-weather/calendar-weather.c:604
 msgid "Metric (Celsius, cm, etc)"
 msgstr "公制(摄氏、厘米等等)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:623
+#: ../plugins/calendar-weather/calendar-weather.c:605
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(华氏、英寸等等)"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:1
-msgid "Provides core functionality for weather calendars."
-msgstr "提供了天气日历的核心功能。"
+msgid "Add weather calendars to Evolution."
+msgstr "添加天气日历到 Evolution。"
 
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "天气月历"
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a popup menu plugin which lets you copy "
-"things to the clipboard."
-msgstr "一个测试插件，它将显示允许您将文字复制到剪贴板的弹出菜单插件。"
+#: ../plugins/contacts-map/contacts-map.c:59
+#: ../plugins/contacts-map/contacts-map.c:193
+#, fuzzy
+msgid "Contacts map"
+msgstr "联系人："
 
-#: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
-msgid "Copy tool"
-msgstr "复制工具"
+#: ../plugins/contacts-map/contacts-map.c:60
+#, fuzzy
+msgid "Show a map of all the contacts"
+msgstr "在信件列表下方显示信件预览"
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:1
+msgid "Add a map showing the location of contacts when possible."
+msgstr ""
+
+#: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
+#, fuzzy
+msgid "Map for contacts"
+msgstr "无联系人"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
@@ -16336,35 +16136,35 @@ msgid ""
 msgstr "每次启动 Evolution 的时候，检查它是否是默认邮件程序。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
-msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "启动时检查 Evolution 是否是默认的邮件客户端。"
+msgid "Check whether Evolution is the default mail client on startup."
+msgstr "在启动时检查 Evolution 是不是默认的邮件客户端。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
-msgid "Default Mail Client "
+msgid "Default Mail Client"
 msgstr "默认邮件客户端"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是否想要将 Evolution 设置为您的默认电子邮件客户端？"
 
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:599
-msgid "Evolution"
-msgstr "Evolution"
-
-#: ../plugins/default-source/default-source.c:82
+#: ../plugins/default-source/default-source.c:94
 msgid "Mark as _default address book"
 msgstr "标为默认地址簿(_D)"
 
-#: ../plugins/default-source/default-source.c:103
+#: ../plugins/default-source/default-source.c:119
+#, fuzzy
+msgid "A_utocomplete with this address book"
+msgstr "在地址簿中查阅"
+
+#: ../plugins/default-source/default-source.c:138
 msgid "Mark as _default calendar"
 msgstr "标为默认日历(_D)"
 
-#: ../plugins/default-source/default-source.c:104
+#: ../plugins/default-source/default-source.c:139
 msgid "Mark as _default task list"
 msgstr "标为默认任务列表(_D)"
 
-#: ../plugins/default-source/default-source.c:105
+#: ../plugins/default-source/default-source.c:140
 msgid "Mark as _default memo list"
 msgstr "标为默认备忘列表(_D)"
 
@@ -16373,44 +16173,9 @@ msgid "Default Sources"
 msgstr "默认源"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid ""
-"Provides functionality for marking a calendar or an address book as the "
-"default one."
-msgstr "提供了将日历或地址簿标为默认日历或地址簿的功能。"
-
-#: ../plugins/email-custom-header/email-custom-header.c:560
-msgid "_Custom Header"
-msgstr "自定义信头(_C)"
-
-#: ../plugins/email-custom-header/email-custom-header.c:881
-msgid "Key"
-msgstr "键"
-
-#: ../plugins/email-custom-header/email-custom-header.c:892
-#: ../plugins/templates/templates.c:396
-msgid "Values"
-msgstr "值"
-
-#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.glade.h:2
-msgid ""
-"The format for specifying a Custom Header key value is:\n"
-"Name of the Custom Header key values separated by \";\"."
-msgstr ""
-
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.glade.h:1
-msgid "Email Custom Header"
-msgstr "自定义信头"
-
-#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
-msgid "Adds custom header to outgoing messages."
+msgid "Mark your preferred address book and calendar as default."
 msgstr ""
 
-#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
-msgid "Custom Header"
-msgstr "自定义信头"
-
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
 msgid "List of Custom Headers"
 msgstr "自定义信头列表"
@@ -16422,1033 +16187,216 @@ msgid ""
 "custom header followed by \"=\" and the values separated by \";\""
 msgstr ""
 
-#. Translators: '=' and ';' should not be changed but ASCII
-#: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:4
-msgid ""
-"[Security=Personal;Unclassified;Protected;InConfidence;Secret;Topsecret]"
-msgstr ""
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "打开其他用户的文件夹"
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:2
-msgid "_Account:"
-msgstr "账户(_A)："
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "文件夹名称(_F)："
-
-#: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:4
-msgid "_User:"
-msgstr "用户(_U)："
-
-#. i18n: "Secure Password Authentication" is an Outlookism
-#: ../plugins/exchange-operations/exchange-account-setup.c:63
-msgid "Secure Password"
-msgstr "安全密码"
-
-#. i18n: "NTLM" probably doesn't translate
-#: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid ""
-"This option will connect to the Exchange server using secure password (NTLM) "
-"authentication."
-msgstr "此选项将使用安全密码(NTLM)身份验证连接到 Exchange 服务器。"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:74
-msgid "Plaintext Password"
-msgstr "纯文本密码"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid ""
-"This option will connect to the Exchange server using standard plaintext "
-"password authentication."
-msgstr "此选项将使用标准的纯文本密码身份验证连接到 Exchange 服务器。"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:272
-msgid "Out Of Office"
-msgstr "办公室以外"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
-msgid ""
-"The message specified below will be automatically sent to \n"
-"each person who sends mail to you while you are out of the office."
-msgstr ""
-"在您位于办公室外时，如果有人给您发送邮件，则会自动将下面指定的信件\n"
-"送回。"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:291
-#: ../plugins/exchange-operations/exchange-account-setup.c:296
-msgid "I am out of the office"
-msgstr "我正在办公室外"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:292
-#: ../plugins/exchange-operations/exchange-account-setup.c:295
-msgid "I am in the office"
-msgstr "我正在办公室内"
-
-#. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:343
-msgid "Change the password for Exchange account"
-msgstr "更改 Exchange 账户的密码"
+#: ../plugins/email-custom-header/email-custom-header.c:318
+msgid "Security:"
+msgstr "安全："
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:345
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:1
-msgid "Change Password"
-msgstr "更改密码"
+#: ../plugins/email-custom-header/email-custom-header.c:323
+msgid "Unclassified"
+msgstr "未分类"
 
-#. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:350
-msgid "Manage the delegate settings for Exchange account"
-msgstr "管理 Exchange 账户的代理设置"
+#: ../plugins/email-custom-header/email-custom-header.c:324
+msgid "Protected"
+msgstr "受保护的"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:352
-msgid "Delegation Assistant"
-msgstr "代理助手"
-
-#. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:364
-msgid "Miscelleneous"
-msgstr "杂项"
-
-#. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:374
-msgid "View the size of all Exchange folders"
-msgstr "查看所有 Exchange 文件夹的大小"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:376
-msgid "Folders Size"
-msgstr "文件夹大小"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:383
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
-msgid "Exchange Settings"
-msgstr "Exchange 设置"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:730
-msgid "_OWA URL:"
-msgstr "_OWA URL："
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:756
-msgid "A_uthenticate"
-msgstr "身份验证(_U)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:777
-msgid "S_pecify the mailbox name"
-msgstr "指定邮箱名(_P)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:790
-msgid "_Mailbox:"
-msgstr "邮件(_M)："
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1005
-msgid "_Authentication Type"
-msgstr "身份验证类型(_A)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1019
-msgid "Ch_eck for Supported Types"
-msgstr "检查支持的类型(_E)"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1134
-#: ../plugins/exchange-operations/exchange-contacts.c:217
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../plugins/exchange-operations/exchange-account-setup.c:1136
-#: ../plugins/exchange-operations/exchange-contacts.c:219
-#, c-format
-msgid "0 KB"
-msgstr "0 KB"
-
-#: ../plugins/exchange-operations/exchange-calendar.c:196
-#: ../plugins/exchange-operations/exchange-contacts.c:170
-msgid ""
-"Evolution is in offline mode. You cannot create or modify folders now.\n"
-"Please switch to online mode for such operations."
-msgstr ""
-"Evolution 正处于脱机模式。您目前无法创建或修改文件夹。\n"
-"要执行这些操作，请切换到联机模式。"
-
-#. User entered a wrong existing
-#. * password. Prompt him again.
-#.
-#: ../plugins/exchange-operations/exchange-change-password.c:114
-msgid ""
-"The current password does not match the existing password for your account. "
-"Please enter the correct password"
-msgstr "当前密码与您账户的已有密码不匹配。请输入正确的密码。"
-
-#: ../plugins/exchange-operations/exchange-change-password.c:121
-msgid "The two passwords do not match. Please re-enter the passwords."
-msgstr "两个密码不匹配。请重新输入密码。"
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:2
-msgid "Confirm Password:"
-msgstr "确认密码："
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:3
-msgid "Current Password:"
-msgstr "当前密码："
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:4
-msgid "New Password:"
-msgstr "新建密码："
-
-#: ../plugins/exchange-operations/exchange-change-password.glade.h:5
-msgid "Your current password has expired. Please change your password now."
-msgstr "您目前的密码已经过期。请立即更改您的密码。"
-
-#: ../plugins/exchange-operations/exchange-config-listener.c:660
-#, c-format
-msgid "Your password will expire in the next %d days"
-msgstr "您的密码即将于 %d 后过期"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:154
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:570
-msgid "Custom"
-msgstr "自定义"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:184
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "编辑(读取、创建、编辑)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:188
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "作者(读取、创建)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:192
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "复查者(只读)"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:242
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:6
-msgid "Delegate Permissions"
-msgstr "代理权限"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:253
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:178
-#, c-format
-msgid "Permissions for %s"
-msgstr "%s 的权限"
-
-#. To translators: This is a part of the message to be sent to the delegatee
-#. summarizing the permissions assigned to him.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:343
-msgid ""
-"This message was sent automatically by Evolution to inform you that you have "
-"been designated as a delegate. You can now send messages on my behalf."
-msgstr ""
-"这封信是 Evolution 自动发送的，目的在于通知你已经被授权为我的代理人。你现在可"
-"以以我的身份发送邮件。"
-
-#. To translators: Another chunk of the same message.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:348
-msgid "You have been given the following permissions on my folders:"
-msgstr "你在我的文件夹上拥有下列权限："
-
-#. To translators: This message is included if the delegatee has been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:366
-msgid "You are also permitted to see my private items."
-msgstr "你还可以查看我的私人项目。"
-
-#. To translators: This message is included if the delegatee has not been given access
-#. to the private items.
-#.
-#: ../plugins/exchange-operations/exchange-delegates-user.c:373
-msgid "However you are not permitted to see my private items."
-msgstr "但是你不能查看我的私人项目。"
-
-#: ../plugins/exchange-operations/exchange-delegates-user.c:405
-#, c-format
-msgid "You have been designated as a delegate for %s"
-msgstr "您现在已经被授权为 %s 的代理人"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:417
-msgid "Delegate To"
-msgstr "授权给"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:582
-#, c-format
-msgid "Remove the delegate %s?"
-msgstr "删除代理人 %s 吗？"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:700
-msgid "Could not access Active Directory"
-msgstr "无法访问 Active Directory"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:712
-msgid "Could not find self in Active Directory"
-msgstr "无法在 Active Directory 中找到自己"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:725
-#, c-format
-msgid "Could not find delegate %s in Active Directory"
-msgstr "无法在 Active Directory 中找到代理人 %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:737
-#, c-format
-msgid "Could not remove delegate %s"
-msgstr "无法删除代理人 %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:797
-msgid "Could not update list of delegates."
-msgstr "无法更新代理人。"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:815
-#, c-format
-msgid "Could not add delegate %s"
-msgstr "无法添加代理人 %s"
-
-#: ../plugins/exchange-operations/exchange-delegates.c:983
-msgid "Error reading delegates list."
-msgstr "读取代理人列表出错。"
-
-#. Translators: This is used for permissions for <user> for the folder Calendar.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:3
-msgid "C_alendar:"
-msgstr "日历(_A)："
-
-#. Translators: This is used for permissions for <user> for the folder Contacts.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:5
-msgid "Co_ntacts:"
-msgstr "联系人(_N)："
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:7
-msgid "Delegates"
-msgstr "代理"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:10
-msgid "Permissions for"
-msgstr "权限"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:12
-msgid ""
-"These users will be able to send mail on your behalf\n"
-"and access your folders with the permissions you give them."
-msgstr "这些用户将可以按照您指定的权限以您的身份发送邮件并访问您的文件夹。"
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:14
-msgid "_Delegate can see private items"
-msgstr "代理可查看私有项目(_D)"
-
-#. Translators: This is used for permissions for <user> for the folder Inbox.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:17
-msgid "_Inbox:"
-msgstr "收件箱(_I)："
-
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
-msgid "_Summarize permissions"
-msgstr "总结权限(_S)"
-
-#. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
-msgid "_Tasks:"
-msgstr "任务(_T)："
-
-#: ../plugins/exchange-operations/exchange-folder-permission.c:62
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:2
-msgid "Permissions..."
-msgstr "权限..."
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:130
-msgid "Folder Name"
-msgstr "文件夹名称"
-
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:134
-msgid "Folder Size"
-msgstr "文件夹大小"
-
-#. FIXME Limit to one user
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:78
-msgid "User"
-msgstr "用户"
-
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:321
-#: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
-msgid "Subscribe to Other User's Folder"
-msgstr "订阅其他用户的文件夹"
-
-#: ../plugins/exchange-operations/exchange-folder-tree.glade.h:1
-msgid "Exchange Folder Tree"
-msgstr "Exchange 文件夹树"
-
-#: ../plugins/exchange-operations/exchange-folder.c:67
-#: ../plugins/exchange-operations/exchange-folder.c:236
-#: ../plugins/exchange-operations/exchange-folder.c:246
-msgid "Unsubscribe Folder..."
-msgstr "退订文件夹..."
-
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:521
-#, c-format
-msgid "Really unsubscribe from folder \"%s\"?"
-msgstr "真的要退订文件夹“%s”吗？"
-
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:533
-#, c-format
-msgid "Unsubscribe from \"%s\""
-msgstr "退订“%s”"
-
-#: ../plugins/exchange-operations/exchange-oof.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"
-"您想要将您的状态更改为“办公室内”吗？"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>办公室以外信件：</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>状态：</b>"
-
-#: ../plugins/exchange-operations/exchange-oof.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>"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "我正在办公室内"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "我正在办公室外"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "不，请不要更改状态"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "离开办公室助手"
-
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "是，更改状态"
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
-msgid "Password Expiry Warning..."
-msgstr "密码过期警告..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:2
-msgid "Your password will expire in 7 days..."
-msgstr "您的密码即将于 7 天后过期..."
-
-#: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:3
-msgid "_Change Password"
-msgstr "更改密码(_C)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:295
-msgid "(Permission denied.)"
-msgstr "(权限被禁止。)"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-msgid "Add User:"
-msgstr "添加用户："
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.c:403
-#: ../plugins/exchange-operations/exchange-send-options.c:410
-#: ../plugins/groupwise-features/proxy.c:937
-#: ../plugins/groupwise-features/share-folder.c:716
-msgid "Add User"
-msgstr "添加用户"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
-msgid "<b>Permissions</b>"
-msgstr "<b>权限</b>"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:2
-msgid "Cannot Delete"
-msgstr "无法删除"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:3
-msgid "Cannot Edit"
-msgstr "无法编辑"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:4
-msgid "Create items"
-msgstr "创建项目"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:5
-msgid "Create subfolders"
-msgstr "创建子文件夹"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:6
-msgid "Delete Any Items"
-msgstr "删除任何项目"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:7
-msgid "Delete Own Items"
-msgstr "删除自有项目"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:8
-msgid "Edit Any Items"
-msgstr "编辑任何项目"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:9
-msgid "Edit Own Items"
-msgstr "编辑自有项目"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:10
-msgid "Folder contact"
-msgstr "文件夹联系人"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:11
-msgid "Folder owner"
-msgstr "文件夹所有者"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:12
-msgid "Folder visible"
-msgstr "文件夹可见"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:13
-msgid "Read items"
-msgstr "读取项目"
-
-#: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:14
-msgid "Role: "
-msgstr "角色："
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:1
-msgid "<b>Message Settings</b>"
-msgstr "<b>信件设置</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:2
-msgid "<b>Tracking Options</b>"
-msgstr "<b>跟踪选项</b>"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:3
-msgid "Exchange - Send Options"
-msgstr "Exchange - 发送选项"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:4
-msgid "I_mportance: "
-msgstr "重要(_M)："
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:5
-msgid ""
-"Normal\n"
-"High\n"
-"Low"
-msgstr ""
-"普通\n"
-"高\n"
-"低"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:8
-msgid ""
-"Normal\n"
-"Personal\n"
-"Private\n"
-"Confidential"
-msgstr ""
-"普通\n"
-"个人\n"
-"私密\n"
-"机密"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:12
-msgid "Request a _delivery receipt for this message"
-msgstr "这封信需要投递收条(_D)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:13
-msgid "Request a _read receipt for this message"
-msgstr "这封信需要阅读收条(_R)"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:14
-msgid "Send as Delegate"
-msgstr "以代表身份发送"
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
-msgid "_Sensitivity: "
-msgstr "敏感度(_S)："
-
-#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
-msgid "_User"
-msgstr "用户(_U)"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:136
-msgid "Select User"
-msgstr "选择用户"
-
-#: ../plugins/exchange-operations/exchange-user-dialog.c:174
-msgid "Address Book..."
-msgstr "地址簿..."
-
-#: ../plugins/exchange-operations/org-gnome-exchange-ab-subscription.xml.h:1
-msgid "Subscribe to Other User's Contacts"
-msgstr "订阅其他用户的联系人"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-cal-subscription.xml.h:1
-msgid "Subscribe to Other User's Calendar"
-msgstr "订阅其他用户的日历"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid ""
-"A plugin that manages a collection of Exchange account specific operations "
-"and features."
-msgstr "管理一组 Exchange 帐户特定操作和特性的插件。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
-msgid "Exchange Operations"
-msgstr "Exchange 操作"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:1
-msgid "Cannot access the \"Exchange settings\" tab in offline mode."
-msgstr ""
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:2
-msgid "Cannot change password due to configuration problems."
-msgstr "因为配置文件问题无法更改密码。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Cannot display folders."
-msgstr "无法显示文件夹。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
-msgid "Cannot perform the operation."
-msgstr "无法执行操作。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:5
-msgid ""
-"Changes to options for Exchange account \"{0}\" will only take effect after "
-"restarting Evolution."
-msgstr "对 Exchange 账户“{0}”配置的更改将在您退出并重新启动 Evolution 后生效。"
+#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../widgets/misc/e-send-options.ui.h:17
+msgid "Secret"
+msgstr "机密"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:6
-msgid "Could not authenticate to server."
-msgstr "无法认证到服务器。"
+#: ../plugins/email-custom-header/email-custom-header.c:327
+msgid "Top secret"
+msgstr "绝密"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:7
-msgid "Could not change password."
-msgstr "无法更改密码。"
+#: ../plugins/email-custom-header/email-custom-header.c:569
+msgid "_Custom Header"
+msgstr "自定义信头(_C)"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:8
+#. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
-"Could not configure Exchange account because \n"
-"an unknown error occurred. Check the URL, \n"
-"username, and password, and try again."
+"The format for specifying a Custom Header key value is:\n"
+"Name of the Custom Header key values separated by \";\"."
 msgstr ""
-"无法配置 Exchange 账户，原因是发生了未知错误。请检查 URL、用户名、密码，然后"
-"再试一次。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:11
-msgid "Could not connect to Exchange server."
-msgstr "无法连接到 Exchange 服务器。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
-msgid "Could not connect to server {0}."
-msgstr "无法连接到服务器 {0}。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:13
-msgid "Could not determine folder permissions for delegates."
-msgstr "无法确定代理人的文件夹权限。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:14
-msgid "Could not find Exchange Web Storage System."
-msgstr "找不到 Exchange Web 存储系统。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:15
-msgid "Could not locate server {0}."
-msgstr "无法定位服务器 {0}。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:16
-msgid "Could not make {0} a delegate"
-msgstr "无法授权给 {0}"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
-msgid "Could not read folder permissions"
-msgstr "无法读取文件夹权限"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:18
-msgid "Could not read folder permissions."
-msgstr "无法读取文件夹权限。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:19
-msgid "Could not read out-of-office state"
-msgstr "无法读取不在办公室状态"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:20
-msgid "Could not update folder permissions."
-msgstr "无法更新文件夹权限。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:21
-msgid "Could not update out-of-office state"
-msgstr "无法更新不在办公室状态"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:22
-msgid "Evolution requires a restart to load the subscribed user's mailbox"
-msgstr ""
+#: ../plugins/email-custom-header/email-custom-header.c:948
+msgid "Key"
+msgstr "键"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:23
-msgid "Exchange Account is offline."
-msgstr "Exchange 账户脱机。"
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
+msgid "Values"
+msgstr "值"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:24
-msgid ""
-"Exchange Connector requires access to certain\n"
-"functionality on the Exchange Server that appears\n"
-"to be disabled or blocked. (This is usually \n"
-"unintentional.) Your Exchange Administrator will \n"
-"need to enable this functionality in order for \n"
-"you to be able to use Evolution Exchange Connector.\n"
-"\n"
-"For information to provide to your Exchange \n"
-"administrator, please follow the link below:\n"
-"\n"
-"{0}\n"
-"  "
+#. For Translators: 'custom header' string is used while adding a new message header to outgoing message, to specify what value for the message header would be added
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:2
+msgid "Add custom headers to outgoing mail messages."
 msgstr ""
-"Exchange Connector 需要访问 Exchange 服务器上的特定功能，但功能已经被无意间禁"
-"用或屏蔽。您的 Exchange 管理员需要启用此功能，才能让您使用 Ximian "
-"Connector。\n"
-"\n"
-"要获得提供给您 Exchange 管理员的信息，请浏览下列链接：\n"
-"\n"
-"{0}\n"
-"  "
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:36
-msgid "Failed to update delegates:"
-msgstr "更新代理人失败："
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-msgid "Folder already exists"
-msgstr "文件夹已经存在"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "Folder does not exist"
-msgstr "文件夹不存在"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
-msgid "Folder offline"
-msgstr "文件夹脱机"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:40
-#: ../shell/e-shell.c:1269
-msgid "Generic error"
-msgstr "常规错误"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
-msgid "Global Catalog Server is not reachable"
-msgstr "全局目录服务器无法访问"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
-msgid ""
-"If OWA is running on a different path, you must specify that in the account "
-"configuration dialog."
-msgstr "如果 OWA 运行于不同的路径上，您必须在账户配置对话框中指定该路径。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:43
-msgid "Mailbox for {0} is not on this server."
-msgstr "{0} 的邮箱不在此服务器上。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:44
-msgid "Make sure the URL is correct and try again."
-msgstr "请确定 URL 正确，然后再试一次。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:45
-msgid "Make sure the server name is spelled correctly and try again."
-msgstr "请确定服务器名称拼写正确，然后再试一次。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
-msgid "Make sure the username and password are correct and try again."
-msgstr "请确定用户名和密码正确，然后再试一次。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
-msgid "No Global Catalog server configured for this account."
-msgstr "没有为此账户配置全局编目服务器。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:48
-msgid "No mailbox for user {0} on {1}."
-msgstr "用户 {0} 在 {1} 上没有邮箱。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
-msgid "No such user {0}"
-msgstr "没有用户 {0}"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
-msgid "Password successfully changed."
-msgstr "密码已经成功更改。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
-msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
-msgstr "请输入一个代理人 ID 或取消选中“以代理人身份发送”选项。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
-msgid "Please make sure the Global Catalog Server name is correct."
-msgstr "请确定全局目录服务器名称正确。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
-msgid "Please restart Evolution for changes to take effect"
-msgstr "请重新启动 Evolution 以便使得更改生效"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
-msgid "Please select a user."
-msgstr "请选择用户。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
-msgid "Server rejected password because it is too weak."
-msgstr "服务器拒绝了密码，因为该密码的安全级别太低。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
-msgid "The Exchange account will be disabled when you quit Evolution"
-msgstr "当您退出 Evolution 时，Exchange 账户将被禁用"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
-msgid "The Exchange account will be removed when you quit Evolution"
-msgstr "当您退出 Evolution 时 Exchange 账户将被删除"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.eplug.xml.h:3
+msgid "Custom Header"
+msgstr "自定义信头"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
-msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "Exchange 服务器与 Exchange Connector 不兼容。"
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:1
+msgid "Email Custom Header"
+msgstr "自定义信头"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
-msgid ""
-"The server is running Exchange 5.5. Exchange Connector \n"
-"supports Microsoft Exchange 2000 and 2003 only."
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+msgid "Automatically launch editor when key is pressed in the mail composer"
 msgstr ""
-"服务器正在运行 Exchange 5.5。Exchange Connector 只支持 Microsoft Exchange "
-"2000 和 2003。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:62
-msgid ""
-"This probably means that your server requires \n"
-"you to specify the Windows domain name \n"
-"as part of your username (eg, &quot;DOMAIN\\user&quot;).\n"
-"\n"
-"Or you might have just typed your password wrong."
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/external-editor.c:119
+msgid "Automatically launch when a new mail is edited"
 msgstr ""
-"这可能意味着您的服务器需要您将 Windows 域名作为用户名的一部分(如“DOMAIN"
-"\\user”)。\n"
-"\n"
-"或者，您可能拼错了密码。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
-msgid "Try again with a different password."
-msgstr "请用不同的密码再试一次。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
-msgid "Unable to add user to access control list:"
-msgstr "无法将用户添加到访问控制列表中："
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
-msgid "Unable to edit delegates."
-msgstr "无法编辑代理人。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
-msgid "Unknown error looking up {0}"
-msgstr "查阅 {0} 时发生未知错误"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
-#: ../plugins/google-account-setup/google-source.c:540
-msgid "Unknown error."
-msgstr "未知错误。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Unknown type"
-msgstr "未知类型"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Unsupported operation"
-msgstr "不支持的操作"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-msgid "You are nearing your quota available for storing mail on this server."
-msgstr "您即将用完您在此服务器上的存储邮件的配额。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
-msgid ""
-"You are permitted to send a message on behalf of only one delegator at a "
-"time."
-msgstr "您被允许每次只能够以一个(而非多个)代理人的身份发送信件。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
-msgid "You cannot make yourself your own delegate"
-msgstr "您不能授权给您自己"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
-msgid "You have exceeded your quota for storing mail on this server."
-msgstr "您已经超过了在此服务器上存储邮件的配额。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
-msgid "You may only configure a single Exchange account."
-msgstr "您只能配置单个 Exchange 账户。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
-msgid ""
-"Your current usage is: {0} KB. Try to clear up some space by deleting some "
-"mail."
-msgstr "您目前使用了 {0} KB。试着通过删除邮件来清理一些空间。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
-msgid ""
-"Your current usage is: {0} KB. You will not be able to either send or "
-"receive mail now."
-msgstr "您目前使用了 {0} KB。您现在既不能发送也不能接收邮件。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
-msgid ""
-"Your current usage is: {0} KB. You will not be able to send mail until you "
-"clear up some space by deleting some mail."
-msgstr "您目前使用了 {0} KB。您将无法发送邮件，除非您通过删除邮件来清理空间。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
-msgid "Your password has expired."
-msgstr "您的密码已经过期。"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
-msgid "{0} cannot be added to an access control list"
-msgstr "{0} 无法添加到访问控制列表中"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:85
-msgid "{0} is already a delegate"
-msgstr "{0} 已被授权"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:86
-msgid "{0} is already in the list"
-msgstr "{0} 已经在列表中"
-
-#: ../plugins/exchange-operations/org-gnome-exchange-tasks-subscription.xml.h:1
-msgid "Subscribe to Other User's Tasks"
-msgstr "订阅其他用户的任务"
-
-#: ../plugins/exchange-operations/org-gnome-folder-permissions.xml.h:1
-msgid "Check folder permissions"
-msgstr "更改文件夹权限"
-
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:1
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:3
 msgid "Default External Editor"
 msgstr "默认外部编辑器"
 
-#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:2
+#: ../plugins/external-editor/apps-evolution-external-editor.schemas.in.h:4
 msgid "The default command that must be used as the editor."
 msgstr "默认命令必须用作编辑器。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+#: ../plugins/external-editor/external-editor.c:108
+msgid "Command to be executed to launch the editor: "
+msgstr "调用编辑器要执行的命令："
+
+#: ../plugins/external-editor/external-editor.c:109
 msgid ""
-"A plugin for using an external editor as the composer. You can send only "
-"plain-text messages."
-msgstr "一个使用外部编辑器作为撰写器的插件。您只能发送纯文本信件。"
+"For Emacs use \"xemacs\"\n"
+"For VI use \"gvim -f\""
+msgstr ""
+"Emacs 应使用“xemacs”\n"
+"VI 应使用“gvim -f”"
 
-#. the path to the shared library
-#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+#: ../plugins/external-editor/external-editor.c:375
+#: ../plugins/external-editor/external-editor.c:377
+msgid "Compose in External Editor"
+msgstr "在外部编辑器中写作"
+
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
 msgid "External Editor"
 msgstr "外部编辑器"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:1
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:2
+#, fuzzy
+msgid "Use an external editor to compose plain-text mail messages."
+msgstr "一个使用外部编辑器作为撰写器的插件。您只能发送纯文本信件。"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:1
 msgid "Cannot create Temporary File"
 msgstr "无法创建临时保存文件"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:2
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:2
 msgid "Editor not launchable"
 msgstr "编辑器不可调用"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:3
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:3
 msgid ""
 "Evolution is unable to create a temporary file to save your mail. Retry "
 "later."
 msgstr "Evolution 无法创建临时文件来保存您的邮件。请稍候再试。"
 
-#: ../plugins/external-editor/org-gnome-external-editor-errors.xml.h:4
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:4
+msgid "External editor still running"
+msgstr "外部编辑器还在运行"
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:5
+msgid ""
+"The external editor is still running. The mail composer window cannot be "
+"closed as long as the editor is active."
+msgstr ""
+
+#: ../plugins/external-editor/org-gnome-external-editor.error.xml.h:6
 msgid ""
 "The external editor set in your plugin preferences cannot be launched. Try "
 "setting a different editor."
 msgstr "您在插件首选项中设定的外部编辑器无法调用，请尝试设置另外一个编辑器。"
 
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
-msgid "Compose in _External Editor"
-msgstr "在外部编辑器中写作(_E)"
-
-#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
-msgid "Compose messages using an external editor"
-msgstr "使用外部编辑器写作信件"
-
-#: ../plugins/external-editor/external-editor.c:112
-msgid "Command to be executed to launch the editor: "
-msgstr "调用编辑器要执行的命令："
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:1
+msgid "Insert Face picture by default"
+msgstr ""
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/face/apps_evolution_eplugin_face.schemas.in.h:2
 msgid ""
-"For Emacs use \"xemacs\"\n"
-"For VI use \"gvim\""
+"Whether insert Face picture to outgoing messages by default. The picture "
+"should be set before checking this, otherwise nothing happens."
 msgstr ""
-"Emacs 应使用“xemacs”\n"
-"VI 应使用“gvim”"
 
-#: ../plugins/face/face.c:59
-msgid "Select a (48*48) png of size < 700bytes"
+#: ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "未知的错误"
+
+#: ../plugins/face/face.c:286
+#, fuzzy
+msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "选择一个小于 700B 的 48*48 的 PNG 图像"
 
-#: ../plugins/face/face.c:69
-msgid "PNG files"
-msgstr "PNG 文件"
+#: ../plugins/face/face.c:296
+msgid "Image files"
+msgstr "图像文件"
 
-#: ../plugins/face/face.c:126
-msgid "_Face"
-msgstr "头像(_F)"
+#: ../plugins/face/face.c:355
+msgid "_Insert Face picture by default"
+msgstr ""
+
+#: ../plugins/face/face.c:366
+msgid "Load new _Face picture"
+msgstr ""
+
+#: ../plugins/face/face.c:415
+#, fuzzy
+msgid "Include _Face"
+msgstr "包含："
 
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
-msgid ""
-"Attach Face header to outgoing messages. First time the user needs to "
-"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
-"faces This will be used in messages that are sent further."
+msgid "Attach a small picture of your face to outgoing messages."
 msgstr ""
-"在发出的邮件的邮件头中附上头像。第一次使用时用户需要配置一个 48*48 的 PNG 图"
-"象。它以 base64 编码并保存在 ~/.evolution/faces 下。这将在以后发出的邮件中使"
-"用。"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
-#, c-format
-msgid "Unsubscribing from folder \"%s\""
-msgstr "无法退订文件夹“%s”"
+#: ../plugins/face/org-gnome-face.error.xml.h:1
+#, fuzzy
+msgid "Failed Read"
+msgstr "表头"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
-msgid "Allows unsubscribing of mail folders in the side bar context menu."
-msgstr "允许在侧边栏的快捷菜单中退订邮件文件夹。"
+#: ../plugins/face/org-gnome-face.error.xml.h:2
+#, fuzzy
+msgid "Invalid Image Size"
+msgstr "无效的日期值"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
-msgid "Unsubscribe Folders"
-msgstr "退订文件夹"
+#: ../plugins/face/org-gnome-face.error.xml.h:3
+msgid "Not an image"
+msgstr "不是一个图像"
 
-#: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:3
-msgid "_Unsubscribe"
-msgstr "退订(_U)"
+#: ../plugins/face/org-gnome-face.error.xml.h:4
+#, fuzzy
+msgid "Please select an image of size 48 * 48"
+msgstr "请选择此联系人的图像"
+
+#: ../plugins/face/org-gnome-face.error.xml.h:5
+msgid "The file cannot be read"
+msgstr "这个文件不能被读取"
 
-#: ../plugins/google-account-setup/google-source.c:83
-#: ../plugins/google-account-setup/google-source.c:90
-#: ../plugins/google-account-setup/google-contacts-source.c:53
-#: ../plugins/google-account-setup/google-contacts-source.c:58
-#: ../plugins/google-account-setup/google-contacts-source.c:84
+#: ../plugins/face/org-gnome-face.error.xml.h:6
+msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgstr ""
+
+#: ../plugins/google-account-setup/google-contacts-source.c:51
+#: ../plugins/google-account-setup/google-source.c:81
 msgid "Google"
 msgstr "Google"
 
-#: ../plugins/google-account-setup/google-source.c:440
+#: ../plugins/google-account-setup/google-contacts-source.c:270
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:285
+msgid "<b>Server</b>"
+msgstr "<b>服务器</b>"
+
+#: ../plugins/google-account-setup/google-source.c:517
 #, c-format
 msgid "Enter password for user %s to access list of subscribed calendars."
 msgstr "输入用户 %s 的密码以便访问已订阅日历的列表。"
 
-#: ../plugins/google-account-setup/google-source.c:540
+#: ../plugins/google-account-setup/google-source.c:623
 #, c-format
 msgid ""
 "Cannot read data from Google server.\n"
@@ -17457,41 +16405,67 @@ msgstr ""
 "无法从 Google 服务器上读取数据。\n"
 "%s"
 
-#: ../plugins/google-account-setup/google-source.c:702
+#: ../plugins/google-account-setup/google-source.c:623
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:943
+msgid "Unknown error."
+msgstr "未知错误。"
+
+#: ../plugins/google-account-setup/google-source.c:758
 msgid "Cal_endar:"
 msgstr "日历(_E)："
 
-#: ../plugins/google-account-setup/google-source.c:737
+#: ../plugins/google-account-setup/google-source.c:793
 msgid "Retrieve _list"
 msgstr "获取列表(_L)"
 
-#: ../plugins/google-account-setup/google-contacts-source.c:278
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:300
-msgid "<b>Server</b>"
-msgstr "<b>服务器</b>"
-
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
-msgid "A plugin to setup Google Calendar and Contacts."
-msgstr "设置 Google 日历和联系人的插件。"
+msgid "Add Google Calendars to Evolution."
+msgstr ""
 
 #: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
-msgid "Google sources"
-msgstr "Google 源"
+msgid "Google Calendars"
+msgstr "Google 日历"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:456
+#: ../plugins/groupwise-features/camel-gw-listener.c:451
 msgid "Checklist"
 msgstr "待办清单"
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
-msgid "A plugin to setup GroupWise calendar and contacts sources."
-msgstr "设置 GroupWise 日历和联系人源的插件。"
+#: ../plugins/groupwise-features/gw-ui.c:111
+msgid "New _Shared Folder..."
+msgstr "新建共享文件夹(_S)..."
 
-#: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:2
-msgid "GroupWise Account Setup"
-msgstr "GroupWise 账户设置"
+#: ../plugins/groupwise-features/gw-ui.c:118
+msgid "_Proxy Login..."
+msgstr "代理服务器登录(_P)..."
 
-#: ../plugins/groupwise-features/install-shared.c:220
-#, c-format
+#: ../plugins/groupwise-features/gw-ui.c:169
+msgid "Junk Mail Settings..."
+msgstr "垃圾邮件设置..."
+
+#: ../plugins/groupwise-features/gw-ui.c:176
+msgid "Track Message Status..."
+msgstr "跟踪信件状态..."
+
+#: ../plugins/groupwise-features/gw-ui.c:182
+msgid "Retract Mail"
+msgstr "收回邮件"
+
+#: ../plugins/groupwise-features/gw-ui.c:339
+msgid "Accept Tentatively"
+msgstr "暂时接受"
+
+#: ../plugins/groupwise-features/gw-ui.c:353
+msgid "Rese_nd Meeting..."
+msgstr "重新发送会议(_N)..."
+
+#: ../plugins/groupwise-features/install-shared.c:175
+#: ../plugins/groupwise-features/share-folder-common.c:350
+msgid "Create folder"
+msgstr "创建文件夹"
+
+#: ../plugins/groupwise-features/install-shared.c:225
+#, fuzzy, c-format
 msgid ""
 "The user '%s' has shared a folder with you\n"
 "\n"
@@ -17501,7 +16475,7 @@ msgid ""
 "%s\n"
 "\n"
 "\n"
-"Click 'Forward' to install the shared folder\n"
+"Click 'Apply' to install the shared folder\n"
 "\n"
 msgstr ""
 "用户“%s”与您共享了文件夹\n"
@@ -17515,278 +16489,285 @@ msgstr ""
 "单击“前进”可安装共享文件夹\n"
 "\n"
 
-#: ../plugins/groupwise-features/install-shared.c:225
+#: ../plugins/groupwise-features/install-shared.c:237
 msgid "Install the shared folder"
 msgstr "安装共享文件夹"
 
-#: ../plugins/groupwise-features/install-shared.c:227
+#: ../plugins/groupwise-features/install-shared.c:241
 msgid "Shared Folder Installation"
 msgstr "共享文件夹安装"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:80
+#: ../plugins/groupwise-features/junk-mail-settings.c:82
 msgid "Junk Settings"
 msgstr "垃圾邮件设置"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:93
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
+#: ../plugins/groupwise-features/junk-mail-settings.c:95
+#: ../plugins/groupwise-features/junk-settings.ui.h:3
 msgid "Junk Mail Settings"
 msgstr "垃圾邮件设置"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:117
-msgid "Junk Mail Settings..."
-msgstr "垃圾邮件设置..."
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:1
-msgid "<b>Junk List:</b>"
-msgstr "<b>垃圾邮件列表：</b>"
-
-#: ../plugins/groupwise-features/junk-settings.glade.h:2
+#: ../plugins/groupwise-features/junk-settings.ui.h:1
 msgid "Email:"
 msgstr "电子邮件："
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:5
-#: ../plugins/mail-account-disable/mail-account-disable.c:45
+#: ../plugins/groupwise-features/junk-settings.ui.h:2
+msgid "Junk List:"
+msgstr "垃圾邮件列表："
+
+#: ../plugins/groupwise-features/junk-settings.ui.h:5
+#: ../plugins/publish-calendar/publish-calendar.c:484
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:6
+#: ../plugins/groupwise-features/junk-settings.ui.h:6
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:7
+#: ../plugins/groupwise-features/junk-settings.ui.h:7
 msgid "_Junk List"
 msgstr "垃圾测试(_J)"
 
-#: ../plugins/groupwise-features/mail-retract.c:53
-#, fuzzy
+#: ../plugins/groupwise-features/junk-settings.ui.h:8
+#: ../plugins/groupwise-features/properties.ui.h:13
+#: ../widgets/table/e-table-config.ui.h:21
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../plugins/groupwise-features/mail-retract.c:83
 msgid "Message Retract"
-msgstr "信件状态"
+msgstr "信息收回"
 
-#: ../plugins/groupwise-features/mail-retract.c:58
+#: ../plugins/groupwise-features/mail-retract.c:88
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
-"sure you want to do this ?"
+"sure you want to do this?"
 msgstr ""
 
-#: ../plugins/groupwise-features/mail-retract.c:77
+#: ../plugins/groupwise-features/mail-retract.c:109
 msgid "Message retracted successfully"
 msgstr "邮件成功收回"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
-msgid "Retract Mail"
-msgstr "收回邮件"
+#: ../plugins/groupwise-features/mail-send-options.c:200
+msgid "Insert Send options"
+msgstr "插入发送选项"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
-#, fuzzy
-#| msgid "Add Send Options to groupwise messages"
 msgid "Add Send Options to GroupWise messages"
-msgstr "将发送选项添加到 GroupWise 信件"
+msgstr "为 GroupWise 信息添加发送选项"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:1
-#, fuzzy
-#| msgid "A plugin for the features in Groupwise accounts."
-msgid "A plugin for the features in GroupWise accounts."
-msgstr "Groupwise 账户特性的插件。"
+msgid "Fine-tune your GroupWise accounts."
+msgstr "调整您的 GroupWise 帐户。"
 
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
-#, fuzzy
-#| msgid "Groupwise Features"
 msgid "GroupWise Features"
-msgstr "Groupwise 特性"
+msgstr "GroupWise 特性"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:1
 msgid "Message retract failed"
 msgstr "邮件收回失败"
 
-#: ../plugins/groupwise-features/org-gnome-mail-retract-errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-mail-retract.error.xml.h:2
 #, fuzzy
 msgid "The server did not allow the selected message to be retracted."
 msgstr "将选中邮件转换为新任务"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:1
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:3
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:1
+#, fuzzy
+msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
+msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:2
+msgid "Account Already Exists"
+msgstr "帐户已经存在"
+
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:1
 msgid "Invalid user"
 msgstr "无效用户"
 
+#: ../plugins/groupwise-features/org-gnome-proxy-login.error.xml.h:4
+msgid ""
+"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
+"address and try again."
+msgstr ""
+
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:3
 #, fuzzy
 msgid "Proxy access cannot be given to user &quot;{0}&quot;"
 msgstr "无法保存到文件“{0}”。"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:4
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:2
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:4
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:2
 msgid "Specify User"
 msgstr "指定用户"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:6
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:6
 #, fuzzy
 msgid "You have already given proxy permissions to this user."
 msgstr "你在我的文件夹上拥有下列权限："
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/org-gnome-proxy-errors.xml.h:8
+#: ../plugins/groupwise-features/org-gnome-proxy.error.xml.h:8
 msgid "You have to specify a valid user name to give proxy rights."
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:1
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:3
 #, fuzzy
-msgid "Account &quot;{0}&quot; already exists. Please check your folder tree."
-msgstr "已经存在名为“{0}”的文件夹。请使用不同的名称。"
-
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:2
-msgid "Account Already Exists"
-msgstr "帐户已经存在"
+msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
+msgstr "无法保存到自动保存文件“{0}”。"
 
-#: ../plugins/groupwise-features/org-gnome-proxy-login-errors.xml.h:4
-msgid ""
-"Proxy login as &quot;{0}&quot; was unsuccessful. Please check your email "
-"address and try again."
+#: ../plugins/groupwise-features/org-gnome-shared-folder.error.xml.h:4
+msgid "You have to specify a user name which you want to add to the list"
 msgstr ""
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:3
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:1
+#, fuzzy
+msgid "Do you want to resend the meeting?"
+msgstr "您确信您要删除该会议吗？"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:2
+#, fuzzy
+msgid "Do you want to resend the recurring meeting?"
+msgstr "您确信您要删除该会议吗？"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:3
+#, fuzzy
+msgid "Do you want to retract the original item?"
+msgstr "您是否想要恢复未完成的信件？"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:4
+#, fuzzy
+msgid "The original will be removed from the recipient's mailbox."
+msgstr "从全部其它收件人的邮箱中删除此项吗？(_D)"
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:5
 #, fuzzy
 msgid "This is a recurring meeting"
 msgstr "将此事件标为重复发生"
 
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:6
+msgid "This will create a new meeting using the existing meeting details."
+msgstr ""
+
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:7
+msgid ""
+"This will create a new meeting with the existing meeting details. The "
+"recurrence rule needs to be re-entered."
+msgstr ""
+
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:5
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:9
 #, fuzzy
 msgid "Would you like to accept it?"
 msgstr "您希望保存更改吗？"
 
 #. Translators: "it" is a "recurring meeting" (string refers to "This is a recurring meeting")
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:7
+#: ../plugins/groupwise-features/org-gnome-process-meeting.error.xml.h:11
 #, fuzzy
 msgid "Would you like to decline it?"
 msgstr "您希望保存更改吗？"
 
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:8
-#, fuzzy
-msgid "You cannot share this folder with the specified user &quot;{0}&quot;"
-msgstr "无法保存到自动保存文件“{0}”。"
-
-#: ../plugins/groupwise-features/org-gnome-shared-folder.errors.xml.h:9
-msgid "You have to specify a user name which you want to add to the list"
-msgstr ""
-
-#: ../plugins/groupwise-features/process-meeting.c:52
-msgid "Accept Tentatively"
-msgstr "暂时接受"
-
-#: ../plugins/groupwise-features/properties.glade.h:1
+#: ../plugins/groupwise-features/properties.ui.h:1
 msgid "<b>Users:</b>"
 msgstr "<b>用户数：</b>"
 
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../plugins/groupwise-features/properties.ui.h:2
 msgid "C_ustomize notification message"
 msgstr "自定义通知消息(_U)"
 
-#: ../plugins/groupwise-features/properties.glade.h:3
+#: ../plugins/groupwise-features/properties.ui.h:3
 msgid "Con_tacts..."
 msgstr "联系人(_T)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:5
-#: ../widgets/table/e-table-click-to-add.c:516
+#: ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:512
 msgid "Message"
 msgstr "消息"
 
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "共享文件夹通知"
 
-#: ../plugins/groupwise-features/properties.glade.h:8
+#: ../plugins/groupwise-features/properties.ui.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "收件人将接收到下列通知。\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:12
+#: ../plugins/groupwise-features/properties.ui.h:12
 msgid "_Not Shared"
 msgstr "未共享(_N)"
 
-#: ../plugins/groupwise-features/properties.glade.h:14
+#: ../plugins/groupwise-features/properties.ui.h:14
 msgid "_Shared With..."
 msgstr "共享对象(_S)..."
 
-#: ../plugins/groupwise-features/properties.glade.h:15
+#: ../plugins/groupwise-features/properties.ui.h:15
 msgid "_Sharing"
 msgstr "共享(_S)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:1
-msgid "<b>Name</b>"
-msgstr "<b>名称</b>"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:2
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:1
 msgid "Access Rights"
 msgstr "访问权限"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:2
 msgid "Add/Edit"
 msgstr "添加/编辑"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:5
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:4
 msgid "Con_tacts"
 msgstr "联系人(_T)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:7
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:6
 msgid "Modify _folders/options/rules/"
 msgstr "修改文件夹/选项/规则(_F)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:8
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:8
 msgid "Read items marked _private"
 msgstr "读取标为私有的项目(_P)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:9
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:9
 msgid "Reminder Notes"
 msgstr "提醒备忘"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:10
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:10
 msgid "Subscribe to my _alarms"
 msgstr "订阅我的提醒(_A)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:11
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:11
 msgid "Subscribe to my _notifications"
 msgstr "订阅我的通知(_N)"
 
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:13
 msgid "_Write"
 msgstr "写入(_W)"
 
-#. To Translators: strip the part in front of the | and the | itself
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+#: ../plugins/groupwise-features/proxy-add-dialog.ui.h:14
 msgid "permission to read|_Read"
 msgstr "读(_R)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
+#: ../plugins/groupwise-features/proxy-listing.ui.h:1
 msgid "Proxy"
 msgstr "代理服务器"
 
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>账户名</b>"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login-dialog.glade.h:3
+#: ../plugins/groupwise-features/proxy-login-dialog.ui.h:2
 msgid "Proxy Login"
 msgstr "代理服务器登录"
 
-#: ../plugins/groupwise-features/proxy-login.c:206
-#: ../plugins/groupwise-features/proxy-login.c:248
-#: ../plugins/groupwise-features/proxy.c:491
+#: ../plugins/groupwise-features/proxy-login.c:209
+#: ../plugins/groupwise-features/proxy-login.c:252
+#: ../plugins/groupwise-features/proxy.c:495
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s输入 %s 的密码(用户 %s)"
 
-#. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
-#. * feature by which one person can send/read mails/appointments using another person's identity
-#. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:510
-msgid "_Proxy Login..."
-msgstr "代理服务器登录(_P)..."
-
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
 #: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
@@ -17797,125 +16778,121 @@ msgstr "代理服务器标签仅当账户联机时才可用。"
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理服务器标签仅当账户启用时才可用。"
 
-#: ../plugins/groupwise-features/send-options.c:214
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:702
+msgid "Add User"
+msgstr "添加用户"
+
+#: ../plugins/groupwise-features/send-options.c:213
 msgid "Advanced send options"
 msgstr "高级发送选项"
 
-#: ../plugins/groupwise-features/share-folder-common.c:321
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../plugins/groupwise-features/share-folder-common.c:317
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Users"
 msgstr "用户"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
+#: ../plugins/groupwise-features/share-folder-common.c:318
 msgid "Enter the users and set permissions"
 msgstr "输入用户及设定权限"
 
-#: ../plugins/groupwise-features/share-folder-common.c:341
-msgid "New _Shared Folder..."
-msgstr "新建共享文件夹(_S)..."
-
-#: ../plugins/groupwise-features/share-folder-common.c:449
+#: ../plugins/groupwise-features/share-folder-common.c:415
 msgid "Sharing"
 msgstr "共享"
 
-#: ../plugins/groupwise-features/share-folder.c:534
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "自定义通知"
 
-#: ../plugins/groupwise-features/share-folder.c:756
+#: ../plugins/groupwise-features/share-folder.c:742
 msgid "Add   "
 msgstr "添加"
 
-#: ../plugins/groupwise-features/share-folder.c:762
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Modify"
 msgstr "修改"
 
-#: ../plugins/groupwise-features/status-track.c:97
+#: ../plugins/groupwise-features/status-track.c:125
 msgid "Message Status"
 msgstr "信件状态"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:111
+#: ../plugins/groupwise-features/status-track.c:139
 msgid "Subject:"
 msgstr "主题："
 
-#: ../plugins/groupwise-features/status-track.c:125
+#: ../plugins/groupwise-features/status-track.c:153
 msgid "From:"
 msgstr "发件人："
 
-#: ../plugins/groupwise-features/status-track.c:140
+#: ../plugins/groupwise-features/status-track.c:168
 msgid "Creation date:"
 msgstr "创建日期："
 
-#: ../plugins/groupwise-features/status-track.c:179
+#: ../plugins/groupwise-features/status-track.c:207
 msgid "Recipient: "
 msgstr "收件人："
 
-#: ../plugins/groupwise-features/status-track.c:186
+#: ../plugins/groupwise-features/status-track.c:214
 msgid "Delivered: "
 msgstr "已投递："
 
-#: ../plugins/groupwise-features/status-track.c:192
+#: ../plugins/groupwise-features/status-track.c:220
 msgid "Opened: "
 msgstr "已打开："
 
-#: ../plugins/groupwise-features/status-track.c:197
+#: ../plugins/groupwise-features/status-track.c:225
 msgid "Accepted: "
 msgstr "已接受："
 
-#: ../plugins/groupwise-features/status-track.c:202
+#: ../plugins/groupwise-features/status-track.c:230
 msgid "Deleted: "
 msgstr "已删除："
 
-#: ../plugins/groupwise-features/status-track.c:207
+#: ../plugins/groupwise-features/status-track.c:235
 msgid "Declined: "
 msgstr "已拒绝："
 
-#: ../plugins/groupwise-features/status-track.c:212
+#: ../plugins/groupwise-features/status-track.c:240
 msgid "Completed: "
 msgstr "已完成："
 
-#: ../plugins/groupwise-features/status-track.c:217
+#: ../plugins/groupwise-features/status-track.c:245
 msgid "Undelivered: "
 msgstr "未投递："
 
-#: ../plugins/groupwise-features/status-track.c:241
-msgid "Track Message Status..."
-msgstr "跟踪信件状态..."
-
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
-msgid "A plugin to setup hula calendar sources."
-msgstr "设置 Hula 日历源的插件。"
+msgid "Add Hula support to Evolution."
+msgstr ""
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
-msgid "Hula Account Setup"
-msgstr "Hula 账户设置"
+msgid "Hula Support"
+msgstr "Hula 支持"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline Image"
+msgstr "嵌入"
+
+#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
+msgid "View image attachments directly in mail messages."
+msgstr ""
 
-#: ../plugins/imap-features/imap-headers.c:320
+#: ../plugins/imap-features/imap-headers.c:328
+#: ../plugins/imap-features/imap-headers.ui.h:2
 msgid "Custom Headers"
 msgstr "自定义信头"
 
-#: ../plugins/imap-features/imap-headers.c:333
+#: ../plugins/imap-features/imap-headers.c:341
+#: ../plugins/imap-features/imap-headers.ui.h:5
 msgid "IMAP Headers"
 msgstr "IMAP 信头"
 
-#: ../plugins/imap-features/imap-headers.glade.h:1
-msgid "<b>Custom Headers</b>"
-msgstr "<b>自定义信头</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers</b>"
-msgstr "<b>IMAP 信头</b>"
-
-#: ../plugins/imap-features/imap-headers.glade.h:3
+#: ../plugins/imap-features/imap-headers.ui.h:1
 msgid "Basic and _Mailing List Headers (Default)"
 msgstr "基本和邮件列表信头(默认)(_M)"
 
-#: ../plugins/imap-features/imap-headers.glade.h:4
-msgid "Fetch A_ll Headers"
-msgstr "获取全部信头(_L)"
-
-#: ../plugins/imap-features/imap-headers.glade.h:5
+#: ../plugins/imap-features/imap-headers.ui.h:3
 msgid ""
 "Give the extra headers that you need to fetch in addition to the above "
 "standard headers. \n"
@@ -17924,7 +16901,7 @@ msgstr ""
 "除了以上的标准信头之外，在此给出想要获取的额外信头。\n"
 "如果您选择的是“全部信头”的话，可以忽略此项。"
 
-#: ../plugins/imap-features/imap-headers.glade.h:7
+#: ../plugins/imap-features/imap-headers.ui.h:6
 msgid ""
 "Select your IMAP Header Preferences. \n"
 "The more headers you have the more time it will take to download."
@@ -17932,7 +16909,7 @@ msgstr ""
 "选择您的 IMAP 信头首选项。\n"
 "您所选择的信头越多，下载所花费的时间越长。"
 
-#: ../plugins/imap-features/imap-headers.glade.h:9
+#: ../plugins/imap-features/imap-headers.ui.h:8
 msgid ""
 "_Basic Headers - (Fastest) \n"
 "Use this if you do not have filters based on mailing lists"
@@ -17940,741 +16917,687 @@ msgstr ""
 "基本信头 - (最快)(_B)\n"
 "如果您没有基于邮件列表的过滤器，请选择此项"
 
+#: ../plugins/imap-features/imap-headers.ui.h:10
+#, fuzzy
+msgid "_Fetch All Headers"
+msgstr "获取全部信头(_L)"
+
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:1
-msgid "A plugin for the features in the IMAP accounts."
-msgstr "实现 IMAP 账户特性的插件。"
+msgid "Fine-tune your IMAP accounts."
+msgstr "调整您的 IMAP 账户。"
 
 #: ../plugins/imap-features/org-gnome-imap-features.eplug.xml.h:2
 msgid "IMAP Features"
 msgstr "IMAP 特性"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:78
-msgid "_Import to Calendar"
-msgstr "导入到日历(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:83
-msgid "_Import to Tasks"
-msgstr "导入到任务(_I)"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:201
-msgid "Import ICS"
-msgstr "导入 ICS"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:224
-msgid "Select Task List"
-msgstr "选择任务列表"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:228
-msgid "Select Calendar"
-msgstr "选择日历"
-
-#: ../plugins/import-ics-attachments/icsimporter.c:260
-#: ../shell/e-shell-importer.c:696
-msgid "_Import"
-msgstr "导入(_I)"
-
-#. the path to the shared library
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:2
-msgid "Import to Calendar"
-msgstr "导入到日历"
-
-#: ../plugins/import-ics-attachments/org-gnome-evolution-mail-attachments-import-ics.eplug.xml.h:3
-msgid "Imports ICS attachments to calendar."
-msgstr "将 ICS 附件导入到日历。"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:49
-msgid "Hardware Abstraction Layer not loaded"
-msgstr "硬件抽象层(HAL)尚未加载"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:50
-msgid ""
-"The \"hald\" service is required but not currently running. Please enable "
-"the service and rerun this program, or contact your system administrator."
-msgstr ""
-"需要“hald”服务但它目前尚未运行。请启用该服务并重新支持此程序，或联系您的系统"
-"管理员。"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:83
-msgid "Search for an iPod failed"
-msgstr "搜索 iPod 失败"
-
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:84
-msgid ""
-"Evolution could not find an iPod to synchronize with. Either the iPod is not "
-"connected to the system or it is not powered on."
-msgstr ""
-"Evolution 找不到要同步的 iPod。您可能没有将其连接到系统，或者没有开机。"
-
-#: ../plugins/ipod-sync/ical-format.c:119
-#: ../plugins/save-calendar/ical-format.c:164
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar 格式(.ics)"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid ""
-"Synchronize the selected task/memo/calendar/address book with Apple iPod"
-msgstr "将选中的任务/备忘/日历/地址簿与 Apple iPod 同步"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
-msgid "Synchronize to iPod"
-msgstr "同步到 iPod"
-
-#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:3
-msgid "iPod Synchronization"
-msgstr "iPod 同步"
-
-#: ../plugins/itip-formatter/itip-formatter.c:481
-#: ../plugins/itip-formatter/itip-formatter.c:606
+#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:619
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "装入日历“%s”失败"
 
-#: ../plugins/itip-formatter/itip-formatter.c:626
+#: ../plugins/itip-formatter/itip-formatter.c:639
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s”中的一个约会与此会议冲突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:662
+#: ../plugins/itip-formatter/itip-formatter.c:675
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:752
+#: ../plugins/itip-formatter/itip-formatter.c:774
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:759
+#: ../plugins/itip-formatter/itip-formatter.c:781
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:785
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:767
+#: ../plugins/itip-formatter/itip-formatter.c:789
 msgid "Unable to find this memo in any memo list"
 msgstr "无法在任何备忘列表中找到此备忘"
 
-#: ../plugins/itip-formatter/itip-formatter.c:838
+#: ../plugins/itip-formatter/itip-formatter.c:860
+#, fuzzy
+msgid "Opening the calendar. Please wait.."
+msgstr "打开日历"
+
+#: ../plugins/itip-formatter/itip-formatter.c:863
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1020
+#: ../plugins/itip-formatter/itip-formatter.c:1045
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1107
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1144
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1123
+#: ../plugins/itip-formatter/itip-formatter.c:1148
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1128
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1133
+#: ../plugins/itip-formatter/itip-formatter.c:1158
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1227
+#: ../plugins/itip-formatter/itip-formatter.c:1252
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1234
+#: ../plugins/itip-formatter/itip-formatter.c:1259
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1236
+#: ../plugins/itip-formatter/itip-formatter.c:1261
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1372
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新，原因是状态无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1371
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1375
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1401
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 msgid "Meeting information sent"
 msgstr "会议信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1404
+#: ../plugins/itip-formatter/itip-formatter.c:1434
 msgid "Task information sent"
 msgstr "任务信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1407
+#: ../plugins/itip-formatter/itip-formatter.c:1437
 msgid "Memo information sent"
 msgstr "备忘信息已发送"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1416
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "无法发送会议信息，会议不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1419
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 msgid "Unable to send task information, the task does not exist"
 msgstr "无法发送任务信息，任务不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1422
+#: ../plugins/itip-formatter/itip-formatter.c:1452
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "无法发送备忘信息，备忘不存在"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1491
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#. Translators: This is a default filename for a calendar.
+#: ../plugins/itip-formatter/itip-formatter.c:1517
+msgid "calendar.ics"
+msgstr "calendar.ics"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1522
+msgid "Save Calendar"
+msgstr "保存日历"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1492
-#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1587
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包含日历，但日历不是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1543
-#: ../plugins/itip-formatter/itip-formatter.c:1571
-#: ../plugins/itip-formatter/itip-formatter.c:1663
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1544
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1664
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
 msgstr "信件的确包含日历，但是日历不包含事件、任务或忙/闲信息"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要处理这些全部项目，应该保存文件并导入日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2306
+#: ../plugins/itip-formatter/itip-formatter.c:2434
 msgid "This meeting recurs"
 msgstr "此会议重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2309
+#: ../plugins/itip-formatter/itip-formatter.c:2437
 msgid "This task recurs"
 msgstr "此任务重现"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2312
+#: ../plugins/itip-formatter/itip-formatter.c:2440
 msgid "This memo recurs"
 msgstr "此备忘重现"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2548
+#: ../plugins/itip-formatter/itip-formatter.c:2670
 msgid "_Delete message after acting"
 msgstr "操作后删除消息(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2558
-#: ../plugins/itip-formatter/itip-formatter.c:2590
+#: ../plugins/itip-formatter/itip-formatter.c:2680
+#: ../plugins/itip-formatter/itip-formatter.c:2713
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2573
+#: ../plugins/itip-formatter/itip-formatter.c:2695
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:191 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:297
-msgid "Today"
-msgstr "今天"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:196
+#: ../plugins/itip-formatter/itip-view.c:199
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:200
+#: ../plugins/itip-formatter/itip-view.c:203
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:209
+#: ../plugins/itip-formatter/itip-view.c:212
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p%l:%M:%S"
 
-#. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:219
-msgid "Tomorrow"
-msgstr "明天"
-
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:224
+#: ../plugins/itip-formatter/itip-view.c:227
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:228
+#: ../plugins/itip-formatter/itip-view.c:231
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:233
+#: ../plugins/itip-formatter/itip-view.c:236
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:237
+#: ../plugins/itip-formatter/itip-view.c:240
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:256
+#: ../plugins/itip-formatter/itip-view.c:259
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:261
+#: ../plugins/itip-formatter/itip-view.c:264
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:265
+#: ../plugins/itip-formatter/itip-view.c:268
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:270
+#: ../plugins/itip-formatter/itip-view.c:273
 msgid "%A %l:%M %p"
 msgstr "%A%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:274
+#: ../plugins/itip-formatter/itip-view.c:277
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:283
+#: ../plugins/itip-formatter/itip-view.c:286
 msgid "%A, %B %e"
 msgstr "%-m月%-d日%A"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:289
+#: ../plugins/itip-formatter/itip-view.c:292
 msgid "%A, %B %e %H:%M"
 msgstr "%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:293
+#: ../plugins/itip-formatter/itip-view.c:296
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:298
+#: ../plugins/itip-formatter/itip-view.c:301
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:302
+#: ../plugins/itip-formatter/itip-view.c:305
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m月%-d日%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:308
+#: ../plugins/itip-formatter/itip-view.c:311
 msgid "%A, %B %e, %Y"
 msgstr "%Y年%-m月%-d日%A"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:313
+#: ../plugins/itip-formatter/itip-view.c:316
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y年%-m月%-d日%A %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:317
+#: ../plugins/itip-formatter/itip-view.c:320
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y年%-m月%-d日%A %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:322
+#: ../plugins/itip-formatter/itip-view.c:325
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:326
+#: ../plugins/itip-formatter/itip-view.c:329
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:351
-#: ../plugins/itip-formatter/itip-view.c:439
-#: ../plugins/itip-formatter/itip-view.c:527
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "Please respond on behalf of <b>%s</b>"
 msgstr "请以 <b>%s</b> 的身份回应"
 
-#: ../plugins/itip-formatter/itip-view.c:353
-#: ../plugins/itip-formatter/itip-view.c:441
-#: ../plugins/itip-formatter/itip-view.c:529
+#: ../plugins/itip-formatter/itip-view.c:356
+#: ../plugins/itip-formatter/itip-view.c:444
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "Received on behalf of <b>%s</b>"
 msgstr "以 <b>%s</b> 的身份接收"
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 通过 %s 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:363
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:365
+#: ../plugins/itip-formatter/itip-view.c:368
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 为您代理了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 通过 %s 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:370
+#: ../plugins/itip-formatter/itip-view.c:373
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:382
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following meeting:"
 msgstr "<b>%s</b> 通过 %s 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望接收到下列会议的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:388
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> through %s has sent back the following meeting response:"
 msgstr "<b>%s</b> 通过 %s 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:390
+#: ../plugins/itip-formatter/itip-view.c:393
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:394
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 通过 %s 取消了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:396
+#: ../plugins/itip-formatter/itip-view.c:399
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 取消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:400
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> through %s has proposed the following meeting changes."
 msgstr "<b>%s</b> 通过 %s 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:402
+#: ../plugins/itip-formatter/itip-view.c:405
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:406
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列会议变更："
 
-#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:411
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 拒绝了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 通过 %s 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:451
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:453
+#: ../plugins/itip-formatter/itip-view.c:456
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> 请求给 %s 分配下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:456
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 通过 %s 为您分配了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:458
+#: ../plugins/itip-formatter/itip-view.c:461
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 为您分配了一个任务："
 
-#: ../plugins/itip-formatter/itip-view.c:464
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:466
+#: ../plugins/itip-formatter/itip-view.c:469
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s<b> 希望加入到已存在的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> through %s wishes to receive the latest information for the "
 "following assigned task:"
 msgstr "<b>%s</b> 通过 %s 想要收到所分配的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:472
+#: ../plugins/itip-formatter/itip-view.c:475
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 想要收到所分配的下列任务的最新信息："
 
-#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid ""
 "<b>%s</b> through %s has sent back the following assigned task response:"
 msgstr "<b>%s</b> 通过 %s 发回了下列分配任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:478
+#: ../plugins/itip-formatter/itip-view.c:481
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 发回了下列分配任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:482
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 取消了下列任务分配："
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:487
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 取消分配的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:488
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid ""
 "<b>%s</b> through %s has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 通过 %s 提议了下列任务分配变更："
 
-#: ../plugins/itip-formatter/itip-view.c:490
+#: ../plugins/itip-formatter/itip-view.c:493
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 提议了下列任务分配变更："
 
-#: ../plugins/itip-formatter/itip-view.c:494
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> 通过 %s 拒绝了下列任务分配："
 
-#: ../plugins/itip-formatter/itip-view.c:496
+#: ../plugins/itip-formatter/itip-view.c:499
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 拒绝了分配的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:534
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 通过 %s 发布了下列备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:536
+#: ../plugins/itip-formatter/itip-view.c:539
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> 发布了下列备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:541
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> 通过 %s 希望加入到已有的备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:546
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入到已有的备忘中："
 
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> 通过 %s 取消了下列共享备忘："
 
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:552
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 取消了下列共享备忘："
 
+#: ../plugins/itip-formatter/itip-view.c:676
+msgid "All day:"
+msgstr ""
+
+#: ../plugins/itip-formatter/itip-view.c:686
+msgid "Start day:"
+msgstr "开始日期："
+
+#. Start time
+#: ../plugins/itip-formatter/itip-view.c:686
+#: ../plugins/itip-formatter/itip-view.c:1041
+msgid "Start time:"
+msgstr "开始时间："
+
+#: ../plugins/itip-formatter/itip-view.c:698
+msgid "End day:"
+msgstr "结束日期："
+
+#. End time
+#: ../plugins/itip-formatter/itip-view.c:698
+#: ../plugins/itip-formatter/itip-view.c:1052
+msgid "End time:"
+msgstr "结束时间："
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:820
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Open Calendar"
 msgstr "打开日历(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:826
-#: ../plugins/itip-formatter/itip-view.c:830
-#: ../plugins/itip-formatter/itip-view.c:836
-#: ../plugins/itip-formatter/itip-view.c:853
-#: ../plugins/itip-formatter/itip-view.c:858
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:841
+#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:864
+#: ../plugins/itip-formatter/itip-view.c:869
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:827
-#: ../plugins/itip-formatter/itip-view.c:832
-#: ../plugins/itip-formatter/itip-view.c:839
-#: ../plugins/itip-formatter/itip-view.c:855
-#: ../plugins/itip-formatter/itip-view.c:860
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:866
+#: ../plugins/itip-formatter/itip-view.c:871
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:830
+#: ../plugins/itip-formatter/itip-view.c:841
 msgid "_Decline all"
 msgstr "全部拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:842
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:831
-#: ../plugins/itip-formatter/itip-view.c:837
-#: ../plugins/itip-formatter/itip-view.c:854
-#: ../plugins/itip-formatter/itip-view.c:859
+#: ../plugins/itip-formatter/itip-view.c:842
+#: ../plugins/itip-formatter/itip-view.c:848
+#: ../plugins/itip-formatter/itip-view.c:865
+#: ../plugins/itip-formatter/itip-view.c:870
 msgid "_Tentative"
 msgstr "待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:843
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:843
+#: ../plugins/itip-formatter/itip-view.c:854
 msgid "_Send Information"
 msgstr "发送信息(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:847
+#: ../plugins/itip-formatter/itip-view.c:858
 msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:850
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Update"
 msgstr "更新(_U)"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:1026
-msgid "Start time:"
-msgstr "开始时间："
-
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:1035
-msgid "End time:"
-msgstr "结束时间："
-
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:1051
-#: ../plugins/itip-formatter/itip-view.c:1101
+#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:1126
 msgid "Comment:"
 msgstr "注释："
 
-#: ../plugins/itip-formatter/itip-view.c:1087
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Send _reply to sender"
 msgstr "回复发件人(_R)"
 
-#: ../plugins/itip-formatter/itip-view.c:1115
+#: ../plugins/itip-formatter/itip-view.c:1141
 msgid "Send _updates to attendees"
 msgstr "给出席者发送更新(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1124
+#: ../plugins/itip-formatter/itip-view.c:1150
 msgid "_Apply to all instances"
 msgstr "应用到全部实例(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1133
+#: ../plugins/itip-formatter/itip-view.c:1159
 msgid "Show time as _free"
 msgstr "将时间显示为空闲(_F)"
 
-#: ../plugins/itip-formatter/itip-view.c:1136
+#: ../plugins/itip-formatter/itip-view.c:1162
 msgid "_Preserve my reminder"
 msgstr "保留我的提醒(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:1141
-#, fuzzy
-#| msgid "Attachment Reminder"
+#. To Translators: This is a check box to inherit a reminder.
+#: ../plugins/itip-formatter/itip-view.c:1168
 msgid "_Inherit reminder"
-msgstr "附件提醒"
+msgstr "继承提示(_I)"
 
-#: ../plugins/itip-formatter/itip-view.c:1895
-msgid "_Tasks :"
+#: ../plugins/itip-formatter/itip-view.c:1930
+msgid "_Tasks:"
 msgstr "任务(_T)："
 
-#: ../plugins/itip-formatter/itip-view.c:1897
-msgid "Memos :"
-msgstr "备忘："
+#: ../plugins/itip-formatter/itip-view.c:1932
+msgid "_Memos:"
+msgstr "备忘(_M)："
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Displays text/calendar parts in messages."
-msgstr "显示信件的 text/calendar 部分。"
+msgid "Display \"text/calendar\" MIME parts in mail messages."
+msgstr "在邮件信息的 MIME 部分显示“文本/日历”。"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
@@ -18695,18 +17618,6 @@ msgid ""
 "This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "此响应并非来自当前出席者。将响应者加为出席者吗？"
 
-#: ../plugins/mail-account-disable/mail-account-disable.c:46
-msgid "Proxy _Logout"
-msgstr "代理服务器注销(_L)"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:1
-msgid "Allows disabling of accounts."
-msgstr "允许禁用账户。"
-
-#: ../plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml.h:2
-msgid "Disable Account"
-msgstr "禁用账户"
-
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
 msgid "Beep or play sound file."
 msgstr "发出哔的一声或播放声音文件。"
@@ -18742,51 +17653,56 @@ msgid "Play sound when new messages arrive."
 msgstr "新邮件到达时播放声音。"
 
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+#, fuzzy
+msgid "Play themed sound when new messages arrive, if not in beep mode."
+msgstr "不在 beep 模式下时新邮件到达要播放的声音文件。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
 msgid "Popup message together with the icon."
 msgstr "同时弹出消息和图标。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Show new mail icon in notification area when new messages arrive."
 msgstr "新邮件到达时在通知区显示新邮件图标。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Sound file name to be played."
 msgstr "待播放的声音文件名。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
 msgid "Sound file to be played when new messages arrive, if not in beep mode."
 msgstr "不在 beep 模式下时新邮件到达要播放的声音文件。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Use sound theme"
+msgstr "使用声音主题"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
 msgid "Whether play sound or beep when new messages arrive."
 msgstr "新邮件到达时是播放声音文件还是哔一下。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
 msgid "Whether show message over the icon when new messages arrive."
 msgstr "新邮件到达时是否在图标上显示消息"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:17
 msgid "Whether the icon should blink or not."
 msgstr "是否闪烁图标。"
 
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:18
 msgid "Whether to notify new messages in Inbox folder only."
 msgstr "是否只通知收件箱文件夹中的新信件。"
 
-#: ../plugins/mail-notification/mail-notification.c:256
-msgid "Generate a _D-Bus message"
-msgstr "生成 _D-Bus 消息"
-
-#: ../plugins/mail-notification/mail-notification.c:379
+#: ../plugins/mail-notification/mail-notification.c:344
 msgid "Evolution's Mail Notification"
 msgstr "Evolution 邮件通知"
 
-#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:366
 msgid "Mail Notification Properties"
 msgstr "邮件通知属性"
 
-#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
-#: ../plugins/mail-notification/mail-notification.c:479
+#. To translators: '%d' is the count of mails received and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:495
 #, c-format
 msgid ""
 "You have received %d new message\n"
@@ -18796,149 +17712,289 @@ msgid_plural ""
 "in %s."
 msgstr[0] "您在 %2$s 中收到了 %1$d 封新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:484
+#. To Translators: "From:" is preceding a new mail sender address, like "From: user@example.com"
+#: ../plugins/mail-notification/mail-notification.c:506
+#, c-format
+msgid "From: %s"
+msgstr "来自：%s"
+
+#. To Translators: "Subject:" is preceding a new mail subject, like "Subject: It happened again"
+#: ../plugins/mail-notification/mail-notification.c:518
+#, c-format
+msgid "Subject: %s"
+msgstr "主题：%s"
+
+#: ../plugins/mail-notification/mail-notification.c:527
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
 msgstr[0] "您收到了 %d 封新邮件。"
 
-#: ../plugins/mail-notification/mail-notification.c:501
-#: ../plugins/mail-notification/mail-notification.c:506
+#: ../plugins/mail-notification/mail-notification.c:544
+#: ../plugins/mail-notification/mail-notification.c:549
 msgid "New email"
 msgstr "新电子邮件"
 
-#: ../plugins/mail-notification/mail-notification.c:566
+#: ../plugins/mail-notification/mail-notification.c:602
 msgid "Show icon in _notification area"
 msgstr "在通知区显示图标(_N)"
 
-#: ../plugins/mail-notification/mail-notification.c:569
+#: ../plugins/mail-notification/mail-notification.c:630
 msgid "B_link icon in notification area"
 msgstr "闪烁通知区图标(_L)"
 
-#: ../plugins/mail-notification/mail-notification.c:571
+#: ../plugins/mail-notification/mail-notification.c:640
 msgid "Popup _message together with the icon"
 msgstr "同时弹出图标和消息(_M)"
 
-#: ../plugins/mail-notification/mail-notification.c:752
+#: ../plugins/mail-notification/mail-notification.c:825
 msgid "_Play sound when new messages arrive"
 msgstr "新邮件到达时播放声音(_P)"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:854
 msgid "_Beep"
 msgstr "响铃(_B)"
 
-#: ../plugins/mail-notification/mail-notification.c:759
-msgid "Play _sound file"
-msgstr "播放声音文件(_S)"
+#: ../plugins/mail-notification/mail-notification.c:867
+msgid "Use sound _theme"
+msgstr "使用声音主题(_T)"
 
-#: ../plugins/mail-notification/mail-notification.c:770
-msgid "Specify _filename:"
-msgstr "指定文件名(_F)："
+#: ../plugins/mail-notification/mail-notification.c:886
+msgid "Play _file:"
+msgstr "播放文件(_F)："
 
-#: ../plugins/mail-notification/mail-notification.c:771
+#: ../plugins/mail-notification/mail-notification.c:897
 msgid "Select sound file"
 msgstr "选择声音文件"
 
-#: ../plugins/mail-notification/mail-notification.c:772
-msgid "Pl_ay"
-msgstr "播放(_A)"
-
-#: ../plugins/mail-notification/mail-notification.c:829
+#: ../plugins/mail-notification/mail-notification.c:955
 msgid "Notify new messages for _Inbox only"
 msgstr "只通知收件箱中的新信件(_I)"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid ""
-"Generates a D-Bus message or notifies the user with an icon in notification "
-"area and a notification message whenever a new message has arrived."
-msgstr "当新邮件到达时使用通知区图标和通知消息通知用户或生成一条 D-Bus 消息。"
+#: ../plugins/mail-notification/mail-notification.c:964
+msgid "Generate a _D-Bus message"
+msgstr "生成 _D-Bus 消息"
 
-#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid "Mail Notification"
 msgstr "邮件通知"
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Notifies you when new mail messages arrive."
+msgstr "当新的邮件信息到达时提示您。"
+
+#. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
+#: ../plugins/mail-to-task/mail-to-task.c:166
+#, c-format
+msgid "Created from a mail by %s"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:496
+#, c-format
+msgid ""
+"Selected calendar contains event '%s' already. Would you like to edit the "
+"old event?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:499
+#, c-format
+msgid ""
+"Selected task list contains task '%s' already. Would you like to edit the "
+"old task?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:502
+#, c-format
+msgid ""
+"Selected memo list contains memo '%s' already. Would you like to edit the "
+"old memo?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:519
+msgid ""
+"Selected calendar contains some events for the given mails already. Would "
+"you like to create new events anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
-"A plugin which allows the creation of meetings from the contents of a mail "
-"message."
-msgstr "允许根据邮件内容创建会议的插件。"
+"Selected task list contains some tasks for the given mails already. Would "
+"you like to create new tasks anyway?"
+msgstr ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:525
+msgid ""
+"Selected memo list contains some memos for the given mails already. Would "
+"you like to create new memos anyway?"
+msgstr ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
-msgid "Con_vert to Meeting"
-msgstr "转换为会议(_V)"
+#: ../plugins/mail-to-task/mail-to-task.c:543
+msgid ""
+"Selected calendar contains an event for the given mail already. Would you "
+"like to create new event anyway?"
+msgid_plural ""
+"Selected calendar contains events for the given mails already. Would you "
+"like to create new events anyway?"
+msgstr[0] ""
 
-#: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:3
-msgid "Mail to meeting"
-msgstr "邮寄到会议"
+#: ../plugins/mail-to-task/mail-to-task.c:549
+msgid ""
+"Selected task list contains a task for the given mail already. Would you "
+"like to create new task anyway?"
+msgid_plural ""
+"Selected task list contains tasks for the given mails already. Would you "
+"like to create new tasks anyway?"
+msgstr[0] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:555
+msgid ""
+"Selected memo list contains a memo for the given mail already. Would you "
+"like to create new memo anyway?"
+msgid_plural ""
+"Selected memo list contains memos for the given mails already. Would you "
+"like to create new memos anyway?"
+msgstr[0] ""
+
+#: ../plugins/mail-to-task/mail-to-task.c:614
+msgid "[No Summary]"
+msgstr "[没有概要]"
+
+#: ../plugins/mail-to-task/mail-to-task.c:625
+msgid "Invalid object returned from a server"
+msgstr "从一个服务器上返回了无效的对象"
+
+#: ../plugins/mail-to-task/mail-to-task.c:696
+#, c-format
+msgid "An error occurred during processing: %s"
+msgstr "在处理时出现了一个错误：%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:287
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "无法打开日历。%s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:292
+#: ../plugins/mail-to-task/mail-to-task.c:732
+#, fuzzy
+msgid ""
+"Selected source is read only, thus cannot create event there. Select other "
+"source, please."
+msgstr "选中的源是只读的，因此不能在此创建任务。请选择其它的源。"
+
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
 msgstr "选中的源是只读的，因此不能在此创建任务。请选择其它的源。"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+#: ../plugins/mail-to-task/mail-to-task.c:738
+#, fuzzy
 msgid ""
-"A plugin which allows the creation of tasks from the contents of a mail "
-"message."
-msgstr "允许根据邮件内容创建任务的插件。"
+"Selected source is read only, thus cannot create memo there. Select other "
+"source, please."
+msgstr "选中的源是只读的，因此不能在此创建任务。请选择其它的源。"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
-msgid "Con_vert to Task"
-msgstr "转换为任务(_V)"
+#: ../plugins/mail-to-task/mail-to-task.c:943
+#, c-format
+msgid "Cannot get source list. %s"
+msgstr "能获取源列表。 %s"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
-msgid "Mail to task"
-msgstr "邮寄到任务"
+#: ../plugins/mail-to-task/mail-to-task.c:1062
+msgid "Create an _Event"
+msgstr "创建一个事件(_E)"
 
-#: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
-msgid "Convert the selected message to a new task"
-msgstr "将选中邮件转换为新任务"
+#: ../plugins/mail-to-task/mail-to-task.c:1064
+msgid "Create a new event from the selected message"
+msgstr "从选择的信息中创建一个新的事件"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
-msgid "Contact list _owner"
-msgstr "联系列表所有者(_O)"
+#: ../plugins/mail-to-task/mail-to-task.c:1069
+msgid "Create a Mem_o"
+msgstr "创建一个备忘(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
-msgid "Get list _archive"
+#: ../plugins/mail-to-task/mail-to-task.c:1071
+msgid "Create a new memo from the selected message"
+msgstr "用所选邮件创建新备忘"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1076
+msgid "Create a _Task"
+msgstr "创建一个任务(_T)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1078
+msgid "Create a new task from the selected message"
+msgstr "用所选邮件创建新任务"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1086
+msgid "Create a _Meeting"
+msgstr "创建一个会议(_M)"
+
+#: ../plugins/mail-to-task/mail-to-task.c:1088
+msgid "Create a new meeting from the selected message"
+msgstr "用所选邮件创建新会议"
+
+#: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Convert a mail message to a task."
+msgstr "转换一个邮件信息成为一个任务。"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:277
+msgid "Get List _Archive"
 msgstr "获得列表存档(_A)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:3
-msgid "Get list _usage information"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:279
+msgid "Get an archive of the list this message belongs to"
+msgstr "获取这封信所属邮件列表的存档"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:284
+msgid "Get List _Usage Information"
 msgstr "获得列表用法信息(_U)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:4
-msgid "Mailing List Actions"
-msgstr "邮件列表操作"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:286
+msgid "Get information about the usage of the list this message belongs to"
+msgstr "获取这封信所属邮件列表的用法信息"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:5
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:7
-msgid "Mailing _List"
-msgstr "邮件列表(_L)"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
+msgid "Contact List _Owner"
+msgstr "联系列表所有者(_O)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid ""
-"Provide actions for common mailing list commands (subscribe, unsubscribe...)."
-msgstr "提供邮件列表公共命令的动作(订阅、退订等等)。"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:293
+msgid "Contact the owner of the mailing list this message belongs to"
+msgstr "联系这封信所属邮件列表的所有者"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
-msgid "_Post message to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
+msgid "_Post Message to List"
 msgstr "投递到列表(_P)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
-msgid "_Subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:300
+msgid "Post a message to the mailing list this message belongs to"
+msgstr "给这封信所属的邮件列表投递"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
+msgid "_Subscribe to List"
 msgstr "订阅列表(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:9
-msgid "_Un-subscribe to list"
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:307
+msgid "Subscribe to the mailing list this message belongs to"
+msgstr "订阅这封信所属的邮件列表"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
+msgid "_Unsubscribe from List"
 msgstr "退订列表(_U)"
 
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:314
+#, fuzzy
+msgid "Unsubscribe from the mailing list this message belongs to"
+msgstr "退订这封信所属的邮件列表"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:321
+msgid "Mailing _List"
+msgstr "邮件列表(_L)"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
+msgid "Mailing List Actions"
+msgstr "邮件列表操作"
+
+#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
+msgid "Perform common mailing list actions (subscribe, unsubscribe, etc.)."
+msgstr "执行普通邮件列表活动 (订阅，取消订阅，等等)。"
+
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:1
 msgid "Action not available"
 msgstr "没有可用的动作"
@@ -18980,11 +18036,6 @@ msgstr "把信件发送到邮件列表吗？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 #, fuzzy
-#| msgid ""
-#| "The action could not be performed. This means the header for this action "
-#| "did not contain any action we could process.\n"
-#| "\n"
-#| "Header: {0}"
 msgid ""
 "The action could not be performed. The header for this action did not "
 "contain any action that could be processed.\n"
@@ -19019,164 +18070,119 @@ msgstr "编辑信件(_E)"
 msgid "_Send message"
 msgstr "发送信件(_S)"
 
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
-msgid "Contact List _Owner"
-msgstr "联系列表所有者(_O)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
-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 List _Archive"
-msgstr "获得列表存档(_A)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:4
-msgid "Get List _Usage Information"
-msgstr "获得列表用法信息(_U)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
-msgid "Get an archive of the list this message belongs to"
-msgstr "获取这封信所属邮件列表的存档"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
-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:8
-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
-msgid "Subscribe to the mailing list this message belongs to"
-msgstr "订阅这封信所属的邮件列表"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
-msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "退订这封信所属的邮件列表"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
-msgid "_Post Message to List"
-msgstr "投递到列表(_P)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
-msgid "_Subscribe to List"
-msgstr "订阅列表(_S)"
-
-#: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:13
-msgid "_Unsubscribe from List"
-msgstr "退订列表(_U)"
-
-#: ../plugins/mark-all-read/mark-all-read.c:39
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "也标记的子文件夹中的信件吗？"
 
-#: ../plugins/mark-all-read/mark-all-read.c:41
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
 msgstr "您是想要只标记当前文件夹中的信件，还是也包括子文件夹中的信件？"
 
-#: ../plugins/mark-all-read/mark-all-read.c:164
-msgid "Current Folder and _Subfolders"
-msgstr "当前文件夹及其子文件夹中(_S)"
+#: ../plugins/mark-all-read/mark-all-read.c:171
+msgid "In Current Folder and _Subfolders"
+msgstr "在当前文件夹和子文件夹(_S)"
+
+#: ../plugins/mark-all-read/mark-all-read.c:185
+msgid "In Current _Folder Only"
+msgstr "只在当前文件夹(_F)"
 
-#: ../plugins/mark-all-read/mark-all-read.c:176
-msgid "Current _Folder Only"
-msgstr "只有当前文件夹(_F)"
+#: ../plugins/mark-all-read/mark-all-read.c:342
+msgid "Mark Me_ssages as Read"
+msgstr "把信件标记为已读(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:1
 msgid "Mark All Read"
 msgstr "全部标为已读"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
-msgid "Mark Me_ssages as Read"
-msgstr "把信件标记为已读(_S)"
-
-#: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
-msgid "Used for marking all the messages under a folder as read"
-msgstr "用于将文件夹内的全部信件全部标为已读"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
-msgid "A plugin which implements mono plugins."
-msgstr "实现 mono 插件的插件。"
-
-#: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:2
-msgid "Mono Loader"
-msgstr "Mono 装入器"
+#, fuzzy
+msgid "Mark all messages in a folder as read."
+msgstr "将此文件夹中的所有信件标记为已读"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
-msgid "A plugin for managing which plugins are enabled or disabled."
-msgstr "管理插件是启用还是禁用的插件。"
+msgid "Manage your Evolution plugins."
+msgstr "管理您的 Evolution 插件。"
 
-#. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:252
+#: ../plugins/plugin-manager/plugin-manager.c:244
 msgid "Plugin Manager"
 msgstr "插件管理器"
 
-#: ../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
-msgid "_Plugins"
-msgstr "插件(_P)"
-
-#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../plugins/plugin-manager/plugin-manager.c:59
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../plugins/plugin-manager/plugin-manager.c:146
-msgid "Configuration"
-msgstr "配置"
-
-#: ../plugins/plugin-manager/plugin-manager.c:265
+#: ../plugins/plugin-manager/plugin-manager.c:259
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些更改直到重新启动后才生效"
 
-#: ../plugins/plugin-manager/plugin-manager.c:291
+#: ../plugins/plugin-manager/plugin-manager.c:285
 msgid "Overview"
 msgstr "概览"
 
-#: ../plugins/plugin-manager/plugin-manager.c:362
-#: ../plugins/plugin-manager/plugin-manager.c:424
+#: ../plugins/plugin-manager/plugin-manager.c:356
+#: ../plugins/plugin-manager/plugin-manager.c:418
 msgid "Plugin"
 msgstr "插件"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
-msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to "
-"disable HTML messages.\n"
-"\n"
-"This plugin is unsupported demonstration code only.\n"
-msgstr ""
-"一个测试插件，它演示了可让您禁用 HTML 邮件的格式化插件。\n"
-"\n"
-"此插件只是一个不提供任何技术支持的演示而已。\n"
+#: ../plugins/plugin-manager/plugin-manager.c:430
+msgid "_Plugins"
+msgstr "插件(_P)"
+
+#: ../plugins/plugin-manager/plugin-manager.c:432
+msgid "Enable and disable plugins"
+msgstr "启用和禁用插件"
 
 #. but then we also need to create our own section frame
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:6
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:2
 msgid "Plain Text Mode"
 msgstr "纯文字模式"
 
-#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:7
-msgid "Prefer plain-text"
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:3
+msgid "Prefer Plain Text"
 msgstr "首选纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:189
+#: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:4
+msgid "View mail messages as plain text, even if they contain HTML content."
+msgstr "作为纯文本来查看邮件信息，甚至在它们包含 HTML 内容时。"
+
+#: ../plugins/prefer-plain/prefer-plain.c:201
 msgid "Show HTML if present"
 msgstr "首选 HTML"
 
-#: ../plugins/prefer-plain/prefer-plain.c:190
-msgid "Prefer PLAIN"
-msgstr "首选纯文本"
+#: ../plugins/prefer-plain/prefer-plain.c:201
+msgid "Let Evolution choose the best part to show."
+msgstr ""
 
-#: ../plugins/prefer-plain/prefer-plain.c:191
-msgid "Only ever show PLAIN"
+#: ../plugins/prefer-plain/prefer-plain.c:202
+#, fuzzy
+msgid "Show plain text if present"
+msgstr "首选 HTML"
+
+#: ../plugins/prefer-plain/prefer-plain.c:202
+msgid ""
+"Show plain text part, if present, otherwise let Evolution choose the best "
+"part to show."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:203
+#, fuzzy
+msgid "Only ever show plain text"
 msgstr "仅显示纯文本"
 
-#: ../plugins/prefer-plain/prefer-plain.c:234
+#: ../plugins/prefer-plain/prefer-plain.c:203
+msgid ""
+"Always show plain text part and make attachments from other parts, if "
+"requested."
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:250
+msgid "Show s_uppressed HTML parts as attachments"
+msgstr ""
+
+#: ../plugins/prefer-plain/prefer-plain.c:270
 msgid "HTML _Mode"
 msgstr "HT_ML 模式"
 
@@ -19185,8 +18191,8 @@ msgid "Evolution Profiler"
 msgstr "Evolution 配置器"
 
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:2
-msgid "Writes a log of profiling data events."
-msgstr "编写配置数据事件的日志。"
+msgid "Profile data events in Evolution (for developers only)."
+msgstr ""
 
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Import Outlook messages from PST file"
@@ -19200,365 +18206,381 @@ msgstr "Outlook PST 导入"
 msgid "Outlook personal folders (.pst)"
 msgstr "Outlook 个人文件夹(.pst)"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-msgid "Allows calendars to be published to the web"
-msgstr "允许将日历发布到 Web"
+#: ../plugins/pst-import/pst-importer.c:299
+msgid "_Mail"
+msgstr "邮件(_M)"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
+#. Address book
+#: ../plugins/pst-import/pst-importer.c:317
+msgid "_Address Book"
+msgstr "地址簿(_A)"
+
+#. Appointments
+#: ../plugins/pst-import/pst-importer.c:324
+msgid "A_ppointments"
+msgstr "约会(_P)"
+
+#. Tasks
+#: ../plugins/pst-import/pst-importer.c:330 ../views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "任务(_T)"
+
+#. Journal
+#: ../plugins/pst-import/pst-importer.c:336
+#, fuzzy
+msgid "_Journal entries"
+msgstr "日记"
+
+#: ../plugins/pst-import/pst-importer.c:351
+#, fuzzy
+msgid "Importing Outlook data"
+msgstr "导入 Elm 数据"
+
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
 msgid "Calendar Publishing"
 msgstr "日历发布"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Locations"
 msgstr "位置"
 
-#: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
-msgid "_Publish Calendar Information"
-msgstr "发布日历信息(_P)"
+#: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
+#, fuzzy
+msgid "Publish calendars to the web."
+msgstr "允许将日历发布到 Web"
 
-#: ../plugins/publish-calendar/publish-calendar.c:596
+#: ../plugins/publish-calendar/publish-calendar.c:94
+#: ../plugins/publish-calendar/publish-calendar.c:336
+#, c-format
+msgid "Could not open %s:"
+msgstr "无法打开 %s："
+
+#: ../plugins/publish-calendar/publish-calendar.c:96
+#, c-format
+msgid "Could not open %s: Unknown error"
+msgstr "无法打开 %s：未知错误"
+
+#: ../plugins/publish-calendar/publish-calendar.c:116
+#, c-format
+msgid "There was an error while publishing to %s:"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:118
+#, c-format
+msgid "Publishing to %s finished successfully"
+msgstr ""
+
+#: ../plugins/publish-calendar/publish-calendar.c:163
+#, c-format
+msgid "Mount of %s failed:"
+msgstr "加载 %s 失败："
+
+#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.ui.h:4
+msgid "E_nable"
+msgstr "启用(_N)"
+
+#: ../plugins/publish-calendar/publish-calendar.c:629
 msgid "Are you sure you want to remove this location?"
 msgstr "您确定您想要删除此位置吗？"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:2
-msgid "<span weight=\"bold\">Location</span>"
-msgstr "<span weight=\"bold\">位置</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:939
+#, fuzzy
+msgid "Could not create publish thread."
+msgstr "无法创建信件。"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:4
-msgid "<span weight=\"bold\">Sources</span>"
-msgstr "<span weight=\"bold\">源</span>"
+#: ../plugins/publish-calendar/publish-calendar.c:946
+msgid "_Publish Calendar Information"
+msgstr "发布日历信息(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:6
-msgid ""
-"Daily\n"
-"Weekly\n"
-"Manual (via Actions menu)"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Custom Location"
+msgstr "自定义位置"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:3
+msgid "Daily"
+msgstr "每天"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:5
+msgid "FTP (with login)"
+msgstr "FTP (使用登录)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:9
+#, fuzzy
+msgid "Manual (via Actions menu)"
 msgstr ""
 "每天\n"
 "每周\n"
 "手动(通过动作菜单)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "启用(_N)"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:11
 msgid "P_ort:"
 msgstr "端口(_O)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:11
+#: ../plugins/publish-calendar/publish-calendar.ui.h:12
+msgid "Public FTP"
+msgstr "公共 FTP"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:13
 msgid "Publishing Location"
 msgstr "发布位置"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:12
+#: ../plugins/publish-calendar/publish-calendar.ui.h:14
 msgid "Publishing _Frequency:"
 msgstr "发布频率(_F)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:13
-msgid ""
-"Secure FTP (SSH)\n"
-"Public FTP\n"
-"FTP (with login)\n"
-"Windows share\n"
-"WebDAV (HTTP)\n"
-"Secure WebDAV (HTTPS)\n"
-"Custom Location"
-msgstr ""
-"安全 FTP (SSH)\n"
-"公开 FTP\n"
-"FTP (需登录)\n"
-"Windows 共享\n"
-"WebDAV (HTTP)\n"
-"安全 WebDAV (HTTPS)\n"
-"自定义位置"
-
-#: ../plugins/publish-calendar/publish-calendar.glade.h:20
+#: ../plugins/publish-calendar/publish-calendar.ui.h:15
+msgid "Secure FTP (SSH)"
+msgstr "安全 FTP (SSH)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:16
+msgid "Secure WebDAV (HTTPS)"
+msgstr "安全 WebDAV (HTTPS)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "Service _type:"
 msgstr "服务类型(_T)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:22
+#: ../plugins/publish-calendar/publish-calendar.ui.h:18
+msgid "Sources"
+msgstr "来源"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:19
+msgid "Time _duration:"
+msgstr "时长(_D)："
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:20
+msgid "WebDAV (HTTP)"
+msgstr "WebDAV (HTTP)"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Weekly"
+msgstr "每周"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:22
+msgid "Windows share"
+msgstr "窗口共享"
+
+#: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_File:"
 msgstr "文件(_F)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+#: ../plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:24
+#: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "_Publish as:"
 msgstr "发布为(_P)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+#: ../plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "_Remember password"
 msgstr "记住密码(_R)"
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+#: ../plugins/publish-calendar/publish-calendar.ui.h:29
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-msgid ""
-"iCal\n"
-"Free/Busy"
-msgstr ""
-"iCal\n"
-"忙/闲"
+#: ../plugins/publish-calendar/publish-calendar.ui.h:31
+msgid "iCal"
+msgstr "iCal"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:461
+#: ../plugins/publish-calendar/publish-format-fb.c:69
+#: ../plugins/publish-calendar/publish-format-ical.c:82
+#, c-format
+msgid "Could not publish calendar: Calendar backend no longer exists"
+msgstr "不能发布日历：日历后端已经不存在了"
+
+#: ../plugins/publish-calendar/url-editor-dialog.c:474
 msgid "New Location"
 msgstr "新建位置"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:463
+#: ../plugins/publish-calendar/url-editor-dialog.c:476
 msgid "Edit Location"
 msgstr "编辑位置"
 
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:1
-#, fuzzy
-msgid "Hello Python"
-msgstr "家庭电话"
-
-#: ../plugins/python/example/org-gnome-hello-python-ui.xml.h:2
-msgid "Python Plugin Loader tests"
-msgstr ""
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:1
-msgid "Python Test Plugin"
-msgstr ""
-
-#: ../plugins/python/example/org-gnome-hello-python.eplug.xml.h:2
-msgid "Test Plugin for Python EPlugin loader."
-msgstr ""
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:1
-msgid "A plugin which loads other plugins written using Python."
-msgstr ""
-
-#: ../plugins/python/org-gnome-evolution-python.eplug.xml.h:2
-msgid "Python Loader"
-msgstr "Python 装入器"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:107
-msgid "SpamAssassin (built-in)"
-msgstr "垃圾克星(内置)"
-
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:133
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:126
 #, fuzzy, c-format
 msgid "SpamAssassin not found, code: %d"
 msgstr "垃圾克星插件"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:141
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:149
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:134
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:142
 #, fuzzy, c-format
 msgid "Failed to create pipe: %s"
 msgstr "创建本地邮件存储“%s”失败：%s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:188
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:181
 #, fuzzy, c-format
 msgid "Error after fork: %s"
 msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:243
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:236
 #, c-format
 msgid "SpamAssassin child process does not respond, killing..."
-msgstr ""
+msgstr "SpamAssassin 子进程没有响应，关闭中..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:245
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:238
 #, c-format
 msgid "Wait for SpamAssassin child process interrupted, terminating..."
-msgstr ""
+msgstr "等待停止 SpamAssassin 子进程，终止中..."
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:254
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:247
 #, c-format
 msgid "Pipe to SpamAssassin failed, error code: %d"
-msgstr ""
+msgstr "SpamAssassin 的管道出错了，错误码：%d"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:497
-#, c-format
-msgid "SpamAssassin is not available."
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:510
+#, fuzzy, c-format
+msgid "SpamAssassin is not available. Please install it first."
 msgstr "垃圾克星不可用。"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:864
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:930
 msgid "This will make SpamAssassin more reliable, but slower"
 msgstr "这将让垃圾克星更可靠，但稍慢"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:870
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:936
 msgid "I_nclude remote tests"
 msgstr "包含远程测试(_N)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid ""
-"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
-"to be installed."
-msgstr "使用垃圾克星过滤垃圾邮件。此插件需要安装 Spamassassin。"
+#, fuzzy
+msgid "Filter junk messages using SpamAssassin."
+msgstr "使用 Bogofilter 过滤垃圾信件。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "SpamAssassin Options"
-msgstr "垃圾克星选项"
+msgid "SpamAssassin Junk Filter"
+msgstr "SpamAssassin 垃圾过滤器"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
-msgid "SpamAssassin junk plugin"
-msgstr "垃圾克星插件"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
-msgid "A plugin for saving all attachments or parts of a message at once."
-msgstr "一次保存全部附件或信件的不同部分的插件。"
-
-#. the path to the shared library
-#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:315
-msgid "Save attachments"
-msgstr "保存附件"
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
-msgid "Save Attachments..."
-msgstr "保存附件..."
-
-#: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
-msgid "Save all attachments"
-msgstr "保存全部附件"
-
-#: ../plugins/save-attachments/save-attachments.c:321
-msgid "Select save base name"
-msgstr "选择保存基础名称"
-
-#: ../plugins/save-attachments/save-attachments.c:340
-msgid "MIME Type"
-msgstr "MIME 类型"
-
-#: ../plugins/save-attachments/save-attachments.c:348
-msgid "Save"
-msgstr "保存"
+msgid "SpamAssassin Options"
+msgstr "垃圾克星选项"
 
 #.
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:163
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "描述列表"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "类别列表"
 
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "注释列表"
 
-#: ../plugins/save-calendar/csv-format.c:367
-msgid "Created"
-msgstr "创建时间"
-
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "开始"
 
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "结束"
 
-#: ../plugins/save-calendar/csv-format.c:372
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "完成百分比"
 
-#: ../plugins/save-calendar/csv-format.c:374
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "出席者列表"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "修改日期"
 
-#: ../plugins/save-calendar/csv-format.c:532
-msgid "Advanced options for the CSV format"
-msgstr "CSV 格式的高级选项"
+#: ../plugins/save-calendar/csv-format.c:520
+msgid "A_dvanced options for the CSV format"
+msgstr "CSV 格式的高级选项(_D)"
 
-#: ../plugins/save-calendar/csv-format.c:539
-msgid "Prepend a header"
-msgstr "前置头"
+#: ../plugins/save-calendar/csv-format.c:527
+msgid "Prepend a _header"
+msgstr "预置标头(_H)"
 
-#: ../plugins/save-calendar/csv-format.c:548
-msgid "Value delimiter:"
-msgstr "值分隔符："
+#: ../plugins/save-calendar/csv-format.c:536
+msgid "_Value delimiter:"
+msgstr "数值分隔符(_V)："
 
-#: ../plugins/save-calendar/csv-format.c:554
-msgid "Record delimiter:"
-msgstr "记录分隔符："
+#: ../plugins/save-calendar/csv-format.c:543
+msgid "_Record delimiter:"
+msgstr "记录分隔符(_R)："
 
-#: ../plugins/save-calendar/csv-format.c:560
-msgid "Encapsulate values with:"
-msgstr "将值以下列形式封装："
+#: ../plugins/save-calendar/csv-format.c:550
+msgid "_Encapsulate values with:"
+msgstr "封装数值使用(_E)："
 
-#: ../plugins/save-calendar/csv-format.c:582
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "逗号分隔的值格式(.csv)"
 
+#: ../plugins/save-calendar/ical-format.c:162
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar 格式(.ics)"
+
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "保存选中"
 
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
-msgid "Saves selected calendar or tasks list to disk."
-msgstr "把选中的日历或任务列表保存到磁盘。"
-
-#: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
-msgid "_Save to Disk"
-msgstr "保存到磁盘(_S)"
+msgid "Save a calendar or task list to disk."
+msgstr "保存一个日历或者任务到磁盘。"
 
 #.
 #. * Translator: the %FT%T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:150
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式(.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:161
+#: ../plugins/save-calendar/save-calendar.c:111
+msgid "_Format:"
+msgstr "格式(_F)："
+
+#: ../plugins/save-calendar/save-calendar.c:172
 msgid "Select destination file"
 msgstr "选择目的文件"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
-msgid "Select one source"
-msgstr "选择一个来源"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:2
-msgid "Selects a single calendar or task source for viewing."
-msgstr "选择要查看的单个日历或任务源。"
-
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
-msgid "Show _only this Calendar"
-msgstr "只显示此日历(_O)"
+#: ../plugins/save-calendar/save-calendar.c:323
+#, fuzzy
+msgid "Save the selected calendar to disk"
+msgstr "把选中的日历或任务列表保存到磁盘。"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
-msgid "Show _only this Memo List"
-msgstr "只显示此备忘列表(_O)"
+#: ../plugins/save-calendar/save-calendar.c:358
+#, fuzzy
+msgid "Save the selected memo list to disk"
+msgstr "把选中的日历或任务列表保存到磁盘。"
 
-#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
-msgid "Show _only this Task List"
-msgstr "只显示此任务列表(_O)"
+#: ../plugins/save-calendar/save-calendar.c:393
+#, fuzzy
+msgid "Save the selected task list to disk"
+msgstr "把选中的日历或任务列表保存到磁盘。"
 
 #: ../plugins/startup-wizard/org-gnome-evolution-startup-wizard.eplug.xml.h:1
 msgid "Guides you through your initial account setup."
@@ -19568,15 +18590,15 @@ msgstr "指引您进行初始帐户的设置。"
 msgid "Setup Assistant"
 msgstr "设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 设置助手"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:92
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:97
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -19589,34 +18611,31 @@ msgstr ""
 "请单击“前进”按钮继续。"
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-msgid "Importing files"
-msgstr "导入文件"
-
-#: ../plugins/startup-wizard/startup-wizard.c:137
-#: ../shell/e-shell-importer.c:141
+#: ../widgets/misc/e-import-assistant.c:386
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
-#: ../plugins/startup-wizard/startup-wizard.c:152
-#: ../shell/e-shell-importer.c:394
+#: ../plugins/startup-wizard/startup-wizard.c:150
+#: ../widgets/misc/e-import-assistant.c:543
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:232
-#: ../shell/e-shell-importer.c:505
-#, c-format
+#: ../plugins/startup-wizard/startup-wizard.c:167
+msgid "Importing files"
+msgstr "导入文件"
+
+#: ../plugins/startup-wizard/startup-wizard.c:230
 msgid "Importing data."
 msgstr "正在导入数据。"
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
-#: ../shell/e-shell-importer.c:519
+#: ../plugins/startup-wizard/startup-wizard.c:232
 msgid "Please wait"
 msgstr "请稍候"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
-msgid "Indicates if threading of messages should fall back to subject."
-msgstr "表明信件线索是否应以主题为准。"
+msgid "Sort mail message threads by subject."
+msgstr "通过主题来排序邮件信息。"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19638,71 +18657,85 @@ msgid ""
 "message body."
 msgstr "消息主体中的用于附件提醒插件的线索列表。"
 
-#: ../plugins/templates/templates.c:603
-msgid "No title"
+#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
+msgid "Drafts based template plugin"
+msgstr "基于草稿的模板型插件"
+
+#: ../plugins/templates/templates.c:617
+msgid "No Title"
 msgstr "无标题"
 
-#: ../plugins/templates/templates.c:711
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "另存为模板(_T)"
 
-#: ../plugins/templates/templates.c:713
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "另存为模板"
 
-#: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-msgid "Drafts based template plugin"
-msgstr ""
-
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
-msgid "A simple plugin which uses yTNEF to decode TNEF attachments."
-msgstr "一个使用 yTNEF 来解码 TNEF 附件的简单插件。"
+msgid "Decode TNEF (winmail.dat) attachments from Microsoft Outlook."
+msgstr "从 Microsoft Outlook 中解码 TNEF (winmail.dat) 附件。"
 
 #: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
-msgid "TNEF Attachment decoder"
-msgstr "TNEF 附件解码器"
+msgid "TNEF Decoder"
+msgstr "TNEF 解码器"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:1
+#, fuzzy
+msgid "Inline vCards"
+msgstr "多个 vCard"
+
+#: ../plugins/vcard-inline/org-gnome-vcard-inline.eplug.xml.h:2
+msgid "Show vCards directly in mail messages."
+msgstr "在邮件信息里直接查看 vCards。"
+
+#: ../plugins/vcard-inline/vcard-inline.c:160
+#: ../plugins/vcard-inline/vcard-inline.c:245
+msgid "Show Full vCard"
+msgstr "显示完整 vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:163
+msgid "Show Compact vCard"
+msgstr "显示紧凑 vCard"
+
+#: ../plugins/vcard-inline/vcard-inline.c:224
+msgid "There is one other contact."
+msgstr "有另外 1 个联系人。"
+
+#: ../plugins/vcard-inline/vcard-inline.c:233
+#, c-format
+msgid "There is %d other contact."
+msgid_plural "There are %d other contacts."
+msgstr[0] "有另外 %d 个联系人。"
+
+#: ../plugins/vcard-inline/vcard-inline.c:254
+msgid "Save in Address Book"
+msgstr "保存至地址簿"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
-msgid "A plugin to setup WebDAV contacts."
-msgstr "设置 WebDAV 联系人的插件。"
+msgid "Add WebDAV contacts to Evolution."
+msgstr "添加 WebDAV 联系人到 Evolution。"
 
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:2
 msgid "WebDAV contacts"
 msgstr "WebDAV 联系人"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:69
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:74
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:100
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:68
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:311
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:295
 msgid "URL:"
 msgstr "URL："
 
-#: ../plugins/webdav-account-setup/webdav-contacts-source.c:338
+#: ../plugins/webdav-account-setup/webdav-contacts-source.c:321
 msgid "_Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr ""
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
-
-#: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
-msgid "Evolution Shell Config factory"
-msgstr "Evolution 外壳配置工厂"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 测试"
-
-#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 测试组件"
+msgstr "避免 IfMatch (需要 Apache < 2.2.8)"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:1
 msgid "Authenticate proxy server connections"
-msgstr ""
+msgstr "认证代理服务器连接"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Automatic proxy configuration URL"
@@ -19717,44 +18750,53 @@ msgid "Default sidebar width"
 msgstr "默认侧边栏宽度"
 
 #: ../shell/apps_evolution_shell.schemas.in.h:5
+#, fuzzy
+msgid "Default window X coordinate"
+msgstr "默认窗口状态"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:6
+#, fuzzy
+msgid "Default window Y coordinate"
+msgstr "默认窗口状态"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window height"
 msgstr "默认窗口高度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "Default window state"
 msgstr "默认窗口状态"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Default window width"
 msgstr "默认窗口宽度"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "Enables the proxy settings when accessing HTTP/Secure HTTP over the Internet."
-msgstr ""
+msgstr "在互联网上连接到 HTTP/HTTPS 时，启用代理设置。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "HTTP proxy host name"
-msgstr ""
+msgstr "HTTP 代理主机名称"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:10
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "HTTP proxy password"
-msgstr "输入密码"
+msgstr "HTTP 代理密码"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:13
 msgid "HTTP proxy port"
-msgstr ""
+msgstr "HTTP 代理端口"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.h:14
 msgid "HTTP proxy username"
-msgstr ""
+msgstr "HTTP 代理用户名"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "启动时默认显示的组件 ID 或别名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "If true, then connections to the proxy server require authentication. The "
 "username is retrieved from the \"/apps/evolution/shell/network_config/"
@@ -19762,45 +18804,62 @@ msgid ""
 "gnome-keyring or the ~/.gnome2_private/Evolution password file."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
+msgid "Initial attachment view"
+msgstr "初始附件视图"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:18
+msgid "Initial file chooser folder"
+msgstr "初始文件选择器文件夹"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:19
+msgid "Initial folder for GtkFileChooser dialogs."
+msgstr "GtkFileChooser 对话框的起始文件夹。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:20
+msgid ""
+"Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is List "
+"View."
+msgstr ""
+
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid "Last upgraded configuration version"
 msgstr "上次升级的配置版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "列出脱机使用时要同步到磁盘的文件夹路径"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Non-proxy hosts"
-msgstr ""
+msgstr "非代理主机"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:24
 msgid "Password to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "用于 HTTP 代理认证的密码。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:19
-#, fuzzy
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Proxy configuration mode"
-msgstr "配置"
+msgstr "代理配置模式"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "SOCKS proxy host name"
-msgstr ""
+msgstr "SOCKS 代理主机名"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "SOCKS proxy port"
-msgstr ""
+msgstr "SOCKS 代理端口"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Secure HTTP proxy host name"
-msgstr ""
+msgstr "安全 HTTP 代理主机名"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid "Secure HTTP proxy port"
-msgstr ""
+msgstr "安全 HTTP 代理端口"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:30
 msgid ""
 "Select the proxy configuration mode. Supported values are 0, 1, 2, and 3 "
 "representing \"use system settings\", \"no proxy\", \"use manual proxy "
@@ -19808,86 +18867,96 @@ msgid ""
 "\" respectively."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Sidebar is visible"
 msgstr "侧边栏可见"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Skip development warning dialog"
 msgstr "跳过开发警告对话框"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:27 ../shell/main.c:483
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:317
 msgid "Start in offline mode"
 msgstr "以脱机模式启动"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:34
 msgid "Statusbar is visible"
 msgstr "状态栏可见"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:35
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Evolution 的配置版本，带主/次/配置级别(如“2.6.0”)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:30
+#: ../shell/apps_evolution_shell.schemas.in.h:36
+#, fuzzy
+msgid "The default X coordinate for the main window."
+msgstr "主窗口的默认宽度，以像素计。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:37
+#, fuzzy
+msgid "The default Y coordinate for the main window."
+msgstr "主窗口的默认宽度，以像素计。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:38
 msgid "The default height for the main window, in pixels."
 msgstr "主窗口的默认高度，以像素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:31
+#: ../shell/apps_evolution_shell.schemas.in.h:39
 msgid "The default width for the main window, in pixels."
 msgstr "主窗口的默认宽度，以像素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:32
+#: ../shell/apps_evolution_shell.schemas.in.h:40
 msgid "The default width for the sidebar, in pixels."
 msgstr "侧边栏的默认宽度，以像素计。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33
+#: ../shell/apps_evolution_shell.schemas.in.h:41
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr "上次升级的 Evolution 配置版本，带主/次/配置级别(如“2.6.0”)。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:34
+#: ../shell/apps_evolution_shell.schemas.in.h:42
 msgid "The machine name to proxy HTTP through."
-msgstr ""
+msgstr "代理 HTTP 的机器名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:35
+#: ../shell/apps_evolution_shell.schemas.in.h:43
 msgid "The machine name to proxy secure HTTP through."
-msgstr ""
+msgstr "代理安全 HTTP 的机器名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:36
+#: ../shell/apps_evolution_shell.schemas.in.h:44
 msgid "The machine name to proxy socks through."
-msgstr ""
+msgstr "代理套接字的机器名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:37
+#: ../shell/apps_evolution_shell.schemas.in.h:45
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "http_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:38
+#: ../shell/apps_evolution_shell.schemas.in.h:46
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "secure_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:39
+#: ../shell/apps_evolution_shell.schemas.in.h:47
 msgid ""
 "The port on the machine defined by \"/apps/evolution/shell/network_config/"
 "socks_host\" that you proxy through."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:40
+#: ../shell/apps_evolution_shell.schemas.in.h:48
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
 msgstr ""
-"窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、"
-"“toolbar”(工具栏)。如果设置为“toolbar”(工具栏)，则工具栏的样式由 GNOME 设置决定。"
+"窗口按钮的样式。可以是“text”(文字)、“icon”(图标)、“both”(二者)、“toolbar”(工"
+"具栏)。如果设置为“toolbar”(工具栏)，则工具栏的样式由 GNOME 设置决定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:41
+#: ../shell/apps_evolution_shell.schemas.in.h:49
 msgid ""
 "This key contains a list of hosts which are connected to directly, rather "
 "than via the proxy (if it is active). The values can be hostnames, domains "
@@ -19895,274 +18964,569 @@ msgid ""
 "IPv6) and network addresses with a netmask (something like 192.168.0.0/24)."
 msgstr ""
 
-#: ../shell/apps_evolution_shell.schemas.in.h:42
+#: ../shell/apps_evolution_shell.schemas.in.h:50
 msgid "Toolbar is visible"
 msgstr "工具栏可见"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:43
+#: ../shell/apps_evolution_shell.schemas.in.h:51
 #, fuzzy
 msgid "URL that provides proxy configuration values."
 msgstr "上次升级的配置版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:44
+#: ../shell/apps_evolution_shell.schemas.in.h:52
 msgid "Use HTTP proxy"
-msgstr ""
+msgstr "使用 HTTP 代理"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:45
+#: ../shell/apps_evolution_shell.schemas.in.h:53
 msgid "User name to pass as authentication when doing HTTP proxying."
-msgstr ""
+msgstr "用于 HTTP 代理认证的用户名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:46
+#: ../shell/apps_evolution_shell.schemas.in.h:54
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "是否以脱机模式而非联机模式启动 Evolution。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:47
+#: ../shell/apps_evolution_shell.schemas.in.h:55
 msgid "Whether or not the window should be maximized."
 msgstr "窗口是否应为最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:48
+#: ../shell/apps_evolution_shell.schemas.in.h:56
 msgid "Whether the sidebar should be visible."
 msgstr "侧边栏是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:49
+#: ../shell/apps_evolution_shell.schemas.in.h:57
 msgid "Whether the status bar should be visible."
 msgstr "状态栏是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:50
+#: ../shell/apps_evolution_shell.schemas.in.h:58
 msgid "Whether the toolbar should be visible."
 msgstr "工具栏是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:51
+#: ../shell/apps_evolution_shell.schemas.in.h:59
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否跳过 Evoltuion 开发版本的警告。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:52
+#: ../shell/apps_evolution_shell.schemas.in.h:60
 msgid "Whether the window buttons should be visible."
 msgstr "窗口按钮是否可见。"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:53
+#: ../shell/apps_evolution_shell.schemas.in.h:61
 msgid "Window button style"
 msgstr "窗口按钮样式"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:54
+#: ../shell/apps_evolution_shell.schemas.in.h:62
 msgid "Window buttons are visible"
 msgstr "窗口按钮可见"
 
-#: ../shell/e-active-connection-dialog.glade.h:1
-msgid "<b>Active Connections</b>"
-msgstr "<b>当前连接</b>"
+#. Translators: The "Show:" label precedes a combo box that
+#. * allows the user to filter the current view.  Examples of
+#. * items that appear in the combo box are "Unread Messages",
+#. * "Important Messages", or "Active Appointments".
+#: ../shell/e-shell-content.c:931
+msgid "Sho_w:"
+msgstr "显示(_W)："
 
-#: ../shell/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "当前连接"
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:956
+msgid "Sear_ch:"
+msgstr "搜索(_C)："
 
-#: ../shell/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "单击确定关闭这些连接，并转入脱机操作"
+#. Scope Combo Widgets
+#. Translators: This is part of the quick search interface.
+#. * example: Search: [_______________] in [ Current Folder ]
+#: ../shell/e-shell-content.c:998
+msgid "i_n"
+msgstr "在(_N) "
 
-#: ../shell/e-shell-importer.c:131
-msgid "Choose the type of importer to run:"
-msgstr "选择要运行的导入器类型："
+#: ../shell/e-shell-content.c:1495
+msgid "Advanced Search"
+msgstr "高级搜索"
 
-#: ../shell/e-shell-importer.c:134
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr "选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。"
+#: ../shell/e-shell-content.c:1557 ../shell/e-shell-content.c:1558
+msgid "Searches"
+msgstr "搜索"
 
-#: ../shell/e-shell-importer.c:138
-msgid "Choose the destination for this import"
-msgstr "选择此导入的目的位置"
+#: ../shell/e-shell-content.c:1604
+msgid "Save Search"
+msgstr "保存搜索"
 
-#: ../shell/e-shell-importer.c:144
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No importable\n"
-"settings found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KB"
+
+#: ../shell/e-shell-switcher.c:446
+msgid "Toolbar Style"
+msgstr "工具栏样式"
+
+#: ../shell/e-shell-switcher.c:447
+msgid "The switcher's toolbar style"
 msgstr ""
-"Evolution 检查了从以下程序导入的设置：Pine、Netscape、Elm、\n"
-"iCalendar。并未发现可导入的设置。如果您想要再试一次，请单击\n"
-"“上一步”按钮。\n"
 
-#: ../shell/e-shell-importer.c:282
-msgid "F_ilename:"
-msgstr "文件名(_I)："
+#: ../shell/e-shell-switcher.c:463
+msgid "Toolbar Visible"
+msgstr "工具栏可见"
 
-#: ../shell/e-shell-importer.c:287
-msgid "Select a file"
-msgstr "选择一个文件"
+#: ../shell/e-shell-switcher.c:464
+msgid "Whether the switcher is visible"
+msgstr "切换器是否可见"
 
-#: ../shell/e-shell-importer.c:296
-msgid "File _type:"
-msgstr "文件类型(_T)："
+#: ../shell/e-shell-view.c:486
+#, fuzzy
+msgid "Switcher Action"
+msgstr "切换到 %s"
 
-#: ../shell/e-shell-importer.c:332
-msgid "Import data and settings from _older programs"
-msgstr "从旧版程序中导入数据和设置(_O)"
+#: ../shell/e-shell-view.c:487
+msgid "The switcher action for this shell view"
+msgstr ""
 
-#: ../shell/e-shell-importer.c:335
-msgid "Import a _single file"
-msgstr "导入单个文件(_S)"
+#: ../shell/e-shell-view.c:502
+msgid "Page Number"
+msgstr "页码"
 
-#: ../shell/e-shell-settings-dialog.c:313
-msgid "Evolution Preferences"
-msgstr "Evolution 首选项"
+#: ../shell/e-shell-view.c:503
+msgid "The notebook page number of the shell view"
+msgstr ""
 
-#. To translators: This is the window title and %s is the
-#. component name. Most translators will want to keep it as is.
-#: ../shell/e-shell-view.c:47 ../shell/e-shell-window.c:328
-#, c-format
-msgid "%s - Evolution"
-msgstr "%s - Evolution"
+#: ../shell/e-shell-view.c:521
+msgid "The title of the shell view"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:75
-msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot 工具好像并未安装到系统中。"
+#: ../shell/e-shell-view.c:536
+msgid "The EShellBackend for this shell view"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:83
-#, c-format
-msgid "Error executing %s."
-msgstr "执行 %s 错误。"
+#: ../shell/e-shell-view.c:551
+msgid "Shell Content Widget"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:139
-msgid "Bug buddy is not installed."
-msgstr "未安装 Bug buddy。"
+#: ../shell/e-shell-view.c:552
+msgid "The content widget appears in a shell window's right pane"
+msgstr ""
 
-#: ../shell/e-shell-window-commands.c:142
-msgid "Bug buddy could not be run."
-msgstr "无法运行 Bug buddy。"
+#: ../shell/e-shell-view.c:568
+#, fuzzy
+msgid "Shell Sidebar Widget"
+msgstr "默认侧边栏宽度"
+
+#: ../shell/e-shell-view.c:569
+msgid "The sidebar widget appears in a shell window's left pane"
+msgstr ""
+
+#: ../shell/e-shell-view.c:584
+#, fuzzy
+msgid "Shell Taskbar Widget"
+msgstr "选择任务列表"
+
+#: ../shell/e-shell-view.c:585
+msgid "The taskbar widget appears at the bottom of a shell window"
+msgstr ""
+
+#: ../shell/e-shell-view.c:600
+#, fuzzy
+msgid "Shell Window"
+msgstr "新建窗口(_W)"
+
+#: ../shell/e-shell-view.c:601
+msgid "The window to which the shell view belongs"
+msgstr ""
+
+#: ../shell/e-shell-view.c:616
+#, fuzzy
+msgid "Current View ID"
+msgstr "当前视图(_C)"
+
+#: ../shell/e-shell-view.c:617
+#, fuzzy
+msgid "The current GAL view ID"
+msgstr "当前时间"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:942
+#: ../shell/e-shell-window-actions.c:643
 msgid "translator-credits"
 msgstr ""
 "开源软件国际化之简体中文组\n"
 "http://i18n.linux.net.cn"
 
-#: ../shell/e-shell-window-commands.c:953
+#: ../shell/e-shell-window-actions.c:654
 msgid "Evolution Website"
 msgstr "Evolution 网站"
 
-#: ../shell/e-shell-window-commands.c:1170
-msgid "_Work Online"
-msgstr "联机工作(_W)"
+#: ../shell/e-shell-window-actions.c:1295
+#, fuzzy
+msgid "Bug Buddy is not installed."
+msgstr "未安装 Bug buddy。"
+
+#: ../shell/e-shell-window-actions.c:1297
+#, fuzzy
+msgid "Bug Buddy could not be run."
+msgstr "无法运行 Bug buddy。"
+
+#: ../shell/e-shell-window-actions.c:1399
+msgid "GNOME Pilot is not installed."
+msgstr "GNOME Pilot 没有安装。"
+
+#: ../shell/e-shell-window-actions.c:1401
+msgid "GNOME Pilot could not be run."
+msgstr "GNOME Pilot 不能运行。"
+
+#: ../shell/e-shell-window-actions.c:1495
+msgid "Show information about Evolution"
+msgstr "显示关于 Evolution 的信息"
+
+#: ../shell/e-shell-window-actions.c:1500
+msgid "_Close Window"
+msgstr "关闭窗口(_C)"
+
+#: ../shell/e-shell-window-actions.c:1507
+#, fuzzy
+msgid "_Contents"
+msgstr "联系人"
+
+#: ../shell/e-shell-window-actions.c:1509
+msgid "Open the Evolution User Guide"
+msgstr "打开 Evolution 用户指南"
+
+#: ../shell/e-shell-window-actions.c:1514
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../shell/e-shell-window-actions.c:1516
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "打开 FAQ 网页"
+
+#: ../shell/e-shell-window-actions.c:1521
+msgid "_Forget Passwords"
+msgstr "丢弃密码(_F)"
+
+#: ../shell/e-shell-window-actions.c:1523
+msgid "Forget all remembered passwords"
+msgstr "忘记所有记住的密码"
+
+#: ../shell/e-shell-window-actions.c:1528
+msgid "I_mport..."
+msgstr "导入(_M)..."
+
+#: ../shell/e-shell-window-actions.c:1530
+msgid "Import data from other programs"
+msgstr "从其它程序导入数据"
 
-#: ../shell/e-shell-window-commands.c:1183 ../ui/evolution.xml.h:57
+#: ../shell/e-shell-window-actions.c:1535
+msgid "New _Window"
+msgstr "新建窗口(_W)"
+
+#: ../shell/e-shell-window-actions.c:1537
+msgid "Create a new window displaying this view"
+msgstr "创建一个新窗口来显示这个视图"
+
+#: ../shell/e-shell-window-actions.c:1544
+msgid "Configure Evolution"
+msgstr "配置 Evolution"
+
+#: ../shell/e-shell-window-actions.c:1549
+msgid "_Quick Reference"
+msgstr "快速首选项(_Q)"
+
+#: ../shell/e-shell-window-actions.c:1551
+#, fuzzy
+msgid "Show Evolution's shortcut keys"
+msgstr "更改 Evolution 的设置"
+
+#: ../shell/e-shell-window-actions.c:1558
+msgid "Exit the program"
+msgstr "退出程序"
+
+#: ../shell/e-shell-window-actions.c:1563
+msgid "_Advanced Search..."
+msgstr "高级搜索(_A)..."
+
+#: ../shell/e-shell-window-actions.c:1565
+msgid "Construct a more advanced search"
+msgstr ""
+
+#: ../shell/e-shell-window-actions.c:1572
+#, fuzzy
+msgid "Clear the current search parameters"
+msgstr "取消当前邮件操作"
+
+#: ../shell/e-shell-window-actions.c:1577
+msgid "_Edit Saved Searches..."
+msgstr "编辑保存的搜索(_E)..."
+
+#: ../shell/e-shell-window-actions.c:1579
+msgid "Manage your saved searches"
+msgstr "管理您保存的搜索"
+
+#: ../shell/e-shell-window-actions.c:1586
+msgid "Click here to change the search type"
+msgstr "单击此处更改搜索类型"
+
+#: ../shell/e-shell-window-actions.c:1591
+msgid "_Find Now"
+msgstr "立即查找(_F)"
+
+#. Block the default Ctrl+F.
+#: ../shell/e-shell-window-actions.c:1593
+#, fuzzy
+msgid "Execute the current search parameters"
+msgstr "取消当前邮件操作"
+
+#: ../shell/e-shell-window-actions.c:1598
+msgid "_Save Search..."
+msgstr "保存搜索(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1600
+#, fuzzy
+msgid "Save the current search parameters"
+msgstr "保存当前文件"
+
+#: ../shell/e-shell-window-actions.c:1605
+msgid "Send / _Receive"
+msgstr "发送/接收(_R)"
+
+#: ../shell/e-shell-window-actions.c:1607
+msgid "Send queued items and retrieve new items"
+msgstr "发送队列中的的邮件并收取新邮件"
+
+#: ../shell/e-shell-window-actions.c:1612
+#, fuzzy
+msgid "Submit _Bug Report..."
+msgstr "提交错误报告(_B)"
+
+#: ../shell/e-shell-window-actions.c:1614
+msgid "Submit a bug report using Bug Buddy"
+msgstr "用 Bug Buddy 提交错误报告"
+
+#: ../shell/e-shell-window-actions.c:1619
+msgid "_Synchronization Options..."
+msgstr "同步选项(_S)..."
+
+#: ../shell/e-shell-window-actions.c:1621
+msgid "Set up Pilot configuration"
+msgstr "配置 Pilot"
+
+#: ../shell/e-shell-window-actions.c:1626
 msgid "_Work Offline"
 msgstr "脱机工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:1196
-msgid "Work Offline"
-msgstr "脱机工作"
+#: ../shell/e-shell-window-actions.c:1628
+#, fuzzy
+msgid "Put Evolution into offline mode"
+msgstr "以脱机模式启动"
 
-#: ../shell/e-shell-window.c:377
-msgid ""
-"Evolution is currently online.\n"
-"Click on this button to work offline."
-msgstr "Evolution 目前联机。\n单击该按钮可脱机工作。"
+#: ../shell/e-shell-window-actions.c:1633
+msgid "_Work Online"
+msgstr "联机工作(_W)"
 
-#: ../shell/e-shell-window.c:384
-msgid "Evolution is in the process of going offline."
-msgstr "Evolution 正在脱机过程中。"
+#: ../shell/e-shell-window-actions.c:1635
+#, fuzzy
+msgid "Put Evolution into online mode"
+msgstr "以联机模式启动"
 
-#: ../shell/e-shell-window.c:391
-msgid ""
-"Evolution is currently offline.\n"
-"Click on this button to work online."
-msgstr "Evolution 目前脱机。\n单击该按钮可联机工作。"
+#: ../shell/e-shell-window-actions.c:1663
+msgid "Lay_out"
+msgstr "布局(_O)"
 
-#: ../shell/e-shell-window.c:787
-#, c-format
-msgid "Switch to %s"
-msgstr "切换到 %s"
+#: ../shell/e-shell-window-actions.c:1670
+msgid "_New"
+msgstr "新建(_N)"
 
-#: ../shell/e-shell.c:640
-msgid "Unknown system error."
-msgstr "未知的系统错误。"
+#: ../shell/e-shell-window-actions.c:1677
+msgid "_Search"
+msgstr "搜索(_S)"
 
-#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KB"
+#: ../shell/e-shell-window-actions.c:1684
+msgid "_Switcher Appearance"
+msgstr "切换器外观(_S)"
 
-#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:313
-msgid "OK"
-msgstr "确定"
+#: ../shell/e-shell-window-actions.c:1698
+msgid "_Window"
+msgstr "窗口(_W)"
+
+#: ../shell/e-shell-window-actions.c:1708
+msgid "Show Side _Bar"
+msgstr "显示侧边栏(_B)"
+
+#: ../shell/e-shell-window-actions.c:1710
+msgid "Show the side bar"
+msgstr "显示侧边栏"
+
+#: ../shell/e-shell-window-actions.c:1716
+msgid "Show _Status Bar"
+msgstr "显示状态栏(_S)"
+
+#: ../shell/e-shell-window-actions.c:1718
+msgid "Show the status bar"
+msgstr "显示状态栏"
 
-#: ../shell/e-shell.c:1263
-msgid "Invalid arguments"
-msgstr "无效参数"
+#: ../shell/e-shell-window-actions.c:1724
+msgid "Show _Buttons"
+msgstr "显示按钮(_B)"
 
-#: ../shell/e-shell.c:1265
-msgid "Cannot register on OAF"
-msgstr "无法注册到 OAF"
+#: ../shell/e-shell-window-actions.c:1726
+msgid "Show the switcher buttons"
+msgstr "显示切换器按钮"
 
-#: ../shell/e-shell.c:1267
-msgid "Configuration Database not found"
-msgstr "找不到配置数据库"
+#: ../shell/e-shell-window-actions.c:1732
+msgid "Show _Tool Bar"
+msgstr "显示工具栏(_T)"
 
-#: ../shell/e-user-creatable-items-handler.c:678
-#: ../shell/e-user-creatable-items-handler.c:688
-#: ../shell/e-user-creatable-items-handler.c:693
+#: ../shell/e-shell-window-actions.c:1734
+msgid "Show the toolbar"
+msgstr "显示工具栏"
+
+#: ../shell/e-shell-window-actions.c:1756
+msgid "_Icons Only"
+msgstr "只有图标(_I)"
+
+#: ../shell/e-shell-window-actions.c:1758
+msgid "Display window buttons with icons only"
+msgstr "显示只有图标的窗口按钮"
+
+#: ../shell/e-shell-window-actions.c:1763
+msgid "_Text Only"
+msgstr "只有文字(_T)"
+
+#: ../shell/e-shell-window-actions.c:1765
+msgid "Display window buttons with text only"
+msgstr "显示只有文字的窗口按钮"
+
+#: ../shell/e-shell-window-actions.c:1770
+msgid "Icons _and Text"
+msgstr "图标和文字(_A)"
+
+#: ../shell/e-shell-window-actions.c:1772
+msgid "Display window buttons with icons and text"
+msgstr "显示带图标和文字的窗口按钮"
+
+#: ../shell/e-shell-window-actions.c:1777
+msgid "Tool_bar Style"
+msgstr "工具栏样式(_B)"
+
+#: ../shell/e-shell-window-actions.c:1779
+msgid "Display window buttons using the desktop toolbar setting"
+msgstr "使用桌面工具栏设置显示窗口按钮"
+
+#: ../shell/e-shell-window-actions.c:1787
+msgid "Define Views..."
+msgstr "定义视图..."
+
+#: ../shell/e-shell-window-actions.c:1789
+msgid "Create or edit views"
+msgstr "创建或编辑视图"
+
+#: ../shell/e-shell-window-actions.c:1794
+msgid "Save Custom View..."
+msgstr "保存当前视图..."
+
+#: ../shell/e-shell-window-actions.c:1796
+msgid "Save current custom view"
+msgstr "保存当前自定义视图"
+
+#: ../shell/e-shell-window-actions.c:1803
+msgid "C_urrent View"
+msgstr "当前视图(_U)"
+
+#: ../shell/e-shell-window-actions.c:1813
+msgid "Custom View"
+msgstr "当前视图"
+
+#: ../shell/e-shell-window-actions.c:1815
+msgid "Current view is a customized view"
+msgstr "当前视图为自定义视图"
+
+#: ../shell/e-shell-window-actions.c:1825
+#, fuzzy
+msgid "Change the page settings for your current printer"
+msgstr "设定您当前打印机的页面设置"
+
+#: ../shell/e-shell-window-actions.c:2097
+#, c-format
+msgid "Switch to %s"
+msgstr "切换到 %s"
+
+#: ../shell/e-shell-window-actions.c:2300
+msgid "Execute these search parameters"
+msgstr ""
+
+#: ../shell/e-shell-window-private.c:254
 msgid "New"
 msgstr "新建"
 
-#: ../shell/test/evolution-test-component.c:105
-msgid "New Test"
-msgstr "新建测试"
+#. Translators: This is used for the main window title.
+#: ../shell/e-shell-window-private.c:588
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
 
-#: ../shell/test/evolution-test-component.c:106
-msgctxt "New"
-msgid "_Test"
-msgstr "测试(_T)"
+#: ../shell/e-shell-window.c:308
+msgid "Active Shell View"
+msgstr ""
 
-#: ../shell/test/evolution-test-component.c:107
-msgid "Create a new test item"
-msgstr "创建新测试项"
+#: ../shell/e-shell-window.c:309
+#, fuzzy
+msgid "Name of the active shell view"
+msgstr "新视图的名称："
 
-#: ../shell/import.glade.h:1
-msgid "Click \"Import\" to begin importing the file into Evolution. "
-msgstr "单击“导入”以便开始将文件导入到 Evolution。"
+#: ../shell/e-shell-window.c:323 ../shell/e-shell.c:743
+msgid "Geometry"
+msgstr ""
 
-#: ../shell/import.glade.h:2
-msgid "Evolution Import Assistant"
-msgstr "Evolution 导入助手"
+#: ../shell/e-shell-window.c:324 ../shell/e-shell.c:744
+msgid "Initial window geometry string"
+msgstr ""
 
-#: ../shell/import.glade.h:3
-msgid "Import File"
-msgstr "导入文件"
+#: ../shell/e-shell-window.c:339
+msgid "Safe Mode"
+msgstr "安全模式"
 
-#: ../shell/import.glade.h:4
-msgid "Import Location"
-msgstr "导入位置"
+#: ../shell/e-shell-window.c:340
+#, fuzzy
+msgid "Whether the shell window is in safe mode"
+msgstr "插件是否已启用"
 
-#: ../shell/import.glade.h:5
-msgid "Importer Type"
-msgstr "导入器类型"
+#: ../shell/e-shell-window.c:371
+msgid "UI Manager"
+msgstr "UI 管理器"
 
-#: ../shell/import.glade.h:6
-msgid "Select Information to Import"
-msgstr "选择要导入的信息"
+#: ../shell/e-shell-window.c:372
+msgid "The shell window's GtkUIManager"
+msgstr ""
 
-#: ../shell/import.glade.h:7
-msgid "Select a File"
-msgstr "选择一个文件"
+#: ../shell/e-shell.c:211
+msgid "Preparing to go offline..."
+msgstr "正在准备离线..."
 
-#: ../shell/import.glade.h:8
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of\n"
-"importing external files into Evolution."
+#: ../shell/e-shell.c:265
+msgid "Preparing to go online..."
+msgstr "正在准备上线..."
+
+#: ../shell/e-shell.c:337
+msgid "Preparing to quit..."
 msgstr ""
-"欢迎使用 Evolution 导入助手。\n"
-"本助手将全程指导您将外部文件导入 Evolution。"
+
+#: ../shell/e-shell.c:759
+msgid "Network Available"
+msgstr "网络可用"
+
+#: ../shell/e-shell.c:760
+msgid "Whether the network is available"
+msgstr "网络是否可用"
+
+#: ../shell/e-shell.c:775 ../widgets/misc/e-online-button.c:130
+msgid "Online"
+msgstr "在线"
+
+#: ../shell/e-shell.c:776
+#, fuzzy
+msgid "Whether the shell is online"
+msgstr "插件是否已启用"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:221
+#: ../shell/main.c:162
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20194,7 +19558,7 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: ../shell/main.c:245
+#: ../shell/main.c:186
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20202,43 +19566,57 @@ msgstr ""
 "感谢\n"
 "Evolution 团队\n"
 
-#: ../shell/main.c:252
+#: ../shell/main.c:193
 msgid "Do not tell me again"
 msgstr "不要再通知我"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:313
 msgid "Start Evolution activating the specified component"
 msgstr "启动 Evolution 并激活指定组件"
 
-#: ../shell/main.c:485
+#: ../shell/main.c:315
+msgid "Apply the given geometry to the main window"
+msgstr ""
+
+#: ../shell/main.c:319
 msgid "Start in online mode"
 msgstr "以联机模式启动"
 
-#: ../shell/main.c:488
-msgid "Forcibly shut down all Evolution components"
+#: ../shell/main.c:322
+#, fuzzy
+msgid "Forcibly shut down Evolution"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: ../shell/main.c:492
+#: ../shell/main.c:326
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "强制从 Evolution 1.4 重新升迁"
 
-#: ../shell/main.c:495
+#: ../shell/main.c:329
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: ../shell/main.c:497
+#: ../shell/main.c:331
 msgid "Disable loading of any plugins."
 msgstr "禁止装入任何插件。"
 
-#: ../shell/main.c:499
+#: ../shell/main.c:333
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "禁用邮件、联系人和任务的预览面板。"
 
-#: ../shell/main.c:586
+#: ../shell/main.c:337
+msgid "Import URIs or file names given as rest of arguments."
+msgstr ""
+
+#: ../shell/main.c:339
+#, fuzzy
+msgid "Request a running Evolution process to quit"
+msgstr "重新启动 Evolution"
+
+#: ../shell/main.c:496
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution 个人信息管理和邮件客户"
 
-#: ../shell/main.c:614
+#: ../shell/main.c:521
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20252,36 +19630,28 @@ msgid "Are you sure you want to forget all remembered passwords?"
 msgstr "您确定要忘记记住的所有密码吗？"
 
 #: ../shell/shell.error.xml.h:2
-msgid "Cannot start Evolution"
-msgstr "无法启动 Evolution"
-
-#: ../shell/shell.error.xml.h:3
 msgid "Continue"
 msgstr "继续"
 
-#: ../shell/shell.error.xml.h:4
+#: ../shell/shell.error.xml.h:3
 msgid "Delete old data from version {0}?"
 msgstr "删除版本 {0} 中的旧数据吗？"
 
-#: ../shell/shell.error.xml.h:5
-msgid "Evolution can not start."
-msgstr "Evolution 无法启动。"
-
-#: ../shell/shell.error.xml.h:6
+#: ../shell/shell.error.xml.h:4
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
 msgstr "忘记您的密码将清除记住的全部密码。下次需要密码的时候，您必须重新输入。"
 
-#: ../shell/shell.error.xml.h:8
+#: ../shell/shell.error.xml.h:6
 msgid "Insufficient disk space for upgrade."
 msgstr "磁盘空间不足以进行升级。"
 
-#: ../shell/shell.error.xml.h:9
+#: ../shell/shell.error.xml.h:7
 msgid "Really delete old data?"
 msgstr "真的要删除旧数据吗？"
 
-#: ../shell/shell.error.xml.h:10
+#: ../shell/shell.error.xml.h:8
 msgid ""
 "The entire contents of the &quot;evolution&quot; directory are about to be "
 "permanently removed.\n"
@@ -20300,16 +19670,8 @@ msgstr ""
 "\n"
 "删除之后，您将无法降级至先前版本的 Evolution，除非您手动从头来过。\n"
 
-#: ../shell/shell.error.xml.h:16
+#: ../shell/shell.error.xml.h:14
 #, fuzzy
-#| msgid ""
-#| "The previous version of evolution stored its data in a different "
-#| "location.\n"
-#| "\n"
-#| "If you choose to remove this data, the entire contents of the &quot;"
-#| "evolution&quot; directory will be removed permanently. If you choose to "
-#| "keep this data, then you may manually remove the contents of &quot;"
-#| "evolution&quot; at your convenience.\n"
 msgid ""
 "The previous version of Evolution stored its data in a different location.\n"
 "\n"
@@ -20323,11 +19685,11 @@ msgstr ""
 "如果您选择删除此数据，“evolution”目录中的全部内容都将被永久删除。如果您选择保"
 "留此数据，那么您可以在您方便的时候手动删除“evolution”目录。\n"
 
-#: ../shell/shell.error.xml.h:20
-msgid "Upgrade from previous version failed: {0}"
-msgstr "从先前版本升级失败：{0}"
+#: ../shell/shell.error.xml.h:18
+msgid "Upgrade from previous version failed:"
+msgstr "从先前版本升级失败："
 
-#: ../shell/shell.error.xml.h:21
+#: ../shell/shell.error.xml.h:19
 msgid ""
 "Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
@@ -20339,45 +19701,22 @@ msgstr ""
 "\n"
 "您需要在继续之前在主目录中腾出更多空间。"
 
-#: ../shell/shell.error.xml.h:24
-msgid ""
-"Your system configuration does not match your Evolution configuration.\n"
-"\n"
-"Click help for details"
-msgstr ""
-"您的系统配置与您的 Evolution 配置不符。\n"
-"\n"
-"请单击帮助查看详情"
-
-#: ../shell/shell.error.xml.h:27
-msgid ""
-"Your system configuration does not match your Evolution configuration:\n"
-"\n"
-"{0}\n"
-"\n"
-"Click help for details."
-msgstr ""
-"您的系统配置与您的 Evolution 配置不符：\n"
-"\n"
-"{0}\n"
-"\n"
-"请单击帮助查看详情。"
-
-#: ../shell/shell.error.xml.h:32
+#: ../shell/shell.error.xml.h:22
 msgid "_Forget"
 msgstr "忘记(_F)"
 
-#: ../shell/shell.error.xml.h:33
+#: ../shell/shell.error.xml.h:23
 msgid "_Keep Data"
 msgstr "保留数据(_K)"
 
-#: ../shell/shell.error.xml.h:34
+#: ../shell/shell.error.xml.h:24
 msgid "_Remind Me Later"
 msgstr "稍后提醒(_R)"
 
-#: ../shell/shell.error.xml.h:35
+#: ../shell/shell.error.xml.h:25
+#, fuzzy
 msgid ""
-"{1}\n"
+"{0}\n"
 "\n"
 "If you choose to continue, you may not have access to some of your old "
 "data.\n"
@@ -20386,7 +19725,91 @@ msgstr ""
 "\n"
 "如果您选择继续，您可能无法访问您的某些旧数据。\n"
 
-#: ../smime/gui/ca-trust-dialog.c:102
+#: ../shell/test/e-test-shell-backend.c:60
+msgctxt "New"
+msgid "_Test Item"
+msgstr "测试条目(_T)"
+
+#: ../shell/test/e-test-shell-backend.c:62
+msgid "Create a new test item"
+msgstr "创建新测试项"
+
+#: ../shell/test/e-test-shell-backend.c:70
+msgctxt "New"
+msgid "Test _Source"
+msgstr "测试来源(_S)"
+
+#: ../shell/test/e-test-shell-backend.c:72
+msgid "Create a new test source"
+msgstr "创建一个新的测试来源"
+
+#: ../smclient/eggdesktopfile.c:165
+#, c-format
+msgid "File is not a valid .desktop file"
+msgstr "文件不是一个有效的 .desktop 文件"
+
+#: ../smclient/eggdesktopfile.c:188
+#, c-format
+msgid "Unrecognized desktop file Version '%s'"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:958
+#, c-format
+msgid "Starting %s"
+msgstr "启动 %s"
+
+#: ../smclient/eggdesktopfile.c:1100
+#, c-format
+msgid "Application does not accept documents on command line"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1168
+#, c-format
+msgid "Unrecognized launch option: %d"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1373
+#, c-format
+msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+msgstr ""
+
+#: ../smclient/eggdesktopfile.c:1394
+#, c-format
+msgid "Not a launchable item"
+msgstr "不是一个可加载的条目"
+
+#: ../smclient/eggsmclient.c:225
+#, fuzzy
+msgid "Disable connection to session manager"
+msgstr "直接连接到 Internet(_D)"
+
+#: ../smclient/eggsmclient.c:228
+#, fuzzy
+msgid "Specify file containing saved configuration"
+msgstr "配置 Pilot"
+
+#: ../smclient/eggsmclient.c:228
+msgid "FILE"
+msgstr "文件"
+
+#: ../smclient/eggsmclient.c:231
+msgid "Specify session management ID"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:231
+msgid "ID"
+msgstr "ID"
+
+#: ../smclient/eggsmclient.c:252
+msgid "Session management options:"
+msgstr ""
+
+#: ../smclient/eggsmclient.c:253
+#, fuzzy
+msgid "Show session management options"
+msgstr "显示图像动画(_S)"
+
+#: ../smime/gui/ca-trust-dialog.c:96
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20397,69 +19820,73 @@ msgstr ""
 "\n"
 "编辑信任设置："
 
-#: ../smime/gui/cert-trust-dialog.c:151
+#: ../smime/gui/cert-trust-dialog.c:144
 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:155
+#: ../smime/gui/cert-trust-dialog.c:148
 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:137
-#: ../smime/gui/certificate-manager.c:380
-#: ../smime/gui/certificate-manager.c:604
+#: ../smime/gui/certificate-manager.c:135
+#: ../smime/gui/certificate-manager.c:382
+#: ../smime/gui/certificate-manager.c:610
 msgid "Select a certificate to import..."
 msgstr "选择要导入的证书..."
 
-#: ../smime/gui/certificate-manager.c:146
+#: ../smime/gui/certificate-manager.c:144
 msgid "All PKCS12 files"
 msgstr "全部 PKCS12 文件"
 
-#: ../smime/gui/certificate-manager.c:151
-#: ../smime/gui/certificate-manager.c:394
-#: ../smime/gui/certificate-manager.c:618
+#: ../smime/gui/certificate-manager.c:150
+#: ../smime/gui/certificate-manager.c:397
+#: ../smime/gui/certificate-manager.c:624
 msgid "All files"
 msgstr "全部文件"
 
-#: ../smime/gui/certificate-manager.c:271
-#: ../smime/gui/certificate-manager.c:480
-#: ../smime/gui/certificate-manager.c:702
+#: ../smime/gui/certificate-manager.c:274
+#: ../smime/gui/certificate-manager.c:487
+#: ../smime/gui/certificate-manager.c:712
 msgid "Certificate Name"
 msgstr "证书名称"
 
-#: ../smime/gui/certificate-manager.c:280
-#: ../smime/gui/certificate-manager.c:498
+#: ../smime/gui/certificate-manager.c:283
+#: ../smime/gui/certificate-manager.c:505
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
-#: ../smime/lib/e-cert.c:553
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:35
+#: ../smime/lib/e-cert.c:552
 msgid "Serial Number"
 msgstr "序列号"
 
-#: ../smime/gui/certificate-manager.c:297
+#: ../smime/gui/certificate-manager.c:300
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:389
+#: ../smime/gui/certificate-manager.c:391
 msgid "All email certificate files"
 msgstr "所有电子邮件证书文件"
 
-#: ../smime/gui/certificate-manager.c:489
+#: ../smime/gui/certificate-manager.c:496
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: ../smime/gui/certificate-manager.c:613
+#: ../smime/gui/certificate-manager.c:619
 msgid "All CA certificate files"
 msgstr "全部颁证机构文件"
 
-#: ../smime/gui/certificate-viewer.c:338
+#: ../smime/gui/certificate-manager.c:1046
+msgid "Certificates"
+msgstr "证书"
+
+#: ../smime/gui/certificate-viewer.c:332
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "证书查看器：%s"
@@ -20479,7 +19906,7 @@ msgid "Enter new password"
 msgstr "输入新密码"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:117
+#: ../smime/gui/e-cert-selector.c:116
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -20488,7 +19915,7 @@ msgstr ""
 "发行给：\n"
 "  主题：%s\n"
 
-#: ../smime/gui/e-cert-selector.c:118
+#: ../smime/gui/e-cert-selector.c:117
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -20497,191 +19924,194 @@ msgstr ""
 "发行者：\n"
 "  主题：%s\n"
 
-#: ../smime/gui/e-cert-selector.c:170
+#: ../smime/gui/e-cert-selector.c:165
 msgid "Select certificate"
 msgstr "选择证书"
 
-#: ../smime/gui/smime-ui.glade.h:1
+#: ../smime/gui/smime-ui.ui.h:1
 msgid "<Not Part of Certificate>"
 msgstr "<不是证书的一部分>"
 
-#: ../smime/gui/smime-ui.glade.h:2
-msgid "<b>Certificate Fields</b>"
-msgstr "<b>证书域</b>"
-
-#: ../smime/gui/smime-ui.glade.h:3
-msgid "<b>Certificate Hierarchy</b>"
-msgstr "<b>证书层次</b>"
-
-#: ../smime/gui/smime-ui.glade.h:4
-msgid "<b>Field Value</b>"
-msgstr "<b>域值</b>"
-
-#: ../smime/gui/smime-ui.glade.h:5
-msgid "<b>Fingerprints</b>"
-msgstr "<b>指纹</b>"
-
-#: ../smime/gui/smime-ui.glade.h:6
-msgid "<b>Issued By</b>"
-msgstr "<b>颁发者</b>"
-
-#: ../smime/gui/smime-ui.glade.h:7
-msgid "<b>Issued To</b>"
-msgstr "<b>颁发给</b>"
-
-#: ../smime/gui/smime-ui.glade.h:8
-msgid "<b>This certificate has been verified for the following uses:</b>"
-msgstr "<b>此证书已经被下列用户所验证：</b>"
-
-#: ../smime/gui/smime-ui.glade.h:9
-msgid "<b>Validity</b>"
-msgstr "<b>有效性</b>"
-
-#: ../smime/gui/smime-ui.glade.h:10
+#: ../smime/gui/smime-ui.ui.h:2
 msgid "Authorities"
 msgstr "证书颁发机构"
 
-#: ../smime/gui/smime-ui.glade.h:11
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "Backup"
 msgstr "备份"
 
-#: ../smime/gui/smime-ui.glade.h:12
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Backup All"
 msgstr "全部备份"
 
-#: ../smime/gui/smime-ui.glade.h:13
+#: ../smime/gui/smime-ui.ui.h:5
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
 msgstr "在信任此 CA 的任何用途之前，您应该先检查该证书及其策略和过程(若可用)。"
 
-#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1060
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1058
 msgid "Certificate"
 msgstr "证书"
 
-#: ../smime/gui/smime-ui.glade.h:15
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "Certificate Authority Trust"
 msgstr "证书颁发机构信任"
 
-#: ../smime/gui/smime-ui.glade.h:16
+#: ../smime/gui/smime-ui.ui.h:8
+#, fuzzy
+msgid "Certificate Fields"
+msgstr "<b>证书域</b>"
+
+#: ../smime/gui/smime-ui.ui.h:9
+#, fuzzy
+msgid "Certificate Hierarchy"
+msgstr "<b>证书层次</b>"
+
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Certificate details"
 msgstr "证书细节"
 
-#: ../smime/gui/smime-ui.glade.h:17
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Certificates Table"
 msgstr "证书表"
 
-#: ../smime/gui/smime-ui.glade.h:18
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Common Name (CN)"
 msgstr "通用名(CN)"
 
-#: ../smime/gui/smime-ui.glade.h:19
+#: ../smime/gui/smime-ui.ui.h:13
 msgid "Contact Certificates"
 msgstr "联系人证书"
 
-#: ../smime/gui/smime-ui.glade.h:21
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Do not trust the authenticity of this certificate"
 msgstr "不信任此证书的颁发机构"
 
-#: ../smime/gui/smime-ui.glade.h:22
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Dummy window only"
 msgstr "只对哑窗口"
 
-#: ../smime/gui/smime-ui.glade.h:23
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Edit"
 msgstr "编辑"
 
-#: ../smime/gui/smime-ui.glade.h:24
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Certificate Trust Settings"
 msgstr "电子邮件证书信任设置"
 
-#: ../smime/gui/smime-ui.glade.h:25
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Recipient Certificate"
 msgstr "电子邮件收件人证书"
 
-#: ../smime/gui/smime-ui.glade.h:26
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Email Signer Certificate"
 msgstr "电子邮件签名者证书"
 
-#: ../smime/gui/smime-ui.glade.h:27
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Expires On"
 msgstr "到期"
 
-#: ../smime/gui/smime-ui.glade.h:29
+#: ../smime/gui/smime-ui.ui.h:22
+#, fuzzy
+msgid "Field Value"
+msgstr "域名"
+
+#: ../smime/gui/smime-ui.ui.h:23
+msgid "Fingerprints"
+msgstr "指纹"
+
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Import"
 msgstr "导入"
 
-#: ../smime/gui/smime-ui.glade.h:30
+#: ../smime/gui/smime-ui.ui.h:26
+msgid "Issued By"
+msgstr "颁发者"
+
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Issued On"
 msgstr "发行日期"
 
-#: ../smime/gui/smime-ui.glade.h:31
+#: ../smime/gui/smime-ui.ui.h:28
+msgid "Issued To"
+msgstr "颁发给"
+
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "MD5 Fingerprint"
 msgstr "MD5 指纹"
 
-#: ../smime/gui/smime-ui.glade.h:32
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organization (O)"
 msgstr "组织(O)"
 
-#: ../smime/gui/smime-ui.glade.h:33
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "Organizational Unit (OU)"
 msgstr "组织单元(OU)"
 
-#: ../smime/gui/smime-ui.glade.h:34
+#: ../smime/gui/smime-ui.ui.h:32
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指纹"
 
-#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:802
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:800
 msgid "SSL Client Certificate"
 msgstr "SSL 客户证书"
 
-#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:806
+#: ../smime/gui/smime-ui.ui.h:34 ../smime/lib/e-cert.c:804
 msgid "SSL Server Certificate"
 msgstr "SSL 服务器证书"
 
-#: ../smime/gui/smime-ui.glade.h:38
+#: ../smime/gui/smime-ui.ui.h:36
+msgid "This certificate has been verified for the following uses:"
+msgstr "此证书已经被下列用户所验证："
+
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust the authenticity of this certificate"
 msgstr "信任此证书的颁发机构"
 
-#: ../smime/gui/smime-ui.glade.h:39
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify email users."
 msgstr "信任此颁发机构标识的电子邮件用户。"
 
-#: ../smime/gui/smime-ui.glade.h:40
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify software developers."
 msgstr "信任此颁发机构标识的软件开发者。"
 
-#: ../smime/gui/smime-ui.glade.h:41
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "Trust this CA to identify web sites."
 msgstr "信任此颁发机构标识的网站。"
 
-#: ../smime/gui/smime-ui.glade.h:42
+#: ../smime/gui/smime-ui.ui.h:41
+msgid "Validity"
+msgstr "有效性"
+
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "View"
 msgstr "查看"
 
-#: ../smime/gui/smime-ui.glade.h:43
+#: ../smime/gui/smime-ui.ui.h:43
 msgid "You have certificates from these organizations that identify you:"
 msgstr "您拥有这些组织证明您身份的证书："
 
-#: ../smime/gui/smime-ui.glade.h:44
+#: ../smime/gui/smime-ui.ui.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "您拥有证明这些颁发机构的文件型证书："
 
-#: ../smime/gui/smime-ui.glade.h:45
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "You have certificates on file that identify these people:"
 msgstr "您拥有证明这些人的文件型证书："
 
-#: ../smime/gui/smime-ui.glade.h:46
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "Your Certificates"
 msgstr "您的证书"
 
-#: ../smime/gui/smime-ui.glade.h:47
+#: ../smime/gui/smime-ui.ui.h:47
 msgid "_Edit CA Trust"
 msgstr "编辑 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:656
+#: ../smime/lib/e-cert-db.c:652
 msgid "Certificate already exists"
 msgstr "证书已经存在"
 
@@ -20690,161 +20120,161 @@ msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:407
 msgid "Sign"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:409
+#: ../smime/lib/e-cert.c:408
 msgid "Encrypt"
 msgstr "加密"
 
-#: ../smime/lib/e-cert.c:514
+#: ../smime/lib/e-cert.c:513
 msgid "Version"
 msgstr "版本"
 
-#: ../smime/lib/e-cert.c:529
+#: ../smime/lib/e-cert.c:528
 msgid "Version 1"
 msgstr "版本 1"
 
-#: ../smime/lib/e-cert.c:532
+#: ../smime/lib/e-cert.c:531
 msgid "Version 2"
 msgstr "版本 2"
 
-#: ../smime/lib/e-cert.c:535
+#: ../smime/lib/e-cert.c:534
 msgid "Version 3"
 msgstr "版本 3"
 
-#: ../smime/lib/e-cert.c:617
+#: ../smime/lib/e-cert.c:616
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD2"
 
-#: ../smime/lib/e-cert.c:620
+#: ../smime/lib/e-cert.c:619
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 MD5"
 
-#: ../smime/lib/e-cert.c:623
+#: ../smime/lib/e-cert.c:622
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "带 RSA 加密的 PKCS #1 SHA-1"
 
-#: ../smime/lib/e-cert.c:650
+#: ../smime/lib/e-cert.c:649
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA 加密"
 
-#: ../smime/lib/e-cert.c:653
+#: ../smime/lib/e-cert.c:652
 msgid "Certificate Key Usage"
 msgstr "证书密钥用途"
 
-#: ../smime/lib/e-cert.c:656
+#: ../smime/lib/e-cert.c:655
 msgid "Netscape Certificate Type"
 msgstr "Netscape 证书类型"
 
-#: ../smime/lib/e-cert.c:659
+#: ../smime/lib/e-cert.c:658
 msgid "Certificate Authority Key Identifier"
 msgstr "证书颁发密钥身份"
 
-#: ../smime/lib/e-cert.c:671
+#: ../smime/lib/e-cert.c:670
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "对象标识符(%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-cert.c:720
 msgid "Algorithm Identifier"
 msgstr "算法标识符"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-cert.c:728
 msgid "Algorithm Parameters"
 msgstr "算法参数"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-cert.c:750
 msgid "Subject Public Key Info"
 msgstr "主题公钥信息"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-cert.c:755
 msgid "Subject Public Key Algorithm"
 msgstr "主题公钥算法"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-cert.c:770
 msgid "Subject's Public Key"
 msgstr "主题公钥"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:842
+#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
 msgid "Error: Unable to process extension"
 msgstr "错误：无法处理扩展"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
 msgid "Object Signer"
 msgstr "对象签名者"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-cert.c:816
 msgid "SSL Certificate Authority"
 msgstr "SSL 证书颁发机构"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-cert.c:820
 msgid "Email Certificate Authority"
 msgstr "电子邮件证书颁发机构"
 
-#: ../smime/lib/e-cert.c:850
+#: ../smime/lib/e-cert.c:848
 msgid "Signing"
 msgstr "签名"
 
-#: ../smime/lib/e-cert.c:854
+#: ../smime/lib/e-cert.c:852
 msgid "Non-repudiation"
 msgstr "不可抵赖"
 
-#: ../smime/lib/e-cert.c:858
+#: ../smime/lib/e-cert.c:856
 msgid "Key Encipherment"
 msgstr "密钥编码器"
 
-#: ../smime/lib/e-cert.c:862
+#: ../smime/lib/e-cert.c:860
 msgid "Data Encipherment"
 msgstr "数据编码器"
 
-#: ../smime/lib/e-cert.c:866
+#: ../smime/lib/e-cert.c:864
 msgid "Key Agreement"
 msgstr "密钥协议"
 
-#: ../smime/lib/e-cert.c:870
+#: ../smime/lib/e-cert.c:868
 msgid "Certificate Signer"
 msgstr "证书签名者"
 
-#: ../smime/lib/e-cert.c:874
+#: ../smime/lib/e-cert.c:872
 msgid "CRL Signer"
 msgstr "CRL 签名者"
 
-#: ../smime/lib/e-cert.c:922
+#: ../smime/lib/e-cert.c:920
 msgid "Critical"
 msgstr "关键"
 
-#: ../smime/lib/e-cert.c:924 ../smime/lib/e-cert.c:927
+#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
 msgid "Not Critical"
 msgstr "非关键"
 
-#: ../smime/lib/e-cert.c:948
+#: ../smime/lib/e-cert.c:946
 msgid "Extensions"
 msgstr "扩展"
 
-#: ../smime/lib/e-cert.c:1019
+#: ../smime/lib/e-cert.c:1017
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1075 ../smime/lib/e-cert.c:1195
+#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
 msgid "Certificate Signature Algorithm"
 msgstr "证书签名算法"
 
-#: ../smime/lib/e-cert.c:1084
+#: ../smime/lib/e-cert.c:1081
 msgid "Issuer"
 msgstr "发行者"
 
-#: ../smime/lib/e-cert.c:1138
+#: ../smime/lib/e-cert.c:1135
 msgid "Issuer Unique ID"
 msgstr "发行者唯一 ID"
 
-#: ../smime/lib/e-cert.c:1157
+#: ../smime/lib/e-cert.c:1154
 msgid "Subject Unique ID"
 msgstr "主题唯一 ID"
 
-#: ../smime/lib/e-cert.c:1200
+#: ../smime/lib/e-cert.c:1197
 msgid "Certificate Signature Value"
 msgstr "证书签名值"
 
@@ -20860,1326 +20290,6 @@ msgstr "输入 PKCS12 文件的密码："
 msgid "Imported Certificate"
 msgstr "导入的证书"
 
-#. This most likely means that KILL_PROCESS_CMD wasn't
-#. * found, so just bail completely.
-#.
-#: ../tools/killev.c:61
-#, c-format
-msgid "Could not execute '%s': %s\n"
-msgstr "无法执行“%s”：%s\n"
-
-#: ../tools/killev.c:76
-#, c-format
-msgid "Shutting down %s (%s)\n"
-msgstr "关闭 %s (%s)\n"
-
-#: ../ui/evolution-addressbook.xml.h:1
-msgid "Address _Book Properties"
-msgstr "地址簿属性(_B)"
-
-#: ../ui/evolution-addressbook.xml.h:3
-msgid "Change the properties of the selected folder"
-msgstr "更改选中文件夹的属性"
-
-#: ../ui/evolution-addressbook.xml.h:4
-msgid "Co_py All Contacts To..."
-msgstr "将全部联系人复制到(_P)..."
-
-#: ../ui/evolution-addressbook.xml.h:5
-msgid "Contact _Preview"
-msgstr "联系人预览(_P)"
-
-#: ../ui/evolution-addressbook.xml.h:6 ../ui/evolution-memos.xml.h:2
-#: ../ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "复制"
-
-#: ../ui/evolution-addressbook.xml.h:7
-msgid "Copy selected contacts to another folder"
-msgstr "把选中的联系人复制到其它文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:8
-msgid "Copy the contacts of the selected folder into another folder"
-msgstr "把选中文件夹中的联系人复制到其它文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
-msgid "Copy the selection"
-msgstr "复制选中内容"
-
-#: ../ui/evolution-addressbook.xml.h:10
-msgid "Copy to Folder..."
-msgstr "复制到文件夹..."
-
-#: ../ui/evolution-addressbook.xml.h:11
-msgid "Create a new address book folder"
-msgstr "创建新的地址簿文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:12 ../ui/evolution-memos.xml.h:4
-#: ../ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "剪切"
-
-#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
-msgid "Cut the selection"
-msgstr "剪切选中内容"
-
-#: ../ui/evolution-addressbook.xml.h:14
-msgid "Del_ete Address Book"
-msgstr "删除地址簿(_E)"
-
-#: ../ui/evolution-addressbook.xml.h:16
-msgid "Delete selected contacts"
-msgstr "删除选中的联系人"
-
-#: ../ui/evolution-addressbook.xml.h:17
-msgid "Delete the selected folder"
-msgstr "删除选中的文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:18
-msgid "Forward Contact"
-msgstr "转发联系人"
-
-#: ../ui/evolution-addressbook.xml.h:19
-msgid "Mo_ve All Contacts To..."
-msgstr "将全部联系人移至(_V)..."
-
-#: ../ui/evolution-addressbook.xml.h:20
-msgid "Move selected contacts to another folder"
-msgstr "把选中的联系人移至其它文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:21
-msgid "Move the contacts of the selected folder into another folder"
-msgstr "把选中文件夹中的联系人移至其它文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:22
-msgid "Move to Folder..."
-msgstr "移至文件夹..."
-
-#: ../ui/evolution-addressbook.xml.h:23 ../ui/evolution-memos.xml.h:8
-#: ../ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "粘贴"
-
-#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
-msgid "Paste the clipboard"
-msgstr "粘贴剪贴板"
-
-#: ../ui/evolution-addressbook.xml.h:25
-msgid "Previews the contacts to be printed"
-msgstr "预览将要打印的联系人"
-
-#: ../ui/evolution-addressbook.xml.h:28
-msgid "Print selected contacts"
-msgstr "打印选中的联系人"
-
-#: ../ui/evolution-addressbook.xml.h:29
-msgid "Rename the selected folder"
-msgstr "重命名选中文件夹"
-
-#: ../ui/evolution-addressbook.xml.h:30
-msgid "S_ave Address Book As VCard"
-msgstr "将地址簿另存为 VCard(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "另存为 VCard..."
-
-#: ../ui/evolution-addressbook.xml.h:32
-msgid "Save selected contacts as a VCard"
-msgstr "把选中的联系人保存为 VCard"
-
-#: ../ui/evolution-addressbook.xml.h:33
-msgid "Save the contacts of the selected folder as VCard"
-msgstr "把选中文件夹中的的联系人保存为 VCard"
-
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2724
-msgid "Select All"
-msgstr "全选"
-
-#: ../ui/evolution-addressbook.xml.h:35
-msgid "Select _All"
-msgstr "全选(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:36
-msgid "Select all contacts"
-msgstr "选中全部联系人"
-
-#: ../ui/evolution-addressbook.xml.h:37
-msgid "Send a message to the selected contacts"
-msgstr "给选中的联系人发信件"
-
-#: ../ui/evolution-addressbook.xml.h:38
-msgid "Send message to contact"
-msgstr "给联系人发信件"
-
-#: ../ui/evolution-addressbook.xml.h:39
-msgid "Send selected contacts to another person"
-msgstr "把选中的联系人发送给其他人"
-
-#: ../ui/evolution-addressbook.xml.h:40
-msgid "Show contact preview window"
-msgstr "显示联系人预览窗口"
-
-#: ../ui/evolution-addressbook.xml.h:41
-msgid "St_op"
-msgstr "停止(_O)"
-
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "Stop"
-msgstr "停止"
-
-#: ../ui/evolution-addressbook.xml.h:43
-msgid "Stop Loading"
-msgstr "停止载入"
-
-#: ../ui/evolution-addressbook.xml.h:44
-msgid "View the current contact"
-msgstr "查看当前联系人"
-
-#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-tasks.xml.h:21
-msgid "_Actions"
-msgstr "操作(_A)"
-
-#: ../ui/evolution-addressbook.xml.h:47
-msgid "_Copy Contact to..."
-msgstr "将联系人复制到(_C)..."
-
-#: ../ui/evolution-addressbook.xml.h:48
-msgid "_Copy Folder Contacts To"
-msgstr "将文件夹联系人复制到(_C)"
-
-#: ../ui/evolution-addressbook.xml.h:50
-msgid "_Delete Contact"
-msgstr "删除联系人(_D)"
-
-#: ../ui/evolution-addressbook.xml.h:52
-msgid "_Forward Contact..."
-msgstr "转发联系人(_F)..."
-
-#: ../ui/evolution-addressbook.xml.h:53
-msgid "_Move Contact to..."
-msgstr "将联系人移至(_M)..."
-
-#: ../ui/evolution-addressbook.xml.h:54
-msgid "_Move Folder Contacts To"
-msgstr "将文件夹联系人移至(_M)"
-
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:49
-msgid "_New"
-msgstr "新建(_N)"
-
-#: ../ui/evolution-addressbook.xml.h:60
-msgid "_Rename"
-msgstr "重命名(_R)"
-
-#: ../ui/evolution-addressbook.xml.h:61
-msgid "_Save Contact as VCard..."
-msgstr "联系人另存为 VCard(_S)..."
-
-#: ../ui/evolution-addressbook.xml.h:62
-msgid "_Save Folder Contacts As VCard"
-msgstr "文件夹联系人另存为 VCard(_S)"
-
-#: ../ui/evolution-addressbook.xml.h:63
-msgid "_Send Message to Contact..."
-msgstr "给联系人发信件(_S)..."
-
-#: ../ui/evolution-calendar.xml.h:4
-msgid "Day"
-msgstr "天"
-
-#: ../ui/evolution-calendar.xml.h:6
-msgid "Delete _all Occurrences"
-msgstr "删除全部发生(_A)"
-
-#: ../ui/evolution-calendar.xml.h:7
-msgid "Delete all occurrences"
-msgstr "删除全部发生"
-
-#: ../ui/evolution-calendar.xml.h:8
-msgid "Delete the appointment"
-msgstr "删除约会"
-
-#: ../ui/evolution-calendar.xml.h:10
-msgid "Delete this occurrence"
-msgstr "删除此次发生"
-
-#: ../ui/evolution-calendar.xml.h:11
-msgid "Go To"
-msgstr "转到"
-
-#: ../ui/evolution-calendar.xml.h:12
-msgid "Go back"
-msgstr "后退"
-
-#: ../ui/evolution-calendar.xml.h:13
-msgid "Go forward"
-msgstr "前进"
-
-#: ../ui/evolution-calendar.xml.h:14
-msgid "List"
-msgstr "列表"
-
-#: ../ui/evolution-calendar.xml.h:15
-msgid "Month"
-msgstr "月"
-
-#: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
-#: ../widgets/misc/e-calendar.c:195
-msgid "Next"
-msgstr "下一项"
-
-#: ../ui/evolution-calendar.xml.h:18
-msgid "Previews the calendar to be printed"
-msgstr "预览将要打印的日历"
-
-#: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
-#: ../widgets/misc/e-calendar.c:171
-msgid "Previous"
-msgstr "上一项"
-
-#: ../ui/evolution-calendar.xml.h:22
-msgid "Print this calendar"
-msgstr "打印此日历"
-
-#: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
-msgid "Purg_e"
-msgstr "销毁(_E)"
-
-#: ../ui/evolution-calendar.xml.h:24
-msgid "Purge old appointments and meetings"
-msgstr "销毁旧约会和会议"
-
-#: ../ui/evolution-calendar.xml.h:25
-msgid "Select _Date"
-msgstr "选择日期(_D)"
-
-#: ../ui/evolution-calendar.xml.h:26
-msgid "Select _Today"
-msgstr "选择今天(_T)"
-
-#: ../ui/evolution-calendar.xml.h:27
-msgid "Select a specific date"
-msgstr "选择特定日期"
-
-#: ../ui/evolution-calendar.xml.h:28
-msgid "Select today"
-msgstr "选择今天"
-
-#: ../ui/evolution-calendar.xml.h:29
-msgid "Show as list"
-msgstr "显示为列表"
-
-#: ../ui/evolution-calendar.xml.h:30
-msgid "Show one day"
-msgstr "显示一天"
-
-#: ../ui/evolution-calendar.xml.h:31
-msgid "Show one month"
-msgstr "显示一个月"
-
-#: ../ui/evolution-calendar.xml.h:32
-msgid "Show one week"
-msgstr "显示一周"
-
-#: ../ui/evolution-calendar.xml.h:33
-msgid "Show the working week"
-msgstr "显示工作周"
-
-#: ../ui/evolution-calendar.xml.h:35
-msgid "View the current appointment"
-msgstr "查看当前约会"
-
-#: ../ui/evolution-calendar.xml.h:36 ../ui/evolution-mail-global.xml.h:19
-msgid "View the debug console for log messages"
-msgstr "查看调试控制台以获得日志信息"
-
-#: ../ui/evolution-calendar.xml.h:37
-msgid "Week"
-msgstr "周"
-
-#: ../ui/evolution-calendar.xml.h:38
-msgid "Work Week"
-msgstr "工作日"
-
-#: ../ui/evolution-calendar.xml.h:41 ../ui/evolution-mail-global.xml.h:22
-msgid "_Debug Logs"
-msgstr "调试日志(_D)"
-
-#: ../ui/evolution-calendar.xml.h:45
-msgid "_Open Appointment"
-msgstr "打开约会(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:2
-msgid "Cancel the current mail operation"
-msgstr "取消当前邮件操作"
-
-#: ../ui/evolution-mail-global.xml.h:3
-msgid "Copy the selected folder into another folder"
-msgstr "把选中的文件夹复制到其它文件夹"
-
-#: ../ui/evolution-mail-global.xml.h:4
-msgid "Create a new folder for storing mail"
-msgstr "创建存储邮件的新文件夹"
-
-#: ../ui/evolution-mail-global.xml.h:5
-msgid "Create or edit Search Folder definitions"
-msgstr "创建或编辑搜索文件夹定义"
-
-#: ../ui/evolution-mail-global.xml.h:6
-msgid "Create or edit rules for filtering new mail"
-msgstr "创建或编辑过滤新邮件的规则"
-
-#: ../ui/evolution-mail-global.xml.h:7
-msgid "Download messages of accounts/folders marked for offline"
-msgstr "为标记为脱机的帐户/文件夹下载信件"
-
-#: ../ui/evolution-mail-global.xml.h:8
-msgid "Empty _Trash"
-msgstr "清空回收站(_T)"
-
-#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
-msgid "F_older"
-msgstr "文件夹(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:10
-msgid "Move the selected folder into another folder"
-msgstr "把选中的文件夹移至其它文件夹"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:12
-msgid "Permanently remove all deleted messages from all folders"
-msgstr "永久删除所有文件夹中的所有已删除的信件"
-
-#: ../ui/evolution-mail-global.xml.h:13
-msgid "Search F_olders"
-msgstr "搜索文件夹(_O)"
-
-#: ../ui/evolution-mail-global.xml.h:14
-msgid "Show Message _Preview"
-msgstr "显示信件预览(_P)"
-
-#: ../ui/evolution-mail-global.xml.h:15
-msgid "Show message preview below the message list"
-msgstr "在信件列表下方显示信件预览"
-
-#: ../ui/evolution-mail-global.xml.h:16
-msgid "Show message preview side-by-side with the message list"
-msgstr "在信件列表旁显示信件预览"
-
-#: ../ui/evolution-mail-global.xml.h:17
-msgid "Show message preview window"
-msgstr "显示信件预览窗口"
-
-#: ../ui/evolution-mail-global.xml.h:18
-msgid "Subscribe or unsubscribe to folders on remote servers"
-msgstr "订阅或退订远程服务器上的文件夹"
-
-#: ../ui/evolution-mail-global.xml.h:20
-msgid "_Classic View"
-msgstr "分类视图(_C)"
-
-#: ../ui/evolution-mail-global.xml.h:21
-msgid "_Copy Folder To..."
-msgstr "文件夹复制到(_C)..."
-
-#: ../ui/evolution-mail-global.xml.h:23
-msgid "_Download Messages for Offline Usage"
-msgstr "下载信件以离线使用(_D)"
-
-#: ../ui/evolution-mail-global.xml.h:25
-msgid "_Message Filters"
-msgstr "信件过滤(_M)"
-
-#: ../ui/evolution-mail-global.xml.h:26
-msgid "_Move Folder To..."
-msgstr "文件夹移至(_M)..."
-
-#: ../ui/evolution-mail-global.xml.h:27
-msgid "_New..."
-msgstr "新建(_N)..."
-
-#: ../ui/evolution-mail-global.xml.h:28
-msgid "_Preview"
-msgstr "预览(_P)"
-
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:32
-msgid "_Subscriptions..."
-msgstr "订阅(_S)..."
-
-#: ../ui/evolution-mail-global.xml.h:33
-msgid "_Vertical View"
-msgstr "垂直视图(_V)"
-
-#: ../ui/evolution-mail-list.xml.h:1
-msgid "Change the name of this folder"
-msgstr "更改此文件夹的名称"
-
-#: ../ui/evolution-mail-list.xml.h:2
-msgid "Change the properties of this folder"
-msgstr "更改此文件夹的属性"
-
-#: ../ui/evolution-mail-list.xml.h:3
-msgid "Collapse All _Threads"
-msgstr "折叠全部线索(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:4
-msgid "Collapse all message threads"
-msgstr "折叠全部信件线索"
-
-#: ../ui/evolution-mail-list.xml.h:5
-msgid "Copy selected message(s) to the clipboard"
-msgstr "将选中信件复制到剪贴板"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-list.xml.h:7
-msgid "Cut selected message(s) to the clipboard"
-msgstr "将选中信件剪切到剪贴板"
-
-#: ../ui/evolution-mail-list.xml.h:8
-msgid "E_xpand All Threads"
-msgstr "展开全部线索(_X)"
-
-#: ../ui/evolution-mail-list.xml.h:9
-msgid "E_xpunge"
-msgstr "销毁(_X)"
-
-#: ../ui/evolution-mail-list.xml.h:10
-msgid "Expand all message threads"
-msgstr "展开全部信件线索"
-
-#: ../ui/evolution-mail-list.xml.h:12
-msgid "Hide S_elected Messages"
-msgstr "隐藏选中的信件(_E)"
-
-#: ../ui/evolution-mail-list.xml.h:13
-msgid "Hide _Deleted Messages"
-msgstr "隐藏已删除的信件(_D)"
-
-#: ../ui/evolution-mail-list.xml.h:14
-msgid "Hide _Read Messages"
-msgstr "隐藏已读的信件(_R)"
-
-#: ../ui/evolution-mail-list.xml.h:15
-msgid ""
-"Hide deleted messages rather than displaying them with a line through them"
-msgstr "隐藏已删除的信件而不是在上面显示一条线"
-
-#: ../ui/evolution-mail-list.xml.h:16
-msgid "Mar_k All Messages as Read"
-msgstr "把全部信件标记为已读(_K)"
-
-#: ../ui/evolution-mail-list.xml.h:17
-msgid "Mark all messages in the folder as read"
-msgstr "将此文件夹中的所有信件标记为已读"
-
-#: ../ui/evolution-mail-list.xml.h:18
-msgid "Paste message(s) from the clipboard"
-msgstr "从剪贴板粘贴信件"
-
-#: ../ui/evolution-mail-list.xml.h:19
-msgid "Permanently remove all deleted messages from this folder"
-msgstr "从该文件夹永久删除所有已删除的信件"
-
-#: ../ui/evolution-mail-list.xml.h:20
-msgid "Permanently remove this folder"
-msgstr "永久删除此文件夹"
-
-#: ../ui/evolution-mail-list.xml.h:22
-msgid "Refresh the folder"
-msgstr "刷新文件夹"
-
-#: ../ui/evolution-mail-list.xml.h:23
-msgid "Select Message S_ubthread"
-msgstr "选择信件子线索(_U)"
-
-#: ../ui/evolution-mail-list.xml.h:24
-msgid "Select Message _Thread"
-msgstr "选择信件线索(_T)"
-
-#: ../ui/evolution-mail-list.xml.h:25
-msgid "Select _All Messages"
-msgstr "选中全部信件(_A)"
-
-#: ../ui/evolution-mail-list.xml.h:26
-msgid "Select all and only the messages that are not currently selected"
-msgstr "选中所有当前没有选中的信件"
-
-#: ../ui/evolution-mail-list.xml.h:27
-msgid "Select all messages in the same thread as the selected message"
-msgstr "把同一线索中的所有信件选择为选中信件"
-
-#: ../ui/evolution-mail-list.xml.h:28
-msgid "Select all replies to the currently selected message"
-msgstr "选择当前选中信件的所有回复"
-
-#: ../ui/evolution-mail-list.xml.h:29
-msgid "Select all visible messages"
-msgstr "选中所有可见的信件"
-
-#: ../ui/evolution-mail-list.xml.h:30
-msgid "Show Hidde_n Messages"
-msgstr "显示隐藏的信件(_N)"
-
-#: ../ui/evolution-mail-list.xml.h:31
-msgid "Show messages that have been temporarily hidden"
-msgstr "显示暂时被隐藏的信件"
-
-#: ../ui/evolution-mail-list.xml.h:32
-msgid "Temporarily hide all messages that have already been read"
-msgstr "暂时隐藏所有已读信件"
-
-#: ../ui/evolution-mail-list.xml.h:33
-msgid "Temporarily hide the selected messages"
-msgstr "暂时隐藏选中信件"
-
-#: ../ui/evolution-mail-list.xml.h:34
-msgid "Threaded Message list"
-msgstr "按线索编排的信件列表"
-
-#: ../ui/evolution-mail-list.xml.h:36
-msgid "_Group By Threads"
-msgstr "按线索分组(_G)"
-
-#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:115
-#: ../ui/evolution-mail-messagedisplay.xml.h:7
-msgid "_Message"
-msgstr "信件(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:1
-msgid "A_dd Sender to Address Book"
-msgstr "将发件人添加到地址簿(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:2
-msgid "A_pply Filters"
-msgstr "应用过滤规则(_P)"
-
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
-msgid "Add Sender to Address Book"
-msgstr "将发件人添加到地址簿"
-
-#: ../ui/evolution-mail-message.xml.h:5
-msgid "All Message _Headers"
-msgstr "全部信头(_H)"
-
-#: ../ui/evolution-mail-message.xml.h:6
-msgid "Apply filter rules to the selected messages"
-msgstr "应用过滤规则到选中的信件"
-
-#: ../ui/evolution-mail-message.xml.h:7
-msgid "Check for _Junk"
-msgstr "检查垃圾信(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:8
-msgid "Compose _New Message"
-msgstr "撰写新信件(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:9
-msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "为选中信件的所有收件人撰写回复"
-
-#: ../ui/evolution-mail-message.xml.h:10
-msgid "Compose a reply to the mailing list of the selected message"
-msgstr "为选中信件的邮件列表撰写回复"
-
-#: ../ui/evolution-mail-message.xml.h:11
-msgid "Compose a reply to the sender of the selected message"
-msgstr "为选中信件的发件人撰写回复"
-
-#: ../ui/evolution-mail-message.xml.h:12
-msgid "Copy selected messages to another folder"
-msgstr "把选中的信件复制到其它文件夹"
-
-#: ../ui/evolution-mail-message.xml.h:13
-msgid "Copy selected messages to the clipboard"
-msgstr "将选中信件复制到剪贴板"
-
-#: ../ui/evolution-mail-message.xml.h:14
-msgid "Create R_ule"
-msgstr "创建规则(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:15
-msgid "Create a Search Folder for these recipients"
-msgstr "为这些收件人创建搜索文件夹"
-
-#: ../ui/evolution-mail-message.xml.h:16
-msgid "Create a Search Folder for this mailing list"
-msgstr "为该邮件列表创建搜索文件夹"
-
-#: ../ui/evolution-mail-message.xml.h:17
-msgid "Create a Search Folder for this sender"
-msgstr "为该发件人创建搜索文件夹"
-
-#: ../ui/evolution-mail-message.xml.h:18
-msgid "Create a Search Folder for this subject"
-msgstr "为该主题创建搜索文件夹"
-
-#: ../ui/evolution-mail-message.xml.h:19
-msgid "Create a rule to filter messages from this sender"
-msgstr "创建可过滤此人寄来的信件的规则"
-
-#: ../ui/evolution-mail-message.xml.h:20
-msgid "Create a rule to filter messages to these recipients"
-msgstr "创建可过滤寄往这些收件人的信件的规则"
-
-#: ../ui/evolution-mail-message.xml.h:21
-msgid "Create a rule to filter messages to this mailing list"
-msgstr "创建可过滤寄往此邮件列表的信件的规则"
-
-#: ../ui/evolution-mail-message.xml.h:22
-msgid "Create a rule to filter messages with this subject"
-msgstr "创建可过滤此主题信件的规则"
-
-#: ../ui/evolution-mail-message.xml.h:23
-msgid "Cut selected messages to the clipboard"
-msgstr "将选中信件剪切到剪贴板"
-
-#: ../ui/evolution-mail-message.xml.h:24
-msgid "Decrease the text size"
-msgstr "减少文本大小"
-
-#: ../ui/evolution-mail-message.xml.h:26
-msgid "Display the next important message"
-msgstr "显示下一封重要信件"
-
-#: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next message"
-msgstr "显示下一封信件"
-
-#: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next thread"
-msgstr "显示下一条线索"
-
-#: ../ui/evolution-mail-message.xml.h:29
-msgid "Display the next unread message"
-msgstr "显示下一封未读信件"
-
-#: ../ui/evolution-mail-message.xml.h:30
-msgid "Display the previous important message"
-msgstr "显示上一封重要信件"
-
-#: ../ui/evolution-mail-message.xml.h:31
-msgid "Display the previous message"
-msgstr "显示上一封信件"
-
-#: ../ui/evolution-mail-message.xml.h:32
-msgid "Display the previous unread message"
-msgstr "显示上一封未读信件"
-
-#: ../ui/evolution-mail-message.xml.h:33
-msgid "F_orward As..."
-msgstr "转发为(_O)..."
-
-#: ../ui/evolution-mail-message.xml.h:34
-msgid "Filter on Mailing _List..."
-msgstr "根据邮件列表过滤(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:35
-msgid "Filter on Se_nder..."
-msgstr "根据发件人过滤(_N)..."
-
-#: ../ui/evolution-mail-message.xml.h:36
-msgid "Filter on _Recipients..."
-msgstr "根据收件人过滤(_R)..."
-
-#: ../ui/evolution-mail-message.xml.h:37
-msgid "Filter on _Subject..."
-msgstr "根据主题过滤(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:38
-msgid "Filter the selected messages for junk status"
-msgstr "把选中的信件标记为垃圾邮件"
-
-#: ../ui/evolution-mail-message.xml.h:39
-msgid "Flag selected messages for follow-up"
-msgstr "为选中信件做跟随标志"
-
-#: ../ui/evolution-mail-message.xml.h:40
-msgid "Follow _Up..."
-msgstr "跟随(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:41
-msgid "Force images in HTML mail to be loaded"
-msgstr "强制装入 HTML 邮件中的图像"
-
-#: ../ui/evolution-mail-message.xml.h:43
-msgid "Forward the selected message in the body of a new message"
-msgstr "在新信体中转发选中信件"
-
-#: ../ui/evolution-mail-message.xml.h:44
-msgid "Forward the selected message quoted like a reply"
-msgstr "以类似于回复的引用方式转发选中的信件"
-
-#: ../ui/evolution-mail-message.xml.h:45
-msgid "Forward the selected message to someone"
-msgstr "把选中信件转发给某人"
-
-#: ../ui/evolution-mail-message.xml.h:46
-msgid "Forward the selected message to someone as an attachment"
-msgstr "把选中信件作为附件转发给某人"
-
-#: ../ui/evolution-mail-message.xml.h:47
-msgid "Increase the text size"
-msgstr "增加文本大小"
-
-#: ../ui/evolution-mail-message.xml.h:49
-msgid "Mar_k as"
-msgstr "标记为(_K)"
-
-#: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected messages as having been read"
-msgstr "把选中信件标记为已读"
-
-#: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected messages as important"
-msgstr "把选中信件标记为重要邮件"
-
-#: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected messages as junk"
-msgstr "把选中信件标记为垃圾邮件"
-
-#: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected messages as not being junk"
-msgstr "把选中信件标记为非垃圾邮件"
-
-#: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected messages as not having been read"
-msgstr "把选中信件标记为未读"
-
-#: ../ui/evolution-mail-message.xml.h:55
-msgid "Mark the selected messages as unimportant"
-msgstr "把选中信件标记为不重要邮件"
-
-#: ../ui/evolution-mail-message.xml.h:56
-msgid "Mark the selected messages for deletion"
-msgstr "为选中信件做删除标记"
-
-#: ../ui/evolution-mail-message.xml.h:57
-msgid "Move selected messages to another folder"
-msgstr "把选中的信件移至其它文件夹"
-
-#: ../ui/evolution-mail-message.xml.h:59
-msgid "Next _Important Message"
-msgstr "下一封重要信件(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:60
-msgid "Next _Thread"
-msgstr "下一条线索(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:61
-msgid "Next _Unread Message"
-msgstr "下一封未读信件(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:62
-msgid "Not Junk"
-msgstr "非垃圾"
-
-#: ../ui/evolution-mail-message.xml.h:63
-msgid "Open a window for composing a mail message"
-msgstr "打开窗口以撰写信件"
-
-#: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected messages in a new window"
-msgstr "在新窗口中打开选中的信件"
-
-#: ../ui/evolution-mail-message.xml.h:65
-msgid "Open the selected messages in the composer for editing"
-msgstr "在撰写器中打开选中的信件以便编辑"
-
-#: ../ui/evolution-mail-message.xml.h:66
-msgid "P_revious Unread Message"
-msgstr "上一封未读信件(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:67
-msgid "Paste messages from the clipboard"
-msgstr "从剪贴板粘贴信件"
-
-#: ../ui/evolution-mail-message.xml.h:68
-msgid "Pos_t New Message to Folder"
-msgstr "把新信件投递到文件夹(_T)"
-
-#: ../ui/evolution-mail-message.xml.h:69
-msgid "Post a Repl_y"
-msgstr "投递回复(_Y)"
-
-#: ../ui/evolution-mail-message.xml.h:70
-msgid "Post a message to a Public folder"
-msgstr "把信件保存到公共文件夹中"
-
-#: ../ui/evolution-mail-message.xml.h:71
-msgid "Post a reply to a message in a Public folder"
-msgstr "在公共文件夹中回复信件"
-
-#: ../ui/evolution-mail-message.xml.h:72
-msgid "Pr_evious Important Message"
-msgstr "上一封重要信件(_E)"
-
-#: ../ui/evolution-mail-message.xml.h:73
-msgid "Preview the message to be printed"
-msgstr "预览要打印的信件"
-
-#: ../ui/evolution-mail-message.xml.h:77
-msgid "Print this message"
-msgstr "打印该信件"
-
-#: ../ui/evolution-mail-message.xml.h:78
-msgid "Re_direct"
-msgstr "重发(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:79
-msgid "Redirect (bounce) the selected message to someone"
-msgstr "将选中信件重发(退回)给某人"
-
-#: ../ui/evolution-mail-message.xml.h:84
-msgid "Reset the text to its original size"
-msgstr "把文本重新设置为原来的大小"
-
-#: ../ui/evolution-mail-message.xml.h:85
-msgid "Save the selected messages as a text file"
-msgstr "把选中信件另存为文本文件"
-
-#: ../ui/evolution-mail-message.xml.h:86
-msgid "Search Folder from Mailing _List..."
-msgstr "基于邮件列表的搜索文件夹(_L)..."
-
-#: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipien_ts..."
-msgstr "基于收件人的搜索文件夹(_T)..."
-
-#: ../ui/evolution-mail-message.xml.h:88
-msgid "Search Folder from S_ubject..."
-msgstr "基于主题的搜索文件夹(_U)..."
-
-#: ../ui/evolution-mail-message.xml.h:89
-msgid "Search Folder from Sen_der..."
-msgstr "基于发件人的搜索文件夹(_D)..."
-
-#: ../ui/evolution-mail-message.xml.h:90
-msgid "Search for text in the body of the displayed message"
-msgstr "在显示信件的主体中搜索文本"
-
-#: ../ui/evolution-mail-message.xml.h:91
-msgid "Select _All Text"
-msgstr "选中所有文字(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:92
-msgid "Select all the text in a message"
-msgstr "选中信件中的全部文本"
-
-#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
-msgid "Set up the page settings for your current printer"
-msgstr "设定您当前打印机的页面设置"
-
-#: ../ui/evolution-mail-message.xml.h:94
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "在显示信件的信体中显示闪烁光标"
-
-#: ../ui/evolution-mail-message.xml.h:95
-msgid "Show messages with all email headers"
-msgstr "显示邮件时显示所有信头"
-
-#: ../ui/evolution-mail-message.xml.h:96
-msgid "Show the raw email source of the message"
-msgstr "显示信件的原始邮件源代码"
-
-#: ../ui/evolution-mail-message.xml.h:97
-msgid "Undelete the selected messages"
-msgstr "取消选中信件的删除"
-
-#: ../ui/evolution-mail-message.xml.h:98
-msgid "Uni_mportant"
-msgstr "不重要(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:99
-msgid "Zoom _Out"
-msgstr "缩小(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:100
-msgid "_Attached"
-msgstr "附件(_A)"
-
-#: ../ui/evolution-mail-message.xml.h:101
-msgid "_Caret Mode"
-msgstr "光标模式(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:102
-msgid "_Clear Flag"
-msgstr "清除标志(_C)"
-
-#: ../ui/evolution-mail-message.xml.h:105
-msgid "_Delete Message"
-msgstr "删除信件(_D)"
-
-#: ../ui/evolution-mail-message.xml.h:107
-msgid "_Find in Message..."
-msgstr "在信件中查找(_F)..."
-
-#: ../ui/evolution-mail-message.xml.h:108
-msgid "_Flag Completed"
-msgstr "标志为已完成(_F)"
-
-#: ../ui/evolution-mail-message.xml.h:110
-msgid "_Go To"
-msgstr "转到(_G)"
-
-#: ../ui/evolution-mail-message.xml.h:111
-msgid "_Important"
-msgstr "重要(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:112
-msgid "_Inline"
-msgstr "嵌入(_I)"
-
-#: ../ui/evolution-mail-message.xml.h:113
-msgid "_Junk"
-msgstr "垃圾(_J)"
-
-#: ../ui/evolution-mail-message.xml.h:114
-msgid "_Load Images"
-msgstr "装入图像(_L)"
-
-#: ../ui/evolution-mail-message.xml.h:116
-msgid "_Message Source"
-msgstr "信件源代码(_M)"
-
-#: ../ui/evolution-mail-message.xml.h:118
-msgid "_Next Message"
-msgstr "下一封信(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:119
-msgid "_Normal Size"
-msgstr "普通大小(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:120
-msgid "_Not Junk"
-msgstr "非垃圾(_N)"
-
-#: ../ui/evolution-mail-message.xml.h:121
-msgid "_Open in New Window"
-msgstr "在新窗口中打开(_O)"
-
-#: ../ui/evolution-mail-message.xml.h:122
-msgid "_Previous Message"
-msgstr "上一封信(_P)"
-
-#: ../ui/evolution-mail-message.xml.h:124
-msgid "_Quoted"
-msgstr "引用(_Q)"
-
-#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "读取(_R)"
-
-#: ../ui/evolution-mail-message.xml.h:128
-msgid "_Save Message..."
-msgstr "保存信件(_S)..."
-
-#: ../ui/evolution-mail-message.xml.h:129
-msgid "_Undelete Message"
-msgstr "取消删除信件(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:130
-msgid "_Unread"
-msgstr "未读(_U)"
-
-#: ../ui/evolution-mail-message.xml.h:131
-msgid "_Zoom"
-msgstr "缩放(_Z)"
-
-#: ../ui/evolution-mail-message.xml.h:132
-msgid "_Zoom In"
-msgstr "放大(_Z)"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
-msgid "Close"
-msgstr "关闭"
-
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
-msgid "Main toolbar"
-msgstr "主工具栏"
-
-#: ../ui/evolution-memos.xml.h:3
-msgid "Copy selected memo"
-msgstr "复制选中的备忘"
-
-#: ../ui/evolution-memos.xml.h:5
-msgid "Cut selected memo"
-msgstr "剪切选中的备忘"
-
-#: ../ui/evolution-memos.xml.h:7
-msgid "Delete selected memos"
-msgstr "删除选中的备忘"
-
-#: ../ui/evolution-memos.xml.h:9
-msgid "Paste memo from the clipboard"
-msgstr "从剪贴板中粘贴备忘"
-
-#: ../ui/evolution-memos.xml.h:10
-msgid "Previews the list of memos to be printed"
-msgstr "预览要打印的备忘列表"
-
-#: ../ui/evolution-memos.xml.h:13
-msgid "Print the list of memos"
-msgstr "打印备忘列表"
-
-#: ../ui/evolution-memos.xml.h:14
-msgid "View the selected memo"
-msgstr "查看选中的备忘"
-
-#: ../ui/evolution-memos.xml.h:18
-msgid "_Open Memo"
-msgstr "打开备忘(_O)"
-
-#: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected tasks"
-msgstr "复制选中的任务"
-
-#: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected tasks"
-msgstr "剪切选中的任务"
-
-#: ../ui/evolution-tasks.xml.h:7
-msgid "Delete completed tasks"
-msgstr "删除已完成的任务"
-
-#: ../ui/evolution-tasks.xml.h:8
-msgid "Delete selected tasks"
-msgstr "删除选中的任务"
-
-#: ../ui/evolution-tasks.xml.h:9
-msgid "Mar_k as Complete"
-msgstr "标记为完成(_K)"
-
-#: ../ui/evolution-tasks.xml.h:10
-msgid "Mark selected tasks as complete"
-msgstr "把选中任务标记为完成"
-
-#: ../ui/evolution-tasks.xml.h:12
-msgid "Paste tasks from the clipboard"
-msgstr "从剪贴板中粘贴任务"
-
-#: ../ui/evolution-tasks.xml.h:13
-msgid "Previews the list of tasks to be printed"
-msgstr "预览要打印的任务列表"
-
-#: ../ui/evolution-tasks.xml.h:16
-msgid "Print the list of tasks"
-msgstr "打印任务列表"
-
-#: ../ui/evolution-tasks.xml.h:18
-msgid "Show task preview window"
-msgstr "显示任务预览窗口"
-
-#: ../ui/evolution-tasks.xml.h:19
-msgid "Task _Preview"
-msgstr "任务预览(_P)"
-
-#: ../ui/evolution-tasks.xml.h:20
-msgid "View the selected task"
-msgstr "查看选中的任务"
-
-#: ../ui/evolution-tasks.xml.h:27
-msgid "_Open Task"
-msgstr "打开任务(_O)"
-
-#: ../ui/evolution.xml.h:1
-msgid "About Evolution..."
-msgstr "关于 Evolution..."
-
-#: ../ui/evolution.xml.h:2
-msgid "Change Evolution's settings"
-msgstr "更改 Evolution 的设置"
-
-#: ../ui/evolution.xml.h:3
-msgid "Change the visibility of the toolbar"
-msgstr "更改工具栏的可见性"
-
-#: ../ui/evolution.xml.h:5
-msgid "Create a new window displaying this folder"
-msgstr "创建显示此文件加的新窗口"
-
-#: ../ui/evolution.xml.h:6
-msgid "Display window buttons using the desktop toolbar setting"
-msgstr "使用桌面工具栏设置显示窗口按钮"
-
-#: ../ui/evolution.xml.h:7
-msgid "Display window buttons with icons and text"
-msgstr "显示带图标和文字的窗口按钮"
-
-#: ../ui/evolution.xml.h:8
-msgid "Display window buttons with icons only"
-msgstr "显示只有图标的窗口按钮"
-
-#: ../ui/evolution.xml.h:9
-msgid "Display window buttons with text only"
-msgstr "显示只有文字的窗口按钮"
-
-#: ../ui/evolution.xml.h:10
-msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
-
-#: ../ui/evolution.xml.h:11
-msgid "Exit the program"
-msgstr "退出程序"
-
-#: ../ui/evolution.xml.h:12
-msgid "Forget remembered passwords so you will be prompted for them again"
-msgstr "保存的密码被丢弃，所以将再次提示您输入密码"
-
-#: ../ui/evolution.xml.h:13
-msgid "Hide window buttons"
-msgstr "隐藏窗口按钮"
-
-#: ../ui/evolution.xml.h:14
-msgid "I_mport..."
-msgstr "导入(_M)..."
-
-#: ../ui/evolution.xml.h:15
-msgid "Icons _and Text"
-msgstr "图标和文字(_A)"
-
-#: ../ui/evolution.xml.h:16
-msgid "Import data from other programs"
-msgstr "从其它程序导入数据"
-
-#: ../ui/evolution.xml.h:17
-msgid "Lay_out"
-msgstr "布局(_O)"
-
-#: ../ui/evolution.xml.h:19
-msgid "New _Window"
-msgstr "新建窗口(_W)"
-
-#: ../ui/evolution.xml.h:20
-msgid "Open the Frequently Asked Questions webpage"
-msgstr "打开 FAQ 网页"
-
-#: ../ui/evolution.xml.h:21
-msgid "Page Set_up..."
-msgstr "页面设置(_U)..."
-
-#: ../ui/evolution.xml.h:22
-msgid "Prefere_nces"
-msgstr "首选项(_N)"
-
-#: ../ui/evolution.xml.h:23
-msgid "Send / Receive"
-msgstr "发送/接收"
-
-#: ../ui/evolution.xml.h:24
-msgid "Send / _Receive"
-msgstr "发送/接收(_R)"
-
-#: ../ui/evolution.xml.h:25
-msgid "Send queued items and retrieve new items"
-msgstr "发送队列中的的邮件并收取新邮件"
-
-#: ../ui/evolution.xml.h:26
-msgid "Set up Pilot configuration"
-msgstr "配置 Pilot"
-
-#: ../ui/evolution.xml.h:28
-msgid "Show Side _Bar"
-msgstr "显示侧边栏(_B)"
-
-#: ../ui/evolution.xml.h:29
-msgid "Show _Status Bar"
-msgstr "显示状态栏(_S)"
-
-#: ../ui/evolution.xml.h:30
-msgid "Show _Toolbar"
-msgstr "显示工具栏(_T)"
-
-#: ../ui/evolution.xml.h:31
-msgid "Show information about Evolution"
-msgstr "显示关于 Evolution 的信息"
-
-#: ../ui/evolution.xml.h:32
-msgid "Submit Bug Report"
-msgstr "提交错误报告"
-
-#: ../ui/evolution.xml.h:33
-msgid "Submit _Bug Report"
-msgstr "提交错误报告(_B)"
-
-#: ../ui/evolution.xml.h:34
-msgid "Submit a bug report using Bug Buddy"
-msgstr "用 Bug Buddy 提交错误报告"
-
-#: ../ui/evolution.xml.h:35
-msgid "Toggle whether we are working offline."
-msgstr "切换是否脱机工作。"
-
-#: ../ui/evolution.xml.h:36
-msgid "Tool_bar Style"
-msgstr "工具栏样式(_B)"
-
-#: ../ui/evolution.xml.h:37
-msgid "View/Hide the Side Bar"
-msgstr "查看/隐藏侧边栏"
-
-#: ../ui/evolution.xml.h:38
-msgid "View/Hide the Status Bar"
-msgstr "查看/隐藏状态栏"
-
-#: ../ui/evolution.xml.h:39
-msgid "Work _Offline"
-msgstr "脱机工作(_O)"
-
-#: ../ui/evolution.xml.h:40
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../ui/evolution.xml.h:41
-msgid "_Close Window"
-msgstr "关闭窗口(_C)"
-
-#: ../ui/evolution.xml.h:44
-msgid "_Forget Passwords"
-msgstr "丢弃密码(_F)"
-
-#: ../ui/evolution.xml.h:45
-msgid "_Frequently Asked Questions"
-msgstr "常见问答(FAQ)(_F)"
-
-#: ../ui/evolution.xml.h:47
-msgid "_Hide Buttons"
-msgstr "隐藏按钮(_H)"
-
-#: ../ui/evolution.xml.h:48
-msgid "_Icons Only"
-msgstr "只有图标(_I)"
-
-#: ../ui/evolution.xml.h:50
-msgid "_Quick Reference"
-msgstr "快速首选项(_Q)"
-
-#: ../ui/evolution.xml.h:51
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../ui/evolution.xml.h:52
-msgid "_Switcher Appearance"
-msgstr "切换器外观(_S)"
-
-#: ../ui/evolution.xml.h:53
-msgid "_Synchronization Options..."
-msgstr "同步选项(_S)..."
-
-#: ../ui/evolution.xml.h:54
-msgid "_Text Only"
-msgstr "只有文字(_T)"
-
-#: ../ui/evolution.xml.h:56
-msgid "_Window"
-msgstr "窗口(_W)"
-
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "按公司(_C)"
@@ -22253,31 +20363,27 @@ msgid "With _Status"
 msgstr "状态(_S)"
 
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:234
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:431
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:433
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:435
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:784
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:226
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:418
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:422
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:761
 msgid "UTC"
 msgstr "UTC"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
-msgid "<b>Time Zones</b>"
-msgstr "<b>时区</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:2
-msgid "<b>_Selection</b>"
-msgstr "<b>选择(_S)</b>"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
 msgid "Select a Time Zone"
 msgstr "选择一个时区"
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:3
+msgid "Time Zones"
+msgstr "时区"
+
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
 msgid "Timezone drop-down combination box"
 msgstr ""
 
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:6
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -22286,168 +20392,275 @@ msgstr ""
 "用鼠标左键放大地图的某个区域并选择时区。\n"
 "用鼠标右键缩小。"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "选择(_S)"
+
+#: ../widgets/menus/gal-define-views-dialog.c:74
 #: ../widgets/menus/gal-define-views-model.c:185
 msgid "Collection"
 msgstr "收藏"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
-#: ../widgets/menus/gal-define-views.glade.h:4
+#: ../widgets/menus/gal-define-views-dialog.c:350
+#: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定义 %s 的视图"
 
-#: ../widgets/menus/gal-define-views-dialog.c:366
-#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:358
+#: ../widgets/menus/gal-define-views-dialog.c:360
 msgid "Define Views"
 msgstr "定义视图"
 
-#: ../widgets/menus/gal-define-views.glade.h:2
+#: ../widgets/menus/gal-define-views.ui.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
 msgstr "定义“%s”的视图"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-header-item.c:1921
 #: ../widgets/table/e-table-scrolled.c:215
 #: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:225
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:223
 msgid "Instance"
 msgstr "实例"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:283
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:276
 msgid "Save Current View"
 msgstr "保存当前视图"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
 msgid "_Create new view"
 msgstr "创建新视图(_C)"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:3
+#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
 msgid "_Replace existing view"
 msgstr "替换现有视图(_R)"
 
-#. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:581
-#: ../widgets/menus/gal-view-menus.c:367
-msgid "Custom View"
-msgstr "当前视图"
-
-#: ../widgets/menus/gal-view-instance.c:582
-msgid "Save Custom View"
-msgstr "保存自定义视图"
-
-#: ../widgets/menus/gal-view-instance.c:586
-#: ../widgets/menus/gal-view-menus.c:391
-msgid "Define Views..."
-msgstr "定义视图..."
-
-#: ../widgets/menus/gal-view-menus.c:304
-msgid "C_urrent View"
-msgstr "当前视图(_U)"
-
-#: ../widgets/menus/gal-view-menus.c:328
-#, c-format
-msgid "Select View: %s"
-msgstr "选择视图：%s"
-
-#: ../widgets/menus/gal-view-menus.c:372
-msgid "Current view is a customized view"
-msgstr "当前视图为自定义视图"
-
-#: ../widgets/menus/gal-view-menus.c:377
-msgid "Save Custom View..."
-msgstr "保存当前视图..."
-
-#: ../widgets/menus/gal-view-menus.c:382
-msgid "Save current custom view"
-msgstr "保存当前自定义视图"
-
-#: ../widgets/menus/gal-view-menus.c:396
-msgid "Create or edit views"
-msgstr "创建或编辑视图"
-
-#: ../widgets/menus/gal-view-new-dialog.c:70
+#: ../widgets/menus/gal-view-new-dialog.c:68
 msgid "Factory"
 msgstr "工厂"
 
-#: ../widgets/menus/gal-view-new-dialog.c:105
+#: ../widgets/menus/gal-view-new-dialog.c:99
 msgid "Define New View"
 msgstr "定义新视图"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:1
+#: ../widgets/menus/gal-view-new-dialog.ui.h:1
 msgid "Name of new view:"
 msgstr "新视图的名称："
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:2
+#: ../widgets/menus/gal-view-new-dialog.ui.h:2
 msgid "Type of View"
 msgstr "视图类型"
 
-#: ../widgets/menus/gal-view-new-dialog.glade.h:3
+#: ../widgets/menus/gal-view-new-dialog.ui.h:3
 msgid "Type of view:"
 msgstr "视图类型："
 
-#: ../widgets/misc/e-attachment-bar.c:1132
-msgid "Attachment Bar"
-msgstr "附件栏"
+#: ../widgets/misc/e-account-manager.c:348
+msgid "De_fault"
+msgstr "默认(_F)"
 
-#: ../widgets/misc/e-attachment.c:290 ../widgets/misc/e-attachment.c:305
-#: ../widgets/misc/e-attachment.c:590 ../widgets/misc/e-attachment.c:607
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "无法附加文件 %s：%s"
+#: ../widgets/misc/e-account-tree-view.c:224
+msgid "Account Name"
+msgstr "账户名"
 
-#: ../widgets/misc/e-attachment.c:298 ../widgets/misc/e-attachment.c:599
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "无法附加文件 %s：不是普通文件"
+#: ../widgets/misc/e-account-tree-view.c:255
+msgid "Protocol"
+msgstr "协议"
 
-#: ../widgets/misc/e-attachment.glade.h:1
+#: ../widgets/misc/e-action-combo-box.c:388
+msgid "Action"
+msgstr "活动"
+
+#: ../widgets/misc/e-action-combo-box.c:389
+msgid "A GtkRadioAction"
+msgstr ""
+
+#: ../widgets/misc/e-attachment-dialog.c:305
 msgid "Attachment Properties"
 msgstr "附件属性"
 
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "文件名："
+#: ../widgets/misc/e-attachment-dialog.c:328
+msgid "_Filename:"
+msgstr "文件名(_F)："
+
+#: ../widgets/misc/e-attachment-dialog.c:363
+msgid "MIME Type:"
+msgstr "MIME  类型："
+
+#: ../widgets/misc/e-attachment-dialog.c:371
+#: ../widgets/misc/e-attachment-store.c:553
+msgid "_Suggest automatic display of attachment"
+msgstr "建议自动显示附件(_S)"
+
+#: ../widgets/misc/e-attachment-handler-image.c:95
+msgid "Could not set as background"
+msgstr "不能设置为背景"
 
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME 类型："
+#: ../widgets/misc/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "设为背景(_B)"
 
-#: ../widgets/misc/e-attachment.glade.h:5
-msgid "Suggest automatic display of attachment"
-msgstr "建议自动显示附件"
+#: ../widgets/misc/e-attachment-handler-sendto.c:87
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "不能发送附件"
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:129
+msgid "_Send To..."
+msgstr "发送到(_S)..."
+
+#: ../widgets/misc/e-attachment-handler-sendto.c:131
+#, fuzzy
+msgid "Send the selected attachments somewhere"
+msgstr "选择保存选中附件的文件夹..."
+
+#: ../widgets/misc/e-attachment-icon-view.c:480
+#: ../widgets/misc/e-attachment-tree-view.c:517
+msgid "Loading"
+msgstr "装入"
+
+#: ../widgets/misc/e-attachment-icon-view.c:492
+#: ../widgets/misc/e-attachment-tree-view.c:529
+msgid "Saving"
+msgstr "保存"
+
+#: ../widgets/misc/e-attachment-paned.c:87
+msgid "Hide _Attachment Bar"
+msgstr "隐藏附件栏(_A)"
+
+#: ../widgets/misc/e-attachment-paned.c:89
+#: ../widgets/misc/e-attachment-paned.c:626
+msgid "Show _Attachment Bar"
+msgstr "显示附件栏(_A)"
+
+#: ../widgets/misc/e-attachment-store.c:541
+msgid "Add Attachment"
+msgstr "添加附件"
+
+#: ../widgets/misc/e-attachment-store.c:544
+msgid "A_ttach"
+msgstr "附件(_T)"
+
+#: ../widgets/misc/e-attachment-store.c:607
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "保存附件"
+
+#. Translators: Default attachment filename.
+#: ../widgets/misc/e-attachment-store.c:636
+#: ../widgets/misc/e-attachment.c:1768 ../widgets/misc/e-attachment.c:2294
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../widgets/misc/e-attachment-view.c:300
+msgid "S_ave All"
+msgstr "全部保存(_A)"
+
+#: ../widgets/misc/e-attachment-view.c:326
+msgid "A_dd Attachment..."
+msgstr "添加附件(_D)..."
+
+#: ../widgets/misc/e-attachment-view.c:350
+msgid "_Hide"
+msgstr "隐藏(_H)"
+
+#: ../widgets/misc/e-attachment-view.c:357
+msgid "_View Inline"
+msgstr "嵌入视图(_V)"
+
+#: ../widgets/misc/e-attachment-view.c:643
+#, c-format
+msgid "Open with \"%s\""
+msgstr "使用“%s”打开"
+
+#: ../widgets/misc/e-attachment-view.c:646
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "在 %s 中打开附件"
+
+#: ../widgets/misc/e-attachment.c:990
+msgid "Attached message"
+msgstr "附加的信息"
+
+#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2596
+msgid "A load operation is already in progress"
+msgstr "一个已经加载的操作正在进行"
+
+#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2604
+msgid "A save operation is already in progress"
+msgstr "个已经保存的操作正在进行"
+
+#: ../widgets/misc/e-attachment.c:1914
+#, c-format
+msgid "Could not load '%s'"
+msgstr "不能加载“%s”"
+
+#: ../widgets/misc/e-attachment.c:1917
+#, c-format
+msgid "Could not load the attachment"
+msgstr "不能加载附件"
+
+#: ../widgets/misc/e-attachment.c:2174
+#, c-format
+msgid "Could not open '%s'"
+msgstr "不能打开“%s”"
+
+#: ../widgets/misc/e-attachment.c:2177
+#, c-format
+msgid "Could not open the attachment"
+msgstr "不能打开附件"
+
+#: ../widgets/misc/e-attachment.c:2612
+#, fuzzy
+msgid "Attachment contents not loaded"
+msgstr "附件提醒"
+
+#: ../widgets/misc/e-attachment.c:2688
+#, c-format
+msgid "Could not save '%s'"
+msgstr "不能保存“%s”"
+
+#: ../widgets/misc/e-attachment.c:2691
+#, fuzzy, c-format
+msgid "Could not save the attachment"
+msgstr "选择保存全部附件的文件夹..."
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../widgets/misc/e-buffer-tagger.c:359
+msgid "Ctrl-click to open a link"
+msgstr "Ctrl 加单击来打开一个链接"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1267
+#: ../widgets/misc/e-calendar-item.c:1253
 msgid "%B %Y"
 msgstr "%Y年%B"
 
-#: ../widgets/misc/e-calendar.c:220
+#: ../widgets/misc/e-calendar.c:217
 msgid "Month Calendar"
 msgstr "月历"
 
 #: ../widgets/misc/e-canvas-background.c:454
-#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3644
-#: ../widgets/text/e-text.c:3645
+#: ../widgets/misc/e-canvas-background.c:455 ../widgets/text/e-text.c:3632
+#: ../widgets/text/e-text.c:3633
 msgid "Fill color"
 msgstr "填充颜色"
 
 #: ../widgets/misc/e-canvas-background.c:461
 #: ../widgets/misc/e-canvas-background.c:462
 #: ../widgets/misc/e-canvas-background.c:468
-#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3651
-#: ../widgets/text/e-text.c:3652 ../widgets/text/e-text.c:3659
-#: ../widgets/text/e-text.c:3660
+#: ../widgets/misc/e-canvas-background.c:469 ../widgets/text/e-text.c:3639
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3646
+#: ../widgets/text/e-text.c:3647
 msgid "GDK fill color"
 msgstr "GDK 填充颜色"
 
 #: ../widgets/misc/e-canvas-background.c:475
-#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3666
-#: ../widgets/text/e-text.c:3667
+#: ../widgets/misc/e-canvas-background.c:476 ../widgets/text/e-text.c:3653
+#: ../widgets/text/e-text.c:3654
 msgid "Fill stipple"
 msgstr "点绘填充"
 
@@ -22471,271 +20684,171 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:91 ../widgets/misc/e-reflow.c:1417
-#: ../widgets/table/e-table-group-container.c:999
-#: ../widgets/table/e-table-group-leaf.c:644
-#: ../widgets/table/e-table-item.c:3070
+#: ../widgets/misc/e-canvas-vbox.c:89
+#: ../widgets/table/e-table-group-container.c:1001
+#: ../widgets/table/e-table-group-leaf.c:649
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "最小宽度"
 
-#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1418
-#: ../widgets/table/e-table-group-container.c:1000
-#: ../widgets/table/e-table-group-leaf.c:645
-#: ../widgets/table/e-table-item.c:3071
+#: ../widgets/misc/e-canvas-vbox.c:90
+#: ../widgets/table/e-table-group-container.c:1002
+#: ../widgets/table/e-table-group-leaf.c:650
+#: ../widgets/table/e-table-item.c:3063
 msgid "Minimum Width"
 msgstr "最小宽度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-canvas-vbox.c:104
-#: ../widgets/misc/e-expander.c:206
+#: ../widgets/misc/e-canvas-vbox.c:101 ../widgets/misc/e-canvas-vbox.c:102
 msgid "Spacing"
 msgstr "间距"
 
-#: ../widgets/misc/e-cell-date-edit.c:289
-msgid "Now"
-msgstr "现在"
-
-#: ../widgets/misc/e-cell-date-edit.c:846
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "时间必须采用格式：%s"
-
-#: ../widgets/misc/e-cell-percent.c:77
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "百分比值必需在 0 到 100 之间，含 0 和 100"
-
-#: ../widgets/misc/e-charset-picker.c:57
-msgid "Arabic"
-msgstr "阿拉伯语"
-
-#: ../widgets/misc/e-charset-picker.c:58
-msgid "Baltic"
-msgstr "波罗的语"
-
-#: ../widgets/misc/e-charset-picker.c:59
-msgid "Central European"
-msgstr "中欧"
-
-#: ../widgets/misc/e-charset-picker.c:60
-msgid "Chinese"
-msgstr "中文"
-
-#: ../widgets/misc/e-charset-picker.c:61
-msgid "Cyrillic"
-msgstr "西里尔语"
-
-#: ../widgets/misc/e-charset-picker.c:62
-msgid "Greek"
-msgstr "希腊语"
-
-#: ../widgets/misc/e-charset-picker.c:63
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: ../widgets/misc/e-charset-picker.c:64
-msgid "Japanese"
-msgstr "日文"
-
-#: ../widgets/misc/e-charset-picker.c:65
-msgid "Korean"
-msgstr "韩语"
-
-#: ../widgets/misc/e-charset-picker.c:66
-msgid "Thai"
-msgstr "泰语"
-
-#: ../widgets/misc/e-charset-picker.c:67
-msgid "Turkish"
-msgstr "土耳其语"
-
-#: ../widgets/misc/e-charset-picker.c:68
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../widgets/misc/e-charset-picker.c:69
-msgid "Western European"
-msgstr "西欧"
-
-#: ../widgets/misc/e-charset-picker.c:70
-msgid "Western European, New"
-msgstr "西欧，新"
-
-#: ../widgets/misc/e-charset-picker.c:89 ../widgets/misc/e-charset-picker.c:90
-#: ../widgets/misc/e-charset-picker.c:91
-msgid "Traditional"
-msgstr "繁体"
-
-#: ../widgets/misc/e-charset-picker.c:92 ../widgets/misc/e-charset-picker.c:93
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-msgid "Simplified"
-msgstr "简体"
-
-#: ../widgets/misc/e-charset-picker.c:98
-msgid "Ukrainian"
-msgstr "乌克兰语"
-
-#: ../widgets/misc/e-charset-picker.c:101
-msgid "Visual"
-msgstr "可视"
-
-#: ../widgets/misc/e-charset-picker.c:170
-#, c-format
-msgid "Unknown character set: %s"
-msgstr "未知的字符集：%s"
-
-#: ../widgets/misc/e-charset-picker.c:215
+#: ../widgets/misc/e-charset-combo-box.c:93
 msgid "Character Encoding"
 msgstr "字符编码"
 
-#: ../widgets/misc/e-charset-picker.c:230
+#: ../widgets/misc/e-charset-combo-box.c:117
 msgid "Enter the character set to use"
 msgstr "输入要使用的字符集"
 
-#: ../widgets/misc/e-charset-picker.c:337
+#: ../widgets/misc/e-charset-combo-box.c:336
 msgid "Other..."
 msgstr "其它..."
 
-#: ../widgets/misc/e-charset-picker.c:599
-msgid "Ch_aracter Encoding"
-msgstr "字符编码(_A)"
-
-#: ../widgets/misc/e-dateedit.c:303
+#: ../widgets/misc/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "日期和时间"
 
-#: ../widgets/misc/e-dateedit.c:324
+#: ../widgets/misc/e-dateedit.c:543
 msgid "Text entry to input date"
 msgstr "输入日期的文本框"
 
-#: ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:565
 msgid "Click this button to show a calendar"
 msgstr "单击此按钮可显示日历"
 
-#: ../widgets/misc/e-dateedit.c:388
+#: ../widgets/misc/e-dateedit.c:607
 msgid "Drop-down combination box to select time"
 msgstr "选择时间的组合框"
 
-#: ../widgets/misc/e-dateedit.c:464
+#: ../widgets/misc/e-dateedit.c:683
 msgid "No_w"
 msgstr "现在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:470
+#: ../widgets/misc/e-dateedit.c:689
 msgid "_Today"
 msgstr "今天(_T)"
 
-#: ../widgets/misc/e-dateedit.c:1635
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../widgets/misc/e-dateedit.c:697
+msgid "_None"
+msgstr "无(_N)"
+
+#: ../widgets/misc/e-dateedit.c:1797
 msgid "Invalid Date Value"
 msgstr "无效的日期值"
 
-#: ../widgets/misc/e-dateedit.c:1664
+#: ../widgets/misc/e-dateedit.c:1833
 msgid "Invalid Time Value"
 msgstr "无效的时间值"
 
-#: ../widgets/misc/e-expander.c:182
-msgid "Expanded"
-msgstr "已展开"
-
-#: ../widgets/misc/e-expander.c:183
-msgid "Whether or not the expander is expanded"
-msgstr "是否展开扩展器"
-
-#: ../widgets/misc/e-expander.c:191
-msgid "Text of the expander's label"
-msgstr "扩展器标签的文本"
-
-#: ../widgets/misc/e-expander.c:198
-msgid "Use underline"
-msgstr "使用下划线"
-
-#: ../widgets/misc/e-expander.c:199
+#: ../widgets/misc/e-import-assistant.c:239
 msgid ""
-"If set, an underline in the text indicates the next character should be used "
-"for the mnemonic accelerator key"
-msgstr "如果设置了此选项，将会在表明加速键的字符下面加下划线"
-
-#: ../widgets/misc/e-expander.c:207
-msgid "Space to put between the label and the child"
-msgstr "标签及其子空间中间的间距"
-
-#: ../widgets/misc/e-expander.c:216
-msgid "Label widget"
-msgstr "标签部件"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr "选择您希望导入到 Evolution 的文件，并从列表中选择文件的类型。"
 
-#: ../widgets/misc/e-expander.c:217
-msgid "A widget to display in place of the usual expander label"
-msgstr "在通常扩展器标签的位置显示的部件"
+#: ../widgets/misc/e-import-assistant.c:256
+msgid "F_ilename:"
+msgstr "文件名(_I)："
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3390
-msgid "Expander Size"
-msgstr "扩展器大小"
+#: ../widgets/misc/e-import-assistant.c:266
+msgid "Select a file"
+msgstr "选择一个文件"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3391
-msgid "Size of the expander arrow"
-msgstr "扩展器箭头的大小"
+#: ../widgets/misc/e-import-assistant.c:280
+#: ../widgets/misc/e-import-assistant.c:456
+msgid "File _type:"
+msgstr "文件类型(_T)："
 
-#: ../widgets/misc/e-expander.c:232
-msgid "Indicator Spacing"
-msgstr "标识器间距"
+#: ../widgets/misc/e-import-assistant.c:323
+msgid "Choose the destination for this import"
+msgstr "选择此导入的目的位置"
 
-#: ../widgets/misc/e-expander.c:233
-msgid "Spacing around expander arrow"
-msgstr "扩展器箭头旁边的间距"
+#: ../widgets/misc/e-import-assistant.c:348
+msgid "Choose the type of importer to run:"
+msgstr "选择要运行的导入器类型："
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:126 ../widgets/misc/e-filter-bar.c:179
-#: ../widgets/misc/e-filter-bar.c:307 ../widgets/misc/e-filter-bar.c:749
-msgid "Advanced Search"
-msgstr "高级搜索"
+#: ../widgets/misc/e-import-assistant.c:356
+msgid "Import data and settings from _older programs"
+msgstr "从旧版程序中导入数据和设置(_O)"
 
-#. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:230
-msgid "Save Search"
-msgstr "保存搜索"
+#: ../widgets/misc/e-import-assistant.c:364
+msgid "Import a _single file"
+msgstr "导入单个文件(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:267
-msgid "_Searches"
-msgstr "搜索(_S)"
+#: ../widgets/misc/e-import-assistant.c:440
+msgid "Select what type of file you want to import from the list."
+msgstr ""
 
-#: ../widgets/misc/e-filter-bar.c:269
-msgid "Searches"
-msgstr "搜索"
+#: ../widgets/misc/e-import-assistant.c:517
+#, fuzzy
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolution 检查了从以下程序导入的设置：Pine、Netscape、Elm、\n"
+"iCalendar。并未发现可导入的设置。如果您想要再试一次，请单击\n"
+"“上一步”按钮。\n"
 
-#: ../widgets/misc/e-filter-bar.h:104 ../widgets/misc/e-filter-bar.h:115
-msgid "_Save Search..."
-msgstr "保存搜索(_S)..."
+#: ../widgets/misc/e-import-assistant.c:1181
+#: ../widgets/misc/e-import-assistant.c:1208
+msgid "Evolution Import Assistant"
+msgstr "Evolution 导入助手"
 
-#: ../widgets/misc/e-filter-bar.h:105 ../widgets/misc/e-filter-bar.h:116
-msgid "_Edit Saved Searches..."
-msgstr "编辑保存的搜索(_E)..."
+#: ../widgets/misc/e-import-assistant.c:1190
+#: ../widgets/misc/e-import-assistant.c:1242
+msgid "Import Location"
+msgstr "导入位置"
 
-#: ../widgets/misc/e-filter-bar.h:106 ../widgets/misc/e-filter-bar.h:117
-msgid "_Advanced Search..."
-msgstr "高级搜索(_A)..."
+#: ../widgets/misc/e-import-assistant.c:1201
+#, fuzzy
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"欢迎使用 Evolution 导入助手。\n"
+"本助手将全程指导您将外部文件导入 Evolution。"
 
-#: ../widgets/misc/e-filter-bar.h:107
-msgid "All Accounts"
-msgstr "全部账户"
+#: ../widgets/misc/e-import-assistant.c:1217
+msgid "Importer Type"
+msgstr "导入器类型"
 
-#: ../widgets/misc/e-filter-bar.h:108
-msgid "Current Account"
-msgstr "当前账户"
+#: ../widgets/misc/e-import-assistant.c:1226
+msgid "Select Information to Import"
+msgstr "选择要导入的信息"
 
-#: ../widgets/misc/e-filter-bar.h:109
-msgid "Current Folder"
-msgstr "当前文件夹"
+#: ../widgets/misc/e-import-assistant.c:1234
+msgid "Select a File"
+msgstr "选择一个文件"
 
-#: ../widgets/misc/e-filter-bar.h:110
-msgid "Current Message"
-msgstr "当前信件"
+#: ../widgets/misc/e-import-assistant.c:1249
+#, fuzzy
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "单击“导入”以便开始将文件导入到 Evolution。"
 
-#: ../widgets/misc/e-image-chooser.c:169
-msgid "Choose Image"
-msgstr "选择图像"
+#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1265
+msgid "Import Data"
+msgstr "导入数据"
 
-#: ../widgets/misc/e-map.c:627
+#: ../widgets/misc/e-map.c:605
 msgid "World Map"
 msgstr "世界地图"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:607
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -22743,278 +20856,334 @@ msgstr ""
 "基于鼠标交互的地图部件，可用来选择时区。键盘用户可以从下方的组合框中选择时"
 "区。"
 
-#: ../widgets/misc/e-online-button.c:106
-msgid "Online"
-msgstr "在线"
+#: ../widgets/misc/e-online-button.c:27
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr "Evolution 目前联机。单击该按钮可脱机工作。"
+
+#: ../widgets/misc/e-online-button.c:30
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
+
+#: ../widgets/misc/e-online-button.c:33
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "因为网络不可用，所以 Evolution 目前脱机。"
 
-#: ../widgets/misc/e-online-button.c:107
+#: ../widgets/misc/e-online-button.c:131
 msgid "The button state is online"
 msgstr "按钮状态为在线"
 
-#: ../widgets/misc/e-pilot-settings.c:102
+#: ../widgets/misc/e-paned.c:244
+#, fuzzy
+msgid "Horizontal Position"
+msgstr "水平面板位置"
+
+#: ../widgets/misc/e-paned.c:245
+msgid "Pane position when oriented horizontally"
+msgstr ""
+
+#: ../widgets/misc/e-paned.c:256
+#, fuzzy
+msgid "Vertical Position"
+msgstr "垂直面板的位置"
+
+#: ../widgets/misc/e-paned.c:257
+msgid "Pane position when oriented vertically"
+msgstr ""
+
+#: ../widgets/misc/e-pilot-settings.c:99
 msgid "Sync with:"
 msgstr "同步对象："
 
-#: ../widgets/misc/e-pilot-settings.c:110
+#: ../widgets/misc/e-pilot-settings.c:107
 msgid "Sync Private Records:"
 msgstr "同步私有记录："
 
-#: ../widgets/misc/e-pilot-settings.c:119
+#: ../widgets/misc/e-pilot-settings.c:116
 msgid "Sync Categories:"
 msgstr "同步类别："
 
-#: ../widgets/misc/e-reflow.c:1439 ../widgets/misc/e-reflow.c:1440
-msgid "Empty message"
-msgstr "空信件"
-
-#: ../widgets/misc/e-reflow.c:1446 ../widgets/misc/e-reflow.c:1447
-msgid "Reflow model"
-msgstr "回流模型"
-
-#: ../widgets/misc/e-reflow.c:1453 ../widgets/misc/e-reflow.c:1454
-msgid "Column width"
-msgstr "列宽"
-
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Search"
-msgstr "搜索"
-
-#: ../widgets/misc/e-search-bar.c:337 ../widgets/misc/e-search-bar.c:470
-#: ../widgets/misc/e-search-bar.c:472
-msgid "Click here to change the search type"
-msgstr "单击此处更改搜索类型"
-
-#: ../widgets/misc/e-search-bar.c:603
-msgid "_Search"
-msgstr "搜索(_S)"
-
-#: ../widgets/misc/e-search-bar.c:609
-msgid "_Find Now"
-msgstr "立即查找(_F)"
-
-#: ../widgets/misc/e-search-bar.c:610
-msgid "_Clear"
-msgstr "清除(_C)"
-
-#: ../widgets/misc/e-search-bar.c:865
-msgid "Item ID"
-msgstr "项目 ID"
-
-#: ../widgets/misc/e-search-bar.c:872 ../widgets/text/e-text.c:3566
-#: ../widgets/text/e-text.c:3567
-msgid "Text"
-msgstr "文字"
-
-#. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
-#. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:1003
-msgid "Sho_w: "
-msgstr "显示(_W)："
-
-#. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
-#. the term to search for
-#: ../widgets/misc/e-search-bar.c:1020
-msgid "Sear_ch: "
-msgstr "搜索(_C)："
-
-#. To Translators: The " in " label is part of the Quick Search Bar, example:
-#. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1032
-msgid " i_n "
-msgstr " 于(_N) "
+#: ../widgets/misc/e-preferences-window.c:218
+msgid "Evolution Preferences"
+msgstr "Evolution 首选项"
 
-#: ../widgets/misc/e-selection-model-array.c:594
-#: ../widgets/table/e-tree-selection-model.c:806
+#: ../widgets/misc/e-selection-model-array.c:593
+#: ../widgets/table/e-tree-selection-model.c:803
 msgid "Cursor Row"
 msgstr "光标行"
 
-#: ../widgets/misc/e-selection-model-array.c:601
-#: ../widgets/table/e-tree-selection-model.c:813
+#: ../widgets/misc/e-selection-model-array.c:600
+#: ../widgets/table/e-tree-selection-model.c:810
 msgid "Cursor Column"
 msgstr "光标列"
 
-#: ../widgets/misc/e-selection-model.c:209
+#: ../widgets/misc/e-selection-model.c:208
 msgid "Sorter"
 msgstr "排序"
 
-#: ../widgets/misc/e-selection-model.c:216
+#: ../widgets/misc/e-selection-model.c:215
 msgid "Selection Mode"
 msgstr "选择模式"
 
-#: ../widgets/misc/e-selection-model.c:224
+#: ../widgets/misc/e-selection-model.c:223
 msgid "Cursor Mode"
 msgstr "光标模式"
 
-#: ../widgets/misc/e-send-options.c:522
+#: ../widgets/misc/e-send-options.c:515
 msgid "When de_leted:"
 msgstr "删除时(_L)："
 
-#: ../widgets/misc/e-send-options.glade.h:1
-msgid "<b>Delivery Options</b>"
-msgstr "<b>发送选项</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:2
-msgid "<b>Replies</b>"
-msgstr "<b>回复数</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:3
-msgid "<b>Return Notification</b>"
-msgstr "<b>返回通知</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:4
-msgid "<b>Status Tracking</b>"
-msgstr "<b>状态跟踪</b>"
-
-#: ../widgets/misc/e-send-options.glade.h:5
+#: ../widgets/misc/e-send-options.ui.h:1
 msgid "A_uto-delete sent item"
 msgstr "自动删除已发项目(_U)"
 
-#: ../widgets/misc/e-send-options.glade.h:7
+#: ../widgets/misc/e-send-options.ui.h:3
 msgid "Creat_e a sent item to track information"
 msgstr "创建一个已发送项以跟踪信息(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:8
+#: ../widgets/misc/e-send-options.ui.h:4
 msgid "Deli_vered and opened"
 msgstr "已发送和已打开(_V)"
 
-#: ../widgets/misc/e-send-options.glade.h:9
+#: ../widgets/misc/e-send-options.ui.h:5
+#, fuzzy
+msgid "Delivery Options"
+msgstr "<b>发送选项</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:6
+msgid "For Your Eyes Only"
+msgstr "独家"
+
+#: ../widgets/misc/e-send-options.ui.h:7
 msgid "Gene_ral Options"
 msgstr "常规选项(_R)"
 
-#: ../widgets/misc/e-send-options.glade.h:10
-msgid ""
-"None\n"
-"Mail Receipt"
+#: ../widgets/misc/e-send-options.ui.h:10
+#, fuzzy
+msgid "Mail Receipt"
 msgstr ""
 "无\n"
 "阅读收条"
 
-#: ../widgets/misc/e-send-options.glade.h:12
-msgid ""
-"Normal\n"
-"Proprietary\n"
-"Confidential\n"
-"Secret\n"
-"Top Secret\n"
-"For Your Eyes Only"
-msgstr ""
-"普通\n"
-"私有\n"
-"机密\n"
-"秘密\n"
-"绝密\n"
-"独家"
+#: ../widgets/misc/e-send-options.ui.h:13
+#, fuzzy
+msgid "Proprietary"
+msgstr "优先级"
 
-#: ../widgets/misc/e-send-options.glade.h:18
+#: ../widgets/misc/e-send-options.ui.h:14
 msgid "R_eply requested"
 msgstr "请求回复(_E)"
 
-#: ../widgets/misc/e-send-options.glade.h:20
+#: ../widgets/misc/e-send-options.ui.h:16
+#, fuzzy
+msgid "Return Notification"
+msgstr "<b>返回通知</b>"
+
+#: ../widgets/misc/e-send-options.ui.h:19
 msgid "Sta_tus Tracking"
 msgstr "状态跟踪(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:21
-msgid ""
-"Undefined\n"
-"High\n"
-"Standard\n"
-"Low"
-msgstr ""
-"未定义\n"
-"高\n"
-"标准\n"
-"低"
+#: ../widgets/misc/e-send-options.ui.h:20
+msgid "Standard"
+msgstr "标准"
 
-#: ../widgets/misc/e-send-options.glade.h:25
+#: ../widgets/misc/e-send-options.ui.h:21
+#, fuzzy
+msgid "Status Tracking"
+msgstr "状态跟踪(_T)"
+
+#: ../widgets/misc/e-send-options.ui.h:22
+msgid "Top Secret"
+msgstr "绝密"
+
+#: ../widgets/misc/e-send-options.ui.h:24
 msgid "When acce_pted:"
 msgstr "接受时(_P)："
 
-#: ../widgets/misc/e-send-options.glade.h:26
+#: ../widgets/misc/e-send-options.ui.h:25
 msgid "When co_mpleted:"
 msgstr "完成时(_M)："
 
-#: ../widgets/misc/e-send-options.glade.h:27
+#: ../widgets/misc/e-send-options.ui.h:26
 msgid "When decli_ned:"
 msgstr "拒绝时(_N)："
 
-#: ../widgets/misc/e-send-options.glade.h:28
+#: ../widgets/misc/e-send-options.ui.h:27
 msgid "Wi_thin"
 msgstr "少于(_T)"
 
-#: ../widgets/misc/e-send-options.glade.h:29
+#: ../widgets/misc/e-send-options.ui.h:28
 msgid "_After:"
 msgstr "之后(_A)："
 
-#: ../widgets/misc/e-send-options.glade.h:30
+#: ../widgets/misc/e-send-options.ui.h:29
 msgid "_All information"
 msgstr "全部信息(_A)"
 
-#. To translators: This means Delay the message delivery for some time
-#: ../widgets/misc/e-send-options.glade.h:32
+#: ../widgets/misc/e-send-options.ui.h:30
+#, fuzzy
+msgid "_Classification:"
+msgstr "分类(_C)"
+
+#: ../widgets/misc/e-send-options.ui.h:31
 msgid "_Delay message delivery"
 msgstr "推迟信件投递(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:33
+#: ../widgets/misc/e-send-options.ui.h:32
 msgid "_Delivered"
 msgstr "已投递(_D)"
 
-#: ../widgets/misc/e-send-options.glade.h:35
+#: ../widgets/misc/e-send-options.ui.h:34
 msgid "_Set expiration date"
 msgstr "设置过期时间(_S)"
 
-#: ../widgets/misc/e-send-options.glade.h:36
+#: ../widgets/misc/e-send-options.ui.h:35
 msgid "_Until:"
 msgstr "直到(_U)："
 
-#: ../widgets/misc/e-send-options.glade.h:37
+#: ../widgets/misc/e-send-options.ui.h:36
 msgid "_When convenient"
 msgstr "方便时(_W)"
 
-#: ../widgets/misc/e-send-options.glade.h:38
+#: ../widgets/misc/e-send-options.ui.h:37
 msgid "_When opened:"
 msgstr "打开时(_W)："
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:252
-#, c-format
-msgid "%s (...)"
-msgstr "%s (...)"
+#: ../widgets/misc/e-signature-editor.c:130
+#: ../widgets/misc/e-signature-editor.c:489
+#: ../widgets/misc/e-signature-manager.c:349
+#: ../widgets/misc/e-signature-script-dialog.c:218
+msgid "Unnamed"
+msgstr "未命名"
 
-#. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
-#. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:258
-#, c-format
-msgid "%s (%d%% complete)"
-msgstr "%s (%d%% 完成)"
+#: ../widgets/misc/e-signature-editor.c:207
+msgid "_Save and Close"
+msgstr "保存并关闭(_S)"
+
+#: ../widgets/misc/e-signature-editor.c:361
+msgid "Edit Signature"
+msgstr "编辑签名"
+
+#: ../widgets/misc/e-signature-editor.c:376
+msgid "_Signature Name:"
+msgstr "签名(_S)："
+
+#: ../widgets/misc/e-signature-manager.c:294
+#, fuzzy
+msgid "Add Signature Script"
+msgstr "添加签名脚本"
+
+#: ../widgets/misc/e-signature-manager.c:359
+#, fuzzy
+msgid "Edit Signature Script"
+msgstr "编辑签名"
+
+#: ../widgets/misc/e-signature-manager.c:576
+msgid "Add _Script"
+msgstr "添加脚本(_S)"
+
+#: ../widgets/misc/e-signature-script-dialog.c:266
+#, fuzzy
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"此脚本的输出将用于您的签名。您指定的名称将只会\n"
+"用于显示。"
 
-#: ../widgets/misc/e-url-entry.c:105
+#: ../widgets/misc/e-signature-script-dialog.c:311
+#, fuzzy
+msgid "S_cript:"
+msgstr "脚本(_S)："
+
+#: ../widgets/misc/e-signature-script-dialog.c:342
+#, fuzzy
+msgid "Script file must be executable."
+msgstr "脚本文件必须存在且可执行。"
+
+#: ../widgets/misc/e-url-entry.c:103
 msgid "Click here to go to URL"
 msgstr "单击此处转到 URL"
 
-#: ../widgets/misc/gal-categories.glade.h:1
-msgid "Edit Master Category List..."
-msgstr "编辑主类别列表..."
+#: ../widgets/misc/e-web-view.c:340
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
 
-#: ../widgets/misc/gal-categories.glade.h:2
-msgid "Item(s) belong to these _categories:"
-msgstr "属于这些类别的项目(_C)："
+#: ../widgets/misc/e-web-view.c:342
+#, fuzzy
+msgid "Copy the link to the clipboard"
+msgstr "将选中文字复制到剪贴板"
 
-#: ../widgets/misc/gal-categories.glade.h:3
-msgid "_Available Categories:"
-msgstr "可用类别(_A)："
+#: ../widgets/misc/e-web-view.c:350
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
 
-#: ../widgets/misc/gal-categories.glade.h:4
-msgid "categories"
-msgstr "类别"
+#: ../widgets/misc/e-web-view.c:352
+#, fuzzy
+msgid "Open the link in a web browser"
+msgstr "在浏览器中打开链接(_O)"
+
+#: ../widgets/misc/e-web-view.c:360
+msgid "_Copy Email Address"
+msgstr "复制电子邮件地址(_C)"
+
+#: ../widgets/misc/e-web-view.c:379
+msgid "Copy the selection to the clipboard"
+msgstr "复制选择到剪贴板"
+
+#: ../widgets/misc/e-web-view.c:389
+msgid "Select all text and images"
+msgstr "选中全部文本和图像"
+
+#: ../widgets/misc/e-web-view.c:710 ../widgets/misc/e-web-view.c:712
+#: ../widgets/misc/e-web-view.c:714
+#, c-format
+msgid "Click to call %s"
+msgstr "单击以呼叫 %s"
+
+#: ../widgets/misc/e-web-view.c:716
+msgid "Click to hide/unhide addresses"
+msgstr "单击可隐藏/显示地址"
+
+#: ../widgets/misc/e-web-view.c:718
+#, c-format
+msgid "Click to open %s"
+msgstr "单击以打开 %s"
+
+#: ../widgets/misc/ea-calendar-item.c:295
+#: ../widgets/misc/ea-calendar-item.c:301
+msgid "%d %B %Y"
+msgstr "%Y年%-m月%-d日"
+
+#: ../widgets/misc/ea-calendar-item.c:303
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "日历：从 %s 到 %s"
+
+#: ../widgets/misc/ea-calendar-item.c:338
+msgid "evolution calendar item"
+msgstr "Evolution 日历项目"
 
-#: ../widgets/table/e-cell-combo.c:170
+#: ../widgets/table/e-cell-combo.c:171
 msgid "popup list"
 msgstr "弹出列表"
 
-#: ../widgets/table/e-cell-date.c:62
-msgid "%l:%M %p"
-msgstr "%p%l:%M"
+#: ../widgets/table/e-cell-date-edit.c:296
+msgid "Now"
+msgstr "现在"
+
+#: ../widgets/table/e-cell-date-edit.c:320
+msgid "OK"
+msgstr "确定"
+
+#: ../widgets/table/e-cell-date-edit.c:846
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "时间必须采用格式：%s"
+
+#: ../widgets/table/e-cell-percent.c:76
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "百分比值必需在 0 到 100 之间，含 0 和 100"
 
 #: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
@@ -23028,457 +21197,2330 @@ msgstr "聚焦列"
 msgid "Unselected Column"
 msgstr "未选列"
 
-#: ../widgets/table/e-cell-text.c:1794
+#: ../widgets/table/e-cell-text.c:1801
 msgid "Strikeout Column"
 msgstr "给列加删除线"
 
-#: ../widgets/table/e-cell-text.c:1801
+#: ../widgets/table/e-cell-text.c:1808
 msgid "Underline Column"
 msgstr "给列加下划线"
 
-#: ../widgets/table/e-cell-text.c:1808
+#: ../widgets/table/e-cell-text.c:1815
 msgid "Bold Column"
 msgstr "给列加粗"
 
-#: ../widgets/table/e-cell-text.c:1815
+#: ../widgets/table/e-cell-text.c:1822
 msgid "Color Column"
 msgstr "给列着色"
 
-#: ../widgets/table/e-cell-text.c:1829
+#: ../widgets/table/e-cell-text.c:1836
 msgid "BG Color Column"
 msgstr "给列着背景色"
 
-#: ../widgets/table/e-table-config.c:152
+#: ../widgets/table/e-table-click-to-add.c:576
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:58
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:131
+msgid "click to add"
+msgstr "单击可添加"
+
+#: ../widgets/table/e-table-config.c:151
 msgid "State"
 msgstr "状态"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Ascending)"
 msgstr "(升序)"
 
-#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
 msgid "(Descending)"
 msgstr "(降序)"
 
-#: ../widgets/table/e-table-config.c:392
+#: ../widgets/table/e-table-config.c:389
 msgid "Not sorted"
 msgstr "未排序"
 
-#: ../widgets/table/e-table-config.c:433
+#: ../widgets/table/e-table-config.c:430
 msgid "No grouping"
 msgstr "未分组"
 
-#: ../widgets/table/e-table-config.c:643
-#: ../widgets/table/e-table-config.glade.h:11
+#: ../widgets/table/e-table-config.c:638
+#: ../widgets/table/e-table-config.ui.h:11
 msgid "Show Fields"
 msgstr "显示域"
 
-#: ../widgets/table/e-table-config.c:664
+#: ../widgets/table/e-table-config.c:657
 msgid "Available Fields"
 msgstr "可用域"
 
-#: ../widgets/table/e-table-config.glade.h:1
+#: ../widgets/table/e-table-config.ui.h:1
 msgid "A_vailable Fields:"
 msgstr "可用域(_V)："
 
-#: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:2
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Ascending"
 msgstr "升序"
 
-#: ../widgets/table/e-table-config.glade.h:3
+#: ../widgets/table/e-table-config.ui.h:3
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../widgets/table/e-table-config.glade.h:4
+#: ../widgets/table/e-table-config.ui.h:4
 msgid "Clear _All"
 msgstr "全部清除(_A)"
 
-#: ../widgets/table/e-table-config.glade.h:5
-#: ../widgets/table/e-table-header-item.c:1582
+#: ../widgets/table/e-table-config.ui.h:5
+#: ../widgets/table/e-table-header-item.c:1580
 msgid "Descending"
 msgstr "降序"
 
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.ui.h:8
 msgid "Group Items By"
 msgstr "分组依据"
 
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.ui.h:9
 msgid "Move _Down"
 msgstr "下移(_D)"
 
-#: ../widgets/table/e-table-config.glade.h:10
+#: ../widgets/table/e-table-config.ui.h:10
 msgid "Move _Up"
 msgstr "上移(_U)"
 
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.ui.h:12
 msgid "Show _field in View"
 msgstr "在视图中显示域(_F)"
 
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.ui.h:13
 msgid "Show field i_n View"
 msgstr "在视图中显示域(_N)"
 
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.ui.h:14
 msgid "Show field in _View"
 msgstr "在视图中显示域(_V)"
 
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../widgets/table/e-table-config.ui.h:15
 msgid "Sort"
 msgstr "排序"
 
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.ui.h:16
 msgid "Sort Items By"
 msgstr "排序依据"
 
-#: ../widgets/table/e-table-config.glade.h:17
+#: ../widgets/table/e-table-config.ui.h:17
 msgid "Then By"
 msgstr "然后按"
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.ui.h:19
 msgid "_Fields Shown..."
 msgstr "显示的域(_F)..."
 
-#: ../widgets/table/e-table-config.glade.h:20
+#: ../widgets/table/e-table-config.ui.h:20
 msgid "_Group By..."
 msgstr "分组依据(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:22
+#: ../widgets/table/e-table-config.ui.h:22
 msgid "_Show field in View"
 msgstr "在视图中显示域(_S)"
 
-#: ../widgets/table/e-table-config.glade.h:23
+#: ../widgets/table/e-table-config.ui.h:23
 msgid "_Show these fields in order:"
 msgstr "按顺序显示这些域(_S)："
 
-#: ../widgets/table/e-table-config.glade.h:24
+#: ../widgets/table/e-table-config.ui.h:24
 msgid "_Sort..."
 msgstr "排序(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:67
-#: ../widgets/table/e-table-field-chooser-item.c:633
-#: ../widgets/table/e-table-field-chooser.c:66
-#: ../widgets/table/e-table-header-item.c:1886
-msgid "DnD code"
-msgstr "拖放代码"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:74
-#: ../widgets/table/e-table-field-chooser-item.c:640
-#: ../widgets/table/e-table-field-chooser.c:73
-#: ../widgets/table/e-table-header-item.c:1900
-msgid "Full Header"
-msgstr "完整标题"
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:116
+#: ../widgets/table/e-table-field-chooser-dialog.c:114
 msgid "Add a column..."
 msgstr "添加一列..."
 
-#: ../widgets/table/e-table-field-chooser.glade.h:1
-msgid "Field Chooser"
-msgstr "域选择器"
-
-#: ../widgets/table/e-table-field-chooser.glade.h:2
+#: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
 msgstr "要在您的表格中添加列，请将其拖曳到您想要其出现的位置。"
 
-#: ../widgets/table/e-table-group-container.c:344
+#: ../widgets/table/e-table-group-container.c:341
 #, c-format
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s：%s (%d 项)"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 项)"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
-#: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-group-leaf.c:582
-#: ../widgets/table/e-table-item.c:3028 ../widgets/table/e-table-item.c:3029
+#: ../widgets/table/e-table-group-container.c:924
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-leaf.c:586
+#: ../widgets/table/e-table-group-leaf.c:587
+#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "交替行色"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
-#: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-group-leaf.c:589
-#: ../widgets/table/e-table-item.c:3035 ../widgets/table/e-table-item.c:3036
-#: ../widgets/table/e-tree.c:3343 ../widgets/table/e-tree.c:3344
+#: ../widgets/table/e-table-group-container.c:931
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-leaf.c:593
+#: ../widgets/table/e-table-group-leaf.c:594
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "水平绘制网格"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
-#: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-group-leaf.c:596
-#: ../widgets/table/e-table-item.c:3042 ../widgets/table/e-table-item.c:3043
-#: ../widgets/table/e-tree.c:3349 ../widgets/table/e-tree.c:3350
+#: ../widgets/table/e-table-group-container.c:938
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-leaf.c:600
+#: ../widgets/table/e-table-group-leaf.c:601
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "垂直绘制网格"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
-#: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-group-leaf.c:603
-#: ../widgets/table/e-table-item.c:3049 ../widgets/table/e-table-item.c:3050
-#: ../widgets/table/e-tree.c:3355 ../widgets/table/e-tree.c:3356
+#: ../widgets/table/e-table-group-container.c:945
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-leaf.c:607
+#: ../widgets/table/e-table-group-leaf.c:608
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "绘制焦点"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
-#: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-group-leaf.c:610
-#: ../widgets/table/e-table-item.c:3056 ../widgets/table/e-table-item.c:3057
+#: ../widgets/table/e-table-group-container.c:952
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-leaf.c:614
+#: ../widgets/table/e-table-group-leaf.c:615
+#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "光标模式"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
-#: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-group-leaf.c:624
-#: ../widgets/table/e-table-item.c:3021 ../widgets/table/e-table-item.c:3022
+#: ../widgets/table/e-table-group-container.c:959
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-leaf.c:628
+#: ../widgets/table/e-table-group-leaf.c:629
+#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "选择模型"
 
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
-#: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-group-leaf.c:617
-#: ../widgets/table/e-table-item.c:3063 ../widgets/table/e-table-item.c:3064
-#: ../widgets/table/e-table.c:3326 ../widgets/table/e-tree.c:3337
-#: ../widgets/table/e-tree.c:3338
+#: ../widgets/table/e-table-group-container.c:966
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-leaf.c:621
+#: ../widgets/table/e-table-group-leaf.c:622
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
+#: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
 msgstr "长度阀值"
 
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
-#: ../widgets/table/e-table-group-leaf.c:658
-#: ../widgets/table/e-table-group-leaf.c:659
-#: ../widgets/table/e-table-item.c:3097 ../widgets/table/e-table-item.c:3098
-#: ../widgets/table/e-table.c:3333 ../widgets/table/e-tree.c:3369
-#: ../widgets/table/e-tree.c:3370
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-container.c:974
+#: ../widgets/table/e-table-group-leaf.c:663
+#: ../widgets/table/e-table-group-leaf.c:664
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
+#: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
 msgstr "统一行高"
 
-#: ../widgets/table/e-table-group-container.c:978
-#: ../widgets/table/e-table-group-container.c:979
-#: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-group-leaf.c:652
+#: ../widgets/table/e-table-group-container.c:980
+#: ../widgets/table/e-table-group-container.c:981
+#: ../widgets/table/e-table-group-leaf.c:656
+#: ../widgets/table/e-table-group-leaf.c:657
 msgid "Frozen"
 msgstr "冻结"
 
-#: ../widgets/table/e-table-header-item.c:1452
+#: ../widgets/table/e-table-header-item.c:1450
 msgid "Customize Current View"
 msgstr "自定义当前视图"
 
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1470
 msgid "Sort _Ascending"
 msgstr "升序排序(_A)"
 
-#: ../widgets/table/e-table-header-item.c:1473
+#: ../widgets/table/e-table-header-item.c:1471
 msgid "Sort _Descending"
 msgstr "降序排序(_D)"
 
-#: ../widgets/table/e-table-header-item.c:1474
+#: ../widgets/table/e-table-header-item.c:1472
 msgid "_Unsort"
 msgstr "未排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1476
+#: ../widgets/table/e-table-header-item.c:1474
 msgid "Group By This _Field"
 msgstr "按该域分组(_F)"
 
-#: ../widgets/table/e-table-header-item.c:1477
+#: ../widgets/table/e-table-header-item.c:1475
 msgid "Group By _Box"
 msgstr "按方框分组(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1479
+#: ../widgets/table/e-table-header-item.c:1477
 msgid "Remove This _Column"
 msgstr "删除该列(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1480
+#: ../widgets/table/e-table-header-item.c:1478
 msgid "Add a C_olumn..."
 msgstr "添加一列(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1482
+#: ../widgets/table/e-table-header-item.c:1480
 msgid "A_lignment"
 msgstr "对齐(_L)"
 
-#: ../widgets/table/e-table-header-item.c:1483
+#: ../widgets/table/e-table-header-item.c:1481
 msgid "B_est Fit"
 msgstr "最佳匹配(_E)"
 
-#: ../widgets/table/e-table-header-item.c:1484
+#: ../widgets/table/e-table-header-item.c:1482
 msgid "Format Column_s..."
 msgstr "格式化列(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1486
+#: ../widgets/table/e-table-header-item.c:1484
 msgid "Custo_mize Current View..."
 msgstr "自定义当前视图(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1542
+#: ../widgets/table/e-table-header-item.c:1540
 msgid "_Sort By"
 msgstr "排序方式(_S)"
 
 #. Custom
-#: ../widgets/table/e-table-header-item.c:1560
+#: ../widgets/table/e-table-header-item.c:1558
 msgid "_Custom"
 msgstr "自定义(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1893
-msgid "Font Description"
-msgstr "字体描述"
-
-#: ../widgets/table/e-table-header-item.c:1914
-#: ../widgets/table/e-table-sorter.c:172
-msgid "Sort Info"
-msgstr "排序信息"
-
-#: ../widgets/table/e-table-header-item.c:1928
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "树"
-
-#: ../widgets/table/e-table-item.c:3007 ../widgets/table/e-table-item.c:3008
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "表头"
 
-#: ../widgets/table/e-table-item.c:3014 ../widgets/table/e-table-item.c:3015
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3090 ../widgets/table/e-table-item.c:3091
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "光标行"
 
-#: ../widgets/table/e-table.c:3340 ../widgets/table/e-tree.c:3376
-#: ../widgets/table/e-tree.c:3377
+#: ../widgets/table/e-table-sorter.c:172
+msgid "Sort Info"
+msgstr "排序信息"
+
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3372
+#: ../widgets/table/e-tree.c:3373
 msgid "Always search"
 msgstr "总是搜索"
 
-#: ../widgets/table/e-table.c:3347
+#: ../widgets/table/e-table.c:3337
 msgid "Use click to add"
 msgstr "单击可添加"
 
-#: ../widgets/table/e-tree.c:3362 ../widgets/table/e-tree.c:3363
+#: ../widgets/table/e-table.c:3351
+#, fuzzy
+msgid "Vertical Row Spacing"
+msgstr "标识器间距"
+
+#: ../widgets/table/e-table.c:3352
+msgid "Vertical space between rows. It is added to top and to bottom of a row"
+msgstr ""
+
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
+msgid "Tree"
+msgstr "树"
+
+#: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "ETree 表格适配器"
 
-#: ../widgets/table/e-tree.c:3383
+#: ../widgets/table/e-tree.c:3379
 msgid "Retro Look"
 msgstr "火箭外观"
 
-#: ../widgets/table/e-tree.c:3384
+#: ../widgets/table/e-tree.c:3380
 msgid "Draw lines and +/- expanders."
 msgstr "绘制行和 +/- 扩展柄。"
 
-#: ../widgets/text/e-text.c:2736
+#: ../widgets/table/e-tree.c:3386
+msgid "Expander Size"
+msgstr "扩展器大小"
+
+#: ../widgets/table/e-tree.c:3387
+msgid "Size of the expander arrow"
+msgstr "扩展器箭头的大小"
+
+#: ../widgets/table/gal-a11y-e-cell-popup.c:121
+msgid "popup"
+msgstr "弹出"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-popup.c:122
+msgid "popup a child"
+msgstr "弹出子对象"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:616
+msgid "edit"
+msgstr "编辑"
+
+#: ../widgets/table/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr "开始编辑此单元格"
+
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:169
+msgid "toggle"
+msgstr "切换"
+
+#. action name
+#: ../widgets/table/gal-a11y-e-cell-toggle.c:170
+msgid "toggle the cell"
+msgstr "切换单元格"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:210
+msgid "expand"
+msgstr "展开"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:211
+msgid "expands the row in the ETree containing this cell"
+msgstr "在包含此单元格的 ETree 中展开行"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:216
+msgid "collapse"
+msgstr "折叠"
+
+#: ../widgets/table/gal-a11y-e-cell-tree.c:217
+msgid "collapses the row in the ETree containing this cell"
+msgstr "在包含此单元格的 ETree 中折叠行"
+
+#: ../widgets/table/gal-a11y-e-cell.c:120
+msgid "Table Cell"
+msgstr "表格单元格"
+
+#: ../widgets/table/gal-a11y-e-table-click-to-add.c:67
+msgid "click"
+msgstr "单击"
+
+#: ../widgets/table/gal-a11y-e-table-column-header.c:152
+msgid "sort"
+msgstr "排序"
+
+#: ../widgets/text/e-text.c:2719
+msgid "Select All"
+msgstr "全选"
+
+#: ../widgets/text/e-text.c:2731
 msgid "Input Methods"
 msgstr "输入法"
 
-#: ../widgets/text/e-text.c:3559 ../widgets/text/e-text.c:3560
+#: ../widgets/text/e-text.c:3548 ../widgets/text/e-text.c:3549
 msgid "Event Processor"
 msgstr "事件处理器"
 
-#: ../widgets/text/e-text.c:3573 ../widgets/text/e-text.c:3574
+#: ../widgets/text/e-text.c:3555 ../widgets/text/e-text.c:3556
+msgid "Text"
+msgstr "文字"
+
+#: ../widgets/text/e-text.c:3562 ../widgets/text/e-text.c:3563
 msgid "Bold"
 msgstr "粗体"
 
-#: ../widgets/text/e-text.c:3580 ../widgets/text/e-text.c:3581
+#: ../widgets/text/e-text.c:3569 ../widgets/text/e-text.c:3570
 msgid "Strikeout"
 msgstr "删除线"
 
-#: ../widgets/text/e-text.c:3587 ../widgets/text/e-text.c:3588
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3577
 msgid "Anchor"
 msgstr "锚点"
 
-#: ../widgets/text/e-text.c:3595 ../widgets/text/e-text.c:3596
+#: ../widgets/text/e-text.c:3583 ../widgets/text/e-text.c:3584
 msgid "Justification"
 msgstr "两端对齐"
 
-#: ../widgets/text/e-text.c:3602 ../widgets/text/e-text.c:3603
+#: ../widgets/text/e-text.c:3590 ../widgets/text/e-text.c:3591
 msgid "Clip Width"
 msgstr "裁剪宽度"
 
-#: ../widgets/text/e-text.c:3609 ../widgets/text/e-text.c:3610
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Clip Height"
 msgstr "裁剪高度"
 
-#: ../widgets/text/e-text.c:3616 ../widgets/text/e-text.c:3617
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Clip"
 msgstr "裁剪"
 
-#: ../widgets/text/e-text.c:3623 ../widgets/text/e-text.c:3624
+#: ../widgets/text/e-text.c:3611 ../widgets/text/e-text.c:3612
 msgid "Fill clip rectangle"
 msgstr "填充裁剪矩形"
 
-#: ../widgets/text/e-text.c:3630 ../widgets/text/e-text.c:3631
+#: ../widgets/text/e-text.c:3618 ../widgets/text/e-text.c:3619
 msgid "X Offset"
 msgstr "水平偏移"
 
-#: ../widgets/text/e-text.c:3637 ../widgets/text/e-text.c:3638
+#: ../widgets/text/e-text.c:3625 ../widgets/text/e-text.c:3626
 msgid "Y Offset"
 msgstr "垂直偏移"
 
-#: ../widgets/text/e-text.c:3673 ../widgets/text/e-text.c:3674
+#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
 msgid "Text width"
 msgstr "文字宽度"
 
-#: ../widgets/text/e-text.c:3680 ../widgets/text/e-text.c:3681
+#: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
+#: ../widgets/text/e-text.c:3681 ../widgets/text/e-text.c:3682
 msgid "Use ellipsis"
 msgstr "使用椭圆"
 
-#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
+#: ../widgets/text/e-text.c:3688 ../widgets/text/e-text.c:3689
 msgid "Ellipsis"
 msgstr "椭圆"
 
-#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
+#: ../widgets/text/e-text.c:3695 ../widgets/text/e-text.c:3696
 msgid "Line wrap"
 msgstr "换行"
 
-#: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
+#: ../widgets/text/e-text.c:3702 ../widgets/text/e-text.c:3703
 msgid "Break characters"
 msgstr "换行字符"
 
-#: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
+#: ../widgets/text/e-text.c:3709 ../widgets/text/e-text.c:3710
 msgid "Max lines"
 msgstr "最多行数"
 
-#: ../widgets/text/e-text.c:3745 ../widgets/text/e-text.c:3746
+#: ../widgets/text/e-text.c:3730 ../widgets/text/e-text.c:3731
 msgid "Draw borders"
 msgstr "绘制边框"
 
-#: ../widgets/text/e-text.c:3752 ../widgets/text/e-text.c:3753
+#: ../widgets/text/e-text.c:3737 ../widgets/text/e-text.c:3738
 msgid "Allow newlines"
 msgstr "允许新行"
 
-#: ../widgets/text/e-text.c:3759 ../widgets/text/e-text.c:3760
+#: ../widgets/text/e-text.c:3744 ../widgets/text/e-text.c:3745
 msgid "Draw background"
 msgstr "绘制背景"
 
-#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3767
+#: ../widgets/text/e-text.c:3751 ../widgets/text/e-text.c:3752
 msgid "Draw button"
 msgstr "绘制按钮"
 
-#: ../widgets/text/e-text.c:3773 ../widgets/text/e-text.c:3774
+#: ../widgets/text/e-text.c:3758 ../widgets/text/e-text.c:3759
 msgid "Cursor position"
 msgstr "光标位置"
 
 #. Translators: Input Method Context
-#: ../widgets/text/e-text.c:3781 ../widgets/text/e-text.c:3783
+#: ../widgets/text/e-text.c:3766 ../widgets/text/e-text.c:3768
 msgid "IM Context"
 msgstr "输入法环境"
 
-#: ../widgets/text/e-text.c:3789 ../widgets/text/e-text.c:3790
+#: ../widgets/text/e-text.c:3774 ../widgets/text/e-text.c:3775
 msgid "Handle Popup"
 msgstr "处理弹出"
+
+#~ msgid "Evolution Error"
+#~ msgstr "Evolution 错误"
+
+#~ msgid "Evolution Warning"
+#~ msgstr "Evolution 警告"
+
+#~ msgid "Internal error, unknown error '%s' requested"
+#~ msgstr "内部错误，请求了未知的错误“%s”"
+
+#~ msgid "search bar"
+#~ msgstr "搜索栏"
+
+#~ msgid "evolution calendar search bar"
+#~ msgstr "Evolution 日历和搜索栏"
+
+#~ msgid "Combo Button"
+#~ msgstr "组合按钮"
+
+#~ msgid "Activate Default"
+#~ msgstr "激活默认"
+
+#~ msgid "Popup Menu"
+#~ msgstr "弹出菜单"
+
+#~ msgid "Toggle Attachment Bar"
+#~ msgstr "切换附件栏"
+
+#~ msgid "activate"
+#~ msgstr "激活"
+
+#~ msgid "C_ontacts"
+#~ msgstr "联系人(_O)"
+
+#~ msgid "Configure autocomplete here"
+#~ msgstr "在此配置自动补全"
+
+#~ msgid "Evolution Address Book"
+#~ msgstr "Evolution 地址簿"
+
+#~ msgid "Evolution Address Book address popup"
+#~ msgstr "Evolution 地址簿地址弹出框"
+
+#~ msgid "Evolution Address Book address viewer"
+#~ msgstr "Evolution 地址簿地址查看器"
+
+#~ msgid "Evolution Address Book card viewer"
+#~ msgstr "Evolution 地址簿名片查看器"
+
+#~ msgid "Evolution Address Book component"
+#~ msgstr "Evolution 地址簿组件"
+
+#~ msgid "Evolution S/MIME Certificate Management Control"
+#~ msgstr "Evolution S/MIME 证书管理控件"
+
+#~ msgid "Evolution folder settings configuration control"
+#~ msgstr "Evolution 文件夹配置控件"
+
+#~ msgid "Manage your S/MIME certificates here"
+#~ msgstr "在此管理您的 S/MIME 证书"
+
+#~ msgid "Failed upgrading Address Book settings or folders."
+#~ msgstr "升级地址簿设置或文件夹失败。"
+
+#~ msgid "Base"
+#~ msgstr "基础"
+
+#~ msgid "Rename the \"%s\" folder to:"
+#~ msgstr "将“%s”文件夹重命名为："
+
+#~ msgid "Rename Folder"
+#~ msgstr "重命名文件夹"
+
+#~ msgid "Save As vCard..."
+#~ msgstr "另存为 vCard..."
+
+#~ msgid "Contact Source Selector"
+#~ msgstr "联系人源选择器"
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the card and list views and the "
+#~ "preview pane, in pixels."
+#~ msgstr "卡片和列表视图及预览面板之间垂直面板的位置，以像素计。"
+
+#~ msgid "<b>Authentication</b>"
+#~ msgstr "<b>身份验证</b>"
+
+#~ msgid "<b>Downloading</b>"
+#~ msgstr "<b>下载</b>"
+
+#~ msgid "<b>Searching</b>"
+#~ msgstr "<b>搜索</b>"
+
+#~ msgid "<b>Type:</b>"
+#~ msgstr "<b>类型：</b>"
+
+#~ msgid "Add Address Book"
+#~ msgstr "添加地址簿"
+
+#~ msgid "Basic"
+#~ msgstr "基本"
+
+#~ msgid "Distinguished name"
+#~ msgstr "识别性名称"
+
+#~ msgid "Email address"
+#~ msgstr "电子邮件地址"
+
+#~ msgid ""
+#~ "Evolution will use this email address to authenticate you with the server."
+#~ msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证。"
+
+#~ msgid "Find Possible Search Bases"
+#~ msgstr "查找可能的搜索基础"
+
+#~ msgid "Search filter"
+#~ msgstr "搜索过滤器"
+
+#~ msgid ""
+#~ "The search base is the distinguished name (DN) of the entry where your "
+#~ "searches will begin. If you leave this blank, the search will begin at "
+#~ "the root of the directory tree."
+#~ msgstr ""
+#~ "搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空，搜索将从目录树的"
+#~ "根开始。"
+
+#~ msgid ""
+#~ "This is the full name of your LDAP server. For example, \"ldap.mycompany."
+#~ "com\"."
+#~ msgstr "这是您的 LDAP 服务器的完整名字。例如，“ldap.mycompany.com”。"
+
+#~ msgid ""
+#~ "This is the maximum number of entries to download. Setting this number to "
+#~ "be too large will slow down your address book."
+#~ msgstr "这是可下载条目的最大数量。将此数值设定得太大将导致地址簿变慢。"
+
+#~ msgid ""
+#~ "This is the name for this server that will appear in your Evolution "
+#~ "folder list. It is for display purposes only. "
+#~ msgstr "这是此服务器在 Evolution 文件夹列表中显示的名称。它只用于显示。"
+
+#~ msgid "Whenever Possible"
+#~ msgstr "可能时"
+
+#~ msgid "_Add Address Book"
+#~ msgstr "添加地址簿(_A)"
+
+#~ msgid "<b>Email</b>"
+#~ msgstr "<b>电子邮件</b>"
+
+#~ msgid "<b>Home</b>"
+#~ msgstr "<b>家庭</b>"
+
+#~ msgid "<b>Job</b>"
+#~ msgstr "<b>职位</b>"
+
+#~ msgid "<b>Miscellaneous</b>"
+#~ msgstr "<b>杂项</b>"
+
+#~ msgid "<b>Other</b>"
+#~ msgstr "<b>其它</b>"
+
+#~ msgid "<b>Telephone</b>"
+#~ msgstr "<b>电话</b>"
+
+#~ msgid "<b>Work</b>"
+#~ msgstr "<b>工作</b>"
+
+#~ msgid "MSN Messenger"
+#~ msgstr "MSN Messenger"
+
+#~ msgid "Novell GroupWise"
+#~ msgstr "Novell GroupWise"
+
+#~ msgid "Novell Groupwise"
+#~ msgstr "Novell Groupwise"
+
+#~ msgid "_Notes:"
+#~ msgstr "注释(_N)："
+
+#~ msgid "United States"
+#~ msgstr "美国"
+
+#~ msgid "Afghanistan"
+#~ msgstr "阿富汗"
+
+#~ msgid "Albania"
+#~ msgstr "阿尔巴尼亚"
+
+#~ msgid "Algeria"
+#~ msgstr "阿尔及利亚"
+
+#~ msgid "American Samoa"
+#~ msgstr "美洲萨摩亚"
+
+#~ msgid "Andorra"
+#~ msgstr "安道尔"
+
+#~ msgid "Angola"
+#~ msgstr "安哥拉"
+
+#~ msgid "Anguilla"
+#~ msgstr "安圭拉"
+
+#~ msgid "Antarctica"
+#~ msgstr "南极洲"
+
+#~ msgid "Antigua And Barbuda"
+#~ msgstr "安提瓜和巴布达"
+
+#~ msgid "Argentina"
+#~ msgstr "阿根廷"
+
+#~ msgid "Armenia"
+#~ msgstr "亚美尼亚"
+
+#~ msgid "Aruba"
+#~ msgstr "阿鲁巴岛"
+
+#~ msgid "Australia"
+#~ msgstr "澳大利亚"
+
+#~ msgid "Austria"
+#~ msgstr "奥地利"
+
+#~ msgid "Azerbaijan"
+#~ msgstr "阿塞拜疆"
+
+#~ msgid "Bahamas"
+#~ msgstr "巴哈马群岛"
+
+#~ msgid "Bahrain"
+#~ msgstr "巴林岛"
+
+#~ msgid "Bangladesh"
+#~ msgstr "孟加拉国"
+
+#~ msgid "Barbados"
+#~ msgstr "巴巴多斯岛"
+
+#~ msgid "Belarus"
+#~ msgstr "白俄罗斯"
+
+#~ msgid "Belgium"
+#~ msgstr "比利时"
+
+#~ msgid "Belize"
+#~ msgstr "伯利兹"
+
+#~ msgid "Benin"
+#~ msgstr "贝宁"
+
+#~ msgid "Bermuda"
+#~ msgstr "百慕大群岛"
+
+#~ msgid "Bhutan"
+#~ msgstr "不丹"
+
+#~ msgid "Bolivia"
+#~ msgstr "玻利维亚"
+
+#~ msgid "Bosnia And Herzegowina"
+#~ msgstr "波斯尼亚和黑赛哥维纳"
+
+#~ msgid "Botswana"
+#~ msgstr "博茨瓦纳"
+
+#~ msgid "Bouvet Island"
+#~ msgstr "布维岛"
+
+#~ msgid "Brazil"
+#~ msgstr "巴西"
+
+#~ msgid "British Indian Ocean Territory"
+#~ msgstr "英属印度洋地区"
+
+#~ msgid "Brunei Darussalam"
+#~ msgstr "文莱德鲁萨兰"
+
+#~ msgid "Bulgaria"
+#~ msgstr "保加利亚"
+
+#~ msgid "Burkina Faso"
+#~ msgstr "布基纳法索"
+
+#~ msgid "Burundi"
+#~ msgstr "布隆迪"
+
+#~ msgid "Cambodia"
+#~ msgstr "柬埔寨"
+
+#~ msgid "Cameroon"
+#~ msgstr "喀麦隆"
+
+#~ msgid "Canada"
+#~ msgstr "加拿大"
+
+#~ msgid "Cape Verde"
+#~ msgstr "佛得角"
+
+#~ msgid "Cayman Islands"
+#~ msgstr "开曼群岛"
+
+#~ msgid "Central African Republic"
+#~ msgstr "中非共和国"
+
+#~ msgid "Chad"
+#~ msgstr "乍得"
+
+#~ msgid "Chile"
+#~ msgstr "智利"
+
+#~ msgid "China"
+#~ msgstr "中国"
+
+#~ msgid "Christmas Island"
+#~ msgstr "圣诞岛"
+
+#~ msgid "Cocos (Keeling) Islands"
+#~ msgstr "科科斯群岛"
+
+#~ msgid "Colombia"
+#~ msgstr "哥伦比亚"
+
+#~ msgid "Comoros"
+#~ msgstr "科摩罗群岛"
+
+#~ msgid "Congo"
+#~ msgstr "刚果"
+
+#~ msgid "Congo, The Democratic Republic Of The"
+#~ msgstr "刚果人民民主共和国"
+
+#~ msgid "Cook Islands"
+#~ msgstr "库克群岛"
+
+#~ msgid "Costa Rica"
+#~ msgstr "哥斯达黎加"
+
+#~ msgid "Cote d'Ivoire"
+#~ msgstr "科特迪瓦"
+
+#~ msgid "Croatia"
+#~ msgstr "克罗地亚"
+
+#~ msgid "Cuba"
+#~ msgstr "古巴"
+
+#~ msgid "Cyprus"
+#~ msgstr "塞浦路斯"
+
+#~ msgid "Czech Republic"
+#~ msgstr "捷克共和国"
+
+#~ msgid "Denmark"
+#~ msgstr "丹麦"
+
+#~ msgid "Djibouti"
+#~ msgstr "吉布提群岛"
+
+#~ msgid "Dominica"
+#~ msgstr "多米尼加"
+
+#~ msgid "Dominican Republic"
+#~ msgstr "多米尼加共和国"
+
+#~ msgid "Ecuador"
+#~ msgstr "厄瓜多尔"
+
+#~ msgid "Egypt"
+#~ msgstr "埃及"
+
+#~ msgid "El Salvador"
+#~ msgstr "萨尔瓦多"
+
+#~ msgid "Equatorial Guinea"
+#~ msgstr "赤道几内亚"
+
+#~ msgid "Eritrea"
+#~ msgstr "厄立特里亚"
+
+#~ msgid "Estonia"
+#~ msgstr "爱沙尼亚"
+
+#~ msgid "Ethiopia"
+#~ msgstr "埃塞俄比亚"
+
+#~ msgid "Falkland Islands"
+#~ msgstr "福克兰群岛"
+
+#~ msgid "Faroe Islands"
+#~ msgstr "法罗群岛"
+
+#~ msgid "Fiji"
+#~ msgstr "斐济"
+
+#~ msgid "Finland"
+#~ msgstr "芬兰"
+
+#~ msgid "France"
+#~ msgstr "法国"
+
+#~ msgid "French Guiana"
+#~ msgstr "法属圭亚那"
+
+#~ msgid "French Polynesia"
+#~ msgstr "法属波利尼西亚"
+
+#~ msgid "French Southern Territories"
+#~ msgstr "法属南部地区"
+
+#~ msgid "Gabon"
+#~ msgstr "加蓬"
+
+#~ msgid "Gambia"
+#~ msgstr "冈比亚"
+
+#~ msgid "Georgia"
+#~ msgstr "格鲁吉亚"
+
+#~ msgid "Germany"
+#~ msgstr "德国"
+
+#~ msgid "Ghana"
+#~ msgstr "加纳"
+
+#~ msgid "Gibraltar"
+#~ msgstr "直布罗陀"
+
+#~ msgid "Greece"
+#~ msgstr "希腊"
+
+#~ msgid "Greenland"
+#~ msgstr "格陵兰"
+
+#~ msgid "Grenada"
+#~ msgstr "格林纳达"
+
+#~ msgid "Guadeloupe"
+#~ msgstr "瓜德罗普岛"
+
+#~ msgid "Guam"
+#~ msgstr "关岛"
+
+#~ msgid "Guatemala"
+#~ msgstr "危地马拉"
+
+#~ msgid "Guernsey"
+#~ msgstr "格恩西岛"
+
+#~ msgid "Guinea"
+#~ msgstr "几内亚"
+
+#~ msgid "Guinea-Bissau"
+#~ msgstr "几内亚比绍"
+
+#~ msgid "Guyana"
+#~ msgstr "圭亚那"
+
+#~ msgid "Haiti"
+#~ msgstr "海地"
+
+#~ msgid "Heard And McDonald Islands"
+#~ msgstr "赫德和麦克唐纳群岛"
+
+#~ msgid "Holy See"
+#~ msgstr "圣座"
+
+#~ msgid "Honduras"
+#~ msgstr "洪都拉斯"
+
+#~ msgid "Hong Kong"
+#~ msgstr "中国香港特别行政区"
+
+#~ msgid "Hungary"
+#~ msgstr "匈牙利"
+
+#~ msgid "Iceland"
+#~ msgstr "冰岛"
+
+#~ msgid "India"
+#~ msgstr "印度"
+
+#~ msgid "Indonesia"
+#~ msgstr "印度尼西亚"
+
+#~ msgid "Iran"
+#~ msgstr "伊朗"
+
+#~ msgid "Iraq"
+#~ msgstr "伊拉克"
+
+#~ msgid "Ireland"
+#~ msgstr "爱尔兰"
+
+#~ msgid "Isle of Man"
+#~ msgstr "Isle of Man"
+
+#~ msgid "Israel"
+#~ msgstr "以色列"
+
+#~ msgid "Italy"
+#~ msgstr "意大利"
+
+#~ msgid "Jamaica"
+#~ msgstr "牙买加"
+
+#~ msgid "Japan"
+#~ msgstr "日本"
+
+#~ msgid "Jersey"
+#~ msgstr "杰尔西"
+
+#~ msgid "Jordan"
+#~ msgstr "约旦"
+
+#~ msgid "Kazakhstan"
+#~ msgstr "哈萨克斯坦"
+
+#~ msgid "Kenya"
+#~ msgstr "肯尼亚"
+
+#~ msgid "Kiribati"
+#~ msgstr "基里巴斯"
+
+#~ msgid "Korea, Democratic People's Republic Of"
+#~ msgstr "韩国人民民主共和国"
+
+#~ msgid "Korea, Republic Of"
+#~ msgstr "韩国"
+
+#~ msgid "Kuwait"
+#~ msgstr "科威特"
+
+#~ msgid "Kyrgyzstan"
+#~ msgstr "吉尔吉斯斯坦"
+
+#~ msgid "Laos"
+#~ msgstr "老挝"
+
+#~ msgid "Latvia"
+#~ msgstr "拉脱维亚"
+
+#~ msgid "Lebanon"
+#~ msgstr "黎巴嫩"
+
+#~ msgid "Lesotho"
+#~ msgstr "莱索托"
+
+#~ msgid "Liberia"
+#~ msgstr "利比里亚"
+
+#~ msgid "Libya"
+#~ msgstr "利比亚"
+
+#~ msgid "Liechtenstein"
+#~ msgstr "列支敦士登"
+
+#~ msgid "Lithuania"
+#~ msgstr "立陶宛"
+
+#~ msgid "Luxembourg"
+#~ msgstr "卢森堡"
+
+#~ msgid "Macao"
+#~ msgstr "中国澳门特别行政区"
+
+#~ msgid "Macedonia"
+#~ msgstr "马其顿"
+
+#~ msgid "Madagascar"
+#~ msgstr "马达加斯加"
+
+#~ msgid "Malawi"
+#~ msgstr "马拉维"
+
+#~ msgid "Malaysia"
+#~ msgstr "马来西亚"
+
+#~ msgid "Maldives"
+#~ msgstr "马尔代夫"
+
+#~ msgid "Mali"
+#~ msgstr "马里"
+
+#~ msgid "Malta"
+#~ msgstr "马耳他"
+
+#~ msgid "Marshall Islands"
+#~ msgstr "马绍尔群岛"
+
+#~ msgid "Martinique"
+#~ msgstr "马提尼可岛"
+
+#~ msgid "Mauritania"
+#~ msgstr "毛里塔尼亚"
+
+#~ msgid "Mauritius"
+#~ msgstr "毛里求斯"
+
+#~ msgid "Mexico"
+#~ msgstr "墨西哥"
+
+#~ msgid "Micronesia"
+#~ msgstr "密克罗尼西亚"
+
+#~ msgid "Moldova, Republic Of"
+#~ msgstr "摩尔多瓦共和国"
+
+#~ msgid "Monaco"
+#~ msgstr "摩纳哥"
+
+#~ msgid "Mongolia"
+#~ msgstr "蒙古"
+
+#~ msgid "Montserrat"
+#~ msgstr "蒙特塞拉特群岛"
+
+#~ msgid "Morocco"
+#~ msgstr "摩洛哥"
+
+#~ msgid "Mozambique"
+#~ msgstr "莫桑比克"
+
+#~ msgid "Myanmar"
+#~ msgstr "缅甸"
+
+#~ msgid "Namibia"
+#~ msgstr "纳米比亚"
+
+#~ msgid "Nauru"
+#~ msgstr "瑙鲁"
+
+#~ msgid "Nepal"
+#~ msgstr "尼泊尔"
+
+#~ msgid "Netherlands"
+#~ msgstr "荷兰"
+
+#~ msgid "Netherlands Antilles"
+#~ msgstr "荷属安的列斯"
+
+#~ msgid "New Caledonia"
+#~ msgstr "新喀里多尼亚"
+
+#~ msgid "New Zealand"
+#~ msgstr "新西兰"
+
+#~ msgid "Nicaragua"
+#~ msgstr "尼加拉瓜"
+
+#~ msgid "Niger"
+#~ msgstr "尼日尔"
+
+#~ msgid "Nigeria"
+#~ msgstr "尼日利亚"
+
+#~ msgid "Niue"
+#~ msgstr "纽埃岛"
+
+#~ msgid "Norfolk Island"
+#~ msgstr "诺福克岛"
+
+#~ msgid "Northern Mariana Islands"
+#~ msgstr "北马里亚那群岛"
+
+#~ msgid "Norway"
+#~ msgstr "挪威"
+
+#~ msgid "Oman"
+#~ msgstr "阿曼"
+
+#~ msgid "Pakistan"
+#~ msgstr "巴基斯坦"
+
+#~ msgid "Palau"
+#~ msgstr "帕劳群岛"
+
+#~ msgid "Palestinian Territory"
+#~ msgstr "巴勒斯坦地区"
+
+#~ msgid "Panama"
+#~ msgstr "巴拿马"
+
+#~ msgid "Papua New Guinea"
+#~ msgstr "巴布亚新几内亚"
+
+#~ msgid "Paraguay"
+#~ msgstr "巴拉圭"
+
+#~ msgid "Peru"
+#~ msgstr "秘鲁"
+
+#~ msgid "Philippines"
+#~ msgstr "菲利宾"
+
+#~ msgid "Pitcairn"
+#~ msgstr "皮特克恩岛"
+
+#~ msgid "Poland"
+#~ msgstr "波兰"
+
+#~ msgid "Portugal"
+#~ msgstr "葡萄牙"
+
+#~ msgid "Puerto Rico"
+#~ msgstr "波多黎各"
+
+#~ msgid "Qatar"
+#~ msgstr "卡塔尔"
+
+#~ msgid "Reunion"
+#~ msgstr "留尼汪"
+
+#~ msgid "Romania"
+#~ msgstr "罗马尼亚"
+
+#~ msgid "Russian Federation"
+#~ msgstr "俄罗斯联邦"
+
+#~ msgid "Rwanda"
+#~ msgstr "卢旺达"
+
+#~ msgid "Saint Kitts And Nevis"
+#~ msgstr "圣基德和吉维斯"
+
+#~ msgid "Saint Lucia"
+#~ msgstr "圣卢西亚岛"
+
+#~ msgid "Saint Vincent And The Grenadines"
+#~ msgstr "圣文森特和格林纳达"
+
+#~ msgid "Samoa"
+#~ msgstr "萨摩亚"
+
+#~ msgid "San Marino"
+#~ msgstr "圣马力诺"
+
+#~ msgid "Sao Tome And Principe"
+#~ msgstr "圣多美和普林西比"
+
+#~ msgid "Saudi Arabia"
+#~ msgstr "沙特阿拉伯"
+
+#~ msgid "Senegal"
+#~ msgstr "塞内加尔"
+
+#~ msgid "Serbia And Montenegro"
+#~ msgstr "塞尔维亚和黑山"
+
+#~ msgid "Sierra Leone"
+#~ msgstr "塞拉利昂"
+
+#~ msgid "Singapore"
+#~ msgstr "新加坡"
+
+#~ msgid "Slovakia"
+#~ msgstr "斯洛伐克"
+
+#~ msgid "Slovenia"
+#~ msgstr "斯洛文尼亚"
+
+#~ msgid "Solomon Islands"
+#~ msgstr "所罗门群岛"
+
+#~ msgid "Somalia"
+#~ msgstr "索马里"
+
+#~ msgid "South Africa"
+#~ msgstr "南非"
+
+#~ msgid "South Georgia And The South Sandwich Islands"
+#~ msgstr "南乔治亚和南三文治群岛"
+
+#~ msgid "Spain"
+#~ msgstr "西班牙"
+
+#~ msgid "Sri Lanka"
+#~ msgstr "斯里兰卡"
+
+#~ msgid "St. Helena"
+#~ msgstr "圣赫勒拿岛"
+
+#~ msgid "St. Pierre And Miquelon"
+#~ msgstr "圣皮埃尔和麦克伦群岛"
+
+#~ msgid "Sudan"
+#~ msgstr "苏丹"
+
+#~ msgid "Suriname"
+#~ msgstr "苏里南"
+
+#~ msgid "Svalbard And Jan Mayen Islands"
+#~ msgstr "斯瓦巴和尖棉群岛"
+
+#~ msgid "Swaziland"
+#~ msgstr "斯威士兰"
+
+#~ msgid "Sweden"
+#~ msgstr "瑞典"
+
+#~ msgid "Switzerland"
+#~ msgstr "瑞士"
+
+#~ msgid "Syria"
+#~ msgstr "叙利亚"
+
+#~ msgid "Taiwan"
+#~ msgstr "中国台湾"
+
+#~ msgid "Tajikistan"
+#~ msgstr "塔吉克斯坦"
+
+#~ msgid "Tanzania, United Republic Of"
+#~ msgstr "坦桑尼亚联邦共和国"
+
+#~ msgid "Thailand"
+#~ msgstr "泰国"
+
+#~ msgid "Timor-Leste"
+#~ msgstr "东帝汶"
+
+#~ msgid "Togo"
+#~ msgstr "多哥"
+
+#~ msgid "Tokelau"
+#~ msgstr "托克劳群岛"
+
+#~ msgid "Tonga"
+#~ msgstr "汤加"
+
+#~ msgid "Trinidad And Tobago"
+#~ msgstr "特里尼达和多巴哥"
+
+#~ msgid "Tunisia"
+#~ msgstr "突尼斯"
+
+#~ msgid "Turkey"
+#~ msgstr "土耳其"
+
+#~ msgid "Turkmenistan"
+#~ msgstr "土库曼斯坦"
+
+#~ msgid "Turks And Caicos Islands"
+#~ msgstr "特克斯和凯科斯群岛"
+
+#~ msgid "Tuvalu"
+#~ msgstr "图瓦卢"
+
+#~ msgid "Uganda"
+#~ msgstr "乌干达"
+
+#~ msgid "Ukraine"
+#~ msgstr "乌克兰"
+
+#~ msgid "United Arab Emirates"
+#~ msgstr "阿拉伯联合酋长国"
+
+#~ msgid "United Kingdom"
+#~ msgstr "英国"
+
+#~ msgid "United States Minor Outlying Islands"
+#~ msgstr "美国小型外岛"
+
+#~ msgid "Uruguay"
+#~ msgstr "乌拉圭"
+
+#~ msgid "Uzbekistan"
+#~ msgstr "乌兹别克斯坦"
+
+#~ msgid "Vanuatu"
+#~ msgstr "努瓦阿图"
+
+#~ msgid "Venezuela"
+#~ msgstr "委内瑞拉"
+
+#~ msgid "Viet Nam"
+#~ msgstr "越南"
+
+#~ msgid "Virgin Islands, British"
+#~ msgstr "英属处女群岛"
+
+#~ msgid "Virgin Islands, U.S."
+#~ msgstr "美属处女群岛"
+
+#~ msgid "Wallis And Futuna Islands"
+#~ msgstr "瓦利斯和富图纳群岛"
+
+#~ msgid "Western Sahara"
+#~ msgstr "西撒哈拉"
+
+#~ msgid "Yemen"
+#~ msgstr "也门"
+
+#~ msgid "Zambia"
+#~ msgstr "赞比亚"
+
+#~ msgid "Zimbabwe"
+#~ msgstr "津巴布韦"
+
+#~ msgid "AOL Instant Messenger"
+#~ msgstr "AOL 即时通讯程序"
+
+#~ msgid "Yahoo Messenger"
+#~ msgstr "雅虎通"
+
+#~ msgid "Gadu-Gadu Messenger"
+#~ msgstr "Gadu-Gadu 即时通讯"
+
+#~ msgid "Service"
+#~ msgstr "服务"
+
+#~ msgid "Username"
+#~ msgstr "用户名"
+
+#~ msgid "Address _2:"
+#~ msgstr "地址 _2："
+
+#~ msgid "Ci_ty:"
+#~ msgstr "城市(_T)："
+
+#~ msgid "Countr_y:"
+#~ msgstr "国家/地区(_Y)："
+
+#~ msgid "Full Address"
+#~ msgstr "完整地址"
+
+#~ msgid "_ZIP Code:"
+#~ msgstr "邮政编码(_Z)："
+
+#~ msgid "Add IM Account"
+#~ msgstr "添加即时通讯账户"
+
+#~ msgid "_Account name:"
+#~ msgstr "账户名(_A)："
+
+#~ msgid "_IM Service:"
+#~ msgstr "即时通讯服务(_I)："
+
+#~ msgid "<b>Members</b>"
+#~ msgstr "<b>成员</b>"
+
+#~ msgid "Name begins with"
+#~ msgstr "姓名以此开头"
+
+#~ msgid "_Open"
+#~ msgstr "打开(_O)"
+
+#~ msgid "_Print"
+#~ msgstr "打印(_P)"
+
+#~ msgid "Cop_y to Address Book..."
+#~ msgstr "复制到地址簿(_Y)..."
+
+#~ msgid "Mo_ve to Address Book..."
+#~ msgstr "移至地址簿(_V)..."
+
+#~ msgid "Cu_t"
+#~ msgstr "剪切(_T)"
+
+#~ msgid "_Copy"
+#~ msgstr "复制(_C)"
+
+#~ msgid "P_aste"
+#~ msgstr "粘贴(_A)"
+
+#~ msgid ""
+#~ "%s already exists\n"
+#~ "Do you want to overwrite it?"
+#~ msgstr ""
+#~ "%s 已经存在\n"
+#~ "您打算覆盖它吗？"
+
+#~ msgid "Overwrite"
+#~ msgstr "覆盖"
+
+#~ msgid "contact"
+#~ msgid_plural "contacts"
+#~ msgstr[0] "联系人"
+
+#~ msgid "Querying Address Book..."
+#~ msgstr "正在查询地址簿..."
+
+#~ msgid "10 pt. Tahoma"
+#~ msgstr "10 pt. Tahoma"
+
+#~ msgid "8 pt. Tahoma"
+#~ msgstr "8 pt. Tahoma"
+
+#~ msgid "Blank forms at end:"
+#~ msgstr "结尾空白格式："
+
+#~ msgid "Body"
+#~ msgstr "邮件体"
+
+#~ msgid "Bottom:"
+#~ msgstr "底部："
+
+#~ msgid "Dimensions:"
+#~ msgstr "尺寸："
+
+#~ msgid "F_ont..."
+#~ msgstr "字体(_O)..."
+
+#~ msgid "Fonts"
+#~ msgstr "字体"
+
+#~ msgid "Footer:"
+#~ msgstr "页脚："
+
+#~ msgid "Header/Footer"
+#~ msgstr "页眉/页脚"
+
+#~ msgid "Headings"
+#~ msgstr "标题"
+
+#~ msgid "Headings for each letter"
+#~ msgstr "每封信的标题"
+
+#~ msgid "Height:"
+#~ msgstr "高度："
+
+#~ msgid "Immediately follow each other"
+#~ msgstr "一个紧接一个"
+
+#~ msgid "Landscape"
+#~ msgstr "横向"
+
+#~ msgid "Left:"
+#~ msgstr "左："
+
+#~ msgid "Letter tabs on side"
+#~ msgstr "旁边显示字母标签"
+
+#~ msgid "Margins"
+#~ msgstr "边界"
+
+#~ msgid "Number of columns:"
+#~ msgstr "列数："
+
+#~ msgid "Orientation"
+#~ msgstr "方向"
+
+#~ msgid "Page"
+#~ msgstr "页面"
+
+#~ msgid "Page Setup:"
+#~ msgstr "页面设置："
+
+#~ msgid "Paper"
+#~ msgstr "纸张"
+
+#~ msgid "Paper source:"
+#~ msgstr "纸张来源："
+
+#~ msgid "Portrait"
+#~ msgstr "纵向"
+
+#~ msgid "Print using gray shading"
+#~ msgstr "用灰度阴影打印"
+
+#~ msgid "Reverse on even pages"
+#~ msgstr "奇数页反向"
+
+#~ msgid "Right:"
+#~ msgstr "右："
+
+#~ msgid "Sections:"
+#~ msgstr "节："
+
+#~ msgid "Size:"
+#~ msgstr "大小："
+
+#~ msgid "Start on a new page"
+#~ msgstr "从新页开始"
+
+#~ msgid "Style name:"
+#~ msgstr "样式名："
+
+#~ msgid "Top:"
+#~ msgstr "顶部："
+
+#~ msgid "Width:"
+#~ msgstr "宽度："
+
+#~ msgid "_Font..."
+#~ msgstr "字体(_F)..."
+
+#~ msgid "Configure your timezone, Calendar and Task List here "
+#~ msgstr "在此配置您的时区、日历和任务列表 "
+
+#~ msgid "Evolution Calendar and Tasks"
+#~ msgstr "Evolution 日历和任务"
+
+#~ msgid "Evolution Calendar configuration control"
+#~ msgstr "Evolution 日历配置控件"
+
+#~ msgid "Evolution Calendar scheduling message viewer"
+#~ msgstr "Evolution 日历调度信件查看器"
+
+#~ msgid "Evolution Calendar/Task editor"
+#~ msgstr "Evolution 日历/任务新闻编辑器"
+
+#~ msgid "Evolution's Calendar component"
+#~ msgstr "Evolution 日历组件"
+
+#~ msgid "Evolution's Memos component"
+#~ msgstr "Evolution 备忘组件"
+
+#~ msgid "Evolution's Tasks component"
+#~ msgstr "Evolution 任务组件"
+
+#~ msgid "Memo_s"
+#~ msgstr "备忘(_S)"
+
+#~ msgid "_Calendars"
+#~ msgstr "日历(_C)"
+
+#~ msgid "Evolution Calendar alarm notification service"
+#~ msgstr "Evolution 日历提醒通知服务"
+
+#~ msgid "Could not initialize Bonobo"
+#~ msgstr "无法初始化 Bonobo"
+
+#~ msgid ""
+#~ "Could not create the alarm notify service factory, maybe it's already "
+#~ "running..."
+#~ msgstr "无法创建提醒服务车间，可能已经运行了..."
+
+#~ msgid ""
+#~ "Position of the vertical pane, between the task list and the task preview "
+#~ "pane, in pixels."
+#~ msgstr "任务列表和任务预览面板间垂直面板的位置，以像素计。"
+
+#~ msgid "Whether to use daylight savings time while displaying events."
+#~ msgstr "在显示事件时使用是否夏时制时间。"
+
+#~ msgid "daylight savings time"
+#~ msgstr "夏时制时间"
+
+#~ msgid "Category is"
+#~ msgstr "类别为"
+
+#~ msgid "Comment contains"
+#~ msgstr "注释含有"
+
+#~ msgid "Location contains"
+#~ msgstr "位置含有"
+
+#~ msgid "_Make available for offline use"
+#~ msgstr "标为可脱机使用(_M)"
+
+#~ msgid "_Do not make available for offline use"
+#~ msgstr "不标为可脱机使用(_D)"
+
+#~ msgid "Failed upgrading calendars."
+#~ msgstr "升级日历失败。"
+
+#~ msgid "Unable to open the calendar '%s' for creating events and meetings"
+#~ msgstr "无法打开日历“%s”来创建事件和会议"
+
+#~ msgid "There is no calendar available for creating events and meetings"
+#~ msgstr "没有可创建事件和会议的日历"
+
+#~ msgid "New appointment"
+#~ msgstr "新建约会"
+
+#~ msgid "New meeting"
+#~ msgstr "新建会议"
+
+#~ msgid "New all day appointment"
+#~ msgstr "新建全天约会"
+
+#~ msgid "New calendar"
+#~ msgstr "新建日历"
+
+#~ msgid "Error while opening the calendar"
+#~ msgstr "打开日历时出错"
+
+#~ msgid "Method not supported when opening the calendar"
+#~ msgstr "打开日历的方法不支持"
+
+#~ msgid "Permission denied to open the calendar"
+#~ msgstr "没有权限打开日历"
+
+#~ msgid "<b>Alarm</b>"
+#~ msgstr "<b>提醒</b>"
+
+#~ msgid "<b>Options</b>"
+#~ msgstr "<b>选项</b>"
+
+#~ msgid "Attach file(s)"
+#~ msgstr "添加附件"
+
+#~ msgid ""
+#~ "60 minutes\n"
+#~ "30 minutes\n"
+#~ "15 minutes\n"
+#~ "10 minutes\n"
+#~ "05 minutes"
+#~ msgstr ""
+#~ "60 分钟\n"
+#~ "30 分钟\n"
+#~ "15 分钟\n"
+#~ "10 分钟\n"
+#~ "5 分钟"
+
+#~ msgid "<span weight=\"bold\">Alerts</span>"
+#~ msgstr "<span weight=\"bold\">警告</span>"
+
+#~ msgid "<span weight=\"bold\">General</span>"
+#~ msgstr "<span weight=\"bold\">常规</span>"
+
+#~ msgid "<span weight=\"bold\">Task List</span>"
+#~ msgstr "<span weight=\"bold\">任务列表</span>"
+
+#~ msgid "<span weight=\"bold\">Time</span>"
+#~ msgstr "<span weight=\"bold\">时间</span>"
+
+#~ msgid "<span weight=\"bold\">Work Week</span>"
+#~ msgstr "<span weight=\"bold\">工作日</span>"
+
+#~ msgid "Adjust for daylight sa_ving time"
+#~ msgstr "调整夏时制时间(_V)"
+
+#~ msgid ""
+#~ "Minutes\n"
+#~ "Hours\n"
+#~ "Days"
+#~ msgstr ""
+#~ "分钟\n"
+#~ "小时\n"
+#~ "天"
+
+#~ msgid ""
+#~ "Monday\n"
+#~ "Tuesday\n"
+#~ "Wednesday\n"
+#~ "Thursday\n"
+#~ "Friday\n"
+#~ "Saturday\n"
+#~ "Sunday"
+#~ msgstr ""
+#~ "星期一\n"
+#~ "星期二\n"
+#~ "星期三\n"
+#~ "星期四\n"
+#~ "星期五\n"
+#~ "星期六\n"
+#~ "星期日"
+
+#~ msgid "Attached message - %s"
+#~ msgstr "附加的信件 - %s"
+
+#~ msgid "Cancel _Drag"
+#~ msgstr "取消拖曳(_D)"
+
+#~ msgid "<b>%d</b> Attachment"
+#~ msgid_plural "<b>%d</b> Attachments"
+#~ msgstr[0] "<b>%d</b> 个附件"
+
+#~ msgid "Hide Attachment _Bar"
+#~ msgstr "隐藏附件栏(_B)"
+
+#~ msgid "Show Attachment _Bar"
+#~ msgstr "显示附件栏(_B)"
+
+#~ msgid "Show Attachments"
+#~ msgstr "显示附件"
+
+#~ msgid "Press space key to toggle attachment bar"
+#~ msgstr "按空格键可切换附件栏"
+
+#~ msgid "_Add "
+#~ msgstr "添加(_A)"
+
+#~ msgid "<b>Att_endees</b>"
+#~ msgstr "<b>与会者(_E)</b>"
+
+#~ msgid "C_hange Organizer"
+#~ msgstr "更改组织者(_H)"
+
+#~ msgid "Co_ntacts..."
+#~ msgstr "联系人(_N)..."
+
+#~ msgid "<b>Preview</b>"
+#~ msgstr "<b>预览</b>"
+
+#~ msgid "<b>Recurrence</b>"
+#~ msgstr "<b>再现</b>"
+
+#~ msgid "<span weight=\"bold\">Miscellaneous</span>"
+#~ msgstr "<span weight=\"bold\">杂项</span>"
+
+#~ msgid "<span weight=\"bold\">Status</span>"
+#~ msgstr "<span weight=\"bold\">状态</span>"
+
+#~ msgid "Save As..."
+#~ msgstr "另存为..."
+
+#~ msgid "untitled_image.%s"
+#~ msgstr "无标题图像.%s"
+
+#~ msgid "_Save As..."
+#~ msgstr "另存为(_S)..."
+
+#~ msgid "_Save Selected"
+#~ msgstr "保存选中(_S)"
+
+#~ msgid "P_rint..."
+#~ msgstr "打印(_R)..."
+
+#~ msgid "C_ut"
+#~ msgstr "剪切(_U)"
+
+#~ msgid "_Paste"
+#~ msgstr "粘贴(_P)"
+
+#~ msgid "_Mark Selected Tasks as Complete"
+#~ msgstr "把任务标记为完成(_M)"
+
+#~ msgid "_Mark Selected Tasks as Incomplete"
+#~ msgstr "把任务标记为未完成(_M)"
+
+#~ msgid "_Delete Selected Tasks"
+#~ msgstr "删除选中任务(_D)"
+
+#~ msgid "Select T_oday"
+#~ msgstr "选择今天(_O)"
+
+#~ msgid "_Select Date..."
+#~ msgstr "选择日期(_S)..."
+
+#~ msgid "Pri_nt..."
+#~ msgstr "打印(_N)..."
+
+#~ msgid "_Delete Selected Memos"
+#~ msgstr "删除选中备忘(_D)"
+
+#~ msgid "Completing tasks..."
+#~ msgstr "正在完成任务..."
+
+#~ msgid "_Custom View"
+#~ msgstr "自定义视图(_C)"
+
+#~ msgid "_Save Custom View"
+#~ msgstr "保存自定义视图(_S)"
+
+#~ msgid "_Define Views..."
+#~ msgstr "定义视图(_D)..."
+
+#~ msgid "Loading tasks at %s"
+#~ msgstr "装入位于 %s 的任务"
+
+#~ msgid "Loading memos at %s"
+#~ msgstr "装入位于 %s 的备忘"
+
+#~ msgid "Failed upgrading memos."
+#~ msgstr "升级备忘失败。"
+
+#~ msgid "Unable to open the memo list '%s' for creating events and meetings"
+#~ msgstr "无法打开备忘列表“%s”来创建事件和会议"
+
+#~ msgid "There is no calendar available for creating memos"
+#~ msgstr "没有可创建备忘的日历"
+
+#~ msgid "New shared memo"
+#~ msgstr "新建共享备忘"
+
+#~ msgctxt "New"
+#~ msgid "Memo li_st"
+#~ msgstr "备忘列表(_S)"
+
+#~ msgid "Failed upgrading tasks."
+#~ msgstr "升级任务失败。"
+
+#~ msgid "Unable to open the task list '%s' for creating events and meetings"
+#~ msgstr "无法打开任务列表“%s”来创建事件和会议"
+
+#~ msgid "There is no calendar available for creating tasks"
+#~ msgstr "没有可创建任务的日历"
+
+#~ msgid "New task"
+#~ msgstr "新建任务"
+
+#~ msgid "New assigned task"
+#~ msgstr "新建分配的任务"
+
+#~ msgctxt "New"
+#~ msgid "Tas_k list"
+#~ msgstr "任务列表(_K)"
+
+#~ msgid "Could not open autosave file"
+#~ msgstr "无法打开自动保存文件"
+
+#~ msgid "_Post-To Field"
+#~ msgstr "投递到域(_P)"
+
+#~ msgid "Toggles whether the Post-To field is displayed"
+#~ msgstr "是否显示投递到域"
+
+#~ msgid "_Subject Field"
+#~ msgstr "主题域(_C)"
+
+#~ msgid "Toggles whether the Subject field is displayed"
+#~ msgstr "切换是否显示主题域"
+
+#~ msgid "_To Field"
+#~ msgstr "收件人域(_T)"
+
+#~ msgid "Toggles whether the To field is displayed"
+#~ msgstr "是否显示寄给域"
+
+#~ msgid ""
+#~ "Send options available only for Novell GroupWise and Microsoft Exchange "
+#~ "accounts."
+#~ msgstr "发送选项只适用于 Novell GroupWise 和 Microsoft Exchange 账户。"
+
+#~ msgid "Send options not available."
+#~ msgstr "发送选项不可用。"
+
+#~ msgid "Evolution Information"
+#~ msgstr "Evolution 信息"
+
+#~ msgid "Evolution Query"
+#~ msgstr "Evolution 查询"
+
+#~ msgid "Component"
+#~ msgstr "组件"
+
+#~ msgid "Label name cannot be empty."
+#~ msgstr "标签名称不能为空。"
+
+#~ msgid ""
+#~ "A label having the same tag already exists on the server. Please rename "
+#~ "your label."
+#~ msgstr "服务器上已存在同名的标签。请重命名您的标签。"
+
+#~ msgid "Test"
+#~ msgstr "测试"
+
+#~ msgid "<b>_Filter Rules</b>"
+#~ msgstr "<b>过滤规则(_F)</b>"
+
+#~ msgid "Rule name"
+#~ msgstr "规则名"
+
+#~ msgid ""
+#~ "Configure mail preferences, including security and message display, here"
+#~ msgstr "在此配置邮件首选项，包括安全和信件显示"
+
+#~ msgid "Configure spell-checking, signatures, and the message composer here"
+#~ msgstr "在此配置拼写检查、签名和信件编写器"
+
+#~ msgid "Configure your email accounts here"
+#~ msgstr "在这里配置您的电子邮件账户"
+
+#~ msgid "Configure your network connection settings here"
+#~ msgstr "在这里配置您的网络连接设置"
+
+#~ msgid "Evolution Mail"
+#~ msgstr "Evolution 邮件"
+
+#~ msgid "Evolution Mail accounts configuration control"
+#~ msgstr "Evolution 邮件账户配置控制"
+
+#~ msgid "Evolution Mail component"
+#~ msgstr "Evolution 邮件组件"
+
+#~ msgid "Evolution Mail composer"
+#~ msgstr "Evolution 邮件撰写器"
+
+#~ msgid "Evolution Mail composer configuration control"
+#~ msgstr "Evolution 邮件撰写控件"
+
+#~ msgid "Evolution Mail preferences control"
+#~ msgstr "Evolution 邮件首选项控件"
+
+#~ msgid "Evolution Network configuration control"
+#~ msgstr "Evolution 网络配置控件"
+
+#~ msgid "[Default]"
+#~ msgstr "[默认]"
+
+#~ msgid "Signature(s)"
+#~ msgstr "签名"
+
+#~ msgid "Account Search"
+#~ msgstr "账户搜索"
+
+#~ msgid "All Account Search"
+#~ msgstr "全部账户搜索"
+
+#~ msgid "_Copy to Folder"
+#~ msgstr "复制到文件夹(_C)"
+
+#~ msgid "_Move to Folder"
+#~ msgstr "移至文件夹(_M)"
+
+#~ msgid "Open in _New Window"
+#~ msgstr "在新窗口中打开(_N)"
+
+#~ msgid "_Move..."
+#~ msgstr "移动(_M)..."
+
+#~ msgid "_Unread Search Folder"
+#~ msgstr "未读搜索文件夹(_U)"
+
+#~ msgid "U_ndelete"
+#~ msgstr "取消删除(_N)"
+
+#~ msgid "Fla_g Completed"
+#~ msgstr "已完成标志(_G)"
+
+#~ msgid "Cl_ear Flag"
+#~ msgstr "清除标志(_E)"
+
+#~ msgid "Crea_te Rule From Message"
+#~ msgstr "根据信件创建规则(_T)"
+
+#~ msgid "Search Folder based on _Subject"
+#~ msgstr "基于主题的搜索文件夹(_S)"
+
+#~ msgid "Search Folder based on Se_nder"
+#~ msgstr "基于发件人的搜索文件夹(_N)"
+
+#~ msgid "Search Folder based on _Recipients"
+#~ msgstr "基于收件人的搜索文件夹(_R)"
+
+#~ msgid "Filter based on Sub_ject"
+#~ msgstr "基于主题过滤(_J)"
+
+#~ msgid "Filter based on Sen_der"
+#~ msgstr "基于发件人过滤(_D)"
+
+#~ msgid "Filter based on Re_cipients"
+#~ msgstr "基于收件人过滤(_C)"
+
+#~ msgid "Filter based on _Mailing List"
+#~ msgstr "基于邮件列表过滤(_M)"
+
+#~ msgid "Retrieving Message..."
+#~ msgstr "正在收取信件..."
+
+#~ msgid "C_all To..."
+#~ msgstr "呼叫到(_A)..."
+
+#~ msgid "Completed on %B %d, %Y, %l:%M %p"
+#~ msgstr "%Y年%m月%d日%A，%p%l:%M完成"
+
+#~ msgid "by %B %d, %Y, %l:%M %p"
+#~ msgstr "到 %m月%d日%A，%p%l:%M"
+
+#~ msgid "_Fit to Width"
+#~ msgstr "适合宽度(_F)"
+
+#~ msgid "_Save Selected..."
+#~ msgstr "保存所选(_S)..."
+
+#~ msgid "%d at_tachment"
+#~ msgid_plural "%d at_tachments"
+#~ msgstr[0] "%d 个附件(_T)"
+
+#~ msgid "S_ave"
+#~ msgstr "保存(_A)"
+
+#~ msgid "No Attachment"
+#~ msgstr "无附件"
+
+#~ msgid " (%a, %R %Z)"
+#~ msgstr " (%A，%R %Z)"
+
+#~ msgid " (%R %Z)"
+#~ msgstr " (%R %Z)"
+
+#~ msgid "Tag"
+#~ msgstr "标签"
+
+#~ msgid "_Reply to sender"
+#~ msgstr "回复发件人(_R)"
+
+#~ msgid "message"
+#~ msgstr "信件"
+
+#~ msgid "Add address"
+#~ msgstr "添加地址"
+
+#~ msgid "Default height of the message window."
+#~ msgstr "信件窗口的默认高度。"
+
+#~ msgid "Default width of the message window."
+#~ msgstr "信件窗口的默认宽度。"
+
+#~ msgid ""
+#~ "Enable side bar search feature so that you can start interactive "
+#~ "searching by typing in the text. Use is that you can easily find a folder "
+#~ "in that side bar by just typing the folder name and the selection jumps "
+#~ "automatically to that folder."
+#~ msgstr ""
+#~ "启用侧边栏搜索特性，以便可以在输入文本的同时进行交互式搜索。这么做的作用在"
+#~ "于您可以更加轻松地在侧边栏中找到文件夹，只需输入文件夹名称，然后选中范围就"
+#~ "会自动跳转到该文件夹。"
+
+#~ msgid ""
+#~ "If the \"Preview\" pane is on, then show it side-by-side rather than "
+#~ "vertically."
+#~ msgstr "如果开启了“预览”面板，则以并列方式显示，而不是垂直方式显示。"
+
+#~ msgid ""
+#~ "It disables/enables the repeated prompts to ask if offline sync is "
+#~ "required before going into offline mode."
+#~ msgstr "禁用/启用在进入离线模式前的是否需要离线同步的不停的提示。"
+
+#~ msgid "Message Window default height"
+#~ msgstr "信件窗口默认高度"
+
+#~ msgid "Message Window default width"
+#~ msgstr "信件窗口默认宽度"
+
+#~ msgid "Prompt to check if the user wants to go offline immediately"
+#~ msgstr "用户想立即离线时提示检查"
+
+#~ msgid "Use side-by-side or wide layout"
+#~ msgstr "使用并排还是宽屏布局"
+
+#~ msgid "View/Bcc menu item is checked"
+#~ msgstr "选中了查看/Bcc 菜单项"
+
+#~ msgid "View/Bcc menu item is checked."
+#~ msgstr "选中了查看/Bcc 菜单项。"
+
+#~ msgid "View/Cc menu item is checked"
+#~ msgstr "选中了查看/Cc 菜单项"
+
+#~ msgid "View/Cc menu item is checked."
+#~ msgstr "选中了查看/Cc 菜单项。"
+
+#~ msgid "View/From menu item is checked"
+#~ msgstr "选中了查看/From 菜单项"
+
+#~ msgid "View/From menu item is checked."
+#~ msgstr "选中了查看/From 菜单项。"
+
+#~ msgid "View/PostTo menu item is checked"
+#~ msgstr "选中了查看/PostTo 菜单项"
+
+#~ msgid "View/PostTo menu item is checked."
+#~ msgstr "选中了查看/PostTo 菜单项。"
+
+#~ msgid "View/ReplyTo menu item is checked"
+#~ msgstr "选中了查看/ReplyTo 菜单项"
+
+#~ msgid "View/ReplyTo menu item is checked."
+#~ msgstr "选中了查看/ReplyTo 菜单项。"
+
+#~ msgid "New Mail Message"
+#~ msgstr "新建信件"
+
+#~ msgid "New Mail Folder"
+#~ msgstr "新建邮件文件夹"
+
+#~ msgid "Failed upgrading Mail settings or folders."
+#~ msgstr "升级邮件设置或文件夹失败。"
+
+#~ msgid " Ch_eck for Supported Types "
+#~ msgstr "检查支持的类型(_E)"
+
+#~ msgid "<b>Sig_natures</b>"
+#~ msgstr "<b>签名(_N)</b>"
+
+#~ msgid "<b>_Languages</b>"
+#~ msgstr "<b>语言(_L)</b>"
+
+#~ msgid "<span weight=\"bold\">Account Information</span>"
+#~ msgstr "<span weight=\"bold\">账户信息</span>"
+
+#~ msgid "<span weight=\"bold\">Authentication</span>"
+#~ msgstr "<span weight=\"bold\">身份验证</span>"
+
+#~ msgid "<span weight=\"bold\">Composing Messages</span>"
+#~ msgstr "<span weight=\"bold\">撰写信件</span>"
+
+#~ msgid "<span weight=\"bold\">Configuration</span>"
+#~ msgstr "<span weight=\"bold\">配置</span>"
+
+#~ msgid "<span weight=\"bold\">Default Behavior</span>"
+#~ msgstr "<span weight=\"bold\">默认行为</span>"
+
+#~ msgid "<span weight=\"bold\">Delete Mail</span>"
+#~ msgstr "<span weight=\"bold\">删除邮件</span>"
+
+#~ msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+#~ msgstr "<span weight=\"bold\">显示的邮件头(_H)</span>"
+
+#~ msgid "<span weight=\"bold\">Labels</span>"
+#~ msgstr "<span weight=\"bold\">标签</span>"
+
+#~ msgid "<span weight=\"bold\">Loading Images</span>"
+#~ msgstr "<span weight=\"bold\">装入图像</span>"
+
+#~ msgid "<span weight=\"bold\">Message Display</span>"
+#~ msgstr "<span weight=\"bold\">信件显示</span>"
+
+#~ msgid "<span weight=\"bold\">Message Fonts</span>"
+#~ msgstr "<span weight=\"bold\">信件字体</span>"
+
+#~ msgid "<span weight=\"bold\">Message Receipts</span>"
+#~ msgstr "<span weight=\"bold\">信件收条</span>"
+
+#~ msgid "<span weight=\"bold\">Optional Information</span>"
+#~ msgstr "<span weight=\"bold\">可选信息</span>"
+
+#~ msgid "<span weight=\"bold\">Options</span>"
+#~ msgstr "<span weight=\"bold\">选项</span>"
+
+#~ msgid "<span weight=\"bold\">Printed Fonts</span>"
+#~ msgstr "<span weight=\"bold\">打印字体</span>"
+
+#~ msgid "<span weight=\"bold\">Proxy Settings</span>"
+#~ msgstr "<span weight=\"bold\">代理服务器状态</span>"
+
+#~ msgid "<span weight=\"bold\">Required Information</span>"
+#~ msgstr "<span weight=\"bold\">请求的信息</span>"
+
+#~ msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
+#~ msgstr "<span weight=\"bold\">安全 MIME(S/MIME)</span>"
+
+#~ msgid "<span weight=\"bold\">Security</span>"
+#~ msgstr "<span weight=\"bold\">安全</span>"
+
+#~ msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
+#~ msgstr "<span weight=\"bold\">已发送和草稿信件</span>"
+
+#~ msgid "<span weight=\"bold\">Server Configuration</span>"
+#~ msgstr "<span weight=\"bold\">服务器配置</span>"
+
+#~ msgid "<span weight=\"bold\">_Authentication Type</span>"
+#~ msgstr "<span weight=\"bold\">认证类型(_A)</span>"
+
+#~ msgid "Baltic (ISO-8859-13)"
+#~ msgstr "波罗的语(ISO-8859-13)"
+
+#~ msgid "Baltic (ISO-8859-4)"
+#~ msgstr "波罗的语(ISO-8859-4)"
+
+#~ msgid "Ch_eck for Supported Types "
+#~ msgstr "检查支持的类型(_E)"
+
+#~ msgid "Email Accounts"
+#~ msgstr "电子邮件"
+
+#~ msgid "Message Composer"
+#~ msgstr "信件撰写器"
+
+#~ msgid "S_OCKS Host:"
+#~ msgstr "SOCKS 主机(_O)："
+
+#~ msgid "Signatures Table"
+#~ msgstr "签名表"
+
+#~ msgid "_Automatic proxy configuration URL:"
+#~ msgstr "自动代理服务器配置 URL(_A)："
+
+#~ msgid "<b>Search Folder Sources</b>"
+#~ msgstr "<b>搜索文件夹来源</b>"
+
+#~ msgid "<span weight=\"bold\">Digital Signature</span>"
+#~ msgstr "<span weight=\"bold\">数字签名</span>"
+
+#~ msgid "<span weight=\"bold\">Encryption</span>"
+#~ msgstr "<span weight=\"bold\">加密</span>"
+
+#~ msgid "Case _sensitive"
+#~ msgstr "区分大小写(_S)"
+
+#~ msgid "F_ind:"
+#~ msgstr "查找(_I)："
+
+#~ msgid "Find in Message"
+#~ msgstr "在信件中查找"
+
+#~ msgid "None Selected"
+#~ msgstr "没有选中"
+
+#~ msgid "Delete \"{0}\"?"
+#~ msgstr "删除“{0}”吗？"
+
+#~ msgid "Delete account?"
+#~ msgstr "删除账户吗？"
+
+#~ msgid "Delete messages in Search Folder?"
+#~ msgstr "删除搜索文件夹中的信件吗？"
+
+#~ msgid "Discard changes?"
+#~ msgstr "丢弃更改吗？"
+
+#~ msgid "Mark all messages as read"
+#~ msgstr "把所有信件标记为已读"
+
+#~ msgid "Querying server"
+#~ msgstr "查询服务器"
+
+#~ msgid "Subject or Recipients contains"
+#~ msgstr "主题或接收者含有"
+
+#~ msgid "Provides core functionality for local address books."
+#~ msgstr "提供本地地址簿的核心功能。"
+
+#~ msgid ""
+#~ "Looks for clues in a message for mention of attachments and warns if the "
+#~ "attachment is missing"
+#~ msgstr "在信件中搜索提及附件的线索并在无附件时警告"
author	Ray Wang <raywang@gnome.org>	2009-12-01 15:15:40 +0800
committer	Ray Wang <raywang@gnome.org>	2009-12-01 15:15:40 +0800
commit	551a4ed9b2145440a7b257e1637a98b213113456 (patch)
tree	015651cacb97af6904ef0bee7641bcbf5c44e1b3 /po
parent	d94534c3673956164f9fb2c7f6b12188994503ae (diff)
download	gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.gz gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.bz2 gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.lz gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.xz gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.tar.zst gsoc2013-evolution-551a4ed9b2145440a7b257e1637a98b213113456.zip