Updated evo translation.

svn path=/trunk/; revision=31340

1 files changed, 341 insertions, 332 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6bf84bc6b9..54bb62b357 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: 2006-01-26 06:32+0100\n"
-"PO-Revision-Date: 2006-01-26 16:31+0800\n"
+"POT-Creation-Date: 2006-01-29 22:11+0100\n"
+"PO-Revision-Date: 2006-01-30 06:52+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"
@@ -86,23 +86,23 @@ msgstr "日历视图事件"
 msgid "Grab Focus"
 msgstr "获得焦点"
 
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "新建约会"
 
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "新建全天事件"
 
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "新会议"
 
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "转到今天"
 
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "转到日期"
 
@@ -527,9 +527,9 @@ msgstr "在此配置自动补全"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1344
+#: ../addressbook/gui/component/addressbook-view.c:1335
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:629
+#: ../plugins/exchange-operations/exchange-folder.c:626
 msgid "Contacts"
 msgstr "联系人"
 
@@ -568,7 +568,7 @@ msgstr "在此管理您的 S/MIME 证书"
 #. create the local source group
 #. On This Computer is always first and Search Folders is always last
 #: ../addressbook/gui/component/addressbook-component.c:141
-#: ../addressbook/gui/component/addressbook-migrate.c:507
+#: ../addressbook/gui/component/addressbook-migrate.c:483
 #: ../calendar/gui/calendar-component.c:209
 #: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
 #: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
@@ -584,7 +584,7 @@ msgstr "在此计算机中"
 #. Create the default Person addressbook
 #. orange
 #: ../addressbook/gui/component/addressbook-component.c:149
-#: ../addressbook/gui/component/addressbook-migrate.c:515
+#: ../addressbook/gui/component/addressbook-migrate.c:491
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:217
 #: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
@@ -597,7 +597,7 @@ msgstr "个人"
 
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:159
-#: ../addressbook/gui/component/addressbook-migrate.c:525
+#: ../addressbook/gui/component/addressbook-migrate.c:501
 msgid "On LDAP Servers"
 msgstr "在 LDAP 服务器上"
 
@@ -618,7 +618,7 @@ msgid "Create a new contact list"
 msgstr "创建一个新的联系人列表"
 
 #: ../addressbook/gui/component/addressbook-component.c:242
-#: ../addressbook/gui/component/addressbook-config.c:1204
+#: ../addressbook/gui/component/addressbook-config.c:1202
 msgid "New Address Book"
 msgstr "新地址簿"
 
@@ -630,7 +630,7 @@ msgstr "地址簿(_B)"
 msgid "Create a new address book"
 msgstr "创建新地址簿"
 
-#: ../addressbook/gui/component/addressbook-component.c:386
+#: ../addressbook/gui/component/addressbook-component.c:382
 msgid "Failed upgrading Addressbook settings or folders."
 msgstr "升级地址簿设置或文件夹失败。"
 
@@ -644,11 +644,11 @@ msgstr "基础"
 msgid "_Type:"
 msgstr "类型(_T)："
 
-#: ../addressbook/gui/component/addressbook-config.c:634
+#: ../addressbook/gui/component/addressbook-config.c:632
 msgid "Copy book content locally for offline operation"
 msgstr "将地址簿内容复制到本地以进行脱机操作"
 
-#: ../addressbook/gui/component/addressbook-config.c:983
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/calendar-setup.c:368
@@ -659,34 +659,34 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
 msgid "General"
 msgstr "常规"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../mail/importers/pine-importer.c:392
 msgid "Addressbook"
 msgstr "地址簿"
 
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "服务器信息"
 
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "身份验证"
 
-#: ../addressbook/gui/component/addressbook-config.c:993
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "细节"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "搜索"
 
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "下载"
 
-#: ../addressbook/gui/component/addressbook-config.c:1202
+#: ../addressbook/gui/component/addressbook-config.c:1200
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "地址簿属性"
@@ -702,15 +702,15 @@ msgstr "正在升迁..."
 msgid "Migrating `%s':"
 msgstr "升迁“%s”："
 
-#: ../addressbook/gui/component/addressbook-migrate.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "LDAP 服务器"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:768
+#: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "自动补全设置"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1143
+#: ../addressbook/gui/component/addressbook-migrate.c:1119
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -721,7 +721,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1157
+#: ../addressbook/gui/component/addressbook-migrate.c:1133
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -731,7 +731,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1166
+#: ../addressbook/gui/component/addressbook-migrate.c:1142
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -741,7 +741,7 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的文件夹..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1176
+#: ../addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -751,33 +751,33 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
-#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../addressbook/gui/component/addressbook-view.c:435
 #: ../mail/em-folder-utils.c:503
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "将“%s”文件夹重命名为："
 
-#: ../addressbook/gui/component/addressbook-view.c:447
+#: ../addressbook/gui/component/addressbook-view.c:438
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "重命名文件夹"
 
-#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../addressbook/gui/component/addressbook-view.c:443
 #: ../mail/em-folder-utils.c:511
 msgid "Folder names cannot contain '/'"
 msgstr "文件夹名不能含有字符“/”"
 
-#: ../addressbook/gui/component/addressbook-view.c:455
+#: ../addressbook/gui/component/addressbook-view.c:446
 msgid "A Folder with this name already exists"
 msgstr "已经存在此名称的文件夹"
 
-#: ../addressbook/gui/component/addressbook-view.c:963
+#: ../addressbook/gui/component/addressbook-view.c:954
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:964
-#: ../addressbook/gui/widgets/e-addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/e-calendar-table.c:1196
 #: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
@@ -788,17 +788,17 @@ msgstr "新建地址簿(_N)"
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:957
 msgid "Save As Vcard..."
 msgstr "另存为 Vcard..."
 
-#: ../addressbook/gui/component/addressbook-view.c:968
+#: ../addressbook/gui/component/addressbook-view.c:959
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "属性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1355
+#: ../addressbook/gui/component/addressbook-view.c:1346
 msgid "Contact Source Selector"
 msgstr "联系人源选择器"
 
@@ -1223,9 +1223,9 @@ msgid "Contact"
 msgstr "联系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:568
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2406
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2403
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -1290,12 +1290,13 @@ msgid "_Birthday:"
 msgstr "生日(_B)："
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: ../plugins/itip-formatter/itip-view.c:1662
+#: ../plugins/itip-formatter/itip-view.c:1652
 msgid "_Calendar:"
 msgstr "日历(_C)："
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "类别(_C)"
 
@@ -2376,7 +2377,7 @@ msgid "Zimbabwe"
 msgstr "津巴布韦"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:936
+#: ../plugins/exchange-operations/exchange-delegates.c:934
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:717
 #: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../plugins/save-attachments/save-attachments.c:369
@@ -2468,21 +2469,21 @@ msgstr "必需域"
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:563
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2401
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2398
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2739
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2736
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2737
 msgid "No image"
 msgstr "无图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3016
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2490,7 +2491,7 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3068
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
@@ -2688,7 +2689,7 @@ msgstr "输入电子邮件地址或者把联系人拖放到下面的列表(_T)�
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: ../addressbook/gui/widgets/e-addressbook-model.c:296
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:224
+#: ../addressbook/gui/widgets/e-addressbook-view.c:222
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
@@ -2761,7 +2762,7 @@ msgstr[0] "%d 个联系人"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:303
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:391
-#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../addressbook/gui/widgets/e-addressbook-view.c:236
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -2812,11 +2813,11 @@ msgstr "高级..."
 msgid "_Advanced..."
 msgstr "高级(_A)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "来源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:243
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:479
@@ -2825,17 +2826,17 @@ msgstr "来源"
 msgid "Type"
 msgstr "类型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.c:548
 msgid "Address Book"
 msgstr "地址簿"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../addressbook/gui/widgets/e-addressbook-view.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2049
 #: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "另存为 VCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:944
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 #: ../calendar/gui/dialogs/comp-editor.c:1093
 #: ../calendar/gui/e-calendar-table.c:1176
 #: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
@@ -2843,56 +2844,56 @@ msgstr "另存为 VCard..."
 msgid "_Open"
 msgstr "打开(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "_New Contact..."
 msgstr "新建联系人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:948
 msgid "_Save as VCard..."
 msgstr "另存为 VCard(_S)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:949
 msgid "_Forward Contact"
 msgstr "转发联系人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "_Forward Contacts"
 msgstr "转发联系人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Send _Message to Contact"
 msgstr "给联系人发信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:952
 msgid "Send _Message to List"
 msgstr "给列表发信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:953
 msgid "Send _Message to Contacts"
 msgstr "给联系人发信件(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
 msgid "Cop_y to Address Book..."
 msgstr "复制到地址簿(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:958
 msgid "Mo_ve to Address Book..."
 msgstr "移至地址簿(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:961
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "剪切(_T)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:964
+#: ../addressbook/gui/widgets/e-addressbook-view.c:962
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1184
@@ -2906,18 +2907,18 @@ msgstr "剪切(_T)"
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "P_aste"
 msgstr "粘贴(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1582
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "任何类别"
 
 #. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1786
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1784
 msgid "Print cards"
 msgstr "打印名片"
 
@@ -2950,7 +2951,7 @@ msgid "Car Phone"
 msgstr "车载电话"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-#: ../calendar/gui/dialogs/event-page.glade.h:9
+#: ../calendar/gui/dialogs/event-page.glade.h:8
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:1
@@ -3802,7 +3803,7 @@ msgstr "阴影"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:965
+#: ../plugins/exchange-operations/exchange-account-setup.c:955
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:199
 msgid "Size:"
@@ -4186,34 +4187,38 @@ msgid "Would you like to save your changes to this appointment?"
 msgstr "您想要保存对约会的更改吗？"
 
 #: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to save your changes to this memo?"
+msgstr "您想要保存对此备忘的更改吗？"
+
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to save your changes to this task?"
 msgstr "您想要保存对此任务的更改吗？"
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "您是否想要为此日记项发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "您是否想要给全部出席者发送取消通知？"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "您是否想要给出席者发送会议邀请？"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send this task to participants?"
 msgstr "您是否想要将此任务发送给出席者？"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "您是否想要给出席者发送更新的会议信息？"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid "Would you like to send updated task information to participants?"
 msgstr "您是否想要给出席者发送更新的任务信息？"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4222,42 +4227,46 @@ msgstr ""
 "您正在连接到不支持的 GroupWise 服务器，此时使用 Evolution 可能遇到问题。为了"
 "得到最佳效果，服务器应该升级到支持的版本。"
 
-#: ../calendar/calendar.error.xml.h:64
-msgid "You have changed this appointment, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:65
+msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已经更改了此约会，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:65
-msgid "You have made changes to this task, but not yet saved them."
+#: ../calendar/calendar.error.xml.h:66
+msgid "You have changed this task, but not yet saved it."
 msgstr "您已经对此任务做出了更改，但尚未保存。"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:67
+msgid "You have made changes to this memo, but not yet saved them."
+msgstr "您已经对此备忘做出了更改，但尚未保存。"
+
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "除非您重新启动 Evolution，否则您的日历无法使用。"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../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:132
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:74
 msgid "{0}."
 msgstr "{0}。"
 
@@ -4366,7 +4375,7 @@ msgstr "备忘"
 #: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:635
+#: ../plugins/exchange-operations/exchange-folder.c:632
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:384
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:591
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
@@ -4419,7 +4428,7 @@ msgstr "约会"
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1270
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1276
 #: ../calendar/gui/e-itip-control.c:1119
-#: ../plugins/itip-formatter/itip-view.c:884
+#: ../plugins/itip-formatter/itip-view.c:880
 msgid "Location:"
 msgstr "位置："
 
@@ -4969,12 +4978,12 @@ msgstr "打印"
 #: ../calendar/gui/calendar-component.c:709
 #: ../calendar/gui/dialogs/calendar-setup.c:369
 #: ../calendar/gui/gnome-cal.c:2123
-#: ../plugins/exchange-operations/exchange-folder.c:623
+#: ../plugins/exchange-operations/exchange-folder.c:620
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:383
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:413
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:590
-#: ../plugins/hula-account-setup/camel-hula-listener.c:374
-#: ../plugins/hula-account-setup/camel-hula-listener.c:403
+#: ../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
 msgid "Calendar"
 msgstr "日历"
@@ -5083,7 +5092,7 @@ msgid "New calendar"
 msgstr "新建日历"
 
 #: ../calendar/gui/calendar-component.c:1482
-#: ../calendar/gui/dialogs/event-page.c:872
+#: ../calendar/gui/dialogs/event-page.c:873
 msgid "Cale_ndar"
 msgstr "日历(_N)"
 
@@ -5224,7 +5233,7 @@ msgstr "分钟"
 msgid "start of appointment"
 msgstr "约会开始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:203
 msgid "Action/Trigger"
 msgstr "动作/触发器"
 
@@ -5341,7 +5350,7 @@ msgid "Display"
 msgstr "显示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../calendar/gui/dialogs/event-editor.c:566
+#: ../calendar/gui/dialogs/event-editor.c:572
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "忙/闲"
@@ -5717,7 +5726,7 @@ msgid "Show Attachment _Bar"
 msgstr "显示附件栏(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1094
-#: ../calendar/gui/dialogs/event-page.c:1895
+#: ../calendar/gui/dialogs/event-page.c:1898
 #: ../calendar/gui/dialogs/meeting-page.c:914
 #: ../calendar/gui/dialogs/task-page.c:1206
 #: ../composer/e-msg-composer-attachment-bar.c:470
@@ -5875,100 +5884,132 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:541
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "约会(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:545
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
-msgstr "再现("
+msgstr "再现"
+
+#: ../calendar/gui/dialogs/event-page.c:807
+#: ../calendar/gui/dialogs/event-page.c:2720
+msgid "This event has alarms"
+msgstr "此事件有提醒"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../calendar/gui/dialogs/event-page.c:879
 #: ../calendar/gui/dialogs/task-page.c:446
 msgid "Or_ganizer"
 msgstr "组织者(_G)"
 
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:917
 msgid "_Delegatees"
 msgstr "代理人(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:918
+#: ../calendar/gui/dialogs/event-page.c:919
 msgid "Atte_ndees"
 msgstr "出席者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1085
+#: ../calendar/gui/dialogs/event-page.c:1086
 msgid "Event with no start date"
 msgstr "没有开始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1088
+#: ../calendar/gui/dialogs/event-page.c:1089
 msgid "Event with no end date"
 msgstr "没有结束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1254
+#: ../calendar/gui/dialogs/event-page.c:1257
 #: ../calendar/gui/dialogs/task-page.c:851
 msgid "Start date is wrong"
 msgstr "开始日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1264
+#: ../calendar/gui/dialogs/event-page.c:1267
 msgid "End date is wrong"
 msgstr "结束日期有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1287
+#: ../calendar/gui/dialogs/event-page.c:1290
 msgid "Start time is wrong"
 msgstr "开始时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1294
+#: ../calendar/gui/dialogs/event-page.c:1297
 msgid "End time is wrong"
 msgstr "结束时间有错"
 
-#: ../calendar/gui/dialogs/event-page.c:1449
+#: ../calendar/gui/dialogs/event-page.c:1452
 #: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:908
 msgid "The organizer selected no longer has an account."
 msgstr "选中的组织者没有帐户了。"
 
-#: ../calendar/gui/dialogs/event-page.c:1455
+#: ../calendar/gui/dialogs/event-page.c:1458
 #: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:914
 msgid "An organizer is required."
 msgstr "需要一名组织者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1470
+#: ../calendar/gui/dialogs/event-page.c:1473
 #: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:929
 msgid "At least one attendee is required."
 msgstr "需要至少一个出席者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1896
+#: ../calendar/gui/dialogs/event-page.c:1899
 #: ../calendar/gui/dialogs/meeting-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1207
 msgid "_Add "
 msgstr "添加(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2625
+#: ../calendar/gui/dialogs/event-page.c:2627
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "无法打开日历“%s”。"
 
-#: ../calendar/gui/dialogs/event-page.c:2893
+#: ../calendar/gui/dialogs/event-page.c:2922
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "约会的 %d 天前"
 
-#: ../calendar/gui/dialogs/event-page.c:2901
+#: ../calendar/gui/dialogs/event-page.c:2930
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "约会的 %d 小时前"
 
-#: ../calendar/gui/dialogs/event-page.c:2909
+#: ../calendar/gui/dialogs/event-page.c:2938
 #, c-format
 msgid "%d minute before appointement"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "约会的 %d 分钟前"
 
+#: ../calendar/gui/dialogs/event-page.c:2954
+msgid "Customize"
+msgstr "自定义"
+
+#. an empty string is the same as 'None'
+#. Put the "None" and "UTC" entries at the top of the combo's list.
+#. When "None" is selected we want the field to be cleared.
+#. Note that we don't show this here, since by default a 'None' date
+#. is not permitted.
+#: ../calendar/gui/dialogs/event-page.c:2959
+#: ../calendar/gui/dialogs/meeting-page.c:321
+#: ../calendar/gui/dialogs/meeting-page.glade.h:4
+#: ../calendar/gui/e-cal-model-tasks.c:654
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
+#: ../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:1626
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
+msgid "None"
+msgstr "无"
+
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 hour before appointment"
 msgstr "约会的 1 小时前"
@@ -5987,18 +6028,18 @@ msgid "Atte_ndees..."
 msgstr "出席者(_N)..."
 
 #: ../calendar/gui/dialogs/event-page.glade.h:6
-msgid "C_ustomize"
-msgstr "自定义(_U)"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:7
-#: ../calendar/gui/dialogs/memo-page.glade.h:3
+#: ../calendar/gui/dialogs/memo-page.glade.h:2
 msgid "Ca_tegories..."
 msgstr "类别(_T)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:8
+#: ../calendar/gui/dialogs/event-page.glade.h:7
 msgid "Cale_ndar:"
 msgstr "日历(_N)："
 
+#: ../calendar/gui/dialogs/event-page.glade.h:9
+msgid "Custom Alarm:"
+msgstr "自定义提醒："
+
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件描述"
@@ -6018,12 +6059,12 @@ msgid "Su_mmary:"
 msgstr "概要(_M)："
 
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "描述(_D)："
+msgid "_Alarm"
+msgstr "提醒(_A)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "设定提醒(_S)\t"
+msgid "_Description:"
+msgstr "描述(_D)："
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
@@ -6047,28 +6088,6 @@ msgstr "代理人(_G)"
 msgid "From:"
 msgstr "发件人："
 
-#. an empty string is the same as 'None'
-#. Put the "None" and "UTC" entries at the top of the combo's list.
-#. When "None" is selected we want the field to be cleared.
-#. Note that we don't show this here, since by default a 'None' date
-#. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:321
-#: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
-#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
-#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
-#: ../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:1627
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
-#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
-msgid "None"
-msgstr "无"
-
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
@@ -6140,47 +6159,21 @@ msgstr "组织者"
 msgid "Organizer:"
 msgstr "组织者："
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2313
+#: ../calendar/gui/dialogs/memo-editor.c:229 ../calendar/gui/print.c:2313
 msgid "Memo"
 msgstr "备忘"
 
-#: ../calendar/gui/dialogs/memo-page.c:490
+#: ../calendar/gui/dialogs/memo-page.c:551
 #, 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:4
-msgid "Classi_fication:"
-msgstr "分类(_F)："
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:368
-msgid "Confidential"
-msgstr "机密"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:367
-msgid "Private"
-msgstr "保密"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../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:366
-msgid "Public"
-msgstr "公开"
-
-#: ../calendar/gui/dialogs/memo-page.glade.h:8
+#: ../calendar/gui/dialogs/memo-page.glade.h:3
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "组(_G)："
 
-#: ../calendar/gui/dialogs/memo-page.glade.h:9
+#: ../calendar/gui/dialogs/memo-page.glade.h:4
 msgid "_Memo Content:"
 msgstr "备忘环境(_M)："
 
@@ -6429,12 +6422,12 @@ msgstr "优先级(_P)："
 msgid "_Web Page:"
 msgstr "网页(_W)："
 
-#: ../calendar/gui/dialogs/task-editor.c:419
+#: ../calendar/gui/dialogs/task-editor.c:420
 #: ../calendar/gui/tasks-component.c:1174
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:423
+#: ../calendar/gui/dialogs/task-editor.c:424
 msgid "Task Details"
 msgstr "任务细节"
 
@@ -6651,8 +6644,8 @@ msgstr "到期日期："
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
 #: ../calendar/gui/e-itip-control.c:1133
-#: ../plugins/exchange-operations/exchange-account-setup.c:267
-#: ../plugins/itip-formatter/itip-view.c:909
+#: ../plugins/exchange-operations/exchange-account-setup.c:269
+#: ../plugins/itip-formatter/itip-view.c:905
 msgid "Status:"
 msgstr "状态："
 
@@ -6660,6 +6653,21 @@ msgstr "状态："
 msgid "Priority:"
 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:366
+msgid "Public"
+msgstr "公开"
+
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-calendar-table.c:367
+msgid "Private"
+msgstr "保密"
+
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-calendar-table.c:368
+msgid "Confidential"
+msgstr "机密"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "结束日期"
@@ -6721,7 +6729,7 @@ msgstr "否"
 #: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
 #: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
 #: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1652
+#: ../plugins/itip-formatter/itip-formatter.c:1651
 #: ../plugins/plugin-manager/plugin-manager.c:72
 #: ../widgets/misc/e-attachment-bar.c:691
 #: ../widgets/misc/e-charset-picker.c:62
@@ -6740,7 +6748,7 @@ msgstr "已指派"
 msgid "Save As..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1866
+#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1909
 msgid "Select folder to save selected attachments..."
 msgstr "选择保存选中附件的文件夹..."
 
@@ -7176,12 +7184,12 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 #: ../calendar/gui/e-meeting-list-view.c:204
 #: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:669
-#: ../plugins/itip-formatter/itip-formatter.c:1640
+#: ../plugins/itip-formatter/itip-formatter.c:1639
 msgid "Accepted"
 msgstr "接受"
 
 #: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
-#: ../plugins/itip-formatter/itip-formatter.c:1643
+#: ../plugins/itip-formatter/itip-formatter.c:1642
 msgid "Tentatively Accepted"
 msgstr "暂时接受"
 
@@ -7189,7 +7197,7 @@ msgstr "暂时接受"
 #: ../calendar/gui/e-meeting-list-view.c:205
 #: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
 #: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
-#: ../plugins/itip-formatter/itip-formatter.c:1646
+#: ../plugins/itip-formatter/itip-formatter.c:1645
 msgid "Declined"
 msgstr "拒绝"
 
@@ -7406,7 +7414,7 @@ msgid "Attendee status updated\n"
 msgstr "更新出席者状态\n"
 
 #: ../calendar/gui/e-itip-control.c:1980
-#: ../plugins/itip-formatter/itip-formatter.c:1025
+#: ../plugins/itip-formatter/itip-formatter.c:1029
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新出席者状态"
 
@@ -7575,7 +7583,7 @@ msgstr "暂时的"
 #: ../calendar/gui/e-meeting-list-view.c:207
 #: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/itip-utils.c:678
-#: ../plugins/itip-formatter/itip-formatter.c:1649
+#: ../plugins/itip-formatter/itip-formatter.c:1648
 msgid "Delegated"
 msgstr "被委任的"
 
@@ -10744,7 +10752,7 @@ msgstr "默认"
 
 #. Security settings
 #: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "安全"
 
@@ -10782,7 +10790,7 @@ msgstr "[默认]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
 #: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:213
+#: ../plugins/plugin-manager/plugin-manager.c:211
 #: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "已启用"
@@ -11150,7 +11158,7 @@ msgstr "草稿"
 
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
-#: ../plugins/exchange-operations/exchange-folder.c:641
+#: ../plugins/exchange-operations/exchange-folder.c:638
 msgid "Inbox"
 msgstr "收件箱"
 
@@ -11407,66 +11415,66 @@ msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:493
+#: ../mail/em-format-html-display.c:494
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html-display.c:753
+#: ../mail/em-format-html-display.c:754
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html-display.c:754
+#: ../mail/em-format-html-display.c:755
 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:755 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:756 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:756
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:757
 msgid "Valid signature, cannot verify sender"
 msgstr "签名有效，无法校验发送者"
 
-#: ../mail/em-format-html-display.c:756
+#: ../mail/em-format-html-display.c:757
 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:762 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:763
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:763
+#: ../mail/em-format-html-display.c:764
 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 "
@@ -11475,21 +11483,21 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:764
+#: ../mail/em-format-html-display.c:765
 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:765 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:766 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:765
+#: ../mail/em-format-html-display.c:766
 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 "
@@ -11498,74 +11506,74 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:866 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:867 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:881
+#: ../mail/em-format-html-display.c:882
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:1169
+#: ../mail/em-format-html-display.c:1170
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%m月%d日%A，%H:%M完成"
 
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1178
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1181
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%H:%M"
 
-#: ../mail/em-format-html-display.c:1240
+#: ../mail/em-format-html-display.c:1241
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../mail/em-format-html-display.c:1241
+#: ../mail/em-format-html-display.c:1242
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../mail/em-format-html-display.c:1242
+#: ../mail/em-format-html-display.c:1243
 msgid "_Fit to Width"
 msgstr "适合宽度(_F)"
 
-#: ../mail/em-format-html-display.c:1243
+#: ../mail/em-format-html-display.c:1244
 msgid "Show _Original Size"
 msgstr "显示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1620
+#: ../mail/em-format-html-display.c:1663
 msgid "Attachment Button"
 msgstr "附件按钮"
 
-#: ../mail/em-format-html-display.c:1827
+#: ../mail/em-format-html-display.c:1870
 msgid "Select folder to save all attachments..."
 msgstr "选择保存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:1874
+#: ../mail/em-format-html-display.c:1917
 msgid "Save Selected..."
 msgstr "保存所选附件..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1941
+#: ../mail/em-format-html-display.c:1984
 #, c-format
 msgid "%d attachme_nt"
 msgid_plural "%d attachme_nts"
 msgstr[0] "%d 个附件(_N)"
 
-#: ../mail/em-format-html-display.c:1948 ../mail/em-format-html-display.c:2024
+#: ../mail/em-format-html-display.c:1991 ../mail/em-format-html-display.c:2067
 msgid "S_ave"
 msgstr "保存(_A)"
 
-#: ../mail/em-format-html-display.c:1959
+#: ../mail/em-format-html-display.c:2002
 msgid "S_ave All"
 msgstr "全部保存(_A)"
 
-#: ../mail/em-format-html-display.c:2018
+#: ../mail/em-format-html-display.c:2061
 msgid "Toggle Attachment Bar"
 msgstr "切换附件栏"
 
-#: ../mail/em-format-html-display.c:2020
+#: ../mail/em-format-html-display.c:2063
 msgid "No Attachment"
 msgstr "无附件"
 
@@ -11792,7 +11800,7 @@ msgid "_Send New Message To..."
 msgstr "把新信发送到(_S)..."
 
 #: ../mail/em-popup.c:622
-msgid "_Add to Addressbook"
+msgid "_Add to Address Book"
 msgstr "添加到地址簿(_A)"
 
 #: ../mail/em-subscribe-editor.c:615
@@ -12344,7 +12352,7 @@ msgstr "导入“%s”"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:236
+#: ../plugins/startup-wizard/startup-wizard.c:237
 #: ../shell/e-shell-importer.c:525
 msgid "Please wait"
 msgstr "请稍候"
@@ -13485,7 +13493,7 @@ msgid "Checking for new mail"
 msgstr "检查新邮件"
 
 #: ../mail/mail-session.c:204
-#: ../plugins/exchange-operations/exchange-config-listener.c:678
+#: ../plugins/exchange-operations/exchange-config-listener.c:681
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
@@ -14541,11 +14549,11 @@ msgid ""
 "password authentication."
 msgstr "此选项将使用标准的纯文本密码身份验证连接到 Exchange 服务器。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:255
+#: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "办公室以外"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:262
+#: ../plugins/exchange-operations/exchange-account-setup.c:264
 msgid ""
 "The message specified below will be automatically sent to \n"
 "each person who sends mail to you while you are out of the office."
@@ -14553,67 +14561,67 @@ msgstr ""
 "在您位于办公室外时，如果有人给您发送邮件，则会自动将下面指定的信件\n"
 "送回。"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:274
-#: ../plugins/exchange-operations/exchange-account-setup.c:279
+#: ../plugins/exchange-operations/exchange-account-setup.c:276
+#: ../plugins/exchange-operations/exchange-account-setup.c:281
 msgid "I am out of the office"
 msgstr "我正在办公室外"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:275
-#: ../plugins/exchange-operations/exchange-account-setup.c:278
+#: ../plugins/exchange-operations/exchange-account-setup.c:277
+#: ../plugins/exchange-operations/exchange-account-setup.c:280
 msgid "I am in the office"
 msgstr "我正在办公室内"
 
 #. Change Password
-#: ../plugins/exchange-operations/exchange-account-setup.c:326
+#: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
 msgstr "更改 Exchange 账户的密码"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:328
+#: ../plugins/exchange-operations/exchange-account-setup.c:330
 #: ../plugins/exchange-operations/exchange-change-password.glade.h:2
 msgid "Change Password"
 msgstr "更改密码"
 
 #. Delegation Assistant
-#: ../plugins/exchange-operations/exchange-account-setup.c:333
+#: ../plugins/exchange-operations/exchange-account-setup.c:335
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 账户的代理设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:335
+#: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
 msgstr "代理助手"
 
 #. Miscelleneous settings
-#: ../plugins/exchange-operations/exchange-account-setup.c:347
+#: ../plugins/exchange-operations/exchange-account-setup.c:349
 msgid "Miscelleneous"
 msgstr "杂项"
 
 #. Folder Size
-#: ../plugins/exchange-operations/exchange-account-setup.c:357
+#: ../plugins/exchange-operations/exchange-account-setup.c:359
 msgid "View the size of all Exchange folders"
 msgstr "查看所有 Exchange 文件夹的大小"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "文件夹大小"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:366
+#: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
 msgstr "Exchange 设置"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:619
+#: ../plugins/exchange-operations/exchange-account-setup.c:609
 msgid "_OWA URL:"
 msgstr "_OWA URL："
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:645
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "身份验证(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "身份验证类型"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "检查支持的类型(_E)"
 
@@ -14685,34 +14693,34 @@ msgstr "授权给"
 msgid "Remove the delegate %s?"
 msgstr "删除代理人 %s 吗？"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:679
+#: ../plugins/exchange-operations/exchange-delegates.c:680
 msgid "Could not access Active Directory"
 msgstr "无法访问 Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:694
+#: ../plugins/exchange-operations/exchange-delegates.c:692
 msgid "Could not find self in Active Directory"
 msgstr "无法在 Active Directory 中找到自己"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:707
+#: ../plugins/exchange-operations/exchange-delegates.c:705
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "无法在 Active Directory 中找到代理人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:719
+#: ../plugins/exchange-operations/exchange-delegates.c:717
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "无法删除代理人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:779
+#: ../plugins/exchange-operations/exchange-delegates.c:777
 msgid "Could not update list of delegates."
 msgstr "无法更新代理人。"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:797
+#: ../plugins/exchange-operations/exchange-delegates.c:795
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "无法添加代理人 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:965
+#: ../plugins/exchange-operations/exchange-delegates.c:963
 msgid "Error reading delegates list."
 msgstr "读取代理人列表出错。"
 
@@ -14771,11 +14779,11 @@ msgstr "任务(_T)："
 msgid "Permissions..."
 msgstr "权限..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:136
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
 msgid "Folder Name"
 msgstr "文件夹名称"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "文件夹大小"
 
@@ -14794,14 +14802,14 @@ msgstr "Exchange 文件夹树"
 msgid "Unsubscribe Folder..."
 msgstr "退订文件夹..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:466
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:463
+#: ../plugins/exchange-operations/exchange-folder.c:523
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "真的要退订文件夹“%s”吗？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:478
-#: ../plugins/exchange-operations/exchange-folder.c:538
+#: ../plugins/exchange-operations/exchange-folder.c:475
+#: ../plugins/exchange-operations/exchange-folder.c:535
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "退订“%s”"
@@ -15375,14 +15383,6 @@ msgstr "写入(_W)"
 msgid "Proxy"
 msgstr "代理服务器"
 
-#: ../plugins/groupwise-features/proxy-listing.glade.h:2
-#: ../plugins/publish-calendar/publish-calendar.glade.h:28
-#: ../smime/gui/smime-ui.glade.h:49
-#: ../widgets/table/e-table-config-no-group.glade.h:20
-#: ../widgets/table/e-table-config.glade.h:21
-msgid "dialog1"
-msgstr "dialog1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>账户名</b>"
@@ -15531,110 +15531,110 @@ msgstr "日历“%s”中的一个约会与此会议冲突"
 msgid "Found the appointment in the calendar '%s'"
 msgstr "在日历“%s”中找到了约会"
 
-#: ../plugins/itip-formatter/itip-formatter.c:487
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "无法找到任何日历"
 
-#: ../plugins/itip-formatter/itip-formatter.c:494
+#: ../plugins/itip-formatter/itip-formatter.c:495
 msgid "Unable to find this meeting in any calendar"
 msgstr "无法在任何日历中找到此会议"
 
-#: ../plugins/itip-formatter/itip-formatter.c:498
+#: ../plugins/itip-formatter/itip-formatter.c:499
 msgid "Unable to find this task in any task list"
 msgstr "无法在任何任务列表中找到此任务"
 
-#: ../plugins/itip-formatter/itip-formatter.c:502
+#: ../plugins/itip-formatter/itip-formatter.c:503
 msgid "Unable to find this journal entry in any journal"
 msgstr "无法在任何日记中找到此日记项"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:529
 msgid "Searching for an existing version of this appointment"
 msgstr "搜索此约会的已有版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "无法分析项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:780
+#: ../plugins/itip-formatter/itip-formatter.c:782
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "无法将项目发送到日历“%s”。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:791
+#: ../plugins/itip-formatter/itip-formatter.c:793
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "将日历“%s”发送为已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:795
+#: ../plugins/itip-formatter/itip-formatter.c:797
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "将日历“%s”发送为待定"
 
-#: ../plugins/itip-formatter/itip-formatter.c:800
+#: ../plugins/itip-formatter/itip-formatter.c:802
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "将日历“%s”发送为已拒绝"
 
-#: ../plugins/itip-formatter/itip-formatter.c:805
+#: ../plugins/itip-formatter/itip-formatter.c:807
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "将日历“%s”发送为已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:898
+#: ../plugins/itip-formatter/itip-formatter.c:900
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "组织者已经删除了代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:905
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "已给代理人发送了取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:907
+#: ../plugins/itip-formatter/itip-formatter.c:909
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "无法给代理人发送取消通知"
 
-#: ../plugins/itip-formatter/itip-formatter.c:991
+#: ../plugins/itip-formatter/itip-formatter.c:994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "出席者状态无法更新，原因是状态无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1017
+#: ../plugins/itip-formatter/itip-formatter.c:1021
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "无法更新出席者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1021
+#: ../plugins/itip-formatter/itip-formatter.c:1025
 msgid "Attendee status updated"
 msgstr "出席者状态已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1148
+#: ../plugins/itip-formatter/itip-formatter.c:1152
 msgid "The calendar attached is not valid"
 msgstr "附加的日历无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1149
+#: ../plugins/itip-formatter/itip-formatter.c:1153
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "信件声明其包含日历，但日历不是有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1183
-#: ../plugins/itip-formatter/itip-formatter.c:1198
-#: ../plugins/itip-formatter/itip-formatter.c:1274
+#: ../plugins/itip-formatter/itip-formatter.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:1202
+#: ../plugins/itip-formatter/itip-formatter.c:1278
 msgid "The item in the calendar is not valid"
 msgstr "日历项无效"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1184
-#: ../plugins/itip-formatter/itip-formatter.c:1199
-#: ../plugins/itip-formatter/itip-formatter.c:1275
+#: ../plugins/itip-formatter/itip-formatter.c:1188
+#: ../plugins/itip-formatter/itip-formatter.c:1203
+#: ../plugins/itip-formatter/itip-formatter.c:1279
 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:1209
+#: ../plugins/itip-formatter/itip-formatter.c:1213
 msgid "The calendar attached contains multiple items"
 msgstr "附加的日历包含多个项目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1210
+#: ../plugins/itip-formatter/itip-formatter.c:1214
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16000,26 +16000,26 @@ msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "开始时间："
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "结束时间："
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:917
-#: ../plugins/itip-formatter/itip-view.c:967
+#: ../plugins/itip-formatter/itip-view.c:913
+#: ../plugins/itip-formatter/itip-view.c:963
 msgid "Comment:"
 msgstr "注释："
 
-#: ../plugins/itip-formatter/itip-view.c:981
+#: ../plugins/itip-formatter/itip-view.c:977
 msgid "Send u_pdates to attendees"
 msgstr "给出席者发送更新(_P)"
 
-#: ../plugins/itip-formatter/itip-view.c:990
+#: ../plugins/itip-formatter/itip-view.c:986
 msgid "A_pply to all instances"
 msgstr "应用到全部实例(_P)"
 
@@ -16315,7 +16315,7 @@ msgstr "管理插件是启用还是禁用的插件。"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:188
+#: ../plugins/plugin-manager/plugin-manager.c:186
 msgid "Plugin Manager"
 msgstr "插件管理器"
 
@@ -16345,12 +16345,12 @@ msgstr "路径"
 msgid "Description"
 msgstr "描述"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:199
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些更改直到重新启动后才生效"
 
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:208
+#: ../plugins/plugin-manager/plugin-manager.c:269
 msgid "Plugin"
 msgstr "插件"
 
@@ -16489,7 +16489,7 @@ msgstr "文件(_F)："
 msgid "_Publish as:"
 msgstr "发布为(_P)："
 
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -16646,8 +16646,8 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式(.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:170
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:169
+#: ../plugins/save-calendar/save-calendar.c:179
 msgid "Select destination file"
 msgstr "选择目的文件"
 
@@ -16700,13 +16700,13 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "请选择您希望导入的信息："
 
-#: ../plugins/startup-wizard/startup-wizard.c:154
+#: ../plugins/startup-wizard/startup-wizard.c:155
 #: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "从 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:234
+#: ../plugins/startup-wizard/startup-wizard.c:235
 #: ../shell/e-shell-importer.c:511
 msgid "Importing data."
 msgstr "正在导入数据。"
@@ -16791,8 +16791,9 @@ msgstr "以脱机模式启动"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
-msgstr "Evolution 的配置版本，带主/次/配置级别"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr "Evolution 的配置版本，带主/次/配置级别(如“2.6.0”)。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid "The default height for the main window, in pixels."
@@ -16809,8 +16810,8 @@ msgstr "侧边栏的默认宽度，以像素计。"
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
-msgstr "上次升级的 Evolution 配置版本，带主/次/配置级别"
+"configuration level (for example \"2.6.0\")."
+msgstr "上次升级的 Evolution 配置版本，带主/次/配置级别(如“2.6.0”)。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
@@ -17121,8 +17122,8 @@ msgstr ""
 "Evolution 团队\n"
 
 #: ../shell/main.c:261
-msgid "Don't tell me again"
-msgstr "不要再问我"
+msgid "Do not tell me again"
+msgstr "不要再通知我"
 
 #: ../shell/main.c:471
 msgid "Start Evolution activating the specified component"
@@ -18193,15 +18194,18 @@ msgstr "提醒(_M)"
 msgid "All day Event"
 msgstr "全天事件"
 
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
+#: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
 msgstr "分类为机密"
 
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-memo-editor.xml.h:2
+#: ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
 msgstr "分类为私人"
 
-#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-task-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-memo-editor.xml.h:3
+#: ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
 msgstr "分类为公开"
 
@@ -18217,7 +18221,8 @@ msgstr "插入高级发送选项"
 msgid "Make this a recurring event"
 msgstr "将此事件标为重复发生"
 
-#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
+#: ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
@@ -18257,7 +18262,8 @@ msgstr "切换是否显示状态域"
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
@@ -18273,11 +18279,13 @@ msgstr "切换是否将时间显示为忙"
 msgid "_All day Event"
 msgstr "全天事件(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分类(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "机密(_C)"
 
@@ -18285,7 +18293,8 @@ msgstr "机密(_C)"
 msgid "_Free/Busy"
 msgstr "忙/闲(_F)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"