Updated evolution zh_CN translation.

svn path=/trunk/; revision=32391

1 files changed, 478 insertions, 395 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index f238ca3caf..f07a21dc27 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,13 +5,13 @@
 # Partly comes from Sun_l10n group, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004, 2005, 2006.
 #
-#: ../mail/em-format-html-display.c:680
+#: ../mail/em-format-html-display.c:681
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-22 06:51+0200\n"
-"PO-Revision-Date: 2006-07-22 15:38+0800\n"
+"POT-Creation-Date: 2006-07-22 23:44+0200\n"
+"PO-Revision-Date: 2006-07-23 15:10+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
@@ -151,7 +151,7 @@ msgid "calendar view for one or more days"
 msgstr "一天或多天的日历视图"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:187
-#: ../calendar/gui/calendar-component.c:679
+#: ../calendar/gui/calendar-component.c:703
 msgid "%A %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -162,7 +162,7 @@ msgstr "%Y年%-m月%-d日%A"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
-#: ../calendar/gui/calendar-component.c:682
+#: ../calendar/gui/calendar-component.c:706
 #: ../calendar/gui/e-day-view-top-item.c:1315
 #: ../calendar/gui/e-day-view.c:1480
 #: ../calendar/gui/e-week-view-main-item.c:319
@@ -173,9 +173,9 @@ msgstr "%-m月%-d日%A"
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
-#: ../calendar/gui/calendar-component.c:684
-#: ../calendar/gui/calendar-component.c:689
-#: ../calendar/gui/calendar-component.c:691
+#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/calendar-component.c:713
+#: ../calendar/gui/calendar-component.c:715
 msgid "%a %d %b %Y"
 msgstr "%Y年%-m月%-d日%A"
 
@@ -183,10 +183,10 @@ msgstr "%Y年%-m月%-d日%A"
 #: ../a11y/calendar/ea-gnome-calendar.c:222
 #: ../a11y/calendar/ea-gnome-calendar.c:228
 #: ../a11y/calendar/ea-gnome-calendar.c:230
-#: ../calendar/gui/calendar-component.c:703
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/calendar-component.c:716
-#: ../calendar/gui/calendar-component.c:718
+#: ../calendar/gui/calendar-component.c:727
+#: ../calendar/gui/calendar-component.c:734
+#: ../calendar/gui/calendar-component.c:740
+#: ../calendar/gui/calendar-component.c:742
 msgid "%d %b %Y"
 msgstr "%Y年%-m月%-d日"
 
@@ -196,7 +196,7 @@ msgstr "%Y年%-m月%-d日"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
-#: ../calendar/gui/calendar-component.c:708
+#: ../calendar/gui/calendar-component.c:732
 #: ../calendar/gui/e-day-view-top-item.c:1319
 #: ../calendar/gui/e-day-view.c:1496
 #: ../calendar/gui/e-week-view-main-item.c:333
@@ -551,7 +551,7 @@ msgstr "在此配置自动补全"
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:265 ../calendar/gui/migration.c:400
+#: ../calendar/gui/calendar-component.c:268 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:575
 msgid "Contacts"
 msgstr "联系人"
@@ -592,8 +592,8 @@ msgstr "在此管理您的 S/MIME 证书"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:227
-#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/calendar-component.c:230
+#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
 #: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
@@ -610,8 +610,8 @@ msgstr "在此计算机中"
 #: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
-#: ../calendar/gui/calendar-component.c:235
-#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/calendar-component.c:238
+#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:482
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:104
@@ -678,7 +678,7 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
 #: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:85
-#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/itip-formatter/itip-formatter.c:2047
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "常规"
@@ -804,10 +804,10 @@ msgstr "新建地址簿(_N)"
 #. FIXME: need to disable for undeletable folders
 #: ../addressbook/gui/component/addressbook-view.c:957
 #: ../addressbook/gui/widgets/e-addressbook-view.c:978
-#: ../calendar/gui/calendar-component.c:556
+#: ../calendar/gui/calendar-component.c:580
 #: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:861
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
+#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
+#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:443
 #: ../mail/em-folder-tree.c:2061 ../mail/em-folder-view.c:1126
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
 #: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
@@ -820,8 +820,8 @@ msgid "Save As Vcard..."
 msgstr "另存为 Vcard..."
 
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:557
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
+#: ../calendar/gui/calendar-component.c:581
+#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "属性(_P)..."
 
@@ -834,12 +834,12 @@ msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
 #: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:494
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:499
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
 #: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:474
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "输入 %s 的密码(用户 %s)"
@@ -1313,7 +1313,7 @@ msgstr "生日(_B)："
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #: ../calendar/gui/dialogs/event-page.c:875
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1654
+#: ../plugins/itip-formatter/itip-view.c:1707
 msgid "_Calendar:"
 msgstr "日历(_C)："
 
@@ -2506,7 +2506,7 @@ msgstr "请选择此联系人的图像"
 msgid "_No image"
 msgstr "无图像(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2514,23 +2514,23 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3098
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3105
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s“%s”的格式无效"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3120
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3131
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s“%s”为空"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3146
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
@@ -2845,7 +2845,7 @@ msgstr "来源"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:486
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5
+#: ../calendar/gui/e-memo-table.etspec.h:6
 msgid "Type"
 msgstr "类型"
 
@@ -2858,7 +2858,7 @@ msgstr "另存为 VCard..."
 #: ../addressbook/gui/widgets/e-addressbook-view.c:956
 #: ../calendar/gui/dialogs/comp-editor.c:1098
 #: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:844
+#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "打开(_O)"
@@ -2913,13 +2913,13 @@ msgid "Cu_t"
 msgstr "剪切(_T)"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:976
-#: ../calendar/gui/calendar-component.c:555
+#: ../calendar/gui/calendar-component.c:579
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:852
-#: ../calendar/gui/memos-component.c:451 ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
+#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:442
 #: ../composer/e-msg-composer.c:3152 ../mail/em-folder-tree.c:986
-#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1899
+#: ../mail/em-folder-view.c:1112 ../mail/message-list.c:1901
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -3301,13 +3301,13 @@ msgstr "视频聊天"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:576
 #: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:727
+#: ../calendar/gui/calendar-component.c:751
 #: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2099
+#: ../calendar/gui/gnome-cal.c:2281
 #: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:386
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:416
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:593
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:388
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:419
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:598
 #: ../plugins/hula-account-setup/camel-hula-listener.c:379
 #: ../plugins/hula-account-setup/camel-hula-listener.c:408
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
@@ -4232,70 +4232,74 @@ msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
 #: ../calendar/calendar.error.xml.h:45
+msgid "The Evolution memo has quit unexpectedly."
+msgstr "Evolution 备忘异常退出。"
+
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage."
 msgstr "日历未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid "The memo list is not marked for offline usage"
 msgstr "备忘列表未标为脱机使用"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage."
 msgstr "任务列表未标为脱机使用。"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "This memo list will be removed permanently."
 msgstr "此备忘列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this memo?"
 msgstr "您想要保存对此备忘的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
 msgstr "您想要保存对此任务的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "您是否想要为此日记项发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "您是否想要给全部出席者发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是否想要给出席者发送会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send this task to participants?"
 msgstr "您是否想要将此任务发送给出席者？"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是否想要给出席者发送更新的会议信息？"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是否想要给出席者发送更新的任务信息？"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4304,56 +4308,60 @@ msgstr ""
 "您正在连接到不支持的 GroupWise 服务器，此时使用 Evolution 可能遇到问题。为了"
 "得到最佳效果，服务器应该升级到支持的版本。"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
-msgstr ""
+msgstr "您选择了只读日历源。请更改为日历视图，然后选择可接受约会的日历。"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have changed this task, but not yet saved it."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:66
 msgid "You have made changes to this memo, but not yet saved them."
 msgstr "您已经对此备忘做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:68
+msgid "Your memos will not be available until Evolution is restarted."
+msgstr "除非您重新启动 Evolution，否则您的备忘将无法使用。"
+
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:70
 #: ../composer/mail-composer.error.xml.h:27
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:71
+#: ../calendar/calendar.error.xml.h:73
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:130
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:74
 msgid "_Send Notice"
 msgstr "发送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:75
 msgid "{0}."
 msgstr "{0}。"
 
@@ -4405,12 +4413,12 @@ 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:2012
+#: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Calendar and Tasks"
 msgstr "日历和任务"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1319
+#: ../calendar/gui/calendar-component.c:1357
 msgid "Calendars"
 msgstr "日历"
 
@@ -4451,9 +4459,9 @@ msgid "Memo_s"
 msgstr "备忘(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:274 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/memos-component.c:530 ../calendar/gui/memos-component.c:997
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
+#: ../calendar/gui/memos-component.c:531
+#: ../calendar/gui/memos-component.c:1006 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "备忘"
 
@@ -4464,8 +4472,8 @@ msgstr "备忘"
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:387
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:594
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:389
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:599
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "任务"
@@ -4513,7 +4521,7 @@ msgstr "约会"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1617
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1623
 #: ../calendar/gui/e-itip-control.c:1113
-#: ../plugins/itip-formatter/itip-view.c:882
+#: ../plugins/itip-formatter/itip-view.c:934
 msgid "Location:"
 msgstr "位置："
 
@@ -4709,7 +4717,7 @@ msgstr "忙/闲模板 URL"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
 msgid "Gradient of the events in calendar views."
-msgstr ""
+msgstr "日历视图中事件的渐变。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Hide completed tasks"
@@ -4800,11 +4808,10 @@ msgid ""
 msgstr "月视图中视图和日期导航器日历之间水平面板的位置，以像素计。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
-#, fuzzy
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
-msgstr "卡片和列表视图及预览面板之间垂直面板的位置，以像素计。"
+msgstr "日历列表和日期导航器日历之间垂直面板的位置。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
 msgid ""
@@ -5008,7 +5015,7 @@ msgstr "是否在日期导航器中显示周数。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
 msgid "Whether to use daylight savings time while displaying events."
-msgstr ""
+msgstr "在显示事件时使用是否夏时制时间。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
 msgid "Work days"
@@ -5032,7 +5039,7 @@ msgstr "工作日开始分钟"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
 msgid "daylight savings time"
-msgstr ""
+msgstr "夏时制时间"
 
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
@@ -5086,89 +5093,89 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:253
-#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/calendar-component.c:256
+#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:501
 #: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "网上"
 
-#: ../calendar/gui/calendar-component.c:271 ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:274 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "生日和纪念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:277
+#: ../calendar/gui/calendar-component.c:280
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天气"
 
-#: ../calendar/gui/calendar-component.c:554
+#: ../calendar/gui/calendar-component.c:578
 msgid "_New Calendar"
 msgstr "新建日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:858
+#: ../calendar/gui/calendar-component.c:895
 msgid "Failed upgrading calendars."
 msgstr "升级日历失败。"
 
-#: ../calendar/gui/calendar-component.c:1157
+#: ../calendar/gui/calendar-component.c:1194
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "无法打开日历“%s”来创建事件和会议"
 
-#: ../calendar/gui/calendar-component.c:1173
+#: ../calendar/gui/calendar-component.c:1210
 msgid "There is no calendar available for creating events and meetings"
 msgstr "没有可创建事件和会议的日历"
 
-#: ../calendar/gui/calendar-component.c:1294
+#: ../calendar/gui/calendar-component.c:1332
 msgid "Calendar Source Selector"
 msgstr "日历源选择器"
 
-#: ../calendar/gui/calendar-component.c:1489
+#: ../calendar/gui/calendar-component.c:1540
 msgid "New appointment"
 msgstr "新建约会"
 
-#: ../calendar/gui/calendar-component.c:1490
+#: ../calendar/gui/calendar-component.c:1541
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: ../calendar/gui/calendar-component.c:1491
+#: ../calendar/gui/calendar-component.c:1542
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: ../calendar/gui/calendar-component.c:1497
+#: ../calendar/gui/calendar-component.c:1548
 msgid "New meeting"
 msgstr "新建会议"
 
-#: ../calendar/gui/calendar-component.c:1498
+#: ../calendar/gui/calendar-component.c:1549
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: ../calendar/gui/calendar-component.c:1499
+#: ../calendar/gui/calendar-component.c:1550
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: ../calendar/gui/calendar-component.c:1505
+#: ../calendar/gui/calendar-component.c:1556
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: ../calendar/gui/calendar-component.c:1506
+#: ../calendar/gui/calendar-component.c:1557
 msgid "All Day A_ppointment"
 msgstr "全天约会(_P)"
 
-#: ../calendar/gui/calendar-component.c:1507
+#: ../calendar/gui/calendar-component.c:1558
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: ../calendar/gui/calendar-component.c:1513
+#: ../calendar/gui/calendar-component.c:1564
 msgid "New calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/calendar-component.c:1514
+#: ../calendar/gui/calendar-component.c:1565
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
-#: ../calendar/gui/calendar-component.c:1515
+#: ../calendar/gui/calendar-component.c:1566
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
@@ -5391,7 +5398,7 @@ msgstr "<span weight=\"bold\">工作周</span>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Adjust for daylight sa_ving time"
-msgstr ""
+msgstr "调整夏时制时间(_V)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
 msgid "Day _ends:"
@@ -5750,12 +5757,12 @@ msgstr[0] "%d 封附加的信件"
 
 #: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3153
 #: ../mail/em-folder-tree.c:987 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1900
+#: ../mail/em-folder-view.c:1008 ../mail/message-list.c:1902
 msgid "_Move"
 msgstr "移动(_M)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3155
-#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1902
+#: ../mail/em-folder-tree.c:989 ../mail/message-list.c:1904
 msgid "Cancel _Drag"
 msgstr "取消拖曳(_D)"
 
@@ -5803,7 +5810,7 @@ msgid "_Add attachment..."
 msgstr "添加附件(_A)..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1489
-#: ../mail/em-format-html-display.c:2262
+#: ../mail/em-format-html-display.c:2263
 msgid "Show Attachments"
 msgstr "显示附件"
 
@@ -5961,6 +5968,7 @@ msgstr "此事件有提醒"
 #: ../calendar/gui/dialogs/event-page.c:882
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 #: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "组织者(_G)："
@@ -5982,6 +5990,7 @@ msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
 #: ../calendar/gui/dialogs/event-page.c:1258
+#: ../calendar/gui/dialogs/memo-page.c:684
 #: ../calendar/gui/dialogs/task-page.c:848
 msgid "Start date is wrong"
 msgstr "开始日期有错"
@@ -5999,11 +6008,13 @@ msgid "End time is wrong"
 msgstr "结束时间有错"
 
 #: ../calendar/gui/dialogs/event-page.c:1453
+#: ../calendar/gui/dialogs/memo-page.c:719
 #: ../calendar/gui/dialogs/task-page.c:905
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
 #: ../calendar/gui/dialogs/event-page.c:1459
+#: ../calendar/gui/dialogs/memo-page.c:725
 #: ../calendar/gui/dialogs/task-page.c:911
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
@@ -6056,7 +6067,7 @@ msgstr "自定义"
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1709
+#: ../plugins/itip-formatter/itip-formatter.c:1735
 #: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
 #: ../widgets/misc/e-dateedit.c:1721
 msgid "None"
@@ -6114,7 +6125,7 @@ msgstr "时间(_T)："
 #: ../calendar/gui/dialogs/event-page.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
-msgstr "只"
+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])
@@ -6194,22 +6205,41 @@ msgstr "组织者"
 msgid "Organizer:"
 msgstr "组织者："
 
-#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2321
+#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-page.c:551
+#: ../calendar/gui/dialogs/memo-page.c:866
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "无法打开“%s”中的备忘。"
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:2
+#: ../calendar/gui/dialogs/memo-page.c:981 ../mail/em-format-html.c:1488
+#: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
+#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+msgid "To"
+msgstr "收件人"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/task-page.glade.h:5
+msgid "Sta_rt date:"
+msgstr "开始日期(_R)："
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
+msgid "Su_mmary"
+msgstr "概要(_M)"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
+msgid "T_o:"
+msgstr "到(_O)："
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "组(_G)："
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
 msgid "_Memo Content:"
 msgstr "备忘内容(_M)："
 
@@ -6464,7 +6494,7 @@ msgstr "已完成"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
 #: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1029
+#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1031
 msgid "High"
 msgstr "高"
 
@@ -6479,14 +6509,14 @@ msgstr "进行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
 #: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1027
+#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1029
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:919 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1028
+#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
+#: ../mail/message-list.c:1030
 msgid "Normal"
 msgstr "中"
 
@@ -6554,10 +6584,6 @@ msgstr "类别(_I)..."
 msgid "Or_ganiser:"
 msgstr "组织者(_G)："
 
-#: ../calendar/gui/dialogs/task-page.glade.h:5
-msgid "Sta_rt date:"
-msgstr "开始日期(_R)："
-
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
 msgstr "时区："
@@ -6689,30 +6715,37 @@ msgstr "%s 为未知触发类型"
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:166
-msgid "Memo:"
-msgstr "备忘："
+#: ../calendar/gui/e-cal-component-memo-preview.c:155
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+msgid "Untitled"
+msgstr "无标题"
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:204
+#: ../calendar/gui/e-cal-component-preview.c:195
+#: ../calendar/gui/e-cal-component-preview.c:206
+msgid "Start Date:"
+msgstr "开始日期："
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:269
+#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-itip-control.glade.h:4
+#: ../composer/e-msg-composer-attachment.glade.h:2
+#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+msgid "Description:"
+msgstr "描述："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:199
+#: ../calendar/gui/e-cal-component-memo-preview.c:250
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "网页："
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
-msgid "Untitled"
-msgstr "无标题"
-
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "概要："
 
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
-msgid "Start Date:"
-msgstr "开始日期："
-
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "到期日期："
@@ -6722,7 +6755,7 @@ msgstr "到期日期："
 #: ../calendar/gui/e-cal-component-preview.c:224
 #: ../calendar/gui/e-itip-control.c:1127
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:907
+#: ../plugins/itip-formatter/itip-view.c:959
 msgid "Status:"
 msgstr "状态："
 
@@ -6730,14 +6763,6 @@ msgstr "状态："
 msgid "Priority:"
 msgstr "优先级："
 
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1159
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
-msgid "Description:"
-msgstr "描述："
-
 #: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
 #: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
 msgid "Public"
@@ -6758,12 +6783,13 @@ msgid "End Date"
 msgstr "结束日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "开始日期"
 
 #: ../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 ../mail/mail-dialogs.glade.h:20
+#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "概要"
@@ -6789,7 +6815,7 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
 #: ../calendar/gui/e-meeting-store.c:764
@@ -6797,7 +6823,7 @@ msgstr ""
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:925
+#: ../calendar/gui/e-cal-model-tasks.c:1005 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:178
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -6813,18 +6839,18 @@ msgstr "否"
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
 #: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1329
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1734
+#: ../plugins/itip-formatter/itip-formatter.c:1760
 #: ../plugins/plugin-manager/plugin-manager.c:68
 #: ../widgets/misc/e-attachment-bar.c:720
 #: ../widgets/misc/e-charset-picker.c:63
 msgid "Unknown"
 msgstr "未知"
 
-#: ../calendar/gui/e-cal-model.c:921
+#: ../calendar/gui/e-cal-model.c:926
 msgid "Recurring"
 msgstr "重复"
 
-#: ../calendar/gui/e-cal-model.c:923
+#: ../calendar/gui/e-cal-model.c:928
 msgid "Assigned"
 msgstr "已指派"
 
@@ -6832,7 +6858,7 @@ msgstr "已指派"
 msgid "Save As..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2110
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2111
 msgid "Select folder to save selected attachments..."
 msgstr "选择保存选中附件的文件夹..."
 
@@ -6842,7 +6868,7 @@ msgid "untitled_image.%s"
 msgstr "无标题图像.%s"
 
 #: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:846
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
 #: ../mail/em-folder-view.c:1122 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "另存为(_S)..."
@@ -6906,17 +6932,17 @@ msgid "100%"
 msgstr "100%"
 
 #: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:433
+#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
 #: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:610
+#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
 msgid "Updating objects"
 msgstr "更新对象"
 
 #: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
 #: ../composer/e-msg-composer.c:1348
 msgid "Save as..."
 msgstr "另存为..."
@@ -6926,13 +6952,13 @@ msgstr "另存为..."
 msgid "New _Task"
 msgstr "新建任务(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:845
+#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1283
 #: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:847
+#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
 #: ../mail/em-folder-view.c:1123
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
@@ -6942,7 +6968,7 @@ msgid "_Print..."
 msgstr "打印(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:851
+#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
 #: ../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"
@@ -6950,7 +6976,7 @@ msgstr "剪切(_U)"
 
 #: ../calendar/gui/e-calendar-table.c:1289
 #: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
@@ -6961,7 +6987,7 @@ msgstr "粘贴(_P)"
 msgid "_Assign Task"
 msgstr "指派任务(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_F)"
@@ -7257,10 +7283,12 @@ msgstr "iCalendar 错误"
 
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
-#: ../plugins/itip-formatter/itip-view.c:338
-#: ../plugins/itip-formatter/itip-view.c:339
-#: ../plugins/itip-formatter/itip-view.c:406
-#: ../plugins/itip-formatter/itip-view.c:407
+#: ../plugins/itip-formatter/itip-view.c:340
+#: ../plugins/itip-formatter/itip-view.c:341
+#: ../plugins/itip-formatter/itip-view.c:408
+#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:476
+#: ../plugins/itip-formatter/itip-view.c:477
 msgid "An unknown person"
 msgstr "未知的人"
 
@@ -7275,12 +7303,12 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1722
+#: ../plugins/itip-formatter/itip-formatter.c:1748
 msgid "Accepted"
 msgstr "接受"
 
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1725
+#: ../plugins/itip-formatter/itip-formatter.c:1751
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
@@ -7288,7 +7316,7 @@ msgstr "暂时接受"
 #: ../calendar/gui/e-meeting-list-view.c:206
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1728
+#: ../plugins/itip-formatter/itip-formatter.c:1754
 msgid "Declined"
 msgstr "拒绝"
 
@@ -7505,7 +7533,7 @@ msgid "Attendee status updated\n"
 msgstr "更新出席者状态\n"
 
 #: ../calendar/gui/e-itip-control.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:1092
+#: ../plugins/itip-formatter/itip-formatter.c:1100
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
@@ -7657,7 +7685,7 @@ msgstr "暂时的"
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1731
+#: ../plugins/itip-formatter/itip-formatter.c:1757
 msgid "Delegated"
 msgstr "被委任的"
 
@@ -7756,11 +7784,11 @@ msgstr "开始时间(_S)："
 msgid "_End time:"
 msgstr "结束时间(_E)："
 
-#: ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/e-memo-table.c:919
 msgid "_Delete Selected Memos"
 msgstr "删除选中备忘(_D)"
 
-#: ../calendar/gui/e-memo-table.c:985 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "单击以添加备忘"
 
@@ -7769,7 +7797,7 @@ msgid "Memo sort"
 msgstr "备忘排序"
 
 #: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2543
+#: ../calendar/gui/gnome-cal.c:2743
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7825,38 +7853,43 @@ msgstr "选择时区"
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
-#: ../calendar/gui/gnome-cal.c:781
+#: ../calendar/gui/gnome-cal.c:820
 msgid "Updating query"
 msgstr "更新查询"
 
-#: ../calendar/gui/gnome-cal.c:2222
+#: ../calendar/gui/gnome-cal.c:2404
 msgid "_Custom View"
 msgstr "自定义视图(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2223
+#: ../calendar/gui/gnome-cal.c:2405
 msgid "_Save Custom View"
 msgstr "保存自定义视图(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2228
+#: ../calendar/gui/gnome-cal.c:2410
 msgid "_Define Views..."
 msgstr "定义视图(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2388
+#: ../calendar/gui/gnome-cal.c:2574
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "装入位于 %s 的约会"
 
-#: ../calendar/gui/gnome-cal.c:2407
+#: ../calendar/gui/gnome-cal.c:2593
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "装入位于 %s 的任务"
 
-#: ../calendar/gui/gnome-cal.c:2511
+#: ../calendar/gui/gnome-cal.c:2602
+#, c-format
+msgid "Loading memos at %s"
+msgstr "装入位于 %s 的备忘"
+
+#: ../calendar/gui/gnome-cal.c:2708
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: ../calendar/gui/gnome-cal.c:3384
+#: ../calendar/gui/gnome-cal.c:3636
 msgid "Purging"
 msgstr "销毁"
 
@@ -7970,61 +8003,73 @@ msgstr "iCalendar 信息"
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/memos-component.c:450
+#: ../calendar/gui/memos-component.c:451
 msgid "_New Memo List"
 msgstr "新建备忘列表(_N)"
 
-#: ../calendar/gui/memos-component.c:526
+#: ../calendar/gui/memos-component.c:527
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 个备忘"
 
-#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已选中 %d 个"
 
-#: ../calendar/gui/memos-component.c:575
+#: ../calendar/gui/memos-component.c:576
 msgid "Failed upgrading memos."
 msgstr "升级备忘失败。"
 
-#: ../calendar/gui/memos-component.c:871
+#: ../calendar/gui/memos-component.c:872
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "无法打开备忘列表“%s”来创建事件和会议"
 
-#: ../calendar/gui/memos-component.c:884
+#: ../calendar/gui/memos-component.c:885
 msgid "There is no calendar available for creating memos"
 msgstr "没有可创建备忘的日历"
 
-#: ../calendar/gui/memos-component.c:972
+#: ../calendar/gui/memos-component.c:981
 msgid "Memo Source Selector"
 msgstr "备忘来源选择器"
 
-#: ../calendar/gui/memos-component.c:1155
+#: ../calendar/gui/memos-component.c:1164
 msgid "New memo"
 msgstr "新建备忘"
 
-#: ../calendar/gui/memos-component.c:1156
+#: ../calendar/gui/memos-component.c:1165
 msgid "Mem_o"
 msgstr "备忘(_O)"
 
-#: ../calendar/gui/memos-component.c:1157
+#: ../calendar/gui/memos-component.c:1166
 msgid "Create a new memo"
 msgstr "创建新备忘"
 
-#: ../calendar/gui/memos-component.c:1163
+#: ../calendar/gui/memos-component.c:1172
+msgid "New shared memo"
+msgstr "新建共享备忘"
+
+#: ../calendar/gui/memos-component.c:1173
+msgid "_Shared memo"
+msgstr "共享备忘(_S)"
+
+#: ../calendar/gui/memos-component.c:1174
+msgid "Create a shared new memo"
+msgstr "创建新的共享备忘"
+
+#: ../calendar/gui/memos-component.c:1180
 msgid "New memo list"
 msgstr "新建备忘列表"
 
-#: ../calendar/gui/memos-component.c:1164
+#: ../calendar/gui/memos-component.c:1181
 msgid "Memo li_st"
 msgstr "备忘列表(_S)"
 
-#: ../calendar/gui/memos-component.c:1165
+#: ../calendar/gui/memos-component.c:1182
 msgid "Create a new memo list"
 msgstr "创建新备忘列表"
 
@@ -11294,12 +11339,12 @@ msgstr "移动文件夹“%s”"
 msgid "Copying folder %s"
 msgstr "复制文件夹 %s"
 
-#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1804
+#: ../mail/em-folder-tree.c:870 ../mail/message-list.c:1806
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "把信件移至文件夹 %s"
 
-#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1806
+#: ../mail/em-folder-tree.c:872 ../mail/message-list.c:1808
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把信件复制到文件夹 %s"
@@ -11532,74 +11577,74 @@ msgid "Click to hide/unhide addresses"
 msgstr "单击可隐藏/显示地址"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:502
+#: ../mail/em-format-html-display.c:503
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: ../mail/em-format-html-display.c:645
+#: ../mail/em-format-html-display.c:646
 msgid "Find:"
 msgstr "查找："
 
-#: ../mail/em-format-html-display.c:676
+#: ../mail/em-format-html-display.c:677
 msgid "M_atch case"
 msgstr "匹配大小写(_A)"
 
-#: ../mail/em-format-html-display.c:924 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:617
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html-display.c:924
+#: ../mail/em-format-html-display.c:925
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:925 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:618
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html-display.c:925
+#: ../mail/em-format-html-display.c:926
 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:926 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:619
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html-display.c:926
+#: ../mail/em-format-html-display.c:927
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:928
 msgid "Valid signature, cannot verify sender"
 msgstr "签名有效，无法校验发送者"
 
-#: ../mail/em-format-html-display.c:927
+#: ../mail/em-format-html-display.c:928
 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:933 ../mail/em-format-html.c:626
+#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:626
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:933
+#: ../mail/em-format-html-display.c:934
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:934 ../mail/em-format-html.c:627
+#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:627
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:934
+#: ../mail/em-format-html-display.c:935
 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 "
@@ -11608,21 +11653,21 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:628
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:935
+#: ../mail/em-format-html-display.c:936
 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:936 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:629
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:936
+#: ../mail/em-format-html-display.c:937
 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 "
@@ -11631,71 +11676,71 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:1037 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1038 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:1052
+#: ../mail/em-format-html-display.c:1053
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:1371
+#: ../mail/em-format-html-display.c:1372
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%Y年%m月%d日%A，%H:%M完成"
+msgstr "%Y年%m月%d日%A，%p%l:%M完成"
 
-#: ../mail/em-format-html-display.c:1379
+#: ../mail/em-format-html-display.c:1380
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1382
+#: ../mail/em-format-html-display.c:1383
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A，%H:%M"
+msgstr "到 %m月%d日%A，%p%l:%M"
 
-#: ../mail/em-format-html-display.c:1442
+#: ../mail/em-format-html-display.c:1443
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../mail/em-format-html-display.c:1443
+#: ../mail/em-format-html-display.c:1444
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../mail/em-format-html-display.c:1444
+#: ../mail/em-format-html-display.c:1445
 msgid "_Fit to Width"
 msgstr "适合宽度(_F)"
 
-#: ../mail/em-format-html-display.c:1445
+#: ../mail/em-format-html-display.c:1446
 msgid "Show _Original Size"
 msgstr "显示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1864 ../mail/mail-config.glade.h:44
+#: ../mail/em-format-html-display.c:1865 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-#: ../mail/em-format-html-display.c:2071
+#: ../mail/em-format-html-display.c:2072
 msgid "Select folder to save all attachments..."
 msgstr "选择保存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:2118
+#: ../mail/em-format-html-display.c:2119
 msgid "_Save Selected..."
 msgstr "保存所选(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2185
+#: ../mail/em-format-html-display.c:2186
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 个附件(_T)"
 
-#: ../mail/em-format-html-display.c:2192 ../mail/em-format-html-display.c:2268
+#: ../mail/em-format-html-display.c:2193 ../mail/em-format-html-display.c:2269
 msgid "S_ave"
 msgstr "保存(_A)"
 
-#: ../mail/em-format-html-display.c:2203
+#: ../mail/em-format-html-display.c:2204
 msgid "S_ave All"
 msgstr "全部保存(_A)"
 
-#: ../mail/em-format-html-display.c:2264
+#: ../mail/em-format-html-display.c:2265
 msgid "No Attachment"
 msgstr "无附件"
 
@@ -11758,12 +11803,6 @@ msgid "Reply-To"
 msgstr "回复至"
 
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
-#: ../mail/message-list.etspec.h:18
-msgid "To"
-msgstr "收件人"
-
-#: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "抄送"
@@ -12007,7 +12046,7 @@ msgstr "编写窗口的默认宽度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr ""
+msgstr "压缩 TO/CC/BCC 中地址的显示"
 
 #: ../mail/evolution-mail.schemas.in.in.h:9
 msgid ""
@@ -12113,7 +12152,7 @@ msgstr "如果用户试图一次打开的信件大于等于十封，将会询问
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
-msgstr ""
+msgstr "如果开启了“预览”面板，则以并列方式显示，而不是垂直方式显示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
 msgid ""
@@ -12248,7 +12287,7 @@ msgstr "新建邮件通知类型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr ""
+msgstr "要在 TO/CC/BCC 中显示的地址数"
 
 #: ../mail/evolution-mail.schemas.in.in.h:62
 msgid "Prompt on empty subject"
@@ -13353,7 +13392,7 @@ msgstr "显示图像动画(_S)"
 
 #: ../mail/mail-config.glade.h:173
 msgid "_Shrink To / Cc / Bcc headers to "
-msgstr ""
+msgstr "只显示 To/Cc/Bcc 头中的前(_S)"
 
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
@@ -13365,7 +13404,7 @@ msgstr "使用与其它应用程序相同的字体(_U)"
 
 #: ../mail/mail-config.glade.h:176
 msgid "addresses"
-msgstr "地址"
+msgstr "个地址"
 
 #: ../mail/mail-config.glade.h:177
 msgid "color"
@@ -14296,74 +14335,74 @@ msgstr "销毁(_E)"
 msgid "_Open Messages"
 msgstr "打开信件(_O)"
 
-#: ../mail/message-list.c:1017
+#: ../mail/message-list.c:1019
 msgid "Unseen"
 msgstr "未看"
 
-#: ../mail/message-list.c:1018
+#: ../mail/message-list.c:1020
 msgid "Seen"
 msgstr "已看"
 
-#: ../mail/message-list.c:1019
+#: ../mail/message-list.c:1021
 msgid "Answered"
 msgstr "已答复"
 
-#: ../mail/message-list.c:1020
+#: ../mail/message-list.c:1022
 msgid "Multiple Unseen Messages"
 msgstr "多封未看信件"
 
-#: ../mail/message-list.c:1021
+#: ../mail/message-list.c:1023
 msgid "Multiple Messages"
 msgstr "多封信"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1027
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1028
 msgid "Lower"
 msgstr "较低"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1032
 msgid "Higher"
 msgstr "较高"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1033
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1449 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1456 ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
-msgstr "今天 %H:%M"
+msgstr "今天%p%l:%M"
 
-#: ../mail/message-list.c:1465 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
-msgstr "昨天 %H:%M"
+msgstr "昨天%p%l:%M"
 
-#: ../mail/message-list.c:1477 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr "%A %H:%M"
+msgstr "%A%p%l:%M"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr "%m月%d日 %H:%M"
+msgstr "%m月%d日%p%l:%M"
 
-#: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../mail/message-list.c:2239 ../mail/message-list.etspec.h:9
+#: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "信件"
 
-#: ../mail/message-list.c:3627
+#: ../mail/message-list.c:3629
 msgid "Generating message list"
 msgstr "生成信件列表"
 
@@ -14980,7 +15019,7 @@ msgstr "文件夹名称"
 msgid "Folder Size"
 msgstr "文件夹大小"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:291
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:304
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "订阅其他用户的文件夹"
@@ -15427,7 +15466,13 @@ msgstr "允许在文件夹树的快捷菜单中退订邮件文件夹。"
 msgid "Unsubscribe Folders"
 msgstr "退订文件夹"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:417
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
+msgid "Notes"
+msgstr "笔记"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:420
 msgid "Checklist"
 msgstr "待办清单"
 
@@ -15716,125 +15761,125 @@ msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "无法打开 Evolution 日历/待办列表导出数据。"
 
 #: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:398
+#: ../plugins/itip-formatter/itip-formatter.c:391
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "装入日历“%s”失败"
 
-#: ../plugins/itip-formatter/itip-formatter.c:418
+#: ../plugins/itip-formatter/itip-formatter.c:411
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "日历“%s”中的一个约会与此会议冲突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:444
+#: ../plugins/itip-formatter/itip-formatter.c:437
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:505
+#: ../plugins/itip-formatter/itip-formatter.c:513
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:512
+#: ../plugins/itip-formatter/itip-formatter.c:520
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:516
+#: ../plugins/itip-formatter/itip-formatter.c:524
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:520
+#: ../plugins/itip-formatter/itip-formatter.c:528
 msgid "Unable to find this journal entry in any journal"
 msgstr "无法在任何日记中找到此日记项"
 
-#: ../plugins/itip-formatter/itip-formatter.c:593
+#: ../plugins/itip-formatter/itip-formatter.c:601
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:788
+#: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:845
+#: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:856
+#: ../plugins/itip-formatter/itip-formatter.c:864
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:860
+#: ../plugins/itip-formatter/itip-formatter.c:868
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:865
+#: ../plugins/itip-formatter/itip-formatter.c:873
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:870
+#: ../plugins/itip-formatter/itip-formatter.c:878
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:963
+#: ../plugins/itip-formatter/itip-formatter.c:971
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:970
+#: ../plugins/itip-formatter/itip-formatter.c:978
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:972
+#: ../plugins/itip-formatter/itip-formatter.c:980
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1057
+#: ../plugins/itip-formatter/itip-formatter.c:1065
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新，原因是状态无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1084
+#: ../plugins/itip-formatter/itip-formatter.c:1092
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1088
+#: ../plugins/itip-formatter/itip-formatter.c:1096
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1215
+#: ../plugins/itip-formatter/itip-formatter.c:1223
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1216
+#: ../plugins/itip-formatter/itip-formatter.c:1224
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包含日历，但日历不是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1250
-#: ../plugins/itip-formatter/itip-formatter.c:1265
-#: ../plugins/itip-formatter/itip-formatter.c:1341
+#: ../plugins/itip-formatter/itip-formatter.c:1259
+#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1355
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1251
-#: ../plugins/itip-formatter/itip-formatter.c:1266
-#: ../plugins/itip-formatter/itip-formatter.c:1342
+#: ../plugins/itip-formatter/itip-formatter.c:1260
+#: ../plugins/itip-formatter/itip-formatter.c:1278
+#: ../plugins/itip-formatter/itip-formatter.c:1356
 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:1276
+#: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1277
+#: ../plugins/itip-formatter/itip-formatter.c:1290
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -15842,384 +15887,422 @@ msgstr "要处理这些全部项目，应该保存文件并导入日历"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2037
+#: ../plugins/itip-formatter/itip-formatter.c:2063
 msgid "_Delete message after acting"
 msgstr "操作后删除消息(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2047
-#: ../plugins/itip-formatter/itip-formatter.c:2079
+#: ../plugins/itip-formatter/itip-formatter.c:2073
+#: ../plugins/itip-formatter/itip-formatter.c:2105
 msgid "Conflict Search"
 msgstr "冲突搜索"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2062
+#: ../plugins/itip-formatter/itip-formatter.c:2088
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "选择要搜索冲突会议的日历"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:34
+#: ../plugins/itip-formatter/itip-view.c:186 ../ui/evolution-calendar.xml.h:34
 #: ../widgets/misc/e-cell-date-edit.c:241
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:189
+#: ../plugins/itip-formatter/itip-view.c:191
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:202
+#: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M:%S %p"
-msgstr "今天 %H:%M:%S"
+msgstr "今天%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:214
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:217
+#: ../plugins/itip-formatter/itip-view.c:219
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:223
 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:226
+#: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %l:%M %p"
-msgstr "明天 %H:%M"
+msgstr "明天%p%l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "明天 %H:%M:%S"
+msgstr "明天%p%l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:249
+#: ../plugins/itip-formatter/itip-view.c:251
 #, 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:254
+#: ../plugins/itip-formatter/itip-view.c:256
 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:258
+#: ../plugins/itip-formatter/itip-view.c:260
 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:263
+#: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %l:%M %p"
-msgstr "%A %H:%M"
+msgstr "%A%p%l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M:%S %p"
-msgstr "%A %H:%M:%S"
+msgstr "%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:276
+#: ../plugins/itip-formatter/itip-view.c:278
 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:282
+#: ../plugins/itip-formatter/itip-view.c:284
 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:286
+#: ../plugins/itip-formatter/itip-view.c:288
 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:291
+#: ../plugins/itip-formatter/itip-view.c:293
 msgid "%A, %B %e %l:%M %p"
-msgstr "%-m月%-d日%A %H:%M"
+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:295
+#: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%-m月%-d日%A %H:%M:%S"
+msgstr "%-m月%-d日%A%p%l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:303
 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:306
+#: ../plugins/itip-formatter/itip-view.c:308
 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:310
+#: ../plugins/itip-formatter/itip-view.c:312
 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:315
+#: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%Y年%-m月%-d日%A %H:%M"
+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:319
+#: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%Y年%-m月%-d日%A %H:%M:%S"
+msgstr "%Y年%-m月%-d日%A%p%l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:344
+#: ../plugins/itip-formatter/itip-view.c:346
 #, 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:346
+#: ../plugins/itip-formatter/itip-view.c:348
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 发布了会议信息："
 
-#: ../plugins/itip-formatter/itip-view.c:351
+#: ../plugins/itip-formatter/itip-view.c:353
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 为您代理了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:356
 #, 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:356
+#: ../plugins/itip-formatter/itip-view.c:358
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 请求您参加下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:362
+#: ../plugins/itip-formatter/itip-view.c:364
 #, 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:364
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入到已有的会议："
 
-#: ../plugins/itip-formatter/itip-view.c:367
+#: ../plugins/itip-formatter/itip-view.c:369
 #, 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:370
+#: ../plugins/itip-formatter/itip-view.c:372
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 发回了下列会议请求的响应："
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:376
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 通过 %s 取消了下列会议："
 
-#: ../plugins/itip-formatter/itip-view.c:376
+#: ../plugins/itip-formatter/itip-view.c:378
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 取消了下列会议。"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:381
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 提议了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:385
 #, 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:385
+#: ../plugins/itip-formatter/itip-view.c:387
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 拒绝了下列会议变更。"
 
-#: ../plugins/itip-formatter/itip-view.c:412
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 通过 %s 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:414
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 发布了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:419
+#: ../plugins/itip-formatter/itip-view.c:421
 #, 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:422
+#: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 通过 %s 为您指派了下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:424
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 为您指派了一个任务："
 
-#: ../plugins/itip-formatter/itip-view.c:430
+#: ../plugins/itip-formatter/itip-view.c:432
 #, 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:432
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s<b> 希望加入到已存在的任务："
 
-#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:437
 #, 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:438
+#: ../plugins/itip-formatter/itip-view.c:440
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 发回了下列指派任务的回应："
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:444
 #, 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:444
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 取消指派的下列任务："
 
-#: ../plugins/itip-formatter/itip-view.c:447
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 提议了下列任务指派变更："
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:453
 #, 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:453
+#: ../plugins/itip-formatter/itip-view.c:455
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 拒绝了指派的下列任务："
 
+#: ../plugins/itip-formatter/itip-view.c:482
+#, c-format
+msgid "<b>%s</b> through %s has published the following memo:"
+msgstr "<b>%s</b> 通过 %s 发布了下列备忘："
+
+#: ../plugins/itip-formatter/itip-view.c:484
+#, c-format
+msgid "<b>%s</b> has published the following memo:"
+msgstr "<b>%s</b> 发布了下列备忘："
+
+#: ../plugins/itip-formatter/itip-view.c:489
+#, 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:491
+#, c-format
+msgid "<b>%s</b> wishes to add to an existing memo:"
+msgstr "<b>%s</b> 希望加入到已有的备忘中："
+
+#: ../plugins/itip-formatter/itip-view.c:495
+#, 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:497
+#, c-format
+msgid "<b>%s</b> has canceled the following shared memo:"
+msgstr "<b>%s</b> 取消了下列共享备忘："
+
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:705
+#: ../plugins/itip-formatter/itip-view.c:753
 msgid "_Open Calendar"
 msgstr "打开日历(_O)"
 
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:710
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:720
-#: ../plugins/itip-formatter/itip-view.c:736
-#: ../plugins/itip-formatter/itip-view.c:741
+#: ../plugins/itip-formatter/itip-view.c:759
+#: ../plugins/itip-formatter/itip-view.c:763
+#: ../plugins/itip-formatter/itip-view.c:769
+#: ../plugins/itip-formatter/itip-view.c:786
+#: ../plugins/itip-formatter/itip-view.c:791
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../plugins/itip-formatter/itip-view.c:760
+#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:772
+#: ../plugins/itip-formatter/itip-view.c:788
+#: ../plugins/itip-formatter/itip-view.c:793
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:713
+#: ../plugins/itip-formatter/itip-view.c:763
 msgid "_Decline all"
 msgstr "全部拒绝(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:713
-#: ../plugins/itip-formatter/itip-view.c:718
-#: ../plugins/itip-formatter/itip-view.c:734
-#: ../plugins/itip-formatter/itip-view.c:739
-msgid "_Decline"
-msgstr "拒绝(_D)"
-
-#: ../plugins/itip-formatter/itip-view.c:714
+#: ../plugins/itip-formatter/itip-view.c:764
 msgid "_Tentative all"
 msgstr "全部待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:714
-#: ../plugins/itip-formatter/itip-view.c:719
-#: ../plugins/itip-formatter/itip-view.c:735
-#: ../plugins/itip-formatter/itip-view.c:740
+#: ../plugins/itip-formatter/itip-view.c:764
+#: ../plugins/itip-formatter/itip-view.c:770
+#: ../plugins/itip-formatter/itip-view.c:787
+#: ../plugins/itip-formatter/itip-view.c:792
 msgid "_Tentative"
 msgstr "待定(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:765
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:724
+#: ../plugins/itip-formatter/itip-view.c:776
 msgid "_Send Information"
 msgstr "发送信息(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:728
+#: ../plugins/itip-formatter/itip-view.c:780
 msgid "_Update Attendee Status"
 msgstr "更新与会者状态(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:731
+#: ../plugins/itip-formatter/itip-view.c:783
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:890
+#: ../plugins/itip-formatter/itip-view.c:942
 msgid "Start time:"
 msgstr "开始时间："
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:899
+#: ../plugins/itip-formatter/itip-view.c:951
 msgid "End time:"
 msgstr "结束时间："
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:915
-#: ../plugins/itip-formatter/itip-view.c:965
+#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:1017
 msgid "Comment:"
 msgstr "注释："
 
-#: ../plugins/itip-formatter/itip-view.c:979
+#: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Send u_pdates to attendees"
 msgstr "给出席者发送更新(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:988
+#: ../plugins/itip-formatter/itip-view.c:1040
 msgid "A_pply to all instances"
 msgstr "应用到全部实例(_P)"
 
+#: ../plugins/itip-formatter/itip-view.c:1709
+msgid "_Tasks :"
+msgstr "任务(_T)："
+
+#: ../plugins/itip-formatter/itip-view.c:1711
+msgid "Memos :"
+msgstr "备忘："
+
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "显示信件的 text/calendar 部分。"
@@ -20551,7 +20634,7 @@ msgstr "弹出列表"
 
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%H:%M"
+msgstr "%p%l:%M"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"