Updated Simplified Chinese translation

svn path=/trunk/; revision=30541

1 files changed, 483 insertions, 203 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 597fd013ec..fd916ef0e8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Evolution 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-19 12:57+0200\n"
-"PO-Revision-Date: 2005-10-19 19:40+0800\n"
+"POT-Creation-Date: 2005-10-19 20:56+0200\n"
+"PO-Revision-Date: 2005-10-20 06:39+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"
@@ -376,7 +376,7 @@ msgid "Server Version"
 msgstr "服务器版本"
 
 #: ../addressbook/addressbook.error.xml.h:14
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server"
 msgstr "某些特性可能无法在您目前的服务器下工作"
 
@@ -445,7 +445,7 @@ msgstr ""
 "人。您想要换作复制联系人吗？"
 
 #: ../addressbook/addressbook.error.xml.h:28
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -558,10 +558,12 @@ msgstr "在此管理您的 S/MIME 证书"
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:137
 #: ../addressbook/gui/component/addressbook-migrate.c:502
-#: ../calendar/gui/calendar-component.c:208 ../calendar/gui/migration.c:462
-#: ../calendar/gui/migration.c:555 ../calendar/gui/tasks-component.c:188
-#: ../mail/em-folder-tree-model.c:197 ../mail/em-folder-tree-model.c:199
-#: ../mail/mail-component.c:292 ../mail/mail-vfolder.c:223
+#: ../calendar/gui/calendar-component.c:208
+#: ../calendar/gui/memos-component.c:192 ../calendar/gui/migration.c:462
+#: ../calendar/gui/migration.c:555 ../calendar/gui/migration.c:1057
+#: ../calendar/gui/tasks-component.c:188 ../mail/em-folder-tree-model.c:197
+#: ../mail/em-folder-tree-model.c:199 ../mail/mail-component.c:292
+#: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "在此计算机中"
 
@@ -573,10 +575,12 @@ msgstr "在此计算机中"
 #: ../addressbook/gui/component/addressbook-component.c:145
 #: ../addressbook/gui/component/addressbook-migrate.c:510
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: ../calendar/gui/calendar-component.c:216 ../calendar/gui/migration.c:470
-#: ../calendar/gui/migration.c:563 ../calendar/gui/tasks-component.c:196
-#: ../filter/filter-label.c:123 ../mail/em-migrate.c:1043
-#: ../mail/mail-config.c:78 ../mail/mail-config.glade.h:104
+#: ../calendar/gui/calendar-component.c:216
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:470
+#: ../calendar/gui/migration.c:563 ../calendar/gui/migration.c:1065
+#: ../calendar/gui/tasks-component.c:196 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1043 ../mail/mail-config.c:78
+#: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "个人"
 
@@ -637,8 +641,9 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
 #: ../addressbook/gui/component/addressbook-config.c:902
 #: ../addressbook/gui/component/ldap-config.glade.h:23
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: ../calendar/gui/dialogs/calendar-setup.c:366
-#: ../calendar/gui/dialogs/calendar-setup.c:377
+#: ../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:215 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
@@ -738,13 +743,15 @@ msgstr ""
 
 #: ../addressbook/gui/component/addressbook-view.c:764
 #: ../addressbook/gui/widgets/e-addressbook-view.c:952
-#: ../mail/em-filter-i18n.h:11 ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:5 ../ui/evolution-mail-message.xml.h:26
+#: ../calendar/gui/memos-component.c:450 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:26 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "删除"
 
 #: ../addressbook/gui/component/addressbook-view.c:766
+#: ../calendar/gui/memos-component.c:451
 msgid "Properties..."
 msgstr "属性..."
 
@@ -822,6 +829,7 @@ msgstr "是否显示预览面板。"
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 #: ../calendar/gui/dialogs/event-page.glade.h:1
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
@@ -2738,6 +2746,7 @@ msgstr "来源"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:377
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "类型"
 
@@ -2755,7 +2764,8 @@ msgstr "另存为 VCard..."
 #: ../addressbook/gui/widgets/e-addressbook-view.c:930
 #: ../calendar/gui/dialogs/comp-editor.c:1119
 #: ../calendar/gui/e-calendar-table.c:1167
-#: ../calendar/gui/e-calendar-view.c:1549 ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1549 ../calendar/gui/e-memo-table.c:845
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -2789,9 +2799,10 @@ msgid "Send Message to Contacts"
 msgstr "给联系人发信件"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:942
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2510
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2512
 #: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-tasks.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:77 ../ui/evolution-memos.xml.h:11
+#: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "打印"
 
@@ -2804,18 +2815,21 @@ msgid "Move to Address Book..."
 msgstr "移动到地址簿..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:949
-#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-tasks.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:7 ../ui/evolution-memos.xml.h:4
+#: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪切"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:3 ../ui/evolution-mail-message.xml.h:12
+#: ../calendar/gui/memos-component.c:449 ../ui/evolution-addressbook.xml.h:3
+#: ../ui/evolution-mail-message.xml.h:12 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "复制"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:951
-#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-tasks.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:14 ../ui/evolution-memos.xml.h:8
+#: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "粘贴"
 
@@ -2862,6 +2876,7 @@ msgstr "车载电话"
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 #: ../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
 msgid "Categories"
 msgstr "类别"
 
@@ -3235,7 +3250,7 @@ msgstr "不支持的协议"
 #: ../calendar/gui/e-cal-component-preview.c:232
 #: ../calendar/gui/e-cal-model-tasks.c:348
 #: ../calendar/gui/e-cal-model-tasks.c:661
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2373
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2375
 msgid "Cancelled"
 msgstr "已经取消"
 
@@ -3953,175 +3968,191 @@ msgid "Delete calendar '{0}'?"
 msgstr "删除日历“{0}”吗？"
 
 #: ../calendar/calendar.error.xml.h:26
+msgid "Delete memo list '{0}'?"
+msgstr "删除备忘列表“{0}”吗？"
+
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "删除任务列表“{0}”吗？"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Don't Send"
 msgstr "不发送"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下载进行中。您想要保存约会吗？"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下载进行中。您想要保存任务吗？"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "无法装入编辑器。"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to RSVP."
 msgstr "将会向全部出席者发送电子邮件邀请，并要求他们答复。"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "将会向全部出席者发送电子邮件邀请，并允许他们接受此任务。"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "装入日历时出错"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
+msgid "Error loading memo list"
+msgstr "装入备忘列表出错"
+
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "装入任务列表出错"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the journal has been deleted."
 msgstr "如果您不发送取消通知，其他出席者人可能不知道日记项已经删除。"
 
-#: ../calendar/calendar.error.xml.h:36
+#: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the meeting is canceled."
 msgstr "如果您不发送取消通知，其他出席者也许不知道会议已经取消。"
 
-#: ../calendar/calendar.error.xml.h:37
+#: ../calendar/calendar.error.xml.h:39
 msgid ""
 "If you don't send a cancellation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "如果您不发送取消通知，其他出席者可能不知道任务已经删除。"
 
-#: ../calendar/calendar.error.xml.h:38
+#: ../calendar/calendar.error.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Send"
 msgstr "发送"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:41
 msgid "Send Notice"
 msgstr "发送通知"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "发送更新的信息将允许其他出席者使他们的日历保持最新。"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "发送更新的信息允许其他出席者使他们的任务列表保持最新。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 日历异常退出。"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 任务异常退出。"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:47
 msgid "The calendar is not marked for offline usage"
-msgstr "日历未标为离线使用"
+msgstr "日历未标为脱机使用"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:48
+msgid "The memo list is not marked for offline usage"
+msgstr "备忘列表未标为脱机使用"
+
+#: ../calendar/calendar.error.xml.h:49
 msgid "The task list is not marked for offline usage"
-msgstr "任务列表未标为离线使用"
+msgstr "任务列表未标为脱机使用"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:50
 msgid "This calendar will be removed permanently."
 msgstr "此日历将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:51
+msgid "This memo list will be removed permanently."
+msgstr "此备忘列表将被永久删除。"
+
+#: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
 msgstr "此任务列表将被永久删除。"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this task?"
 msgstr "您想要保存对此任务的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to send a cancellation notice for this journal entry?"
 msgstr "您是否想要为此日记项发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send all the participants a cancellation notice?"
 msgstr "您是否想要给全部出席者发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是否想要给出席者发送会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send this task to participants?"
 msgstr "您是否想要将此任务发送给出席者？"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是否想要给出席者发送更新的会议信息？"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是否想要给出席者发送更新的任务信息？"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "You have changed this appointment, but not yet saved them."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "You have made changes to this task, but not yet saved them."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的任务将无法使用。"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "丢弃更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "_Save Changes"
 msgstr "保存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:127
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "{0}."
 msgstr "{0}。"
 
@@ -4136,6 +4167,8 @@ msgstr "分割多日事件："
 
 #: ../calendar/conduits/calendar/calendar-conduit.c:1377
 #: ../calendar/conduits/calendar/calendar-conduit.c:1378
+#: ../calendar/conduits/memo/memo-conduit.c:854
+#: ../calendar/conduits/memo/memo-conduit.c:855
 #: ../calendar/conduits/todo/todo-conduit.c:879
 #: ../calendar/conduits/todo/todo-conduit.c:880
 msgid "Could not start evolution-data-server"
@@ -4146,6 +4179,16 @@ msgstr "无法启动 evolution-data-server"
 msgid "Could not read pilot's Calendar application block"
 msgstr "无法读入 Pilot 日历应用程序块"
 
+#: ../calendar/conduits/memo/memo-conduit.c:937
+#: ../calendar/conduits/memo/memo-conduit.c:940
+msgid "Could not read pilot's Memo application block"
+msgstr "无法读入 Pilot 的备忘应用程序块"
+
+#: ../calendar/conduits/memo/memo-conduit.c:976
+#: ../calendar/conduits/memo/memo-conduit.c:979
+msgid "Could not write pilot's Memo application block"
+msgstr "无法写入 Pilot 备忘应用程序块"
+
 #: ../calendar/conduits/todo/todo-conduit.c:234
 msgid "Default Priority:"
 msgstr "默认优先级："
@@ -4189,10 +4232,24 @@ 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:10
+#: ../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-memos.c:1091 ../calendar/gui/memos-component.c:528
+#: ../calendar/gui/memos-component.c:998 ../calendar/gui/memos-control.c:334
+msgid "Memos"
+msgstr "备忘"
+
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
 #: ../calendar/gui/e-tasks.c:1333 ../calendar/gui/print.c:1831
 #: ../calendar/gui/tasks-component.c:519
 #: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:466
@@ -4204,11 +4261,11 @@ msgstr "Evolution 任务组件"
 msgid "Tasks"
 msgstr "任务"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
 msgid "_Calendars"
 msgstr "日历(_C)"
 
-#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:15
 #: ../views/tasks/galview.xml.h:3
 msgid "_Tasks"
 msgstr "任务(_T)"
@@ -4258,7 +4315,7 @@ msgstr "午睡时间(_T)："
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:13
 #: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:44
 #: ../ui/evolution-signature-editor.xml.h:23
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
@@ -4698,7 +4755,7 @@ msgstr "无匹配"
 
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:708
-#: ../calendar/gui/dialogs/calendar-setup.c:367
+#: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2113
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
@@ -4728,10 +4785,13 @@ 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:234 ../calendar/gui/migration.c:489
-#: ../calendar/gui/migration.c:582 ../calendar/gui/tasks-component.c:215
+#: ../calendar/gui/calendar-component.c:234
+#: ../calendar/gui/memos-component.c:219 ../calendar/gui/migration.c:489
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1084
+#: ../calendar/gui/tasks-component.c:215
 msgid "On The Web"
 msgstr "网上"
 
@@ -4752,23 +4812,24 @@ msgstr "新建日历(_N)"
 #: ../calendar/gui/calendar-component.c:536
 #: ../calendar/gui/dialogs/comp-editor.c:429
 #: ../calendar/gui/e-calendar-table.c:1175
-#: ../calendar/gui/e-calendar-view.c:1556
-#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3069
+#: ../calendar/gui/e-calendar-view.c:1556 ../calendar/gui/e-memo-table.c:853
+#: ../calendar/gui/tasks-component.c:440 ../composer/e-msg-composer.c:3050
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1035
 #: ../mail/message-list.c:1718 ../ui/evolution-addressbook.xml.h:32
 #: ../ui/evolution-calendar.xml.h:39 ../ui/evolution-composer-entries.xml.h:7
-#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-tasks.xml.h:23
+#: ../ui/evolution-mail-message.xml.h:103 ../ui/evolution-memos.xml.h:15
+#: ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "复制(_C)"
 
 #. FIXME: need to disable for undeletable folders
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/e-calendar-table.c:1187
-#: ../calendar/gui/e-calendar-view.c:1569
+#: ../calendar/gui/e-calendar-view.c:1569 ../calendar/gui/e-memo-table.c:862
 #: ../calendar/gui/tasks-component.c:441 ../mail/em-folder-tree.c:2054
 #: ../mail/em-folder-view.c:1049 ../ui/evolution-addressbook.xml.h:34
 #: ../ui/evolution-calendar.xml.h:40 ../ui/evolution-mail-list.xml.h:27
-#: ../ui/evolution-tasks.xml.h:24
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "删除(_D)"
 
@@ -5028,7 +5089,7 @@ msgstr "附件"
 #: ../calendar/gui/dialogs/comp-editor.c:1120
 #: ../calendar/gui/dialogs/meeting-page.c:908
 #: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3567
+#: ../composer/e-msg-composer.c:3546
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -5038,7 +5099,7 @@ msgstr "删除(_R)"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:474
 #: ../calendar/gui/dialogs/comp-editor.c:1121
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3568 ../mail/em-folder-tree.c:2058
+#: ../composer/e-msg-composer.c:3547 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "_Properties"
 msgstr "属性(_P)"
@@ -5046,7 +5107,7 @@ msgstr "属性(_P)"
 #: ../calendar/gui/dialogs/cal-attachment-bar.c:476
 #: ../calendar/gui/dialogs/comp-editor.c:1123
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3570
+#: ../composer/e-msg-composer.c:3549
 msgid "_Add attachment..."
 msgstr "添加附件(_A)..."
 
@@ -5417,27 +5478,40 @@ msgstr "将日历内容复制到本地以进行脱机操作"
 msgid "Copy task list contents locally for offline operation"
 msgstr "将任务列表内容复制到本地以进行脱机操作"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:341
+#: ../calendar/gui/dialogs/calendar-setup.c:292
+msgid "Copy memo list contents locally for offline operation"
+msgstr "将备忘列表内容复制到本地以进行脱机操作"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:343
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 msgid "C_olor:"
 msgstr "颜色(_O)："
 
-#: ../calendar/gui/dialogs/calendar-setup.c:378
+#: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Tasks List"
 msgstr "任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:447
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+msgid "Memos List"
+msgstr "备忘列表"
+
+#: ../calendar/gui/dialogs/calendar-setup.c:460
 msgid "Calendar Properties"
 msgstr "日历属性"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:449
+#: ../calendar/gui/dialogs/calendar-setup.c:462
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:515
+#: ../calendar/gui/dialogs/calendar-setup.c:528
 msgid "Task List Properties"
 msgstr "任务列表属性"
 
+#: ../calendar/gui/dialogs/calendar-setup.c:594
+#: ../calendar/gui/memos-component.c:448
+msgid "New Memo List"
+msgstr "新建备忘列表"
+
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Calendar"
 msgstr "添加日历"
@@ -5545,27 +5619,27 @@ msgstr " (预定 "
 msgid "Due "
 msgstr "预定 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:191 ../composer/e-msg-composer.c:2820
+#: ../calendar/gui/dialogs/comp-editor.c:191 ../composer/e-msg-composer.c:2801
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加的信件 - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:196
-#: ../calendar/gui/dialogs/comp-editor.c:366 ../composer/e-msg-composer.c:2825
-#: ../composer/e-msg-composer.c:3004
+#: ../calendar/gui/dialogs/comp-editor.c:366 ../composer/e-msg-composer.c:2806
+#: ../composer/e-msg-composer.c:2985
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "%d 封附加的信件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:430 ../composer/e-msg-composer.c:3070
+#: ../calendar/gui/dialogs/comp-editor.c:430 ../composer/e-msg-composer.c:3051
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:931 ../mail/message-list.c:1719
 msgid "_Move"
 msgstr "移动(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3072
+#: ../calendar/gui/dialogs/comp-editor.c:432 ../composer/e-msg-composer.c:3053
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1721
 msgid "Cancel _Drag"
 msgstr "取消拖曳(_D)"
@@ -5574,7 +5648,7 @@ msgstr "取消拖曳(_D)"
 msgid "Could not update object"
 msgstr "无法更新对象"
 
-#: ../calendar/gui/dialogs/comp-editor.c:978 ../composer/e-msg-composer.c:2458
+#: ../calendar/gui/dialogs/comp-editor.c:978 ../composer/e-msg-composer.c:2444
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -5836,6 +5910,7 @@ msgid "C_ustomize..."
 msgstr "自定义(_U)..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:12
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
@@ -5844,11 +5919,13 @@ msgid "Cale_ndar:"
 msgstr "日历(_N)："
 
 #: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Classi_fication:"
 msgstr "分类(_F)："
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
+#: ../calendar/gui/dialogs/memo-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.c:254 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:364
@@ -5864,6 +5941,7 @@ msgid "Locat_ion:"
 msgstr "位置(_I)："
 
 #: ../calendar/gui/dialogs/event-page.glade.h:18
+#: ../calendar/gui/dialogs/memo-page.glade.h:6
 #: ../calendar/gui/dialogs/task-page.glade.h:10
 #: ../calendar/gui/e-cal-list-view.c:253 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:363
@@ -5871,6 +5949,7 @@ msgid "Private"
 msgstr "保密"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:19
+#: ../calendar/gui/dialogs/memo-page.glade.h:7
 #: ../calendar/gui/dialogs/task-page.glade.h:11
 #: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:314
 #: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:362
@@ -5920,7 +5999,7 @@ msgstr "<b>来自：</b>"
 #: ../calendar/gui/dialogs/meeting-page.c:315
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:653
-#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2261
+#: ../calendar/gui/e-itip-control.c:1103 ../composer/e-msg-composer.c:2247
 #: ../filter/filter-rule.c:881 ../mail/em-account-editor.c:683
 #: ../mail/em-account-editor.c:1348 ../mail/em-account-prefs.c:464
 #: ../mail/em-folder-view.c:1064 ../mail/em-junk-hook.c:78
@@ -6024,6 +6103,28 @@ msgstr "组织者"
 msgid "Organizer:"
 msgstr "组织者："
 
+#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2311
+msgid "Memo"
+msgstr "备忘"
+
+#: ../calendar/gui/dialogs/memo-page.c:489
+#, c-format
+msgid "Unable to open memos in '%s'."
+msgstr "无法打开“%s”中的备忘。"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "<span weight=\"bold\">基本</span>"
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/task-page.glade.h:16
+msgid "_Group:"
+msgstr "组(_G)："
+
+#: ../calendar/gui/dialogs/memo-page.glade.h:9
+msgid "_Memo Content:"
+msgstr "备忘环境(_M)："
+
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "<b>Calendar options</b>"
 msgstr "<b>日历选项</b>"
@@ -6215,7 +6316,7 @@ msgstr "<span weight=\"bold\">状态</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:659
 #: ../calendar/gui/e-calendar-table.c:459 ../calendar/gui/e-itip-control.c:895
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../calendar/gui/print.c:2370 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2372 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "已完成"
 
@@ -6230,7 +6331,7 @@ msgstr "高"
 #: ../calendar/gui/e-cal-model-tasks.c:344
 #: ../calendar/gui/e-cal-model-tasks.c:657
 #: ../calendar/gui/e-cal-model-tasks.c:732
-#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2367
+#: ../calendar/gui/e-calendar-table.c:458 ../calendar/gui/print.c:2369
 msgid "In Progress"
 msgstr "进行中"
 
@@ -6251,7 +6352,7 @@ msgstr "中"
 #: ../calendar/gui/e-cal-component-preview.c:236
 #: ../calendar/gui/e-cal-model-tasks.c:342
 #: ../calendar/gui/e-cal-model-tasks.c:655
-#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2364
+#: ../calendar/gui/e-calendar-table.c:457 ../calendar/gui/print.c:2366
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -6325,10 +6426,6 @@ msgstr "任务描述"
 msgid "_Due date:"
 msgstr "到期日期(_D)："
 
-#: ../calendar/gui/dialogs/task-page.glade.h:16
-msgid "_Group:"
-msgstr "组(_G)："
-
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
 msgid "<b>Free/Busy C_alendars</b>"
 msgstr "<b>忙/闲日历(_A)</b>"
@@ -6449,11 +6546,21 @@ msgstr "在 %2$s 时 %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
+#: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2704
 #, c-format
 msgid "Click to open %s"
 msgstr "单击以打开 %s"
 
+#: ../calendar/gui/e-cal-component-memo-preview.c:199
+msgid "Memo:"
+msgstr "备忘："
+
+#: ../calendar/gui/e-cal-component-memo-preview.c:232
+#: ../calendar/gui/e-cal-component-preview.c:299
+msgid "Web Page:"
+msgstr "网页："
+
 #: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
 msgid "Untitled"
 msgstr "无标题"
@@ -6486,10 +6593,6 @@ msgstr "状态："
 msgid "Priority:"
 msgstr "优先级："
 
-#: ../calendar/gui/e-cal-component-preview.c:299
-msgid "Web Page:"
-msgstr "网页："
-
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "结束日期"
@@ -6500,7 +6603,8 @@ msgstr "开始日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../mail/mail-dialogs.glade.h:16 ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "概要"
 
@@ -6542,7 +6646,9 @@ msgstr "否"
 
 #. This is the default filename used for temporary file creation
 #: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-itip-control.c:1148 ../calendar/gui/e-itip-control.c:1289
+#: ../calendar/gui/e-cal-popup.c:106 ../calendar/gui/e-cal-popup.c:121
+#: ../calendar/gui/e-cal-popup.c:165 ../calendar/gui/e-itip-control.c:1148
+#: ../calendar/gui/e-itip-control.c:1289
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
@@ -6563,6 +6669,39 @@ msgstr "重复"
 msgid "Assigned"
 msgstr "已指派"
 
+#: ../calendar/gui/e-cal-popup.c:171 ../mail/em-popup.c:411
+msgid "Save As..."
+msgstr "另存为..."
+
+#: ../calendar/gui/e-cal-popup.c:187 ../mail/em-format-html-display.c:1812
+msgid "Select folder to save selected attachments..."
+msgstr "选择保存选中附件的文件夹..."
+
+#: ../calendar/gui/e-cal-popup.c:216 ../mail/em-popup.c:436
+#, c-format
+msgid "untitled_image.%s"
+msgstr "无标题图像.%s"
+
+#: ../calendar/gui/e-cal-popup.c:270 ../calendar/gui/e-calendar-table.c:1169
+#: ../calendar/gui/e-calendar-view.c:1550 ../calendar/gui/e-memo-table.c:847
+#: ../mail/em-folder-view.c:1045 ../mail/em-popup.c:553 ../mail/em-popup.c:564
+msgid "_Save As..."
+msgstr "另存为(_S)..."
+
+#: ../calendar/gui/e-cal-popup.c:271 ../mail/em-popup.c:554
+#: ../mail/em-popup.c:565
+msgid "Set as _Background"
+msgstr "设为背景(_B)"
+
+#: ../calendar/gui/e-cal-popup.c:272
+msgid "_Save Selected"
+msgstr "保存选中(_S)"
+
+#: ../calendar/gui/e-cal-popup.c:394 ../mail/em-popup.c:774
+#, c-format
+msgid "Open in %s..."
+msgstr "在 %s 中打开..."
+
 #: ../calendar/gui/e-calendar-table.c:406
 msgid "0%"
 msgstr "0%"
@@ -6612,49 +6751,48 @@ msgid "Task Table"
 msgstr "任务表"
 
 #: ../calendar/gui/e-calendar-table.c:696
-#: ../calendar/gui/e-calendar-view.c:671
+#: ../calendar/gui/e-calendar-view.c:671 ../calendar/gui/e-memo-table.c:426
 msgid "Deleting selected objects"
 msgstr "删除选中的对象"
 
 #: ../calendar/gui/e-calendar-table.c:875
-#: ../calendar/gui/e-calendar-view.c:799
+#: ../calendar/gui/e-calendar-view.c:799 ../calendar/gui/e-memo-table.c:603
 msgid "Updating objects"
 msgstr "更新对象"
 
 #: ../calendar/gui/e-calendar-table.c:1025
-#: ../calendar/gui/e-calendar-view.c:1126 ../composer/e-msg-composer.c:1356
+#: ../calendar/gui/e-calendar-view.c:1126 ../calendar/gui/e-memo-table.c:735
+#: ../composer/e-msg-composer.c:1342
 msgid "Save as..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-calendar-table.c:1168
+#: ../calendar/gui/e-calendar-table.c:1168 ../calendar/gui/e-memo-table.c:846
 msgid "Open _Web Page"
 msgstr "打开网页(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1169
-#: ../calendar/gui/e-calendar-view.c:1550 ../mail/em-folder-view.c:1045
-#: ../mail/em-popup.c:553 ../mail/em-popup.c:564
-msgid "_Save As..."
-msgstr "另存为(_S)..."
-
 #: ../calendar/gui/e-calendar-table.c:1170
 #: ../calendar/gui/e-calendar-view.c:1530
-#: ../calendar/gui/e-calendar-view.c:1551 ../mail/em-folder-view.c:1046
+#: ../calendar/gui/e-calendar-view.c:1551 ../calendar/gui/e-memo-table.c:848
+#: ../mail/em-folder-view.c:1046
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
 #: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-tasks.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:120 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "打印(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1174
-#: ../calendar/gui/e-calendar-view.c:1555 ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1 ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1555 ../calendar/gui/e-memo-table.c:852
+#: ../ui/evolution-addressbook.xml.h:1 ../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:1176
 #: ../calendar/gui/e-calendar-view.c:1533
-#: ../calendar/gui/e-calendar-view.c:1557 ../ui/evolution-addressbook.xml.h:39
-#: ../ui/evolution-calendar.xml.h:43 ../ui/evolution-composer-entries.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1557 ../calendar/gui/e-memo-table.c:854
+#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:43
+#: ../ui/evolution-composer-entries.xml.h:9 ../ui/evolution-memos.xml.h:19
 #: ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "粘贴(_P)"
@@ -6663,7 +6801,8 @@ msgstr "粘贴(_P)"
 msgid "_Assign Task"
 msgstr "指派任务(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1181 ../ui/evolution-tasks.xml.h:26
+#: ../calendar/gui/e-calendar-table.c:1181 ../calendar/gui/e-memo-table.c:858
+#: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "作为 iCalendar 转发(_F)"
 
@@ -6807,7 +6946,7 @@ msgstr "%Y年%m月%d日%A%H:%M:%S"
 #: ../calendar/gui/e-cell-date-edit-text.c:118 ../e-util/e-time-utils.c:175
 #: ../e-util/e-time-utils.c:402
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%Y-%m-%d %A %H:%M:%S"
+msgstr "%Y-%m-%d %A %p%I:%M:%S"
 
 #: ../calendar/gui/e-cell-date-edit-text.c:123
 #, c-format
@@ -7446,12 +7585,24 @@ msgstr "必需的人(_R)"
 msgid "Required people and _one resource"
 msgstr "必需的人和一个资源(_O)"
 
-#: ../calendar/gui/e-pub-utils.c:311
-#, c-format
-msgid "Enter the password for %s"
-msgstr "为 %s 输入密码"
+#: ../calendar/gui/e-memo-table.c:267
+msgid "Memo Table"
+msgstr "备忘表"
 
-#: ../calendar/gui/e-tasks.c:822 ../calendar/gui/gnome-cal.c:2553
+#: ../calendar/gui/e-memo-table.c:863
+msgid "_Delete Selected Memos"
+msgstr "删除选中备忘(_D)"
+
+#: ../calendar/gui/e-memo-table.c:986 ../calendar/gui/e-memo-table.etspec.h:2
+msgid "Click to add a memo"
+msgstr "单击以添加备忘"
+
+#: ../calendar/gui/e-memo-table.etspec.h:3
+msgid "Memo sort"
+msgstr "备忘排序"
+
+#: ../calendar/gui/e-memos.c:727 ../calendar/gui/e-tasks.c:822
+#: ../calendar/gui/gnome-cal.c:2553
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7460,6 +7611,24 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
+#: ../calendar/gui/e-memos.c:775
+msgid "Loading memos"
+msgstr "装入备忘"
+
+#: ../calendar/gui/e-memos.c:860
+#, c-format
+msgid "Opening memos at %s"
+msgstr "在 %s 打开备忘"
+
+#: ../calendar/gui/e-memos.c:1033 ../calendar/gui/e-tasks.c:1225
+msgid "Deleting selected objects..."
+msgstr "正在删除选中的对象..."
+
+#: ../calendar/gui/e-pub-utils.c:311
+#, c-format
+msgid "Enter the password for %s"
+msgstr "为 %s 输入密码"
+
 #: ../calendar/gui/e-tasks.c:870
 msgid "Loading tasks"
 msgstr "装入任务"
@@ -7473,10 +7642,6 @@ msgstr "在 %s 打开任务"
 msgid "Completing tasks..."
 msgstr "正在完成任务..."
 
-#: ../calendar/gui/e-tasks.c:1225
-msgid "Deleting selected objects..."
-msgstr "正在删除选中的对象..."
-
 #: ../calendar/gui/e-tasks.c:1252
 msgid "Expunging"
 msgstr "销毁"
@@ -7637,6 +7802,64 @@ msgstr "iCalendar 信息"
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
+#: ../calendar/gui/memos-component.c:524
+#, c-format
+msgid "%d memo"
+msgid_plural "%d memos"
+msgstr[0] "%d 个备忘"
+
+#: ../calendar/gui/memos-component.c:526 ../calendar/gui/tasks-component.c:517
+#: ../mail/mail-component.c:548
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "，已选中 %d 个"
+
+#: ../calendar/gui/memos-component.c:573
+msgid "Failed upgrading memos."
+msgstr "升级备忘失败。"
+
+#: ../calendar/gui/memos-component.c:869
+#, c-format
+msgid "Unable to open the memo list '%s' for creating events and meetings"
+msgstr "无法打开备忘列表“%s”来创建事件和会议"
+
+#: ../calendar/gui/memos-component.c:882
+msgid "There is no calendar available for creating memos"
+msgstr "没有可创建备忘的日历"
+
+#: ../calendar/gui/memos-component.c:973
+msgid "Memo Source Selector"
+msgstr "备忘来源选择器"
+
+#: ../calendar/gui/memos-component.c:1156
+msgid "New memo"
+msgstr "新建备忘"
+
+#: ../calendar/gui/memos-component.c:1157
+msgid "_Memo"
+msgstr "备忘(_M)"
+
+#: ../calendar/gui/memos-component.c:1158
+msgid "Create a new memo"
+msgstr "创建新备忘"
+
+#: ../calendar/gui/memos-component.c:1164
+msgid "New memo list"
+msgstr "新建备忘列表"
+
+#: ../calendar/gui/memos-component.c:1165
+msgid "Memo l_ist"
+msgstr "备忘列表(_I)"
+
+#: ../calendar/gui/memos-component.c:1166
+msgid "Create a new memo list"
+msgstr "创建新备忘列表"
+
+#: ../calendar/gui/memos-control.c:334
+msgid "Print Memos"
+msgstr "打印备忘"
+
 #: ../calendar/gui/migration.c:151
 msgid ""
 "The location and hierarchy of the Evolution task folders has changed since "
@@ -7869,51 +8092,51 @@ msgstr "约会"
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2329
+#: ../calendar/gui/print.c:2331
 #, c-format
 msgid "Summary: %s"
 msgstr "概要：%s"
 
-#: ../calendar/gui/print.c:2337
+#: ../calendar/gui/print.c:2339
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
-#: ../calendar/gui/print.c:2380
+#: ../calendar/gui/print.c:2382
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: ../calendar/gui/print.c:2397
+#: ../calendar/gui/print.c:2399
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2409
+#: ../calendar/gui/print.c:2411
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: ../calendar/gui/print.c:2421
+#: ../calendar/gui/print.c:2423
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2435
+#: ../calendar/gui/print.c:2437
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2446
+#: ../calendar/gui/print.c:2448
 msgid "Contacts: "
 msgstr "联系人："
 
-#: ../calendar/gui/print.c:2586 ../calendar/gui/print.c:2674
-#: ../calendar/gui/print.c:2800 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2588 ../calendar/gui/print.c:2676
+#: ../calendar/gui/print.c:2802 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: ../calendar/gui/print.c:2621
+#: ../calendar/gui/print.c:2623
 msgid "Print Item"
 msgstr "打印项"
 
@@ -7927,12 +8150,6 @@ msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 个任务"
 
-#: ../calendar/gui/tasks-component.c:517 ../mail/mail-component.c:548
-#, c-format
-msgid ", %d selected"
-msgid_plural ", %d selected"
-msgstr[0] "，已选中 %d 个"
-
 #: ../calendar/gui/tasks-component.c:564
 msgid "Failed upgrading tasks."
 msgstr "升级任务失败。"
@@ -9655,58 +9872,58 @@ msgstr "投递到："
 msgid "A_ttach"
 msgstr "附件(_T)"
 
-#: ../composer/e-msg-composer.c:843
+#: ../composer/e-msg-composer.c:832
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "无法对寄出的信件签名：未对此账户设置签名证书"
 
-#: ../composer/e-msg-composer.c:850
+#: ../composer/e-msg-composer.c:839
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "无法对寄出的信件加密：未对此账户设置加密证书"
 
-#: ../composer/e-msg-composer.c:1337 ../composer/e-msg-composer.c:1371
+#: ../composer/e-msg-composer.c:1323 ../composer/e-msg-composer.c:1357
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../composer/e-msg-composer.c:1409
+#: ../composer/e-msg-composer.c:1395
 msgid "Could not open file"
 msgstr "无法打开文件"
 
-#: ../composer/e-msg-composer.c:1417
+#: ../composer/e-msg-composer.c:1403
 msgid "Unable to retrieve message from editor"
 msgstr "无法从编辑器获取信件"
 
-#: ../composer/e-msg-composer.c:1692
+#: ../composer/e-msg-composer.c:1678
 msgid "Untitled Message"
 msgstr "无标题信件"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1727
+#: ../composer/e-msg-composer.c:1713
 msgid "Open File"
 msgstr "打开文件"
 
-#: ../composer/e-msg-composer.c:2141 ../mail/em-account-editor.c:588
+#: ../composer/e-msg-composer.c:2127 ../mail/em-account-editor.c:588
 #: ../mail/em-account-editor.c:633 ../mail/em-account-editor.c:700
 msgid "Autogenerated"
 msgstr "自动生成的"
 
-#: ../composer/e-msg-composer.c:2244
+#: ../composer/e-msg-composer.c:2230
 msgid "Si_gnature:"
 msgstr "签名(_G)："
 
-#: ../composer/e-msg-composer.c:2487 ../composer/e-msg-composer.c:3695
-#: ../composer/e-msg-composer.c:3698
+#: ../composer/e-msg-composer.c:2473 ../composer/e-msg-composer.c:3674
+#: ../composer/e-msg-composer.c:3677
 msgid "Compose a message"
 msgstr "撰写新件"
 
-#: ../composer/e-msg-composer.c:3816
+#: ../composer/e-msg-composer.c:3792
 msgid "_Attachment Bar"
 msgstr "附件栏(_A)"
 
-#: ../composer/e-msg-composer.c:4906
+#: ../composer/e-msg-composer.c:4882
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -10020,7 +10237,7 @@ msgstr "覆盖(_O)"
 #. time, in 12-hour format, without seconds.
 #: ../e-util/e-time-utils.c:185 ../e-util/e-time-utils.c:398
 msgid "%a %m/%d/%Y %I:%M %p"
-msgstr "%Y-%m-%d %A %p %I:%M"
+msgstr "%Y-%m-%d %A %p%I:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
@@ -10034,7 +10251,7 @@ msgstr "%Y-%m-%d %A %H:%M"
 #. in 12-hour format, without minutes or seconds.
 #: ../e-util/e-time-utils.c:195
 msgid "%a %m/%d/%Y %I %p"
-msgstr "%Y-%m-%d %A %p %I点"
+msgstr "%Y-%m-%d %A %p%I点"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
@@ -10045,7 +10262,7 @@ msgstr "%Y-%m-%d %A %H点"
 #. strptime format of a date and a time, in 12-hour format.
 #: ../e-util/e-time-utils.c:211
 msgid "%m/%d/%Y %I:%M:%S %p"
-msgstr "%Y-%m-%d %p %I:%M:%S"
+msgstr "%Y-%m-%d %p%I:%M:%S"
 
 #. strptime format of a date and a time, in 24-hour format.
 #: ../e-util/e-time-utils.c:215
@@ -10056,7 +10273,7 @@ msgstr "%Y-%m-%d %H:%M:%S"
 #. without seconds.
 #: ../e-util/e-time-utils.c:220
 msgid "%m/%d/%Y %I:%M %p"
-msgstr "%Y-%m-%d %H:%M %p"
+msgstr "%Y-%m-%d %p%I:%M"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
@@ -10068,7 +10285,7 @@ msgstr "%Y-%m-%d %H:%M"
 #. without minutes or seconds.
 #: ../e-util/e-time-utils.c:230
 msgid "%m/%d/%Y %I %p"
-msgstr "%Y-%m-%d %p %I点"
+msgstr "%Y-%m-%d %p%I点"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
@@ -10080,7 +10297,7 @@ msgstr "%Y-%m-%d %H点"
 #. strftime format of a time in 12-hour format.
 #: ../e-util/e-time-utils.c:339 ../e-util/e-time-utils.c:438
 msgid "%I:%M:%S %p"
-msgstr "%p %I:%M:%S"
+msgstr "%p%I:%M:%S"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
@@ -10096,7 +10313,7 @@ msgstr "%H:%M:%S"
 #: ../e-util/e-time-utils.c:348 ../e-util/e-time-utils.c:435
 #: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1720
 msgid "%I:%M %p"
-msgstr "%p %I:%M"
+msgstr "%p%I:%M"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
@@ -10110,7 +10327,7 @@ msgstr "%H:%M"
 #. strptime format for hour and AM/PM, 12-hour format.
 #: ../e-util/e-time-utils.c:356
 msgid "%I %p"
-msgstr "%p %I点"
+msgstr "%p%I点"
 
 #: ../e-util/eggtrayicon.c:119
 msgid "The orientation of the tray."
@@ -11266,10 +11483,6 @@ msgstr "附件按钮"
 msgid "Select folder to save all attachments..."
 msgstr "选择保存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:1812
-msgid "Select folder to save selected attachments..."
-msgstr "选择保存选中附件的文件夹..."
-
 #: ../mail/em-format-html-display.c:1820
 msgid "Save Selected..."
 msgstr "保存所选附件..."
@@ -11494,19 +11707,6 @@ msgstr ""
 "无法从先前的 Evolution 安装中读取设置，“evolution/config.xmldb”不存在或者已损"
 "坏。"
 
-#: ../mail/em-popup.c:411
-msgid "Save As..."
-msgstr "另存为..."
-
-#: ../mail/em-popup.c:436
-#, c-format
-msgid "untitled_image.%s"
-msgstr "无标题图像.%s"
-
-#: ../mail/em-popup.c:554 ../mail/em-popup.c:565
-msgid "Set as _Background"
-msgstr "设为背景(_B)"
-
 #: ../mail/em-popup.c:556 ../mail/em-popup.c:567
 msgid "_Reply to sender"
 msgstr "回复发件人(_R)"
@@ -11528,11 +11728,6 @@ msgstr "把新信发送到(_S)..."
 msgid "_Add to Addressbook"
 msgstr "添加到地址簿(_A)"
 
-#: ../mail/em-popup.c:774
-#, c-format
-msgid "Open in %s..."
-msgstr "在 %s 中打开..."
-
 #: ../mail/em-subscribe-editor.c:614
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此存储不支持订阅，或订阅未启用。"
@@ -14312,7 +14507,8 @@ 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要执行这些操作，请切换到联机模式。"
+"Evolution 正处于脱机模式。您目前无法创建或修改文件夹。\n"
+"要执行这些操作，请切换到联机模式。"
 
 #. User entered a wrong existing
 #. * password. Prompt him again.
@@ -15086,9 +15282,61 @@ msgstr "共享"
 msgid "Track Message Status..."
 msgstr "跟踪信件状态..."
 
+#: ../plugins/ipod-sync/ical-format.c:137
+#: ../plugins/save-calendar/ical-format.c:137
+msgid "iCalendar format (.ics)"
+msgstr "iCalendar 格式(.ics)"
+
+#: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
+msgid "Synchronize the selected task/calendar/addressbook 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/ipod-sync/sync.c:158
+msgid "No output directory!"
+msgstr "无输出目录！"
+
+#: ../plugins/ipod-sync/sync.c:159
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"correctly set up and try again."
+msgstr ""
+"未在 iPod 中找到输出目录！请确定 iPod 已正确设置，然后再试一次。"
+
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
+msgid "Could not export data!"
+msgstr "无法导出数据！"
+
+#: ../plugins/ipod-sync/sync.c:203
+msgid "Exporting data failed."
+msgstr "导出数据失败。"
+
+#: ../plugins/ipod-sync/sync.c:231
+msgid "Could not open addressbook!"
+msgstr "无法打开地址簿！"
+
+#: ../plugins/ipod-sync/sync.c:232
+msgid "Could not open the Evolution addressbook to export data."
+msgstr "无法打开 Evolution 地址簿导出数据。"
+
+#: ../plugins/ipod-sync/sync.c:291
+msgid "Could not open calendar/todo!"
+msgstr "无法打开日历/待办！"
+
+#: ../plugins/ipod-sync/sync.c:292
+msgid "Could not open the Evolution calendar/todo list to export data."
+msgstr "无法打开 Evolution 日历/待办列表导出数据。"
+
 #: ../plugins/itip-formatter/itip-formatter.c:724
 msgid "Unable to parse item"
-msgstr "无法分析信件项目"
+msgstr "无法分析项目"
 
 #: ../plugins/itip-formatter/itip-formatter.c:780
 #, c-format
@@ -15743,19 +15991,19 @@ msgstr "退订这封信所属的邮件列表"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
-msgstr "将日历标为离线"
+msgstr "将日历标为脱机"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 msgid "Marks the selected calendar for offline viewing."
-msgstr "将选中日历标为离线查看。"
+msgstr "将选中日历标为脱机查看。"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
 msgid "_Do not make this available offline"
-msgstr "不将此日历标为离线(_D)"
+msgstr "不将此日历标为脱机(_D)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
 msgid "_Mark Calendar for offline use"
-msgstr "将日历标为离线使用(_M)"
+msgstr "将日历标为脱机使用(_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -15867,7 +16115,8 @@ msgstr "在撰写器中添加打印邮件的选项"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-tasks.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:78 ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "打印预览(_V)"
 
@@ -15997,10 +16246,6 @@ msgstr "将值以下列形式封装："
 msgid "Comma separated value format (.csv)"
 msgstr "逗号分隔的值格式(.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:137
-msgid "iCalendar format (.ics)"
-msgstr "iCalendar 格式(.ics)"
-
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:1
 msgid "Save Selected"
 msgstr "保存选中"
@@ -16381,7 +16626,7 @@ msgstr "Evolution 正在脱机过程中。"
 
 #: ../shell/e-shell-window.c:358
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution 目前脱机。单击该按钮可在线工作。"
+msgstr "Evolution 目前脱机。单击该按钮可联机工作。"
 
 #: ../shell/e-shell-window.c:735
 #, c-format
@@ -18079,6 +18324,38 @@ msgstr "关闭(_C)"
 msgid "_File"
 msgstr "文件(_F)"
 
+#: ../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-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附件"
@@ -18599,6 +18876,10 @@ msgstr "按跟随标志(_F)"
 msgid "_Messages"
 msgstr "信件(_M)"
 
+#: ../views/memos/galview.xml.h:1
+msgid "_Memos"
+msgstr "备忘(_M)"
+
 #: ../views/tasks/galview.xml.h:1
 msgid "With _Due Date"
 msgstr "到期日期(_D)"
@@ -19789,4 +20070,3 @@ msgstr "输入法环境"
 #: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Handle Popup"
 msgstr "处理弹出"
-