Updated Traditional Chinese translation(Taiwan). Updated Traditional

2006-02-06  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>

	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).

svn path=/trunk/; revision=31414

3 files changed, 1779 insertions, 1746 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4c172317dd..77ead699cb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-06  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+
 2006-02-06  Francisco Javier F. Serrador  <serrador@cvs.gnome.org>
 
 	* es.po: Updated Spanish translation.
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9dd4c316cd..4410878dfc 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-27 06:53+0800\n"
-"PO-Revision-Date: 2006-01-26 22:14+0800\n"
+"POT-Creation-Date: 2006-02-06 07:02+0800\n"
+"PO-Revision-Date: 2006-02-06 07:41+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -100,29 +100,29 @@ msgstr "得到焦點"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "新增約會"
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-calendar.xml.h:12
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "移至今日"
 
 # ui/evolution-calendar.xml.h:11
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "移至日期"
 
@@ -321,7 +321,7 @@ msgstr "表格的儲存格"
 # calendar/gui/e-calendar-table.c:163
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
 msgstr "請按這裏加入"
 
@@ -600,9 +600,9 @@ msgstr "在此設定自動完成"
 # ui/evolution-addressbook.xml.h:17
 #. 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:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:629
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "聯絡人"
 
@@ -647,7 +647,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
@@ -663,21 +663,21 @@ 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
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
 #. 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 伺服器"
 
@@ -701,7 +701,7 @@ msgstr "建立新的聯絡人清單"
 
 # importers/pine-importer.c:661
 #: ../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 "新通訊錄"
 
@@ -714,7 +714,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 "升級通訊錄設定或資料夾失敗。"
 
@@ -729,40 +729,40 @@ 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
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../mail/importers/pine-importer.c:392
 msgid "Addressbook"
 msgstr "目錄服務"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "伺服器資訊"
 
 # mail/mail-config.glade.h:10
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "驗證"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../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"
@@ -770,17 +770,17 @@ msgstr "詳細資料"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "搜尋中"
 
 # mail/mail-ops.c:898
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "下載中"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: ../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 "通訊錄內容"
@@ -799,16 +799,16 @@ msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
 # addressbook/gui/component/addressbook-config.c:148
-#: ../addressbook/gui/component/addressbook-migrate.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-#: ../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"
@@ -819,7 +819,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"
@@ -829,7 +829,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"
@@ -839,7 +839,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"
@@ -849,34 +849,34 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的 Pilot Sync 資料時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../addressbook/gui/component/addressbook-view.c:434
 #: ../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:437
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
 
-#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../addressbook/gui/component/addressbook-view.c:442
 #: ../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:445
 msgid "A Folder with this name already exists"
 msgstr "以此為名的資料夾已存在"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-view.c:963
+#: ../addressbook/gui/component/addressbook-view.c:953
 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:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../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
@@ -891,7 +891,7 @@ msgstr "刪除(_D)"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: ../addressbook/gui/component/addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "儲存為 VCard..."
 
@@ -899,13 +899,13 @@ msgstr "儲存為 VCard..."
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: ../addressbook/gui/component/addressbook-view.c:968
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../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:1345
 msgid "Contact Source Selector"
 msgstr "聯絡人來源選擇器"
 
@@ -1143,12 +1143,12 @@ msgstr "支援的搜尋起點"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
-"搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在網"
-"路目錄樹的根部開始。"
+"搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目"
+"錄樹的底層開始。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
@@ -1362,9 +1362,9 @@ msgstr "聯絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../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:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "聯絡人編輯器"
 
@@ -1440,12 +1440,13 @@ msgstr "生日(_B):"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: ../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)"
 
@@ -1566,9 +1567,9 @@ msgstr "地址"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
-#: ../widgets/text/e-text.c:3613
+#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2548,9 +2549,9 @@ 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/plugin-manager/plugin-manager.c:42
 #: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
@@ -2655,22 +2656,22 @@ msgid "Changed"
 msgstr "已更改"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, 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:2757
 msgid "Please select an image for this contact"
 msgstr "請選取此聯絡人的圖像"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
 msgid "No image"
 msgstr "沒有圖像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2680,7 +2681,7 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
 msgid "Invalid contact."
 msgstr "無效的聯絡人。"
 
@@ -2916,7 +2917,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:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
@@ -2977,12 +2978,31 @@ msgstr ""
 "此聯絡人的名稱或電郵地址已經存在\n"
 "於此資料夾。你無論如何都要新增它嗎？"
 
-# widgets/misc/e-filter-bar.c:239
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:162
-msgid "Advanced Search"
-msgstr "進階搜尋"
+# addressbook/gui/component/addressbook.c:618
+# calendar/gui/gnome-cal.c:233
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "任何欄位包含"
+
+# calendar/gui/e-calendar-table.c:150
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "分類為"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "電郵開始於"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "名稱開始於"
 
 # ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
@@ -2999,7 +3019,7 @@ msgstr[1] "%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:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -3012,12 +3032,12 @@ msgstr "取得書本檢視時發生錯誤"
 
 # addressbook/contact-editor/e-contact-editor.c:1253
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "模型"
 
@@ -3026,47 +3046,13 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯咭片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Name begins with"
-msgstr "名稱開始於"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-msgid "Email begins with"
-msgstr "電郵開始於"
-
-# calendar/gui/e-calendar-table.c:150
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "分類為"
-
-# addressbook/gui/component/addressbook.c:618
-# calendar/gui/gnome-cal.c:233
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Any field contains"
-msgstr "任何欄位包含"
-
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
-#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-msgid "Advanced..."
-msgstr "進階..."
-
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
-msgid "_Advanced..."
-msgstr "進階(_A)..."
-
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "來源"
 
 # mail/mail-config.glade.h:78
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:479
@@ -3075,7 +3061,7 @@ msgstr "來源"
 msgid "Type"
 msgstr "類型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 msgid "Address Book"
 msgstr "通訊錄"
 
@@ -3083,13 +3069,13 @@ msgstr "通訊錄"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
 #: ../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:957
 #: ../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
@@ -3098,44 +3084,44 @@ msgid "_Open"
 msgstr "開啟(_O)"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "新增聯絡人(_N)..."
 
 # ui/evolution-addressbook.xml.h:17
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "新增聯絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "儲存成 VCard(_S)..."
 
 # ui/evolution-mail.xml.h:35
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "轉寄聯絡人(_F)"
 
 # ui/evolution-mail.xml.h:35
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "轉寄聯絡人(_F)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "傳送電郵給聯絡人(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "傳送電郵給清單(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "傳送電郵給聯絡人(_M)"
 
@@ -3146,31 +3132,31 @@ msgstr "傳送電郵給聯絡人(_M)"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "列印(_P)"
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../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:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1184
 #: ../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
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
@@ -3181,20 +3167,20 @@ msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "任何分類"
 
 # ui/evolution-calendar.xml.h:25
 #. 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:1803
 msgid "Print cards"
 msgstr "列印咭片"
 
@@ -3237,7 +3223,7 @@ msgstr "汽車電話"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../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
@@ -3420,16 +3406,16 @@ msgstr "網址"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "寬度"
 
@@ -3437,15 +3423,15 @@ msgstr "寬度"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "高度"
 
@@ -3855,6 +3841,9 @@ msgid_plural ""
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
 "開啟 %d 個聯絡人會一併開啟 %d 個新視窗。\n"
+"確定要顯示這個聯絡人？"
+msgstr[1] ""
+"開啟 %d 個聯絡人會一併開啟 %d 個新視窗。\n"
 "確定要顯示所有的聯絡人？"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:321
@@ -4112,11 +4101,11 @@ msgstr "格式"
 
 # addressbook/printing/e-contact-print.glade.h:11
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "頁首"
@@ -4243,7 +4232,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:"
@@ -4682,35 +4671,40 @@ msgstr "要儲存對此約會所做的更改？"
 
 # calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to save your changes to this memo?"
+msgstr "要儲存對此備忘錄所做的更改？"
+
+# calendar/gui/dialogs/save-comp.c:51
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的更改？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../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 "
@@ -4719,49 +4713,53 @@ msgstr ""
 "你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
 "解決方案是將該伺服器升級至支援的版本。"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "你已經更改此約會，但尚未儲存它。"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../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
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Save Changes"
 msgstr "儲存更改(_S)"
 
 # ui/evolution-message-composer.xml.h:26
-#: ../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}."
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:48
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "輸入密碼"
 
@@ -4891,7 +4889,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:591
 #: ../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
@@ -4946,10 +4944,10 @@ msgstr "約會"
 # addressbook/backend/ebook/e-card.c:3442
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1270
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1276
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1272
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1278
 #: ../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,7 +4967,7 @@ msgstr "忽略時間(_T):"
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:13
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4983,35 +4981,35 @@ msgid "location of appointment"
 msgstr "約會的地點"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1111
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1254
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1120
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1122
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1130
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1188
 #, c-format
 msgid "You have %d alarms"
 msgstr "你有 %d 個鬧鈴"
 
 # widgets/misc/e-messagebox.c:159
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1372
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1352
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -5023,7 +5021,7 @@ msgstr ""
 "送出電郵。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1378
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -5043,7 +5041,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1392
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5580,12 +5578,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:579
 #: ../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 "行事曆"
@@ -5707,7 +5705,6 @@ msgid "New calendar"
 msgstr "新行事曆"
 
 #: ../calendar/gui/calendar-component.c:1482
-#: ../calendar/gui/dialogs/event-page.c:872
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
@@ -5753,10 +5750,15 @@ msgstr "拒絕許可權來開啟行事曆"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
+# calendar/gui/e-calendar-table.c:162
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "編輯鬧鈴"
+
 # data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
@@ -5880,7 +5882,7 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "約會開始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -5946,7 +5948,7 @@ msgid "MIME type:"
 msgstr "MIME 類型:"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
 
@@ -6012,7 +6014,7 @@ msgstr "顯示"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../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 "空閒/忙碌"
@@ -6061,7 +6063,7 @@ msgstr ""
 # mail/mail-config.glade.h:54
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "選取顏色"
 
@@ -6115,7 +6117,7 @@ msgid "Thursday"
 msgstr "星期四"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
@@ -6133,80 +6135,81 @@ msgid "Tuesday"
 msgstr "星期二"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "W_eek starts:"
-msgstr "一週開始於(_E):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
 
+#. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "一週開始於(_K):"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../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:14
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # ui/evolution-mail.xml.h:43
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "週一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "週二(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "前"
 
@@ -6386,7 +6389,7 @@ msgid "Due "
 msgstr "期限 "
 
 # mail/mail-tools.c:219
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
@@ -6394,21 +6397,21 @@ msgstr "附加訊息 - %s"
 # composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2859
-#: ../composer/e-msg-composer.c:3038
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3034
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
@@ -6418,7 +6421,7 @@ msgstr "取消拖拉(_D)"
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6441,11 +6444,11 @@ 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
-#: ../composer/e-msg-composer.c:3601
+#: ../composer/e-msg-composer.c:3597
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -6454,7 +6457,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
+#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "屬性(_P)"
@@ -6462,7 +6465,7 @@ msgstr "屬性(_P)"
 # composer/e-msg-composer-attachment-bar.c:500
 #: ../calendar/gui/dialogs/comp-editor.c:1097
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3604
+#: ../composer/e-msg-composer.c:3600
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
@@ -6522,7 +6525,7 @@ msgstr "沒有摘要"
 #: ../calendar/gui/dialogs/comp-editor.c:2668
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
 #: ../mail/em-utils.c:502 ../mail/em-utils.c:539
-#: ../widgets/misc/e-attachment-bar.c:342
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "附件"
 
@@ -6614,89 +6617,101 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/dialogs/event-editor.c:541
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:545
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../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:873
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "行事曆(_N):"
+
+#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
-msgid "Or_ganizer"
-msgstr "召集人(_G)"
+msgid "Or_ganizer:"
+msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:917
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: ../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/e-calendar-table.c:154
-#: ../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/event-editor-dialog.glade.h:31
-#: ../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)"
 
 # shell/e-storage.c:475
-#: ../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/event-editor.c:1612
-#: ../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"
@@ -6704,7 +6719,7 @@ msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
 # calendar/gui/event-editor-dialog.glade.h:36
-#: ../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"
@@ -6712,27 +6727,54 @@ msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
 # calendar/gui/event-editor.c:1612
-#: ../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 分鐘"
 msgstr[1] "約會前 %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:2271
+#: ../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:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "無"
+
 # calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 hour before appointment"
-msgstr "約會前 1 小時"
+msgid "1 day before appointment"
+msgstr "約會前 1 天"
 
 # calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "15 minutes before appointment"
-msgstr "約會前 15 分鐘"
+msgid "1 hour before appointment"
+msgstr "約會前 1 小時"
 
 # calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "約會前 1 天"
+msgid "15 minutes before appointment"
+msgstr "約會前 15 分鐘"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.glade.h:5
@@ -6741,46 +6783,39 @@ 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
-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
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "描述(_E):"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "事件描述"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
 msgstr "地點(_I):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "會議召集人(_G):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "描述(_D):"
-
+# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "設定鬧鈴(_S)\t"
+msgid "_Alarm"
+msgstr "鬧鈴(_A)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
@@ -6807,28 +6842,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 "無"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -6916,58 +6929,23 @@ msgid "Organizer:"
 msgstr "會議召集人:"
 
 # calendar/gui/print.c:362
-#: ../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 "備忘錄"
 
 # addressbook/gui/component/addressbook.c:438
-#: ../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」開啟備忘錄。"
 
-# views/mail/galview.xml.h:4
-#: ../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/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
-#: ../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/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
-#: ../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/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: ../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.c:439
 #: ../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):"
 
@@ -7284,21 +7262,17 @@ 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)"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../calendar/gui/dialogs/task-editor.c:423
+#: ../calendar/gui/dialogs/task-editor.c:424
 msgid "Task Details"
 msgstr "工作詳細資料"
 
-#: ../calendar/gui/dialogs/task-page.c:439
-msgid "_Group"
-msgstr "群組(_G)"
-
 #: ../calendar/gui/dialogs/task-page.c:824
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
@@ -7313,10 +7287,6 @@ msgstr "無法在 '%s' 開啟工作。"
 msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "描述(_E):"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "召集人(_G):"
@@ -7534,8 +7504,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 "狀態:"
 
@@ -7544,6 +7514,30 @@ msgstr "狀態:"
 msgid "Priority:"
 msgstr "優先程度："
 
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: ../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/calendar-model.c:363
+# calendar/gui/calendar-model.c:900
+# calendar/gui/e-calendar-table.c:324
+#: ../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/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#: ../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-calendar-table.c:153
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
@@ -7613,9 +7607,9 @@ 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/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "不明"
@@ -7637,7 +7631,7 @@ msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-display.c:196
-#: ../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 "選擇用來儲存選定的附加檔案的資料夾..."
 
@@ -7741,7 +7735,7 @@ msgstr "更新物件"
 # composer/e-msg-composer.c:774
 #: ../calendar/gui/e-calendar-table.c:1034
 #: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
-#: ../composer/e-msg-composer.c:1354
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "另存新檔..."
 
@@ -8149,13 +8143,13 @@ 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 "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../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 "暫時接受"
 
@@ -8163,7 +8157,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 "婉拒"
 
@@ -8399,7 +8393,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 "到會者狀態不能更新，因為項目已經不存在"
 
@@ -8594,7 +8588,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 "已委派"
 
@@ -8639,10 +8633,7 @@ msgstr "%a %m/%d/%Y"
 # widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452
-#: ../widgets/misc/e-dateedit.c:1737
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -11122,7 +11113,7 @@ msgstr "%.0fG"
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:995
+#: ../widgets/misc/e-attachment-bar.c:986
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
@@ -11133,7 +11124,7 @@ msgstr "附加檔案列"
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "不能附加檔案 %s： %s"
@@ -11142,7 +11133,7 @@ msgstr "不能附加檔案 %s： %s"
 # camel/providers/local/camel-mbox-store.c:146
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
@@ -11150,17 +11141,17 @@ msgstr "不能附加檔案 %s：不是一個合法的檔案"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼電郵。"
 
 # composer/e-msg-composer-hdrs.c:324
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "按這裏新增目錄服務"
 
@@ -11172,7 +11163,7 @@ msgstr "按這裏新增目錄服務"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "回覆地址(_R):"
 
@@ -11180,7 +11171,7 @@ msgstr "回覆地址(_R):"
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
@@ -11188,37 +11179,37 @@ msgstr "寄件者(_O):"
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
 # composer/e-msg-composer-hdrs.c:386
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "收件者(_T):"
 
 # composer/e-msg-composer-hdrs.c:387
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "輸入電郵的收件者"
 
 # composer/e-msg-composer-hdrs.c:390
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "副本(_C):"
 
 # composer/e-msg-composer-hdrs.c:391
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入電郵副本的收件者"
 
 # composer/e-msg-composer-hdrs.c:394
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
 # composer/e-msg-composer-hdrs.c:395
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11228,16 +11219,16 @@ msgstr "輸入電郵密件副本的收件者"
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "按一下這裏，選取要張貼的資料夾"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "張貼到:"
 
@@ -11253,12 +11244,12 @@ msgstr "附加(_T)"
 msgid "Insert Attachment"
 msgstr "插入附加檔案"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽名送出的電郵：此帳號沒有設定簽名證書"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11267,63 +11258,63 @@ msgstr "無法加密送出的電郵：沒有設定加密證書(此帳號)"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
-#: ../composer/e-msg-composer.c:3847
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3843
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
 # camel/camel-sasl-login.c:127
-#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
 
 # camel/camel-filter-driver.c:671
-#: ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../composer/e-msg-composer.c:1415
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得電郵"
 
 # mail/mail-search.c:138
-#: ../composer/e-msg-composer.c:1693
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "未命名的電郵"
 
 # composer/e-msg-composer.c:966
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1728
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2155 ../mail/em-account-editor.c:596
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:596
 #: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "自動產生的"
 
 # mail/mail-config.glade.h:74
-#: ../composer/e-msg-composer.c:2258
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../composer/e-msg-composer.c:2526 ../composer/e-msg-composer.c:3729
-#: ../composer/e-msg-composer.c:3732
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
+#: ../composer/e-msg-composer.c:3728
 msgid "Compose Message"
 msgstr "編輯電郵"
 
-#: ../composer/e-msg-composer.c:4956
+#: ../composer/e-msg-composer.c:4952
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11485,7 +11476,7 @@ msgstr "儲存電郵(_S)"
 # shell/e-shell-view-menu.c:228
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:511
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -11771,7 +11762,7 @@ msgstr "選擇一個檔案"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
 #: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "重要"
 
@@ -11786,7 +11777,7 @@ msgstr "待辦"
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "稍後"
 
@@ -12032,7 +12023,7 @@ msgid "Mail Accounts"
 msgstr "電郵帳號"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "電郵偏好設定"
 
@@ -12070,12 +12061,12 @@ msgid "Ask for each message"
 msgstr "每封電郵皆詢問"
 
 # mail/mail-config.glade.h:35
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config.glade.h:57
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "接收電郵"
 
@@ -12084,7 +12075,7 @@ msgid "Automatically check for _new mail every"
 msgstr "自動檢查新電郵每(_N)"
 
 # mail/mail-config.glade.h:65
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "傳送電郵"
 
@@ -12094,8 +12085,8 @@ msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "安全性"
 
@@ -12142,7 +12133,7 @@ msgstr "[預設值]"
 # mail/mail-config.glade.h:30
 #. 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:205
 #: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "已啟用"
@@ -12335,7 +12326,7 @@ msgid "is not Flagged"
 msgstr "沒有標幟的"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "垃圾電郵"
@@ -12542,7 +12533,7 @@ msgstr "草稿"
 # mail/local-config.glade.h:8
 #. 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:597
 msgid "Inbox"
 msgstr "收件匣"
 
@@ -12613,7 +12604,7 @@ msgstr "掃描「%s」內的資料夾"
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -12825,71 +12816,71 @@ msgstr "按一下來傳送電郵 %s"
 
 # mail/mail-search.c:319
 #. 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"
 
 # calendar/gui/calendar-model.c:1578
-#: ../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/mail-format.c:1161
-#: ../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/mail-config.glade.h:74
-#: ../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/mail-format.c:1161
-#: ../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/mail-config.glade.h:74
-#: ../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 "此電郵未加密。它的內容在透過互聯網傳送可能會被檢閱。"
 
-#: ../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 "
@@ -12899,21 +12890,21 @@ msgstr ""
 "日，並不是無法檢視此電郵的內容。"
 
 # ui/evolution-message-composer.xml.h:13
-#: ../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 "
@@ -12922,58 +12913,58 @@ 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/message-list.c:977
-#: ../mail/em-format-html-display.c:1169
+#: ../mail/em-format-html-display.c:1170
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %B %d, %Y, %l:%M %p"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1178
 msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1181
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "作者 %B %d, %Y, %l:%M %p"
 
-#: ../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)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:1620
+#: ../mail/em-format-html-display.c:1663
 msgid "Attachment Button"
 msgstr "附件按鈕"
 
 # mail/mail-display.c:196
-#: ../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 "儲存選取的..."
 
@@ -12981,33 +12972,33 @@ msgstr "儲存選取的..."
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #. 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)"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-message-composer.xml.h:18
-#: ../mail/em-format-html-display.c:1959
+#: ../mail/em-format-html-display.c:2002
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:2018
+#: ../mail/em-format-html-display.c:2061
 msgid "Toggle Attachment Bar"
 msgstr "切換附件列"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:2020
+#: ../mail/em-format-html-display.c:2063
 msgid "No Attachment"
 msgstr "無附件"
 
@@ -13866,7 +13857,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 "請稍候"
@@ -14401,90 +14392,94 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "加密外送的電郵 (預設值)(_E)"
 
 #: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr "固定寬度字型(_X):"
+
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "字型內容"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "將電郵格式化為 _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
 # mail/mail-config.glade.h:36
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML 電郵"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "標頭"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "包含遠端測試(_N)"
 
 # mail/mail-config.glade.h:37
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "行內"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "語言表"
 
 # mail/mail-config.glade.h:40
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "電郵組態"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "電郵標頭表"
 
 # mail/local-config.glade.h:2
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "信箱位置"
 
 # views/mail/galview.xml.h:4
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "電郵編輯器"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在你首次連線之前將不會提示你輸入密碼"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鑰匙 ID(_K):"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "當新電郵到達時播放聲音檔案(_V)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14493,7 +14488,7 @@ msgstr ""
 "這個名稱將只做為顯示之用。"
 
 # mail/mail-config-druid.c:105
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14502,7 +14497,7 @@ msgstr ""
 "服務供應商。"
 
 # mail/mail-config-druid.c:99
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14511,125 +14506,121 @@ msgstr ""
 "請在下面輸入你的名稱及電郵地址。「選擇性」的欄位不一定要填，除非你希望在送出"
 "的電郵內包含這些資訊。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
 # ui/evolution-mail.xml.h:14
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的電郵只有指定密件副本收件者時顯示提示(_O)"
 
 # camel/camel-filter-driver.c:671
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "引用原始電郵"
 
 # mail/mail-config.glade.h:56
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "記住密碼(_M)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
 # ui/evolution-contact-editor.xml.h:3
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
 # ui/evolution-contact-editor.xml.h:3
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "選取(_L)..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於列印的 HTML 固定寬度字型"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
 # mail/mail-ops.c:603
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "傳送電郵回條:"
 
 # mail/mail-config.glade.h:66
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "傳送電郵"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "傳送電郵資料夾(_M):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "簽名證書(_N):"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "簽名"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "簽署表"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_erminal Font:"
-msgstr "終端機字型(_E):"
-
 #: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "類型(_Y):"
@@ -15143,7 +15134,7 @@ msgstr "檢查新電郵"
 
 # camel/camel-smime-context.c:194
 #: ../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 所需的密碼"
@@ -16395,11 +16386,11 @@ msgid ""
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../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."
@@ -16407,77 +16398,77 @@ 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 "我目前在辦公室"
 
 # camel/camel-smime-context.c:194
 #. 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 帳號的授權設定"
 
 # shell/importer/import.glade.h:2
-#: ../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 資料夾的大小"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "資料夾大小"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../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:"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../plugins/exchange-operations/exchange-account-setup.c:645
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
 # mail/mail-config.glade.h:11
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "驗證類型"
 
 # mail/mail-config.glade.h:1
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
@@ -16549,34 +16540,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 "讀取委託清單錯誤。"
 
@@ -16637,17 +16628,17 @@ 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 "資料夾名稱"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "資料夾大小"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "訂閱其他使用者的資料夾"
@@ -16662,14 +16653,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」"
@@ -16915,7 +16906,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -17189,7 +17180,7 @@ msgstr "<b>使用者：</b>"
 
 # views/mail/galview.xml.h:4
 #: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "電郵"
 
@@ -17278,14 +17269,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 "對話方塊 1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>帳號名稱</b>"
@@ -17459,119 +17442,119 @@ msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
 # shell/e-storage.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:487
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
 # shell/e-storage.c:475
-#: ../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 "尋找這個約會既存的版本"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
 # shell/e-storage.c:475
-#: ../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"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../plugins/itip-formatter/itip-formatter.c:905
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../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 "由於不合法的狀態使得到會者狀態無法更新！"
 
 # shell/e-storage.c:475
-#: ../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 "到會者狀態已更新"
 
 # shell/e-storage.c:465
-#: ../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。"
 
 # ui/evolution-calendar.xml.h:22
-#: ../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"
@@ -17971,29 +17954,29 @@ msgstr "更新(_U)"
 
 # calendar/gui/event-editor-dialog.glade.h:31
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "開始時間:"
 
 # calendar/gui/event-editor-dialog.glade.h:30
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "結束時間:"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #. 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 "註解："
 
 # shell/e-storage.c:475
-#: ../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 "套用至所有實體(_A)"
 
@@ -18316,7 +18299,7 @@ msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 # addressbook/gui/widgets/e-addressbook-view.c:732
 #. 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:180
 msgid "Plugin Manager"
 msgstr "外掛管理程式"
 
@@ -18334,31 +18317,20 @@ msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
 # calendar/gui/event-editor-dialog.glade.h:39
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "作者"
 
-# addressbook/contact-editor/fullname.glade.h:4
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-# addressbook/gui/component/addressbook-config.c:520
-# mail/mail-config.glade.h:53
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "路徑"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "描述:"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些更改在重新啟動後才會生效"
 
@@ -18367,8 +18339,8 @@ msgstr "注意：某些更改在重新啟動後才會生效"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
 msgstr "外掛程式"
 
@@ -18521,7 +18493,7 @@ msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -18698,8 +18670,8 @@ msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
 # shell/e-shell-importer.c:602
-#: ../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 "選取目的檔案"
 
@@ -18757,13 +18729,13 @@ msgid "Please select the information that you would like to import:"
 msgstr "請選擇你想要匯入的資訊："
 
 # composer/e-msg-composer-hdrs.c:355
-#: ../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 "匯入資料。"
@@ -18852,40 +18824,48 @@ msgid "Printer settings"
 msgstr "印表機設定"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Sidebar is visible"
+msgstr "顯示側邊欄"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:470
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
-msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
 # ui/evolution.xml.h:32
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
 # ui/evolution.xml.h:32
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設寬度，以像素計。"
 
 # ui/evolution.xml.h:32
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
-msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如"
+"「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18894,32 +18874,36 @@ msgstr ""
 "視窗按鈕的風格。可以是「文字」、「圖示」、「兩者」、「工具列」。如果設為「工"
 "具列」，按鈕的風格會依 GNOME 工具列設定值決定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the sidebar should be visible."
+msgstr "是否可以看到側邊欄。"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
@@ -18939,8 +18923,8 @@ msgstr "按「確定」關閉這些連線以離線"
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(未命名)"
 
@@ -19072,7 +19056,7 @@ msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19081,20 +19065,20 @@ msgstr "離線工作(_W)"
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: ../shell/e-shell-window.c:370
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
-#: ../shell/e-shell-window.c:378
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
-#: ../shell/e-shell-window.c:385
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
 # mail/mail-autofilter.c:70
-#: ../shell/e-shell-window.c:775
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
@@ -19106,27 +19090,27 @@ msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: ../shell/e-shell.c:1273
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1275
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
@@ -19250,35 +19234,35 @@ msgstr ""
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
 #: ../shell/main.c:261
-msgid "Don't tell me again"
+msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:468
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:472
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:475
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:479
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
 # shell/main.c:185
-#: ../shell/main.c:485
+#: ../shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:484
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:515
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19360,7 +19344,7 @@ msgstr "從以前的版本升級失敗：{0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
@@ -19429,7 +19413,7 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19438,7 +19422,7 @@ msgstr ""
 "因為你信任發出此證書的證書單位，所以除非在此指示，否則你將信任此證書的有效"
 "性。"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19483,20 +19467,20 @@ msgstr "到期"
 msgid "E-Mail Address"
 msgstr "電郵地址"
 
-#: ../smime/gui/certificate-viewer.c:342
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "證書檢視器:%s"
 
 # camel/camel-smime-context.c:194
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "輸入 `%s' 的密碼"
 
 # camel/camel-smime-context.c:194
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "輸入證書資料庫的新密碼"
 
@@ -19506,7 +19490,7 @@ msgstr "輸入證書資料庫的新密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "輸入新密碼"
 
@@ -19736,7 +19720,7 @@ msgid "_Edit CA Trust"
 msgstr "編輯 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:657
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "證書已經存在"
 
@@ -19933,28 +19917,28 @@ msgid "Imported Certificate"
 msgstr "輸入的證書"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "要新增的附件。"
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "附件的內容類型。"
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "要顯示在電郵的檔案名稱。"
 
 # calendar/gui/gnome-cal.c:235
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "附件的描述。"
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "將附件標示成預設顯示在行內。"
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "電郵的預設主旨。"
 
@@ -20123,7 +20107,7 @@ msgstr "將選定資料夾中的聯絡人儲存為 VCard"
 
 # ui/evolution-event-editor.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:57
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "全選"
 
@@ -20209,7 +20193,7 @@ msgstr "將聯絡人移到(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "將資料夾聯絡人移到(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:40
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:43
 msgid "_New"
 msgstr "新增(_N)"
 
@@ -20462,11 +20446,11 @@ 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:14
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:35
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:37
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -20490,15 +20474,18 @@ msgstr "全天事件"
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../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 "分類為公開"
 
@@ -20519,7 +20506,8 @@ msgstr "將此項設為循環事件"
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: ../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)"
 
@@ -20566,7 +20554,8 @@ msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../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 "切換是否顯示「分類」"
 
@@ -20587,14 +20576,16 @@ msgstr "全天事件(_A)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-#: ../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)"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../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)"
 
@@ -20606,7 +20597,8 @@ msgstr "空閒/忙碌(_F)"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: ../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)"
 
@@ -20664,7 +20656,7 @@ msgstr "資料夾(_O)"
 # views/mail/galview.xml.h:4
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Message _List As"
-msgstr "將電郵排列為(_L)"
+msgstr "電郵列為(_L)"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
@@ -20740,13 +20732,13 @@ msgid "Collapse all message threads"
 msgstr "收摺所有的相關電郵"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "複製已選定的電郵到剪貼簿"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:6 ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Cut selected message(s) to the clipboard"
 msgstr "將電郵剪下並貼到剪貼簿"
 
@@ -20782,12 +20774,12 @@ msgid ""
 msgstr "隱藏已刪除的電郵而非將它們以刪除線的形式顯示"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Mar_k Messages as Read"
-msgstr "標示電郵為已閱讀(_K)"
+msgid "Mar_k All Messages as Read"
+msgstr "標示所有電郵為已閱讀(_K)"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:16 ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上電郵"
 
@@ -20904,10 +20896,15 @@ msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的電郵的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的電郵到另一個資料夾"
 
+# ui/evolution-mail.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to the clipboard"
+msgstr "複製已選定的電郵到剪貼簿"
+
 # ui/evolution.xml.h:10
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Create R_ule"
@@ -20953,6 +20950,12 @@ msgstr "為這個通信論壇建立過濾器規則"
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
+# ui/evolution-event-editor.xml.h:31
+# ui/evolution-task-editor-dialog.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Cut selected messages to the clipboard"
+msgstr "將電郵剪下並貼到剪貼簿"
+
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "減少文字大小"
@@ -20969,13 +20972,13 @@ msgstr "顯示下一封電郵"
 
 # ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next unread message"
-msgstr "顯示下一封未閱讀的電郵"
+msgid "Display the next thread"
+msgstr "顯示下一封相關電郵"
 
 # ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread thread"
-msgstr "顯示下一封未閱讀的相關電郵"
+msgid "Display the next unread message"
+msgstr "顯示下一封未閱讀的電郵"
 
 # ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:29
@@ -21019,7 +21022,7 @@ msgstr "篩選所選信件的垃圾電郵狀態"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:38
-msgid "Flag selected message(s) for follow-up"
+msgid "Flag selected messages for follow-up"
 msgstr "將選定的電郵加上跟隨標幟"
 
 #: ../ui/evolution-mail-message.xml.h:39
@@ -21062,32 +21065,32 @@ msgstr "標示成(_K)"
 
 # ui/evolution-mail.xml.h:52
 #: ../ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected message(s) as having been read"
+msgid "Mark the selected messages as having been read"
 msgstr "將選定的電郵標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as important"
+msgid "Mark the selected messages as important"
 msgstr "將選定的電郵標示成重要"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as junk"
-msgstr "將選取的電郵標示成垃圾電郵"
+msgid "Mark the selected messages as junk"
+msgstr "將選定的電郵標示成垃圾電郵"
 
 # ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as not being junk"
+msgid "Mark the selected messages as not being junk"
 msgstr "將選取的電郵標示成不是垃圾電郵"
 
 # ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not having been read"
+msgid "Mark the selected messages as not having been read"
 msgstr "將選定的電郵標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as unimportant"
+msgid "Mark the selected messages as unimportant"
 msgstr "將選定的電郵標示成不重要"
 
 # ui/evolution-mail.xml.h:54
@@ -21097,7 +21100,7 @@ msgstr "將選定的電郵標示成要刪除"
 
 # ui/evolution-mail.xml.h:56
 #: ../ui/evolution-mail-message.xml.h:56
-msgid "Move selected message(s) to another folder"
+msgid "Move selected messages to another folder"
 msgstr "將選定的電郵移至另一個資料夾"
 
 #: ../ui/evolution-mail-message.xml.h:58
@@ -21124,18 +21127,24 @@ msgstr "開啟視窗以便撰寫電郵"
 
 # ui/evolution-mail.xml.h:59
 #: ../ui/evolution-mail-message.xml.h:63
-msgid "Open the selected message in a new window"
+msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的電郵"
 
 # ui/evolution-mail.xml.h:60
 #: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected message in the composer for editing"
-msgstr "在撰寫視窗開啟選取的電郵來編輯"
+msgid "Open the selected messages in the composer for editing"
+msgstr "在撰寫視窗開啟選取的電郵以便編輯"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的電郵(_R)"
 
+# ui/evolution-event-editor.xml.h:31
+# ui/evolution-task-editor-dialog.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "Paste messages from the clipboard"
+msgstr "自剪貼簿貼上電郵"
+
 # mail/mail-ops.c:825
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Pos_t New Message to Folder"
@@ -21185,8 +21194,8 @@ msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:74
 #: ../ui/evolution-mail-message.xml.h:84
-msgid "Save the message as a text file"
-msgstr "另存電郵成文字檔案"
+msgid "Save the selected messages as a text file"
+msgstr "將選定的電郵另存成文字檔案"
 
 # ui/evolution-mail.xml.h:95
 #: ../ui/evolution-mail-message.xml.h:85
@@ -21236,12 +21245,12 @@ msgstr "在顯示的電郵內文中顯示閃爍游標"
 
 # ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-message.xml.h:94
-msgid "Show message in the normal style"
+msgid "Show messages in the normal style"
 msgstr "使用正常模式顯示電郵"
 
 # ui/evolution-mail.xml.h:87
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message with all email headers"
+msgid "Show messages with all email headers"
 msgstr "顯示電郵及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
@@ -21251,8 +21260,8 @@ msgstr "顯示電郵原始檔"
 
 # ui/evolution-mail.xml.h:94
 #: ../ui/evolution-mail-message.xml.h:97
-msgid "Un-delete the selected messages"
-msgstr "復原選定的電郵"
+msgid "Undelete the selected messages"
+msgstr "取消刪除選定的電郵"
 
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
@@ -21708,12 +21717,12 @@ msgstr "狀態詳細資料(_S)"
 
 # calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+msgid "Copy selected tasks"
 msgstr "複製選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Cut selected tasks"
 msgstr "剪下選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
@@ -21738,7 +21747,7 @@ msgstr "將選取的工作標示成完成"
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
 msgstr "貼上剪貼簿上的工作"
 
 # ui/evolution-calendar.xml.h:22
@@ -21810,7 +21819,7 @@ msgstr "只顯示視窗按鈕的文字"
 # shell/e-shell-view-menu.c:228
 #: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
+msgstr "Evolution ＿FAQ"
 
 # ui/evolution.xml.h:19
 #: ../ui/evolution.xml.h:11
@@ -21872,84 +21881,92 @@ msgstr "設定 Pilot 組態"
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-# ui/evolution.xml.h:28
 #: ../ui/evolution.xml.h:25
+msgid "Side _Bar"
+msgstr "側邊欄(_B)"
+
+#: ../ui/evolution.xml.h:26
+msgid "Status _Bar"
+msgstr "狀態列(_B)"
+
+# ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:34
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:22
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "工具列(_B)"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "工具列風格(_B)"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
+msgid "View/Hide the Side Bar"
+msgstr "顯示/隱藏側邊列"
+
+#: ../ui/evolution.xml.h:34
 msgid "View/Hide the Status Bar"
 msgstr "顯示/隱藏狀態列"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:35
 msgid "_About"
 msgstr "關於(_A)"
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:36
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Forget Passwords"
 msgstr "遺忘密碼(_F)"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
 msgstr "隱藏按鈕(_H)"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:44
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:46
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Synchronization Options..."
 msgstr "同步化選項(_S)..."
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:48
 msgid "_Text only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:47
-msgid "_View Status Bar"
-msgstr "檢視狀態列(_V)"
-
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "視窗(_O)"
 
@@ -22023,7 +22040,7 @@ msgid "With _Status"
 msgstr "設定狀態(_S)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -22085,9 +22102,9 @@ msgid "_Edit..."
 msgstr "編輯(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "表格"
 
@@ -22167,7 +22184,7 @@ msgstr "一二三四五六日"
 # widgets/misc/e-calendar-item.c:1061
 # widgets/misc/e-calendar-item.c:2756
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1098
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22185,62 +22202,62 @@ msgstr "上一步按鈕"
 msgid "Month Calendar"
 msgstr "月行事曆"
 
-#: ../widgets/misc/e-canvas-background.c:459
-#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
-#: ../widgets/text/e-text.c:3569
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "填入色彩"
 
-#: ../widgets/misc/e-canvas-background.c:466
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:473
-#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3575
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
-#: ../widgets/misc/e-canvas-background.c:480
-#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "填入網點"
 
-#: ../widgets/misc/e-canvas-background.c:487
-#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:494
-#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:501
-#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:508
-#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/table/e-table-item.c:3011
 msgid "Minimum width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3012
 msgid "Minimum Width"
 msgstr "最小寬度"
 
@@ -22257,7 +22274,7 @@ msgid "Now"
 msgstr "現在"
 
 # widgets/misc/e-cell-date-edit.c:726
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
@@ -22400,7 +22417,7 @@ msgstr "時刻的組合式方塊"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -22409,7 +22426,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1448 ../widgets/misc/e-dateedit.c:1775
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -22451,11 +22468,11 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "展開器大小"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
@@ -22467,17 +22484,23 @@ msgstr "指示器間距"
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
-#: ../widgets/misc/e-filter-bar.c:201
+# widgets/misc/e-filter-bar.c:239
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "進階搜尋"
+
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "搜尋(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:203
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "搜尋"
 
 # widgets/misc/e-filter-bar.c:168
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:226
+#: ../widgets/misc/e-filter-bar.c:227
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
@@ -22500,11 +22523,11 @@ msgid "Choose Image"
 msgstr "選擇圖像"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: ../widgets/misc/e-map.c:651
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../widgets/misc/e-map.c:653
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -22526,57 +22549,57 @@ msgid "Sync Categories:"
 msgstr "同步分類:"
 
 # mail/mail-ops.c:603
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Empty message"
 msgstr "空白電郵"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
 msgid "Column width"
 msgstr "欄寬"
 
 # addressbook/gui/component/addressbook-config.c:430
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
+#: ../widgets/misc/e-search-bar.c:371
 msgid "Search Text Entry"
 msgstr "搜尋文字項目"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "清除(_C)"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "搜尋類型"
 
-#: ../widgets/misc/e-search-bar.c:893
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:900
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
-#: ../widgets/text/e-text.c:3491
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "文字"
 
-#: ../widgets/misc/e-search-bar.c:987
+#: ../widgets/misc/e-search-bar.c:984
 msgid "Find _Now"
 msgstr "立即尋找(_N)"
 
@@ -22603,7 +22626,7 @@ msgstr "選擇區模式"
 msgid "Cursor Mode"
 msgstr "游標模式"
 
-#: ../widgets/misc/e-send-options.c:524
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
@@ -22821,23 +22844,23 @@ msgstr "聚焦的欄"
 msgid "Unselected Column"
 msgstr "未選擇的欄"
 
-#: ../widgets/table/e-cell-text.c:1742
+#: ../widgets/table/e-cell-text.c:1744
 msgid "Strikeout Column"
 msgstr "刪除線欄"
 
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1751
 msgid "Underline Column"
 msgstr "底線欄"
 
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1758
 msgid "Bold Column"
 msgstr "粗體欄"
 
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1765
 msgid "Color Column"
 msgstr "色彩欄"
 
-#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/table/e-cell-text.c:1779
 msgid "BG Color Column"
 msgstr "背景色彩欄"
 
@@ -22887,7 +22910,6 @@ msgid "Sh_ow these fields in order:"
 msgstr "依序顯示這些欄位(_O):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "顯示欄位"
@@ -22955,11 +22977,6 @@ msgstr "未排序"
 msgid "No grouping"
 msgstr "未群組"
 
-# ui/evolution-message-composer.xml.h:47
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "可用的欄位"
-
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "群組依(_G)..."
@@ -22969,16 +22986,16 @@ msgid "_Show these fields in order:"
 msgstr "依序顯示這些欄位(_S):"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "DnD 碼"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "完整檔頭"
 
@@ -23001,12 +23018,12 @@ msgstr ""
 "想在你的表格中加入欄位，只要將它\n"
 "拖曳至你希望它出現的位置即可。"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
 msgstr "%s : %s (%d 個項目)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s : %s (%d items)"
 msgstr "%s : %s (%d 個項目)"
@@ -23015,7 +23032,7 @@ msgstr "%s : %s (%d 個項目)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
 msgstr "%s (%d 個項目)"
@@ -23024,190 +23041,190 @@ msgstr "%s (%d 個項目)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s (%d items)"
 msgstr "%s (%d 個項目)"
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2969 ../widgets/table/e-table-item.c:2970
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2976 ../widgets/table/e-table-item.c:2977
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
 # calendar/gui/e-calendar-table.c:156
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2983 ../widgets/table/e-table-item.c:2984
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-table-item.c:2990 ../widgets/table/e-table-item.c:2991
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:2997 ../widgets/table/e-table-item.c:2998
 msgid "Cursor mode"
 msgstr "游標模式"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2962 ../widgets/table/e-table-item.c:2963
 msgid "Selection model"
 msgstr "選擇區模型"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
-#: ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:3004 ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "界限長度"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-item.c:3038 ../widgets/table/e-table-item.c:3039
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "標準列高"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "凍結"
 
 # widgets/menus/gal-view-menus.c:176
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "遞增排序"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "遞減排序"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "不排序"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "依此欄位做群組"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "依方塊為群組"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "移除此欄"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "加入一欄..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "排列"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "最適填滿"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "格式欄..."
 
 # widgets/menus/gal-view-menus.c:176
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "自訂目前的檢視..."
 
 # addressbook/printing/e-contact-print.glade.h:8
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "字型組"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "排序資訊"
 
 # ui/evolution-calendar.xml.h:36
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2948 ../widgets/table/e-table-item.c:2949
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2955 ../widgets/table/e-table-item.c:2956
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3031 ../widgets/table/e-table-item.c:3032
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
 msgid "Always search"
 msgstr "總是搜尋"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "請按這裏加入"
 
-#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3318
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線條與 +/- 展開符號。"
 
@@ -23228,7 +23245,7 @@ msgstr "這可以測試迷你咭片畫布項目"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "事件處理器"
 
@@ -23241,58 +23258,58 @@ msgid "GDKFont"
 msgstr "GDK字型"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "左右對齊"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "橢圓"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "折行"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "中斷字元"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "最大行數"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "允許新行"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "繪製框線"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "繪製背景"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "繪製按鈕"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "游標位置"
 
@@ -23300,62 +23317,59 @@ msgstr "游標位置"
 msgid "Emulate label resize"
 msgstr "模擬標籤縮放"
 
-#: ../widgets/text/e-text.c:2724
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "粗體"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X 位移"
 
-#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y 位移"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "文字寬度"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM 快顯選單"
 
-#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
-
-#~ msgid "Select target addressbook."
-#~ msgstr "選取目標通訊錄。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8f7f5076ff..25516efabf 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-27 06:53+0800\n"
-"PO-Revision-Date: 2006-01-26 22:14+0800\n"
+"POT-Creation-Date: 2006-02-06 07:02+0800\n"
+"PO-Revision-Date: 2006-02-06 07:41+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -100,29 +100,29 @@ msgstr "得到焦點"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: ../a11y/calendar/ea-cal-view.c:306
+#: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "新增約會"
 
 # calendar/gui/e-day-view.c:3148
 # calendar/gui/e-week-view.c:3279
-#: ../a11y/calendar/ea-cal-view.c:307
+#: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: ../a11y/calendar/ea-cal-view.c:308
+#: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-calendar.xml.h:12
-#: ../a11y/calendar/ea-cal-view.c:309
+#: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "移至今日"
 
 # ui/evolution-calendar.xml.h:11
-#: ../a11y/calendar/ea-cal-view.c:310
+#: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "移至日期"
 
@@ -321,7 +321,7 @@ msgstr "表格的儲存格"
 # calendar/gui/e-calendar-table.c:163
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
-#: ../widgets/table/e-table-click-to-add.c:575
+#: ../widgets/table/e-table-click-to-add.c:574
 msgid "click to add"
 msgstr "請按這裡加入"
 
@@ -600,9 +600,9 @@ msgstr "在此設定自動完成"
 # ui/evolution-addressbook.xml.h:17
 #. 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:1334
 #: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
-#: ../plugins/exchange-operations/exchange-folder.c:629
+#: ../plugins/exchange-operations/exchange-folder.c:585
 msgid "Contacts"
 msgstr "連絡人"
 
@@ -647,7 +647,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
@@ -663,21 +663,21 @@ 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
 #: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
 #: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
 #: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:105
 msgid "Personal"
 msgstr "個人"
 
 # addressbook/gui/component/addressbook-config.c:148
 #. 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 伺服器"
 
@@ -701,7 +701,7 @@ msgstr "建立新的連絡人清單"
 
 # importers/pine-importer.c:661
 #: ../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 "新通訊錄"
 
@@ -714,7 +714,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 "升級通訊錄設定或資料夾失敗。"
 
@@ -729,40 +729,40 @@ 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
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:86
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:982
 #: ../mail/importers/pine-importer.c:392
 msgid "Addressbook"
 msgstr "目錄服務"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: ../addressbook/gui/component/addressbook-config.c:988
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "伺服器資訊"
 
 # mail/mail-config.glade.h:10
-#: ../addressbook/gui/component/addressbook-config.c:990
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "驗證"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../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"
@@ -770,17 +770,17 @@ msgstr "詳細資料"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:992
 msgid "Searching"
 msgstr "搜尋中"
 
 # mail/mail-ops.c:898
-#: ../addressbook/gui/component/addressbook-config.c:996
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "下載中"
 
 # addressbook/gui/component/addressbook-config.glade.h:2
-#: ../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 "通訊錄內容"
@@ -799,16 +799,16 @@ msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
 # addressbook/gui/component/addressbook-config.c:148
-#: ../addressbook/gui/component/addressbook-migrate.c:653
+#: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
 # mail/mail-config.glade.h:76
-#: ../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"
@@ -819,7 +819,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"
@@ -829,7 +829,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"
@@ -839,7 +839,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"
@@ -849,34 +849,34 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的 Pilot Sync 資料時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../addressbook/gui/component/addressbook-view.c:434
 #: ../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:437
 #: ../mail/em-folder-utils.c:505
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
 
-#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../addressbook/gui/component/addressbook-view.c:442
 #: ../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:445
 msgid "A Folder with this name already exists"
 msgstr "以此為名的資料夾已存在"
 
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-view.c:963
+#: ../addressbook/gui/component/addressbook-view.c:953
 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:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:979
 #: ../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
@@ -891,7 +891,7 @@ msgstr "刪除(_D)"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: ../addressbook/gui/component/addressbook-view.c:966
+#: ../addressbook/gui/component/addressbook-view.c:956
 msgid "Save As Vcard..."
 msgstr "儲存為 VCard..."
 
@@ -899,13 +899,13 @@ msgstr "儲存為 VCard..."
 # ui/evolution-mail.xml.h:115
 # ui/evolution-task-editor-dialog.xml.h:83
 # ui/evolution.xml.h:60
-#: ../addressbook/gui/component/addressbook-view.c:968
+#: ../addressbook/gui/component/addressbook-view.c:958
 #: ../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:1345
 msgid "Contact Source Selector"
 msgstr "連絡人來源選擇器"
 
@@ -1143,12 +1143,12 @@ msgstr "支援的搜尋起點"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid ""
-"The search base is the distinguished name (DN)  of the entry where your "
+"The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
 msgstr ""
-"搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在網"
-"路目錄樹的根部開始。"
+"搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目"
+"錄樹的底層開始。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
 msgid ""
@@ -1362,9 +1362,9 @@ msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../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:551
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:566
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2402
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1440,12 +1440,13 @@ msgstr "生日(_B):"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
 #: ../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)"
 
@@ -1566,9 +1567,9 @@ msgstr "地址"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
-#: ../widgets/text/e-text.c:3613
+#: ../widgets/table/e-cell-text.c:1772 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3607
+#: ../widgets/text/e-text.c:3608
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2548,9 +2549,9 @@ 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/plugin-manager/plugin-manager.c:42
 #: ../plugins/save-attachments/save-attachments.c:369
 #: ../widgets/menus/gal-view-new-dialog.c:73
 msgid "Name"
@@ -2655,22 +2656,22 @@ msgid "Changed"
 msgstr "已變更"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: ../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:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2397
 #, 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:2757
 msgid "Please select an image for this contact"
 msgstr "請選取此連絡人的影像"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2758
 msgid "No image"
 msgstr "沒有影像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3042
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2680,7 +2681,7 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3094
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
@@ -2916,7 +2917,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:223
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:506
 msgid "Book"
@@ -2977,12 +2978,31 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。您無論如何都要新增它嗎？"
 
-# widgets/misc/e-filter-bar.c:239
-#. FIXME: get the toplevel window...
-#: ../addressbook/gui/search/e-addressbook-search-dialog.c:165
-#: ../widgets/misc/e-filter-bar.c:162
-msgid "Advanced Search"
-msgstr "進階搜尋"
+# addressbook/gui/component/addressbook.c:618
+# calendar/gui/gnome-cal.c:233
+#. We attach subitems below
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../addressbook/gui/widgets/e-addressbook-view.c:172
+#: ../calendar/gui/cal-search-bar.c:53
+msgid "Any field contains"
+msgstr "任何欄位包含"
+
+# calendar/gui/e-calendar-table.c:150
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../addressbook/gui/widgets/e-addressbook-view.c:171
+#: ../calendar/gui/cal-search-bar.c:50
+msgid "Category is"
+msgstr "分類為"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../addressbook/gui/widgets/e-addressbook-view.c:170
+msgid "Email begins with"
+msgstr "電子郵件開始於"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:4
+#: ../addressbook/gui/widgets/e-addressbook-view.c:169
+msgid "Name begins with"
+msgstr "名稱開始於"
 
 # ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
@@ -2999,7 +3019,7 @@ msgstr[1] "%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:237
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:513
 msgid "Query"
@@ -3012,12 +3032,12 @@ msgstr "取得書本檢視時發生錯誤"
 
 # addressbook/contact-editor/e-contact-editor.c:1253
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3344
+#: ../widgets/table/e-table.c:3329
 #: ../widgets/table/e-tree-selection-model.c:825
 #: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-text.c:3471 ../widgets/text/e-text.c:3472
 msgid "Model"
 msgstr "模型"
 
@@ -3026,47 +3046,13 @@ msgstr "模型"
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:170
-msgid "Name begins with"
-msgstr "名稱開始於"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.c:171
-msgid "Email begins with"
-msgstr "電子郵件開始於"
-
-# calendar/gui/e-calendar-table.c:150
-#: ../addressbook/gui/widgets/e-addressbook-view.c:172
-#: ../calendar/gui/cal-search-bar.c:50
-msgid "Category is"
-msgstr "分類為"
-
-# addressbook/gui/component/addressbook.c:618
-# calendar/gui/gnome-cal.c:233
-#. We attach subitems below
-#: ../addressbook/gui/widgets/e-addressbook-view.c:173
-#: ../calendar/gui/cal-search-bar.c:53
-msgid "Any field contains"
-msgstr "任何欄位包含"
-
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
-#: ../addressbook/gui/widgets/e-addressbook-view.c:174
-msgid "Advanced..."
-msgstr "進階..."
-
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
-msgid "_Advanced..."
-msgstr "進階(_A)..."
-
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: ../addressbook/gui/widgets/e-addressbook-view.c:231
+#: ../addressbook/gui/widgets/e-addressbook-view.c:230
 msgid "Source"
 msgstr "來源"
 
 # mail/mail-config.glade.h:78
-#: ../addressbook/gui/widgets/e-addressbook-view.c:245
+#: ../addressbook/gui/widgets/e-addressbook-view.c:244
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-meeting-list-view.c:479
@@ -3075,7 +3061,7 @@ msgstr "來源"
 msgid "Type"
 msgstr "類型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.c:563
 msgid "Address Book"
 msgstr "通訊錄"
 
@@ -3083,13 +3069,13 @@ msgstr "通訊錄"
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
-#: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../addressbook/gui/widgets/e-addressbook-view.c:834
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2068
 #: ../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:957
 #: ../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
@@ -3098,44 +3084,44 @@ msgid "_Open"
 msgstr "開啟(_O)"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../addressbook/gui/widgets/e-addressbook-view.c:946
+#: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)..."
 
 # ui/evolution-addressbook.xml.h:17
-#: ../addressbook/gui/widgets/e-addressbook-view.c:947
+#: ../addressbook/gui/widgets/e-addressbook-view.c:960
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Save as VCard..."
 msgstr "儲存成 VCard(_S)..."
 
 # ui/evolution-mail.xml.h:35
-#: ../addressbook/gui/widgets/e-addressbook-view.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
 # ui/evolution-mail.xml.h:35
-#: ../addressbook/gui/widgets/e-addressbook-view.c:952
+#: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:953
+#: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to Contact"
 msgstr "傳送郵件給連絡人(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:954
+#: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to List"
 msgstr "傳送郵件給清單(_M)"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
 # addressbook/gui/widgets/e-addressbook-view.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.c:955
+#: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "Send _Message to Contacts"
 msgstr "傳送郵件給連絡人(_M)"
 
@@ -3146,31 +3132,31 @@ msgstr "傳送郵件給連絡人(_M)"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: ../addressbook/gui/widgets/e-addressbook-view.c:956
+#: ../addressbook/gui/widgets/e-addressbook-view.c:969
 msgid "_Print"
 msgstr "列印(_P)"
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:959
+#: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
 # addressbook/contact-editor/contact-editor.glade.h:18
-#: ../addressbook/gui/widgets/e-addressbook-view.c:960
+#: ../addressbook/gui/widgets/e-addressbook-view.c:973
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:963
+#: ../addressbook/gui/widgets/e-addressbook-view.c:976
 #: ../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:977
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1184
 #: ../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
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3098
 #: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
 #: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
 #: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
@@ -3181,20 +3167,20 @@ msgstr "複製(_C)"
 
 # ui/evolution-event-editor.xml.h:30
 # ui/evolution-task-editor-dialog.xml.h:33
-#: ../addressbook/gui/widgets/e-addressbook-view.c:965
+#: ../addressbook/gui/widgets/e-addressbook-view.c:978
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1584
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1601
 #: ../calendar/gui/cal-search-bar.c:346
 msgid "Any Category"
 msgstr "任何分類"
 
 # ui/evolution-calendar.xml.h:25
 #. 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:1803
 msgid "Print cards"
 msgstr "列印名片"
 
@@ -3237,7 +3223,7 @@ msgstr "汽車電話"
 
 # calendar/gui/e-calendar-table.c:150
 #: ../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
@@ -3420,16 +3406,16 @@ msgstr "網址"
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
-#: ../widgets/table/e-table-click-to-add.c:517
+#: ../widgets/misc/e-reflow.c:1434 ../widgets/misc/e-reflow.c:1435
+#: ../widgets/table/e-table-click-to-add.c:516
 #: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:667
-#: ../widgets/table/e-table-group-container.c:971
-#: ../widgets/table/e-table-group-container.c:972
+#: ../widgets/table/e-table-field-chooser-item.c:656
+#: ../widgets/table/e-table-group-container.c:967
+#: ../widgets/table/e-table-group-container.c:968
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3018 ../widgets/table/e-table-item.c:3019
+#: ../widgets/text/e-text.c:3649 ../widgets/text/e-text.c:3650
 msgid "Width"
 msgstr "寬度"
 
@@ -3437,15 +3423,15 @@ msgstr "寬度"
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:145
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
-#: ../widgets/table/e-table-click-to-add.c:524
-#: ../widgets/table/e-table-field-chooser-item.c:674
-#: ../widgets/table/e-table-group-container.c:964
-#: ../widgets/table/e-table-group-container.c:965
+#: ../widgets/misc/e-reflow.c:1442 ../widgets/misc/e-reflow.c:1443
+#: ../widgets/table/e-table-click-to-add.c:523
+#: ../widgets/table/e-table-field-chooser-item.c:663
+#: ../widgets/table/e-table-group-container.c:960
+#: ../widgets/table/e-table-group-container.c:961
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3657 ../widgets/text/e-text.c:3658
 msgid "Height"
 msgstr "高度"
 
@@ -3855,6 +3841,9 @@ msgid_plural ""
 "Do you really want to display all of these contacts?"
 msgstr[0] ""
 "開啟 %d 個連絡人會一併開啟 %d 個新視窗。\n"
+"確定要顯示這個連絡人？"
+msgstr[1] ""
+"開啟 %d 個連絡人會一併開啟 %d 個新視窗。\n"
 "確定要顯示所有的連絡人？"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:321
@@ -4112,11 +4101,11 @@ msgstr "格式"
 
 # addressbook/printing/e-contact-print.glade.h:11
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../widgets/table/e-table-click-to-add.c:496
+#: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
-#: ../widgets/table/e-table-field-chooser-item.c:660
-#: ../widgets/table/e-table-field-chooser.c:93
-#: ../widgets/table/e-table-header-item.c:1831
+#: ../widgets/table/e-table-field-chooser-item.c:649
+#: ../widgets/table/e-table-field-chooser.c:91
+#: ../widgets/table/e-table-header-item.c:1825
 #: ../widgets/table/e-table-selection-model.c:318
 msgid "Header"
 msgstr "頁首"
@@ -4243,7 +4232,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:"
@@ -4682,35 +4671,40 @@ msgstr "要儲存對此約會所做的變更？"
 
 # calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:56
+msgid "Would you like to save your changes to this memo?"
+msgstr "要儲存對此備忘錄所做的變更？"
+
+# calendar/gui/dialogs/save-comp.c:51
+#: ../calendar/calendar.error.xml.h:57
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的變更？"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../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 "
@@ -4719,49 +4713,53 @@ msgstr ""
 "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
 "解決方案是將該伺服器升級至支援的版本。"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:65
 msgid "You have changed this appointment, but not yet saved it."
 msgstr "您已經變更此約會，但尚未儲存它。"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../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
 #: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:72
 msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
 # ui/evolution-message-composer.xml.h:26
-#: ../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}."
 
 #: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
-#: ../smime/gui/component.c:48
+#: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "輸入密碼"
 
@@ -4891,7 +4889,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:591
 #: ../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
@@ -4946,10 +4944,10 @@ msgstr "約會"
 # addressbook/backend/ebook/e-card.c:3442
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1270
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1276
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1272
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1278
 #: ../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,7 +4967,7 @@ msgstr "忽略時間(_T):"
 #: ../ui/evolution-message-composer.xml.h:46
 #: ../ui/evolution-signature-editor.xml.h:13
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:37
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4983,35 +4981,35 @@ msgid "location of appointment"
 msgstr "約會的地點"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1111
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1254
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1120
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1122
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1130
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1188
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
 # widgets/misc/e-messagebox.c:159
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1348
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1372
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1352
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -5023,7 +5021,7 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1378
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -5043,7 +5041,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1392
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5580,12 +5578,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:579
 #: ../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 "行事曆"
@@ -5707,7 +5705,6 @@ msgid "New calendar"
 msgstr "新行事曆"
 
 #: ../calendar/gui/calendar-component.c:1482
-#: ../calendar/gui/dialogs/event-page.c:872
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
@@ -5753,10 +5750,15 @@ msgstr "拒絕許可權來開啟行事曆"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1271
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
+# calendar/gui/e-calendar-table.c:162
+#: ../calendar/gui/dialogs/alarm-dialog.c:567
+msgid "Edit Alarm"
+msgstr "編輯鬧鈴"
+
 # data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
@@ -5880,7 +5882,7 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "約會開始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:200
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:232
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -5946,7 +5948,7 @@ msgid "MIME type:"
 msgstr "MIME 類型:"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:469
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
 
@@ -6012,7 +6014,7 @@ msgstr "顯示"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../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 "空閒/忙碌"
@@ -6061,7 +6063,7 @@ msgstr ""
 # mail/mail-config.glade.h:54
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:106
 msgid "Pick a color"
 msgstr "選取顏色"
 
@@ -6115,7 +6117,7 @@ msgid "Thursday"
 msgstr "星期四"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#: ../calendar/gui/dialogs/event-page.glade.h:14
+#: ../calendar/gui/dialogs/event-page.glade.h:15
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
@@ -6133,80 +6135,81 @@ msgid "Tuesday"
 msgstr "星期二"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
-msgid "W_eek starts:"
-msgstr "一週開始於(_E):"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
 
+#. A weekday like "Monday" follows
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+msgid "Wee_k starts on:"
+msgstr "一週開始於(_K):"
+
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "Work days:"
 msgstr "工作日:"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_12 hour (AM/PM)"
 msgstr "_12 小時 (AM/PM)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_24 hour"
 msgstr "_24 小時"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: ../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:14
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # ui/evolution-mail.xml.h:43
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Mon"
 msgstr "週一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Tue"
 msgstr "週二(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
 msgid "before every appointment"
 msgstr "前"
 
@@ -6386,7 +6389,7 @@ msgid "Due "
 msgstr "期限 "
 
 # mail/mail-tools.c:219
-#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
@@ -6394,21 +6397,21 @@ msgstr "附加訊息 - %s"
 # composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2859
-#: ../composer/e-msg-composer.c:3038
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3034
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3099
 #: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
 #: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3101
 #: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
@@ -6418,7 +6421,7 @@ msgstr "取消拖拉(_D)"
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2479
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6441,11 +6444,11 @@ 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
-#: ../composer/e-msg-composer.c:3601
+#: ../composer/e-msg-composer.c:3597
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:14
 #: ../widgets/table/e-table-config.glade.h:18
@@ -6454,7 +6457,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
+#: ../composer/e-msg-composer.c:3598 ../mail/em-folder-tree.c:2058
 #: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "屬性(_P)"
@@ -6462,7 +6465,7 @@ msgstr "屬性(_P)"
 # composer/e-msg-composer-attachment-bar.c:500
 #: ../calendar/gui/dialogs/comp-editor.c:1097
 #: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3604
+#: ../composer/e-msg-composer.c:3600
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
@@ -6522,7 +6525,7 @@ msgstr "沒有摘要"
 #: ../calendar/gui/dialogs/comp-editor.c:2668
 #: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
 #: ../mail/em-utils.c:502 ../mail/em-utils.c:539
-#: ../widgets/misc/e-attachment-bar.c:342
+#: ../widgets/misc/e-attachment-bar.c:339
 msgid "attachment"
 msgstr "附件"
 
@@ -6614,89 +6617,101 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/dialogs/event-editor.c:541
+#: ../calendar/gui/dialogs/event-editor.c:547
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:545
+#: ../calendar/gui/dialogs/event-editor.c:551
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../calendar/gui/dialogs/event-page.c:878
+#: ../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:873
+#: ../calendar/gui/dialogs/event-page.glade.h:7
+msgid "Cale_ndar:"
+msgstr "行事曆(_N):"
+
+#: ../calendar/gui/dialogs/event-page.c:879
+#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/task-page.c:446
-msgid "Or_ganizer"
-msgstr "召集人(_G)"
+msgid "Or_ganizer:"
+msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:916
+#: ../calendar/gui/dialogs/event-page.c:917
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
-#: ../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/e-calendar-table.c:154
-#: ../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/event-editor-dialog.glade.h:31
-#: ../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)"
 
 # shell/e-storage.c:475
-#: ../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/event-editor.c:1612
-#: ../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"
@@ -6704,7 +6719,7 @@ msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
 # calendar/gui/event-editor-dialog.glade.h:36
-#: ../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"
@@ -6712,27 +6727,54 @@ msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
 # calendar/gui/event-editor.c:1612
-#: ../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 分鐘"
 msgstr[1] "約會前 %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:2271
+#: ../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:1505 ../widgets/misc/e-dateedit.c:1719
+msgid "None"
+msgstr "無"
+
 # calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:1
-msgid "1 hour before appointment"
-msgstr "約會前 1 小時"
+msgid "1 day before appointment"
+msgstr "約會前 1 天"
 
 # calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:2
-msgid "15 minutes before appointment"
-msgstr "約會前 15 分鐘"
+msgid "1 hour before appointment"
+msgstr "約會前 1 小時"
 
 # calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:3
-msgid "1day before appointment"
-msgstr "約會前 1 天"
+msgid "15 minutes before appointment"
+msgstr "約會前 15 分鐘"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.glade.h:5
@@ -6741,46 +6783,39 @@ 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
-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
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "D_escription:"
+msgstr "描述(_E):"
 
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../calendar/gui/dialogs/event-page.glade.h:10
+#: ../calendar/gui/dialogs/event-page.glade.h:11
 msgid "Event Description"
 msgstr "事件描述"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:11
+#: ../calendar/gui/dialogs/event-page.glade.h:12
 msgid "Locat_ion:"
 msgstr "地點(_I):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:12
-#: ../calendar/gui/dialogs/meeting-page.glade.h:5
-msgid "Or_ganizer:"
-msgstr "會議召集人(_G):"
-
-#: ../calendar/gui/dialogs/event-page.glade.h:13
+#: ../calendar/gui/dialogs/event-page.glade.h:14
 #: ../calendar/gui/dialogs/task-page.glade.h:6
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
-#: ../calendar/gui/dialogs/event-page.glade.h:15
-msgid "_Description:"
-msgstr "描述(_D):"
-
+# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/event-page.glade.h:16
-msgid "_Set alarm\t"
-msgstr "設定鬧鈴(_S)\t"
+msgid "_Alarm"
+msgstr "鬧鈴(_A)"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:17
 msgid "_Time:"
@@ -6807,28 +6842,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 "無"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
@@ -6916,58 +6929,23 @@ msgid "Organizer:"
 msgstr "會議召集人:"
 
 # calendar/gui/print.c:362
-#: ../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 "備忘錄"
 
 # addressbook/gui/component/addressbook.c:438
-#: ../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」開啟備忘錄。"
 
-# views/mail/galview.xml.h:4
-#: ../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/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
-#: ../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/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
-#: ../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/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
-#: ../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.c:439
 #: ../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):"
 
@@ -7284,21 +7262,17 @@ 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)"
 
 # addressbook/contact-editor/contact-editor.glade.h:8
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
-#: ../calendar/gui/dialogs/task-editor.c:423
+#: ../calendar/gui/dialogs/task-editor.c:424
 msgid "Task Details"
 msgstr "工作詳細資料"
 
-#: ../calendar/gui/dialogs/task-page.c:439
-msgid "_Group"
-msgstr "群組(_G)"
-
 #: ../calendar/gui/dialogs/task-page.c:824
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
@@ -7313,10 +7287,6 @@ msgstr "無法在 '%s' 開啟工作。"
 msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:3
-msgid "D_escription:"
-msgstr "描述(_E):"
-
 #: ../calendar/gui/dialogs/task-page.glade.h:4
 msgid "Or_ganiser:"
 msgstr "召集人(_G):"
@@ -7534,8 +7504,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 "狀態:"
 
@@ -7544,6 +7514,30 @@ msgstr "狀態:"
 msgid "Priority:"
 msgstr "優先程度："
 
+# calendar/gui/calendar-model.c:360
+# calendar/gui/calendar-model.c:898
+# calendar/gui/e-calendar-table.c:323
+#: ../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/calendar-model.c:363
+# calendar/gui/calendar-model.c:900
+# calendar/gui/e-calendar-table.c:324
+#: ../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/calendar-model.c:366
+# calendar/gui/calendar-model.c:902
+# calendar/gui/e-calendar-table.c:325
+#: ../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-calendar-table.c:153
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
@@ -7613,9 +7607,9 @@ 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/plugin-manager/plugin-manager.c:72
-#: ../widgets/misc/e-attachment-bar.c:691
+#: ../plugins/itip-formatter/itip-formatter.c:1651
+#: ../plugins/plugin-manager/plugin-manager.c:68
+#: ../widgets/misc/e-attachment-bar.c:686
 #: ../widgets/misc/e-charset-picker.c:62
 msgid "Unknown"
 msgstr "不明"
@@ -7637,7 +7631,7 @@ msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-display.c:196
-#: ../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 "選擇用來儲存選定的附加檔案的資料夾..."
 
@@ -7741,7 +7735,7 @@ msgstr "更新物件"
 # composer/e-msg-composer.c:774
 #: ../calendar/gui/e-calendar-table.c:1034
 #: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
-#: ../composer/e-msg-composer.c:1354
+#: ../composer/e-msg-composer.c:1349
 msgid "Save as..."
 msgstr "另存新檔..."
 
@@ -8149,13 +8143,13 @@ 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 "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../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 "暫時接受"
 
@@ -8163,7 +8157,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 "婉拒"
 
@@ -8399,7 +8393,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 "到會者狀態不能更新，因為項目已經不存在"
 
@@ -8594,7 +8588,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 "已委派"
 
@@ -8639,10 +8633,7 @@ msgstr "%a %m/%d/%Y"
 # widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
-#. This is a strftime() format for a short date. %m = month,
-#. %d = day of month, %Y = year (all digits).
 #: ../calendar/gui/e-meeting-time-sel-item.c:452
-#: ../widgets/misc/e-dateedit.c:1737
 msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
@@ -11122,7 +11113,7 @@ msgstr "%.0fG"
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:995
+#: ../widgets/misc/e-attachment-bar.c:986
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
@@ -11133,7 +11124,7 @@ msgstr "附加檔案列"
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
 #: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:441 ../widgets/misc/e-attachment.c:457
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "不能附加檔案 %s： %s"
@@ -11142,7 +11133,7 @@ msgstr "不能附加檔案 %s： %s"
 # camel/providers/local/camel-mbox-store.c:146
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:449
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
@@ -11150,17 +11141,17 @@ msgstr "不能附加檔案 %s：不是一個合法的檔案"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../composer/e-msg-composer-hdrs.c:558
+#: ../composer/e-msg-composer-hdrs.c:557
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
 # composer/e-msg-composer-attachment-bar.c:501
-#: ../composer/e-msg-composer-hdrs.c:559
+#: ../composer/e-msg-composer-hdrs.c:558
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
 # composer/e-msg-composer-hdrs.c:324
-#: ../composer/e-msg-composer-hdrs.c:593
+#: ../composer/e-msg-composer-hdrs.c:589
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
@@ -11172,7 +11163,7 @@ msgstr "按這裡新增目錄服務"
 #. * because that causes from_changed to be called, which
 #. * expects the reply_to fields to be initialized.
 #.
-#: ../composer/e-msg-composer-hdrs.c:623
+#: ../composer/e-msg-composer-hdrs.c:619
 msgid "_Reply-To:"
 msgstr "回覆地址(_R):"
 
@@ -11180,7 +11171,7 @@ msgstr "回覆地址(_R):"
 #.
 #. * From
 #.
-#: ../composer/e-msg-composer-hdrs.c:630
+#: ../composer/e-msg-composer-hdrs.c:626
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
@@ -11188,37 +11179,37 @@ msgstr "寄件者(_O):"
 #.
 #. * Subject
 #.
-#: ../composer/e-msg-composer-hdrs.c:637
+#: ../composer/e-msg-composer-hdrs.c:633
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
 # composer/e-msg-composer-hdrs.c:386
-#: ../composer/e-msg-composer-hdrs.c:646
+#: ../composer/e-msg-composer-hdrs.c:642
 msgid "_To:"
 msgstr "收件者(_T):"
 
 # composer/e-msg-composer-hdrs.c:387
-#: ../composer/e-msg-composer-hdrs.c:647
+#: ../composer/e-msg-composer-hdrs.c:643
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
 # composer/e-msg-composer-hdrs.c:390
-#: ../composer/e-msg-composer-hdrs.c:650
+#: ../composer/e-msg-composer-hdrs.c:646
 msgid "_Cc:"
 msgstr "副本(_C):"
 
 # composer/e-msg-composer-hdrs.c:391
-#: ../composer/e-msg-composer-hdrs.c:651
+#: ../composer/e-msg-composer-hdrs.c:647
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
 # composer/e-msg-composer-hdrs.c:394
-#: ../composer/e-msg-composer-hdrs.c:654
+#: ../composer/e-msg-composer-hdrs.c:650
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
 # composer/e-msg-composer-hdrs.c:395
-#: ../composer/e-msg-composer-hdrs.c:655
+#: ../composer/e-msg-composer-hdrs.c:651
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -11228,16 +11219,16 @@ msgstr "輸入郵件密件副本的收件者"
 #.
 #. * Post-To
 #.
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:658
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:663
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡，選取要張貼的資料夾"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: ../composer/e-msg-composer-hdrs.c:673
+#: ../composer/e-msg-composer-hdrs.c:669
 msgid "Post To:"
 msgstr "張貼到:"
 
@@ -11253,12 +11244,12 @@ msgstr "附加(_T)"
 msgid "Insert Attachment"
 msgstr "插入附加檔案"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:828
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽名送出的郵件：此帳號沒有設定簽名憑證"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:835
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -11267,63 +11258,63 @@ msgstr "無法加密送出的郵件：沒有設定加密憑證(此帳號)"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
+#: ../composer/e-msg-composer.c:1295 ../composer/e-msg-composer.c:2508
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
-#: ../composer/e-msg-composer.c:3847
+#: ../composer/e-msg-composer.c:1298 ../composer/e-msg-composer.c:2511
+#: ../composer/e-msg-composer.c:3843
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
 # camel/camel-sasl-login.c:127
-#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
+#: ../composer/e-msg-composer.c:1330 ../composer/e-msg-composer.c:1364
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
 
 # camel/camel-filter-driver.c:671
-#: ../composer/e-msg-composer.c:1407
+#: ../composer/e-msg-composer.c:1402
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../composer/e-msg-composer.c:1415
+#: ../composer/e-msg-composer.c:1410
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
 # mail/mail-search.c:138
-#: ../composer/e-msg-composer.c:1693
+#: ../composer/e-msg-composer.c:1689
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
 # composer/e-msg-composer.c:966
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1728
+#: ../composer/e-msg-composer.c:1724
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2155 ../mail/em-account-editor.c:596
+#: ../composer/e-msg-composer.c:2151 ../mail/em-account-editor.c:596
 #: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "自動產生的"
 
 # mail/mail-config.glade.h:74
-#: ../composer/e-msg-composer.c:2258
+#: ../composer/e-msg-composer.c:2254
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../composer/e-msg-composer.c:2526 ../composer/e-msg-composer.c:3729
-#: ../composer/e-msg-composer.c:3732
+#: ../composer/e-msg-composer.c:2522 ../composer/e-msg-composer.c:3725
+#: ../composer/e-msg-composer.c:3728
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:4956
+#: ../composer/e-msg-composer.c:4952
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11485,7 +11476,7 @@ msgstr "儲存郵件(_S)"
 # shell/e-shell-view-menu.c:228
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:514
+#: ../shell/main.c:511
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -11771,7 +11762,7 @@ msgstr "選擇一個檔案"
 
 #: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
 #: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
-#: ../mail/mail-config.glade.h:91
+#: ../mail/mail-config.glade.h:92
 msgid "Important"
 msgstr "重要"
 
@@ -11786,7 +11777,7 @@ msgstr "待辦"
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
+#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:96
 msgid "Later"
 msgstr "稍後"
 
@@ -12032,7 +12023,7 @@ msgid "Mail Accounts"
 msgstr "郵件帳號"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:99
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
@@ -12070,12 +12061,12 @@ msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
 # mail/mail-config.glade.h:35
-#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:91
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config.glade.h:57
-#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:118
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
@@ -12084,7 +12075,7 @@ msgid "Automatically check for _new mail every"
 msgstr "自動檢查新郵件每(_N)"
 
 # mail/mail-config.glade.h:65
-#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:130
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
@@ -12094,8 +12085,8 @@ msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
-#: ../plugins/exchange-operations/exchange-account-setup.c:315
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:123
+#: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "安全性"
 
@@ -12142,7 +12133,7 @@ msgstr "[預設值]"
 # mail/mail-config.glade.h:30
 #. 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:205
 #: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "已啟用"
@@ -12335,7 +12326,7 @@ msgid "is not Flagged"
 msgstr "沒有標幟的"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "垃圾郵件"
@@ -12542,7 +12533,7 @@ msgstr "草稿"
 # mail/local-config.glade.h:8
 #. 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:597
 msgid "Inbox"
 msgstr "收件匣"
 
@@ -12613,7 +12604,7 @@ msgstr "掃描「%s」內的資料夾"
 #: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
 #: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:49
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -12825,71 +12816,71 @@ msgstr "按一下來傳送郵件 %s"
 
 # mail/mail-search.c:319
 #. 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"
 
 # calendar/gui/calendar-model.c:1578
-#: ../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/mail-format.c:1161
-#: ../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/mail-config.glade.h:74
-#: ../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/mail-format.c:1161
-#: ../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/mail-config.glade.h:74
-#: ../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 "此郵件未加密。它的內容在透過網際網路傳送可能會被檢閱。"
 
-#: ../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 "
@@ -12899,21 +12890,21 @@ msgstr ""
 "日，並不是無法檢視此郵件的內容。"
 
 # ui/evolution-message-composer.xml.h:13
-#: ../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 "
@@ -12922,58 +12913,58 @@ 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/message-list.c:977
-#: ../mail/em-format-html-display.c:1169
+#: ../mail/em-format-html-display.c:1170
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %B %d, %Y, %l:%M %p"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../mail/em-format-html-display.c:1177
+#: ../mail/em-format-html-display.c:1178
 msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1180
+#: ../mail/em-format-html-display.c:1181
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "作者 %B %d, %Y, %l:%M %p"
 
-#: ../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)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:1620
+#: ../mail/em-format-html-display.c:1663
 msgid "Attachment Button"
 msgstr "附件按鈕"
 
 # mail/mail-display.c:196
-#: ../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 "儲存選取的..."
 
@@ -12981,33 +12972,33 @@ msgstr "儲存選取的..."
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #. 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)"
 
 # ui/evolution-calendar.xml.h:27
 # ui/evolution-message-composer.xml.h:18
-#: ../mail/em-format-html-display.c:1959
+#: ../mail/em-format-html-display.c:2002
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:2018
+#: ../mail/em-format-html-display.c:2061
 msgid "Toggle Attachment Bar"
 msgstr "切換附件列"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:2020
+#: ../mail/em-format-html-display.c:2063
 msgid "No Attachment"
 msgstr "無附件"
 
@@ -13866,7 +13857,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 "請稍候"
@@ -14401,90 +14392,94 @@ msgid "Encrypt out_going messages (by default)"
 msgstr "加密外送的郵件 (預設值)(_E)"
 
 #: ../mail/mail-config.glade.h:81
+msgid "Fi_xed width Font:"
+msgstr "固定寬度字型(_X):"
+
+#: ../mail/mail-config.glade.h:82
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
 # mail/folder-browser-factory.c:198
 # ui/evolution-event-editor.xml.h:39
 # ui/evolution-task-editor-dialog.xml.h:42
-#: ../mail/mail-config.glade.h:82
+#: ../mail/mail-config.glade.h:83
 msgid "Font Properties"
 msgstr "字型內容"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:84
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:85
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
 # mail/mail-config.glade.h:36
-#: ../mail/mail-config.glade.h:86
+#: ../mail/mail-config.glade.h:87
 msgid "HTML Mail"
 msgstr "HTML 郵件"
 
 # addressbook/printing/e-contact-print.glade.h:11
-#: ../mail/mail-config.glade.h:87
+#: ../mail/mail-config.glade.h:88
 msgid "Headers"
 msgstr "標頭"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:89
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:90
 msgid "I_nclude remote tests"
 msgstr "包含遠端測試(_N)"
 
 # mail/mail-config.glade.h:37
-#: ../mail/mail-config.glade.h:92
+#: ../mail/mail-config.glade.h:93
 msgid "Inline"
 msgstr "行內"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: ../mail/mail-config.glade.h:94
+#: ../mail/mail-config.glade.h:95
 msgid "Languages Table"
 msgstr "語言表"
 
 # mail/mail-config.glade.h:40
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:97
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
-#: ../mail/mail-config.glade.h:97
+#: ../mail/mail-config.glade.h:98
 msgid "Mail Headers Table"
 msgstr "郵件標頭表"
 
 # mail/local-config.glade.h:2
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:100
 msgid "Mailbox location"
 msgstr "信箱位置"
 
 # views/mail/galview.xml.h:4
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:101
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:102
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在您首次連線之前將不會提示您輸入密碼"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:103
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:104
 msgid "PGP/GPG _Key ID:"
 msgstr "PGP/GPG 鑰匙 ID(_K):"
 
-#: ../mail/mail-config.glade.h:106
+#: ../mail/mail-config.glade.h:107
 msgid "Play sound file when new mail arri_ves"
 msgstr "當新郵件到達時播放聲音檔案(_V)"
 
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:108
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -14493,7 +14488,7 @@ msgstr ""
 "這個名稱將只做為顯示之用。"
 
 # mail/mail-config-druid.c:105
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -14502,7 +14497,7 @@ msgstr ""
 "服務供應商。"
 
 # mail/mail-config-druid.c:99
-#: ../mail/mail-config.glade.h:110
+#: ../mail/mail-config.glade.h:111
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -14511,125 +14506,121 @@ msgstr ""
 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出"
 "的郵件內包含這些資訊。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
 # ui/evolution-mail.xml.h:14
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
 # camel/camel-filter-driver.c:671
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Quote original message"
 msgstr "引用原始郵件"
 
 # mail/mail-config.glade.h:56
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Re_member password"
 msgstr "記住密碼(_M)"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
 # ui/evolution-contact-editor.xml.h:3
-#: ../mail/mail-config.glade.h:119
+#: ../mail/mail-config.glade.h:120
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
 # ui/evolution-contact-editor.xml.h:3
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "選取(_L)..."
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../mail/mail-config.glade.h:124
+#: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於列印的 HTML 固定寬度字型"
 
-#: ../mail/mail-config.glade.h:125
+#: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
 # mail/mail-ops.c:603
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Send message receipts:"
 msgstr "傳送郵件回條:"
 
 # mail/mail-config.glade.h:66
-#: ../mail/mail-config.glade.h:130
+#: ../mail/mail-config.glade.h:131
 msgid "Sending Mail"
 msgstr "傳送郵件"
 
-#: ../mail/mail-config.glade.h:131
+#: ../mail/mail-config.glade.h:132
 msgid "Sent _Messages Folder:"
 msgstr "傳送郵件資料夾(_M):"
 
-#: ../mail/mail-config.glade.h:132
+#: ../mail/mail-config.glade.h:133
 msgid "Ser_ver requires authentication"
 msgstr "伺服器要求驗證(_V)"
 
-#: ../mail/mail-config.glade.h:133
+#: ../mail/mail-config.glade.h:134
 msgid "Server _Type: "
 msgstr "伺服器類型(_T):"
 
-#: ../mail/mail-config.glade.h:134
+#: ../mail/mail-config.glade.h:135
 msgid "Sig_ning certificate:"
 msgstr "簽名憑證(_N):"
 
-#: ../mail/mail-config.glade.h:135
+#: ../mail/mail-config.glade.h:136
 msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-config.glade.h:136
+#: ../mail/mail-config.glade.h:137
 msgid "Signatures"
 msgstr "簽名"
 
 # mail/mail-config.glade.h:74
-#: ../mail/mail-config.glade.h:137
+#: ../mail/mail-config.glade.h:138
 msgid "Signatures Table"
 msgstr "簽章表"
 
-#: ../mail/mail-config.glade.h:138
+#: ../mail/mail-config.glade.h:139
 msgid "Specify _filename:"
 msgstr "指定檔案名稱(_F):"
 
-#: ../mail/mail-config.glade.h:139
+#: ../mail/mail-config.glade.h:140
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.glade.h:140
-msgid "T_erminal Font:"
-msgstr "終端機字型(_E):"
-
 #: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "類型(_Y):"
@@ -15143,7 +15134,7 @@ msgstr "檢查新郵件"
 
 # camel/camel-smime-context.c:194
 #: ../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 所需的密碼"
@@ -16395,11 +16386,11 @@ msgid ""
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../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."
@@ -16407,77 +16398,77 @@ 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 "我目前在辦公室"
 
 # camel/camel-smime-context.c:194
 #. 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 帳號的授權設定"
 
 # shell/importer/import.glade.h:2
-#: ../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 資料夾的大小"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: ../plugins/exchange-operations/exchange-account-setup.c:359
+#: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "資料夾大小"
 
 # ui/evolution-event-editor.xml.h:9
 # ui/evolution-task-editor-dialog.xml.h:10
-#: ../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:"
 
 # camel/camel-sasl-anonymous.c:110
 # camel/camel-sasl-plain.c:87
-#: ../plugins/exchange-operations/exchange-account-setup.c:645
+#: ../plugins/exchange-operations/exchange-account-setup.c:635
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
 # mail/mail-config.glade.h:11
-#: ../plugins/exchange-operations/exchange-account-setup.c:838
+#: ../plugins/exchange-operations/exchange-account-setup.c:828
 msgid "Authentication Type"
 msgstr "驗證類型"
 
 # mail/mail-config.glade.h:1
-#: ../plugins/exchange-operations/exchange-account-setup.c:852
+#: ../plugins/exchange-operations/exchange-account-setup.c:842
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
@@ -16549,34 +16540,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 "讀取委託清單錯誤。"
 
@@ -16637,17 +16628,17 @@ 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 "資料夾名稱"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:140
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "資料夾大小"
 
-#: ../plugins/exchange-operations/exchange-folder-subscription.c:192
+#: ../plugins/exchange-operations/exchange-folder-subscription.c:279
 #: ../plugins/exchange-operations/org-gnome-folder-subscription.xml.h:1
 msgid "Subscribe to Other User's Folder"
 msgstr "訂閱其他使用者的資料夾"
@@ -16662,14 +16653,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」"
@@ -16915,7 +16906,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
-#: ../shell/e-shell.c:1277
+#: ../shell/e-shell.c:1269
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -17189,7 +17180,7 @@ msgstr "<b>使用者：</b>"
 
 # views/mail/galview.xml.h:4
 #: ../plugins/groupwise-features/properties.glade.h:4
-#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
 msgstr "郵件"
 
@@ -17278,14 +17269,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 "對話方塊 1"
-
 #: ../plugins/groupwise-features/proxy-login-dialog.glade.h:1
 msgid "<b>Account Name</b>"
 msgstr "<b>帳號名稱</b>"
@@ -17459,119 +17442,119 @@ msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
 # shell/e-storage.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:487
+#: ../plugins/itip-formatter/itip-formatter.c:488
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
 # shell/e-storage.c:475
-#: ../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 "尋找這個約會既存的版本"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: ../plugins/itip-formatter/itip-formatter.c:724
+#: ../plugins/itip-formatter/itip-formatter.c:726
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
 # shell/e-storage.c:475
-#: ../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"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../plugins/itip-formatter/itip-formatter.c:905
+#: ../plugins/itip-formatter/itip-formatter.c:907
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
 # calendar/gui/dialogs/delete-comp.c:102
-#: ../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 "由於不合法的狀態使得到會者狀態無法更新！"
 
 # shell/e-storage.c:475
-#: ../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 "到會者狀態已更新"
 
 # shell/e-storage.c:465
-#: ../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。"
 
 # ui/evolution-calendar.xml.h:22
-#: ../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"
@@ -17971,29 +17954,29 @@ msgstr "更新(_U)"
 
 # calendar/gui/event-editor-dialog.glade.h:31
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:892
+#: ../plugins/itip-formatter/itip-view.c:888
 msgid "Start time:"
 msgstr "開始時間:"
 
 # calendar/gui/event-editor-dialog.glade.h:30
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:901
+#: ../plugins/itip-formatter/itip-view.c:897
 msgid "End time:"
 msgstr "結束時間:"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
 #. 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 "註解："
 
 # shell/e-storage.c:475
-#: ../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 "套用至所有實體(_A)"
 
@@ -18316,7 +18299,7 @@ msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 # addressbook/gui/widgets/e-addressbook-view.c:732
 #. 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:180
 msgid "Plugin Manager"
 msgstr "外掛管理程式"
 
@@ -18334,31 +18317,20 @@ msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
 # calendar/gui/event-editor-dialog.glade.h:39
-#: ../plugins/plugin-manager/plugin-manager.c:45
+#: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "作者"
 
-# addressbook/contact-editor/fullname.glade.h:4
-#: ../plugins/plugin-manager/plugin-manager.c:46
-msgid "Id"
-msgstr "Id"
-
-# addressbook/gui/component/addressbook-config.c:520
-# mail/mail-config.glade.h:53
-#: ../plugins/plugin-manager/plugin-manager.c:47
-msgid "Path"
-msgstr "路徑"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: ../plugins/plugin-manager/plugin-manager.c:48
+#: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
 msgid "Description"
 msgstr "描述:"
 
-#: ../plugins/plugin-manager/plugin-manager.c:201
+#: ../plugins/plugin-manager/plugin-manager.c:193
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些變更在重新啟動後才會生效"
 
@@ -18367,8 +18339,8 @@ msgstr "注意：某些變更在重新啟動後才會生效"
 # mail/mail-ops.c:1014
 # mail/mail-ops.c:1032
 # mail/mail-ops.c:1033
-#: ../plugins/plugin-manager/plugin-manager.c:210
-#: ../plugins/plugin-manager/plugin-manager.c:271
+#: ../plugins/plugin-manager/plugin-manager.c:202
+#: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
 msgstr "外掛程式"
 
@@ -18521,7 +18493,7 @@ msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../plugins/publish-calendar/publish-calendar.glade.h:29
+#: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
 "Free/Busy"
@@ -18698,8 +18670,8 @@ msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
 # shell/e-shell-importer.c:602
-#: ../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 "選取目的檔案"
 
@@ -18757,13 +18729,13 @@ msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
 # composer/e-msg-composer-hdrs.c:355
-#: ../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 "匯入資料。"
@@ -18852,40 +18824,48 @@ msgid "Printer settings"
 msgstr "印表機設定"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Sidebar is visible"
+msgstr "顯示側邊欄"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:470
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12
+#: ../shell/apps_evolution_shell.schemas.in.in.h:13
 msgid ""
-"The configuration version of Evolution, with major/minor/configuration level"
-msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示"
+"The configuration version of Evolution, with major/minor/configuration level "
+"(for example \"2.6.0\")."
+msgstr ""
+"Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
 # ui/evolution.xml.h:32
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.in.h:14
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
 # ui/evolution.xml.h:32
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.in.h:15
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設寬度，以像素計。"
 
 # ui/evolution.xml.h:32
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
-"configuration level"
-msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示"
+"configuration level (for example \"2.6.0\")."
+msgstr ""
+"上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如"
+"「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -18894,32 +18874,36 @@ msgstr ""
 "視窗按鈕的風格。可以是「文字」、「圖示」、「兩者」、「工具列」。如果設為「工"
 "具列」，按鈕的風格會依 GNOME 工具列設定值決定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.in.h:19
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.in.h:20
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+msgid "Whether the sidebar should be visible."
+msgstr "是否可以看到側邊欄。"
+
+#: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.in.h:23
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.in.h:24
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.in.h:25
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.in.h:26
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
@@ -18939,8 +18923,8 @@ msgstr "按「確定」關閉這些連線以離線"
 
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
-#: ../shell/e-shell-folder-title-bar.c:586
-#: ../shell/e-shell-folder-title-bar.c:587
+#: ../shell/e-shell-folder-title-bar.c:584
+#: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
 msgstr "(未命名)"
 
@@ -19072,7 +19056,7 @@ msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:51
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19081,20 +19065,20 @@ msgstr "離線工作(_W)"
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: ../shell/e-shell-window.c:370
+#: ../shell/e-shell-window.c:368
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
-#: ../shell/e-shell-window.c:378
+#: ../shell/e-shell-window.c:376
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
-#: ../shell/e-shell-window.c:385
+#: ../shell/e-shell-window.c:383
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
 # mail/mail-autofilter.c:70
-#: ../shell/e-shell-window.c:775
+#: ../shell/e-shell-window.c:783
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
@@ -19106,27 +19090,27 @@ msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:829 ../shell/e-shell.c:830
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1261 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1263
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: ../shell/e-shell.c:1273
+#: ../shell/e-shell.c:1265
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1275
+#: ../shell/e-shell.c:1267
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
@@ -19250,35 +19234,35 @@ msgstr ""
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
 #: ../shell/main.c:261
-msgid "Don't tell me again"
+msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: ../shell/main.c:471
+#: ../shell/main.c:468
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
-#: ../shell/main.c:475
+#: ../shell/main.c:472
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:478
+#: ../shell/main.c:475
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:482
+#: ../shell/main.c:479
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
 # shell/main.c:185
-#: ../shell/main.c:485
+#: ../shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: ../shell/main.c:487
+#: ../shell/main.c:484
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:518
+#: ../shell/main.c:515
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19360,7 +19344,7 @@ msgstr "從以前的版本升級失敗：{0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but "
+"Upgrading your data and settings will require up to {0} of disk space, but "
 "you only have {1} available.\n"
 "\n"
 "You will need to make more space available in your home directory before you "
@@ -19429,7 +19413,7 @@ msgstr ""
 "\n"
 "編輯信任設定值："
 
-#: ../smime/gui/cert-trust-dialog.c:153
+#: ../smime/gui/cert-trust-dialog.c:154
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19438,7 +19422,7 @@ msgstr ""
 "因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效"
 "性。"
 
-#: ../smime/gui/cert-trust-dialog.c:157
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19483,20 +19467,20 @@ msgstr "到期"
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
 
-#: ../smime/gui/certificate-viewer.c:342
+#: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "憑證檢視器:%s"
 
 # camel/camel-smime-context.c:194
-#: ../smime/gui/component.c:45
+#: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "輸入 `%s' 的密碼"
 
 # camel/camel-smime-context.c:194
 #. we're setting the password initially
-#: ../smime/gui/component.c:68
+#: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "輸入憑證資料庫的新密碼"
 
@@ -19506,7 +19490,7 @@ msgstr "輸入憑證資料庫的新密碼"
 # camel/providers/nntp/camel-nntp-store.c:291
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
-#: ../smime/gui/component.c:70
+#: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "輸入新密碼"
 
@@ -19736,7 +19720,7 @@ msgid "_Edit CA Trust"
 msgstr "編輯 CA 信任(_E)"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:657
+#: ../smime/lib/e-cert-db.c:664
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
@@ -19933,28 +19917,28 @@ msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: ../tools/evolution-launch-composer.c:324
+#: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "要新增的附件。"
 
-#: ../tools/evolution-launch-composer.c:325
+#: ../tools/evolution-launch-composer.c:322
 msgid "Content type of the attachment."
 msgstr "附件的內容類型。"
 
-#: ../tools/evolution-launch-composer.c:326
+#: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
 msgstr "要顯示在郵件的檔案名稱。"
 
 # calendar/gui/gnome-cal.c:235
-#: ../tools/evolution-launch-composer.c:327
+#: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "附件的描述。"
 
-#: ../tools/evolution-launch-composer.c:328
+#: ../tools/evolution-launch-composer.c:325
 msgid "Mark attachment to be shown inline by default."
 msgstr "將附件標示成預設顯示在行內。"
 
-#: ../tools/evolution-launch-composer.c:329
+#: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
 msgstr "郵件的預設主旨。"
 
@@ -20123,7 +20107,7 @@ msgstr "將選定資料夾中的連絡人儲存為 VCard"
 
 # ui/evolution-event-editor.xml.h:48
 # ui/evolution-task-editor-dialog.xml.h:57
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2709
 msgid "Select All"
 msgstr "全選"
 
@@ -20209,7 +20193,7 @@ msgstr "將連絡人移到(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "將資料夾連絡人移到(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:40
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:43
 msgid "_New"
 msgstr "新增(_N)"
 
@@ -20462,11 +20446,11 @@ 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:14
-#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:35
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:38
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:37
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:40
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -20490,15 +20474,18 @@ msgstr "全天事件"
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../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 "分類為公開"
 
@@ -20519,7 +20506,8 @@ msgstr "將此項設為循環事件"
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: ../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)"
 
@@ -20566,7 +20554,8 @@ msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../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 "切換是否顯示「分類」"
 
@@ -20587,14 +20576,16 @@ msgstr "全天事件(_A)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-#: ../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)"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../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)"
 
@@ -20606,7 +20597,8 @@ msgstr "空閒/忙碌(_F)"
 # calendar/gui/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: ../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)"
 
@@ -20664,7 +20656,7 @@ msgstr "資料夾(_O)"
 # views/mail/galview.xml.h:4
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Message _List As"
-msgstr "將郵件排列為(_L)"
+msgstr "郵件列為(_L)"
 
 #: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
@@ -20740,13 +20732,13 @@ msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:11
+#: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "複製已選定的郵件到剪貼簿"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:6 ../ui/evolution-mail-message.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:6
 msgid "Cut selected message(s) to the clipboard"
 msgstr "將郵件剪下並貼到剪貼簿"
 
@@ -20782,12 +20774,12 @@ msgid ""
 msgstr "隱藏已刪除的郵件而非將它們以刪除線的形式顯示"
 
 #: ../ui/evolution-mail-list.xml.h:15
-msgid "Mar_k Messages as Read"
-msgstr "標示郵件為已閱讀(_K)"
+msgid "Mar_k All Messages as Read"
+msgstr "標示所有郵件為已閱讀(_K)"
 
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
-#: ../ui/evolution-mail-list.xml.h:16 ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-list.xml.h:16
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
@@ -20904,10 +20896,15 @@ msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-message.xml.h:11
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
+# ui/evolution-mail.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:12
+msgid "Copy selected messages to the clipboard"
+msgstr "複製已選定的郵件到剪貼簿"
+
 # ui/evolution.xml.h:10
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Create R_ule"
@@ -20953,6 +20950,12 @@ msgstr "為這個通信論壇建立過濾器規則"
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
+# ui/evolution-event-editor.xml.h:31
+# ui/evolution-task-editor-dialog.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:22
+msgid "Cut selected messages to the clipboard"
+msgstr "將郵件剪下並貼到剪貼簿"
+
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "減少文字大小"
@@ -20969,13 +20972,13 @@ msgstr "顯示下一封郵件"
 
 # ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:27
-msgid "Display the next unread message"
-msgstr "顯示下一封未閱讀的郵件"
+msgid "Display the next thread"
+msgstr "顯示下一封相關郵件"
 
 # ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:28
-msgid "Display the next unread thread"
-msgstr "顯示下一封未閱讀的相關郵件"
+msgid "Display the next unread message"
+msgstr "顯示下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:29
@@ -21019,7 +21022,7 @@ msgstr "篩選所選信件的垃圾郵件狀態"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:38
-msgid "Flag selected message(s) for follow-up"
+msgid "Flag selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨標幟"
 
 #: ../ui/evolution-mail-message.xml.h:39
@@ -21062,32 +21065,32 @@ msgstr "標示成(_K)"
 
 # ui/evolution-mail.xml.h:52
 #: ../ui/evolution-mail-message.xml.h:49
-msgid "Mark the selected message(s) as having been read"
+msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:50
-msgid "Mark the selected message(s) as important"
+msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:51
-msgid "Mark the selected message(s) as junk"
-msgstr "將選取的郵件標示成垃圾郵件"
+msgid "Mark the selected messages as junk"
+msgstr "將選定的郵件標示成垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:52
-msgid "Mark the selected message(s) as not being junk"
+msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:53
-msgid "Mark the selected message(s) as not having been read"
+msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:54
-msgid "Mark the selected message(s) as unimportant"
+msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
@@ -21097,7 +21100,7 @@ msgstr "將選定的郵件標示成要刪除"
 
 # ui/evolution-mail.xml.h:56
 #: ../ui/evolution-mail-message.xml.h:56
-msgid "Move selected message(s) to another folder"
+msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
 #: ../ui/evolution-mail-message.xml.h:58
@@ -21124,18 +21127,24 @@ msgstr "開啟視窗以便撰寫郵件"
 
 # ui/evolution-mail.xml.h:59
 #: ../ui/evolution-mail-message.xml.h:63
-msgid "Open the selected message in a new window"
+msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
 #: ../ui/evolution-mail-message.xml.h:64
-msgid "Open the selected message in the composer for editing"
-msgstr "在撰寫視窗開啟選取的郵件來編輯"
+msgid "Open the selected messages in the composer for editing"
+msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
+# ui/evolution-event-editor.xml.h:31
+# ui/evolution-task-editor-dialog.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:66
+msgid "Paste messages from the clipboard"
+msgstr "自剪貼簿貼上郵件"
+
 # mail/mail-ops.c:825
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Pos_t New Message to Folder"
@@ -21185,8 +21194,8 @@ msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:74
 #: ../ui/evolution-mail-message.xml.h:84
-msgid "Save the message as a text file"
-msgstr "另存郵件成文字檔案"
+msgid "Save the selected messages as a text file"
+msgstr "將選定的郵件另存成文字檔案"
 
 # ui/evolution-mail.xml.h:95
 #: ../ui/evolution-mail-message.xml.h:85
@@ -21236,12 +21245,12 @@ msgstr "在顯示的郵件內文中顯示閃爍游標"
 
 # ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-message.xml.h:94
-msgid "Show message in the normal style"
+msgid "Show messages in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
 #: ../ui/evolution-mail-message.xml.h:95
-msgid "Show message with all email headers"
+msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
@@ -21251,8 +21260,8 @@ msgstr "顯示郵件原始檔"
 
 # ui/evolution-mail.xml.h:94
 #: ../ui/evolution-mail-message.xml.h:97
-msgid "Un-delete the selected messages"
-msgstr "復原選定的郵件"
+msgid "Undelete the selected messages"
+msgstr "取消刪除選定的郵件"
 
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
@@ -21708,12 +21717,12 @@ msgstr "狀態詳細資料(_S)"
 
 # calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:3
-msgid "Copy selected task"
+msgid "Copy selected tasks"
 msgstr "複製選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:5
-msgid "Cut selected task"
+msgid "Cut selected tasks"
 msgstr "剪下選定的工作"
 
 # calendar/gui/e-calendar-table.c:714
@@ -21738,7 +21747,7 @@ msgstr "將選取的工作標示成完成"
 # ui/evolution-event-editor.xml.h:31
 # ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-tasks.xml.h:12
-msgid "Paste task from the clipboard"
+msgid "Paste tasks from the clipboard"
 msgstr "貼上剪貼簿上的工作"
 
 # ui/evolution-calendar.xml.h:22
@@ -21810,7 +21819,7 @@ msgstr "只顯示視窗按鈕的文字"
 # shell/e-shell-view-menu.c:228
 #: ../ui/evolution.xml.h:10
 msgid "Evolution _FAQ"
-msgstr "Evolution _FAQ"
+msgstr "Evolution ＿FAQ"
 
 # ui/evolution.xml.h:19
 #: ../ui/evolution.xml.h:11
@@ -21872,84 +21881,92 @@ msgstr "設定 Pilot 組態"
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-# ui/evolution.xml.h:28
 #: ../ui/evolution.xml.h:25
+msgid "Side _Bar"
+msgstr "側邊欄(_B)"
+
+#: ../ui/evolution.xml.h:26
+msgid "Status _Bar"
+msgstr "狀態列(_B)"
+
+# ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:27
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:28
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:29
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:34
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:30
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:22
-#: ../ui/evolution.xml.h:29
+#: ../ui/evolution.xml.h:31
 msgid "Tool_bar"
 msgstr "工具列(_B)"
 
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:32
 msgid "Tool_bar style"
 msgstr "工具列風格(_B)"
 
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:33
+msgid "View/Hide the Side Bar"
+msgstr "顯示/隱藏側邊列"
+
+#: ../ui/evolution.xml.h:34
 msgid "View/Hide the Status Bar"
 msgstr "顯示/隱藏狀態列"
 
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:35
 msgid "_About"
 msgstr "關於(_A)"
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:36
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:39
 msgid "_Forget Passwords"
 msgstr "遺忘密碼(_F)"
 
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution.xml.h:41
 msgid "_Hide buttons"
 msgstr "隱藏按鈕(_H)"
 
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution.xml.h:42
 msgid "_Icons only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:44
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:45
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: ../ui/evolution.xml.h:43
+#: ../ui/evolution.xml.h:46
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:47
 msgid "_Synchronization Options..."
 msgstr "同步化選項(_S)..."
 
-#: ../ui/evolution.xml.h:45
+#: ../ui/evolution.xml.h:48
 msgid "_Text only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:47
-msgid "_View Status Bar"
-msgstr "檢視狀態列(_V)"
-
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:50
 msgid "_Window"
 msgstr "視窗(_O)"
 
@@ -22023,7 +22040,7 @@ msgid "With _Status"
 msgstr "設定狀態(_S)"
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:197
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:645
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:642
 msgid "UTC"
 msgstr "UTC"
 
@@ -22085,9 +22102,9 @@ msgid "_Edit..."
 msgstr "編輯(_E)..."
 
 #: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1845
-#: ../widgets/table/e-table-scrolled.c:224
-#: ../widgets/table/e-table-scrolled.c:225
+#: ../widgets/table/e-table-header-item.c:1839
+#: ../widgets/table/e-table-scrolled.c:222
+#: ../widgets/table/e-table-scrolled.c:223
 msgid "Table"
 msgstr "表格"
 
@@ -22167,7 +22184,7 @@ msgstr "一二三四五六日"
 # widgets/misc/e-calendar-item.c:1061
 # widgets/misc/e-calendar-item.c:2756
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1098
+#: ../widgets/misc/e-calendar-item.c:1093
 msgid "%B %Y"
 msgstr "%B %Y"
 
@@ -22185,62 +22202,62 @@ msgstr "上一步按鈕"
 msgid "Month Calendar"
 msgstr "月行事曆"
 
-#: ../widgets/misc/e-canvas-background.c:459
-#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
-#: ../widgets/text/e-text.c:3569
+#: ../widgets/misc/e-canvas-background.c:457
+#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3563
+#: ../widgets/text/e-text.c:3564
 msgid "Fill color"
 msgstr "填入色彩"
 
-#: ../widgets/misc/e-canvas-background.c:466
-#: ../widgets/misc/e-canvas-background.c:467
-#: ../widgets/misc/e-canvas-background.c:473
-#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
+#: ../widgets/misc/e-canvas-background.c:464
+#: ../widgets/misc/e-canvas-background.c:465
+#: ../widgets/misc/e-canvas-background.c:471
+#: ../widgets/misc/e-canvas-background.c:472 ../widgets/text/e-entry.c:1291
 #: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3575
-#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
-#: ../widgets/text/e-text.c:3584
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3570
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3578
+#: ../widgets/text/e-text.c:3579
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
-#: ../widgets/misc/e-canvas-background.c:480
-#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
-#: ../widgets/text/e-text.c:3591
+#: ../widgets/misc/e-canvas-background.c:478
+#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3585
+#: ../widgets/text/e-text.c:3586
 msgid "Fill stipple"
 msgstr "填入網點"
 
-#: ../widgets/misc/e-canvas-background.c:487
-#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:485
+#: ../widgets/misc/e-canvas-background.c:486
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:494
-#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:492
+#: ../widgets/misc/e-canvas-background.c:493
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:501
-#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:499
+#: ../widgets/misc/e-canvas-background.c:500
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:508
-#: ../widgets/misc/e-canvas-background.c:509
+#: ../widgets/misc/e-canvas-background.c:506
+#: ../widgets/misc/e-canvas-background.c:507
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:978
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1427
+#: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/table/e-table-item.c:3011
 msgid "Minimum width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
-#: ../widgets/table/e-table-group-container.c:979
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1428
+#: ../widgets/table/e-table-group-container.c:975
 #: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/table/e-table-item.c:3012
 msgid "Minimum Width"
 msgstr "最小寬度"
 
@@ -22257,7 +22274,7 @@ msgid "Now"
 msgstr "現在"
 
 # widgets/misc/e-cell-date-edit.c:726
-#: ../widgets/misc/e-cell-date-edit.c:802
+#: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
@@ -22400,7 +22417,7 @@ msgstr "時刻的組合式方塊"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
+#: ../widgets/misc/e-dateedit.c:1436 ../widgets/misc/e-dateedit.c:1763
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -22409,7 +22426,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1448 ../widgets/misc/e-dateedit.c:1775
+#: ../widgets/misc/e-dateedit.c:1439 ../widgets/misc/e-dateedit.c:1766
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -22451,11 +22468,11 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3312
 msgid "Expander Size"
 msgstr "展開器大小"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3313
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
@@ -22467,17 +22484,23 @@ msgstr "指示器間距"
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
-#: ../widgets/misc/e-filter-bar.c:201
+# widgets/misc/e-filter-bar.c:239
+#. FIXME: get the toplevel window...
+#: ../widgets/misc/e-filter-bar.c:163
+msgid "Advanced Search"
+msgstr "進階搜尋"
+
+#: ../widgets/misc/e-filter-bar.c:202
 msgid "_Searches"
 msgstr "搜尋(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:203
+#: ../widgets/misc/e-filter-bar.c:204
 msgid "Searches"
 msgstr "搜尋"
 
 # widgets/misc/e-filter-bar.c:168
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:226
+#: ../widgets/misc/e-filter-bar.c:227
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
@@ -22500,11 +22523,11 @@ msgid "Choose Image"
 msgstr "選擇影像"
 
 # addressbook/contact-editor/fulladdr.glade.h:5
-#: ../widgets/misc/e-map.c:651
+#: ../widgets/misc/e-map.c:627
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../widgets/misc/e-map.c:653
+#: ../widgets/misc/e-map.c:629
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -22526,57 +22549,57 @@ msgid "Sync Categories:"
 msgstr "同步分類:"
 
 # mail/mail-ops.c:603
-#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1449 ../widgets/misc/e-reflow.c:1450
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1456 ../widgets/misc/e-reflow.c:1457
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1463 ../widgets/misc/e-reflow.c:1464
 msgid "Column width"
 msgstr "欄寬"
 
 # addressbook/gui/component/addressbook-config.c:430
 #. To translators: This is the accessibility name of
 #. the search bar's text entry widget
-#: ../widgets/misc/e-search-bar.c:372
+#: ../widgets/misc/e-search-bar.c:371
 msgid "Search Text Entry"
 msgstr "搜尋文字項目"
 
-#: ../widgets/misc/e-search-bar.c:591
+#: ../widgets/misc/e-search-bar.c:588
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:594
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:595 ../widgets/misc/e-search-bar.c:982
 msgid "_Clear"
 msgstr "清除(_C)"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: ../widgets/misc/e-search-bar.c:689
+#: ../widgets/misc/e-search-bar.c:686
 msgid "Search Type"
 msgstr "搜尋類型"
 
-#: ../widgets/misc/e-search-bar.c:893
+#: ../widgets/misc/e-search-bar.c:890
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:900
+#: ../widgets/misc/e-search-bar.c:897
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
-#: ../widgets/text/e-text.c:3491
+#: ../widgets/misc/e-search-bar.c:904 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3485
+#: ../widgets/text/e-text.c:3486
 msgid "Text"
 msgstr "文字"
 
-#: ../widgets/misc/e-search-bar.c:987
+#: ../widgets/misc/e-search-bar.c:984
 msgid "Find _Now"
 msgstr "立即尋找(_N)"
 
@@ -22603,7 +22626,7 @@ msgstr "選擇區模式"
 msgid "Cursor Mode"
 msgstr "游標模式"
 
-#: ../widgets/misc/e-send-options.c:524
+#: ../widgets/misc/e-send-options.c:522
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
@@ -22821,23 +22844,23 @@ msgstr "聚焦的欄"
 msgid "Unselected Column"
 msgstr "未選擇的欄"
 
-#: ../widgets/table/e-cell-text.c:1742
+#: ../widgets/table/e-cell-text.c:1744
 msgid "Strikeout Column"
 msgstr "刪除線欄"
 
-#: ../widgets/table/e-cell-text.c:1749
+#: ../widgets/table/e-cell-text.c:1751
 msgid "Underline Column"
 msgstr "底線欄"
 
-#: ../widgets/table/e-cell-text.c:1756
+#: ../widgets/table/e-cell-text.c:1758
 msgid "Bold Column"
 msgstr "粗體欄"
 
-#: ../widgets/table/e-cell-text.c:1763
+#: ../widgets/table/e-cell-text.c:1765
 msgid "Color Column"
 msgstr "色彩欄"
 
-#: ../widgets/table/e-cell-text.c:1777
+#: ../widgets/table/e-cell-text.c:1779
 msgid "BG Color Column"
 msgstr "背景色彩欄"
 
@@ -22887,7 +22910,6 @@ msgid "Sh_ow these fields in order:"
 msgstr "依序顯示這些欄位(_O):"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:12
-#: ../widgets/table/e-table-config.c:563
 #: ../widgets/table/e-table-config.glade.h:10
 msgid "Show Fields"
 msgstr "顯示欄位"
@@ -22955,11 +22977,6 @@ msgstr "未排序"
 msgid "No grouping"
 msgstr "未群組"
 
-# ui/evolution-message-composer.xml.h:47
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "可用的欄位"
-
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "群組依(_G)..."
@@ -22969,16 +22986,16 @@ msgid "_Show these fields in order:"
 msgstr "依序顯示這些欄位(_S):"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:646
-#: ../widgets/table/e-table-field-chooser.c:79
-#: ../widgets/table/e-table-header-item.c:1810
+#: ../widgets/table/e-table-field-chooser-item.c:635
+#: ../widgets/table/e-table-field-chooser.c:77
+#: ../widgets/table/e-table-header-item.c:1804
 msgid "DnD code"
 msgstr "DnD 碼"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:653
-#: ../widgets/table/e-table-field-chooser.c:86
-#: ../widgets/table/e-table-header-item.c:1824
+#: ../widgets/table/e-table-field-chooser-item.c:642
+#: ../widgets/table/e-table-field-chooser.c:84
+#: ../widgets/table/e-table-header-item.c:1818
 msgid "Full Header"
 msgstr "完整檔頭"
 
@@ -23001,12 +23018,12 @@ msgstr ""
 "想在您的表格中加入欄位，只要將它\n"
 "拖曳至您希望它出現的位置即可。"
 
-#: ../widgets/table/e-table-group-container.c:350
+#: ../widgets/table/e-table-group-container.c:346
 #, c-format
 msgid "%s : %s (%d item)"
 msgstr "%s : %s (%d 個項目)"
 
-#: ../widgets/table/e-table-group-container.c:351
+#: ../widgets/table/e-table-group-container.c:347
 #, c-format
 msgid "%s : %s (%d items)"
 msgstr "%s : %s (%d 個項目)"
@@ -23015,7 +23032,7 @@ msgstr "%s : %s (%d 個項目)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: ../widgets/table/e-table-group-container.c:356
+#: ../widgets/table/e-table-group-container.c:352
 #, c-format
 msgid "%s (%d item)"
 msgstr "%s (%d 個項目)"
@@ -23024,190 +23041,190 @@ msgstr "%s (%d 個項目)"
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: ../widgets/table/e-table-group-container.c:357
+#: ../widgets/table/e-table-group-container.c:353
 #, c-format
 msgid "%s (%d items)"
 msgstr "%s (%d 個項目)"
 
-#: ../widgets/table/e-table-group-container.c:901
-#: ../widgets/table/e-table-group-container.c:902
+#: ../widgets/table/e-table-group-container.c:897
+#: ../widgets/table/e-table-group-container.c:898
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2969 ../widgets/table/e-table-item.c:2970
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
-#: ../widgets/table/e-table-group-container.c:908
-#: ../widgets/table/e-table-group-container.c:909
+#: ../widgets/table/e-table-group-container.c:904
+#: ../widgets/table/e-table-group-container.c:905
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2976 ../widgets/table/e-table-item.c:2977
+#: ../widgets/table/e-tree.c:3265 ../widgets/table/e-tree.c:3266
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
 # calendar/gui/e-calendar-table.c:156
-#: ../widgets/table/e-table-group-container.c:915
-#: ../widgets/table/e-table-group-container.c:916
+#: ../widgets/table/e-table-group-container.c:911
+#: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2983 ../widgets/table/e-table-item.c:2984
+#: ../widgets/table/e-tree.c:3271 ../widgets/table/e-tree.c:3272
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
-#: ../widgets/table/e-table-group-container.c:922
-#: ../widgets/table/e-table-group-container.c:923
+#: ../widgets/table/e-table-group-container.c:918
+#: ../widgets/table/e-table-group-container.c:919
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-table-item.c:2990 ../widgets/table/e-table-item.c:2991
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
-#: ../widgets/table/e-table-group-container.c:929
-#: ../widgets/table/e-table-group-container.c:930
+#: ../widgets/table/e-table-group-container.c:925
+#: ../widgets/table/e-table-group-container.c:926
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:2997 ../widgets/table/e-table-item.c:2998
 msgid "Cursor mode"
 msgstr "游標模式"
 
-#: ../widgets/table/e-table-group-container.c:936
-#: ../widgets/table/e-table-group-container.c:937
+#: ../widgets/table/e-table-group-container.c:932
+#: ../widgets/table/e-table-group-container.c:933
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2962 ../widgets/table/e-table-item.c:2963
 msgid "Selection model"
 msgstr "選擇區模型"
 
-#: ../widgets/table/e-table-group-container.c:943
-#: ../widgets/table/e-table-group-container.c:944
+#: ../widgets/table/e-table-group-container.c:939
+#: ../widgets/table/e-table-group-container.c:940
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
-#: ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:3004 ../widgets/table/e-table-item.c:3005
+#: ../widgets/table/e-table.c:3301 ../widgets/table/e-tree.c:3259
+#: ../widgets/table/e-tree.c:3260
 msgid "Length Threshold"
 msgstr "界限長度"
 
-#: ../widgets/table/e-table-group-container.c:950
-#: ../widgets/table/e-table-group-container.c:951
+#: ../widgets/table/e-table-group-container.c:946
+#: ../widgets/table/e-table-group-container.c:947
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
-#: ../widgets/table/e-tree.c:3304
+#: ../widgets/table/e-table-item.c:3038 ../widgets/table/e-table-item.c:3039
+#: ../widgets/table/e-table.c:3308 ../widgets/table/e-tree.c:3291
+#: ../widgets/table/e-tree.c:3292
 msgid "Uniform row height"
 msgstr "標準列高"
 
-#: ../widgets/table/e-table-group-container.c:957
-#: ../widgets/table/e-table-group-container.c:958
+#: ../widgets/table/e-table-group-container.c:953
+#: ../widgets/table/e-table-group-container.c:954
 #: ../widgets/table/e-table-group-leaf.c:643
 #: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "凍結"
 
 # widgets/menus/gal-view-menus.c:176
-#: ../widgets/table/e-table-header-item.c:1472
+#: ../widgets/table/e-table-header-item.c:1466
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
-#: ../widgets/table/e-table-header-item.c:1492
+#: ../widgets/table/e-table-header-item.c:1486
 msgid "Sort Ascending"
 msgstr "遞增排序"
 
-#: ../widgets/table/e-table-header-item.c:1493
+#: ../widgets/table/e-table-header-item.c:1487
 msgid "Sort Descending"
 msgstr "遞減排序"
 
-#: ../widgets/table/e-table-header-item.c:1494
+#: ../widgets/table/e-table-header-item.c:1488
 msgid "Unsort"
 msgstr "不排序"
 
-#: ../widgets/table/e-table-header-item.c:1496
+#: ../widgets/table/e-table-header-item.c:1490
 msgid "Group By This Field"
 msgstr "依此欄位做群組"
 
-#: ../widgets/table/e-table-header-item.c:1497
+#: ../widgets/table/e-table-header-item.c:1491
 msgid "Group By Box"
 msgstr "依方塊為群組"
 
-#: ../widgets/table/e-table-header-item.c:1499
+#: ../widgets/table/e-table-header-item.c:1493
 msgid "Remove This Column"
 msgstr "移除此欄"
 
 # composer/e-msg-composer-attachment-bar.c:500
-#: ../widgets/table/e-table-header-item.c:1500
+#: ../widgets/table/e-table-header-item.c:1494
 msgid "Add a Column..."
 msgstr "加入一欄..."
 
-#: ../widgets/table/e-table-header-item.c:1502
+#: ../widgets/table/e-table-header-item.c:1496
 msgid "Alignment"
 msgstr "排列"
 
-#: ../widgets/table/e-table-header-item.c:1503
+#: ../widgets/table/e-table-header-item.c:1497
 msgid "Best Fit"
 msgstr "最適填滿"
 
-#: ../widgets/table/e-table-header-item.c:1504
+#: ../widgets/table/e-table-header-item.c:1498
 msgid "Format Columns..."
 msgstr "格式欄..."
 
 # widgets/menus/gal-view-menus.c:176
-#: ../widgets/table/e-table-header-item.c:1506
+#: ../widgets/table/e-table-header-item.c:1500
 msgid "Customize Current View..."
 msgstr "自訂目前的檢視..."
 
 # addressbook/printing/e-contact-print.glade.h:8
-#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1811 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "字型組"
 
-#: ../widgets/table/e-table-header-item.c:1838
+#: ../widgets/table/e-table-header-item.c:1832
 #: ../widgets/table/e-table-sorter.c:175
 msgid "Sort Info"
 msgstr "排序資訊"
 
 # ui/evolution-calendar.xml.h:36
-#: ../widgets/table/e-table-header-item.c:1852
-#: ../widgets/table/e-tree-scrolled.c:223
-#: ../widgets/table/e-tree-scrolled.c:224
+#: ../widgets/table/e-table-header-item.c:1846
+#: ../widgets/table/e-tree-scrolled.c:221
+#: ../widgets/table/e-tree-scrolled.c:222
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2948 ../widgets/table/e-table-item.c:2949
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2955 ../widgets/table/e-table-item.c:2956
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3031 ../widgets/table/e-table-item.c:3032
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
-#: ../widgets/table/e-tree.c:3311
+#: ../widgets/table/e-table.c:3315 ../widgets/table/e-tree.c:3298
+#: ../widgets/table/e-tree.c:3299
 msgid "Always search"
 msgstr "總是搜尋"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../widgets/table/e-table.c:3337
+#: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "請按這裡加入"
 
-#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3317
+#: ../widgets/table/e-tree.c:3305
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3318
+#: ../widgets/table/e-tree.c:3306
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線條與 +/- 展開符號。"
 
@@ -23228,7 +23245,7 @@ msgstr "這可以測試迷你名片畫布項目"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
-#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-text.c:3478 ../widgets/text/e-text.c:3479
 msgid "Event Processor"
 msgstr "事件處理器"
 
@@ -23241,58 +23258,58 @@ msgid "GDKFont"
 msgstr "GDK字型"
 
 #: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-text.c:3514 ../widgets/text/e-text.c:3515
 msgid "Justification"
 msgstr "左右對齊"
 
 #: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
 #: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
 msgid "Ellipsis"
 msgstr "橢圓"
 
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
 msgid "Line wrap"
 msgstr "折行"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
 msgid "Break characters"
 msgstr "中斷字元"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-text.c:3642 ../widgets/text/e-text.c:3643
 msgid "Max lines"
 msgstr "最大行數"
 
 #: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
 msgid "Allow newlines"
 msgstr "允許新行"
 
 #: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-text.c:3664 ../widgets/text/e-text.c:3665
 msgid "Draw borders"
 msgstr "繪製框線"
 
 #: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
 msgid "Draw background"
 msgstr "繪製背景"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
+#: ../widgets/text/e-text.c:3685 ../widgets/text/e-text.c:3686
 msgid "Draw button"
 msgstr "繪製按鈕"
 
 #: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
+#: ../widgets/text/e-text.c:3692 ../widgets/text/e-text.c:3693
 msgid "Cursor position"
 msgstr "游標位置"
 
@@ -23300,62 +23317,59 @@ msgstr "游標位置"
 msgid "Emulate label resize"
 msgstr "模擬標籤縮放"
 
-#: ../widgets/text/e-text.c:2724
+#: ../widgets/text/e-text.c:2721
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3492 ../widgets/text/e-text.c:3493
 msgid "Bold"
 msgstr "粗體"
 
-#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3499 ../widgets/text/e-text.c:3500
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3506 ../widgets/text/e-text.c:3507
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3521 ../widgets/text/e-text.c:3522
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3528 ../widgets/text/e-text.c:3529
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3535 ../widgets/text/e-text.c:3536
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3542 ../widgets/text/e-text.c:3543
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3549 ../widgets/text/e-text.c:3550
 msgid "X Offset"
 msgstr "X 位移"
 
-#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3556 ../widgets/text/e-text.c:3557
 msgid "Y Offset"
 msgstr "Y 位移"
 
-#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3592 ../widgets/text/e-text.c:3593
 msgid "Text width"
 msgstr "文字寬度"
 
-#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3599 ../widgets/text/e-text.c:3600
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
+#: ../widgets/text/e-text.c:3699 ../widgets/text/e-text.c:3700
 msgid "IM Context"
 msgstr "IM 快顯選單"
 
-#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
+#: ../widgets/text/e-text.c:3706 ../widgets/text/e-text.c:3707
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
-
-#~ msgid "Select target addressbook."
-#~ msgstr "選取目標通訊錄。"