Updated evo translation.

svn path=/trunk/; revision=31314

1 files changed, 536 insertions, 473 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e9c9492815..6bf84bc6b9 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-21 05:49+0100\n"
-"PO-Revision-Date: 2006-01-21 18:36+0800\n"
+"POT-Creation-Date: 2006-01-26 06:32+0100\n"
+"PO-Revision-Date: 2006-01-26 16:31+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"
@@ -452,7 +452,7 @@ msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
-"您即将把联系人从一个地址簿移动到另外一个地址簿，但是无法从源地址簿删除该联系"
+"您即将把联系人从一个地址簿移至另外一个地址簿，但是无法从源地址簿删除该联系"
 "人。您想要换作复制联系人吗？"
 
 #: ../addressbook/addressbook.error.xml.h:30
@@ -527,7 +527,7 @@ msgstr "在此配置自动补全"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1186
+#: ../addressbook/gui/component/addressbook-view.c:1344
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:629
 msgid "Contacts"
@@ -650,7 +650,7 @@ msgstr "将地址簿内容复制到本地以进行脱机操作"
 
 #: ../addressbook/gui/component/addressbook-config.c:983
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
@@ -751,30 +751,54 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
-#: ../addressbook/gui/component/addressbook-view.c:769
+#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "将“%s”文件夹重命名为："
+
+#: ../addressbook/gui/component/addressbook-view.c:447
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "重命名文件夹"
+
+#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "文件夹名不能含有字符“/”"
+
+#: ../addressbook/gui/component/addressbook-view.c:455
+msgid "A Folder with this name already exists"
+msgstr "已经存在此名称的文件夹"
+
+#: ../addressbook/gui/component/addressbook-view.c:963
 msgid "_New Address Book"
 msgstr "新建地址簿(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:770
+#: ../addressbook/gui/component/addressbook-view.c:964
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../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
 #: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:34
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
 #: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
 #: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "删除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:772
+#: ../addressbook/gui/component/addressbook-view.c:966
+msgid "Save As Vcard..."
+msgstr "另存为 Vcard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:968
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "属性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1197
+#: ../addressbook/gui/component/addressbook-view.c:1355
 msgid "Contact Source Selector"
 msgstr "联系人源选择器"
 
@@ -782,12 +806,12 @@ msgstr "联系人源选择器"
 msgid "Accessing LDAP Server anonymously"
 msgstr "匿名访问 LDAP 服务器"
 
-#: ../addressbook/gui/component/addressbook.c:191
+#: ../addressbook/gui/component/addressbook.c:197
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "认证失败。\n"
 
-#: ../addressbook/gui/component/addressbook.c:198
+#: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -1199,9 +1223,9 @@ msgid "Contact"
 msgstr "联系人"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:527
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2380
+#: ../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
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
@@ -2386,7 +2410,7 @@ msgstr "服务"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:461
+#: ../plugins/publish-calendar/publish-calendar.c:478
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "位置"
@@ -2444,21 +2468,21 @@ msgstr "必需域"
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:537
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2375
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:563
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2401
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "联系人编辑器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2713
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2739
 msgid "Please select an image for this contact"
 msgstr "请选择此联系人的图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "No image"
 msgstr "无图像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2466,47 +2490,51 @@ msgstr ""
 "联系人数据无效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3045
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
 msgid "Invalid contact."
 msgstr "无效的联系人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "编辑全名(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "全名(_F)："
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "全名(_F)"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "电子邮件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "电子邮件(_M)："
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "选择地址簿(_S)"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact list (%s) ?"
 msgstr "您确定要删除联系人列表(%s)吗？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
 msgstr "您确定要删除这些联系人列表吗？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
 "Are you sure you want\n"
 "to delete contact (%s) ?"
 msgstr "您确定要删除联系人(%s)吗？"
 
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2802,8 +2830,8 @@ msgid "Address Book"
 msgstr "地址簿"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "另存为 VCard..."
 
@@ -2811,7 +2839,7 @@ msgstr "另存为 VCard..."
 #: ../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
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -2824,7 +2852,6 @@ msgid "New Contact _List..."
 msgstr "新建联系人列表(_L)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "另存为 VCard(_S)..."
 
@@ -2858,7 +2885,7 @@ msgstr "复制到地址簿(_Y)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "Mo_ve to Address Book..."
-msgstr "移动到地址簿(_V)..."
+msgstr "移至地址簿(_V)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:963
 #: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
@@ -2872,7 +2899,7 @@ msgstr "剪切(_T)"
 #: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
 #: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3102
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:32
+#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:104
 #: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
@@ -2941,12 +2968,10 @@ msgid "Email"
 msgstr "电子邮件"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 msgid "Email 2"
 msgstr "电子邮件 2"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "电子邮件 3"
 
@@ -3300,7 +3325,7 @@ msgstr "不支持的协议"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2377
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3487,13 +3512,17 @@ msgstr[0] "联系人"
 msgid "card.vcf"
 msgstr "card.vcf"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "选择地址簿"
+
 #: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "列表"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:756
 msgid "Move contact to"
-msgstr "将联系人移动到"
+msgstr "将联系人移至"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:758
 msgid "Copy contact to"
@@ -3501,16 +3530,12 @@ msgstr "将联系人复制到"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:761
 msgid "Move contacts to"
-msgstr "将联系人移动到"
+msgstr "将联系人移至"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:763
 msgid "Copy contacts to"
 msgstr "将联系人复制到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
-msgid "Select target addressbook."
-msgstr "从地址簿中选择目标联系人。"
-
 #: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
 msgstr "多个 VCard"
@@ -3530,41 +3555,10 @@ msgstr "联系人信息"
 msgid "Contact information for %s"
 msgstr "%s 的联系人信息"
 
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(无)"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "主电子邮件"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "选择一项活动"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "创建新联系人“%s”"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "为现有的联系人“%s”添加地址"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "正在查询地址簿..."
 
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "合并电子邮件地址"
-
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
@@ -3592,33 +3586,33 @@ msgstr "名片视图"
 msgid "GTK Tree View"
 msgstr "GTK 树视图"
 
-#: ../addressbook/importers/evolution-csv-importer.c:521
+#: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "正在导入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:723
+#: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:724
+#: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:732
+#: ../addressbook/importers/evolution-csv-importer.c:835
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:733
+#: ../addressbook/importers/evolution-csv-importer.c:836
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 和 Tab 导入器"
 
-#: ../addressbook/importers/evolution-csv-importer.c:741
+#: ../addressbook/importers/evolution-csv-importer.c:844
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:742
+#: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 和 Tab 导入器"
 
@@ -3808,7 +3802,7 @@ msgstr "阴影"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:965
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:199
 msgid "Size:"
@@ -4367,7 +4361,7 @@ msgid "Memos"
 msgstr "备忘"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1832
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1833
 #: ../calendar/gui/tasks-component.c:521
 #: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
 #: ../calendar/importers/icalendar-importer.c:80
@@ -4415,15 +4409,6 @@ msgstr[0] "小时"
 msgid "Start time"
 msgstr "开始时间"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:374
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s %s"
-
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
@@ -4431,8 +4416,8 @@ msgstr "约会"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1503
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../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
 msgid "Location:"
@@ -4443,18 +4428,17 @@ msgid "Snooze _time:"
 msgstr "午睡时间(_T)："
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
 #: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#: ../ui/evolution-addressbook.xml.h:35 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -4466,48 +4450,32 @@ msgstr "午睡(_S)"
 msgid "location of appointment"
 msgstr "约会位置"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1129
-msgid "<b>Calendars</b>"
-msgstr "<b>日历</b>"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
-msgid "Preferences"
-msgstr "首选项"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1208
-msgid "_Configure Alarms"
-msgstr "配置提醒(_C)"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1210 ../ui/evolution.xml.h:45
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1358
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
 msgid "No summary available."
 msgstr "没有可用的概览。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1369
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1120
 msgid "No description available."
 msgstr "没有描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1377
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "No location information available."
 msgstr "没有可用的位置信息。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1416
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 个提醒"
 
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4519,7 +4487,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4535,7 +4503,7 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1624
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
 msgid "Do not ask me about this program again."
 msgstr "不要再次询问此问题。"
 
@@ -4563,7 +4531,7 @@ msgid "(%d %s %d %s)"
 msgstr "(%d %s %d %s)"
 
 #: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:991 ../calendar/gui/misc.c:111
+#: ../calendar/gui/dialogs/recurrence-page.c:992 ../calendar/gui/misc.c:111
 msgid "second"
 msgstr "第二"
 
@@ -4990,8 +4958,8 @@ msgstr "位置含有"
 msgid "Unmatched"
 msgstr "无匹配"
 
-#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2513
-#: ../ui/evolution-addressbook.xml.h:17 ../ui/evolution-calendar.xml.h:18
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2514
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:18
 #: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
@@ -5265,8 +5233,9 @@ msgid "A_dd"
 msgstr "添加(_D)"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:2
 msgid "Alarms"
 msgstr "提醒"
 
@@ -5311,6 +5280,10 @@ msgstr "文件名："
 msgid "MIME type:"
 msgstr "MIME 类型："
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+msgid "Selected Calendars for Alarms"
+msgstr "已选择用于提醒的日历"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
 "60 minutes\n"
@@ -5325,41 +5298,37 @@ msgstr ""
 "10 分钟\n"
 "5 分钟"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "<b>Publishing</b>"
-msgstr "<b>发布</b>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u 和 %d 将被替换为电子邮件地址中的用户和域名。</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">默认忙/闲服务器</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
 #: ../plugins/itip-formatter/itip-formatter.c:1977
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">常规</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">任务列表</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">时间</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">工作周</span>"
 
@@ -5372,24 +5341,18 @@ msgid "Display"
 msgstr "显示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "启用(_N)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:566
-#: ../ui/evolution-event-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "忙/闲"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5399,13 +5362,13 @@ msgstr ""
 "小时\n"
 "天"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -5423,20 +5386,26 @@ msgstr ""
 "周六\n"
 "周日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Publishing Table"
-msgstr "发布表"
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "选取一种颜色"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "周日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1052
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "星期六"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr "选择用于提醒的日历"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "显示一条提醒(_O)"
@@ -5446,7 +5415,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "星期日"
@@ -5464,7 +5433,7 @@ msgid "Template:"
 msgstr "模板："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "星期四"
@@ -5479,7 +5448,7 @@ msgid "Time format:"
 msgstr "时间格式："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "星期二"
@@ -5489,7 +5458,7 @@ msgid "W_eek starts:"
 msgstr "一周开始(_E)："
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
@@ -5507,58 +5476,54 @@ msgid "_24 hour"
 msgstr "_24 小时"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "_Add URL"
-msgstr "添加 URL(_A)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "删除项时要求确认(_A)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Compress weekends in month view"
 msgstr "不在月视图中显示周末(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Day begins:"
 msgstr "一天开始(_D)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Fri"
 msgstr "周五(_F)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Hide completed tasks after"
 msgstr "随后隐藏已完成的任务(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Mon"
 msgstr "周一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Overdue tasks:"
 msgstr "延期任务(_O)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Sat"
 msgstr "周六(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Show appointment end times in week and month view"
 msgstr "在周视图和月视图中显示约会结束时间(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Time divisions:"
 msgstr "时间分割(_T)："
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Tue"
 msgstr "周二(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Wed"
 msgstr "周三(_W)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "before every appointment"
 msgstr "在每次约会前"
 
@@ -5612,11 +5577,6 @@ msgstr "添加日历"
 msgid "Add Task List"
 msgstr "添加任务列表"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "添加日历(_A)"
@@ -5692,23 +5652,23 @@ msgstr "%s  您还没有进行修改，更新编辑器吗？"
 msgid "Validation error: %s"
 msgstr "校验错误：%s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2271
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2272
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2275
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2276
 msgid " (Completed "
 msgstr " (完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2277
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2278
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2282
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2283
 msgid " (Due "
 msgstr " (预定 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2285
 msgid "Due "
 msgstr "预定 "
 
@@ -5758,7 +5718,7 @@ msgstr "显示附件栏(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1094
 #: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/meeting-page.c:914
 #: ../calendar/gui/dialogs/task-page.c:1206
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3601
@@ -5771,7 +5731,7 @@ msgstr "删除(_R)"
 #: ../calendar/gui/dialogs/comp-editor.c:1095
 #: ../composer/e-msg-composer-attachment-bar.c:471
 #: ../composer/e-msg-composer.c:3602 ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "属性(_P)"
 
@@ -5920,7 +5880,7 @@ msgid "Appoint_ment"
 msgstr "约会(_M)"
 
 #: ../calendar/gui/dialogs/event-editor.c:545
-#: ../ui/evolution-event-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "再现("
 
@@ -5963,25 +5923,25 @@ msgid "End time is wrong"
 msgstr "结束时间有错"
 
 #: ../calendar/gui/dialogs/event-page.c:1449
-#: ../calendar/gui/dialogs/meeting-page.c:464
+#: ../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/meeting-page.c:470
+#: ../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/meeting-page.c:485
+#: ../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/meeting-page.c:910
+#: ../calendar/gui/dialogs/meeting-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1207
 msgid "_Add "
 msgstr "添加(_A)"
@@ -6079,25 +6039,25 @@ msgstr "只"
 msgid "until"
 msgstr "直到"
 
-#: ../calendar/gui/dialogs/meeting-page.c:306
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>代理人(_G)</b>"
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "代理人(_G)"
 
-#: ../calendar/gui/dialogs/meeting-page.c:310
-msgid "<b>From:</b>"
-msgstr "<b>来自：</b>"
+#: ../calendar/gui/dialogs/meeting-page.c:313
+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:316
+#: ../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:881 ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:465
+#: ../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
@@ -6180,7 +6140,7 @@ msgstr "组织者"
 msgid "Organizer:"
 msgstr "组织者："
 
-#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2312
+#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2313
 msgid "Memo"
 msgstr "备忘"
 
@@ -6293,51 +6253,51 @@ msgstr "本次和以后各次"
 msgid "All Instances"
 msgstr "所有各次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:499
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "此约会含有 Evolution 无法编辑的再现。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:820
 msgid "Recurrence date is invalid"
 msgstr "再现日期无效"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:931
 msgid "on"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "first"
 msgstr "第一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "third"
 msgstr "第三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "fourth"
 msgstr "第四"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:995
 msgid "last"
 msgstr "最后"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "Other Date"
 msgstr "其它日期"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "day"
 msgstr "天"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1182
+#: ../calendar/gui/dialogs/recurrence-page.c:1183
 msgid "on the"
 msgstr "在"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1371
+#: ../calendar/gui/dialogs/recurrence-page.c:1372
 msgid "occurrences"
 msgstr "循环"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2343
 msgid "Date/Time"
 msgstr "日期/时间"
 
@@ -6403,7 +6363,7 @@ msgstr "<span weight=\"bold\">状态</span>"
 #: ../calendar/gui/e-cal-model-tasks.c:660
 #: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
 #: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../calendar/gui/print.c:2373 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/print.c:2374 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "已完成"
 
@@ -6418,7 +6378,7 @@ msgstr "高"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:658
 #: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2370
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2371
 msgid "In Progress"
 msgstr "进行中"
 
@@ -6439,7 +6399,7 @@ msgstr "中"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2367
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2368
 msgid "Not Started"
 msgstr "尚未开始"
 
@@ -6668,7 +6628,7 @@ msgstr "备忘："
 msgid "Web Page:"
 msgstr "网页："
 
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "无标题"
 
@@ -6780,7 +6740,7 @@ msgstr "已指派"
 msgid "Save As..."
 msgstr "另存为..."
 
-#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1865
+#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1866
 msgid "Select folder to save selected attachments..."
 msgstr "选择保存选中附件的文件夹..."
 
@@ -6882,7 +6842,7 @@ msgstr "打开网页(_W)"
 #: ../calendar/gui/e-calendar-view.c:1608 ../calendar/gui/e-memo-table.c:857
 #: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
@@ -6890,7 +6850,7 @@ msgstr "打印(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1183
 #: ../calendar/gui/e-calendar-view.c:1612 ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:1 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪切(_U)"
@@ -6898,7 +6858,7 @@ msgstr "剪切(_U)"
 #: ../calendar/gui/e-calendar-table.c:1185
 #: ../calendar/gui/e-calendar-view.c:1595
 #: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:39 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
@@ -7003,7 +6963,7 @@ msgstr "复制到日历(_Y)..."
 
 #: ../calendar/gui/e-calendar-view.c:1619
 msgid "Mo_ve to Calendar..."
-msgstr "移动到日历(_V)..."
+msgstr "移至日历(_V)..."
 
 #: ../calendar/gui/e-calendar-view.c:1620
 msgid "_Delegate Meeting..."
@@ -7040,19 +7000,25 @@ msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../calendar/gui/e-calendar-view.c:2045
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "组织者：%s <%s>"
 
+#. With SunOne accouts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-view.c:2049
+#, c-format
+msgid "Organizer: %s"
+msgstr "组织者：%s"
+
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2057 ../calendar/gui/print.c:2340
+#: ../calendar/gui/e-calendar-view.c:2064 ../calendar/gui/print.c:2341
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2088
+#: ../calendar/gui/e-calendar-view.c:2095
 #, c-format
 msgid "Time: %s %s"
 msgstr "时间：%s %s"
@@ -7078,7 +7044,11 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:557
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i 分钟分割"
@@ -7090,19 +7060,19 @@ msgstr "%02i 分钟分割"
 #. order but don't change the specifiers or add
 #. anything.
 #: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1527
+#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1528
 msgid "%A %d %B"
 msgstr "%B%d日%A"
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:842
+#: ../calendar/gui/print.c:843
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:844
+#: ../calendar/gui/print.c:845
 msgid "pm"
 msgstr "下午"
 
@@ -7775,7 +7745,7 @@ msgstr "时区按钮"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1511
+#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1512
 msgid "%d %B"
 msgstr "%-m月%-d日"
 
@@ -7924,14 +7894,14 @@ msgstr "iCalendar 信息"
 msgid "You must be an attendee of the event."
 msgstr "您必须是事件的出席者。"
 
-#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:3
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
 #: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "复制"
 
 #: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
@@ -8162,115 +8132,116 @@ msgstr "30日"
 msgid "31st"
 msgstr "31日"
 
-#: ../calendar/gui/print.c:574
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:575
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Sa"
 msgstr "六"
 
 #. Day
-#: ../calendar/gui/print.c:1927
+#: ../calendar/gui/print.c:1928
 msgid "Selected day (%a %b %d %Y)"
 msgstr "选中的日期(%Y年%m月%d日%A)"
 
-#: ../calendar/gui/print.c:1952 ../calendar/gui/print.c:1956
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1957
 msgid "%a %b %d"
 msgstr "%m月%d日%A"
 
-#: ../calendar/gui/print.c:1953
+#: ../calendar/gui/print.c:1954
 msgid "%a %d %Y"
 msgstr "%Y年%d日%A"
 
-#: ../calendar/gui/print.c:1957 ../calendar/gui/print.c:1959
-#: ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1958 ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1961
 msgid "%a %b %d %Y"
 msgstr "%Y年%m月%d日%A"
 
-#: ../calendar/gui/print.c:1964
+#: ../calendar/gui/print.c:1965
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "选中的周(%s - %s)"
 
 #. Month
-#: ../calendar/gui/print.c:1972
+#: ../calendar/gui/print.c:1973
 msgid "Selected month (%b %Y)"
 msgstr "选中的月(%Y年%m月)"
 
 #. Year
-#: ../calendar/gui/print.c:1979
+#: ../calendar/gui/print.c:1980
 msgid "Selected year (%Y)"
 msgstr "选中的年(%Y年)"
 
-#: ../calendar/gui/print.c:2308
+#: ../calendar/gui/print.c:2309
 msgid "Appointment"
 msgstr "约会"
 
-#: ../calendar/gui/print.c:2310
+#: ../calendar/gui/print.c:2311
 msgid "Task"
 msgstr "任务"
 
-#: ../calendar/gui/print.c:2332
+#: ../calendar/gui/print.c:2333
 #, c-format
 msgid "Summary: %s"
 msgstr "概要：%s"
 
-#: ../calendar/gui/print.c:2383
+#: ../calendar/gui/print.c:2384
 #, c-format
 msgid "Status: %s"
 msgstr "状态：%s"
 
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2401
 #, c-format
 msgid "Priority: %s"
 msgstr "优先级：%s"
 
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2413
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成率：%i"
 
-#: ../calendar/gui/print.c:2424
+#: ../calendar/gui/print.c:2425
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: ../calendar/gui/print.c:2438
+#: ../calendar/gui/print.c:2439
 #, c-format
 msgid "Categories: %s"
 msgstr "类别：%s"
 
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2450
 msgid "Contacts: "
 msgstr "联系人："
 
-#: ../calendar/gui/print.c:2589 ../calendar/gui/print.c:2677
-#: ../calendar/gui/print.c:2803 ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2590 ../calendar/gui/print.c:2678
+#: ../calendar/gui/print.c:2804 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "打印预览"
 
-#: ../calendar/gui/print.c:2624
+#: ../calendar/gui/print.c:2625
 msgid "Print Item"
 msgstr "打印项"
 
@@ -10503,48 +10474,52 @@ msgstr "稍候"
 msgid "Test"
 msgstr "测试"
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:799
 msgid "_Search name:"
 msgstr "搜索名称(_B)："
 
-#: ../filter/filter-rule.c:819
+#: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
 msgstr "查找符合下列条件的项目"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
 msgstr "如果满足所有条件"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If any criteria are met"
 msgstr "如果满足任一条件"
 
-#: ../filter/filter-rule.c:860
+#: ../filter/filter-rule.c:868
 msgid "Find items:"
 msgstr "查找项目："
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "All related"
 msgstr "相关的全部"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies"
 msgstr "回复"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies and parents"
 msgstr "回复及原始邮件"
 
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "无回复或原始邮件"
+
+#: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "包含线索"
 
-#: ../filter/filter-rule.c:978 ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:349
 msgid "Incoming"
 msgstr "接收"
 
-#: ../filter/filter-rule.c:978 ../mail/em-utils.c:350
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:350
 msgid "Outgoing"
 msgstr "寄出"
 
@@ -10801,26 +10776,26 @@ msgid "Enable"
 msgstr "启用"
 
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:456
+#: ../mail/em-account-prefs.c:459
 msgid "[Default]"
 msgstr "[默认]"
 
 #. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:505 ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:213
-#: ../plugins/publish-calendar/publish-calendar.c:457
+#: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "已启用"
 
-#: ../mail/em-account-prefs.c:511
+#: ../mail/em-account-prefs.c:518
 msgid "Account name"
 msgstr "账户名"
 
-#: ../mail/em-account-prefs.c:513
+#: ../mail/em-account-prefs.c:520
 msgid "Protocol"
 msgstr "协议"
 
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:525
 msgid "Mail Accounts Table"
 msgstr "邮件账户表"
 
@@ -11029,7 +11004,7 @@ msgstr "不是垃圾邮件"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
-msgstr "移动到文件夹"
+msgstr "移至文件夹"
 
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
@@ -11208,7 +11183,7 @@ msgstr "复制文件夹 %s"
 #: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "把信件移动到文件夹 %s"
+msgstr "把信件移至文件夹 %s"
 
 #: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
 #, c-format
@@ -11225,14 +11200,14 @@ msgstr "复制到文件夹(_C)"
 
 #: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
-msgstr "移动到文件夹(_M)"
+msgstr "移至文件夹(_M)"
 
 #: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "在“%s”中扫描文件夹"
 
-#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:44
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:24
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
@@ -11280,19 +11255,6 @@ msgstr "选择文件夹"
 msgid "C_opy"
 msgstr "复制(_O)"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "将“%s”文件夹重命名为："
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "重命名文件夹"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "文件夹名不能含有字符“/”"
-
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:141
 #, c-format
@@ -11328,11 +11290,11 @@ msgstr "作为新信件进行编辑(_E)..."
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: ../mail/em-folder-view.c:1093 ../ui/evolution-addressbook.xml.h:37
+#: ../mail/em-folder-view.c:1093
 msgid "_Move to Folder..."
-msgstr "移动到文件夹(_M)..."
+msgstr "移至文件夹(_M)..."
 
-#: ../mail/em-folder-view.c:1094 ../ui/evolution-addressbook.xml.h:33
+#: ../mail/em-folder-view.c:1094
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
@@ -11445,66 +11407,66 @@ msgid "Click to mail %s"
 msgstr "单击以给 %s 发送邮件"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:492
+#: ../mail/em-format-html-display.c:493
 #, c-format
 msgid "Matches: %d"
 msgstr "匹配：%d"
 
-#: ../mail/em-format-html-display.c:752 ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "未签名"
 
-#: ../mail/em-format-html-display.c:752
+#: ../mail/em-format-html-display.c:753
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此信件未签名。无法保证这封信是可信的。"
 
-#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "有效签名"
 
-#: ../mail/em-format-html-display.c:753
+#: ../mail/em-format-html-display.c:754
 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:754 ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "无效签名"
 
-#: ../mail/em-format-html-display.c:754
+#: ../mail/em-format-html-display.c:755
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "无法校验这封信的签名，可能在传送的过程中邮件被篡改了。"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:756
 msgid "Valid signature, cannot verify sender"
 msgstr "签名有效，无法校验发送者"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:756
 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:761 ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:761
+#: ../mail/em-format-html-display.c:762
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "这封信未加密。在 Internet 上传送时所有人都可以看到其内容。"
 
-#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "弱加密"
 
-#: ../mail/em-format-html-display.c:762
+#: ../mail/em-format-html-display.c:763
 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 "
@@ -11513,21 +11475,21 @@ msgstr ""
 "这封信已加密，但使用的是弱加密算法。如果外人想要查看这封信的内容，可能要花一"
 "定时间进行暴力破解，这很困难但并不是不可能。"
 
-#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "加密"
 
-#: ../mail/em-format-html-display.c:763
+#: ../mail/em-format-html-display.c:764
 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:764 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "强加密"
 
-#: ../mail/em-format-html-display.c:764
+#: ../mail/em-format-html-display.c:765
 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 "
@@ -11536,73 +11498,77 @@ msgstr ""
 "这封信已加密，且使用的是强加密算法。如果外人想要查看这封信的内容，可能要花大"
 "量时间进行暴力破解，这十分困难。"
 
-#: ../mail/em-format-html-display.c:865 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:866 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "查看证书(_V)"
 
-#: ../mail/em-format-html-display.c:880
+#: ../mail/em-format-html-display.c:881
 msgid "This certificate is not viewable"
 msgstr "此证书不可查看"
 
-#: ../mail/em-format-html-display.c:1168
+#: ../mail/em-format-html-display.c:1169
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%m月%d日%A，%H:%M完成"
 
-#: ../mail/em-format-html-display.c:1176
+#: ../mail/em-format-html-display.c:1177
 msgid "Overdue:"
 msgstr "延期："
 
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1180
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "到 %m月%d日%A，%H:%M"
 
-#: ../mail/em-format-html-display.c:1239
+#: ../mail/em-format-html-display.c:1240
 msgid "_View Inline"
 msgstr "嵌入视图(_V)"
 
-#: ../mail/em-format-html-display.c:1240
+#: ../mail/em-format-html-display.c:1241
 msgid "_Hide"
 msgstr "隐藏(_H)"
 
-#: ../mail/em-format-html-display.c:1241
+#: ../mail/em-format-html-display.c:1242
 msgid "_Fit to Width"
 msgstr "适合宽度(_F)"
 
-#: ../mail/em-format-html-display.c:1242
+#: ../mail/em-format-html-display.c:1243
 msgid "Show _Original Size"
 msgstr "显示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1619
+#: ../mail/em-format-html-display.c:1620
 msgid "Attachment Button"
 msgstr "附件按钮"
 
-#: ../mail/em-format-html-display.c:1826
+#: ../mail/em-format-html-display.c:1827
 msgid "Select folder to save all attachments..."
 msgstr "选择保存全部附件的文件夹..."
 
-#: ../mail/em-format-html-display.c:1873
+#: ../mail/em-format-html-display.c:1874
 msgid "Save Selected..."
 msgstr "保存所选附件..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1940
+#: ../mail/em-format-html-display.c:1941
 #, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%d 个附件"
+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
+msgid "S_ave"
+msgstr "保存(_A)"
 
-#: ../mail/em-format-html-display.c:2003
+#: ../mail/em-format-html-display.c:1959
+msgid "S_ave All"
+msgstr "全部保存(_A)"
+
+#: ../mail/em-format-html-display.c:2018
 msgid "Toggle Attachment Bar"
 msgstr "切换附件栏"
 
-#: ../mail/em-format-html-display.c:2005
+#: ../mail/em-format-html-display.c:2020
 msgid "No Attachment"
 msgstr "无附件"
 
-#: ../mail/em-format-html-display.c:2008
-msgid "Save All"
-msgstr "全部保存"
-
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
@@ -12836,6 +12802,11 @@ msgstr "完成"
 msgid "Drafts _Folder:"
 msgstr "草稿文件夹(_F)："
 
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "启用(_N)"
+
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
 msgstr "电子邮件"
@@ -13344,7 +13315,7 @@ msgstr "把信件保存到文件夹中"
 #: ../mail/mail-ops.c:946
 #, c-format
 msgid "Moving messages to %s"
-msgstr "把信件移动到 %s"
+msgstr "把信件移至 %s"
 
 #: ../mail/mail-ops.c:946
 #, c-format
@@ -13548,7 +13519,7 @@ msgstr "无法创建脱机目录“%s”：%s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "试图将邮件移动到非 mbox 源“%s”"
+msgstr "试图将邮件移至非 mbox 源“%s”"
 
 #: ../mail/mail-tools.c:256
 #, c-format
@@ -14038,7 +14009,7 @@ msgstr "无法发送此信件，因为您所选择用来发送的账户未启用
 
 #: ../mail/mail.error.xml.h:109
 msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+"This message cannot be sent because you have not specified any recipients"
 msgstr "无法发送此信件，因为您没有指定任何收件人"
 
 #: ../mail/mail.error.xml.h:110
@@ -14358,34 +14329,33 @@ msgstr "备份及恢复 Evolution 的数据和设置"
 msgid "Restore Settings..."
 msgstr "恢复设置..."
 
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:429
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自动联系人"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:438
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">自动联系人</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
+#: ../plugins/bbdb/bbdb.c:451
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "回复邮件时自动在地址簿中创建联系人项(_A)"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:472
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">即时通讯联系人</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
+#: ../plugins/bbdb/bbdb.c:485
 msgid ""
-"Periodically synchronize contact information and images from my _instant "
-"messenger"
-msgstr "定时从我的即时通讯服务器上同步联系人信息和图像(_I)"
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr "定时从 Gaim 好友列表中同步联系人信息和图像"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:502
 msgid "Synchronize with _buddy list now"
 msgstr "立即同步好友列表(_B)"
 
@@ -14639,11 +14609,11 @@ msgstr "_OWA URL："
 msgid "A_uthenticate"
 msgstr "身份验证(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:833
+#: ../plugins/exchange-operations/exchange-account-setup.c:838
 msgid "Authentication Type"
 msgstr "身份验证类型"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:847
+#: ../plugins/exchange-operations/exchange-account-setup.c:852
 msgid "Ch_eck for Supported Types"
 msgstr "检查支持的类型(_E)"
 
@@ -15302,7 +15272,7 @@ msgid "Add Send Options to groupwise messages"
 msgstr "将发送选项添加到 GroupWise 信件"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
-#: ../ui/evolution-event-editor.xml.h:14 ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "发送选项"
@@ -15469,27 +15439,27 @@ msgstr "设置 Hula 日历源的插件。"
 msgid "Hula Account Setup"
 msgstr "Hula 账户设置"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:81
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
 msgstr "导入到日历(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:86
+#: ../plugins/import-ics-attachments/icsimporter.c:88
 msgid "_Import to Tasks"
 msgstr "导入到任务(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:196
+#: ../plugins/import-ics-attachments/icsimporter.c:197
 msgid "Import ICS"
 msgstr "导入 ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:224
+#: ../plugins/import-ics-attachments/icsimporter.c:225
 msgid "Select Task List"
 msgstr "选择任务列表"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:229
 msgid "Select Calendar"
 msgstr "选择日历"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../plugins/import-ics-attachments/icsimporter.c:260
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "导入(_I)"
@@ -16425,7 +16395,7 @@ msgid "Gives an option to print mail from composer"
 msgstr "在撰写器中添加打印邮件的选项"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:19
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
@@ -16459,7 +16429,7 @@ msgstr "位置"
 msgid "_Publish Calendar Information"
 msgstr "发布日历信息(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:372
+#: ../plugins/publish-calendar/publish-calendar.c:386
 msgid "Are you sure you want to remove this URL?"
 msgstr "您确定您想要删除此 URL 吗？"
 
@@ -16949,8 +16919,8 @@ msgid "Import a _single file"
 msgstr "导入单个文件(_S)"
 
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Evolution 设置"
+msgid "Evolution Preferences"
+msgstr "Evolution 首选项"
 
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
@@ -17809,120 +17779,210 @@ msgstr "无法执行“%s”：%s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "关闭 %s (%s)\n"
 
-#: ../ui/evolution-addressbook.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:1
+msgid "Address _Book Properties"
+msgstr "地址簿属性(_B)"
+
+#: ../ui/evolution-addressbook.xml.h:3
+msgid "Change the properties of the selected folder"
+msgstr "更改选中文件夹的属性"
+
+#: ../ui/evolution-addressbook.xml.h:4
+msgid "Co_py All Contacts To..."
+msgstr "将全部联系人复制到(_P)..."
+
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "联系人预览(_P)"
 
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "把选中的联系人复制到其它文件夹..."
 
-#: ../ui/evolution-addressbook.xml.h:5 ../ui/evolution-calendar.xml.h:2
+#: ../ui/evolution-addressbook.xml.h:8
+msgid "Copy the contacts of the selected folder into another folder"
+msgstr "把选中文件夹中的联系人复制到其它文件夹"
+
+#: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "复制选中内容"
 
-#: ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "复制到文件夹..."
 
-#: ../ui/evolution-addressbook.xml.h:7
+#: ../ui/evolution-addressbook.xml.h:11
+msgid "Create a new addressbook folder"
+msgstr "创建新的地址簿文件夹"
+
+#: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪切"
 
-#: ../ui/evolution-addressbook.xml.h:8 ../ui/evolution-calendar.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪切选中内容"
 
-#: ../ui/evolution-addressbook.xml.h:10
+#: ../ui/evolution-addressbook.xml.h:14
+msgid "Del_ete Address Book"
+msgstr "删除地址簿(_E)"
+
+#: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "删除选中的联系人"
 
-#: ../ui/evolution-addressbook.xml.h:11
+#: ../ui/evolution-addressbook.xml.h:17
+msgid "Delete the selected folder"
+msgstr "删除选中的文件夹"
+
+#: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "转发联系人"
 
-#: ../ui/evolution-addressbook.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:19
+msgid "Mo_ve All Contacts To..."
+msgstr "将全部联系人移至(_V)..."
+
+#: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
-msgstr "把选中的联系人移动到其它文件夹..."
+msgstr "把选中的联系人移至其它文件夹..."
+
+#: ../ui/evolution-addressbook.xml.h:21
+msgid "Move the contacts of the selected folder into another folder"
+msgstr "把选中文件夹中的联系人移至其它文件夹"
 
-#: ../ui/evolution-addressbook.xml.h:13
+#: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
-msgstr "移动到文件夹..."
+msgstr "移至文件夹..."
 
-#: ../ui/evolution-addressbook.xml.h:14
+#: ../ui/evolution-addressbook.xml.h:23
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "粘贴"
 
-#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:15
 msgid "Paste the clipboard"
 msgstr "粘贴剪贴板"
 
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "预览将要打印的联系人"
 
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "打印选中的联系人"
 
-#: ../ui/evolution-addressbook.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:29
+msgid "Rename the selected folder"
+msgstr "重命名选中文件夹"
+
+#: ../ui/evolution-addressbook.xml.h:30
+msgid "S_ave Address Book As VCard"
+msgstr "将地址簿另存为 VCard(_A)"
+
+#: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "把选中的联系人保存为 VCard。"
 
-#: ../ui/evolution-addressbook.xml.h:22 ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:33
+msgid "Save the contacts of the selected folder as VCard"
+msgstr "把选中文件夹中的的联系人保存为 VCard"
+
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
 msgid "Select All"
 msgstr "全选"
 
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "全选(_A)"
+
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "选中全部联系人"
 
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr "给选中的联系人发信件。"
 
-#: ../ui/evolution-addressbook.xml.h:25
+#: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "给联系人发信件"
 
-#: ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "把选中的联系人发送给其他人。"
 
-#: ../ui/evolution-addressbook.xml.h:27
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "显示联系人预览窗口"
 
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../ui/evolution-addressbook.xml.h:41
+msgid "St_op"
+msgstr "停止(_O)"
+
+#: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "停止"
 
-#: ../ui/evolution-addressbook.xml.h:29
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "停止载入"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "查看当前联系人"
 
-#: ../ui/evolution-addressbook.xml.h:31 ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:36
 #: ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "操作(_A)"
 
-#: ../ui/evolution-addressbook.xml.h:36
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "将联系人复制到(_C)..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "将文件夹联系人复制到(_C)"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "删除联系人(_D)"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "转发联系人(_F)..."
 
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "全选(_S)"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "将联系人移至(_M)..."
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "将文件夹联系人移至(_M)"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:43
+msgid "_New"
+msgstr "新建(_N)"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "重命名(_R)"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "联系人另存为 VCard(_S)..."
+
+#: ../ui/evolution-addressbook.xml.h:62
+msgid "_Save Folder Contacts As VCard"
+msgstr "文件夹联系人另存为 VCard(_S)"
+
+#: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
 msgstr "给联系人发信件(_S)..."
 
@@ -18062,11 +18122,6 @@ msgstr "从剪贴板粘贴"
 msgid "Paste text from the clipboard"
 msgstr "从剪贴板中粘贴文字"
 
-#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "全选(_A)"
-
 #: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 msgid "Select all text"
 msgstr "选中所有文字"
@@ -18114,7 +18169,7 @@ msgstr "关闭(_C)"
 #: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
 #: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:39
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "文件(_F)"
 
@@ -18130,90 +18185,90 @@ msgstr "插入(_I)"
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:1
+msgid "Alar_ms"
+msgstr "提醒(_M)"
+
+#: ../ui/evolution-event-editor.xml.h:3
 msgid "All day Event"
 msgstr "全天事件"
 
-#: ../ui/evolution-event-editor.xml.h:3 ../ui/evolution-task-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
 msgstr "分类为机密"
 
-#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
 msgstr "分类为私人"
 
-#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
 msgstr "分类为公开"
 
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
 msgstr "单击此处以设定或取消此事件的提醒"
 
-#: ../ui/evolution-event-editor.xml.h:8 ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "插入高级发送选项"
 
-#: ../ui/evolution-event-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
 msgstr "将此事件标为重复发生"
 
-#: ../ui/evolution-event-editor.xml.h:10 ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "公开(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:12
 msgid "Query free / busy information for the attendees"
 msgstr "查询出席者的忙闲信息"
 
-#: ../ui/evolution-event-editor.xml.h:12 ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "角色域(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as b_usy"
 msgstr "将时间设定为忙(_U)"
 
-#: ../ui/evolution-event-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "时区(_Z)"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切换是否显示出席者类型域"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切换是否显示请回复域"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切换是否显示角色域"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切换是否显示状态域"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切换是否显示时区"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切换是否显示类别"
 
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All day Event"
 msgstr "切换是否有全天事件"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to show time as busy"
 msgstr "切换是否将时间显示为忙"
 
-#: ../ui/evolution-event-editor.xml.h:25
-msgid "_Alarms"
-msgstr "提醒(_A)"
-
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_All day Event"
 msgstr "全天事件(_A)"
@@ -18226,19 +18281,27 @@ msgstr "分类(_C)"
 msgid "_Confidential"
 msgstr "机密(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:30
+msgid "_Free/Busy"
+msgstr "忙/闲(_F)"
+
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "请回复(_R)"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "再现(_R)"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "状态域(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "类型域(_T)"
 
@@ -18277,7 +18340,7 @@ msgstr "信件预览(_P)"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
-msgstr "把选中的文件夹移动到其它文件夹"
+msgstr "把选中的文件夹移至其它文件夹"
 
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:12
@@ -18641,7 +18704,7 @@ msgstr "为选中信件做删除标记"
 
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected message(s) to another folder"
-msgstr "把选中的信件移动到其它文件夹"
+msgstr "把选中的信件移至其它文件夹"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
@@ -18871,7 +18934,7 @@ msgstr "放大(_Z)"
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:16
 msgid "Main toolbar"
 msgstr "主工具栏"
 
@@ -19152,18 +19215,18 @@ msgid "Click change / view the status details of the task"
 msgstr "单击可更改/查看任务的状态细节"
 
 #: ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "显示时区(_Z)"
-
-#: ../ui/evolution-task-editor.xml.h:10
 msgid "Status Details"
 msgstr "状态细节"
 
-#: ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
 msgstr "时区"
 
 #: ../ui/evolution-task-editor.xml.h:23
+msgid "_Send Options"
+msgstr "发送选项(_S)"
+
+#: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
 msgstr "状态细节(_S)"
 
@@ -19256,58 +19319,54 @@ msgid "Exit the program"
 msgstr "退出程序"
 
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "丢弃密码(_P)"
-
-#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "保存的密码被丢弃，所以将再次提示您输入密码"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:12
 msgid "Hide window buttons"
 msgstr "隐藏窗口按钮"
 
-#: ../ui/evolution.xml.h:14
+#: ../ui/evolution.xml.h:13
 msgid "I_mport..."
 msgstr "导入(_M)..."
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:14
 msgid "Icons _and text"
 msgstr "图标和文字(_A)"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:15
 msgid "Import data from other programs"
 msgstr "从其它程序导入数据"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:17
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:18
 msgid "Prefere_nces"
 msgstr "首选项(_N)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:19
 msgid "Send / Receive"
 msgstr "发送/接收"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:20
 msgid "Send / _Receive"
 msgstr "发送/接收(_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:21
 msgid "Send queued items and retrieve new items"
 msgstr "发送队列中的的邮件并收取新邮件"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:22
 msgid "Set up Pilot configuration"
 msgstr "配置 Pilot"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:23
 msgid "Show information about Evolution"
 msgstr "显示关于 Evolution 的信息"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:24
 msgid "Submit Bug Report"
 msgstr "提交错误报告"
 
@@ -19315,38 +19374,42 @@ msgstr "提交错误报告"
 #. _label="Evolution _FAQ"/>
 #.
 #. <separator/>
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:29
 msgid "Submit _Bug Report"
 msgstr "提交错误报告(_B)"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:30
 msgid "Submit a bug report using Bug Buddy"
 msgstr "用 Bug Buddy 提交错误报告"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:31
 msgid "Toggle whether we are working offline."
 msgstr "切换是否脱机工作。"
 
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar"
 msgstr "工具栏(_B)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:33
 msgid "Tool_bar style"
 msgstr "工具栏样式(_B)"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:34
 msgid "View/Hide the Status Bar"
 msgstr "查看/隐藏状态栏"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:35
 msgid "_About"
 msgstr "关于(_A)"
 
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:36
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
+#: ../ui/evolution.xml.h:39
+msgid "_Forget Passwords"
+msgstr "丢弃密码(_F)"
+
 #: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
 msgstr "隐藏按钮(_H)"
@@ -19355,14 +19418,14 @@ msgstr "隐藏按钮(_H)"
 msgid "_Icons only"
 msgstr "只有图标(_I)"
 
-#: ../ui/evolution.xml.h:43
-msgid "_New"
-msgstr "新建(_N)"
-
 #: ../ui/evolution.xml.h:44
 msgid "_Quick Reference"
 msgstr "快速首选项(_Q)"
 
+#: ../ui/evolution.xml.h:45
+msgid "_Quit"
+msgstr "退出(_Q)"
+
 #: ../ui/evolution.xml.h:46
 msgid "_Switcher Appearance"
 msgstr "切换器外观(_S)"