Updated Traditional Chinese translation(Hong Kong). Updated Traditional

2008-02-05 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> * zh_HK.po: Updated Traditional Chinese translation(Hong Kong). * zh_TW.po: Updated Traditional Chinese translation(Taiwan). svn path=/trunk/; revision=34959
author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2008-02-05 17:57:49 +0800
committer: Chao-Hsiung Liao <chliao@src.gnome.org> 2008-02-05 17:57:49 +0800
commit: c62d4443013d64bf55397f2618e44bd0bc8d3b73 (patch)
tree: 076ec7bc5bbf72f98e6bec6c7fc54af10b1802a5 /po
parent: 8591b2dba30cd153a77c78e5c43d1e196ce0dcf6 (diff)
download: gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar
gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.gz
gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.bz2
gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.lz
gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.xz
gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.zst
gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.zip
3 files changed, 11221 insertions, 8446 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index 8abfe7b54c..037d23a906 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-05  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+
 2008-02-03  Andre Klapper  <a9016009@gmx.de>
 
 	* de.po: Updated German translation.
diff --git a/po/zh_HK.po b/po/zh_HK.po
index d4819e87d2..affc51d495 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.9.92\n"
+"Project-Id-Version: evolution 2.21.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-04 14:51+0800\n"
-"PO-Revision-Date: 2007-03-04 14:53+0800\n"
+"POT-Creation-Date: 2008-02-04 21:23+0800\n"
+"PO-Revision-Date: 2008-02-05 17:54+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,21 +21,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "新聯絡人"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "新增聯絡人清單"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -84,7 +84,7 @@ msgstr "行事曆事件：沒有摘要。"
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "得到焦點"
 
@@ -108,7 +108,7 @@ msgstr "移至今日"
 msgid "Go to Date"
 msgstr "移至日期"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "用來檢視與選擇時刻範圍的表格"
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:747
 msgid "%A %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -164,9 +164,9 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1358
+#: ../calendar/gui/e-day-view.c:2158
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -175,9 +175,9 @@ msgstr "%-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -185,10 +185,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -198,25 +198,25 @@ msgstr "%Y 年 %-m 月 %-d 日"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1362
+#: ../calendar/gui/e-day-view.c:2174
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "搜尋列"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "evolution 行事曆搜尋列"
 
@@ -255,11 +255,11 @@ msgstr "彈出"
 msgid "popup a child"
 msgstr "彈出子選單"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "編輯"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "開始編輯此儲存格"
 
@@ -272,19 +272,19 @@ msgstr "切換"
 msgid "toggle the cell"
 msgstr "切換儲存格"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "展開"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "展開 ETree 中包含此儲存格的列"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "收摺"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "折疊 ETree 中包含此儲存格的列"
 
@@ -294,29 +294,29 @@ msgstr "表格的儲存格"
 
 #: ../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:574
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "請按這裏加入"
 
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:53
 msgid "click"
-msgstr "單擊"
+msgstr "點選"
 
 #: ../a11y/e-table/gal-a11y-e-table-column-header.c:135
 msgid "sort"
 msgstr "排序"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "行事曆：從 %s 到 %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "evolution 行事曆項目"
 
@@ -351,200 +351,210 @@ msgid "Address '{0}' already exists."
 msgstr "通訊錄「{0}」已存在"
 
 #: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot add new contact"
+msgstr "不能加入新的聯絡人"
+
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Cannot move contact."
 msgstr "無法移動聯絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:5
 msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:6
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
 "your caps lock might be on."
 msgstr "請檢查來確定你的密碼拼法正確，而且你使用的是支援的登入方法。請記得許多密碼有區分大小寫；你可能啟動了大寫鎖定鍵。"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not get schema information for LDAP server."
 msgstr "無法取得 LDAP 伺服器的綱要資訊。"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:9
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
 "Frequent Contacts and Groupwise Personal Contacts folders."
 msgstr "目前你只能存取 Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 GroupWise 郵件客戶端，以取得你的 GroupWise 常用聯絡人及 Groupwise 個人聯絡人資料夾。"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Delete address book '{0}'?"
 msgstr "刪除通訊錄「{0}」？"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error loading addressbook."
 msgstr "載入通訊錄發生錯誤。"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤： {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Failed to authenticate with LDAP server."
 msgstr "無法驗證 LDAP 伺服器。"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
+#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
 msgid "Failed to delete contact"
 msgstr "刪除聯絡人失敗"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise 通訊錄的建立"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺服器未回應有效的綱要資訊。"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Permission Denied."
 msgstr "權限不足。"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Server Version"
 msgstr "伺服器版本"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "某些功能可能無法在你目前的伺服器版本上正常運作"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
+msgid ""
+"The address book {0} is read only, thus you cannot add contacts there. "
+"Select other address book, please."
+msgstr "通訊錄 {0} 是唯讀的，因此無法在這兒加入聯絡人。請選擇其他的通訊錄。"
+
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的圖片太大。你是否要改變大小後才儲存它？"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
 "supported search bases."
 msgstr "此 LDAP 伺服器可能使用舊的 LDAP 版本，它不支援此功能，或可能設定錯誤。請洽詢管理員，瞭解支援的搜尋基礎。"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "無法開啟此通訊錄。"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺服器沒有任何建議的搜尋基礎。"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或你的網絡連線已經停止。"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺服器不支援 LDAPv3 綱要資訊。"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "無法開啟通訊錄"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的更改？"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr "你正在嘗試從某一個通訊錄，將聯絡人移至另一個通訊錄，但是它無法從來源移除。你想要儲存一個副本來代替嗎？"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
 "a supported version"
 msgstr "你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版太"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "你已經修改此聯絡人。要儲存這些更改？"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的聯絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "新增(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "放棄(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "不要儲存(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "改變大小(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "將它視為(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../addressbook/addressbook.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
-#: ../addressbook/conduit/address-conduit.c:1317
-#: ../addressbook/conduit/address-conduit.c:1318
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
 msgid "Could not load addressbook"
 msgstr "無法載入通訊錄"
 
-#: ../addressbook/conduit/address-conduit.c:1395
-#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
@@ -566,9 +576,10 @@ msgstr "在此設定自動完成"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "聯絡人"
 
@@ -606,14 +617,14 @@ 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:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:305
+#: ../mail/mail-vfolder.c:216
 msgid "On This Computer"
 msgstr "我的電腦"
 
@@ -622,137 +633,135 @@ msgstr "我的電腦"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:248
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "個人"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 msgid "On LDAP Servers"
 msgstr "在 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "聯絡人(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "建立新的聯絡人"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "聯絡人清單(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "建立新的聯絡人清單"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "升級通訊錄設定值或資料夾失敗。"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "基本"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "類型(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "複製通訊錄內容至本地用於離線作業"
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy _book content locally for offline operation"
+msgstr "複製通訊錄內容至本地用於離線作業(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../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:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2087
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:387
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "驗證"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:935
 msgid "Searching"
 msgstr "搜尋中"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:643
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:758
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -763,7 +772,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -773,7 +782,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -783,7 +792,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -809,39 +818,32 @@ msgstr "重新命名資料夾"
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "以此為名的資料夾已存在"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:954
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:990
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1148
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "儲存為 vCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1349
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "儲存為 VCard..."
-
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "聯絡人來源選擇器"
 
@@ -849,59 +851,59 @@ msgstr "聯絡人來源選擇器"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:513
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "驗證證書失敗。\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:493
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "自動完成長度"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "完成 uris 清單的 EFolderList xml"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "完成 uris 清單的 EFolderList xml"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 msgstr "垂直窗格的位置，在卡片、清單檢視與預覽窗格之間，以像素計。"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "顯示預覽窗格"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字符數目。"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "垂直窗格位置"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "是否顯示預覽窗格。"
 
@@ -926,7 +928,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>驗證</b>"
 
@@ -1146,9 +1147,9 @@ msgid "_Login method:"
 msgstr "登入方法(_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:229
+#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "名稱(_N):"
@@ -1181,12 +1182,11 @@ msgstr "卡片"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:395
 msgid "minutes"
 msgstr "分鐘"
 
@@ -1227,98 +1227,99 @@ msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "分類(_T)..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "聯絡人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
 msgid "Contact Editor"
 msgstr "聯絡人編輯器"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "圖片"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "郵寄地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "暱稱(_C):"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr "網名(_K):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "個人資料"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "電話"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:155
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
 msgid "Work"
 msgstr "工作"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "助理(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "分類(_C)..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "縣/市(_C):"
@@ -1396,7 +1397,7 @@ msgid "_Web Log:"
 msgstr "網誌(_W):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "通訊錄(_W):"
 
@@ -1405,26 +1406,25 @@ msgid "_Zip/Postal Code:"
 msgstr "郵遞區號(_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "地址"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1833 ../widgets/text/e-entry.c:1265
-#: ../widgets/text/e-entry.c:1266 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3687
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2397,11 +2397,14 @@ msgid "Zimbabwe"
 msgstr "津巴布韋"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../mail/em-mailer-prefs.c:481
+#: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../plugins/plugin-manager/plugin-manager.c:56
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "名稱"
 
@@ -2410,8 +2413,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2424,8 +2427,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2434,9 +2437,9 @@ msgid "Service"
 msgstr "服務"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
 msgstr "位置"
 
@@ -2445,76 +2448,76 @@ msgid "Username"
 msgstr "使用者名稱"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "住家"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "其它"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "來源通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "是新聯絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "必要欄位"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "已更改"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "聯絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid "Please select an image for this contact"
 msgstr "請選取代表此聯絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2522,43 +2525,43 @@ msgstr ""
 "聯絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3129
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
 msgid "Invalid contact."
 msgstr "無效的聯絡人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
 msgid "Contact Quick-Add"
 msgstr "快速新增聯絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
@@ -2612,10 +2615,6 @@ msgstr "國家(_Y):"
 msgid "Full Address"
 msgstr "完整地址"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "地址(_A):"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "郵遞區號(_Z):"
@@ -2629,7 +2628,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "全名"
 
@@ -2701,72 +2700,56 @@ msgstr "_IM 服務:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "位置(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "<b>Members</b>"
+msgstr "<b>成員</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "新增電子郵件到清單"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "聯絡人清單編輯器"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "從通訊錄插入電子郵件位址"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "會員"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "從清單移除電子郵件地址"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "選擇..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "列出名稱(_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "選取(_S)"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸入電子郵件地址或拖曳聯絡人到以下清單(_T)："
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "聯絡人清單成員"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "書本"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "是新的清單"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "聯絡人清單成員"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "更改後的聯絡人:"
@@ -2782,11 +2765,9 @@ msgstr "偵測到重複的聯絡人"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"此聯絡人中改變後的電子郵件或名稱已經\n"
-"存在於此資料夾。你無論如何都要新增它嗎？"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr "此聯絡人的名稱或電子郵件地址已經存在於此資料夾。無論如何都要新增它嗎？"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2804,143 +2785,157 @@ msgstr ""
 "此聯絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。你無論如何都要新增它嗎？"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+msgid "Merge Contact"
+msgstr "合併聯絡人"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:860
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "電子郵件"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "沒有聯絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 個聯絡人"
 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:246
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "查詢"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "取得書本檢視時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3337
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3551
 msgid "Model"
 msgstr "模型"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "編輯卡片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "來源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:501
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "類型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2178
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "儲存為 VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
+msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/e-calendar-table.c:1327
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_New Contact..."
 msgstr "新增聯絡人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "New Contact _List..."
 msgstr "新增聯絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
-msgid "_Save as VCard..."
-msgstr "儲存成 _VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as vCard..."
+msgstr "儲存成 _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contact"
 msgstr "轉寄聯絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Forward Contacts"
 msgstr "轉寄聯絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contact"
 msgstr "傳送郵件給聯絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to List"
 msgstr "傳送郵件給清單(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Send _Message to Contacts"
 msgstr "傳送郵件給聯絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../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:988
-#: ../calendar/gui/calendar-component.c:583
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3185 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1134 ../mail/message-list.c:1922
+#: ../calendar/gui/e-calendar-table.c:1335
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
+#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2059
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -2948,30 +2943,25 @@ msgstr "剪下(_T)"
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
 msgid "Any Category"
 msgstr "任何分類"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1871
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1927
-msgid "Print cards"
-msgstr "打印卡片"
-
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Other error"
 msgstr "其他錯誤"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "助理"
 
@@ -3001,6 +2991,7 @@ msgstr "汽車電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
 #: ../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
@@ -3008,84 +2999,78 @@ msgid "Categories"
 msgstr "分類"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "公司電話"
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "公司"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "電子郵件"
+msgid "Company Phone"
+msgstr "公司電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "電子郵件 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "電子郵件 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "歸檔為"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "家用傳真"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "家用電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "家用電話 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "日誌"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "主管"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "流動電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
-msgstr "暱稱"
+msgstr "網名"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "備註"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "辦公室"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "團體"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它傳真"
@@ -3096,7 +3081,7 @@ msgstr "其它電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
-msgstr "call 機"
+msgstr "傳呼機"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
@@ -3107,15 +3092,14 @@ msgid "Radio"
 msgstr "無線電電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "配偶"
 
@@ -3147,32 +3131,32 @@ msgstr "網址"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../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:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
 msgid "Width"
 msgstr "闊度"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../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:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
 msgid "Height"
 msgstr "高度"
 
@@ -3213,7 +3197,7 @@ msgstr ""
 "\n"
 "搜尋聯絡人\n"
 "\n"
-"雙擊這裏以建立新的聯絡人。"
+"連按兩下這裏以建立新的聯絡人。"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
@@ -3227,7 +3211,7 @@ msgstr ""
 "\n"
 "沒有項目可供這種檢視方式顯示。\n"
 "\n"
-"雙擊這裏以建立新的聯絡人。"
+"連按兩下這裏以建立新的聯絡人。"
 
 #: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
@@ -3273,249 +3257,249 @@ msgstr "已選擇"
 msgid "Has Cursor"
 msgstr "有游標"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2545
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2807
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr "(映射)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr "對映"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
 msgid "List Members"
 msgstr "清單成員"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "電子郵件"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "部門"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "職業"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "視像交談"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2305
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "傳真"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "首頁"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2327
 msgid "Birthday"
 msgstr "生日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2328
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
 msgid "Home page"
 msgstr "首頁"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Backend busy"
 msgstr "後端忙碌"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Repository offline"
 msgstr "資料庫離線"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Address Book does not exist"
 msgstr "通訊錄不存在"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "No Self Contact defined"
 msgstr "沒有定義自我聯絡人"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "權限不足"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Contact not found"
 msgstr "找不到聯絡人"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact ID already exists"
 msgstr "聯絡人 ID 已經存在"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2516
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2521
 msgid "Canceled"
 msgstr "已取消"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Could not cancel"
 msgstr "無法取消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/comp-editor-factory.c:422
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Authentication Required"
 msgstr "要求驗證"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "TLS not Available"
 msgstr "TLS 無法使用"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "No such source"
 msgstr "查無此來源"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Not available in offline mode"
 msgstr "無法在離線模式下使用"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
 "load the addressbook once in online mode to download its contents"
 msgstr "我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且你有權限存取它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示你輸入錯誤的 URI，或無法連線 LDAP 伺服器。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
 "Evolution package."
 msgstr "此 Evolution 版本未編譯 LDAP 支援。如果你若想在 Evolution 使用 LDAP，必須安裝啟用 LDAP 的 Evolution 套件。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示你輸入錯誤的URI，或伺服器無法連線。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3527,7 +3511,7 @@ msgstr ""
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3539,45 +3523,45 @@ msgstr ""
 "或是提高此目錄服務的目錄伺服器偏好設定中的\n"
 "結果上限。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄服務的後端程式無法解析這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "新增聯絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying contact"
 msgstr "修改聯絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "移除聯絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3592,8 +3576,16 @@ msgstr[1] ""
 "開啟 %d 個聯絡人會一併開啟 %d 個新視窗。\n"
 "確定要顯示所有的聯絡人？"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
+msgid "_Don't Display"
+msgstr "不要顯示(_D)"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
+msgid "Display _All Contacts"
+msgstr "顯示所有的聯絡人(_A)"
+
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3602,64 +3594,65 @@ msgstr ""
 "%s 已經存在\n"
 "你是否要覆寫它？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
 msgid "Overwrite"
 msgstr "覆寫"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "個聯絡人"
 msgstr[1] "個聯絡人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
 msgid "Select Address Book"
 msgstr "選擇通訊錄"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
 msgid "list"
 msgstr "清單"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Move contact to"
 msgstr "將聯絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
 msgid "Copy contact to"
 msgstr "複製聯絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Move contacts to"
 msgstr "將聯絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Copy contacts to"
 msgstr "複製聯絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
-msgid "Multiple VCards"
-msgstr "多重 VCard"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "多重 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
 #, c-format
-msgid "VCard for %s"
-msgstr "給 %s 的 VCard"
+msgid "vCard for %s"
+msgstr "%s 的 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#, c-format
 msgid "Contact information"
 msgstr "聯絡人資訊"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的聯絡人資訊"
@@ -3668,23 +3661,23 @@ msgstr "%s 的聯絡人資訊"
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "和另外 1 個聯絡人。"
 msgstr[1] "和另外 %d 個聯絡人。"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "顯示完整的 VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "顯示完整的 vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "顯示精簡的 VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr "顯示精簡的 vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
@@ -3692,17 +3685,11 @@ msgstr "存入目錄服務"
 msgid "Card View"
 msgstr "卡片檢視模式"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK 樹狀檢視模式"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-ldif-importer.c:499
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "匯入..."
 
@@ -3730,38 +3717,21 @@ msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料交換格式 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:667
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf、.gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf、.gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard 輸入器"
-
-# zh_HK: msgstr "打印信封"
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "打印信封"
-
-# zh_HK: msgstr "打印連絡人"
-#: ../addressbook/printing/e-contact-print.c:856
-msgid "Print contacts"
-msgstr "打印連絡人"
-
-# zh_HK: msgstr "打印連絡人"
-#: ../addressbook/printing/e-contact-print.c:882
-#: ../addressbook/printing/e-contact-print.c:909
-msgid "Print contact"
-msgstr "打印連絡人"
+msgid "Evolution vCard Importer"
+msgstr "Evolution vCard 匯入程式"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3804,12 +3774,12 @@ msgid "Format"
 msgstr "格式"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../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:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1895
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:648
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "頁首"
 
@@ -3862,7 +3832,6 @@ msgid "Options"
 msgstr "選項"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "紙張方向"
 
@@ -3914,9 +3883,9 @@ msgstr "網底"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:981
 #: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "大小:"
 
@@ -3933,7 +3902,7 @@ msgid "Top:"
 msgstr "上:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "類型:"
 
@@ -3951,7 +3920,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "連絡人打印樣式編輯器測試"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:44
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "版權所有 (C) 2000, Ximian, Inc."
 
@@ -3961,17 +3930,17 @@ msgid "This should test the contact print style editor widget"
 msgstr "這可以測試連絡人打印樣式編輯器工具"
 
 # zh_HK: msgstr "連絡人打印測試"
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
 msgstr "連絡人打印測試"
 
 # zh_HK: msgstr "這可以測試連絡人打印代碼"
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:46
 msgid "This should test the contact print code"
 msgstr "這可以測試連絡人打印代碼"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "無法開啟檔案"
@@ -3984,72 +3953,61 @@ msgstr "無法取得通訊錄清單"
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "指定輸出檔案而不是標準輸出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "輸出檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "List local addressbook folders"
 msgstr "列出本地通訊錄資料夾"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "將卡片顯示成 vcard 或 csv 檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "在非同步模式匯出"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "非同步模式下，一個輸出檔案中的卡片數目，預設大小是 100。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "數目"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help 選項來查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "在非同步模式下，輸出必須是檔案。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "在一般模式下，不需要大小選項。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "載入預設目錄服務時發生錯誤"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "輸入檔案"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "沒有提供檔案名稱。"
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
@@ -4063,15 +4021,12 @@ msgid ""
 msgstr "新增有意義的摘要到你的工作可以讓收件者知道你的工作和什麼事有關。"
 
 #: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "會刪除這些備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr "會刪除此日誌的所有資訊而且無法復原。"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "會刪除此備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4090,15 +4045,13 @@ msgstr "會刪除此約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
-
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
+#: ../calendar/calendar.error.xml.h:9
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "會刪除此備忘錄上的所有資訊而且無法復原。"
+
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
@@ -4112,16 +4065,16 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "確定要刪除標題為 '{0}' 的約會？"
 
 #: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "確定要刪除日誌項目 '{0}'？"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "確定要刪除備忘錄 '{0}'？"
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "確定要刪除這 {0} 約會？"
 
 #: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "確定要刪除這 {0} 日誌項目？"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "確定要刪除這 {0} 個備忘錄？"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -4132,89 +4085,90 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "確定要刪除此約會？"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "確定要刪除此日誌項目？"
-
-#: ../calendar/calendar.error.xml.h:19
 #: ../calendar/gui/dialogs/delete-comp.c:183
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議？"
 
+#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "確定要刪除此備忘錄？"
+
 #: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:186
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作？"
 
 #: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "確定要儲存沒有摘要的備忘錄？"
+
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "你確定要傳送沒有摘要的約會？"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "你確定要傳送沒有摘要的工作？"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:24
 msgid "Cannot create a new event"
 msgstr "不能建立新的事件"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」？"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Delete memo list '{0}'?"
 msgstr "刪除備忘錄清單「{0}」？"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "刪除工作清單「{0}」？"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Do _not Send"
 msgstr "不要傳送(_N)"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下載尚在進行中。你是否要儲存此約會？"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下載尚在進行中。你是否要儲存此工作？"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此工作。"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "載入行事曆時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading memo list"
 msgstr "載入備忘錄清單時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
-
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
@@ -4224,227 +4178,235 @@ msgstr "如果不傳送取消通知，其他參與者可能不知道會議已經
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr "如果未傳送取消通知，其他參與者可能不知道該備忘錄已經刪除。"
+
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道工作已經刪除。"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "這裏有一些需要下載的附件。儲存此約會將會失去這些附件。"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "這裏有一些需要下載的附件。儲存此工作將會失去這些附件。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server."
 msgstr "某些功能可能無法在你目前的伺服器版本上正常運作。"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 行事曆已經意外結束。"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 備忘錄已經意外結束。"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 工作已經意外結束。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid "The calendar is not marked for offline usage."
 msgstr "此行事曆尚未標記為離線使用。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "The memo list is not marked for offline usage"
 msgstr "此備忘錄清單尚未標記為離線使用"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "The task list is not marked for offline usage."
 msgstr "此工作清單尚未標記為離線使用。"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "This calendar will be removed permanently."
 msgstr "這個行事曆將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "This memo list will be removed permanently."
 msgstr "這個備忘錄清單將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "This task list will be removed permanently."
 msgstr "這項工作清單將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的更改？"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this memo?"
 msgstr "要儲存對此備忘錄所做的更改？"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的更改？"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "要傳送此日誌項目的取消通知？"
-
 #: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "是否要傳送此備忘錄的取消通知？"
+
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "要傳送取消通知給所有的參與者？"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "要傳送會議邀請給參與者？"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send this task to participants?"
 msgstr "要傳送此工作給參與者？"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "要傳送會議更新資訊給參與者？"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated task information to participants?"
 msgstr "要傳送更新的工作資訊給參與者？"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
 "a supported version."
 msgstr "你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版本。"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
 msgstr "你選擇了一個唯讀的行事曆來源。請切換到行事曆檢視並選取一個能加入約會的行事曆。"
 
-#: ../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:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用你的行事曆。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用你的備忘錄。"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用你的工作。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "放棄更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "_Save Changes"
 msgstr "儲存更改(_S)"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "_Send Notice"
 msgstr "傳送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:93
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1506
-#: ../calendar/conduits/calendar/calendar-conduit.c:1507
-#: ../calendar/conduits/memo/memo-conduit.c:932
-#: ../calendar/conduits/memo/memo-conduit.c:933
-#: ../calendar/conduits/todo/todo-conduit.c:1108
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../calendar/conduits/calendar/calendar-conduit.c:1515
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
+#: ../calendar/conduits/memo/memo-conduit.c:816
+#: ../calendar/conduits/memo/memo-conduit.c:817
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
 msgid "Could not start evolution-data-server"
 msgstr "無法啟動 Evolution 資料伺服器"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1614
-#: ../calendar/conduits/calendar/calendar-conduit.c:1617
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1026
-#: ../calendar/conduits/memo/memo-conduit.c:1029
+#: ../calendar/conduits/memo/memo-conduit.c:910
+#: ../calendar/conduits/memo/memo-conduit.c:913
 msgid "Could not read pilot's Memo application block"
 msgstr "無法讀取 pilot 備忘錄程式區塊"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1073
-#: ../calendar/conduits/memo/memo-conduit.c:1076
+#: ../calendar/conduits/memo/memo-conduit.c:957
+#: ../calendar/conduits/memo/memo-conduit.c:960
 msgid "Could not write pilot's Memo application block"
 msgstr "無法寫入 pilot 備忘錄程式區塊"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1192
-#: ../calendar/conduits/todo/todo-conduit.c:1195
+#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1237
-#: ../calendar/conduits/todo/todo-conduit.c:1240
+#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
 msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1392
 msgid "Calendars"
 msgstr "行事曆"
 
@@ -4485,22 +4447,25 @@ msgid "Memo_s"
 msgstr "備忘錄(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
+#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
 msgid "Memos"
 msgstr "備忘錄"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1435
+#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:403
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:547
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "工作"
@@ -4518,19 +4483,19 @@ msgstr "工作(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 msgstr[1] "分鐘"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:396
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "小時"
@@ -4547,10 +4512,10 @@ msgstr "約會"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/e-itip-control.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "位置:"
 
@@ -4560,16 +4525,16 @@ msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:160
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4581,17 +4546,17 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
@@ -4600,12 +4565,13 @@ msgstr "沒有可用的地點資訊。"
 msgid "You have %d alarms"
 msgstr "你有 %d 個鬧鈴"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1517
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4617,7 +4583,7 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4634,7 +4600,7 @@ msgstr ""
 "\n"
 "你確定要執行這個程式？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1751
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -4643,8 +4609,10 @@ msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "無法建立聲音提醒服務元件工廠"
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr "無法建立聲音提醒服務元件工廠，也許它已經在執行中..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4679,454 +4647,482 @@ msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "鬧鈴程式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "今天到期的工作背景色彩，使用 \"#rrggbb\" 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "過期工作的背景色彩，使用 \"#rrggbb\" 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用預設值)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日檢視中用來繪製 Marcus Bains 線的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "清空時確認"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "必須指明工作日開始與結束於幾時。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "用來存放鬧鈴音效檔的目錄"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
-msgstr "事件漸層效果"
+msgstr "事件漸變色效果"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "事件透明效果"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "空閒/忙碌伺服器網址"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "空閒/忙碌範本網址"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
-msgstr "行事曆檢視中的事件漸層效果。"
+msgstr "行事曆檢視中的事件漸變色效果。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "隱藏已完成的工作"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "隱藏工作單位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "隱藏工作數值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "水平窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日結束於幾點，以 24 小時格式，0 至 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "工作日開始於幾點，以 24 小時格式，0 至 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "在「日」和「工作週」檢視中顯示間隔，以分鐘計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "上次鬧鈴時刻"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "用於空閒/忙碌發佈的伺服器 URL 清單。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 線"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 線色彩─日檢視"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 線色彩─時刻列"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日結束分鐘，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日開始分鐘，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "月檢視的水平窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "月檢視的垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "決定預設提醒的單位數目。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "決定何時隱藏工作的單位數目。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr "水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "垂直窗格的位置，在行事曆清單與日期導覽行事曆之間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "垂直窗格的位置，在工作清單與工作預覽窗格之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr "垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "用來做為鬧鈴而執行的程式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "儲存鬧鈴音效檔目錄"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/會議/工作編輯器中顯示 分類 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
-msgstr "在通知匣中顯示鬧鈴畫面"
+msgstr "在通知區中顯示鬧鈴畫面"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Show the \"Preview\" pane"
 msgstr "顯示「預覽」窗格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Show the \"Preview\" pane."
 msgstr "顯示「預覽」窗格。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "在日期導覽顯示週數"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "工作垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
 "user part of the mail address and %d is replaced by the domain."
 msgstr "作為空閒/忙碌資料回饋之用的網址範本，%u 要以電子郵件位址的使用者名稱部分來取代，而 %d 要替換為網域名稱。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
 msgstr "用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 \"America/New York\"。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "時間分隔"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "時區"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr "行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24 小時制格式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "預設提醒單位，「分鐘」、「小時」或「日」。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱藏工作的單位，「分鐘」、「小時」或「日」。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "一週開始於"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "每週的開始，從星期日 (0) 到星期六 (6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "是否使用通知匣顯示鬧鈴。"
+msgstr "是否使用通知區顯示鬧鈴。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "刪除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在行事曆中繪出 Marcus Bains 線（代表目前時刻的直線）。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在工作檢視中隱藏完成的工作。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否設定約會的預設提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是否使用 24 小時制時間而不是使用上午/下午。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期導覽中顯示週數。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "顯示事件時是否使用日光節約時間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "工作日結束小時"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "工作日結束分鐘"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "工作日開始小時"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "工作日開始分鐘"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "日光節約時間"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Category is"
 msgstr "分類為"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "備註包含"
 
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Location contains"
 msgstr "位置包含"
 
-#: ../calendar/gui/cal-search-bar.c:432
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 Days' Tasks"
+msgstr "未來 7 天的工作"
+
+#: ../calendar/gui/cal-search-bar.c:635
+msgid "Active Tasks"
+msgstr "進行中的工作"
+
+#: ../calendar/gui/cal-search-bar.c:639
+msgid "Overdue Tasks"
+msgstr "過期的工作"
+
+#: ../calendar/gui/cal-search-bar.c:643
+msgid "Completed Tasks"
+msgstr "已完成的工作 "
+
+#: ../calendar/gui/cal-search-bar.c:647
+msgid "Tasks with Attachments"
+msgstr "有附加檔案的工作"
+
+#: ../calendar/gui/cal-search-bar.c:693
+msgid "Active Appointments"
+msgstr "進行中的約會"
+
+#: ../calendar/gui/cal-search-bar.c:697
+msgid "Next 7 Days' Appointments"
+msgstr "未來 7 天的約會(_P)"
+
 # zh_HK: msgstr "打印"
-#: ../calendar/gui/calendar-commands.c:119
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "打印"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 msgstr "此作業會永久性刪除比選取時間還舊的所有事件。如果你繼續，將無法復原這些事件。"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:397
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "天"
@@ -5135,89 +5131,103 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "在網站上"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天氣"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:605
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2102
+msgid "_Copy..."
+msgstr "複製(_C)..."
+
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "屬性(_P)"
+
+#: ../calendar/gui/calendar-component.c:939
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1238
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1254
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1367
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1585
 msgid "New appointment"
 msgstr "新增約會"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1586
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1587
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1593
 msgid "New meeting"
 msgstr "新增會議"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1594
 msgid "M_eeting"
 msgstr "會議(_M)"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1595
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1601
 msgid "New all day appointment"
 msgstr "新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1602
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1603
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1609
 msgid "New calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1610
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1611
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -5237,23 +5247,33 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+msgid "Description Contains"
+msgstr "描述包含"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Summary Contains"
+msgstr "摘要包含"
+
+#: ../calendar/gui/comp-editor-factory.c:404
 msgid "Error while opening the calendar"
 msgstr "開啟行事曆時發生錯誤"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:410
 msgid "Method not supported when opening the calendar"
 msgstr "開啟行事曆時不支援方法"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:416
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許可權來開啟行事曆"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1273
+#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
@@ -5275,11 +5295,11 @@ msgstr "新增鬧鈴"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:5
 msgid "Custom _message"
-msgstr "自訂訊息(_M)"
+msgstr "自選訊息(_M)"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:6
 msgid "Custom alarm sound"
-msgstr "自訂鬧鈴聲音"
+msgstr "自選鬧鈴聲音"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:7
 msgid "Mes_sage:"
@@ -5301,66 +5321,70 @@ msgid "Run a program"
 msgstr "執行外部程式"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "選取檔案"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "收件者："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "傳送電子郵件"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "重複鬧鈴(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "之後"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "之前"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "日"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "約會結束"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "小時"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "分鐘"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "約會開始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -5375,19 +5399,16 @@ msgstr "加入(_A)"
 msgid "Alarms"
 msgstr "鬧鈴"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
 
@@ -5412,7 +5433,7 @@ msgid ""
 msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
@@ -5451,8 +5472,8 @@ msgid "Display"
 msgstr "顯示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "星期五"
 
@@ -5467,8 +5488,8 @@ msgstr ""
 "日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "星期一"
 
@@ -5491,8 +5512,7 @@ msgstr ""
 "星期日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid "Pick a color"
 msgstr "選取顏色"
 
@@ -5502,8 +5522,8 @@ msgid "S_un"
 msgstr "週日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "星期六"
 
@@ -5520,8 +5540,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "星期日"
 
@@ -5539,8 +5559,8 @@ msgid "Template:"
 msgstr "樣板:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "星期四"
 
@@ -5554,14 +5574,14 @@ msgid "Time format:"
 msgstr "時刻格式:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "星期二"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -5639,81 +5659,46 @@ msgstr "週三(_W)"
 msgid "before every appointment"
 msgstr "前"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "複製行事曆內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "複製工作清單內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "複製備忘錄清單內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "C_olor:"
 msgstr "色彩(_O):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "備忘錄清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:478
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:480
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:536
 msgid "Task List Properties"
 msgstr "工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:592
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "新增行事曆"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "新增工作清單"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "加入行事曆(_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "新增工作清單(_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "重新整理(_R):"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "網址(_U):"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "週"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
@@ -5723,8 +5708,8 @@ msgid "This task has been deleted."
 msgstr "這項工作已刪除。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "這個日誌項目已刪除。"
+msgid "This memo has been deleted."
+msgstr "這個備忘錄已刪除。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5745,8 +5730,8 @@ msgid "This task has been changed."
 msgstr "這項工作已更改。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "這個日誌項目已更改。"
+msgid "This memo has been changed."
+msgstr "這個備忘錄已更改。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5758,163 +5743,154 @@ msgstr "%s  你已經做了些更改。放棄這些更改並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  你沒有做任何更改，更新這個編輯器？"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2392
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2338
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2396
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2342
 msgid " (Completed "
 msgstr " (已完成) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2398
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2344
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2403
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2349
 msgid " (Due "
 msgstr "(期限)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2405
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2351
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2921
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2926
-#: ../composer/e-msg-composer.c:3122
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3040
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3186
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1030 ../mail/message-list.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
+#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2060
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3188
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
+#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2062
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:669
+#: ../calendar/gui/dialogs/comp-editor.c:2827 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:831
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> 個附加檔案"
 msgstr[1] "<b>%d</b> 個附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1530
+#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1564
 msgid "Show Attachment _Bar"
 msgstr "顯示附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3693
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3694 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
-msgid "_Properties"
-msgstr "屬性(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3696
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../composer/e-msg-composer.c:3636
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1554
-#: ../mail/em-format-html-display.c:2300
+#: ../calendar/gui/dialogs/comp-editor.c:1588
+#: ../mail/em-format-html-display.c:2374
 msgid "Show Attachments"
 msgstr "顯示附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1555
+#: ../calendar/gui/dialogs/comp-editor.c:1589
 msgid "Press space key to toggle attachment bar"
 msgstr "按下空白鍵切換附加檔案列"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2162
-#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2168
-#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2174
-#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2209
+#: ../calendar/gui/dialogs/comp-editor.c:2252
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:2212
+#: ../calendar/gui/dialogs/comp-editor.c:2255
 #, c-format
-msgid "Journal entry - %s"
-msgstr "日誌項目 - %s"
+msgid "Memo - %s"
+msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:2265
 msgid "No summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2777
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:406
-#: ../mail/em-utils.c:438 ../widgets/misc/e-attachment-bar.c:350
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2866
-#: ../calendar/gui/dialogs/comp-editor.c:2920
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2916
+#: ../calendar/gui/dialogs/comp-editor.c:2970
+#: ../calendar/gui/dialogs/comp-editor.c:2994
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄對此項目所做的更改"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2968
+#: ../calendar/gui/dialogs/comp-editor.c:3023
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
@@ -5943,8 +5919,8 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+msgid "The memo could not be deleted due to a corba error"
+msgstr "由於 corba 錯誤，所以無法刪除該備忘錄。"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -5959,8 +5935,8 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "因為許可全被拒絕，所以無法刪除工作。"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "因為許可權被拒絕，所以無法刪除日誌項目。"
+msgid "The memo could not be deleted because permission was denied"
+msgstr "因為許可權被拒絕，所以無法刪除該備忘錄。"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -5975,8 +5951,8 @@ msgid "The task could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+msgid "The memo could not be deleted due to an error"
+msgstr "由於錯誤，所以無法刪除該備忘錄。"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
@@ -5995,128 +5971,135 @@ msgstr "委託給："
 msgid "Enter Delegate"
 msgstr "輸入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:602
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:606
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
 msgstr "這個事件具有鬧鈴"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:946
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1128
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1131
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1313
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1336
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1454
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
 msgid "The organizer selected no longer has an account."
 msgstr "選取的召集人已經沒有帳號。"
 
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1897
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
 msgid "_Add "
 msgstr "新增(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "你正擔任 %s 的代理人"
+
+#: ../calendar/gui/dialogs/event-page.c:3053
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:3059
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:3065
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "約會前 %d 分鐘"
 msgstr[1] "約會前 %d 分鐘"
 
-#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../calendar/gui/dialogs/event-page.c:3078
 msgid "Customize"
-msgstr "自訂"
+msgstr "自選"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2960
+#: ../calendar/gui/dialogs/event-page.c:3083
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2318
-#: ../filter/filter-rule.c:890 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:200
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../plugins/itip-formatter/itip-formatter.c:1996
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "無"
 
@@ -6136,17 +6119,11 @@ msgstr "約會前 15 分鐘"
 msgid "Attendee_s..."
 msgstr "到會者(_S)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "分類(_T)..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
-msgstr "自訂鬧鈴:"
+msgstr "自選鬧鈴:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "描述(_E):"
 
@@ -6184,56 +6161,6 @@ msgstr "總共"
 msgid "until"
 msgstr "直至"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "到會者"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "按這裏新增到會者"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "普通名稱"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "委任自"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "委派給"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "語言"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "成員"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "狀況"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>到會者(_E)</b>"
@@ -6255,18 +6182,19 @@ msgstr "會議召集人"
 msgid "Organizer:"
 msgstr "會議召集人:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2452
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2446
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:952
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s」開啟備忘錄。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html.c:1597 ../mail/em-format-html.c:1623
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "收件者"
 
@@ -6284,91 +6212,58 @@ msgid "_Description:"
 msgstr "描述(_D):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "羣組(_G):"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>行事曆選項</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "新增行事曆"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "行事曆羣組"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "行事曆位置"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "行事曆名稱"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>工作清單選項</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "新增工作清單"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "工作清單羣組"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "工作清單名稱"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "你正在修改週期性事件。你想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "你正在委任週期性事件。你想要委派什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "你正在修改週期性工作。你想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "你正在修改週期性日誌項目。你想要修改什麼？"
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "你正在修改週期性備忘錄。你想要修改什麼？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "限此例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "此例項和先前的例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "此例項和以後的例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "所有例項"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
 msgid "on"
 msgstr "的"
 
@@ -6376,7 +6271,7 @@ msgstr "的"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "first"
 msgstr "一"
 
@@ -6385,7 +6280,7 @@ msgstr "一"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "second"
 msgstr "二"
 
@@ -6393,7 +6288,7 @@ msgstr "二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "third"
 msgstr "三"
 
@@ -6401,7 +6296,7 @@ msgstr "三"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "四"
 
@@ -6409,13 +6304,13 @@ msgstr "四"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "last"
 msgstr "最後"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -6423,7 +6318,7 @@ msgstr "其它日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "1st to 10th"
 msgstr "1日至10日"
 
@@ -6431,7 +6326,7 @@ msgstr "1日至10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
 msgid "11th to 20th"
 msgstr "11日至20日"
 
@@ -6439,45 +6334,45 @@ msgstr "11日至20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "21st to 31st"
 msgstr "21日至31日"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
 msgid "on the"
 msgstr "在第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Add exception"
 msgstr "加入例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
 msgstr "無法取得要編輯的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
 msgid "Modify exception"
 msgstr "編輯例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to delete."
 msgstr "無法取得要刪除的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -6486,7 +6381,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>例外</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>預覽</b>"
 
@@ -6533,7 +6428,7 @@ msgstr "年"
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
 msgid "Web Page"
 msgstr "網頁"
 
@@ -6548,48 +6443,48 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2513 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2518 ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "已完成"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1065
 msgid "High"
 msgstr "高"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:748
+#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2515
 msgid "In Progress"
 msgstr "進行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1063
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1033
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
+#: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "正常"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2512
 msgid "Not Started"
 msgstr "未開始"
 
@@ -6602,7 +6497,7 @@ msgid "Stat_us:"
 msgstr "狀態(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:330
 msgid "Undefined"
 msgstr "未指定"
 
@@ -6619,20 +6514,25 @@ msgstr "優先順序(_P):"
 msgid "_Web Page:"
 msgstr "網頁(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1322
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "工作詳細資料"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "會議召集人(_Z):"
+
+#: ../calendar/gui/dialogs/task-page.c:866
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1885
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法在 '%s' 開啟工作。"
@@ -6645,9 +6545,9 @@ msgstr "到會者(_N)..."
 msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "召集人(_G):"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr "描述(_S):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
@@ -6657,49 +6557,6 @@ msgstr "時區:"
 msgid "_Due date:"
 msgstr "到期日(_D):"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>空閒/忙碌行事曆(_A)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>發佈頻率</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>發佈位置(_L)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "空閒/忙碌發佈設定"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "每天(_D)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "手動(_M)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "密碼(_P):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "記住密碼(_R)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "使用者名稱(_U):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "每週(_W)"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6776,72 +6633,72 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2913
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3327
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "未命名"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:206
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
 msgid "Start Date:"
 msgstr "開始日期："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:219
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:252
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Web Page:"
 msgstr "網頁："
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "摘要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Due Date:"
 msgstr "截止日期："
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-itip-control.c:1169
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Priority:"
 msgstr "優先程度："
 
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
+#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
 msgid "Public"
 msgstr "公開"
 
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
+#: ../calendar/gui/e-calendar-table.c:306
 msgid "Private"
 msgstr "私人"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
+#: ../calendar/gui/e-calendar-table.c:307
 msgid "Confidential"
 msgstr "機密"
 
@@ -6850,236 +6707,231 @@ msgid "End Date"
 msgstr "結束日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "開始日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Summary"
 msgstr "摘要"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:379
 msgid "Free"
 msgstr "空閒"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:380
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
 "45.436845,125.862501"
 msgstr ""
-"經緯必須依此格式輸入：\n"
+"經緯必須根據此格式輸入：\n"
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1023 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1023 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-model.c:330 ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1213
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:967
 msgid "Recurring"
 msgstr "循環模式"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:969
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2146
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1144 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1329
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
+#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:281
 msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:349
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:350
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:351
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:352
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:353
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:354
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:355
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:356
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:357
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:358
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:635
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:917
+#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "更新物件"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1101
+#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1324
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1328 ../calendar/gui/e-memo-table.c:922
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1145
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "打印(_P)..."
+#: ../calendar/gui/e-calendar-table.c:1330
+#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+msgid "P_rint..."
+msgstr "打印(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1334
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/e-calendar-table.c:1336
+#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1340 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1341 ../calendar/gui/e-memo-table.c:934
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCale_ndar 轉寄"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1342
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1343
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1344
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1345
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "標示選定的工作為未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1350
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1587
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裏增加新的工作"
@@ -7089,7 +6941,7 @@ msgstr "請按這裏增加新的工作"
 msgid "% Complete"
 msgstr "% 完成"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "完成"
 
@@ -7102,7 +6954,7 @@ msgid "Due date"
 msgstr "截止日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "Priority"
 msgstr "優先順序"
 
@@ -7110,105 +6962,112 @@ msgstr "優先順序"
 msgid "Start date"
 msgstr "開始日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "工作排序"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "狀況"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1346
 msgid "Moving items"
 msgstr "移動項目"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1658
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Select T_oday"
 msgstr "選擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Select Date..."
 msgstr "選擇日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1679
+msgid "Pri_nt..."
+msgstr "打印(_N)..."
+
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1139
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2202
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2206
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2481
+#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2475
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2256
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -7223,15 +7082,13 @@ msgstr "%Y-%m-%d (%a) %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:124
+#: ../calendar/gui/e-cell-date-edit-text.c:127
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
-"日期必須依此格式輸入：\n"
-"\n"
+"日期必須根據此格式輸入：\n"
 "%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
@@ -7249,26 +7106,26 @@ msgstr "間隔 %02i 分鐘"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1354
+#: ../calendar/gui/e-day-view.c:2141
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1643
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:952
+#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
+#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:954
+#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
+#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "下午"
 
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:769
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
 
@@ -7277,7 +7134,7 @@ msgstr "是。(複雜循環)"
 #. Every %d day/days"
 #. For Translators : 'Every day' is event Recurring every day
 #. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7289,7 +7146,7 @@ msgstr[1] "每 %d 天"
 #. Every %d week/weeks"
 #. For Translators : 'Every week' is event Recurring every week
 #. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7298,7 +7155,7 @@ msgstr[1] "每 %d 週"
 
 #. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
 #. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:799
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7306,19 +7163,19 @@ msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " 和 "
 
 #. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "The %s day of "
 msgstr "%s 日於 "
 
 #. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
 #. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:821
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 日於 "
@@ -7329,7 +7186,7 @@ msgstr "%s %s 日於 "
 #. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
 #. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
 #. %d is a digit
-#: ../calendar/gui/e-itip-control.c:834
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7341,7 +7198,7 @@ msgstr[1] "每 %d 月"
 #. Every %d year/years"
 #. For Translators : 'Every year' is event Recurring every year
 #. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:843
+#: ../calendar/gui/e-itip-control.c:853
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7350,7 +7207,7 @@ msgstr[1] "每 %d 年"
 
 #. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
 #. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:866
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7358,334 +7215,333 @@ msgstr[0] "總共 %d 次"
 msgstr[1] "總共 %d 次"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:876
 msgid ", ending on "
 msgstr "，結束於 "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:898
 msgid "Starts"
 msgstr "開始"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:912
 msgid "Ends"
 msgstr "結束"
 
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:946
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Due"
 msgstr "截止"
 
-#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1003
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../calendar/gui/e-itip-control.c:1126
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1174
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2012
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2015
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../calendar/gui/e-itip-control.c:1266
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "會議已經取消，但是在你的行事曆中找不到"
 
-#: ../calendar/gui/e-itip-control.c:1258
+#: ../calendar/gui/e-itip-control.c:1268
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經取消，但是在你的工作清單中找不到"
 
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1355
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請你出席此次會議。"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1356
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1376
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1383
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1384
 msgid "Meeting Cancelation"
 msgstr "會議取消"
 
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1422
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1423
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求你進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Proposal"
 msgstr "工作計劃"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Update"
 msgstr "工作更新"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1452
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1453
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Task Cancelation"
 msgstr "工作取消"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1496
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1497
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1501
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求你的空閒/忙碌資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1502
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1588
 msgid "The message does not appear to be properly formed"
 msgstr "郵件似乎沒有被適當地組成"
 
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1647
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1680
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1712
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1988
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:2005
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: ../calendar/gui/e-itip-control.c:1986
+#: ../calendar/gui/e-itip-control.c:2023
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: ../calendar/gui/e-itip-control.c:2003
+#: ../calendar/gui/e-itip-control.c:2047
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: ../calendar/gui/e-itip-control.c:2006
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2054
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2230
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2301
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2329
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2330
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2331
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2360
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2388
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2416
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -7735,65 +7591,69 @@ msgid "Attendees"
 msgstr "到會者"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "羣組"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "會議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
 msgid "Needs Action"
 msgstr "需要動作"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr "暫訂"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2018
 msgid "Delegated"
 msgstr "已委派"
 
@@ -7802,14 +7662,20 @@ msgstr "已委派"
 msgid "Attendee                          "
 msgstr "到會者"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 msgid "In Process"
 msgstr "進行中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel.c:2137
 msgid "%A, %B %d, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -7818,7 +7684,7 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel.c:2168
 msgid "%a %m/%d/%Y"
 msgstr "%Y-%m-%d (%a)"
 
@@ -7828,84 +7694,108 @@ msgstr "%Y-%m-%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:430
 msgid "A_ttendees..."
 msgstr "到會者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:567
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:576
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:648
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "到會者"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "按這裏新增到會者"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "普通名稱"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "委任自"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "委派給"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "語言"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "成員"
+
+#: ../calendar/gui/e-memo-table.c:939
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1090 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裏增加新的備忘錄"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "備忘錄排序"
-
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2771
+#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/gnome-cal.c:2867
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7914,38 +7804,33 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:839
 msgid "Loading memos"
 msgstr "正在載入備忘錄"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:920
 #, c-format
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1327
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "輸入 %s 的密碼"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:972
 msgid "Loading tasks"
 msgstr "正在載入工作"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:1059
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1304
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1354
 msgid "Expunging"
 msgstr "除去中"
 
@@ -7957,47 +7842,47 @@ msgstr "選擇一個時區"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1624
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:828
 msgid "Updating query"
 msgstr "正在更新查詢"
 
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2508
 msgid "_Custom View"
-msgstr "自訂檢視(_C)"
+msgstr "自選檢視(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2509
 msgid "_Save Custom View"
-msgstr "儲存自訂檢視(_S)"
+msgstr "儲存自選檢視(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2514
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2600
+#: ../calendar/gui/gnome-cal.c:2691
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-#: ../calendar/gui/gnome-cal.c:2619
+#: ../calendar/gui/gnome-cal.c:2710
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2719
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-#: ../calendar/gui/gnome-cal.c:2736
+#: ../calendar/gui/gnome-cal.c:2826
 #, c-format
 msgid "Opening %s"
 msgstr "開啟 %s"
 
-#: ../calendar/gui/gnome-cal.c:3664
+#: ../calendar/gui/gnome-cal.c:3783
 msgid "Purging"
 msgstr "清除"
 
@@ -8057,134 +7942,133 @@ msgstr "九月"
 msgid "_Select Today"
 msgstr "選擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:485
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
-msgid "Journal information"
-msgstr "日誌資訊"
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+msgid "Memo information"
+msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:698
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:747
 msgid "Updated"
 msgstr "已更新"
 
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:755
 msgid "Refresh"
 msgstr "重整清單"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:759
 msgid "Counter-proposal"
 msgstr "計算計劃"
 
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:831
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:841
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:1008
 msgid "You must be an attendee of the event."
 msgstr "你必須是此事件的到會者。"
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 msgstr[1] "%d 項備忘錄"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
-#: ../mail/mail-component.c:562
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已選擇 %d 個"
 msgstr[1] "，已選擇 %d 個"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s」來建立事件和會議"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "沒有可用的行事曆來建立備忘錄"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "新增備忘錄"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1260
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1268
 msgid "_Shared memo"
 msgstr "共用備忘錄(_S)"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "新備忘錄清單"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1276
 msgid "Memo li_st"
 msgstr "備忘錄清單(_S)"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
 # zh_HK: msgstr "打印備忘錄"
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
 msgid "Print Memos"
 msgstr "打印備忘錄"
 
@@ -8211,323 +8095,295 @@ msgstr ""
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:809
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法移轉工作 `%s'"
 
-#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:404
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:435
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:548
+#: ../calendar/gui/migration.c:1226
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
 msgid "Notes"
 msgstr "備註"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "31日"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "六"
 
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "選擇的日期(%Y 年 %-m 月 %-d 日 (%a))"
-
-#: ../calendar/gui/print.c:2072 ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%-m 月 %-d 日 (%a)"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%Y 年 %-m 月 %-d 日 (%a)"
-
-#: ../calendar/gui/print.c:2077 ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%Y 年 %-m 月 %-d 日 (%a)"
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "選定的週(%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "選定的月份(%Y 年 %-m 月)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "選定的年份(%Y)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2442
 msgid "Appointment"
 msgstr "約會"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2444
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2466
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2488
+msgid "Attendees: "
+msgstr "到會者:"
+
+#: ../calendar/gui/print.c:2528
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2545
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2557
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2582
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2593
 msgid "Contacts: "
 msgstr "聯絡人: "
 
-# zh_HK: msgstr "打印項目"
-#: ../calendar/gui/print.c:2654 ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "打印項目"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2695
+msgid "Upcoming Appointments"
+msgstr "即將開始的約會"
 
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 msgstr[1] "%d 項工作"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有可用的行事曆來建立工作"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1321
 msgid "New task"
 msgstr "新增工作"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1323
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1329
 msgid "New assigned task"
 msgstr "新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1330
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1331
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1337
 msgid "New task list"
 msgstr "新工作清單"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1338
 msgid "Tas_k list"
 msgstr "工作清單(_K)"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1339
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:455
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8538,25 +8394,21 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
 msgstr "打印工作"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "日一二三四五六"
-
 #: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "約會和會議"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
+#: ../plugins/itip-formatter/itip-formatter.c:1562
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
@@ -10118,201 +9970,124 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "附加檔案列"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "不能附加檔案 %s： %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "不能附加檔案 %s：不是一個合法的檔案"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "附件內容"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "檔案名稱:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME 類型:"
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "按這裏新增目錄服務"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-composer-post-header.c:117
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-composer-post-header.c:118
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
-#: ../composer/e-msg-composer-hdrs.c:603
-msgid "Click here for the address book"
-msgstr "按這裏新增目錄服務"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "按一下這裏，選取要張貼的資料夾"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:635
-msgid "_Reply-To:"
-msgstr "回覆地址(_R):"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "簽名檔(_G):"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:326
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:649
-msgid "S_ubject:"
-msgstr "主旨(_U):"
+#: ../composer/e-msg-composer-hdrs.c:332
+msgid "_Reply-To:"
+msgstr "回覆地址(_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:335
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:337
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:340
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:342
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:346
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:348
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr "輸入郵件密件副本的收件者"
+"appearing in the recipient list of the message"
+msgstr "輸入郵件密件副本的收件者，他們會收到這封郵件但不會出現在郵件的收件者清單"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:679
-msgid "Click here to select folders to post to"
-msgstr "按一下這裏，選取要張貼的資料夾"
-
-#: ../composer/e-msg-composer-hdrs.c:684
-msgid "Post To:"
-msgstr "張貼到:"
+#: ../composer/e-msg-composer-hdrs.c:356
+msgid "S_ubject:"
+msgstr "主旨(_U):"
 
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:77
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:198
 msgid "Insert Attachment"
 msgstr "插入附加檔案"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:819
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件：此帳號沒有設定簽署證書"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:826
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件：沒有設定加密證書(此帳號)"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3939
+#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3881
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1525
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1856
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2198 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "自動產生的"
-
-#: ../composer/e-msg-composer.c:2301
-msgid "Si_gnature:"
-msgstr "簽名檔(_G):"
-
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3821
-#: ../composer/e-msg-composer.c:3824
+#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:3764
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:5048
+#: ../composer/e-msg-composer.c:5034
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10447,7 +10222,7 @@ msgstr "撰寫郵件前，你需要先設定帳號。"
 msgid "_Do not Recover"
 msgstr "不要復原(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:310
 msgid "_Recover"
 msgstr "復原(_R)"
 
@@ -10456,18 +10231,16 @@ msgid "_Save Message"
 msgstr "儲存郵件(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution 郵件與行事曆"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:574
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟件"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "Evolution PIM 與郵件客戶端"
+msgid "Manage your email, contacts and schedule"
+msgstr "管理你的郵件、聯絡人和行程"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10477,109 +10250,6 @@ msgstr "地址卡"
 msgid "calendar information"
 msgstr "行事曆資訊"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>目前你的狀態是「不在辦公室」。</b>\n"
-"\n"
-"要更改狀態為「在辦公室」嗎？ "
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>外出訊息：</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>狀態：</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>當你不在辦公室時，以下指定的郵件將會自動傳送給\n"
-"每一位傳送郵件給你的人。</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "我目前在辦公室"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "我目前不在辦公室"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "否，請不要更改狀態"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "外出助理"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "是，請更改狀態"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>正在接收電子郵件</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>正在傳送電子郵件:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>此頁面可以讓你選擇，當別人閱讀你的郵件後，是否傳送讀信回條，\n"
-"以及指定當某人要求你傳送回條時，Evolution 要做什麼。</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "一定送回讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "詢問我是否要傳送讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "永遠不傳送讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "要求所有我傳送的郵件都索取讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "除非郵件傳送至郵寄清單，而不是給我個人"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "當你收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Evolution 錯誤"
@@ -10602,6 +10272,19 @@ msgstr "Evolution 查詢"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "內部錯誤，要求的不明錯誤 '%s'>"
 
+#: ../e-util/e-print.c:138
+msgid "An error occurred while printing"
+msgstr "在打印時發生錯誤"
+
+#: ../e-util/e-print.c:145
+msgid "The printing system reported the following details about the error:"
+msgstr "打印系統回報下列關於此錯誤的詳細資訊："
+
+#: ../e-util/e-print.c:151
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "打印系統沒有回報任何關於此錯誤的額外資訊。"
+
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "無法開啟檔案「{0}」。"
@@ -10622,151 +10305,229 @@ msgstr "檔案存在「{0}」。"
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "系統匣的方向。"
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "重要(_M)"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "工作(_W)"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "個人(_P)"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "待辦事項(_T)"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "稍後(_L)"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "標籤名稱(_N):"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Edit Label"
+msgstr "編輯標籤"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Add Label"
+msgstr "加入標籤"
 
-#: ../filter/filter-datespec.c:78
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "標籤的名稱不能空白。"
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr "已存在同樣的標籤。請更改標籤名稱。"
+
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 秒前"
 msgstr[1] "%d 秒前"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "1 秒後"
+msgstr[1] "%d 秒後"
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 分鐘前"
 msgstr[1] "%d 分鐘前"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "1 分鐘後"
+msgstr[1] "%d 分鐘後"
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 小時前"
 msgstr[1] "%d 小時前"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "1 小時後"
+msgstr[1] "%d 小時後"
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 日前"
 msgstr[1] "%d 日前"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "1 天後"
+msgstr[1] "%d 天後"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 週前"
 msgstr[1] "%d 週前"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "1 週後"
+msgstr[1] "%d 週後"
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 月前"
 msgstr[1] "%d 月前"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "1 個月後"
+msgstr[1] "%d 個月後"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 年前"
 msgstr[1] "%d 年前"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "1 年後"
+msgstr[1] "%d 年後"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<按這裏選擇日期>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "現在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
-msgid "Important"
-msgstr "重要"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:147
-msgid "To Do"
-msgstr "待辦"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "稍後"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "測試"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "搜尋名稱(_S):"
+#: ../filter/filter-rule.c:800
+msgid "R_ule name:"
+msgstr "規則名稱(_U):"
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "尋找符合下列條件的項目"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:862
+msgid "A_dd Filter Criteria"
+msgstr "加入過濾器規則(_D)"
+
+#: ../filter/filter-rule.c:868
 msgid "If all criteria are met"
 msgstr "如果全部條件符合"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:868
 msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:870
 msgid "_Find items:"
 msgstr "尋找項目(_F):"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "Replies"
 msgstr "回覆"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
-msgstr "包括線串"
+#: ../filter/filter-rule.c:894
+msgid "I_nclude threads"
+msgstr "包括郵件羣組(_N)"
 
-#: ../filter/filter-rule.c:987 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "內送"
 
-#: ../filter/filter-rule.c:987 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -10790,7 +10551,7 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -10858,35 +10619,46 @@ msgstr "相對於目前時間的時差"
 msgid "ago"
 msgstr "前"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+#, fuzzy
+msgid "in the future"
+msgstr "1 天後"
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:181
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "秒後"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "目前時間"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "你所指定的時間"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:398
+msgid "weeks"
+msgstr "週"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "年"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "規則名稱"
 
@@ -10931,22 +10703,21 @@ msgstr "Evolution 郵件撰寫器組態控制"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 郵件優先設定控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:580
-#: ../mail/mail-component.c:581 ../mail/mail-component.c:722
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
+#: ../mail/mail-component.c:737
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:502
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
@@ -10973,121 +10744,123 @@ msgstr ""
 "並選取核取方塊來接受它\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
+#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "自動產生的"
+
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
 msgid "Identity"
 msgstr "身分"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
-#: ../mail/em-account-editor.c:2046
-msgid "Automatically check for _new mail every"
+#: ../mail/em-account-editor.c:2053
+msgid "Check for _new messages every"
 msgstr "自動檢查新郵件每(_N)"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "分鐘(_T)"
+
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "安全性"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
 msgid "Receiving Options"
 msgstr "接收選項"
 
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
-msgid "Checking for New Mail"
+#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+msgid "Checking for New Messages"
 msgstr "檢查新郵件"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "停用"
-
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "啟用"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:436
 msgid "[Default]"
 msgstr "[預設值]"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
+#: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:495
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:497
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:1033
+#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:1062
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:953
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:996
 msgid "Add signature script"
 msgstr "新增簽署程序檔"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1016
 msgid "Signature(s)"
 msgstr "簽名檔"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1702
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1749
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
 msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} 提到："
 
+#: ../mail/em-composer-utils.c:1890
+msgid "-----Original Message-----"
+msgstr "-----原始郵件-----"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "過濾器規則(_F)"
@@ -11110,365 +10883,401 @@ msgid "Attachments"
 msgstr "附加檔案"
 
 #: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "密件副本(BCC)"
+
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "嗶聲"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "副本(CC)"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "已完成於"
+
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "包含"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "收件日期"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "送件日期"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "不包含"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "不是以此結束"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "不存在"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "沒有傳回"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "不類似"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "不是以此開始"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "草稿"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "以此終結"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "存在"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "存在"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "詞句"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "跟隨"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "重要"
+
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "是"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "是之後的"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "是之前的"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "有標幟"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "大於"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "小於"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "不是"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "沒有標幟"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "未設定"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "設定"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "標籤"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "符合全部"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "建立程式管道"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
 msgid "Read"
 msgstr "已閱讀"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件者"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "回覆"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "傳回"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "傳回大於"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "傳回小於"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "執行程式"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "目標"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "寄件者"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "設定標籤"
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "設定狀態"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "類似"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "以此開始"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1661
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1696
+#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "主旨"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>然後</b>"
+#: ../mail/em-filter-rule.c:489
+msgid "Then"
+msgstr "接着根據"
+
+#: ../mail/em-filter-rule.c:517
+msgid "Add Ac_tion"
+msgstr "加入動作(_T)"
 
-#: ../mail/em-folder-browser.c:168
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)..."
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../mail/em-folder-browser.c:200
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "最近的郵件"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "有附加檔案的郵件"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/em-folder-browser.c:1028
+#: ../mail/em-folder-browser.c:1123
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../mail/em-folder-browser.c:1072
+#: ../mail/em-folder-browser.c:1176
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "未讀郵件:"
+msgstr[1] "未讀郵件:"
+
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 msgstr[1] "所有郵件:"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "未讀郵件:"
-msgstr[1] "未讀郵件:"
-
-#: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../mail/em-folder-properties.c:323
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "建立"
+#: ../mail/em-folder-selector.c:262
+msgid "C_reate"
+msgstr "建立(_R)"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "草稿"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
 msgid "Outbox"
 msgstr "寄件匣"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
 msgid "Sent"
 msgstr "已傳送"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
 msgid "Loading..."
 msgstr "載入中..."
 
@@ -11487,606 +11296,725 @@ msgstr "載入中..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:372
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:732
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:891
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1968
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1970
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
 
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:58 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2095
 msgid "Open in _New Window"
 msgstr "在新視窗開啟(_N)"
 
-#: ../mail/em-folder-tree.c:2070
-msgid "_Copy..."
-msgstr "複製(_C)..."
-
-#: ../mail/em-folder-tree.c:2071
-msgid "_Move..."
-msgstr "移動(_M)..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2100
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)..."
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2103
+msgid "_Move..."
+msgstr "移動(_M)..."
+
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2111
+msgid "Re_fresh"
+msgstr "重新整理(_F)"
+
+#: ../mail/em-folder-tree.c:2112
+msgid "Fl_ush Outbox"
+msgstr "清理寄件匣(_U)"
+
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "清空回收筒(_E)"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s」複製到「%s」"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1030
-#: ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
+#: ../mail/em-folder-view.c:1206
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
-#: ../mail/em-folder-view.c:966 ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "你沒有足夠的權限刪除此封郵件。"
 
-#: ../mail/em-folder-view.c:1138 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1140 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:578 ../mail/em-popup.c:589
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/em-folder-view.c:1143 ../ui/evolution-mail-message.xml.h:107
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1342
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "打印(_P)..."
+
+#: ../mail/em-folder-view.c:1346
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1347
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1348
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1351
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as Un_important"
 msgstr "標示成不重要(_I)"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1357
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)..."
 
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1359
 msgid "_Label"
 msgstr "標籤(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1163 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:498
 msgid "_None"
 msgstr "無(_N)"
 
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1363
+msgid "_New Label"
+msgstr "新增標籤(_N)"
+
+#: ../mail/em-folder-view.c:1367
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1368
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1371
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
-#: ../mail/em-folder-view.c:1173
-msgid "Search Folder from _Subject"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1373
+msgid "Search Folder based on _Subject"
 msgstr "從主旨建立搜尋資料夾(_S)"
 
-#: ../mail/em-folder-view.c:1174
-msgid "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1374
+msgid "Search Folder based on Se_nder"
 msgstr "從寄件者建立搜尋資料夾(_N)"
 
-#: ../mail/em-folder-view.c:1175
-msgid "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on _Recipients"
 msgstr "從收件者建立搜尋資料夾(_R)"
 
-#: ../mail/em-folder-view.c:1176
-msgid "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on Mailing _List"
 msgstr "從郵件清單建立搜尋資料夾(_L)"
 
-#: ../mail/em-folder-view.c:1180
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1381
+msgid "Filter based on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
-#: ../mail/em-folder-view.c:1181
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1382
+msgid "Filter based on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
-#: ../mail/em-folder-view.c:1182
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
-#: ../mail/em-folder-view.c:1183
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on _Mailing List"
 msgstr "從通信論壇建立過濾器(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2036 ../mail/em-folder-view.c:2080
+#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
 msgid "Default"
 msgstr "預設值"
 
-# zh_HK: msgstr "打印郵件"
-#: ../mail/em-folder-view.c:2185 ../mail/em-folder-view.c:2190
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "打印郵件"
-
-#: ../mail/em-folder-view.c:2349
+#: ../mail/em-folder-view.c:2528
 msgid "Unable to retrieve message"
 msgstr "無法接收郵件"
 
 #: ../mail/em-folder-view.c:2547
+msgid "Retrieving Message..."
+msgstr "取回郵件..."
+
+#: ../mail/em-folder-view.c:2806
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2809
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2810
 msgid "_From this Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2811
 msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/em-folder-view.c:2906
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../mail/em-folder-view.c:2911
+#: ../mail/em-folder-view.c:3320
+#, c-format
+msgid "Click to call %s"
+msgstr "按一下播號給 %s"
+
+#: ../mail/em-folder-view.c:3325
 msgid "Click to hide/unhide addresses"
 msgstr "按這裏隱藏/解除隱藏位址"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:515
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
-msgstr "尋找(_N):"
+#: ../mail/em-format-html-display.c:659
+msgid "Fin_d:"
+msgstr "尋找(_D):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:683
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:688
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:693
 msgid "M_atch case"
 msgstr "區分大小寫(_A)"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:635
 msgid "Unsigned"
 msgstr "未簽署"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:992
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此郵件未簽署。不保證此郵件已驗證。"
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:636
 msgid "Valid signature"
 msgstr "有效的簽署"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:993
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此郵件已簽署而且有效，表示它非常有可能是驗證的郵件。"
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:621
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:637
 msgid "Invalid signature"
 msgstr "無效的簽署"
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:994
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "郵件的簽署無法檢驗，可能已在傳送時被更動了。"
 
-#: ../mail/em-format-html-display.c:941
-msgid "Valid signature, cannot verify sender"
-msgstr "簽署有效，但無法檢驗寄件者"
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:638
+msgid "Valid signature, but cannot verify sender"
+msgstr "簽署有效，但是無法檢驗寄件者"
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:995
 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:947 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:639
+msgid "Signature exists, but need public key"
+msgstr "簽署存在，但需要公開密碼匙"
+
+#: ../mail/em-format-html-display.c:996
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "此郵件有一個有效的簽署，但是沒有對應的公開密碼匙。"
+
+#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:645
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:1003
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "此郵件未加密。它的內容在透過互聯網傳送可能會被檢閱。"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:646
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:1004
 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 "
 "message in a practical amount of time."
 msgstr "此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時日，並不是無法檢視此郵件的內容。"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:647
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:1005
 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:950 ../mail/em-format-html.c:631
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:648
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:1006
 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 "
 "practical amount of time."
 msgstr "此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件的內容。"
 
-#: ../mail/em-format-html-display.c:1051 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視證書(_V)"
 
-#: ../mail/em-format-html-display.c:1066
+#: ../mail/em-format-html-display.c:1122
 msgid "This certificate is not viewable"
 msgstr "此證書無法檢視"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1441
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1393
+#: ../mail/em-format-html-display.c:1449
 msgid "Overdue:"
 msgstr "到期日:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1396
+#: ../mail/em-format-html-display.c:1452
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1512
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1513
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1514
 msgid "_Fit to Width"
 msgstr "符合闊度(_F)"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1515
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2505
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-#: ../mail/em-format-html-display.c:2107
-msgid "Select folder to save all attachments..."
-msgstr "選擇用來儲存所有的附加檔案的資料夾..."
+#: ../mail/em-format-html-display.c:2173
+msgid "Save attachment as"
+msgstr "另存附加檔案為"
+
+#: ../mail/em-format-html-display.c:2177
+msgid "Select folder to save all attachments"
+msgstr "選擇用來儲存所有附加檔案的資料夾"
 
-#: ../mail/em-format-html-display.c:2154
+#: ../mail/em-format-html-display.c:2228
 msgid "_Save Selected..."
 msgstr "儲存選取的(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2221
+#: ../mail/em-format-html-display.c:2295
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 個附件(_T)"
 msgstr[1] "%d 個附件(_T)"
 
-#: ../mail/em-format-html-display.c:2228 ../mail/em-format-html-display.c:2306
+#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
 msgid "S_ave"
 msgstr "儲存(_A)"
 
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2313
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2376
 msgid "No Attachment"
 msgstr "無附件"
 
-#: ../mail/em-format-html-display.c:2433 ../mail/em-format-html-display.c:2478
+#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
 msgid "View _Unformatted"
 msgstr "檢閱未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2435
+#: ../mail/em-format-html-display.c:2509
 msgid "Hide _Unformatted"
 msgstr "隱藏未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2497
+#: ../mail/em-format-html-display.c:2564
 msgid "O_pen With"
 msgstr "以...開啟(_O)"
 
-#: ../mail/em-format-html-display.c:2566
+#: ../mail/em-format-html-display.c:2635
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
 msgstr "Evolution 無法顯示此封電子郵件，因為它已超出能處理的大小。你可以用不排版的方式或使用外部文字編輯器來閱讀它。"
 
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../mail/em-format-html.c:484 ../mail/em-format-html.c:486
+#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
 
-#: ../mail/em-format-html.c:622
-msgid "Valid signature but cannot verify sender"
-msgstr "簽署有效，但是無法檢驗寄件者"
+#: ../mail/em-format-html.c:910
+msgid "Unknown external-body part."
+msgstr "未知的外加本文部分。"
 
-#: ../mail/em-format-html.c:893
+#: ../mail/em-format-html.c:918
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:948
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:959
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-#: ../mail/em-format-html.c:936
+#: ../mail/em-format-html.c:961
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:957
+#: ../mail/em-format-html.c:982
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:993
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
-#: ../mail/em-format-html.c:1195
+#: ../mail/em-format-html.c:1221
 msgid "Formatting message"
 msgstr "格式化郵件"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "寄件者"
+#: ../mail/em-format-html.c:1388
+msgid "Formatting Message..."
+msgstr "格式化郵件..."
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:86
-msgid "Reply-To"
-msgstr "回覆"
-
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1540 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "副本"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1629 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "密件副本"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1665 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1045
+#: ../mail/em-format-html.c:1700 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1692
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1727
+msgid " (%a, %R %Z)"
+msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1695
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: ../mail/em-format-html.c:1705 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../mail/em-format-html.c:1732
+msgid " (%R %Z)"
+msgstr " (%R %Z)"
+
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format-html.c:1728 ../mail/em-format.c:855
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1767 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "新聞羣組"
 
-#: ../mail/em-format.c:1119
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1860
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr "這封郵件是由 <b>%s</b> 代表 <b>%s</b> 寄出"
+
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
+msgid "From"
+msgstr "寄件者"
+
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:91
+msgid "Reply-To"
+msgstr "回覆"
+
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
-#: ../mail/em-format.c:1158 ../mail/em-format.c:1306 ../mail/em-format.c:1608
+#: ../mail/em-format.c:1196
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 
-#: ../mail/em-format.c:1288 ../mail/em-format.c:1444
+#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-#: ../mail/em-format.c:1296
+#: ../mail/em-format.c:1341
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "多部份/已加密不支援的加密類型"
 
-#: ../mail/em-format.c:1463
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message"
+msgstr "無法剖析 PGP/MIME 郵件"
+
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "無法剖析 PGP/MIME 郵件：未知的錯誤"
+
+#: ../mail/em-format.c:1508
 msgid "Unsupported signature format"
 msgstr "不支援的簽署格式"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
 msgid "Error verifying signature"
 msgstr "檢驗簽署發生錯誤"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽署發生不明錯誤"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message"
+msgstr "無法剖析 PGP 郵件"
+
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message: Unknown error"
+msgstr "無法剖析 PGP 郵件：未知的錯誤"
+
+#: ../mail/em-mailer-prefs.c:108
 msgid "Every time"
 msgstr "每次"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per day"
 msgstr "每天一次"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per week"
 msgstr "每週一次"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:111
 msgid "Once per month"
 msgstr "每月一次"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr "加入自選垃圾郵件檔頭"
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr "標頭名稱:"
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr "標頭數值包含:"
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr "包含數值"
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "色彩"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr "標籤"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s 外掛程式已可使用並且該軟件也安裝完成。"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s 外掛程式尚無法使用。請檢查是否有安裝該套件。"
+
+#: ../mail/em-mailer-prefs.c:1115
+msgid "No Junk plugin available"
+msgstr "沒有可用的垃圾郵件外掛程式"
+
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "待辦"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "稍後"
+
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12097,108 +12025,108 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2827
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2846
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr "無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:639
 msgid "_Add to Address Book"
 msgstr "加入到通訊錄(_A)"
 
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-subscribe-editor.c:595
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:628
 msgid "Subscribed"
 msgstr "已訂閱"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:632
 msgid "Folder"
 msgstr "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:834
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:855
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
-#: ../mail/em-utils.c:124
-msgid "Do not show this message again."
-msgstr "不要再顯示這個訊息。"
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "不要再顯示這個訊息(_D)"
 
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:404 ../mail/em-utils.c:436
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "郵件"
 
-#: ../mail/em-utils.c:571
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "儲存郵件…"
 
-#: ../mail/em-utils.c:620
+#: ../mail/em-utils.c:694
 msgid "Add address"
 msgstr "新增地址"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1104
+#: ../mail/em-utils.c:1178
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
@@ -12207,125 +12135,188 @@ msgstr "來自 %s 的郵件"
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
 msgstr "允許 evolution 顯示內文部份的限制大小"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Always request read receipt"
+msgstr "一定要求讀信回條"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be showed on the status bar."
+msgstr "錯誤訊息在狀態列中顯示的時間(秒)。"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
+msgstr "自動表情辨識"
+
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "自動連結辨識"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "自動辨認笑臉符號"
-
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Composer Window default height"
 msgstr "撰寫視窗預設高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Composer Window default width"
 msgstr "撰寫視窗預設闊度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr "編輯器讀取/附加目錄"
+
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "將 TO/CC/BCC 中位址的顯示方式壓縮為 address_count 中指定的長度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to compose messages"
 msgstr "用於撰寫郵件的預設字符集"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default charset in which to compose messages."
 msgstr "用於撰寫郵件的預設字符集。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字符集"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字符集。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "撰寫視窗的預設高度"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default height of the Composer Window."
+msgstr "撰寫視窗的預設高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Message Window"
-msgstr "郵件視窗的預設高度"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default height of the message window."
+msgstr "郵件視窗的預設高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "訂閱對話方塊的預設高度"
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default height of the subscribe dialog."
+msgstr "訂閱對話方塊的預設高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Composer Window"
-msgstr "撰寫視窗的預設闊度"
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default value for thread expand state"
+msgstr "相關郵件展開狀態的預設數值"
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default width of the Composer Window."
+msgstr "撰寫視窗的預設闊度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Message Window"
-msgstr "郵件視窗的預設闊度"
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "郵件視窗的預設闊度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
-msgid "Default width of the Subscribe dialog"
-msgstr "訂閱對話方塊的預設闊度"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "訂閱對話方塊的預設闊度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
-msgid "Directory for saving mail component files"
-msgstr "用來存放郵件元件檔的目錄"
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號。如果找得到，就不判斷為垃圾郵件。它會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄（像 ldap），則速度可能會很慢。"
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "決定是否使用自選標頭來檢查垃圾郵件"
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr "決定是否使用自選標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭，將會提升垃圾郵件檢查的速度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Directory for loading/attaching files to composer."
+msgstr "用來郵件編輯器載入/附加檔案的目錄。"
+
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Directory for saving mail component files."
+msgstr "用來儲存郵件元件檔的目錄。"
+
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Draw spelling error indicators on words as you type."
 msgstr "當你輸入內容時在文字上顯示拼字錯誤指示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Empty Junk folders on exit"
+msgstr "離開時清空垃圾郵件資料夾"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
+
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式，如此你可以在閱讀郵件時看到游標。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Enable or disable magic space bar"
+msgstr "啟用或停用神奇空白鍵"
+
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Enable search folders"
+msgstr "啟用搜尋資料夾"
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders on startup."
+msgstr "啟用程式開始時搜尋資料夾。"
+
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12333,446 +12324,545 @@ msgid ""
 "that folder."
 msgstr "啟用側邊欄搜尋功能使你能輸入文字開始互動式搜尋。它的作用是讓你只須在側邊欄中輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾的位置。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr "啟用此選項可在郵件預覽、郵件清單和資料夾中使用空白鍵捲動畫面。"
+
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Enable to render message text part of limited size."
 msgstr "啟用以顯示限制大小的郵件文字。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Height of the message-list pane"
 msgstr "郵件清單窗格高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Height of the message-list pane."
 msgstr "郵件清單窗格的高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "隱藏各資料夾預覽並移除選取區"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "當「預覽」窗格開啟時，將它緊貼顯示而非重疊顯示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
 "in GNOME's mime-type database may be used for displaying content."
 msgstr "如果沒有內置檢視器可用於 Evolution 裏面特殊的 mime-type，任何顯示在此清單的 mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於顯示內容。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "這會停用/啟用標記多個郵件時的提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr "它啟用/停用在進入離線模式前是否重複提示有無離線前同步的需求。"
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr "它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件，而非僅是將郵件自搜尋結果中移除。"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Last time empty junk was run"
+msgstr "上次清空垃圾郵件的時間"
+
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Last time empty trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Level beyond which the message should be logged."
+msgstr "應記錄的郵件等級。"
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "List of accepted licenses"
 msgstr "接收的授權清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "List of accounts"
 msgstr "帳號清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 msgstr "Evolution 的郵件元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts 相關的字串命名子目錄。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "List of custom headers and whether they are enabled."
-msgstr "自訂檔頭以及它們是否啟用的清單"
+msgstr "自選檔頭以及它們是否啟用的清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
 msgstr "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color 使用 HTML 十六進位編碼。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "mime 類型清單，檢查 bonobo 元件檢視器"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of protocol names whose license has been accepted."
 msgstr "已經接受其授權的協定清單。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Load images for HTML messages over http"
 msgstr "透過 http 載入 HTML 郵件的圖像"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
-msgstr ""
-"透過 http(s) 載入 HTML 郵件的圖像。可能的值為：\n"
-"0 – 不從網絡載入圖像\n"
-"1 – 如果寄件者是在通訊錄時，載入圖像\n"
-"2 - 一定從網絡載入圖像"
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
+msgstr "透過 http(s) 載入 HTML 郵件的圖像。可能的值為：0 – 不從網絡載入圖像。 1 – 如果寄件者是在通訊錄時，載入圖像。2 - 一定從網絡載入圖像。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後，標示成已閱讀"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後，標示成已閱讀。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Mark citations in the message \"Preview\""
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Message Window default height"
 msgstr "郵件視窗預設高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Message Window default width"
 msgstr "郵件視窗預設闊度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "訊息顯示樣式 (「一般」、「完整檔頭」、「來源」)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Minimum days between emptying the junk on exit"
+msgstr "結束時清空垃圾郵件最少間隔天數"
+
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "結束時清空垃圾郵件最少間隔天數。"
+
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
-msgid "New Mail Notify sound file"
-msgstr "新郵件通知聲音檔案"
-
-#: ../mail/evolution-mail.schemas.in.in.h:63
-msgid "New Mail Notify type"
-msgstr "新郵件通知類型"
-
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr "提示使用者以確認是否立即進入離線"
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Prompt when deleting messages in search folder"
+msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時，顯示提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "辨認文字中的表情符號並取代成圖示。"
+
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Recognize links in text and replace them."
 msgstr "辨認文字中的連結並將之取代。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
-msgid "Recognize smileys in text and replace them with images."
-msgstr "辨認文字中的笑臉符號並取代成圖示。"
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid "Run junk test on incoming mail."
+msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:77
-msgid "Run junk test on incoming mail"
-msgstr "在內送的郵件執行垃圾郵件檢查"
-
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Search for the sender photo in local addressbooks"
+msgstr "在本地端通訊錄搜尋寄件者相片"
+
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Send HTML mail by default"
 msgstr "預設傳送 HTML 郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Send HTML mail by default."
 msgstr "預設傳送 HTML 郵件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Show animated images as animations."
 msgstr "播放動畫影像。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Show photo of the sender"
+msgstr "顯示寄件者的相片"
+
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "在郵件清單的組合欄中顯示寄件者的電子郵件"
+"list."
+msgstr "在郵件清單的組合欄中顯示寄件者的電子郵件。"
+
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Show the sender email in the messages column in the message list"
 msgstr "在郵件清單的郵件欄中顯示寄件者的電子郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
-msgid "Sound file to play when new mail arrives."
-msgstr "新郵件送到時要播放的音效檔案"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Specifies the header to check for junk."
+msgstr "指定檢查垃圾郵件用的標頭。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "指定使用者要使用的「新郵件通知」類型。"
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Specifies the header to check for junk. The format is headername=value in "
+"gconf."
+msgstr "指定檢查垃圾郵件用的標頭。其格式為 gconf 中的 headername=value。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Spell check inline"
 msgstr "行內拼字檢查"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Subscribe dialog default height"
 msgstr "訂閱對話方塊預設高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default width"
 msgstr "訂閱對話方塊預設闊度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Text message part limit"
 msgstr "文字郵件限制"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "The default plugin for Junk hook"
+msgstr "垃圾釣鉤的預設外掛程式"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "上次執行清空垃圾郵件的時間，從電腦紀元後算起的日數。"
+
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次執行清單回收筒的時間，從紀元後算起的日數。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
-msgid "The terminal font for mail display"
-msgstr "用於郵件顯示的終端機字型"
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "The terminal font for mail display."
+msgstr "用於顯示郵件的終端機字型。"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "The variable width font for mail display."
+msgstr "用於顯示郵件的變動闊度字型。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
-msgid "The variable width font for mail display"
-msgstr "用於郵件顯示的變動闊度字型"
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "這裏可使用三種數值。 0 為錯誤，1 為警告，2 為除錯訊息。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
 msgstr "這裏決定了郵件內文在 evolution 中可排版的最大容量。預設的大小是 4MB / 4096 KB，以 KB 來指定。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr "這是預設的垃圾郵件外掛程式，即使已啟用了其他的外掛程式。如果停用這裏列出的預設外掛程式，並不會影響其他可用的外掛程式。"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"This key is read only once and reset to false after read. This unselects the "
+"mail in the list and removes the preview for that folder."
+msgstr "這個鍵值只能讀取一次，並會在讀取後設為 false。這樣會取消在清單中對該郵件的選取並移除對該資料夾的預覽。"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
 "header enabled&gt; - set enabled if the header is to be displayed in the "
 "mail view."
-msgstr "此密碼匙應該包含 XML 清單，它會指定自訂檔頭，以及是否顯示它們。XML 結構的格式是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定成 enabled。"
+msgstr "此密碼匙應該包含 XML 清單，它會指定自選檔頭，以及是否顯示它們。XML 結構的格式是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定成 enabled。"
+
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "This option would help in improving the speed of fetching."
+msgstr "這個選項能協助增進接收的速度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "這會設定在預設郵件清單檢視中顯示位址的長度，超過的部分會顯示「...」。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr "這個設定值指定相關郵件預設為展開或收摺的狀態。Evolution 將需要重新啟動。"
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr "這個設定值指定相關郵件要根據每個郵件羣組最新的郵件排序，而非根據郵件的日期。Evolution 將需要重新啟動。"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Thread the message list."
 msgstr "串接郵件清單。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Thread the message-list"
 msgstr "串接郵件清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Timeout for marking message as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Timeout for marking message as seen."
 msgstr "將郵件標示成已閱讀的時限。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use Spamassassin daemon and client"
-msgstr "使用 Spamasssassin 伺服程式和用戶端"
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Use SpamAssassin daemon and client"
+msgstr "使用 SpamAsssassin 伺服程式和客戶端"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "使用 Spamasssassin 伺服程式和用戶端 (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "使用 SpamAsssassin 伺服程式和客戶端 (spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Use custom fonts"
-msgstr "使用自訂字型"
+msgstr "使用自選字型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
-msgid "Use custom fonts for displaying mail"
-msgstr "使用自訂字型來顯示郵件"
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Use custom fonts for displaying mail."
+msgstr "使用自選字型來顯示郵件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾郵件測試。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use side-by-side or wide layout"
 msgstr "使用緊貼或寬配置"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Variable width font"
 msgstr "變動闊度字型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "View/Bcc menu item is checked"
 msgstr "檢視/密件副本功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "View/Bcc menu item is checked."
 msgstr "檢視/密件副本功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "View/Cc menu item is checked"
 msgstr "檢視/副本功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "View/Cc menu item is checked."
 msgstr "檢視/副本功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "View/From menu item is checked"
 msgstr "檢視/寄件者功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "View/From menu item is checked."
 msgstr "檢視/寄件者功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "View/PostTo menu item is checked"
 msgstr "檢視/張貼功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "View/PostTo menu item is checked."
 msgstr "檢視/張貼功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "View/ReplyTo menu item is checked"
 msgstr "檢視/回覆功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "View/ReplyTo menu item is checked."
 msgstr "檢視/回覆功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "是否預設在每封郵件加入讀信回條的要求"
+
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
-msgstr "當郵件不包含 In-Reply-To 或 References 檔頭時，是否按照主旨放回線串。"
+msgstr "當郵件不包含 In-Reply-To 或 References 檔頭時，是否按照主旨放回郵件羣組。"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "是否根據郵件羣組中最新的郵件來排序相關郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Width of the message-list pane"
 msgstr "郵件清單窗格闊度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Width of the message-list pane."
 msgstr "郵件清單窗格的闊度。"
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:184
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:369
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:370
 msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "選取資料夾來輸入"
 
@@ -12784,119 +12874,29 @@ msgstr "Berkeley 郵件信箱 (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "匯入 Berkeley 郵件信箱格式資料夾"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "正在匯入 ‘%s’"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "請稍候"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "正在匯入信箱"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
 #, c-format
-msgid "Scanning %s"
-msgstr "掃描 %s"
+msgid "Importing `%s'"
+msgstr "正在匯入 ‘%s’"
 
-#: ../mail/importers/netscape-importer.c:74
+#: ../mail/importers/mail-importer.c:372
 #, c-format
-msgid "Priority Filter \"%s\""
-msgstr "優先順序過濾器「%s」"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"有些 Netscape 郵件過濾器是以電子郵件的優先權\n"
-"為基礎的，而在 Evolution 中則沒有這種用法。\n"
-"Evolution 的替代方式是提供範圍從 -3 到 3 的點數\n"
-"給電子郵件，並且根據此數值來過濾。\n"
-"\n"
-"\n"
-"目前的解決方案是加入一組名為「優先順序過濾器」\n"
-"的過濾器來將 Netscape 的電子郵件優先權轉換為\n"
-"Evolution 的點數，而受影響的過濾器會使用點數來\n"
-"代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
-"照你想要的方式運作。"
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"有些 Netscape 郵件過濾器使用\n"
-"「忽略對話」或「監看對話」的\n"
-"功能，而 Evolution 並不支援它。\n"
-"這些過濾器則會被丟棄。"
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"有些 Netscape 郵件過濾器可以測試\n"
-"電子郵件的內文是否與所給的字串相等，\n"
-"Evolution 不支援此功能。那些過濾器\n"
-"會被修改成測試郵件的內文是否包含\n"
-"該字串。"
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution 正在匯入舊有的 Netscape 資料"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "輸入 Netscape 資料"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "設定值"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "郵件規則"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution 找到 Netscape 格式的郵件。\n"
-"是否將它們匯入至 Evolution？"
+msgid "Scanning %s"
+msgstr "掃描 %s"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
 msgid "Import mail from Pine."
 msgstr "從 Pine 匯入郵件。"
 
@@ -12924,166 +12924,198 @@ msgstr "%s 郵件列表"
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:533
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "已選擇 %d 個，"
+msgstr[1] "已選擇 %d 個，"
+
+#: ../mail/mail-component.c:537
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 msgstr[1] "%d 封已刪除"
 
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 msgstr[1] "%d 封垃圾"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 msgstr[1] "%d 個草稿"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:544
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 msgstr[1] "%d 封已傳送"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 msgstr[1] "%d 封未傳送"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:552
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d 封未讀，"
+msgstr[1] "%d 封未讀，"
+
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 msgstr[1] "共 %d 封"
 
-#: ../mail/mail-component.c:558
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] "%d 封未讀"
-msgstr[1] "%d 封未讀"
-
-#: ../mail/mail-component.c:840
+#: ../mail/mail-component.c:890
 msgid "New Mail Message"
 msgstr "新增郵件"
 
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:891
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:892
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../mail/mail-component.c:848
+#: ../mail/mail-component.c:898
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
 
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:899
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:900
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../mail/mail-component.c:996
+#: ../mail/mail-component.c:1047
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級郵件或資料夾失敗。"
 
-#: ../mail/mail-config.c:85
-msgid "I_mportant"
-msgstr "重要(_M)"
+#: ../mail/mail-component.c:1516
+msgid "Error"
+msgstr "錯誤"
 
-#. red
-#: ../mail/mail-config.c:86
-msgid "_Work"
-msgstr "工作(_W)"
+#: ../mail/mail-component.c:1516
+msgid "Errors"
+msgstr "錯誤"
 
-#. orange
-#: ../mail/mail-config.c:87
-msgid "_Personal"
-msgstr "個人(_P)"
+#: ../mail/mail-component.c:1517
+msgid "Warnings and Errors"
+msgstr "警告與錯誤"
 
-#. forest green
-#: ../mail/mail-config.c:88
-msgid "_To Do"
-msgstr "待辦事項(_T)"
+#: ../mail/mail-component.c:1518
+msgid "Debug"
+msgstr "偵錯"
 
-#. blue
-#: ../mail/mail-config.c:89
-msgid "_Later"
-msgstr "稍後(_L)"
+#: ../mail/mail-component.c:1518
+msgid "Error, Warnings and Debug messages"
+msgstr "錯誤、警告與除錯訊息"
+
+#: ../mail/mail-component.c:1628
+msgid "Debug Logs"
+msgstr "除錯紀錄檔"
+
+#: ../mail/mail-component.c:1632
+msgid "Show _errors in the status bar for"
+msgstr "在狀態列顯示此錯誤(_E)"
+
+#: ../mail/mail-component.c:1639
+msgid "seconds."
+msgstr "秒。"
+
+#: ../mail/mail-component.c:1649
+msgid "Log Messages:"
+msgstr "紀錄檔訊息:"
+
+#: ../mail/mail-component.c:1701
+msgid "Log Level"
+msgstr "紀錄等級"
+
+#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "時間"
+
+#: ../mail/mail-component.c:1715 ../mail/message-list.c:2400
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "郵件"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " 檢查可支援的類型(_E) "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart)"
+msgstr "(注意：需要重新啟動)"
+
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>此 Evolution 版本不支援 SSL</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>寄件者相片</b>"
+
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>簽署(_N)</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>語言(_L)</b>"
 
-#: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>此會讓過濾器更可靠，但速度變慢</small>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">帳號資訊</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">驗證類型</span>"
-
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">驗證</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">撰寫郵件</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">組態</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">預設行為</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">刪除郵件</span>"
 
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">顯示的郵件檔頭(_H)</span>"
-
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">過濾器選項</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">顯示的郵件檔頭(_H)</span>"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">標籤和色彩</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">標籤</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13102,47 +13134,47 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">郵件回條</span>"
 
 #: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">新郵件通知</span>"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">選擇性資訊</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">選項</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">嚴密私隱權 (PGP/GPG)</span>"
 
 # zh_HK: msgstr "<span weight=\"bold\">打印用的字型</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">打印用的字型</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">必要資訊</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">安全 MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全性</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">己傳送的和草稿郵件</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">伺服器組態</span>"
 
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">驗證類型(_A)</span>"
+
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "帳號總管"
@@ -13160,7 +13192,7 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽署(_W)"
 
 #: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
+msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "當傳送加密郵件時也加密本身(_F)"
 
 #: ../mail/mail-config.glade.h:39
@@ -13176,65 +13208,65 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任我的密碼匙圈裏的密碼匙(_T)"
 
 #: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
 #: ../mail/mail-config.glade.h:43
+msgid "Always request rea_d receipt"
+msgstr "永遠要求讀信回條(_D)"
+
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "附加原始郵件"
 
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
-msgstr "自動插入笑臉圖片(_S)"
-
 #: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "自動插入表情符號(_E)"
+
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
-msgid "Beep w_hen new mail arrives"
-msgstr "當新郵件到達時發出嗶聲(_H)"
-
 #: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "字符集(_H):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr " 檢查可支援的類型(_E) "
+msgid "C_heck custom headers for junk"
+msgstr "檢查垃圾郵件自選標頭(_H)"
 
 #: ../mail/mail-config.glade.h:51
-msgid "Check in_coming mail for junk"
-msgstr "檢查內送郵件是否為垃圾郵件(_N)"
+msgid "Ch_eck for Supported Types "
+msgstr " 檢查可支援的類型(_E) "
 
 #: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr "檢查內送郵件是否為垃圾郵件(_M)"
+
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢查內送的垃圾郵件訊息"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "清除(_A)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "清除(_R)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
-#: ../mail/mail-config.glade.h:57
-msgid "Colors"
-msgstr "色彩"
-
 #: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
@@ -13263,134 +13295,150 @@ msgstr "預設值(_F)"
 msgid "Default character e_ncoding:"
 msgstr "預設字符編碼(_N):"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "為外送的郵件加上數碼簽署 [預設值] (_S)"
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr "離開時刪除垃圾郵件(_X)"
 
 #: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in mails if the text si_ze exceeds"
-msgstr "不排版郵件內文的文字大小上限(_Z)"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "為外送的郵件加上數碼簽署 [預設值] (_U)"
 
 #: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_N)"
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr "不排版郵件內文的文字大小上限(_Z)"
+
+#: ../mail/mail-config.glade.h:73
 msgid "Do not quote original message"
 msgstr "不要引用原始郵件"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "草稿匣(_F):"
 
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "啟用(_E)"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "離開時清空回收筒資料夾(_X)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr "啟用神奇空白鍵(_P)"
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "啟用搜尋資料夾(_R)"
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "加密證書(_P):"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
 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
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "固定闊度(_X):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr "固定闊度字型(_E):"
+
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "字型內容"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/mail-config.glade.h:87
-msgid "HTML Mail"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:91
 msgid "Headers"
 msgstr "檔頭"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:92
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.glade.h:90
-msgid "I_nclude remote tests"
-msgstr "包含遠端測試(_N)"
-
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "行內"
 
 #: ../mail/mail-config.glade.h:95
+msgid "Inline original message (Outlook style)"
+msgstr "內嵌原始郵件 (Outlook 風格)"
+
+#: ../mail/mail-config.glade.h:97
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "標籤"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:103
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:104
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "注意：在標籤名稱中的底線是用來標記選單中的捷徑鍵。"
+
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在首次連線之前將不會提示你輸入密碼"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:108
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG 密碼匙 ID:"
 
-#: ../mail/mail-config.glade.h:108
-msgid "Play sound file when new mail arri_ves"
-msgstr "當新郵件到達時播放聲音檔案(_V)"
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13398,83 +13446,79 @@ msgstr ""
 "請在下面的空間輸入描述這個帳號的名稱。\n"
 "這個名稱將只做為顯示之用。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 msgstr "請輸入以下關於寄送郵件方式的資訊。如果你不清楚，請聯絡系統管理員或網絡服務供應商。"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 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 "
 "information in email you send."
 msgstr "請在下面輸入你的名稱及電郵地址。「選擇性」的欄位不一定要填，除非你希望在送出的郵件內包含這些資訊。"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "引用原始郵件"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "記住密碼(_M)"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
+
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../mail/mail-config.glade.h:124
-msgid "Se_lect..."
-msgstr "選取(_L)..."
-
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定闊度字型"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於打印的 HTML 固定闊度字型"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變闊度字型"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於打印的 HTML 可變闊度字型"
 
-#: ../mail/mail-config.glade.h:130
-msgid "Select sound file"
-msgstr "選擇聲音檔案"
-
 #: ../mail/mail-config.glade.h:132
 msgid "Sending Mail"
 msgstr "傳送郵件"
@@ -13508,24 +13552,20 @@ msgid "Signatures Table"
 msgstr "簽署表"
 
 #: ../mail/mail-config.glade.h:140
-msgid "Specify _filename:"
-msgstr "指定檔案名稱(_F):"
-
-#: ../mail/mail-config.glade.h:141
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "類型(_Y):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裏的語言清單只反映出已經安裝字典的語言。"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13535,7 +13575,12 @@ msgstr ""
 "簽名檔。你指定的名稱只會作為\n"
 "顯示之用。"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:146
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr "如果找到符合的自選垃圾郵件標頭這個選項就會被覆蓋。"
+
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13543,15 +13588,16 @@ msgstr ""
 "輸入想用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
-#: ../mail/mail-config.glade.h:150 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "可變闊度(_A):"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13561,88 +13607,100 @@ msgstr ""
 "\n"
 "按一下「下一步」開始。 "
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "一定自網絡下載圖像(_A)"
 
-#: ../mail/mail-config.glade.h:158
-msgid "_Do not notify me when new mail arrives"
-msgstr "當新郵件到達時不要通知我(_D)"
+#: ../mail/mail-config.glade.h:156
+msgid "_Default junk plugin:"
+msgstr "預設垃圾郵件外掛程式(_D):"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (兼容於 _Outlook)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: ../mail/mail-config.glade.h:162
-msgid "_Load images in mail from contacts"
-msgstr "載入由聯絡人寄出的郵件中的圖片(_L)"
+#: ../mail/mail-config.glade.h:160
+msgid "_Keep Signature above the original message on replying"
+msgstr "回信時保留原始郵件的簽署(_K)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:161
+msgid "_Load images in messages from contacts"
+msgstr "載入由聯絡人寄出郵件中的圖片(_L)"
+
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "標示郵件為已閱讀於(_M)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "一定不自網絡下載圖像(_N)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "當傳送 _HTML 郵件給不想收到這類郵件的聯絡人時顯示提示"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
+#: ../mail/mail-config.glade.h:171
+msgid "_Select..."
+msgstr "選取(_S)..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:174
 msgid "_Show image animations"
-msgstr "顯示動畫影像(_S)"
+msgstr "顯示動畫圖像(_S)"
 
 #: ../mail/mail-config.glade.h:175
+msgid "_Show the photograph of sender in the message preview"
+msgstr "在郵件預覽顯示寄件者相片(_S)"
+
+#: ../mail/mail-config.glade.h:176
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮短 _To / Cc / Bcc 檔頭為"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Use Secure Connection:"
 msgstr "使用安全連線(_U):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "addresses"
 msgstr "地址"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "color"
 msgstr "色彩"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "description"
 msgstr "描述"
 
@@ -13678,7 +13736,7 @@ msgstr "所有本地端資料夾"
 msgid "Case _sensitive"
 msgstr "區分大小寫(_S)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
@@ -13690,8 +13748,7 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在郵件內尋找"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
@@ -13719,7 +13776,7 @@ msgstr "保全性資訊"
 msgid "Specific folders"
 msgstr "指定的資料夾"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13731,11 +13788,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "接受授權(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "到期於(_D):"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
@@ -13743,7 +13800,7 @@ msgstr "標幟(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "選取此項來接受授權合約(_T)"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:823
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -13752,17 +13809,17 @@ msgstr "Pinging %s"
 msgid "Filtering Selected Messages"
 msgstr "過濾選擇的郵件"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13771,12 +13828,16 @@ msgstr ""
 "無法附加至 %s：%s\n"
 "改附加至本地「寄件匣」。"
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」：%s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "正在傳送郵件"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
@@ -13786,15 +13847,15 @@ msgstr "正在傳送郵件 %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
@@ -13808,77 +13869,77 @@ msgstr "將郵件移到 %s"
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1161
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1202
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1267
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1338
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾「%s」"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1545
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1629
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空 '%s' 的回收筒"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1630
 msgid "Local Folders"
 msgstr "本機資料夾"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1711
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1903
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13887,11 +13948,11 @@ msgstr ""
 "儲存郵件到：%s 時發生錯誤：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13900,69 +13961,75 @@ msgstr ""
 "不能建立輸出檔案：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "準備帳號「%s」離線工作"
+
+#: ../mail/mail-ops.c:2401
 msgid "Checking Service"
 msgstr "檢查服務"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:393
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:400
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:510
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:792
+#, c-format
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
-#: ../mail/mail-session.c:198
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "請輸入 %s 所需的密語"
 
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "輸入密語"
 
-#: ../mail/mail-session.c:203
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../mail/mail-session.c:243
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "使用者已取消操作。"
 
@@ -13975,7 +14042,6 @@ msgid "Enter a name for this signature."
 msgstr "輸入這個簽名檔的名稱。"
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "名稱:"
 
@@ -14003,26 +14069,26 @@ msgstr "轉寄的郵件"
 msgid "Invalid folder: `%s'"
 msgstr "資料夾無效:`%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新 '%s:%s' 的搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新 '%s' 的搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1059
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1148
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
@@ -14217,68 +14283,86 @@ msgid "Delete account?"
 msgstr "刪除帳號？"
 
 #: ../mail/mail.error.xml.h:45
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr "是否刪除搜尋資料夾 &quot;{0}&quot;？"
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder?"
+msgstr "是否刪除搜尋資料夾中的郵件？"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Discard changes?"
 msgstr "是否放棄更改？"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
+msgid "Do not d_elete"
+msgstr "不要刪除(_E)"
+
+#: ../mail/mail.error.xml.h:49
 msgid "Do not delete"
 msgstr "不要刪除"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Do not disable"
 msgstr "不要停用"
 
-#: ../mail/mail.error.xml.h:48
-msgid "Do you want the operation to be performed in the subfolders?"
+#: ../mail/mail.error.xml.h:51
+msgid "Do you want the operation to be performed also in the subfolders?"
 msgstr "是否想在子資料夾中一併進行這項操作程序？"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr "是否要在本地端同步那些標記為離線使用的資料夾？"
+
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "是否要將全部的郵件標示成已閱讀？"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的更改？"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "輸入密碼。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "執行作業時，發生錯誤。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果你選擇繼續，將無法復原這些郵件。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "如果你選擇刪除資料夾，它的所有內容和子資料夾內容會永遠消失。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果繼續，所有的代理伺服器帳號會永久刪除。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14286,29 +14370,29 @@ msgstr ""
 "如果繼續，該帳號的資訊以及\n"
 "它所有的代理伺服器會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "如果你選擇結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "無效的驗證"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14316,102 +14400,108 @@ msgid ""
 "recipient."
 msgstr "很多電子郵件系統會新增 Apparently-To 檔頭至只有密件副本收件者的郵件。如果加入了此檔頭，會永遠列示郵件中所有的收件者。要避免此情況，應該至少新增一個「收件者：」或「副本：」收件者。"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "將全部的郵件標示成已閱讀"
 
-#: ../mail/mail.error.xml.h:70
-msgid "Mark all messages in subfolders as read?"
-msgstr "是否子資料夾中全部的郵件標示成已閱讀？"
-
-#: ../mail/mail.error.xml.h:71
-msgid "Mark as _Read"
-msgstr "標示成已閱讀(_R)"
+#: ../mail/mail.error.xml.h:74
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "是否將此資料夾及其子資料夾中全部的郵件標示成已閱讀？"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "No sources selected."
 msgstr "未選取來源。"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
+msgid "Only on _Current Folder"
+msgstr "只在目前的資料夾(_C)"
+
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次開啟過多郵件可能會花費許多時間。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr "請檢查帳號設定並再試一次。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
 msgstr "請在「收件者：」欄位輸入一個有效的電子郵件地址。你可以按一下輸入方塊旁邊的「收件者：」按鈕，搜尋電子郵件地址。"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
-"請確定以下收件者希望並且可以接收HTML 電子郵件：\n"
-"{0}\n"
-"立即傳送？"
+"請確定以下收件者希望並且可以接收 HTML 電子郵件：\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "請稍候。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "移轉舊郵件資料夾「{0}」發生問題。"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server"
 msgstr "查詢伺服器"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的驗證演算法清單。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid "Read receipt requested."
 msgstr "要求讀信回條。"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "搜尋資料夾自動更新。"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "傳送回條"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "簽名檔已經存在"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "同步化"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr "是否同步資料夾以供離線使用？"
+
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
 msgstr "Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪除。"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14424,7 +14514,7 @@ msgstr ""
 "\n"
 "很多電子郵件系統會新增 Apparently-To 檔頭至只有密件副本收件者的郵件。如果新增此檔頭，會列示郵件中所有的收件者。要避免此情況，你應該至少新增一個「收件者：」或「副本：」收件者。 "
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14438,7 +14528,7 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14452,11 +14542,11 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "程序檔必須存在而且可以執行。"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14464,76 +14554,85 @@ msgstr ""
 "此資料夾可能已經自動新增。\n"
 "需要時，請移至搜尋資料夾編輯器，以手動方式新增它。"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "因為你沒有啟用選擇用來寄送的帳號，所以無法傳送此郵件。"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "因為你沒有指定任何收件者，所以無法傳送此郵件"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽署已經更改，但尚未儲存。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺服器。"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替？"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾？"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+"警告：從搜尋資料夾中刪除郵件將會自你的本地或遠端資料夾刪除實際的郵件。\n"
+"是否確定要這麼做？"
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "你沒有填入所有必須的資訊。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "你有未寄出的郵件，你無論如何都要離開嗎？"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "你不能用相同的名稱建立兩個帳號。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "你必須命名此搜尋資料夾。"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "你必須指定一個資料夾。"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14542,98 +14641,98 @@ msgstr ""
 "你必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾，然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "你登入伺服器「{0}」以「{0}」身分，但失敗。"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "添加(_A)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "放棄更改(_D)"
 
-#: ../mail/mail.error.xml.h:130
-msgid "_Do not Mark as Read"
-msgstr "不要標示成已閱讀(_D)"
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr "不要同步(_D)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "清除(_E)"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/message-list.c:1022
+#: ../mail/mail.error.xml.h:143
+msgid "on Current Folder and _Subfolders"
+msgstr "於目前的資料夾及子資料夾(_S)"
+
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1469 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "？"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476 ../plugins/itip-formatter/itip-view.c:202
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1618 ../plugins/itip-formatter/itip-view.c:206
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "今天%p %-l:%M"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1627 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p %-l:%M"
 
-#: ../mail/message-list.c:1497 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1639 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1647 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/message-list.c:1507 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../mail/message-list.c:2263 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "郵件"
-
-#: ../mail/message-list.c:3654
+#: ../mail/message-list.c:3843
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -14653,15 +14752,15 @@ msgstr "有標幟的"
 msgid "Follow Up Flag"
 msgstr "跟隨標幟"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "已接收"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "傳送郵件"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "大小"
@@ -14690,15 +14789,15 @@ msgstr "轉寄"
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
 msgid "Review"
 msgstr "檢閱"
 
@@ -14734,6 +14833,59 @@ msgstr "本地端通訊錄"
 msgid "Provides core functionality for local address books."
 msgstr "提供本地端行事曆的核心功能。"
 
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "Enable attachment reminder plugin"
+msgstr "啟用附加檔案提醒外掛程式"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid "Enable attachment reminder plugin."
+msgstr "啟用附加檔案提醒外掛程式。"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr "讓附加檔案提醒外掛程式用來搜尋郵件內文的關鍵字清單"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "讓附加檔案提醒外掛程式用來搜尋郵件內文的關鍵字清單。"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+msgid "Keywords"
+msgstr "關鍵字"
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+msgid "Remind _missing attachments"
+msgstr "提醒遺失的附加檔案(_M)"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "附加檔案提醒程式"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr "在郵件中尋找關鍵字以提醒其中的附加檔案並且可在附加檔案遺失時提出警告"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr "Evolution 已找到某些代表該郵件應含有附加檔案的關鍵字，卻找不到這個附加檔案。"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "郵件沒有附加檔案"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Continue Editing"
+msgstr "繼續編輯(_C)"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14744,38 +14896,124 @@ msgstr "用來顯示郵件中音效附件的格式外掛程式，它可以讓你
 msgid "Audio inline plugin"
 msgstr "郵件音訊外掛程式"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
-msgstr "選擇 Evolution 檔案庫的名稱"
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution backup file"
+msgstr "選擇 Evolution 備份檔案的名稱"
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "備份後重新啟動 E_volution"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr "選擇要復原的 Evolution 檔案庫"
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution backup file to restore"
+msgstr "選擇要還原的 Evolution 備份檔案名稱"
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr "回存後重新啟動 E_volution"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr "從備份還原"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+"你可以從備份中還原 Evolution。它可以還原所有的郵件、行事曆、工作、備忘錄、聯絡人。\n"
+"它也可以還原你所有的個人設定、郵件過濾器等。"
+
+#: ../plugins/backup-restore/backup-restore.c:244
+msgid "_Restore Evolution from the backup file"
+msgstr "從備份檔案還原 Evol_ution"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr "選擇要還原的 Evolution 檔案庫："
+
+#: ../plugins/backup-restore/backup-restore.c:254
+msgid "Choose a file to restore"
+msgstr "選擇要還原的檔案"
+
+#: ../plugins/backup-restore/backup.c:40
 msgid "Backup Evolution directory"
 msgstr "備份 Evolution 目錄"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
 msgid "Restore Evolution directory"
 msgstr "回存 Evolution 目錄"
 
-#: ../plugins/backup-restore/backup.c:113
-msgid "Check Evolution archive"
-msgstr "檢查 Evolution 檔案庫"
+#: ../plugins/backup-restore/backup.c:44
+msgid "Check Evolution Backup"
+msgstr "檢查 Evolution 備份"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
+#: ../plugins/backup-restore/backup.c:48
+msgid "With Graphical User Interface"
+msgstr "使用圖形使用者介面"
+
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
+msgid "Shutting down Evolution"
+msgstr "正在關閉 Evolution"
+
+#: ../plugins/backup-restore/backup.c:74
+msgid "Backing Evolution accounts and settings"
+msgstr "備份 Evolution 的帳號與設定值"
+
+#: ../plugins/backup-restore/backup.c:78
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "正在備份 Evolution 資料 (郵件、聯絡人、行事曆、工作、備忘錄)"
+
+#: ../plugins/backup-restore/backup.c:88
+msgid "Backup complete"
+msgstr "備份完成"
+
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
+msgid "Restarting Evolution"
+msgstr "重新啟動 Evolution"
+
+#: ../plugins/backup-restore/backup.c:114
+msgid "Backup current Evolution data"
+msgstr "備份目前的 Evolution 資料"
+
+#: ../plugins/backup-restore/backup.c:119
+msgid "Extracting files from backup"
+msgstr "從備份解開檔案"
+
+#: ../plugins/backup-restore/backup.c:125
+msgid "Loading Evolution settings"
+msgstr "正在讀取 Evolution 的設定值"
+
+#: ../plugins/backup-restore/backup.c:129
+msgid "Removing temporary backup files"
+msgstr "移除暫存的備份檔案"
+
+#: ../plugins/backup-restore/backup.c:249
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "正備份至資料夾 %s"
+
+#: ../plugins/backup-restore/backup.c:254
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "從資料夾還原 %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:270
+msgid "Evolution Backup"
+msgstr "Evolution 備份"
+
+#: ../plugins/backup-restore/backup.c:270
+msgid "Evolution Restore"
+msgstr "Evolution 還原"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "備份與回存 Evolution 的資料與設定值的外掛程式。"
@@ -14785,49 +15023,84 @@ msgstr "備份與回存 Evolution 的資料與設定值的外掛程式。"
 msgid "Backup and restore plugin"
 msgstr "備份與回存外掛程式。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "備份設定值..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "確定要關閉 Evolution？"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "確定要從選定的備份檔案還原 Evolution？"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr "Evolution 備份只能在 Evolution 沒有執行時啟動。在進行之前請確定你已儲存並關閉所有未儲存的視窗。如果希望 Evolution 在備份後自動重新啟動，請啟用切換按鈕。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Invalid Evolution backup file"
+msgstr "無效的 Evolution 備份檔案"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Please select a valid backup file to restore."
+msgstr "請選擇有效的備份檔案來還原。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr "這將會刪除所有 Evolution 目前的資料與設定值並從備份中還原它們。Evolution 還原只能在 Evolution 沒有執行時啟動。如果希望 Evolution 在還原後自動重新啟動，請啟用切換按鈕。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "備份與回存 Evolution 的資料與設定值"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "還原設定值(_E)..."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "回存設定值..."
+msgid "_Backup Settings..."
+msgstr "備份設定值(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的聯絡人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
+#: ../plugins/bbdb/bbdb.c:565
 msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+"_Automatically create entries in the addressbook when responding to messages"
 msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入聯絡人用的通訊錄"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:586
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息聯絡人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:601
 msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr "定期從 gaim 的好友清單同步聯絡人資訊"
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr "定期從 Pidgin 的好友清單同步聯絡人資訊"
 
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
-msgstr "選擇給 Gaim 好友名單用的通訊錄"
+#: ../plugins/bbdb/bbdb.c:607
+msgid "Select Address book for Pidgin buddy list"
+msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:618
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
@@ -14842,11 +15115,39 @@ msgstr "回覆郵件時自動在通訊錄中填入姓名與電子郵件位址。
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+msgid "Convert message text to _Unicode"
+msgstr "將郵件文字轉換為 _Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "將郵件轉換為 Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr "將郵件文字轉換為 Unicode UTF-8 以統一來自不同字集的 spam/ham 特徵。"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr "Bogofilter 選項"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr "使用 Bogofilter 過濾垃圾郵件。"
+
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:135
+msgid "_URL:"
+msgstr "網址(_U):"
+
 #: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:351
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
@@ -14866,10 +15167,20 @@ msgstr "本地行事曆"
 msgid "Provides core functionality for local calendars."
 msgstr "提供本地行事曆的核心功能。"
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:375
+msgid "_Refresh:"
+msgstr "重新整理(_R):"
+
+#: ../plugins/calendar-http/calendar-http.c:341
 msgid "_Secure connection"
 msgstr "安全連線(_S)"
 
+#: ../plugins/calendar-http/calendar-http.c:406
+msgid "Userna_me:"
+msgstr "使用者名稱(_M):"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP 行事曆"
@@ -14911,15 +15222,15 @@ msgstr "天氣：雷暴"
 msgid "Select a location"
 msgstr "選擇一個位置"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "單位(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "公制(攝氏、厘米等)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(華氏、公吋等)"
 
@@ -14941,11 +15252,11 @@ msgstr "用來展示彈出式選單外掛程式功能的測試用外掛程式，
 msgid "Copy tool"
 msgstr "複製工具"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "檢查 Evolution 是否為預設的郵件程式"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "每次啟動 Evolution 時，檢查它是否為預設的郵件程式。"
@@ -14962,8 +15273,13 @@ msgstr "預設郵件客戶端程式"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "你是否要將 Evolution 設為你的預設電子郵件客戶端程式？"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:624
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as _default folder"
 msgstr "標示為預設資料夾(_D)"
 
@@ -15053,7 +15369,7 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 帳號的授權設定"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+msgid "Delegation Assistant"
 msgstr "委派設定助理"
 
 #. Miscelleneous settings
@@ -15075,35 +15391,36 @@ msgstr "資料夾大小"
 msgid "Exchange Settings"
 msgstr "Exchange 設定值"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:625
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:651
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "驗證類型"
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
+msgid "_Authentication Type"
+msgstr "驗證類型(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:868
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-account-setup.c:974
+#: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:215
+#: ../plugins/exchange-operations/exchange-account-setup.c:976
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15145,68 +15462,111 @@ msgstr "你目前的密碼已過期。請立即更改你的密碼。"
 msgid "Your password will expire in the next %d days"
 msgstr "你的密碼將在 %d 天後到期"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:159
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
 msgid "Custom"
-msgstr "自訂"
+msgstr "自選"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "編輯者 (讀取、建立、編輯)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "原著者 (讀取，建立)"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "檢閱者 (僅限讀取)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:247
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "委託許可權"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s 的許可權"
 
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr "這封郵件是由 Evolution 自動寄出以通知你已經被指派為代理人。你現在可以代表我寄發郵件。"
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+msgid "You have been given the following permissions on my folders:"
+msgstr "你已經得到我的資料夾的權限有："
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+msgid "You are also permitted to see my private items."
+msgstr "你也被允許查看我的私人項目。"
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+msgid "However you are not permitted to see my private items."
+msgstr "然而你並未得到允許觀看我的私人項目。"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr "你已經被指派為 %s 的代理人"
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "委託給"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "要移除委託 %s 嗎？"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 msgid "Could not access Active Directory"
 msgstr "無法存取 Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory 中找不到自己"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Active Directory 中找不到委託 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "無法移除委託 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 msgid "Could not update list of delegates."
 msgstr "無法更新委託的清單。"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "無法新增委託 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 msgid "Error reading delegates list."
 msgstr "讀取委託清單錯誤。"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "原著者 (讀取，建立)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
@@ -15221,18 +15581,10 @@ msgstr "聯絡人(_N)"
 msgid "Delegates"
 msgstr "委託"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "編輯者 (讀取、建立、編輯)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "許可權"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "檢閱者 (僅限讀取)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15250,8 +15602,12 @@ msgstr "委託可以查看私人的項目(_D)"
 msgid "_Inbox:"
 msgstr "收件匣(_I)："
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "許可權摘要(_S)"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "工作(_T)："
 
@@ -15260,11 +15616,11 @@ msgstr "工作(_T)："
 msgid "Permissions..."
 msgstr "權限..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
 msgid "Folder Name"
 msgstr "資料夾名稱"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
 msgid "Folder Size"
 msgstr "資料夾大小"
 
@@ -15278,23 +15634,70 @@ msgid "Exchange Folder Tree"
 msgstr "Exchange 資料夾樹"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "取消訂閱資料夾..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "確定要取消訂閱資料夾「%s」？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "取消訂閱「%s」"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>目前你的狀態是「不在辦公室」。</b>\n"
+"\n"
+"要更改狀態為「在辦公室」嗎？ "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>外出訊息：</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>狀態：</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>當你不在辦公室時，以下指定的郵件將會自動傳送給\n"
+"每一位傳送郵件給你的人。</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "我目前在辦公室"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "我目前不在辦公室"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "否，請不要更改狀態"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "外出助理"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "是，請更改狀態"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "密碼到期警告"
@@ -15375,10 +15778,6 @@ msgstr "讀取項目"
 msgid "Role: "
 msgstr "角色： "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "否，請不要更改狀態"
-
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
 msgstr "<b>郵件設定值</b>"
@@ -15426,14 +15825,26 @@ msgid "Request a _read receipt for this message"
 msgstr "要求這封郵件索取讀信回條(_R)"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "以代理人身分寄信"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "敏感度(_S):"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "使用者(_U)"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "選擇使用者"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 msgid "Address Book..."
 msgstr "通訊錄..."
 
@@ -15562,7 +15973,7 @@ msgstr ""
 "Evolution Exchange Connector。\n"
 "\n"
 "若需有關提供給你的 Exchange 管理員\n"
-"的資訊，請依照下列連結：\n"
+"的資訊，請根據下列連結：\n"
 "\n"
 "{0}\n"
 "  "
@@ -15584,7 +15995,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1288
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -15631,34 +16042,38 @@ msgid "Password successfully changed."
 msgstr "密碼已成功的更改。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr "請輸入代理人的 ID 或取消「以代理人身分寄信」選項。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "請確定全域型錄伺服器名稱是正確的。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please restart Evolution for changes to take effect"
 msgstr "請重新啟動 Evolution 以使更改生效"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please select a user."
 msgstr "請選取一個使用者。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr "伺服器拒絕密碼，因為它太容易被破解。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange 帳號將會在你離開 Evolution 時停用"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange 帳號將會在你結束 Evolution 時移除"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "此 Exchange 伺服器無法與 Exchange Connector 兼容。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15666,7 +16081,7 @@ msgstr ""
 "此伺服器執行的是 Exchange 5.5。Exchange Connector \n"
 "僅支援 Microsoft Exchange 2000 和 2003。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15680,81 +16095,87 @@ msgstr ""
 "\n"
 "或者可能只是你把密碼打錯了。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr "請使用不同的密碼再試一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to add user to access control list:"
 msgstr "無法將使用者加入存取控制清單："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to edit delegates."
 msgstr "無法編輯委任。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生不明的錯誤"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error."
 msgstr "不明的錯誤。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown type"
 msgstr "未知的類型"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unsupported operation"
 msgstr "不支援的操作"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "你已經接近在此伺服器儲存郵件的 quota 配額。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr "一個代理人只允許每次寄出一封郵件。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
 msgstr "你無法將自己設為你自己的委託"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "你已經超過了在此伺服器儲存郵件的 quota 配額。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr "你可以只設定一個單一的 Exchange 帳號。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "目前的使用量為：{0} KB。請嘗試刪除一些郵件來空出部分空間。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "目前的使用量為：{0} KB。你現在將無法傳送或接收郵件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
 msgstr "目前的使用量為：{0} KB。除非你刪除一些郵件來空出部分空間，否則將無法傳送郵件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr "你的密碼已經到期。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} 無法加入存取控制清單"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} is already a delegate"
 msgstr "{0} 已經是一個委託了"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already in the list"
 msgstr "{0} 已經在清單中"
 
@@ -15766,7 +16187,49 @@ msgstr "訂閱其他使用者的工作"
 msgid "Check folder permissions"
 msgstr "檢查資料夾權限"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr "使用外部編輯器做為郵件編輯器的外掛程式。你只能寄出純文字郵件。"
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+msgid "External Editor"
+msgstr "外部編輯器"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+msgid "Compose in External Editor"
+msgstr "以外部編輯器撰寫"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr "使用外部編輯器來編寫郵件"
+
+#: ../plugins/face/face.c:57
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "選擇小於 700 位元組的 (48*48) png"
+
+#: ../plugins/face/face.c:67
+msgid "PNG files"
+msgstr "PNG 檔案"
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+msgid "_Face"
+msgstr "面貌(_F)"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
+msgstr "在外寄的郵件中附加大頭貼標頭。第一次使用時需要先設定一張 48*48 的 png 相片。它會以 base 64 編碼並儲存於 ~/.evolution/faces 這會用在未來所寄出的郵件中。"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "面貌"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "取消訂閱資料夾 「%s」"
@@ -15783,7 +16246,20 @@ msgstr "取消訂閱資料夾"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:434
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "A plugin to setup google calendar."
+msgstr "用來設定 Google 行事曆的外掛程式。"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "Google 來源"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
 msgid "Checklist"
 msgstr "檢查清單"
 
@@ -15828,15 +16304,16 @@ msgstr "安裝分享資料夾"
 msgid "Shared Folder Installation"
 msgstr "分享資料夾安裝"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
 msgstr "垃圾郵件設定值"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>垃圾郵件設定值</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "垃圾郵件設定值"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
 msgstr "垃圾郵件設定值..."
 
@@ -15848,10 +16325,6 @@ msgstr "<b>垃圾郵件清單：</b>"
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "垃圾郵件設定值"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -15899,27 +16372,27 @@ msgstr "暫時套用"
 msgid "<b>Users:</b>"
 msgstr "<b>使用者：</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "自選通知訊息(_U)"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Con_tacts..."
+msgstr "聯絡人(_T)..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "郵件"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "分享資料夾通知"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "參與者將會收到下列通知。\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "聯絡人(_C)..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "自訂通知訊息(_C)"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "未分享(_N)"
@@ -15969,14 +16442,14 @@ msgid "Subscribe to my _notifications"
 msgstr "訂閱至我的通知(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "已閱讀(_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "寫入(_W)"
 
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr "讀(_R)"
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "代理伺服器"
@@ -16000,73 +16473,93 @@ msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:516
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "代理伺服器登入(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:701
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代理伺服器頁籤只有在帳號上線時才會出現。"
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:706
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Users"
 msgstr "使用者"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr "輸入使用者並設定權限"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr "新增分享資料夾(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "分享"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:766
 msgid "Add   "
 msgstr "新增"
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:772
 msgid "Modify"
 msgstr "修改"
 
-#: ../plugins/groupwise-features/status-track.c:118
+#: ../plugins/groupwise-features/status-track.c:105
 msgid "Message Status"
 msgstr "郵件狀態"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:132
-msgid "<b>Subject</b> :"
-msgstr "<b>主旨</b>:"
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "主旨:"
+
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "寄件者:"
+
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr "建立日期:"
+
+#: ../plugins/groupwise-features/status-track.c:187
+msgid "Recipient: "
+msgstr "收件者:"
+
+#: ../plugins/groupwise-features/status-track.c:194
+msgid "Delivered: "
+msgstr "已遞送:"
 
-#: ../plugins/groupwise-features/status-track.c:144
-msgid "<b>From</b> :"
-msgstr "<b>寄件者</b>:"
+#: ../plugins/groupwise-features/status-track.c:200
+msgid "Opened: "
+msgstr "已開啟:"
 
-#: ../plugins/groupwise-features/status-track.c:157
-msgid "<b>Creation date</b> :"
-msgstr "<b>建立日期</b>:"
+#: ../plugins/groupwise-features/status-track.c:205
+msgid "Accepted: "
+msgstr "已接受:"
 
-#: ../plugins/groupwise-features/status-track.c:177
-msgid "<b>Recipients </b>"
-msgstr "<b>收件者</b>"
+#: ../plugins/groupwise-features/status-track.c:210
+msgid "Deleted: "
+msgstr "已刪除:"
 
-#: ../plugins/groupwise-features/status-track.c:181
-msgid "<b>Action</b>"
-msgstr "<b>動作</b>"
+#: ../plugins/groupwise-features/status-track.c:215
+msgid "Declined: "
+msgstr "已婉拒:"
 
-#: ../plugins/groupwise-features/status-track.c:185
-msgid "<b>Date and Time</b>"
-msgstr "<b>日期與時刻</b>"
+#: ../plugins/groupwise-features/status-track.c:220
+msgid "Completed: "
+msgstr "已完成: "
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr "未遞送:"
+
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "追蹤郵件狀態..."
 
@@ -16078,25 +16571,21 @@ msgstr "用來設定 hula 行事曆來源的外掛程式。"
 msgid "Hula Account Setup"
 msgstr "Hula 帳號設定"
 
-#: ../plugins/imap-features/imap-headers.c:133
-msgid "Custom Header"
-msgstr "自訂檔頭"
-
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:322
 msgid "Custom Headers"
-msgstr "自訂檔頭"
+msgstr "自選檔頭"
 
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:335
 msgid "IMAP Headers"
 msgstr "IMAP 檔頭"
 
 #: ../plugins/imap-features/imap-headers.glade.h:1
 msgid "<b>Custom Headers</b>"
-msgstr "<b>自訂檔頭</b>"
+msgstr "<b>自選檔頭</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
-msgstr "<b>IMAP 檔頭</b>"
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>IMAP 標頭</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
@@ -16147,20 +16636,20 @@ msgstr "匯入至行事曆(_I)"
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:203
+#: ../plugins/import-ics-attachments/icsimporter.c:206
 msgid "Import ICS"
 msgstr "匯入 ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:231
+#: ../plugins/import-ics-attachments/icsimporter.c:233
 msgid "Select Task List"
 msgstr "選擇工作清單"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:235
+#: ../plugins/import-ics-attachments/icsimporter.c:237
 msgid "Select Calendar"
 msgstr "選擇行事曆"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:266
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "匯入(_I)"
 
@@ -16173,25 +16662,34 @@ msgstr "匯入至行事曆"
 msgid "Imports ICS attachments to calendar."
 msgstr "匯入 ICS 附加檔案到行事曆。"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "無法載入硬件抽象層"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for a iPod failed</span>\n"
-"\n"
-"Evolution could not find a iPod to synchronize with.Either it is not "
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr "「hald」服務是必要的但目前並未執行。請啟用該服務後再回到本程式，或者聯絡你的系統管理者。"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr "搜尋 iPod 失敗"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">搜尋 iPod 失敗</span>\n"
-"\n"
-"Evolution 無法找到要同步化的 iPod。可能是它尚未連接到系統或者沒有打開電源。"
+msgstr "Evolution 無法找到要同步化的 iPod。可能是 iPod 尚未連接到系統或者沒有打開電源。"
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/ical-format.c:133
+#: ../plugins/save-calendar/ical-format.c:190
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 格式 (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "與 Apple iPod 同步選擇的工作/行事曆/通訊錄"
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgstr "與 Apple iPod 同步選擇的工作/備忘錄/行事曆/通訊錄"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16201,580 +16699,642 @@ msgstr "同步化 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod 同步化"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "沒有輸出目錄！"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr "在 iPod 上找不到輸出的目錄！請確定 iPod 已正確設定後再試一次。"
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "無法匯出資料！"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "匯出資料失敗。"
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "無法開啟通訊錄！"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "無法開啟行事曆/工作！"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:429
+#: ../plugins/itip-formatter/itip-formatter.c:554
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "載入行事曆「%s」失敗"
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:574
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:600
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:676
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:683
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:687
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "無法在任何日誌中找到這個日誌項目"
+#: ../plugins/itip-formatter/itip-formatter.c:691
+msgid "Unable to find this memo in any memo list"
+msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:801
+#: ../plugins/itip-formatter/itip-formatter.c:927
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:985
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:871
+#: ../plugins/itip-formatter/itip-formatter.c:997
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1006
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1011
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1105
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1112
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1114
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1199
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1226
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1230
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1255
+msgid "Meeting information sent"
+msgstr "會議資訊寄出"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1258
+msgid "Task information sent"
+msgstr "工作資訊寄出"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1261
+msgid "Memo information sent"
+msgstr "備忘錄資訊寄出"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1270
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "無法寄出會議資訊，該會議並不存在"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1273
+msgid "Unable to send task information, the task does not exist"
+msgstr "無法寄出工作資訊，該項工作不存在"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1276
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "無法寄出備忘錄資訊，該備忘錄並不存在"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1352
+#: ../plugins/itip-formatter/itip-formatter.c:1367
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1402
+#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 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:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2123
+msgid "This meeting recurs"
+msgstr "這個會議的循環規則為"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2126
+msgid "This task recurs"
+msgstr "這項工作的循環規則為"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2129
+msgid "This memo recurs"
+msgstr "這個備忘錄的循環規則為"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "_Delete message after acting"
 msgstr "完成後刪除郵件(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2376
 msgid "Conflict Search"
 msgstr "衝突的搜尋"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "選擇要搜尋會議衝突的行事曆"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:238
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:257
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A %l:%M %p"
 msgstr "%A%p %-l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:275
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p %-l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:280
+#: ../plugins/itip-formatter/itip-view.c:284
 msgid "%A, %B %e"
 msgstr "%-m 月 %d 日 (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M"
 msgstr "%-m 月 %d 日 (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m 月 %d 日 (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr "請代表 <b>%s</b> 回覆"
+
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr "代表 <b>%s</b> 接收"
+
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 由於 %s 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 已經委派下列會議給你："
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 由於 %s 邀請你出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 邀請你出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 由於 %s 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> 透過 %s 希望收到下列會議的最新資訊："
+
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> 透過 %s 傳送了下列會議的回覆："
+
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 傳送了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 由於 %s 已經消取下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 已經消取下列會議。"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:401
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> 透過 %s 已經答覆了下列會議更改。"
+
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 已經答覆了下列會議更改。"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 由於 %s 已經婉拒了下列會議更改："
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 已經婉拒了下列會議更改。"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 已經發佈了下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> 指派 %s 加入下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 由於 %s 已經指派你一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 已經指派你一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 由於 %s 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> 透過 %s 希望收到下列指派工作的最新資訊："
+
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:477
+#, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> 透過 %s 傳送了下列指派工作的回覆："
+
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 傳送了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已經取消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 已經取消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:489
+#, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> 透過 %s 已經回覆下列指派工作的更改："
+
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 已經回覆下列指派工作的更改："
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已婉拒了下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 已經婉拒下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> 已經發佈了備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> 由於 %s 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> 由於 %s 已經消取下列共用備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經取消下列共用備忘錄："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:821
 msgid "_Open Calendar"
 msgstr "開啟行事曆(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Send Information"
 msgstr "傳送資訊(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "開始時間:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "結束時間:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "註解："
 
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
-msgstr "傳送更新給到會者(_P)"
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
+msgstr "回覆寄件者(_R)"
+
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr "傳送更新給到會者(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr "顯示時間為空閒(_F)"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "工作(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "備忘錄:"
 
@@ -16813,32 +17373,152 @@ msgstr "允許停用帳號。"
 msgid "Disable Account"
 msgstr "停用帳號"
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "發出嗶聲或播放聲音檔案。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr "讓通知區的圖示閃爍。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "啟用 D-Bus 訊息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr "啟用通知區的圖示。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "當新郵件到達時產生 D-BUS 訊息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
+msgstr "如果為 true，則當新郵件抵達時發出嗶聲或播放聲音檔。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr "只通知收件匣的新郵件。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "當新郵件到達時播放聲音檔案。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr "在圖示上彈出新郵件。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "當新郵件到達時在通知區顯示新郵件圖示。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr "要播放的聲音檔案名稱。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "新郵件送到時要播放的音效檔案，如果不是使用嗶聲模式。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "當新郵件到達時是否播放聲音檔案或發出嗶聲。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "是否在新郵件抵達時於圖示上彈出訊息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr "圖示是否要閃爍。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "是否只通知收件匣的新郵件。"
+
+#: ../plugins/mail-notification/mail-notification.c:254
+msgid "Generate a _D-Bus message"
+msgstr "產生 _D-Bus 訊息"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
 #, c-format
-msgid "System error: %s"
-msgstr "系統錯誤： %s"
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+"你已經接收 %d 封郵件\n"
+"到 %s 。 "
+msgstr[1] ""
+"你已經接收 %d 封郵件\n"
+"到 %s 。 "
 
-#: ../plugins/mail-remote/client.c:32
+#: ../plugins/mail-notification/mail-notification.c:368
 #, c-format
-msgid "Camel error: %s"
-msgstr "Camel 錯誤： %s"
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "你已經接收 %d 封郵件 。 "
+msgstr[1] "你已經接收 %d 封郵件 。 "
+
+#: ../plugins/mail-notification/mail-notification.c:380
+#: ../plugins/mail-notification/mail-notification.c:385
+msgid "New email"
+msgstr "新郵件"
+
+#: ../plugins/mail-notification/mail-notification.c:440
+msgid "Show icon in _notification area"
+msgstr "在通知區中顯示圖示(_N)"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "帳號不能傳送電子郵件"
+#: ../plugins/mail-notification/mail-notification.c:443
+msgid "B_link icon in notification area"
+msgstr "讓通知區圖示閃爍(_L)"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "沒有可用的儲存空間"
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
+msgstr "在圖示上彈出訊息(_M)"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/mail-notification.c:626
+msgid "_Play sound when new messages arrive"
+msgstr "當新郵件到達時播放聲音檔案(_P)"
+
+#: ../plugins/mail-notification/mail-notification.c:632
+msgid "_Beep"
+msgstr "嗶聲(_B)"
+
+#: ../plugins/mail-notification/mail-notification.c:633
+msgid "Play _sound file"
+msgstr "播放聲音檔案(_S)"
+
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "指定檔案名稱(_F):"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "選擇聲音檔案"
+
+#: ../plugins/mail-notification/mail-notification.c:646
+msgid "Pl_ay"
+msgstr "播放(_A)"
+
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr "只通知收件匣的新郵件(_I)"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "實作 CORBA 介面以存取遠端郵件資料的外掛程式。"
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
+msgstr "當新郵件抵達時產生 D-Bus 訊息或在通知區以圖示和通知訊息知會使用者。"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "遠端郵件"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "郵件通知"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16854,6 +17534,17 @@ msgstr "轉換為會議(_V)"
 msgid "Mail to meeting"
 msgstr "寄信到會議"
 
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "無法開啟行事曆。%s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr "選定的來源是唯讀的，因此不能在這裏建立工作。請選擇其他的來源。"
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
@@ -17053,12 +17744,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "將選定的行事曆標示成可供離線閱覽。"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+msgid "_Do not make available for offline use"
 msgstr "不允許此項在離線狀態使用(_D)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "將行事曆標為供離線使用(_M)"
+msgid "_Make available for offline use"
+msgstr "標記為供離線使用(_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -17068,25 +17759,13 @@ msgstr "實作 mono 功能的外掛程式。"
 msgid "Mono Loader"
 msgstr "Mono 載入器"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "當新郵件到達時產生 D-BUS 郵件。"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "新郵件通知"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "新郵件通知"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:225
 msgid "Plugin Manager"
 msgstr "外掛管理程式"
 
@@ -17098,22 +17777,33 @@ msgstr "啟用與停用外掛程式"
 msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:57
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../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
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "描述:"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些更改在重新啟動後才會生效"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:260
+msgid "Overview"
+msgstr "概覽"
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+msgid "Configuration"
+msgstr "組態"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr "這個外掛程式沒有設定的選項。"
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
 msgid "Plugin"
 msgstr "外掛程式"
 
@@ -17137,26 +17827,31 @@ msgstr "純文字模型"
 msgid "Prefer plain-text"
 msgstr "偏好純文字"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:139
 msgid "Show HTML if present"
 msgstr "如提供 HTML 則顯示之"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:140
 msgid "Prefer PLAIN"
 msgstr "偏好純文字"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:141
 msgid "Only ever show PLAIN"
 msgstr "只以純文字顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "HTML 模式"
+#: ../plugins/prefer-plain/prefer-plain.c:184
+msgid "HTML _Mode"
+msgstr "HT_ML 模式"
 
 # msgstr "提供自郵件編輯器打印郵件的選項"
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "提供自郵件編輯器打印郵件的選項"
+msgid "Gives an option to print from the composer."
+msgstr "提供自郵件編輯器打印郵件的選項。"
+
+# zh_HK: msgstr "打印郵件"
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "打印郵件"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
@@ -17194,7 +17889,13 @@ msgstr "位置"
 msgid "_Publish Calendar Information"
 msgstr "發佈行事曆資訊(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "輸入 `%s' 的密碼"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
 
@@ -17216,6 +17917,10 @@ msgstr ""
 "每週\n"
 "手動(透過「動作」選單)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "啟用(_E)"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "連接埠(_O):"
@@ -17244,7 +17949,7 @@ msgstr ""
 "Windows 共用\n"
 "WebDAV (HTTP)\n"
 "安全的 WebDAV (HTTPS)\n"
-"自訂位置"
+"自選位置"
 
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
 msgid "Service _type:"
@@ -17254,10 +17959,22 @@ msgstr "服務類型(_T):"
 msgid "_File:"
 msgstr "檔案(_F):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "密碼(_P):"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "記住密碼(_R)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "使用者名稱(_U):"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17266,19 +17983,31 @@ msgstr ""
 "iCal\n"
 "空閒/忙碌"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
-msgstr "Spamassassin (內置)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
+msgstr "SpamAssassin (內置)"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "這會讓 Spamassasin 更可靠，但速度變慢"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+msgid "I_nclude remote tests"
+msgstr "包含遠端測試(_N)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
-msgstr "使用 Spamassassin 過濾垃圾郵件。這個外掛程式需要安裝 Spamassassin。"
+msgstr "使用 SpamAssassin 過濾垃圾郵件。這個外掛程式需要安裝 SpamAssassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
-msgstr "Spamassassin 垃圾郵件外掛程式"
+msgid "SpamAssassin junk plugin"
+msgstr "SpamAssassin 垃圾郵件外掛程式"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "SpamAssassin 選項"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17286,7 +18015,7 @@ msgstr "提供一次儲存所有附伴或郵件的各部分的外掛程式。"
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:334
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "儲存附加檔案"
 
@@ -17298,16 +18027,16 @@ msgstr "儲存附加檔案..."
 msgid "Save all attachments"
 msgstr "儲存所有的附加檔案"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
 msgid "Select save base name"
 msgstr "選擇儲存的基本名稱"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "MIME 類型"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:20
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "儲存"
 
@@ -17315,79 +18044,79 @@ msgstr "儲存"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:167
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Description List"
 msgstr "描述清單"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Categories List"
 msgstr "分類清單"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Comment List"
 msgstr "註解清單"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Created"
 msgstr "已建立"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Contact List"
 msgstr "聯絡人清單"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Start"
 msgstr "開始"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "End"
 msgstr "結束"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "percent Done"
 msgstr "％已完成"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "URL"
 msgstr "網址"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Attendees List"
 msgstr "到會者清單"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Modified"
 msgstr "已修改"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Advanced options for the CSV format"
 msgstr "CSV 格式的進階選項"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Prepend a header"
 msgstr "預設的檔頭"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:561
 msgid "Value delimiter:"
 msgstr "數值定界符:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:567
 msgid "Record delimiter:"
 msgstr "記錄定界符:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "Encapsulate values with:"
 msgstr "以此封裝數值:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:595
 msgid "Comma separated value format (.csv)"
 msgstr "逗號隔開的數值格式 (.csv)"
 
@@ -17408,16 +18137,15 @@ msgstr "儲存至磁碟(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:154
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:164
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
@@ -17434,6 +18162,10 @@ msgid "Show _only this Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "只顯示此備忘錄清單(_O)"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "只顯示此工作清單(_O)"
 
@@ -17445,15 +18177,15 @@ msgstr "處理啟動精靈的外掛程式。"
 msgid "Startup wizard"
 msgstr "啟動精靈"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -17465,26 +18197,32 @@ msgstr ""
 "\n"
 "請按一下「下一步」按鈕繼續。 "
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:134
 msgid "Importing files"
 msgstr "匯入檔案"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇你想要匯入的資訊："
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:511
+#, c-format
 msgid "Importing data."
 msgstr "匯入資料。"
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr "請稍候"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "指示相關郵件功能是否應以主旨為準。"
@@ -17499,8 +18237,16 @@ msgstr "以主旨為基礎串接郵件"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
-msgstr "退回到依主旨的相關郵件(_J)"
+msgid "F_all back to threading messages by subject"
+msgstr "退回到根據主旨的相關郵件(_A)"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr "使用 ytnef 解碼 tnef 附加檔案的簡易外掛程式。"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr "TNEF 附加檔案解碼器"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -17510,137 +18256,153 @@ msgstr "Evolution Shell"
 msgid "Evolution Shell Config factory"
 msgstr "Evolution Shell 設定工廠"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution 測試"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolution 測試元件"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A string description of the current printer settings"
-msgstr "目前打印機設定值的描述字串"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "A string description of the current printer settings."
+msgstr "目前打印機設定值的描述字串。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash detection should be run or not."
+msgstr "決定是否應執行當機偵測功能。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "預設資訊方塊列闊度"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "預設視窗高度"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "預設視窗狀態"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "預設視窗闊度"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "啟動時預設顯示的元件相關 ID 或別名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Sidebar is visible"
 msgstr "顯示側邊欄"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:472
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "Skip recovery warning dialog"
+msgstr "忽略復原警告對話方塊"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:569
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Statusbar is visible"
 msgstr "狀態列設為顯示"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設闊度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設闊度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
 msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
 "by the GNOME toolbar setting."
-msgstr "視窗按鈕的風格。可以是「文字」、「圖示」、「兩者」、「工具列」。如果設為「工具列」，按鈕的風格會依 GNOME 工具列設定值決定。"
+msgstr "視窗按鈕的風格。可以是「文字」、「圖示」、「兩者」、「工具列」。如果設為「工具列」，按鈕的風格會根據 GNOME 工具列設定值決定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
 # zh_HK: msgstr "Evolution 是否以離線模式啟動取代線上模式。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Whether crash detection should be done or not"
+msgstr "是否使用當機偵測。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether or not the window should be maximized."
 msgstr "視窗是否可以最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "是否可以看到側邊欄。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the status bar should be visible."
 msgstr "是否顯示狀態列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr "是否省略 Evulution 復原的警告對話方塊。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
@@ -17656,16 +18418,11 @@ msgstr "作用中的連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按「確定」關閉這些連線以離線"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(未命名)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17677,11 +18434,11 @@ msgstr ""
 "\n"
 "若你不清楚檔案類型，請選擇「自動」。Evolution 會嘗試找出適當的處理方法。"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17693,27 +18450,27 @@ msgstr ""
 "輸入的設定值。如果你想\n"
 "再試一次，請按一下「上一步」按鈕。\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:288
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:293
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
@@ -17737,27 +18494,34 @@ msgstr "資料夾名稱不可以包括 “#” 字符。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "‘.’ 和 ‘..’ 是資料夾保留名稱。"
 
-#: ../shell/e-shell-window-commands.c:76
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "系統似乎沒有安裝 GNOME Pilot 工具。"
 
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
 
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "未安裝設計錯誤部份。"
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:565
+#: ../shell/e-shell-window-commands.c:663
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -17768,25 +18532,29 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:576
+#: ../shell/e-shell-window-commands.c:674
 msgid "Evolution Website"
 msgstr "Evolution 網站"
 
+#: ../shell/e-shell-window-commands.c:692
+msgid "Error opening the FAQ webpage."
+msgstr "開啟 FAQ 網頁時發生錯誤"
+
 # zh_HK: msgstr "線上工作(_W)"
-#: ../shell/e-shell-window-commands.c:782
+#: ../shell/e-shell-window-commands.c:889
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:795 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:808
+#: ../shell/e-shell-window-commands.c:915
 msgid "Work Offline"
 msgstr "離線工作"
 
 # zh_HK: msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:382
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
@@ -17799,33 +18567,33 @@ msgstr "Evolution 正在離線的程序中。"
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
-#: ../shell/e-shell-window.c:796
+#: ../shell/e-shell-window.c:805
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../shell/e-shell.c:635
-msgid "Uknown system error."
+#: ../shell/e-shell.c:640
+msgid "Unknown system error."
 msgstr "不明的系統錯誤。"
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1263 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "確認"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1282
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1284
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1286
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
@@ -17835,15 +18603,15 @@ msgstr "找不到組態資料庫"
 msgid "New"
 msgstr "新增"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:107
 msgid "New Test"
 msgstr "新測試"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:108
 msgid "_Test"
 msgstr "測試(_T)"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
@@ -17886,7 +18654,7 @@ msgstr ""
 "匯入到 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -17921,7 +18689,7 @@ msgstr ""
 "我們希望你享受工作成果，而且我們\n"
 "熱切希望你提供意見！\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -17929,40 +18697,67 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:307
+msgid "Evolution Crash Detection"
+msgstr "Evolution 當機偵測"
+
+#: ../shell/main.c:309
+msgid "Ig_nore"
+msgstr "忽略(_N)"
+
+#: ../shell/main.c:324
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+"Evolution 上次執行時似乎發生不正常的關閉。\n"
+"為了預防它再度發生，所有的預覽窗格都會隱藏起來。\n"
+"你可以從「檢視」選單還原這些預覽窗格。\n"
+
+#: ../shell/main.c:335
+msgid "_Do not show this message again"
+msgstr "不要再顯示這個訊息(_D)"
+
+#: ../shell/main.c:567
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
 # zh_HK: msgstr "以線上模式啟動"
-#: ../shell/main.c:474
+#: ../shell/main.c:571
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:574
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:578
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:581
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: ../shell/main.c:486
+#: ../shell/main.c:583
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:585
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "停用郵件、聯絡人和工作的預覽窗格。"
+
+#: ../shell/main.c:615
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:628
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18120,49 +18915,59 @@ msgid ""
 "unless otherwise indicated here"
 msgstr "因為你不信任發出此證書的證書單位，所以除非在此指示，否則你將不信任此證書的有效性。"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的證書..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr "所有的 PKCS12 檔案"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "所有檔案"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "證書名稱"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr "所有的電子郵件證書檔案"
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
 
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr "所有的 CA 證書檔案"
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "證書檢視器:%s"
 
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "輸入 `%s' 的密碼"
-
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -18375,7 +19180,7 @@ msgid "_Edit CA Trust"
 msgstr "編輯核證機關 (_CA) 信任度"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:679
 msgid "Certificate already exists"
 msgstr "證書已經存在"
 
@@ -18554,30 +19359,6 @@ msgstr "輸入 PKCS12 檔案的密碼:"
 msgid "Imported Certificate"
 msgstr "輸入的證書"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "要新增的附件。"
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "附件的內容類型。"
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "要顯示在郵件的檔案名稱。"
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "附件的描述。"
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "將附件標示成預設顯示在行內。"
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "郵件的預設主旨。"
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -18703,6 +19484,10 @@ msgstr "重新命名選定的資料夾"
 msgid "S_ave Address Book As VCard"
 msgstr "將通訊錄另存為 VC_ard"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "儲存為 VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "將選定的聯絡人儲存為 VCard。"
@@ -18711,7 +19496,7 @@ msgstr "將選定的聯絡人儲存為 VCard。"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "將選定資料夾中的聯絡人儲存為 VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
 msgid "Select All"
 msgstr "全選"
 
@@ -18786,7 +19571,7 @@ msgstr "將聯絡人移到(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "將資料夾聯絡人移到(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
 msgid "_New"
 msgstr "新增(_N)"
 
@@ -18990,23 +19775,24 @@ msgstr "關閉"
 msgid "I_nsert"
 msgstr "插入(_N)"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -19063,87 +19849,91 @@ msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
 #: ../ui/evolution-event-editor.xml.h:16
+msgid "Send _Options"
+msgstr "傳送選項(_O)"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "週期性(_R)"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
@@ -19168,79 +19958,95 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr "下載標記為離線使用的帳號/資料夾之郵件"
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "清空回收筒(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "顯示郵件預覽(_P)"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "在郵件清單下方顯示郵件預覽"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
 msgstr "在郵件清單旁顯示郵件預覽"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "顯示郵件預覽視窗"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "檢視紀錄檔訊息的除錯主控台"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "除錯紀錄檔(_D)"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "下載離線使用的郵件(_D)"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "新增(_N)..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "預覽(_P)"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "訂閱(_S)"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
@@ -19303,62 +20109,82 @@ msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
 #: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "將資料夾中全部的郵件標示成已閱讀"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr "重新整理(_F)..."
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "重新載入資料夾"
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "選擇郵件子羣組(_U)"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "選擇全部的郵件(_A)"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "選擇全部目前未選定的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr "選擇所有回覆選定郵件的信"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "顯示隱藏的郵件(_N)"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "顯示暫時隱藏的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "將已閱讀的郵件暫時隱藏"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "將選定的郵件暫時隱藏"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
-msgstr "依相關郵件為羣組(_G)"
+msgstr "根據相關郵件為羣組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -19663,8 +20489,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "收件者搜尋資料夾..."
+msgid "Search Folder from Recipien_ts..."
+msgstr "從收件者搜尋資料夾(_T)..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -19686,7 +20512,7 @@ msgstr "選取所有文字(_A)"
 msgid "Select all the text in a message"
 msgstr "選擇郵件中的所有文字"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "設定你目前打印機的版面設定"
 
@@ -19790,23 +20616,28 @@ msgstr "上一封郵件(_P)"
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "已閱讀(_R)"
+
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
@@ -19814,7 +20645,7 @@ msgstr "放大(_Z)"
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -19908,144 +20739,164 @@ msgid "PGP Sign"
 msgstr "PGP 加簽"
 
 #: ../ui/evolution-message-composer.xml.h:17
+msgid "PGP _Encrypt"
+msgstr "PG_P 加密"
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "PGP _Sign"
+msgstr "P_GP 加簽"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "要求讀信回條(_E)"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "S/MIME En_crypt"
+msgstr "_S/MIME 加密"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME 加密"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "S/MIME Sig_n"
+msgstr "S/MI_ME 加簽"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME 加簽"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "S_end"
+msgstr "傳送(_E)"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "儲存草稿"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "另存新檔(_A)..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "儲存草稿(_D)"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "儲存至資料夾..."
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "使用另一名稱儲存目前的檔案"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "將郵件儲存至指定的資料夾"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "傳送"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送郵件"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "用你的 PGP 密碼匙為郵件加上數碼簽署"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用你的 S/MIME 簽署證書為郵件加上數碼簽署"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "切換寄件者選擇器的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "切換是否顯示「張貼至」欄位"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "切換是否顯示「收件者」欄位"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "全部刪除(_D)"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "寄件者欄位(_F)"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "開啟(_O)..."
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "張貼到欄位(_P)"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "安全性(_S)"
 
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "傳送選項(_S)"
 
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "數件者欄位(_T)"
 
@@ -20203,81 +21054,89 @@ msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "隱藏視窗按鈕"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "匯入(_M)..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "開啟常見問題(FAQ)網頁"
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "頁面設定(_U)..."
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "偏好設定(_N)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "顯示工具列(_T)"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
@@ -20291,7 +21150,7 @@ msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
+msgid "Tool_bar Style"
 msgstr "工具列風格(_B)"
 
 #: ../ui/evolution.xml.h:37
@@ -20314,49 +21173,53 @@ msgstr "關閉視窗(_C)"
 msgid "_Forget Passwords"
 msgstr "遺忘密碼(_F)"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "隱藏按鈕(_H)"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "常見問題(_FAQ)"
 
 #: ../ui/evolution.xml.h:46
-msgid "_Icons only"
+msgid "_Hide Buttons"
+msgstr "隱藏按鈕(_H)"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Synchronization Options..."
 msgstr "同步化選項(_S)..."
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:55
 msgid "_Window"
 msgstr "視窗(_O)"
 
 #: ../views/addressbook/galview.xml.h:1
 msgid "By _Company"
-msgstr "依公司(_C)"
+msgstr "根據公司(_C)"
 
 #: ../views/addressbook/galview.xml.h:2
 msgid "_Address Cards"
 msgstr "地址卡(_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "電話清單(_P)"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "清單檢視(_L)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20366,10 +21229,6 @@ msgstr "週檢視(_E)"
 msgid "_Day View"
 msgstr "日檢視(_D)"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "清單檢視(_L)"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "月檢視(_M)"
@@ -20388,19 +21247,19 @@ msgstr "做為寄送資料夾(_S)"
 
 #: ../views/mail/galview.xml.h:3
 msgid "By S_tatus"
-msgstr "依狀況(_T)"
+msgstr "根據狀況(_T)"
 
 #: ../views/mail/galview.xml.h:4
 msgid "By Se_nder"
-msgstr "依寄件者(_N)"
+msgstr "根據寄件者(_N)"
 
 #: ../views/mail/galview.xml.h:5
 msgid "By Su_bject"
-msgstr "依主旨(_B)"
+msgstr "根據主旨(_B)"
 
 #: ../views/mail/galview.xml.h:6
 msgid "By _Follow Up Flag"
-msgstr "依跟隨標幟(_F)"
+msgstr "根據跟隨標幟(_F)"
 
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
@@ -20423,11 +21282,11 @@ msgid "With _Status"
 msgstr "設定狀態(_S)"
 
 #. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
 msgid "UTC"
 msgstr "UTC"
 
@@ -20456,19 +21315,19 @@ msgstr ""
 "使用滑鼠左鍵拉近地圖的區域，然後選取時區。\n"
 "使用滑鼠右鍵拉遠。"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "收集"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定義 %s 的檢視"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "定義檢視"
 
@@ -20477,22 +21336,18 @@ msgstr "定義檢視"
 msgid "Define Views for \"%s\""
 msgstr "定義「%s」的檢視"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "編輯(_E)..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1909
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
 msgid "Instance"
 msgstr "實體"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
@@ -20505,17 +21360,17 @@ msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
-msgstr "自訂檢視"
+msgstr "自選檢視"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
-msgstr "儲存自訂檢視"
+msgstr "儲存自選檢視"
 
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "定義檢視..."
 
@@ -20523,15 +21378,32 @@ msgstr "定義檢視..."
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "選擇檢視：%s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "目前的檢視方式是自選的檢視"
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
-msgstr "儲存自訂檢視..."
+msgstr "儲存自選檢視..."
+
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "儲存目前的自選檢視"
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "建立或編輯檢視(_C)"
+
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "工廠"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "定義新的檢視"
 
@@ -20547,19 +21419,40 @@ msgstr "檢視的類型"
 msgid "Type of view:"
 msgstr "檢視的類型:"
 
+#: ../widgets/misc/e-attachment-bar.c:1028
+msgid "Attachment Bar"
+msgstr "附加檔案列"
+
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "不能附加檔案 %s： %s"
+
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:516
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "不能附加檔案 %s：不是一個合法的檔案"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "附件內容"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "檔案名稱:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME 類型:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "一二三四五六日"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1089
-#: ../widgets/misc/e-calendar-item.c:1743
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1724
 msgid "%B %Y"
 msgstr "%Y 年 %-m 月"
 
@@ -20567,222 +21460,205 @@ msgstr "%Y 年 %-m 月"
 msgid "Month Calendar"
 msgstr "月行事曆"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
 msgid "Fill color"
 msgstr "填入色彩"
 
-#: ../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:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
 msgid "Fill stipple"
 msgstr "填入網點"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "最小闊度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/misc/e-canvas-vbox.c:93 ../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:3063
 msgid "Minimum Width"
 msgstr "最小闊度"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "間距"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "現在"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr "阿拉伯"
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "波羅的海語"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "中歐語系"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "中文"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "斯拉夫文"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "希伯來語"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "日文"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "韓文"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "泰文"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "土耳其語"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "萬國碼"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "西歐語系"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "西歐語系，新"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "繁體"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
 #: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Simplified"
 msgstr "簡體"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "烏克蘭語"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "視覺"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "不明的字符集：%s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "字符編碼"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "輸入要使用的字符集"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "其它..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "字符編碼(_A)"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
 msgid "Text entry to input date"
 msgstr "用來輸入日期的文字項目"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
 msgid "Combo box to select time"
 msgstr "用以選擇時刻的組合式方塊"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "時間"
-
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:484
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:490
 msgid "_Today"
 msgstr "今天(_T)"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I %M:%p"
-
-#: ../widgets/misc/e-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1655
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../widgets/misc/e-dateedit.c:1660
+#: ../widgets/misc/e-dateedit.c:1684
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
@@ -20820,11 +21696,11 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
 msgid "Expander Size"
 msgstr "展開器大小"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
@@ -20837,61 +21713,61 @@ msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:291 ../widgets/misc/e-filter-bar.c:727
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "搜尋(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "搜尋"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "目前的郵件"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
 msgid "Choose Image"
 msgstr "選擇圖像"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:626
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:628
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -20909,77 +21785,86 @@ msgstr "同步私人記錄:"
 msgid "Sync Categories:"
 msgstr "同步分類:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "欄寬"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Search"
+msgstr "搜尋"
+
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Click here to change the search type"
+msgstr "按這裏以改變搜尋類型"
+
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:872
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1223
-#: ../widgets/text/e-entry.c:1224 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-text.c:3565
 msgid "Text"
 msgstr "文字"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:996
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "顯示(_W):"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "搜尋(_C):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1025
+#: ../widgets/misc/e-search-bar.c:1042
 msgid " i_n "
 msgstr " i_n "
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "游標列"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "游標欄"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "分類器"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "選擇區模式"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "游標模式"
 
@@ -21116,14 +22001,14 @@ msgid "_When opened:"
 msgstr "當開啟時(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:297
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
@@ -21148,178 +22033,168 @@ msgstr "可用的分類(_A):"
 msgid "categories"
 msgstr "分類"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "彈出式清單"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
-#: ../widgets/table/e-cell-pixbuf.c:398
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "選擇的欄"
 
-#: ../widgets/table/e-cell-pixbuf.c:405
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "聚焦的欄"
 
-#: ../widgets/table/e-cell-pixbuf.c:412
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "未選擇的欄"
 
-#: ../widgets/table/e-cell-text.c:1805
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "刪除線欄"
 
-#: ../widgets/table/e-cell-text.c:1812
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "底線欄"
 
-#: ../widgets/table/e-cell-text.c:1819
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "粗體欄"
 
-#: ../widgets/table/e-cell-text.c:1826
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "色彩欄"
 
-#: ../widgets/table/e-cell-text.c:1840
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "背景色彩欄"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<-移除(_R)"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "狀態"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(遞增)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(遞減)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "未排序"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "未組成羣組"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "顯示欄位"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "可用的欄位"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "可用的欄位(_V):"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1575
+msgid "Clear _All"
+msgstr "全部清除(_A)"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "遞減"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
-msgstr "將項目組成羣組，依"
+msgstr "將項目組成羣組，根據"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "下移(_D)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "上移(_U)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "依序顯示這些欄位(_O):"
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "顯示檢視中的欄位(_F)"
 
-#: ../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 "顯示欄位"
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "顯示檢視中的欄位(_N)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr "顯示檢視中的欄位"
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "顯示檢視中的欄位(_V)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "排序"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
-msgstr "排序項目依"
+msgstr "排序項目根據"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
-msgstr "接着依"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "加入(_A)->"
+msgstr "接着根據"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "欄位顯示(_F)..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "排序(_S)..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "狀態"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(遞增)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(遞減)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "未排序"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "未組成羣組"
-
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "可用的欄位"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
-msgstr "羣組依(_G)..."
+msgstr "羣組根據(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "顯示檢視中的欄位(_S)"
+
+#: ../widgets/table/e-table-config.glade.h:23
 msgid "_Show these fields in order:"
-msgstr "依序顯示這些欄位(_S):"
+msgstr "根據序顯示這些欄位(_S):"
+
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "排序(_S)..."
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:77
-#: ../widgets/table/e-table-field-chooser-item.c:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1874
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:634
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "DnD 碼"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1888
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:641
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "完整檔頭"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "加入一欄..."
 
@@ -21349,315 +22224,812 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
 msgstr[1] "%s (%d 個項目)"
 
+#: ../widgets/table/e-table-group-container.c:896
 #: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../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:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
+#: ../widgets/table/e-table-group-container.c:903
 #: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../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:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
+#: ../widgets/table/e-table-group-container.c:910
 #: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../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:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
+#: ../widgets/table/e-table-group-container.c:917
 #: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../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:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
+#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../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:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "游標模式"
 
+#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../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:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "選擇區模型"
 
+#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../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:3309 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
 msgid "Length Threshold"
 msgstr "界限長度"
 
+#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../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:3316 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
 msgid "Uniform row height"
 msgstr "標準列高"
 
+#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "凍結"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
-msgstr "自訂目前的檢視"
+msgstr "自選目前的檢視"
+
+#: ../widgets/table/e-table-header-item.c:1472
+msgid "Sort _Ascending"
+msgstr "遞增排序(_A)"
 
 #: ../widgets/table/e-table-header-item.c:1473
-msgid "Sort Ascending"
-msgstr "遞增排序"
+msgid "Sort _Descending"
+msgstr "遞減排序(_D)"
 
 #: ../widgets/table/e-table-header-item.c:1474
-msgid "Sort Descending"
-msgstr "遞減排序"
+msgid "_Unsort"
+msgstr "不排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1475
-msgid "Unsort"
-msgstr "不排序"
+#: ../widgets/table/e-table-header-item.c:1476
+msgid "Group By This _Field"
+msgstr "根據此欄位做羣組(_F)"
 
 #: ../widgets/table/e-table-header-item.c:1477
-msgid "Group By This Field"
-msgstr "依此欄位做羣組"
+msgid "Group By _Box"
+msgstr "根據方塊為羣組(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1478
-msgid "Group By Box"
-msgstr "依方塊為羣組"
+#: ../widgets/table/e-table-header-item.c:1479
+msgid "Remove This _Column"
+msgstr "移除此欄(_C)"
 
 #: ../widgets/table/e-table-header-item.c:1480
-msgid "Remove This Column"
-msgstr "移除此欄"
+msgid "Add a C_olumn..."
+msgstr "加入一欄(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1481
-msgid "Add a Column..."
-msgstr "加入一欄..."
+#: ../widgets/table/e-table-header-item.c:1482
+msgid "A_lignment"
+msgstr "排列(_L)"
 
 #: ../widgets/table/e-table-header-item.c:1483
-msgid "Alignment"
-msgstr "排列"
+msgid "B_est Fit"
+msgstr "最適填滿(_E)"
 
 #: ../widgets/table/e-table-header-item.c:1484
-msgid "Best Fit"
-msgstr "最適填滿"
+msgid "Format Column_s..."
+msgstr "格式化欄(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1485
-msgid "Format Columns..."
-msgstr "格式欄..."
+#: ../widgets/table/e-table-header-item.c:1486
+msgid "Custo_mize Current View..."
+msgstr "自選目前的檢視(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1487
-msgid "Customize Current View..."
-msgstr "自訂目前的檢視..."
+#: ../widgets/table/e-table-header-item.c:1542
+msgid "_Sort By"
+msgstr "排序根據(_S)"
 
-#: ../widgets/table/e-table-header-item.c:1536
-msgid "Sort By"
-msgstr "排序依"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+msgid "_Custom"
+msgstr "自選(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1881
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "字型描述"
 
-#: ../widgets/table/e-table-header-item.c:1902
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "排序資訊"
 
-#: ../widgets/table/e-table-header-item.c:1916
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
 msgid "Always search"
 msgstr "總是搜尋"
 
-#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "請按這裏加入"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3349
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3350
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線條與 +/- 展開符號。"
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "迷你卡片測試"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "這可以測試迷你卡片畫布項目"
+#: ../widgets/text/e-text.c:2734
+msgid "Input Methods"
+msgstr "輸入法"
 
-#: ../widgets/text/e-entry.c:1216 ../widgets/text/e-entry.c:1217
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
 msgid "Event Processor"
 msgstr "事件處理器"
 
-#: ../widgets/text/e-entry.c:1230 ../widgets/text/e-entry.c:1231
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+msgid "Bold"
+msgstr "粗體"
+
+#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+msgid "Strikeout"
+msgstr "刪除線"
+
+#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+msgid "Anchor"
+msgstr "錨點"
+
+#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
 msgid "Justification"
 msgstr "左右對齊"
 
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+msgid "Clip Width"
+msgstr "剪輯闊度"
+
+#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+msgid "Clip Height"
+msgstr "剪輯高度"
+
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+msgid "Clip"
+msgstr "剪輯"
+
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+msgid "Fill clip rectangle"
+msgstr "填滿剪輯方塊"
+
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+msgid "X Offset"
+msgstr "X 位移"
+
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+msgid "Y Offset"
+msgstr "Y 位移"
+
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+msgid "Text width"
+msgstr "文字闊度"
+
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+msgid "Text height"
+msgstr "文字高度"
+
+#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
 msgid "Line wrap"
 msgstr "換行"
 
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
 msgid "Break characters"
 msgstr "中斷字符"
 
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "允許新行"
-
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+msgid "Allow newlines"
+msgstr "允許新行"
+
+#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
 msgid "Draw background"
 msgstr "繪製背景"
 
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
 msgid "Cursor position"
 msgstr "游標位置"
 
-#: ../widgets/text/e-entry.c:1342 ../widgets/text/e-entry.c:1343
-msgid "Emulate label resize"
-msgstr "模擬標籤縮放"
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+msgid "IM Context"
+msgstr "IM 快顯視窗"
 
-#: ../widgets/text/e-text.c:2739
-msgid "Input Methods"
-msgstr "輸入法"
+#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+msgid "Handle Popup"
+msgstr "處理彈出式項目"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
-msgid "Bold"
-msgstr "粗體"
+#~ msgid "A Folder with this name already exists"
+#~ msgstr "以此為名的資料夾已存在"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
-msgid "Strikeout"
-msgstr "刪除線"
+#~ msgid "_Address: "
+#~ msgstr "地址(_A):"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
-msgid "Anchor"
-msgstr "錨點"
+#~ msgid "_Categories..."
+#~ msgstr "分類(_C)..."
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
-msgid "Clip Width"
-msgstr "剪輯闊度"
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
-msgid "Clip Height"
-msgstr "剪輯高度"
+#~ msgid "Add an email to the List"
+#~ msgstr "新增電子郵件到清單"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
-msgid "Clip"
-msgstr "剪輯"
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "從通訊錄插入電子郵件位址"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
-msgid "Fill clip rectangle"
-msgstr "填滿剪輯方塊"
+#~ msgid "Members"
+#~ msgstr "會員"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
-msgid "X Offset"
-msgstr "X 位移"
+#~ msgid "Remove an email address from the List"
+#~ msgstr "從清單移除電子郵件地址"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
-msgid "Y Offset"
-msgstr "Y 位移"
+#~ msgid "_Select"
+#~ msgstr "選取(_S)"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
-msgid "Text width"
-msgstr "文字闊度"
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "此連絡人中改變後的電子郵件或名稱已經\n"
+#~ "存在於此資料夾。您無論如何都要新增它嗎？"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
-msgid "Text height"
-msgstr "文字高度"
+#~ msgid "Print cards"
+#~ msgstr "列印名片"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
-msgid "IM Context"
-msgstr "IM 快顯視窗"
+#~ msgid "Organization"
+#~ msgstr "團體"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
-msgid "Handle Popup"
-msgstr "處理彈出式項目"
+#~ msgid "E-mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "GTK Tree View"
+#~ msgstr "GTK 樹狀檢視模式"
+
+# zh_HK: msgstr "打印信封"
+#~ msgid "Print envelope"
+#~ msgstr "列印信封"
+
+# zh_HK: msgstr "打印連絡人"
+#~ msgid "Print contacts"
+#~ msgstr "列印連絡人"
+
+# zh_HK: msgstr "打印連絡人"
+#~ msgid "Print contact"
+#~ msgstr "列印連絡人"
+
+#~ msgid "Error loading default addressbook."
+#~ msgstr "載入預設目錄服務時發生錯誤"
+
+#~ msgid "Input File"
+#~ msgstr "輸入檔案"
+
+#~ msgid ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
+
+#~ msgid ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
+
+#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgstr "確定要刪除日誌項目 '{0}'？"
+
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "確定要刪除這 {0} 日誌項目？"
+
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "確定要刪除此日誌項目？"
+
+#~ msgid ""
+#~ "If you do not send a cancelation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
+
+#~ msgid "Add Calendar"
+#~ msgstr "新增行事曆"
+
+#~ msgid "Add Task List"
+#~ msgstr "新增工作清單"
+
+#~ msgid "_Add Calendar"
+#~ msgstr "加入行事曆(_A)"
+
+#~ msgid "_Add Task List"
+#~ msgstr "新增工作清單(_A)"
+
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "這個日誌項目已刪除。"
+
+#~ msgid "This journal entry has been changed."
+#~ msgstr "這個日誌項目已變更。"
+
+#~ msgid "Journal entry - %s"
+#~ msgstr "日誌項目 - %s"
+
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr "因為許可權被拒絕，所以無法刪除日誌項目。"
+
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+
+#~ msgid "Add New Calendar"
+#~ msgstr "新增行事曆"
+
+#~ msgid "Calendar Group"
+#~ msgstr "行事曆群組"
+
+#~ msgid "Calendar Location"
+#~ msgstr "行事曆位置"
+
+#~ msgid "Calendar Name"
+#~ msgstr "行事曆名稱"
+
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>工作清單選項</b>"
+
+#~ msgid "Add New Task List"
+#~ msgstr "新增工作清單"
+
+#~ msgid "Task List Group"
+#~ msgstr "工作清單群組"
+
+#~ msgid "Task List Name"
+#~ msgstr "工作清單名稱"
+
+#~ msgid ""
+#~ "You are modifying a recurring journal entry. What would you like to "
+#~ "modify?"
+#~ msgstr "您正在修改週期性日誌項目。您想要修改什麼？"
+
+#~ msgid "Or_ganiser:"
+#~ msgstr "召集人(_G):"
+
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>空閒/忙碌行事曆(_A)</b>"
+
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>發佈頻率</b>"
+
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>發佈位置(_L)</b>"
+
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "空閒/忙碌發佈設定"
+
+#~ msgid "_Daily"
+#~ msgstr "每天(_D)"
+
+#~ msgid "_Manual"
+#~ msgstr "手動(_M)"
+
+#~ msgid "_Weekly"
+#~ msgstr "每週(_W)"
+
+#~ msgid "Task sort"
+#~ msgstr "工作排序"
+
+#~ msgid "Memo sort"
+#~ msgstr "備忘錄排序"
+
+#~ msgid "Enter the password for %s"
+#~ msgstr "輸入 %s 的密碼"
+
+#~ msgid "Journal information"
+#~ msgstr "日誌資訊"
+
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "選擇的日期(%Y 年 %-m 月 %-d 日 (%a))"
+
+#~ msgid "%a %b %d"
+#~ msgstr "%-m 月 %-d 日 (%a)"
+
+#~ msgid "%a %d %Y"
+#~ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
+
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
+
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "選定的週(%s - %s)"
+
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "選定的月份(%Y 年 %-m 月)"
+
+#~ msgid "Selected year (%Y)"
+#~ msgstr "選定的年份(%Y)"
+
+# zh_HK: msgstr "打印項目"
+#~ msgid "Print Item"
+#~ msgstr "列印項目"
+
+#~ msgid "SMTWTFS"
+#~ msgstr "日一二三四五六"
+
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+
+#~ msgid "Post To:"
+#~ msgstr "張貼到:"
+
+#~ msgid "The Evolution PIM and Email Client"
+#~ msgstr "Evolution PIM 與郵件客戶端"
+
+#~ msgid "No, Do not Change Status"
+#~ msgstr "否，請不要變更狀態"
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>正在接收電子郵件</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>正在傳送電子郵件:</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>此頁面可以讓您選擇，當別人閱讀您的郵件後，是否傳送讀信回條，\n"
+#~ "以及指定當某人要求您傳送回條時，Evolution 要做什麼。</small>"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "詢問我是否要傳送讀信回條"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "永遠不傳送讀信回條"
+
+#~ msgid "Read Receipts"
+#~ msgstr "讀信回條"
+
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "要求所有我傳送的郵件都索取讀信回條"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "除非郵件傳送至郵寄清單，而不是給我個人"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr "當您收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "系統匣的方向。"
+
+#~ msgid "_Search name:"
+#~ msgstr "搜尋名稱(_S):"
+
+#~ msgid "Disable"
+#~ msgstr "停用"
+
+#~ msgid "Enable"
+#~ msgstr "啟用"
+
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>然後</b>"
+
+#~ msgid "Valid signature, cannot verify sender"
+#~ msgstr "簽名有效，但無法檢驗寄件者"
+
+#~ msgid "Automatic smiley recognition"
+#~ msgstr "自動辨認笑臉符號"
+
+#~ msgid "New Mail Notify sound file"
+#~ msgstr "新郵件通知聲音檔案"
+
+#~ msgid "New Mail Notify type"
+#~ msgstr "新郵件通知類型"
+
+#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgstr "指定使用者要使用的「新郵件通知」類型。"
+
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "優先順序過濾器「%s」"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "有些 Netscape 郵件過濾器是以電子郵件的優先權\n"
+#~ "為基礎的，而在 Evolution 中則沒有這種用法。\n"
+#~ "Evolution 的替代方式是提供範圍從 -3 到 3 的點數\n"
+#~ "給電子郵件，並且根據此數值來過濾。\n"
+#~ "\n"
+#~ "\n"
+#~ "目前的解決方案是加入一組名為「優先順序過濾器」\n"
+#~ "的過濾器來將 Netscape 的電子郵件優先權轉換為\n"
+#~ "Evolution 的點數，而受影響的過濾器會使用點數來\n"
+#~ "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
+#~ "照您想要的方式運作。"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "有些 Netscape 郵件過濾器使用\n"
+#~ "「忽略對話」或「監看對話」的\n"
+#~ "功能，而 Evolution 並不支援它。\n"
+#~ "這些過濾器則會被丟棄。"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "有些 Netscape 郵件過濾器可以測試\n"
+#~ "電子郵件的內文是否與所給的字串相等，\n"
+#~ "Evolution 不支援此功能。那些過濾器\n"
+#~ "會被修改成測試郵件的內文是否包含\n"
+#~ "該字串。"
+
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Evolution 正在匯入舊有的 Netscape 資料"
+
+#~ msgid "Importing Netscape data"
+#~ msgstr "輸入 Netscape 資料"
+
+#~ msgid "Settings"
+#~ msgstr "設定值"
+
+#~ msgid "Mail Filters"
+#~ msgstr "郵件規則"
+
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution 找到 Netscape 格式的郵件。\n"
+#~ "是否將它們匯入至 Evolution？"
+
+#~ msgid "<span weight=\"bold\">Filter Options</span>"
+#~ msgstr "<span weight=\"bold\">過濾器選項</span>"
+
+#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
+#~ msgstr "<span weight=\"bold\">標籤和色彩</span>"
+
+#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
+#~ msgstr "<span weight=\"bold\">新郵件通知</span>"
+
+#~ msgid "Beep w_hen new mail arrives"
+#~ msgstr "當新郵件到達時發出嗶聲(_H)"
+
+#~ msgid "HTML Mail"
+#~ msgstr "HTML 郵件"
+
+#~ msgid "Se_lect..."
+#~ msgstr "選取(_L)..."
+
+#~ msgid "_Do not notify me when new mail arrives"
+#~ msgstr "當新郵件到達時不要通知我(_D)"
+
+#~ msgid "Mark as _Read"
+#~ msgstr "標示成已閱讀(_R)"
+
+#~ msgid "_Do not Mark as Read"
+#~ msgstr "不要標示成已閱讀(_D)"
+
+#~ msgid "<b>Junk Mail Settings</b>"
+#~ msgstr "<b>垃圾郵件設定值</b>"
+
+#~ msgid "_Contacts..."
+#~ msgstr "連絡人(_C)..."
+
+#~ msgid "<b>Subject</b> :"
+#~ msgstr "<b>主旨</b>:"
+
+#~ msgid "<b>From</b> :"
+#~ msgstr "<b>寄件者</b>:"
+
+#~ msgid "<b>Recipients </b>"
+#~ msgstr "<b>收件者</b>"
+
+#~ msgid "<b>Action</b>"
+#~ msgstr "<b>動作</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>日期與時刻</b>"
+
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr "在 iPod 上找不到輸出的目錄！請確定 iPod 已正確設定後再試一次。"
+
+#~ msgid "Could not export data!"
+#~ msgstr "無法匯出資料！"
+
+#~ msgid "Exporting data failed."
+#~ msgstr "匯出資料失敗。"
+
+#~ msgid "Could not open addressbook!"
+#~ msgstr "無法開啟通訊錄！"
+
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
+
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "無法開啟行事曆/工作！"
+
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
+
+#~ msgid "Unable to find this journal entry in any journal"
+#~ msgstr "無法在任何日誌中找到這個日誌項目"
+
+#~ msgid "System error: %s"
+#~ msgstr "系統錯誤： %s"
+
+#~ msgid "Camel error: %s"
+#~ msgstr "Camel 錯誤： %s"
+
+#~ msgid "Account cannot send e-mail"
+#~ msgstr "帳號不能傳送電子郵件"
+
+#~ msgid "No store available"
+#~ msgstr "沒有可用的儲存空間"
+
+#~ msgid ""
+#~ "A plugin which implements a CORBA interface for accessing mail data "
+#~ "remotely."
+#~ msgstr "實作 CORBA 介面以存取遠端郵件資料的外掛程式。"
+
+#~ msgid "Mail Remote"
+#~ msgstr "遠端郵件"
+
+#~ msgid "New mail notify"
+#~ msgstr "新郵件通知"
+
+#~ msgid "(Untitled)"
+#~ msgstr "(未命名)"
+
+#~ msgid "An attachment to add."
+#~ msgstr "要新增的附件。"
+
+#~ msgid "Content type of the attachment."
+#~ msgstr "附件的內容類型。"
+
+#~ msgid "The filename to display in the mail."
+#~ msgstr "要顯示在郵件的檔案名稱。"
+
+#~ msgid "Description of the attachment."
+#~ msgstr "附件的描述。"
+
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "將附件標示成預設顯示在行內。"
+
+#~ msgid "_Phone List"
+#~ msgstr "電話清單(_P)"
+
+#~ msgid "_Edit..."
+#~ msgstr "編輯(_E)..."
+
+#~ msgid "MTWTFSS"
+#~ msgstr "一二三四五六日"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%I:%M %p"
+#~ msgstr "%I %M:%p"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<-移除(_R)"
+
+#~ msgid "Sh_ow these fields in order:"
+#~ msgstr "依序顯示這些欄位(_O):"
+
+#~ msgid "_Add ->"
+#~ msgstr "加入(_A)->"
+
+#~ msgid "Minicard Test"
+#~ msgstr "迷你名片測試"
+
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#~ msgid "This should test the minicard canvas item"
+#~ msgstr "這可以測試迷你名片畫布項目"
+
+#~ msgid "Emulate label resize"
+#~ msgstr "模擬標籤縮放"
 
 #~ msgid "ebby"
 #~ msgstr "ebby"
@@ -21705,8 +23077,5 @@ msgstr "處理彈出式項目"
 #~ msgid "Filtering Folder"
 #~ msgstr "過濾資料夾"
 
-#~ msgid "ok_button"
-#~ msgstr "確定按鈕(_B)"
-
 #~ msgid " New "
 #~ msgstr " 新增 "
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b19e95d274..f498a9a947 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.9.92\n"
+"Project-Id-Version: evolution 2.21.91\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-04 14:51+0800\n"
-"PO-Revision-Date: 2007-02-27 20:56+0800\n"
+"POT-Creation-Date: 2008-02-04 21:23+0800\n"
+"PO-Revision-Date: 2008-02-04 20:56+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Taiwan) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,21 +21,21 @@ msgstr ""
 
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
-#: ../a11y/addressbook/ea-minicard-view.c:180
+#: ../a11y/addressbook/ea-minicard-view.c:179
 msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
-#: ../a11y/addressbook/ea-minicard-view.c:34
-#: ../addressbook/gui/component/addressbook-component.c:224
+#: ../a11y/addressbook/ea-minicard-view.c:33
+#: ../addressbook/gui/component/addressbook-component.c:228
 msgid "New Contact"
 msgstr "新連絡人"
 
-#: ../a11y/addressbook/ea-minicard-view.c:35
-#: ../addressbook/gui/component/addressbook-component.c:232
+#: ../a11y/addressbook/ea-minicard-view.c:34
+#: ../addressbook/gui/component/addressbook-component.c:236
 msgid "New Contact List"
 msgstr "新增連絡人清單"
 
-#: ../a11y/addressbook/ea-minicard-view.c:163
+#: ../a11y/addressbook/ea-minicard-view.c:162
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -84,7 +84,7 @@ msgstr "行事曆事件：沒有摘要。"
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
 
-#: ../a11y/calendar/ea-cal-view-event.c:529
+#: ../a11y/calendar/ea-cal-view-event.c:528
 msgid "Grab Focus"
 msgstr "得到焦點"
 
@@ -108,7 +108,7 @@ msgstr "移至今日"
 msgid "Go to Date"
 msgstr "移至日期"
 
-#: ../a11y/calendar/ea-day-view-main-item.c:299
+#: ../a11y/calendar/ea-day-view-main-item.c:303
 #: ../a11y/calendar/ea-week-view-main-item.c:301
 msgid "a table to view and select the current time range"
 msgstr "用來檢視與選擇時刻範圍的表格"
@@ -153,7 +153,7 @@ msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
 #: ../a11y/calendar/ea-gnome-calendar.c:188
-#: ../calendar/gui/calendar-component.c:707
+#: ../calendar/gui/calendar-component.c:747
 msgid "%A %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -164,9 +164,9 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. You can change the order but don't change the
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:191
-#: ../calendar/gui/calendar-component.c:710
-#: ../calendar/gui/e-day-view-top-item.c:1315
-#: ../calendar/gui/e-day-view.c:2106
+#: ../calendar/gui/calendar-component.c:750
+#: ../calendar/gui/e-day-view-top-item.c:1358
+#: ../calendar/gui/e-day-view.c:2158
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
@@ -175,9 +175,9 @@ msgstr "%-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:193
 #: ../a11y/calendar/ea-gnome-calendar.c:198
 #: ../a11y/calendar/ea-gnome-calendar.c:200
-#: ../calendar/gui/calendar-component.c:712
-#: ../calendar/gui/calendar-component.c:717
-#: ../calendar/gui/calendar-component.c:719
+#: ../calendar/gui/calendar-component.c:752
+#: ../calendar/gui/calendar-component.c:757
+#: ../calendar/gui/calendar-component.c:759
 msgid "%a %d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
@@ -185,10 +185,10 @@ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 #: ../a11y/calendar/ea-gnome-calendar.c:223
 #: ../a11y/calendar/ea-gnome-calendar.c:229
 #: ../a11y/calendar/ea-gnome-calendar.c:231
-#: ../calendar/gui/calendar-component.c:731
-#: ../calendar/gui/calendar-component.c:738
-#: ../calendar/gui/calendar-component.c:744
-#: ../calendar/gui/calendar-component.c:746
+#: ../calendar/gui/calendar-component.c:771
+#: ../calendar/gui/calendar-component.c:778
+#: ../calendar/gui/calendar-component.c:784
+#: ../calendar/gui/calendar-component.c:786
 msgid "%d %b %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
@@ -198,25 +198,25 @@ msgstr "%Y 年 %-m 月 %-d 日"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:221
-#: ../calendar/gui/calendar-component.c:736
-#: ../calendar/gui/e-day-view-top-item.c:1319
-#: ../calendar/gui/e-day-view.c:2122
+#: ../calendar/gui/calendar-component.c:776
+#: ../calendar/gui/e-day-view-top-item.c:1362
+#: ../calendar/gui/e-day-view.c:2174
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
 msgstr "%-m 月 %-d 日"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:248
-#: ../a11y/calendar/ea-gnome-calendar.c:256
+#: ../a11y/calendar/ea-gnome-calendar.c:247
+#: ../a11y/calendar/ea-gnome-calendar.c:255
 #: ../calendar/importers/icalendar-importer.c:772
 msgid "Gnome Calendar"
 msgstr "Gnome 行事曆"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:291
+#: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "搜尋列"
 
-#: ../a11y/calendar/ea-gnome-calendar.c:292
+#: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "evolution 行事曆搜尋列"
 
@@ -255,11 +255,11 @@ msgstr "彈出"
 msgid "popup a child"
 msgstr "彈出子選單"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:612
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:614
 msgid "edit"
 msgstr "編輯"
 
-#: ../a11y/e-table/gal-a11y-e-cell-text.c:613
+#: ../a11y/e-table/gal-a11y-e-cell-text.c:615
 msgid "begin editing this cell"
 msgstr "開始編輯此儲存格"
 
@@ -272,19 +272,19 @@ msgstr "切換"
 msgid "toggle the cell"
 msgstr "切換儲存格"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:192
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:194
 msgid "expand"
 msgstr "展開"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:193
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:195
 msgid "expands the row in the ETree containing this cell"
 msgstr "展開 ETree 中包含此儲存格的列"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:198
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:200
 msgid "collapse"
 msgstr "收摺"
 
-#: ../a11y/e-table/gal-a11y-e-cell-tree.c:199
+#: ../a11y/e-table/gal-a11y-e-cell-tree.c:201
 msgid "collapses the row in the ETree containing this cell"
 msgstr "折疊 ETree 中包含此儲存格的列"
 
@@ -294,7 +294,7 @@ msgstr "表格的儲存格"
 
 #: ../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:574
+#: ../widgets/table/e-table-click-to-add.c:581
 msgid "click to add"
 msgstr "請按這裡加入"
 
@@ -306,17 +306,17 @@ msgstr "單擊"
 msgid "sort"
 msgstr "排序"
 
-#: ../a11y/widgets/ea-calendar-item.c:296
-#: ../a11y/widgets/ea-calendar-item.c:302
+#: ../a11y/widgets/ea-calendar-item.c:298
+#: ../a11y/widgets/ea-calendar-item.c:304
 msgid "%d %B %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../a11y/widgets/ea-calendar-item.c:304
+#: ../a11y/widgets/ea-calendar-item.c:306
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "行事曆：從 %s 到 %s"
 
-#: ../a11y/widgets/ea-calendar-item.c:339
+#: ../a11y/widgets/ea-calendar-item.c:341
 msgid "evolution calendar item"
 msgstr "evolution 行事曆項目"
 
@@ -351,14 +351,18 @@ msgid "Address '{0}' already exists."
 msgstr "通訊錄「{0}」已存在"
 
 #: ../addressbook/addressbook.error.xml.h:3
+msgid "Cannot add new contact"
+msgstr "不能加入新的連絡人"
+
+#: ../addressbook/addressbook.error.xml.h:4
 msgid "Cannot move contact."
 msgstr "無法移動連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:4
+#: ../addressbook/addressbook.error.xml.h:5
 msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
-#: ../addressbook/addressbook.error.xml.h:5
+#: ../addressbook/addressbook.error.xml.h:6
 msgid ""
 "Check to make sure your password is spelled correctly and that you are using "
 "a supported login method. Remember that many passwords are case sensitive; "
@@ -367,15 +371,15 @@ msgstr ""
 "請檢查來確定您的密碼拼法正確，而且您使用的是支援的登入方法。請記得許多密碼有"
 "區分大小寫；您可能啟動了大寫鎖定鍵。"
 
-#: ../addressbook/addressbook.error.xml.h:6
+#: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not get schema information for LDAP server."
 msgstr "無法取得 LDAP 伺服器的綱要資訊。"
 
-#: ../addressbook/addressbook.error.xml.h:7
+#: ../addressbook/addressbook.error.xml.h:8
 msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
-#: ../addressbook/addressbook.error.xml.h:8
+#: ../addressbook/addressbook.error.xml.h:9
 msgid ""
 "Currently you can access only GroupWise System Address Book from Evolution. "
 "Please use some other GroupWise mail client once, to get your GroupWise "
@@ -385,58 +389,64 @@ msgstr ""
 "GroupWise 郵件客戶端，以取得您的 GroupWise 常用連絡人及 Groupwise 個人連絡人"
 "資料夾。"
 
-#: ../addressbook/addressbook.error.xml.h:9
+#: ../addressbook/addressbook.error.xml.h:10
 msgid "Delete address book '{0}'?"
 msgstr "刪除通訊錄「{0}」？"
 
-#: ../addressbook/addressbook.error.xml.h:10
+#: ../addressbook/addressbook.error.xml.h:11
 msgid "Error loading addressbook."
 msgstr "載入通訊錄發生錯誤。"
 
-#: ../addressbook/addressbook.error.xml.h:11
+#: ../addressbook/addressbook.error.xml.h:12
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤： {2}"
 
-#: ../addressbook/addressbook.error.xml.h:12
+#: ../addressbook/addressbook.error.xml.h:13
 msgid "Failed to authenticate with LDAP server."
 msgstr "無法驗證 LDAP 伺服器。"
 
 #. Unknown error
-#: ../addressbook/addressbook.error.xml.h:13
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
+#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
-#: ../addressbook/addressbook.error.xml.h:14
+#: ../addressbook/addressbook.error.xml.h:15
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise 通訊錄的建立"
 
-#: ../addressbook/addressbook.error.xml.h:15
+#: ../addressbook/addressbook.error.xml.h:16
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺服器未回應有效的綱要資訊。"
 
-#: ../addressbook/addressbook.error.xml.h:16
+#: ../addressbook/addressbook.error.xml.h:17
 msgid "Permission Denied."
 msgstr "權限不足。"
 
-#: ../addressbook/addressbook.error.xml.h:17
+#: ../addressbook/addressbook.error.xml.h:18
 msgid "Server Version"
 msgstr "伺服器版本"
 
-#: ../addressbook/addressbook.error.xml.h:18
+#: ../addressbook/addressbook.error.xml.h:19
 msgid "Some features may not work properly with your current server"
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作"
 
-#: ../addressbook/addressbook.error.xml.h:19
+#: ../addressbook/addressbook.error.xml.h:20
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
 
-#: ../addressbook/addressbook.error.xml.h:20
+#: ../addressbook/addressbook.error.xml.h:21
+msgid ""
+"The address book {0} is read only, thus you cannot add contacts there. "
+"Select other address book, please."
+msgstr "通訊錄 {0} 是唯讀的，因此無法在這兒加入連絡人。請選擇其他的通訊錄。"
+
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的圖片太大。您是否要改變大小後才儲存它？"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:23
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -445,45 +455,45 @@ msgstr ""
 "此 LDAP 伺服器可能使用舊的 LDAP 版本，它不支援此功能，或可能設定錯誤。請洽詢"
 "管理員，瞭解支援的搜尋基礎。"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:25
 msgid "This addressbook could not be opened."
 msgstr "無法開啟此通訊錄。"
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:26
 msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺服器沒有任何建議的搜尋基礎。"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:27
 msgid ""
 "This addressbook server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
 msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或您的網路連線已經停止。"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺服器不支援 LDAPv3 綱要資訊。"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to open addressbook"
 msgstr "無法開啟通訊錄"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的變更？"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "You are attempting to move a contact from one addressbook to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -491,7 +501,7 @@ msgstr ""
 "您正在嘗試從某一個通訊錄，將連絡人移至另一個通訊錄，但是它無法從來源移除。您"
 "想要儲存一個副本來代替嗎？"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results the server should be upgraded to "
@@ -500,62 +510,62 @@ msgstr ""
 "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
 "解決方案是將該伺服器升級至支援的版太"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:35
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "您已經修改此連絡人。要儲存這些變更？"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:35 ../mail/em-vfolder-rule.c:511
+#: ../addressbook/addressbook.error.xml.h:37 ../mail/em-vfolder-rule.c:512
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
-#: ../plugins/groupwise-features/properties.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:15
+#: ../plugins/groupwise-features/properties.glade.h:10
+#: ../widgets/table/e-table-config.glade.h:18
 msgid "_Add"
 msgstr "新增(_A)"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "_Discard"
 msgstr "放棄(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "_Do not save"
 msgstr "不要儲存(_D)"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:40
 msgid "_Resize"
 msgstr "改變大小(_R)"
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:41
 msgid "_Use as it is"
 msgstr "將它視為(_U)"
 
 #. For Translators: {0} is the string describing why the search could not be performed (eg: "The backend for this addressbook was unable to parse this query."
-#: ../addressbook/addressbook.error.xml.h:41
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
+#: ../addressbook/addressbook.error.xml.h:43
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
 msgid "{0}"
 msgstr "{0}"
 
 #. For Translators: {1} is the error status string (eg: "E_BOOK_ERROR_NO_SELF_CONTACT")
-#: ../addressbook/addressbook.error.xml.h:43
+#: ../addressbook/addressbook.error.xml.h:45
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:300
+#: ../addressbook/conduit/address-conduit.c:298
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
-#: ../addressbook/conduit/address-conduit.c:1317
-#: ../addressbook/conduit/address-conduit.c:1318
+#: ../addressbook/conduit/address-conduit.c:1319
+#: ../addressbook/conduit/address-conduit.c:1320
 msgid "Could not load addressbook"
 msgstr "無法載入通訊錄"
 
-#: ../addressbook/conduit/address-conduit.c:1395
-#: ../addressbook/conduit/address-conduit.c:1398
+#: ../addressbook/conduit/address-conduit.c:1397
+#: ../addressbook/conduit/address-conduit.c:1400
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
@@ -577,9 +587,10 @@ msgstr "在此設定自動完成"
 
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#: ../addressbook/gui/component/addressbook-view.c:1332
-#: ../calendar/gui/calendar-component.c:272 ../calendar/gui/migration.c:402
-#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../addressbook/gui/component/addressbook-view.c:1338
+#: ../calendar/gui/calendar-component.c:285 ../calendar/gui/migration.c:402
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:581
 msgid "Contacts"
 msgstr "連絡人"
 
@@ -617,14 +628,14 @@ 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:139
-#: ../addressbook/gui/component/addressbook-migrate.c:483
-#: ../calendar/gui/calendar-component.c:231
-#: ../calendar/gui/memos-component.c:195 ../calendar/gui/migration.c:476
-#: ../calendar/gui/migration.c:572 ../calendar/gui/migration.c:1080
-#: ../calendar/gui/tasks-component.c:191 ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:300
-#: ../mail/mail-vfolder.c:223
+#: ../addressbook/gui/component/addressbook-component.c:144
+#: ../addressbook/gui/component/addressbook-migrate.c:497
+#: ../calendar/gui/calendar-component.c:237
+#: ../calendar/gui/memos-component.c:200 ../calendar/gui/migration.c:481
+#: ../calendar/gui/migration.c:582 ../calendar/gui/migration.c:1095
+#: ../calendar/gui/tasks-component.c:196 ../mail/em-folder-tree-model.c:200
+#: ../mail/em-folder-tree-model.c:202 ../mail/mail-component.c:305
+#: ../mail/mail-vfolder.c:216
 msgid "On This Computer"
 msgstr "我的電腦"
 
@@ -633,137 +644,135 @@ msgstr "我的電腦"
 #. Create the default Person task list
 #. Create the default Person addressbook
 #. orange
-#: ../addressbook/gui/component/addressbook-component.c:147
-#: ../addressbook/gui/component/addressbook-migrate.c:491
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: ../addressbook/gui/widgets/eab-contact-display.c:602
-#: ../calendar/gui/calendar-component.c:241
-#: ../calendar/gui/memos-component.c:203 ../calendar/gui/migration.c:486
-#: ../calendar/gui/migration.c:580 ../calendar/gui/migration.c:1088
-#: ../calendar/gui/tasks-component.c:199 ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1055 ../mail/mail-config.glade.h:106
+#: ../addressbook/gui/component/addressbook-component.c:152
+#: ../addressbook/gui/component/addressbook-migrate.c:505
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/widgets/eab-contact-display.c:660
+#: ../calendar/gui/calendar-component.c:248
+#: ../calendar/gui/memos-component.c:209 ../calendar/gui/migration.c:491
+#: ../calendar/gui/migration.c:590 ../calendar/gui/migration.c:1103
+#: ../calendar/gui/tasks-component.c:205 ../mail/em-migrate.c:1056
 msgid "Personal"
 msgstr "個人"
 
 #. Create the LDAP source group
-#: ../addressbook/gui/component/addressbook-component.c:157
-#: ../addressbook/gui/component/addressbook-migrate.c:501
+#: ../addressbook/gui/component/addressbook-component.c:162
+#: ../addressbook/gui/component/addressbook-migrate.c:515
 msgid "On LDAP Servers"
 msgstr "在 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook-component.c:225
+#: ../addressbook/gui/component/addressbook-component.c:229
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
-#: ../addressbook/gui/component/addressbook-component.c:226
+#: ../addressbook/gui/component/addressbook-component.c:230
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
 
-#: ../addressbook/gui/component/addressbook-component.c:233
+#: ../addressbook/gui/component/addressbook-component.c:237
 msgid "Contact _List"
 msgstr "連絡人清單(_L)"
 
-#: ../addressbook/gui/component/addressbook-component.c:234
+#: ../addressbook/gui/component/addressbook-component.c:238
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
-#: ../addressbook/gui/component/addressbook-component.c:240
-#: ../addressbook/gui/component/addressbook-config.c:1205
+#: ../addressbook/gui/component/addressbook-component.c:244
+#: ../addressbook/gui/component/addressbook-config.c:1206
 msgid "New Address Book"
 msgstr "新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:241
+#: ../addressbook/gui/component/addressbook-component.c:245
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-#: ../addressbook/gui/component/addressbook-component.c:242
+#: ../addressbook/gui/component/addressbook-component.c:246
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
 
-#: ../addressbook/gui/component/addressbook-component.c:405
+#: ../addressbook/gui/component/addressbook-component.c:409
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "升級通訊錄設定值或資料夾失敗。"
 
-#: ../addressbook/gui/component/addressbook-config.c:332
+#: ../addressbook/gui/component/addressbook-config.c:329
 msgid "Base"
 msgstr "基本"
 
-#: ../addressbook/gui/component/addressbook-config.c:533
-#: ../calendar/gui/dialogs/calendar-setup.c:192
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:9
+#: ../addressbook/gui/component/addressbook-config.c:530
+#: ../calendar/gui/dialogs/calendar-setup.c:172
 msgid "_Type:"
 msgstr "類型(_T):"
 
-#: ../addressbook/gui/component/addressbook-config.c:635
-msgid "Copy book content locally for offline operation"
-msgstr "複製通訊錄內容至本地用於離線作業"
+#: ../addressbook/gui/component/addressbook-config.c:632
+msgid "Copy _book content locally for offline operation"
+msgstr "複製通訊錄內容至本地用於離線作業(_B)"
 
-#: ../addressbook/gui/component/addressbook-config.c:984
+#: ../addressbook/gui/component/addressbook-config.c:981
 #: ../addressbook/gui/component/ldap-config.glade.h:22
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: ../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:222 ../mail/mail-config.glade.h:86
-#: ../plugins/itip-formatter/itip-formatter.c:2087
+#: ../calendar/gui/dialogs/calendar-setup.c:369
+#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../mail/em-folder-properties.c:222 ../mail/mail-config.glade.h:89
+#: ../plugins/itip-formatter/itip-formatter.c:2318
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
 
-#: ../addressbook/gui/component/addressbook-config.c:985
-#: ../addressbook/gui/widgets/e-addressbook-view.c:572
-#: ../mail/importers/pine-importer.c:392
+#: ../addressbook/gui/component/addressbook-config.c:982
+#: ../addressbook/gui/widgets/e-addressbook-view.c:557
+#: ../mail/importers/pine-importer.c:387
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: ../addressbook/gui/component/addressbook-config.c:989
+#: ../addressbook/gui/component/addressbook-config.c:986
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-#: ../addressbook/gui/component/addressbook-config.c:991
+#: ../addressbook/gui/component/addressbook-config.c:988
 msgid "Authentication"
 msgstr "驗證"
 
-#: ../addressbook/gui/component/addressbook-config.c:994
+#: ../addressbook/gui/component/addressbook-config.c:991
 #: ../addressbook/gui/component/ldap-config.glade.h:17
 #: ../mail/mail-dialogs.glade.h:10 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細資料"
 
-#: ../addressbook/gui/component/addressbook-config.c:995
-#: ../mail/em-folder-browser.c:852
+#: ../addressbook/gui/component/addressbook-config.c:992
+#: ../mail/em-folder-browser.c:935
 msgid "Searching"
 msgstr "搜尋中"
 
-#: ../addressbook/gui/component/addressbook-config.c:997
+#: ../addressbook/gui/component/addressbook-config.c:994
 msgid "Downloading"
 msgstr "下載中"
 
-#: ../addressbook/gui/component/addressbook-config.c:1203
+#: ../addressbook/gui/component/addressbook-config.c:1204
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:73
-#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1202
+#: ../calendar/gui/migration.c:155 ../mail/em-migrate.c:1203
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1243
+#: ../calendar/gui/migration.c:202 ../mail/em-migrate.c:1244
 #, c-format
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
-#: ../addressbook/gui/component/addressbook-migrate.c:629
+#: ../addressbook/gui/component/addressbook-migrate.c:643
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:744
+#: ../addressbook/gui/component/addressbook-migrate.c:758
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1119
+#: ../addressbook/gui/component/addressbook-migrate.c:1134
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -774,7 +783,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1133
+#: ../addressbook/gui/component/addressbook-migrate.c:1148
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
@@ -784,7 +793,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1142
+#: ../addressbook/gui/component/addressbook-migrate.c:1157
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
@@ -794,7 +803,7 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../addressbook/gui/component/addressbook-migrate.c:1152
+#: ../addressbook/gui/component/addressbook-migrate.c:1167
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
@@ -820,39 +829,32 @@ msgstr "重新命名資料夾"
 msgid "Folder names cannot contain '/'"
 msgstr "資料夾名稱不能包含斜線。"
 
-#: ../addressbook/gui/component/addressbook-view.c:445
-msgid "A Folder with this name already exists"
-msgstr "以此為名的資料夾已存在"
-
-#: ../addressbook/gui/component/addressbook-view.c:956
+#: ../addressbook/gui/component/addressbook-view.c:954
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
-#. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:957
-#: ../addressbook/gui/widgets/e-addressbook-view.c:990
-#: ../calendar/gui/calendar-component.c:584
-#: ../calendar/gui/e-calendar-table.c:1302
-#: ../calendar/gui/e-calendar-view.c:1720 ../calendar/gui/e-memo-table.c:918
-#: ../calendar/gui/memos-component.c:453 ../calendar/gui/tasks-component.c:444
-#: ../mail/em-folder-tree.c:2077 ../mail/em-folder-view.c:1148
+#: ../addressbook/gui/component/addressbook-view.c:955
+msgid "Save As vCard..."
+msgstr "儲存為 vCard..."
+
+#: ../addressbook/gui/component/addressbook-view.c:958
+#: ../addressbook/gui/widgets/e-addressbook-view.c:957
+#: ../calendar/gui/calendar-component.c:609
+#: ../calendar/gui/e-calendar-table.c:1349
+#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:938
+#: ../calendar/gui/memos-component.c:468 ../calendar/gui/tasks-component.c:459
+#: ../mail/em-folder-tree.c:2107 ../mail/em-folder-view.c:1345
 #: ../ui/evolution-addressbook.xml.h:49 ../ui/evolution-calendar.xml.h:40
-#: ../ui/evolution-mail-list.xml.h:30 ../ui/evolution-memos.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:35 ../ui/evolution-memos.xml.h:16
 #: ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-#: ../addressbook/gui/component/addressbook-view.c:959
-msgid "Save As Vcard..."
-msgstr "儲存為 VCard..."
-
 #: ../addressbook/gui/component/addressbook-view.c:961
-#: ../calendar/gui/calendar-component.c:585
-#: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:445
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1343
+#: ../addressbook/gui/component/addressbook-view.c:1349
 msgid "Contact Source Selector"
 msgstr "連絡人來源選擇器"
 
@@ -860,59 +862,59 @@ msgstr "連絡人來源選擇器"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook.c:197
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:513
+#: ../addressbook/gui/component/addressbook.c:200
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:511
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
-#: ../addressbook/gui/component/addressbook.c:204
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:493
+#: ../addressbook/gui/component/addressbook.c:207
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:491
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:1
 msgid "Autocomplete length"
 msgstr "自動完成長度"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:2
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:2
 msgid "EFolderList XML for the list of completion URIs"
 msgstr "完成 uris 清單的 EFolderList xml"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:3
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:3
 msgid "EFolderList XML for the list of completion URIs."
 msgstr "完成 uris 清單的 EFolderList xml"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:4
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
 msgstr "垂直窗格的位置，在名片、清單檢視與預覽窗格之間，以像素計。"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:5
 msgid "Show preview pane"
 msgstr "顯示預覽窗格"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:6
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
 msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字元數目。"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:7
 msgid "URI for the folder last used in the select names dialog"
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:8
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:8
 msgid "URI for the folder last used in the select names dialog."
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:70
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:70
 msgid "Vertical pane position"
 msgstr "垂直窗格位置"
 
-#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
+#: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "是否顯示預覽窗格。"
 
@@ -937,7 +939,6 @@ msgid "636"
 msgstr "636"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:6
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
 msgstr "<b>驗證</b>"
 
@@ -1174,9 +1175,9 @@ msgid "_Login method:"
 msgstr "登入方法(_L):"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:53
-#: ../calendar/gui/dialogs/calendar-setup.c:245
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:7
-#: ../mail/mail-config.glade.h:165
+#: ../calendar/gui/dialogs/calendar-setup.c:229
+#: ../mail/mail-config.glade.h:164
+#: ../plugins/groupwise-features/properties.glade.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:2
 msgid "_Name:"
 msgstr "名稱(_N):"
@@ -1209,12 +1210,11 @@ msgstr "名片"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:16
-#: ../mail/em-account-editor.c:2054
-#: ../plugins/calendar-http/calendar-http.c:286
-#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../filter/filter.glade.h:17
+#: ../plugins/calendar-http/calendar-http.c:288
+#: ../plugins/calendar-weather/calendar-weather.c:561
+#: ../plugins/google-account-setup/google-source.c:395
 msgid "minutes"
 msgstr "分鐘"
 
@@ -1255,98 +1255,99 @@ msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
-#: ../addressbook/gui/widgets/eab-contact-display.c:556
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:184
+#: ../addressbook/gui/widgets/eab-contact-display.c:614
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:275
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
+#: ../calendar/gui/dialogs/event-page.glade.h:6
+#: ../calendar/gui/dialogs/memo-page.glade.h:1
+msgid "Ca_tegories..."
+msgstr "分類(_T)..."
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:273
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1156
 #: ../addressbook/gui/widgets/e-minicard.c:194
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:12
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:552
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:567
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2423
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:550
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:565
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2430
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Image"
 msgstr "圖片"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "Mailing Address"
 msgstr "郵寄地址"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Ni_ckname:"
-msgstr "暱稱(_C):"
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
+msgid "Nic_kname:"
+msgstr "暱稱(_K):"
+
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:19
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Telephone"
 msgstr "電話"
 
 #. red
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:22
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:238
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:202
 #: ../addressbook/gui/widgets/eab-contact-display.c:57
-#: ../addressbook/gui/widgets/eab-contact-display.c:585
-#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1054
-#: ../mail/mail-config.glade.h:155
+#: ../addressbook/gui/widgets/eab-contact-display.c:643
+#: ../mail/em-migrate.c:1055
 msgid "Work"
 msgstr "工作"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
-msgid "_Address: "
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
+msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Assistant:"
 msgstr "助理(_A):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: ../calendar/gui/dialogs/event-page.c:875
+#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: ../calendar/gui/dialogs/event-page.c:899
 #: ../calendar/gui/dialogs/event-page.glade.h:15
-#: ../plugins/itip-formatter/itip-view.c:1709
+#: ../plugins/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
-#: ../addressbook/gui/contact-editor/contact-editor.glade.h:28
-msgid "_Categories..."
-msgstr "分類(_C)..."
-
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "縣/市(_C):"
@@ -1424,7 +1425,7 @@ msgid "_Web Log:"
 msgstr "網誌(_W):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "_Where:"
 msgstr "通訊錄(_W):"
 
@@ -1433,26 +1434,25 @@ msgid "_Zip/Postal Code:"
 msgstr "郵遞區號(_Z):"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:97
-#: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:640
+#: ../addressbook/gui/widgets/eab-contact-display.c:655
 msgid "Address"
 msgstr "地址"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:104
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:96
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:144
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:188
-#: ../addressbook/gui/widgets/e-addressbook-model.c:310
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:398
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1176
+#: ../addressbook/gui/widgets/e-addressbook-model.c:312
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:397
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:121
 #: ../addressbook/gui/widgets/e-minicard-view.c:522
 #: ../addressbook/gui/widgets/e-minicard.c:187
-#: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1833 ../widgets/text/e-entry.c:1265
-#: ../widgets/text/e-entry.c:1266 ../widgets/text/e-text.c:3625
-#: ../widgets/text/e-text.c:3626
+#: ../widgets/menus/gal-define-views-model.c:179
+#: ../widgets/table/e-cell-text.c:1835 ../widgets/text/e-text.c:3686
+#: ../widgets/text/e-text.c:3687
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2425,11 +2425,14 @@ msgid "Zimbabwe"
 msgstr "辛巴威"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:90
-#: ../plugins/exchange-operations/exchange-delegates.c:934
+#: ../mail/em-mailer-prefs.c:481
+#: ../plugins/exchange-operations/exchange-delegates.c:958
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:721
-#: ../plugins/plugin-manager/plugin-manager.c:42
-#: ../plugins/save-attachments/save-attachments.c:370
-#: ../widgets/menus/gal-view-new-dialog.c:73
+#: ../plugins/plugin-manager/plugin-manager.c:56
+#: ../plugins/save-attachments/save-attachments.c:366
+#: ../widgets/menus/gal-define-views-dialog.c:348
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:93
+#: ../widgets/menus/gal-view-new-dialog.c:65
 msgid "Name"
 msgstr "名稱"
 
@@ -2438,8 +2441,8 @@ msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:65
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
-#: ../addressbook/gui/widgets/eab-contact-display.c:559
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/eab-contact-display.c:617
 msgid "Jabber"
 msgstr "Jabber"
 
@@ -2452,8 +2455,8 @@ msgid "Gadu-Gadu Messenger"
 msgstr "Gadu-Gadu Messenger"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:69
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/eab-contact-display.c:558
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/widgets/eab-contact-display.c:616
 msgid "ICQ"
 msgstr "ICQ"
 
@@ -2462,9 +2465,9 @@ msgid "Service"
 msgstr "服務"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:130
-#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:8
-#: ../plugins/publish-calendar/publish-calendar.c:497
-#: ../plugins/save-calendar/csv-format.c:400
+#: ../calendar/gui/e-cal-list-view.etspec.h:3 ../mail/message-list.etspec.h:9
+#: ../plugins/publish-calendar/publish-calendar.c:514
+#: ../plugins/save-calendar/csv-format.c:396
 msgid "Location"
 msgstr "位置"
 
@@ -2473,76 +2476,76 @@ msgid "Username"
 msgstr "使用者名稱"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:205
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:203
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "住家"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:204
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
 msgid "Other"
 msgstr "其它"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
-#: ../addressbook/gui/widgets/eab-contact-display.c:561
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/eab-contact-display.c:619
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
-#: ../addressbook/gui/widgets/eab-contact-display.c:562
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-display.c:620
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/eab-contact-display.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
+#: ../addressbook/gui/widgets/eab-contact-display.c:618
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:557
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/widgets/eab-contact-display.c:615
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
 msgid "Source Book"
 msgstr "來源通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:282
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:280
 msgid "Is New Contact"
 msgstr "是新連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:289
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:287
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:296
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:294
 msgid "Required Fields"
 msgstr "必要欄位"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:308
 msgid "Changed"
 msgstr "已變更"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:562
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2418
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:560
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2425
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2798
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2821
 msgid "Please select an image for this contact"
 msgstr "請選取代表此連絡人的圖片"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2799
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid "_No image"
 msgstr "沒有圖片(_N)"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3103
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3095
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2550,43 +2553,43 @@ msgstr ""
 "連絡人資料無效：\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3107
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3099
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3114
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3106
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s「%s」含有無效的格式"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3129
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3140
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3132
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3155
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3147
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:322
 msgid "Contact Quick-Add"
 msgstr "快速新增連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:293
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:325
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:394
 msgid "_Full name"
 msgstr "全名(_F)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:405
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:416
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
@@ -2640,10 +2643,6 @@ msgstr "國家(_Y):"
 msgid "Full Address"
 msgstr "完整地址"
 
-#: ../addressbook/gui/contact-editor/fulladdr.glade.h:5
-msgid "_Address:"
-msgstr "地址(_A):"
-
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:8
 msgid "_ZIP Code:"
 msgstr "郵遞區號(_Z):"
@@ -2657,7 +2656,7 @@ msgid "Esq."
 msgstr "Esq."
 
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Full Name"
 msgstr "全名"
 
@@ -2729,72 +2728,56 @@ msgstr "_IM 服務:"
 #: ../calendar/gui/dialogs/event-page.glade.h:16
 #: ../plugins/calendar-weather/calendar-weather.c:409
 #: ../plugins/exchange-operations/exchange-calendar.c:242
-#: ../plugins/exchange-operations/exchange-contacts.c:235
+#: ../plugins/exchange-operations/exchange-contacts.c:234
 msgid "_Location:"
 msgstr "位置(_L):"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
-msgid "\n"
-msgstr "\n"
+msgid "<b>Members</b>"
+msgstr "<b>成員</b>"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-msgid "Add an email to the List"
-msgstr "新增電子郵件到清單"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:2
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:666
 msgid "Contact List Editor"
 msgstr "連絡人清單編輯器"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
-msgid "Insert email addresses from Address Book"
-msgstr "從通訊錄插入電子郵件位址"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
-msgid "Members"
-msgstr "會員"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
-msgid "Remove an email address from the List"
-msgstr "從清單移除電子郵件地址"
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
+msgid "Select..."
+msgstr "選擇..."
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 msgid "_Hide addresses when sending mail to this list"
 msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "_List name:"
 msgstr "列出名稱(_L):"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
-msgid "_Select"
-msgstr "選取(_S)"
-
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸入電子郵件地址或拖曳連絡人到以下清單(_T)："
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:167
-#: ../addressbook/gui/widgets/e-addressbook-model.c:296
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:384
-#: ../addressbook/gui/widgets/e-addressbook-view.c:232
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+msgid "Contact List Members"
+msgstr "連絡人清單成員"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1146
+#: ../addressbook/gui/widgets/e-addressbook-model.c:298
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:383
+#: ../addressbook/gui/widgets/e-addressbook-view.c:217
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:107
 #: ../addressbook/gui/widgets/e-minicard-view.c:508
 msgid "Book"
 msgstr "書本"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1166
 msgid "Is New List"
 msgstr "是新的清單"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1237
 msgid "_Members"
 msgstr "成員(_M)"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
-msgid "Contact List Members"
-msgstr "連絡人清單成員"
-
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "變更後的連絡人:"
@@ -2810,11 +2793,9 @@ msgstr "偵測到重複的連絡人"
 
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:4
 msgid ""
-"The changed email or name of this contact already\n"
-"exists in this folder.  Would you like to add it anyway?"
-msgstr ""
-"此連絡人中改變後的電子郵件或名稱已經\n"
-"存在於此資料夾。您無論如何都要新增它嗎？"
+"The name or email of this contact already exists in this folder.  Would you "
+"like to add it anyway?"
+msgstr "此連絡人的名稱或電子郵件地址已經存在於此資料夾。無論如何都要新增它嗎？"
 
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
@@ -2832,143 +2813,157 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。您無論如何都要新增它嗎？"
 
+#: ../addressbook/gui/merging/eab-contact-merging.c:190
+msgid "Merge Contact"
+msgstr "合併連絡人"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:205
+msgid "_Merge"
+msgstr "合併(_M)"
+
+#: ../addressbook/gui/merging/eab-contact-merging.c:258
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:597
+#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:860
+#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
+msgid "Email"
+msgstr "電子郵件"
+
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../addressbook/gui/widgets/e-addressbook-view.c:180
-#: ../calendar/gui/cal-search-bar.c:60
+#: ../addressbook/gui/widgets/e-addressbook-view.c:165
+#: ../calendar/gui/cal-search-bar.c:78 ../calendar/gui/caltypes.xml.h:1
+#: ../calendar/gui/memotypes.xml.h:1 ../calendar/gui/tasktypes.xml.h:1
 msgid "Any field contains"
 msgstr "任何欄位包含"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../addressbook/gui/widgets/e-addressbook-view.c:179
+#: ../addressbook/gui/widgets/e-addressbook-view.c:164
 msgid "Email begins with"
 msgstr "電子郵件開始於"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../addressbook/gui/widgets/e-addressbook-view.c:178
+#: ../addressbook/gui/widgets/e-addressbook-view.c:163
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:148
+#: ../addressbook/gui/widgets/e-addressbook-model.c:150
 msgid "No contacts"
 msgstr "沒有連絡人"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:151
+#: ../addressbook/gui/widgets/e-addressbook-model.c:153
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
 msgstr[0] "%d 個連絡人"
 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:246
+#: ../addressbook/gui/widgets/e-addressbook-model.c:305
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:390
+#: ../addressbook/gui/widgets/e-addressbook-view.c:231
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:114
 #: ../addressbook/gui/widgets/e-minicard-view.c:515
 msgid "Query"
 msgstr "查詢"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:446
+#: ../addressbook/gui/widgets/e-addressbook-model.c:448
 msgid "Error getting book view"
 msgstr "取得書本檢視時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
-#: ../widgets/table/e-table-click-to-add.c:502
-#: ../widgets/table/e-table-selection-model.c:311
-#: ../widgets/table/e-table.c:3337
-#: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1209 ../widgets/text/e-entry.c:1210
-#: ../widgets/text/e-text.c:3489 ../widgets/text/e-text.c:3490
+#: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:404
+#: ../widgets/table/e-table-click-to-add.c:510
+#: ../widgets/table/e-table-selection-model.c:303
+#: ../widgets/table/e-table.c:3335
+#: ../widgets/table/e-tree-selection-model.c:821 ../widgets/text/e-text.c:3550
+#: ../widgets/text/e-text.c:3551
 msgid "Model"
 msgstr "模型"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:131
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:239
+#: ../addressbook/gui/widgets/e-addressbook-view.c:224
 msgid "Source"
 msgstr "來源"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:253
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:11
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-meeting-list-view.c:500
+#: ../addressbook/gui/widgets/e-addressbook-view.c:238
+#: ../calendar/gui/e-calendar-table.etspec.h:12
+#: ../calendar/gui/e-meeting-list-view.c:501
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Type"
 msgstr "類型"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:843
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2178
-#: ../ui/evolution-addressbook.xml.h:31
-msgid "Save as VCard..."
-msgstr "儲存為 VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:814
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1935
+msgid "Save as vCard..."
+msgstr "儲存為 vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:968
-#: ../calendar/gui/dialogs/comp-editor.c:1119
-#: ../calendar/gui/e-calendar-table.c:1280
-#: ../calendar/gui/e-calendar-view.c:1698 ../calendar/gui/e-memo-table.c:901
+#: ../addressbook/gui/widgets/e-addressbook-view.c:935
+#: ../calendar/gui/dialogs/comp-editor.c:1134
+#: ../calendar/gui/e-calendar-table.c:1327
+#: ../calendar/gui/e-calendar-view.c:1677 ../calendar/gui/e-memo-table.c:921
 #: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:970
+#: ../addressbook/gui/widgets/e-addressbook-view.c:937
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:971
+#: ../addressbook/gui/widgets/e-addressbook-view.c:938
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:974
-msgid "_Save as VCard..."
-msgstr "儲存成 _VCard..."
+#: ../addressbook/gui/widgets/e-addressbook-view.c:941
+msgid "_Save as vCard..."
+msgstr "儲存成 _vCard..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:975
+#: ../addressbook/gui/widgets/e-addressbook-view.c:942
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:976
+#: ../addressbook/gui/widgets/e-addressbook-view.c:943
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:977
+#: ../addressbook/gui/widgets/e-addressbook-view.c:944
 msgid "Send _Message to Contact"
 msgstr "傳送郵件給連絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:978
+#: ../addressbook/gui/widgets/e-addressbook-view.c:945
 msgid "Send _Message to List"
 msgstr "傳送郵件給清單(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:979
+#: ../addressbook/gui/widgets/e-addressbook-view.c:946
 msgid "Send _Message to Contacts"
 msgstr "傳送郵件給連絡人(_M)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:980
+#: ../addressbook/gui/widgets/e-addressbook-view.c:947
 msgid "_Print"
 msgstr "列印(_P)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:983
+#: ../addressbook/gui/widgets/e-addressbook-view.c:950
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:984
+#: ../addressbook/gui/widgets/e-addressbook-view.c:951
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:987
+#: ../addressbook/gui/widgets/e-addressbook-view.c:954
 #: ../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:988
-#: ../calendar/gui/calendar-component.c:583
+#: ../addressbook/gui/widgets/e-addressbook-view.c:955
 #: ../calendar/gui/dialogs/comp-editor.c:463
-#: ../calendar/gui/e-calendar-table.c:1288
-#: ../calendar/gui/e-calendar-view.c:1705 ../calendar/gui/e-memo-table.c:909
-#: ../calendar/gui/memos-component.c:452 ../calendar/gui/tasks-component.c:443
-#: ../composer/e-msg-composer.c:3185 ../mail/em-folder-tree.c:1002
-#: ../mail/em-folder-view.c:1134 ../mail/message-list.c:1922
+#: ../calendar/gui/e-calendar-table.c:1335
+#: ../calendar/gui/e-calendar-view.c:1684 ../calendar/gui/e-memo-table.c:929
+#: ../composer/e-msg-composer.c:3103 ../mail/em-folder-tree.c:1013
+#: ../mail/em-folder-view.c:1330 ../mail/message-list.c:2059
 #: ../ui/evolution-addressbook.xml.h:46 ../ui/evolution-calendar.xml.h:39
 #: ../ui/evolution-composer-entries.xml.h:13 ../ui/evolution-editor.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:104 ../ui/evolution-memos.xml.h:15
@@ -2976,30 +2971,25 @@ msgstr "剪下(_T)"
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:989
+#: ../addressbook/gui/widgets/e-addressbook-view.c:956
 msgid "P_aste"
 msgstr "貼上(_A)"
 
 #. All, unmatched, separator
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1671
-#: ../calendar/gui/cal-search-bar.c:428
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1511
+#: ../calendar/gui/cal-search-bar.c:619 ../calendar/gui/cal-search-bar.c:662
+#: ../calendar/gui/cal-search-bar.c:681
 msgid "Any Category"
 msgstr "任何分類"
 
-#. FIXME: Allow range selection in table views, as in minicard view
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1871
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1927
-msgid "Print cards"
-msgstr "列印名片"
-
 #. E_BOOK_ERROR_OTHER_ERROR
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1961
-#: ../addressbook/gui/widgets/eab-gui-util.c:70
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1716
+#: ../addressbook/gui/widgets/eab-gui-util.c:75
 msgid "Other error"
 msgstr "其他錯誤"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-#: ../addressbook/gui/widgets/eab-contact-display.c:576
+#: ../addressbook/gui/widgets/eab-contact-display.c:634
 msgid "Assistant"
 msgstr "助理"
 
@@ -3029,6 +3019,7 @@ msgstr "汽車電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
+#: ../calendar/gui/e-cal-component-memo-preview.c:169
 #: ../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
@@ -3036,84 +3027,78 @@ msgid "Categories"
 msgstr "分類"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "公司電話"
+#: ../addressbook/gui/widgets/eab-contact-display.c:629
+msgid "Company"
+msgstr "公司"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: ../addressbook/gui/widgets/eab-contact-display.c:785
-#: ../plugins/groupwise-features/junk-settings.c:425 ../smime/lib/e-cert.c:827
-msgid "Email"
-msgstr "電子郵件"
+msgid "Company Phone"
+msgstr "公司電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 2"
 msgstr "電子郵件 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Email 3"
 msgstr "電子郵件 3"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "Family Name"
 msgstr "姓"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "歸檔為"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Given Name"
 msgstr "名"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Fax"
 msgstr "住家傳真"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone"
 msgstr "住家電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 msgid "Journal"
 msgstr "日誌"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-#: ../addressbook/gui/widgets/eab-contact-display.c:575
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: ../addressbook/gui/widgets/eab-contact-display.c:633
 msgid "Manager"
 msgstr "主管"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: ../addressbook/gui/widgets/eab-contact-display.c:596
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+#: ../addressbook/gui/widgets/eab-contact-display.c:654
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-#: ../addressbook/gui/widgets/eab-contact-display.c:550
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: ../addressbook/gui/widgets/eab-contact-display.c:608
 msgid "Nickname"
 msgstr "暱稱"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: ../addressbook/gui/widgets/eab-contact-display.c:609
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/eab-contact-display.c:667
 msgid "Note"
 msgstr "備註"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Office"
 msgstr "辦公室"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: ../addressbook/gui/widgets/eab-contact-display.c:571
-msgid "Organization"
-msgstr "團體"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它傳真"
@@ -3135,15 +3120,14 @@ msgid "Radio"
 msgstr "無線電電話"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:9
-#: ../calendar/gui/e-meeting-list-view.c:511
+#: ../calendar/gui/e-meeting-list-view.c:513
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:725
 msgid "Role"
 msgstr "角色"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-display.c:600
+#: ../addressbook/gui/widgets/eab-contact-display.c:658
 msgid "Spouse"
 msgstr "配偶"
 
@@ -3175,32 +3159,32 @@ msgstr "網址"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:150
-#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1436 ../widgets/misc/e-reflow.c:1437
-#: ../widgets/table/e-table-click-to-add.c:516
-#: ../widgets/table/e-table-col.c:98
-#: ../widgets/table/e-table-field-chooser-item.c:658
+#: ../widgets/misc/e-canvas-vbox.c:86 ../widgets/misc/e-canvas-vbox.c:87
+#: ../widgets/misc/e-reflow.c:1433 ../widgets/misc/e-reflow.c:1434
+#: ../widgets/table/e-table-click-to-add.c:524
+#: ../widgets/table/e-table-col.c:99
+#: ../widgets/table/e-table-field-chooser-item.c:655
+#: ../widgets/table/e-table-group-container.c:966
 #: ../widgets/table/e-table-group-container.c:967
-#: ../widgets/table/e-table-group-container.c:968
+#: ../widgets/table/e-table-group-leaf.c:628
 #: ../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:3667 ../widgets/text/e-text.c:3668
+#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/text/e-text.c:3728 ../widgets/text/e-text.c:3729
 msgid "Width"
 msgstr "寬度"
 
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:157
-#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1444 ../widgets/misc/e-reflow.c:1445
-#: ../widgets/table/e-table-click-to-add.c:523
-#: ../widgets/table/e-table-field-chooser-item.c:665
+#: ../widgets/misc/e-canvas-vbox.c:98 ../widgets/misc/e-canvas-vbox.c:99
+#: ../widgets/misc/e-reflow.c:1441 ../widgets/misc/e-reflow.c:1442
+#: ../widgets/table/e-table-click-to-add.c:531
+#: ../widgets/table/e-table-field-chooser-item.c:662
+#: ../widgets/table/e-table-group-container.c:959
 #: ../widgets/table/e-table-group-container.c:960
-#: ../widgets/table/e-table-group-container.c:961
+#: ../widgets/table/e-table-group-leaf.c:621
 #: ../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:3675 ../widgets/text/e-text.c:3676
+#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/text/e-text.c:3736 ../widgets/text/e-text.c:3737
 msgid "Height"
 msgstr "高度"
 
@@ -3301,216 +3285,216 @@ msgstr "已選擇"
 msgid "Has Cursor"
 msgstr "有游標"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:620
+#: ../addressbook/gui/widgets/eab-contact-display.c:172 ../mail/em-popup.c:637
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結(_O)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:175
-#: ../mail/em-folder-view.c:2545
+#: ../addressbook/gui/widgets/eab-contact-display.c:173
+#: ../mail/em-folder-view.c:2807
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:176 ../mail/em-popup.c:621
+#: ../addressbook/gui/widgets/eab-contact-display.c:174 ../mail/em-popup.c:638
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:177
+#: ../addressbook/gui/widgets/eab-contact-display.c:175
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
 msgstr "複製電子郵件位址(_E)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:301
-#: ../addressbook/gui/widgets/eab-contact-display.c:364
+#: ../addressbook/gui/widgets/eab-contact-display.c:296
+#: ../addressbook/gui/widgets/eab-contact-display.c:370
+#: ../addressbook/gui/widgets/eab-contact-display.c:372
 msgid "(map)"
 msgstr "(映射)"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:311
-#: ../addressbook/gui/widgets/eab-contact-display.c:377
+#: ../addressbook/gui/widgets/eab-contact-display.c:306
+#: ../addressbook/gui/widgets/eab-contact-display.c:390
+#: ../addressbook/gui/widgets/eab-contact-display.c:402
 msgid "map"
 msgstr "對映"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:462
-#: ../addressbook/gui/widgets/eab-contact-display.c:763
+#: ../addressbook/gui/widgets/eab-contact-display.c:487
+#: ../addressbook/gui/widgets/eab-contact-display.c:827
 msgid "List Members"
 msgstr "清單成員"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:540
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-msgid "E-mail"
-msgstr "電子郵件"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:572
+#: ../addressbook/gui/widgets/eab-contact-display.c:630
 msgid "Department"
 msgstr "部門"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:573
+#: ../addressbook/gui/widgets/eab-contact-display.c:631
 msgid "Profession"
 msgstr "職業"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:574
+#: ../addressbook/gui/widgets/eab-contact-display.c:632
 msgid "Position"
 msgstr "位置"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:577
+#: ../addressbook/gui/widgets/eab-contact-display.c:635
 msgid "Video Chat"
 msgstr "視訊交談"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:578
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/calendar-component.c:755
-#: ../calendar/gui/dialogs/calendar-setup.c:369
-#: ../calendar/gui/gnome-cal.c:2305
-#: ../plugins/exchange-operations/exchange-folder.c:569
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
-#: ../plugins/hula-account-setup/camel-hula-listener.c:381
-#: ../plugins/hula-account-setup/camel-hula-listener.c:410
+#: ../addressbook/gui/widgets/eab-contact-display.c:636
+#: ../calendar/gui/calendar-commands.c:99
+#: ../calendar/gui/calendar-component.c:795
+#: ../calendar/gui/dialogs/calendar-setup.c:370
+#: ../calendar/gui/gnome-cal.c:2383
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:575
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:400
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:431
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:544
+#: ../plugins/hula-account-setup/camel-hula-listener.c:378
+#: ../plugins/hula-account-setup/camel-hula-listener.c:407
 #: ../plugins/publish-calendar/publish-calendar.glade.h:5
 msgid "Calendar"
 msgstr "行事曆"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:579
+#: ../addressbook/gui/widgets/eab-contact-display.c:637
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-#: ../calendar/gui/dialogs/event-editor.c:591
+#: ../calendar/gui/dialogs/event-editor.c:369
 #: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:580
-#: ../addressbook/gui/widgets/eab-contact-display.c:595
+#: ../addressbook/gui/widgets/eab-contact-display.c:638
+#: ../addressbook/gui/widgets/eab-contact-display.c:653
 msgid "Phone"
 msgstr "電話"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:581
+#: ../addressbook/gui/widgets/eab-contact-display.c:639
 msgid "Fax"
 msgstr "傳真"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:592
+#: ../addressbook/gui/widgets/eab-contact-display.c:650
 msgid "Home Page"
 msgstr "首頁"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:593
+#: ../addressbook/gui/widgets/eab-contact-display.c:651
 msgid "Web Log"
 msgstr "網誌"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:598
+#: ../addressbook/gui/widgets/eab-contact-display.c:656
+#: ../calendar/gui/e-calendar-view.c:2327
 msgid "Birthday"
 msgstr "生日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:599
+#: ../addressbook/gui/widgets/eab-contact-display.c:657
+#: ../calendar/gui/e-calendar-view.c:2328
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:781
+#: ../addressbook/gui/widgets/eab-contact-display.c:845
 msgid "Job Title"
 msgstr "職稱"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:812
+#: ../addressbook/gui/widgets/eab-contact-display.c:881
 msgid "Home page"
 msgstr "首頁"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:820
+#: ../addressbook/gui/widgets/eab-contact-display.c:889
 msgid "Blog"
 msgstr "Blog"
 
 #. E_BOOK_ERROR_OK
-#: ../addressbook/gui/widgets/eab-gui-util.c:50
+#: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "Success"
 msgstr "成功"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: ../addressbook/gui/widgets/eab-gui-util.c:52
+#: ../addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Backend busy"
 msgstr "後端忙碌"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: ../addressbook/gui/widgets/eab-gui-util.c:53
+#: ../addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Repository offline"
 msgstr "資料庫離線"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: ../addressbook/gui/widgets/eab-gui-util.c:54
+#: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Address Book does not exist"
 msgstr "通訊錄不存在"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: ../addressbook/gui/widgets/eab-gui-util.c:55
+#: ../addressbook/gui/widgets/eab-gui-util.c:60
 msgid "No Self Contact defined"
 msgstr "沒有定義自我連絡人"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: ../addressbook/gui/widgets/eab-gui-util.c:58
+#: ../addressbook/gui/widgets/eab-gui-util.c:63
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:49
 msgid "Permission denied"
 msgstr "權限不足"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: ../addressbook/gui/widgets/eab-gui-util.c:59
+#: ../addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Contact not found"
 msgstr "找不到連絡人"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: ../addressbook/gui/widgets/eab-gui-util.c:60
+#: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Contact ID already exists"
 msgstr "連絡人 ID 已經存在"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: ../addressbook/gui/widgets/eab-gui-util.c:61
+#: ../addressbook/gui/widgets/eab-gui-util.c:66
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
 #. E_BOOK_ERROR_CANCELLED
-#: ../addressbook/gui/widgets/eab-gui-util.c:62
+#: ../addressbook/gui/widgets/eab-gui-util.c:67
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
-#: ../calendar/gui/e-cal-component-preview.c:234
-#: ../calendar/gui/e-cal-model-tasks.c:349
-#: ../calendar/gui/e-cal-model-tasks.c:664
-#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/print.c:2516
+#: ../calendar/gui/e-cal-component-preview.c:239
+#: ../calendar/gui/e-cal-model-tasks.c:360
+#: ../calendar/gui/e-cal-model-tasks.c:677
+#: ../calendar/gui/e-calendar-table.c:403 ../calendar/gui/print.c:2521
 msgid "Canceled"
 msgstr "已取消"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: ../addressbook/gui/widgets/eab-gui-util.c:63
+#: ../addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Could not cancel"
 msgstr "無法取消"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: ../addressbook/gui/widgets/eab-gui-util.c:64
-#: ../calendar/gui/comp-editor-factory.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../calendar/gui/comp-editor-factory.c:422
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: ../addressbook/gui/widgets/eab-gui-util.c:65
+#: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Authentication Required"
 msgstr "要求驗證"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:66
+#: ../addressbook/gui/widgets/eab-gui-util.c:71
 msgid "TLS not Available"
 msgstr "TLS 無法使用"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: ../addressbook/gui/widgets/eab-gui-util.c:68
+#: ../addressbook/gui/widgets/eab-gui-util.c:73
 msgid "No such source"
 msgstr "查無此來源"
 
 #. E_BOOK_ERROR_OFFLINE_UNAVAILABLE
-#: ../addressbook/gui/widgets/eab-gui-util.c:69
+#: ../addressbook/gui/widgets/eab-gui-util.c:74
 msgid "Not available in offline mode"
 msgstr "無法在離線模式下使用"
 
 #. E_BOOK_ERROR_INVALID_SERVER_VERSION
-#: ../addressbook/gui/widgets/eab-gui-util.c:71
+#: ../addressbook/gui/widgets/eab-gui-util.c:76
 msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:94
+#: ../addressbook/gui/widgets/eab-gui-util.c:99
 msgid ""
 "We were unable to open this addressbook. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -3519,20 +3503,20 @@ msgstr ""
 "我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離"
 "線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:103
+#: ../addressbook/gui/widgets/eab-gui-util.c:108
 #, c-format
 msgid ""
 "We were unable to open this addressbook.  Please check that the path %s "
 "exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且您有權限存取它。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:112
+#: ../addressbook/gui/widgets/eab-gui-util.c:117
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的 URI，或無法連線 LDAP 伺服器。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:117
+#: ../addressbook/gui/widgets/eab-gui-util.c:122
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
 "you want to use LDAP in Evolution, you must install an LDAP-enabled "
@@ -3541,13 +3525,13 @@ msgstr ""
 "此 Evolution 版本未編譯 LDAP 支援。如果您若想在 Evolution 使用 LDAP，必須安裝"
 "啟用 LDAP 的 Evolution 套件。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
+#: ../addressbook/gui/widgets/eab-gui-util.c:129
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的URI，或伺服器無法連線。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:147
+#: ../addressbook/gui/widgets/eab-gui-util.c:152
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -3559,7 +3543,7 @@ msgstr ""
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
+#: ../addressbook/gui/widgets/eab-gui-util.c:158
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -3571,45 +3555,45 @@ msgstr ""
 "或是提高此目錄服務的目錄伺服器偏好設定中的\n"
 "結果上限。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:159
+#: ../addressbook/gui/widgets/eab-gui-util.c:164
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "此目錄服務的後端程式無法解析這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
+#: ../addressbook/gui/widgets/eab-gui-util.c:170
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:187
-#: ../addressbook/gui/widgets/eab-gui-util.c:707
+#: ../addressbook/gui/widgets/eab-gui-util.c:192
+#: ../addressbook/gui/widgets/eab-gui-util.c:670
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:198
+#: ../addressbook/gui/widgets/eab-gui-util.c:203
 msgid "Error modifying contact"
 msgstr "修改連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-#: ../addressbook/gui/widgets/eab-gui-util.c:659
+#: ../addressbook/gui/widgets/eab-gui-util.c:215
+#: ../addressbook/gui/widgets/eab-gui-util.c:620
 msgid "Error removing contact"
 msgstr "移除連絡人時發生錯誤"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:292
+#: ../addressbook/gui/widgets/eab-gui-util.c:297
 #, c-format
 msgid ""
 "Opening %d contact will open %d new window as well.\n"
@@ -3624,8 +3608,16 @@ msgstr[1] ""
 "開啟 %d 個連絡人會一併開啟 %d 個新視窗。\n"
 "確定要顯示所有的連絡人？"
 
+#: ../addressbook/gui/widgets/eab-gui-util.c:305
+msgid "_Don't Display"
+msgstr "不要顯示(_D)"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
+msgid "Display _All Contacts"
+msgstr "顯示所有的連絡人(_A)"
+
 #. For Translators only: "it" refers to the filename %s.
-#: ../addressbook/gui/widgets/eab-gui-util.c:324
+#: ../addressbook/gui/widgets/eab-gui-util.c:332
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -3634,64 +3626,65 @@ msgstr ""
 "%s 已經存在\n"
 "您是否要覆寫它？"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:328
+#: ../addressbook/gui/widgets/eab-gui-util.c:336
 msgid "Overwrite"
 msgstr "覆寫"
 
 #. more than one, finding the total number of contacts might
 #. * hit performance while saving large number of contacts
 #.
-#: ../addressbook/gui/widgets/eab-gui-util.c:375
-#: ../addressbook/gui/widgets/eab-gui-util.c:378
+#: ../addressbook/gui/widgets/eab-gui-util.c:379
+#: ../addressbook/gui/widgets/eab-gui-util.c:382
 msgid "contact"
 msgid_plural "contacts"
 msgstr[0] "個連絡人"
 msgstr[1] "個連絡人"
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:426
+#: ../addressbook/gui/widgets/eab-gui-util.c:428
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:463
+#: ../addressbook/gui/widgets/eab-gui-util.c:465
 msgid "Select Address Book"
 msgstr "選擇通訊錄"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:604
+#: ../addressbook/gui/widgets/eab-gui-util.c:579
 msgid "list"
 msgstr "清單"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:768
+#: ../addressbook/gui/widgets/eab-gui-util.c:731
 msgid "Move contact to"
 msgstr "將連絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:770
+#: ../addressbook/gui/widgets/eab-gui-util.c:733
 msgid "Copy contact to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:773
+#: ../addressbook/gui/widgets/eab-gui-util.c:736
 msgid "Move contacts to"
 msgstr "將連絡人移到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:775
+#: ../addressbook/gui/widgets/eab-gui-util.c:738
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1001
-msgid "Multiple VCards"
-msgstr "多重 VCard"
+#: ../addressbook/gui/widgets/eab-gui-util.c:983
+msgid "Multiple vCards"
+msgstr "多重 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1004
+#: ../addressbook/gui/widgets/eab-gui-util.c:986
 #, c-format
-msgid "VCard for %s"
-msgstr "給 %s 的 VCard"
+msgid "vCard for %s"
+msgstr "%s 的 vCard"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1045
-#: ../addressbook/gui/widgets/eab-gui-util.c:1063
+#: ../addressbook/gui/widgets/eab-gui-util.c:1027
+#: ../addressbook/gui/widgets/eab-gui-util.c:1052
+#, c-format
 msgid "Contact information"
 msgstr "連絡人資訊"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:1065
+#: ../addressbook/gui/widgets/eab-gui-util.c:1054
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
@@ -3700,23 +3693,23 @@ msgstr "%s 的連絡人資訊"
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:139
+#: ../addressbook/gui/widgets/eab-vcard-control.c:143
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "和另外 1 個連絡人。"
 msgstr[1] "和另外 %d 個連絡人。"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:223
-#: ../addressbook/gui/widgets/eab-vcard-control.c:272
-msgid "Show Full VCard"
-msgstr "顯示完整的 VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:228
+#: ../addressbook/gui/widgets/eab-vcard-control.c:279
+msgid "Show Full vCard"
+msgstr "顯示完整的 vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "顯示精簡的 VCard"
+#: ../addressbook/gui/widgets/eab-vcard-control.c:232
+msgid "Show Compact vCard"
+msgstr "顯示精簡的 vCard"
 
-#: ../addressbook/gui/widgets/eab-vcard-control.c:277
+#: ../addressbook/gui/widgets/eab-vcard-control.c:284
 msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
@@ -3724,17 +3717,11 @@ msgstr "存入目錄服務"
 msgid "Card View"
 msgstr "名片檢視模式"
 
-#: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
-msgid "GTK Tree View"
-msgstr "GTK 樹狀檢視模式"
-
 #: ../addressbook/importers/evolution-csv-importer.c:624
-#: ../addressbook/importers/evolution-ldif-importer.c:583
+#: ../addressbook/importers/evolution-ldif-importer.c:499
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../mail/importers/evolution-outlook-importer.c:264
-#: ../mail/importers/netscape-importer.c:1252 ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing..."
 msgstr "匯入..."
 
@@ -3762,38 +3749,21 @@ msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:754
+#: ../addressbook/importers/evolution-ldif-importer.c:666
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP 資料交換格式 (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:755
+#: ../addressbook/importers/evolution-ldif-importer.c:667
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:547
-msgid "VCard (.vcf, .gcrd)"
-msgstr "VCard (.vcf、.gcrd)"
+msgid "vCard (.vcf, .gcrd)"
+msgstr "vCard (.vcf、.gcrd)"
 
 #: ../addressbook/importers/evolution-vcard-importer.c:548
-msgid "Evolution VCard Importer"
-msgstr "Evolution VCard 輸入器"
-
-# zh_HK: msgstr "打印信封"
-#: ../addressbook/printing/e-contact-print-envelope.c:213
-#: ../addressbook/printing/e-contact-print-envelope.c:234
-msgid "Print envelope"
-msgstr "列印信封"
-
-# zh_HK: msgstr "打印連絡人"
-#: ../addressbook/printing/e-contact-print.c:856
-msgid "Print contacts"
-msgstr "列印連絡人"
-
-# zh_HK: msgstr "打印連絡人"
-#: ../addressbook/printing/e-contact-print.c:882
-#: ../addressbook/printing/e-contact-print.c:909
-msgid "Print contact"
-msgstr "列印連絡人"
+msgid "Evolution vCard Importer"
+msgstr "Evolution vCard 匯入程式"
 
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -3836,12 +3806,12 @@ msgid "Format"
 msgstr "格式"
 
 #: ../addressbook/printing/e-contact-print.glade.h:11
-#: ../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:651
-#: ../widgets/table/e-table-field-chooser.c:91
-#: ../widgets/table/e-table-header-item.c:1895
-#: ../widgets/table/e-table-selection-model.c:318
+#: ../mail/em-mailer-prefs.c:447 ../widgets/table/e-table-click-to-add.c:503
+#: ../widgets/table/e-table-field-chooser-dialog.c:81
+#: ../widgets/table/e-table-field-chooser-item.c:648
+#: ../widgets/table/e-table-field-chooser.c:81
+#: ../widgets/table/e-table-header-item.c:1907
+#: ../widgets/table/e-table-selection-model.c:310
 msgid "Header"
 msgstr "頁首"
 
@@ -3894,7 +3864,6 @@ msgid "Options"
 msgstr "選項"
 
 #: ../addressbook/printing/e-contact-print.glade.h:24
-#: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "紙張方向"
 
@@ -3946,9 +3915,9 @@ msgstr "網底"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:956
+#: ../plugins/exchange-operations/exchange-account-setup.c:981
 #: ../plugins/exchange-operations/exchange-calendar.c:231
-#: ../plugins/exchange-operations/exchange-contacts.c:218
+#: ../plugins/exchange-operations/exchange-contacts.c:217
 msgid "Size:"
 msgstr "大小:"
 
@@ -3965,7 +3934,7 @@ msgid "Top:"
 msgstr "上:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:40
-#: ../calendar/gui/dialogs/calendar-setup.c:176
+#: ../calendar/gui/dialogs/calendar-setup.c:156
 msgid "Type:"
 msgstr "類型:"
 
@@ -3983,7 +3952,7 @@ msgid "Contact Print Style Editor Test"
 msgstr "連絡人列印樣式編輯器測試"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
-#: ../addressbook/printing/test-print.c:53
+#: ../addressbook/printing/test-print.c:44
 msgid "Copyright (C) 2000, Ximian, Inc."
 msgstr "版權所有 (C) 2000, Ximian, Inc."
 
@@ -3993,17 +3962,17 @@ msgid "This should test the contact print style editor widget"
 msgstr "這可以測試連絡人列印樣式編輯器工具"
 
 # zh_HK: msgstr "連絡人打印測試"
-#: ../addressbook/printing/test-print.c:52
+#: ../addressbook/printing/test-print.c:43
 msgid "Contact Print Test"
 msgstr "連絡人列印測試"
 
 # zh_HK: msgstr "這可以測試連絡人打印代碼"
-#: ../addressbook/printing/test-print.c:55
+#: ../addressbook/printing/test-print.c:46
 msgid "This should test the contact print code"
 msgstr "這可以測試連絡人列印代碼"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:668
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:704
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "無法開啟檔案"
@@ -4016,72 +3985,61 @@ msgstr "無法取得通訊錄清單"
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:56
+#: ../addressbook/tools/evolution-addressbook-export.c:49
 msgid "Specify the output file instead of standard output"
 msgstr "指定輸出檔案而不是標準輸出"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:57
+#: ../addressbook/tools/evolution-addressbook-export.c:50
 msgid "OUTPUTFILE"
 msgstr "輸出檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:53
 msgid "List local addressbook folders"
 msgstr "列出本地通訊錄資料夾"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:56
 msgid "Show cards as vcard or csv file"
 msgstr "將名片顯示成 vcard 或 csv 檔案"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:57
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:61
+#: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Export in asynchronous mode"
 msgstr "在非同步模式匯出"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
-"The number of cards in one output file in asychronous mode, default size 100."
+"The number of cards in one output file in asynchronous mode, default size "
+"100."
 msgstr "非同步模式下，一個輸出檔案中的名片數目，預設大小是 100。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "NUMBER"
 msgstr "數目"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:91
+#: ../addressbook/tools/evolution-addressbook-export.c:102
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help 選項來查看用法。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:105
+#: ../addressbook/tools/evolution-addressbook-export.c:116
 msgid "Only support csv or vcard format."
 msgstr "僅支援 csv 或 vcard 格式。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:114
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "In async mode, output must be file."
 msgstr "在非同步模式下，輸出必須是檔案。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:122
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid "In normal mode, there is no need for the size option."
 msgstr "在一般模式下，不需要大小選項。"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:153
+#: ../addressbook/tools/evolution-addressbook-export.c:164
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
-#: ../addressbook/tools/evolution-addressbook-import.c:46
-msgid "Error loading default addressbook."
-msgstr "載入預設目錄服務時發生錯誤"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:67
-msgid "Input File"
-msgstr "輸入檔案"
-
-#: ../addressbook/tools/evolution-addressbook-import.c:82
-msgid "No filename provided."
-msgstr "沒有提供檔案名稱。"
-
 #: ../calendar/calendar.error.xml.h:1
 msgid ""
 "Adding a meaningful summary to your appointment will give your recipients an "
@@ -4095,15 +4053,12 @@ msgid ""
 msgstr "新增有意義的摘要到您的工作可以讓收件者知道您的工作和什麼事有關。"
 
 #: ../calendar/calendar.error.xml.h:3
-msgid ""
-"All information in these journal entries will be deleted and can not be "
-"restored."
-msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
+msgid "All information in these memos will be deleted and can not be restored."
+msgstr "會刪除這些備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:4
-msgid ""
-"All information in this journal will be deleted and can not be restored."
-msgstr "會刪除此日誌的所有資訊而且無法復原。"
+msgid "All information in this memo will be deleted and can not be restored."
+msgstr "會刪除此備忘錄中的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:5
 msgid ""
@@ -4122,15 +4077,13 @@ msgstr "會刪除此約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:8
 msgid ""
-"All information on this journal entry will be deleted and can not be "
-"restored."
-msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
-
-#: ../calendar/calendar.error.xml.h:9
-msgid ""
 "All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
+#: ../calendar/calendar.error.xml.h:9
+msgid "All information on this memo will be deleted and can not be restored."
+msgstr "會刪除此備忘錄上的所有資訊而且無法復原。"
+
 #: ../calendar/calendar.error.xml.h:10
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
@@ -4144,16 +4097,16 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "確定要刪除標題為 '{0}' 的約會？"
 
 #: ../calendar/calendar.error.xml.h:13
-msgid "Are you sure you want to delete the journal entry '{0}'?"
-msgstr "確定要刪除日誌項目 '{0}'？"
+msgid "Are you sure you want to delete the memo '{0}'?"
+msgstr "確定要刪除備忘錄 '{0}'？"
 
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "確定要刪除這 {0} 約會？"
 
 #: ../calendar/calendar.error.xml.h:15
-msgid "Are you sure you want to delete these {0} journal entries?"
-msgstr "確定要刪除這 {0} 日誌項目？"
+msgid "Are you sure you want to delete these {0} memos?"
+msgstr "確定要刪除這 {0} 個備忘錄？"
 
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
@@ -4164,89 +4117,90 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "確定要刪除此約會？"
 
 #: ../calendar/calendar.error.xml.h:18
-#: ../calendar/gui/dialogs/delete-comp.c:189
-msgid "Are you sure you want to delete this journal entry?"
-msgstr "確定要刪除此日誌項目？"
-
-#: ../calendar/calendar.error.xml.h:19
 #: ../calendar/gui/dialogs/delete-comp.c:183
+#, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議？"
 
+#: ../calendar/calendar.error.xml.h:19
+#: ../calendar/gui/dialogs/delete-comp.c:189
+#, c-format
+msgid "Are you sure you want to delete this memo?"
+msgstr "確定要刪除此備忘錄？"
+
 #: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:186
+#, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作？"
 
 #: ../calendar/calendar.error.xml.h:21
+msgid "Are you sure you want to save the memo without a summary?"
+msgstr "確定要儲存沒有摘要的備忘錄？"
+
+#: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "您確定要傳送沒有摘要的約會？"
 
-#: ../calendar/calendar.error.xml.h:22
+#: ../calendar/calendar.error.xml.h:23
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "您確定要傳送沒有摘要的工作？"
 
-#: ../calendar/calendar.error.xml.h:23
+#: ../calendar/calendar.error.xml.h:24
 msgid "Cannot create a new event"
 msgstr "不能建立新的事件"
 
-#: ../calendar/calendar.error.xml.h:24
+#: ../calendar/calendar.error.xml.h:25
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」？"
 
-#: ../calendar/calendar.error.xml.h:25
+#: ../calendar/calendar.error.xml.h:26
 msgid "Delete memo list '{0}'?"
 msgstr "刪除備忘錄清單「{0}」？"
 
-#: ../calendar/calendar.error.xml.h:26
+#: ../calendar/calendar.error.xml.h:27
 msgid "Delete task list '{0}'?"
 msgstr "刪除工作清單「{0}」？"
 
-#: ../calendar/calendar.error.xml.h:27
+#: ../calendar/calendar.error.xml.h:28
 msgid "Do _not Send"
 msgstr "不要傳送(_N)"
 
-#: ../calendar/calendar.error.xml.h:28
+#: ../calendar/calendar.error.xml.h:29
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下載尚在進行中。您是否要儲存此約會？"
 
-#: ../calendar/calendar.error.xml.h:29
+#: ../calendar/calendar.error.xml.h:30
 msgid "Download in progress. Do you want to save the task?"
 msgstr "下載尚在進行中。您是否要儲存此工作？"
 
-#: ../calendar/calendar.error.xml.h:30
+#: ../calendar/calendar.error.xml.h:31
 msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
-#: ../calendar/calendar.error.xml.h:31
+#: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
 msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此工作。"
 
-#: ../calendar/calendar.error.xml.h:32
+#: ../calendar/calendar.error.xml.h:33
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
-#: ../calendar/calendar.error.xml.h:33
+#: ../calendar/calendar.error.xml.h:34
 msgid "Error loading calendar"
 msgstr "載入行事曆時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:34
+#: ../calendar/calendar.error.xml.h:35
 msgid "Error loading memo list"
 msgstr "載入備忘錄清單時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:35
+#: ../calendar/calendar.error.xml.h:36
 msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
-#: ../calendar/calendar.error.xml.h:36
-msgid ""
-"If you do not send a cancelation notice, the other participants may not know "
-"the journal has been deleted."
-msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
-
 #: ../calendar/calendar.error.xml.h:37
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
@@ -4256,110 +4210,116 @@ msgstr "如果不傳送取消通知，其他參與者可能不知道會議已經
 #: ../calendar/calendar.error.xml.h:38
 msgid ""
 "If you do not send a cancelation notice, the other participants may not know "
+"the memo has been deleted."
+msgstr "如果未傳送取消通知，其他參與者可能不知道該備忘錄已經刪除。"
+
+#: ../calendar/calendar.error.xml.h:39
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
 "the task has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道工作已經刪除。"
 
-#: ../calendar/calendar.error.xml.h:39
+#: ../calendar/calendar.error.xml.h:40
 msgid ""
 "Sending updated information allows other participants to keep their "
 "calendars up to date."
 msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
-#: ../calendar/calendar.error.xml.h:40
+#: ../calendar/calendar.error.xml.h:41
 msgid ""
 "Sending updated information allows other participants to keep their task "
 "lists up to date."
 msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
 
-#: ../calendar/calendar.error.xml.h:41
+#: ../calendar/calendar.error.xml.h:42
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr "這裡有一些需要下載的附件。儲存此約會將會失去這些附件。"
 
-#: ../calendar/calendar.error.xml.h:42
+#: ../calendar/calendar.error.xml.h:43
 msgid ""
 "Some attachments are being downloaded. Saving the task would result in the "
 "loss of these attachments."
 msgstr "這裡有一些需要下載的附件。儲存此工作將會失去這些附件。"
 
-#: ../calendar/calendar.error.xml.h:43
+#: ../calendar/calendar.error.xml.h:44
 msgid "Some features may not work properly with your current server."
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作。"
 
-#: ../calendar/calendar.error.xml.h:44
+#: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 行事曆已經意外結束。"
 
-#: ../calendar/calendar.error.xml.h:45
+#: ../calendar/calendar.error.xml.h:46
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 備忘錄已經意外結束。"
 
-#: ../calendar/calendar.error.xml.h:46
+#: ../calendar/calendar.error.xml.h:47
 msgid "The Evolution tasks have quit unexpectedly."
 msgstr "Evolution 工作已經意外結束。"
 
-#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/calendar.error.xml.h:48
 msgid "The calendar is not marked for offline usage."
 msgstr "此行事曆尚未標記為離線使用。"
 
-#: ../calendar/calendar.error.xml.h:48
+#: ../calendar/calendar.error.xml.h:49
 msgid "The memo list is not marked for offline usage"
 msgstr "此備忘錄清單尚未標記為離線使用"
 
-#: ../calendar/calendar.error.xml.h:49
+#: ../calendar/calendar.error.xml.h:50
 msgid "The task list is not marked for offline usage."
 msgstr "此工作清單尚未標記為離線使用。"
 
-#: ../calendar/calendar.error.xml.h:50
+#: ../calendar/calendar.error.xml.h:51
 msgid "This calendar will be removed permanently."
 msgstr "這個行事曆將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:51
+#: ../calendar/calendar.error.xml.h:52
 msgid "This memo list will be removed permanently."
 msgstr "這個備忘錄清單將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:52
+#: ../calendar/calendar.error.xml.h:53
 msgid "This task list will be removed permanently."
 msgstr "這項工作清單將會被永遠移除。"
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的變更？"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this memo?"
 msgstr "要儲存對此備忘錄所做的變更？"
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的變更？"
 
-#: ../calendar/calendar.error.xml.h:56
-msgid "Would you like to send a cancelation notice for this journal entry?"
-msgstr "要傳送此日誌項目的取消通知？"
-
 #: ../calendar/calendar.error.xml.h:57
+msgid "Would you like to send a cancelation notice for this memo?"
+msgstr "是否要傳送此備忘錄的取消通知？"
+
+#: ../calendar/calendar.error.xml.h:58
 msgid "Would you like to send all the participants a cancelation notice?"
 msgstr "要傳送取消通知給所有的參與者？"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:59
 msgid "Would you like to send meeting invitations to participants?"
 msgstr "要傳送會議邀請給參與者？"
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:60
 msgid "Would you like to send this task to participants?"
 msgstr "要傳送此工作給參與者？"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:61
 msgid "Would you like to send updated meeting information to participants?"
 msgstr "要傳送會議更新資訊給參與者？"
 
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:62
 msgid "Would you like to send updated task information to participants?"
 msgstr "要傳送更新的工作資訊給參與者？"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You are connecting to an unsupported GroupWise server and may encounter "
 "problems using Evolution. For best results, the server should be upgraded to "
@@ -4368,7 +4328,7 @@ msgstr ""
 "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
 "解決方案是將該伺服器升級至支援的版本。"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
@@ -4376,111 +4336,113 @@ msgstr ""
 "您選擇了一個唯讀的行事曆來源。請切換到行事曆檢視並選取一個能加入約會的行事"
 "曆。"
 
-#: ../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:67
+#: ../calendar/calendar.error.xml.h:68
 msgid "Your calendars will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用您的行事曆。"
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:69
 msgid "Your memos will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用您的備忘錄。"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:70
 msgid "Your tasks will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用您的工作。"
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:71
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
-#: ../calendar/calendar.error.xml.h:71 ../ui/evolution-editor.xml.h:23
-#: ../ui/evolution-message-composer.xml.h:54
+#: ../calendar/calendar.error.xml.h:72 ../ui/evolution-editor.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:59
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:73
 msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
-#: ../calendar/calendar.error.xml.h:73
-#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:74
+#: ../composer/mail-composer.error.xml.h:33 ../mail/mail.error.xml.h:142
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:75
 msgid "_Send Notice"
 msgstr "傳送通知(_S)"
 
-#: ../calendar/calendar.error.xml.h:75
+#: ../calendar/calendar.error.xml.h:76
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:50
+#: ../plugins/publish-calendar/publish-calendar.c:93
 #: ../smime/gui/component.c:50
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:255
+#: ../calendar/conduits/calendar/calendar-conduit.c:254
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1506
-#: ../calendar/conduits/calendar/calendar-conduit.c:1507
-#: ../calendar/conduits/memo/memo-conduit.c:932
-#: ../calendar/conduits/memo/memo-conduit.c:933
-#: ../calendar/conduits/todo/todo-conduit.c:1108
-#: ../calendar/conduits/todo/todo-conduit.c:1109
+#: ../calendar/conduits/calendar/calendar-conduit.c:1515
+#: ../calendar/conduits/calendar/calendar-conduit.c:1516
+#: ../calendar/conduits/memo/memo-conduit.c:816
+#: ../calendar/conduits/memo/memo-conduit.c:817
+#: ../calendar/conduits/todo/todo-conduit.c:1014
+#: ../calendar/conduits/todo/todo-conduit.c:1015
 msgid "Could not start evolution-data-server"
 msgstr "無法啟動 Evolution 資料伺服器"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1614
-#: ../calendar/conduits/calendar/calendar-conduit.c:1617
+#: ../calendar/conduits/calendar/calendar-conduit.c:1623
+#: ../calendar/conduits/calendar/calendar-conduit.c:1626
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1026
-#: ../calendar/conduits/memo/memo-conduit.c:1029
+#: ../calendar/conduits/memo/memo-conduit.c:910
+#: ../calendar/conduits/memo/memo-conduit.c:913
 msgid "Could not read pilot's Memo application block"
 msgstr "無法讀取 pilot 備忘錄程式區塊"
 
-#: ../calendar/conduits/memo/memo-conduit.c:1073
-#: ../calendar/conduits/memo/memo-conduit.c:1076
+#: ../calendar/conduits/memo/memo-conduit.c:957
+#: ../calendar/conduits/memo/memo-conduit.c:960
 msgid "Could not write pilot's Memo application block"
 msgstr "無法寫入 pilot 備忘錄程式區塊"
 
-#: ../calendar/conduits/todo/todo-conduit.c:239
+#: ../calendar/conduits/todo/todo-conduit.c:238
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1192
-#: ../calendar/conduits/todo/todo-conduit.c:1195
+#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1101
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1237
-#: ../calendar/conduits/todo/todo-conduit.c:1240
+#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1146
 msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#: ../plugins/itip-formatter/itip-formatter.c:2078
+#: ../plugins/itip-formatter/itip-formatter.c:2309
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: ../calendar/gui/calendar-component.c:1361
+#: ../calendar/gui/calendar-component.c:1392
 msgid "Calendars"
 msgstr "行事曆"
 
@@ -4521,22 +4483,25 @@ msgid "Memo_s"
 msgstr "備忘錄(_S)"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memo-table.c:323 ../calendar/gui/e-memos.c:1084
-#: ../calendar/gui/gnome-cal.c:1637 ../calendar/gui/memos-component.c:531
-#: ../calendar/gui/memos-component.c:1008 ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memo-table.c:280 ../calendar/gui/e-memos.c:1151
+#: ../calendar/gui/gnome-cal.c:1701 ../calendar/gui/memos-component.c:548
+#: ../calendar/gui/memos-component.c:1101 ../calendar/gui/memos-control.c:356
+#: ../calendar/gui/memos-control.c:372
 msgid "Memos"
 msgstr "備忘錄"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-calendar-table.c:526 ../calendar/gui/e-tasks.c:1348
-#: ../calendar/gui/gnome-cal.c:1509 ../calendar/gui/print.c:1949
-#: ../calendar/gui/tasks-component.c:522
-#: ../calendar/gui/tasks-component.c:1013 ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/e-tasks.c:1435
+#: ../calendar/gui/gnome-cal.c:1573 ../calendar/gui/print.c:1966
+#: ../calendar/gui/tasks-component.c:539
+#: ../calendar/gui/tasks-component.c:1090 ../calendar/gui/tasks-control.c:495
+#: ../calendar/gui/tasks-control.c:511
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
-#: ../plugins/exchange-operations/exchange-folder.c:581
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:403
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:547
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:401
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:545
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:12
 msgid "Tasks"
 msgstr "工作"
@@ -4554,19 +4519,19 @@ msgstr "工作(_T)"
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:112
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "分鐘"
 msgstr[1] "分鐘"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:127
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 #: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
-#: ../plugins/calendar-http/calendar-http.c:287
-#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/calendar-http/calendar-http.c:289
+#: ../plugins/calendar-weather/calendar-weather.c:562
+#: ../plugins/google-account-setup/google-source.c:396
 msgid "hours"
 msgid_plural "hours"
 msgstr[0] "小時"
@@ -4583,10 +4548,10 @@ msgstr "約會"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1619
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1625
-#: ../calendar/gui/e-itip-control.c:1145
-#: ../plugins/itip-formatter/itip-view.c:936
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1611
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1617
+#: ../calendar/gui/e-itip-control.c:1155
+#: ../plugins/itip-formatter/itip-view.c:1004
 msgid "Location:"
 msgstr "位置:"
 
@@ -4596,16 +4561,16 @@ msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:10
-#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:160
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:158
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:21
 #: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:41
 #: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:18
 #: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
-#: ../ui/evolution-message-composer.xml.h:47
+#: ../ui/evolution-message-composer.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:24
 #: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:41 ../widgets/menus/gal-define-views.glade.h:5
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4617,17 +4582,17 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1601
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1470
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1593
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1464
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1466
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1479
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1481
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1474
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1489
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
@@ -4636,12 +4601,13 @@ msgstr "沒有可用的地點資訊。"
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1703
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1731
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1695
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1723
+#: ../mail/mail-component.c:1517
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1707
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4653,7 +4619,7 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1737
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1729
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4670,7 +4636,7 @@ msgstr ""
 "\n"
 "您確定要執行這個程式？"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1751
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1743
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -4679,8 +4645,10 @@ msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
 #: ../calendar/gui/alarm-notify/notify-main.c:153
-msgid "Could not create the alarm notify service factory"
-msgstr "無法建立聲音提醒服務元件工廠"
+msgid ""
+"Could not create the alarm notify service factory, maybe it's already "
+"running..."
+msgstr "無法建立聲音提醒服務元件工廠，也許它已經在執行中..."
 
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
@@ -4715,262 +4683,262 @@ msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:1
 msgid "Alarm programs"
 msgstr "鬧鈴程式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:2
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:2
 msgid "Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:3
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:3
 msgid "Background color of tasks that are due today, in \"#rrggbb\" format."
 msgstr "今天到期的工作背景色彩，使用 \"#rrggbb\" 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:4
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:4
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "過期工作的背景色彩，使用 \"#rrggbb\" 格式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:6
 msgid ""
 "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用預設值)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:7
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日檢視中用來繪製 Marcus Bains 線的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:8
 msgid "Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:9
 msgid "Confirm expunge"
 msgstr "清空時確認"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:10
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:10
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "必須指明工作日開始與結束於幾時。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:11
 msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:12
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:13
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:13
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:14
 msgid "Directory for saving alarm audio files"
 msgstr "用來存放鬧鈴音效檔的目錄"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:15
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:15
 msgid "Event Gradient"
 msgstr "事件漸層效果"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:16
 msgid "Event Transparency"
 msgstr "事件透明效果"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:17
 msgid "Free/busy server URLs"
 msgstr "空閒/忙碌伺服器網址"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:18
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:18
 msgid "Free/busy template URL"
 msgstr "空閒/忙碌範本網址"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:19
 msgid "Gradient of the events in calendar views."
 msgstr "行事曆檢視中的事件漸層效果。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:20
 msgid "Hide completed tasks"
 msgstr "隱藏已完成的工作"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:21
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:21
 msgid "Hide task units"
 msgstr "隱藏工作單位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:22
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:22
 msgid "Hide task value"
 msgstr "隱藏工作數值"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:23
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:23
 msgid "Horizontal pane position"
 msgstr "水平窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:24
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:24
 msgid "Hour the workday ends on, in twenty four hour format, 0 to 23."
 msgstr "工作日結束於幾點，以 24 小時格式，0 至 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:25
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:25
 msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgstr "工作日開始於幾點，以 24 小時格式，0 至 23。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:26
 msgid "Intervals shown in Day and Work Week views, in minutes."
 msgstr "在「日」和「工作週」檢視中顯示間隔，以分鐘計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:27
 msgid "Last alarm time"
 msgstr "上次鬧鈴時刻"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:28
 msgid "List of server URLs for free/busy publishing."
 msgstr "用於空閒/忙碌發佈的伺服器 URL 清單。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:29
 msgid "Marcus Bains Line"
 msgstr "Marcus Bains 線"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:30
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Marcus Bains 線色彩─日檢視"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:31
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Marcus Bains 線色彩─時刻列"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:32
 msgid "Minute the workday ends on, 0 to 59."
 msgstr "工作日結束分鐘，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:33
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:33
 msgid "Minute the workday starts on, 0 to 59."
 msgstr "工作日開始分鐘，0 到 59。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:34
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:34
 msgid "Month view horizontal pane position"
 msgstr "月檢視的水平窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:35
 msgid "Month view vertical pane position"
 msgstr "月檢視的垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:36
 msgid "Number of units for determining a default reminder."
 msgstr "決定預設提醒的單位數目。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:37
 msgid "Number of units for determining when to hide tasks."
 msgstr "決定何時隱藏工作的單位數目。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:38
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:39
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
 msgstr ""
 "水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:40
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:41
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:41
 msgid ""
 "Position of the vertical pane, between the calendar lists and the date "
 "navigator calendar."
 msgstr "垂直窗格的位置，在行事曆清單與日期導覽行事曆之間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:42
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:42
 msgid ""
 "Position of the vertical pane, between the task list and the task preview "
 "pane, in pixels."
 msgstr "垂直窗格的位置，在工作清單與工作預覽窗格之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:43
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
 msgstr ""
 "垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:44
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list when not in the month view, in pixels."
 msgstr ""
 "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:45
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:45
 msgid "Programs that are allowed to be run by alarms."
 msgstr "用來做為鬧鈴而執行的程式。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:46
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:46
 msgid "Save directory for alarm audio"
 msgstr "儲存鬧鈴音效檔目錄"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:47
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:48
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:48
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:49
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:49
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:50
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:50
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "在事件/會議/工作編輯器中顯示 分類 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:51
 msgid "Show display alarms in notification tray"
-msgstr "在通知匣中顯示鬧鈴畫面"
+msgstr "在通知區中顯示鬧鈴畫面"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:52
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:52
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:53
-#: ../mail/evolution-mail.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:109
 msgid "Show the \"Preview\" pane"
 msgstr "顯示「預覽」窗格"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:54
-#: ../mail/evolution-mail.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:110
 msgid "Show the \"Preview\" pane."
 msgstr "顯示「預覽」窗格。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:55
 msgid "Show timezone field in the event/meeting editor"
 msgstr "在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:56
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:57
 msgid "Show week numbers in date navigator"
 msgstr "在日期導覽顯示週數"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:58
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:58
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:59
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:59
 msgid "Tasks vertical pane position"
 msgstr "工作垂直窗格位置"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:61
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -4979,7 +4947,7 @@ msgstr ""
 "作為空閒/忙碌資料回饋之用的網址範本，%u 要以電子郵件位址的使用者名稱部分來取"
 "代，而 %d 要替換為網域名稱。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:62
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olsen timezone database location like \"America/New York\"."
@@ -4987,176 +4955,204 @@ msgstr ""
 "用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
 "\"America/New York\"。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:63
 msgid "Time divisions"
 msgstr "時間分隔"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:64
 msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
-#: ../plugins/startup-wizard/startup-wizard.c:110
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:65
+#: ../plugins/startup-wizard/startup-wizard.c:108
 msgid "Timezone"
 msgstr "時區"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:66
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:66
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
 msgstr ""
 "行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:67
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:67
 msgid "Twenty four hour time format"
 msgstr "24 小時制格式"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:68
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "預設提醒單位，「分鐘」、「小時」或「日」。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:69
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱藏工作的單位，「分鐘」、「小時」或「日」。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:71
 msgid "Week start"
 msgstr "一週開始於"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:72
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:72
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)."
 msgstr "每週的開始，從星期日 (0) 到星期六 (6)。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:73
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:73
 msgid "Whether or not to use the notification tray for display alarms."
-msgstr "是否使用通知匣顯示鬧鈴。"
+msgstr "是否使用通知區顯示鬧鈴。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:74
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:74
 msgid "Whether to ask for confirmation when deleting an appointment or task."
 msgstr "刪除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:75
 msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是否要求確認。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:76
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:76
 msgid ""
 "Whether to compress weekends in the month view, which puts Saturday and "
 "Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:77
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:78
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在行事曆中繪出 Marcus Bains 線（代表目前時刻的直線）。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:79
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在工作檢視中隱藏完成的工作。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:80
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否設定約會的預設提醒。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:81
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:82
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:83
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:83
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:84
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:85
 msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是否使用 24 小時制時間而不是使用上午/下午。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:86
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:87
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:87
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:88
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:88
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期導覽中顯示週數。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:89
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:89
 msgid "Whether to use daylight savings time while displaying events."
 msgstr "顯示事件時是否使用日光節約時間。"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:90
 msgid "Work days"
 msgstr "工作日"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:91
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:91
 msgid "Workday end hour"
 msgstr "工作日結束小時"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:92
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:92
 msgid "Workday end minute"
 msgstr "工作日結束分鐘"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:93
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:93
 msgid "Workday start hour"
 msgstr "工作日開始小時"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:94
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:94
 msgid "Workday start minute"
 msgstr "工作日開始分鐘"
 
-#: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:95
+#: ../calendar/gui/apps_evolution_calendar.schemas.in.h:95
 msgid "daylight savings time"
 msgstr "日光節約時間"
 
-#: ../calendar/gui/cal-search-bar.c:55
+#: ../calendar/gui/cal-search-bar.c:73
 msgid "Summary contains"
 msgstr "主旨包含"
 
-#: ../calendar/gui/cal-search-bar.c:56
+#: ../calendar/gui/cal-search-bar.c:74
 msgid "Description contains"
 msgstr "描述包含"
 
-#: ../calendar/gui/cal-search-bar.c:57
+#: ../calendar/gui/cal-search-bar.c:75
 msgid "Category is"
 msgstr "分類為"
 
-#: ../calendar/gui/cal-search-bar.c:58
+#: ../calendar/gui/cal-search-bar.c:76
 msgid "Comment contains"
 msgstr "備註包含"
 
-#: ../calendar/gui/cal-search-bar.c:59
+#: ../calendar/gui/cal-search-bar.c:77
 msgid "Location contains"
 msgstr "位置包含"
 
-#: ../calendar/gui/cal-search-bar.c:432
+#: ../calendar/gui/cal-search-bar.c:623 ../calendar/gui/cal-search-bar.c:666
+#: ../calendar/gui/cal-search-bar.c:685
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
+#: ../calendar/gui/cal-search-bar.c:631
+msgid "Next 7 Days' Tasks"
+msgstr "未來 7 天的工作"
+
+#: ../calendar/gui/cal-search-bar.c:635
+msgid "Active Tasks"
+msgstr "進行中的工作"
+
+#: ../calendar/gui/cal-search-bar.c:639
+msgid "Overdue Tasks"
+msgstr "過期的工作"
+
+#: ../calendar/gui/cal-search-bar.c:643
+msgid "Completed Tasks"
+msgstr "已完成的工作 "
+
+#: ../calendar/gui/cal-search-bar.c:647
+msgid "Tasks with Attachments"
+msgstr "有附加檔案的工作"
+
+#: ../calendar/gui/cal-search-bar.c:693
+msgid "Active Appointments"
+msgstr "進行中的約會"
+
+#: ../calendar/gui/cal-search-bar.c:697
+msgid "Next 7 Days' Appointments"
+msgstr "未來 7 天的約會(_P)"
+
 # zh_HK: msgstr "打印"
-#: ../calendar/gui/calendar-commands.c:119
-#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:20
-#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:11
-#: ../ui/evolution-tasks.xml.h:14
+#: ../calendar/gui/calendar-commands.c:99 ../ui/evolution-addressbook.xml.h:26
+#: ../ui/evolution-calendar.xml.h:20 ../ui/evolution-mail-message.xml.h:75
+#: ../ui/evolution-memos.xml.h:11 ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "列印"
 
-#: ../calendar/gui/calendar-commands.c:348
+#: ../calendar/gui/calendar-commands.c:324
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -5164,15 +5160,15 @@ msgid ""
 msgstr ""
 "此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
-#: ../calendar/gui/calendar-commands.c:354
+#: ../calendar/gui/calendar-commands.c:330
 msgid "Purge events older than"
 msgstr "清除早於這段時間的事件"
 
-#: ../calendar/gui/calendar-commands.c:359
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:11
-#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
-#: ../plugins/calendar-weather/calendar-weather.c:565
+#: ../calendar/gui/calendar-commands.c:335
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21 ../filter/filter.glade.h:14
+#: ../plugins/calendar-http/calendar-http.c:290
+#: ../plugins/calendar-weather/calendar-weather.c:563
+#: ../plugins/google-account-setup/google-source.c:397
 #: ../widgets/misc/e-send-options.glade.h:38
 msgid "days"
 msgstr "天"
@@ -5181,89 +5177,103 @@ msgstr "天"
 #. Create the LDAP source group
 #. Create the Webcal source group
 #. Create the LDAP source group
-#: ../calendar/gui/calendar-component.c:260
-#: ../calendar/gui/memos-component.c:222 ../calendar/gui/migration.c:506
-#: ../calendar/gui/migration.c:599 ../calendar/gui/migration.c:1107
-#: ../calendar/gui/tasks-component.c:218
+#: ../calendar/gui/calendar-component.c:273
+#: ../calendar/gui/memos-component.c:235 ../calendar/gui/migration.c:511
+#: ../calendar/gui/migration.c:609 ../calendar/gui/migration.c:1122
+#: ../calendar/gui/tasks-component.c:231
 msgid "On The Web"
 msgstr "在網站上"
 
-#: ../calendar/gui/calendar-component.c:278 ../calendar/gui/migration.c:405
+#: ../calendar/gui/calendar-component.c:296 ../calendar/gui/migration.c:405
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
 #. Create the weather group
-#: ../calendar/gui/calendar-component.c:284
+#: ../calendar/gui/calendar-component.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:100
 msgid "Weather"
 msgstr "天氣"
 
-#: ../calendar/gui/calendar-component.c:582
+#: ../calendar/gui/calendar-component.c:605
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:899
+#: ../calendar/gui/calendar-component.c:606
+#: ../calendar/gui/memos-component.c:465 ../calendar/gui/tasks-component.c:456
+#: ../mail/em-folder-tree.c:2102
+msgid "_Copy..."
+msgstr "複製(_C)..."
+
+#: ../calendar/gui/calendar-component.c:612
+#: ../calendar/gui/dialogs/comp-editor.c:1136
+#: ../calendar/gui/memos-component.c:471 ../calendar/gui/tasks-component.c:462
+#: ../composer/e-msg-composer.c:3634 ../mail/em-folder-tree.c:2116
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:38
+msgid "_Properties"
+msgstr "屬性(_P)"
+
+#: ../calendar/gui/calendar-component.c:939
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
 
-#: ../calendar/gui/calendar-component.c:1198
+#: ../calendar/gui/calendar-component.c:1238
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1214
+#: ../calendar/gui/calendar-component.c:1254
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
-#: ../calendar/gui/calendar-component.c:1336
+#: ../calendar/gui/calendar-component.c:1367
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
 
-#: ../calendar/gui/calendar-component.c:1544
+#: ../calendar/gui/calendar-component.c:1585
 msgid "New appointment"
 msgstr "新增約會"
 
-#: ../calendar/gui/calendar-component.c:1545
+#: ../calendar/gui/calendar-component.c:1586
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-#: ../calendar/gui/calendar-component.c:1546
+#: ../calendar/gui/calendar-component.c:1587
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-#: ../calendar/gui/calendar-component.c:1552
+#: ../calendar/gui/calendar-component.c:1593
 msgid "New meeting"
 msgstr "新增會議"
 
-#: ../calendar/gui/calendar-component.c:1553
+#: ../calendar/gui/calendar-component.c:1594
 msgid "M_eeting"
 msgstr "會議(_M)"
 
-#: ../calendar/gui/calendar-component.c:1554
+#: ../calendar/gui/calendar-component.c:1595
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-#: ../calendar/gui/calendar-component.c:1560
+#: ../calendar/gui/calendar-component.c:1601
 msgid "New all day appointment"
 msgstr "新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1561
+#: ../calendar/gui/calendar-component.c:1602
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-#: ../calendar/gui/calendar-component.c:1562
+#: ../calendar/gui/calendar-component.c:1603
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-#: ../calendar/gui/calendar-component.c:1568
+#: ../calendar/gui/calendar-component.c:1609
 msgid "New calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/calendar-component.c:1569
+#: ../calendar/gui/calendar-component.c:1610
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-#: ../calendar/gui/calendar-component.c:1570
+#: ../calendar/gui/calendar-component.c:1611
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
@@ -5283,23 +5293,33 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
-#: ../calendar/gui/comp-editor-factory.c:415
+#: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
+#: ../calendar/gui/tasktypes.xml.h:2
+msgid "Description Contains"
+msgstr "描述包含"
+
+#: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
+#: ../calendar/gui/tasktypes.xml.h:3
+msgid "Summary Contains"
+msgstr "摘要包含"
+
+#: ../calendar/gui/comp-editor-factory.c:404
 msgid "Error while opening the calendar"
 msgstr "開啟行事曆時發生錯誤"
 
-#: ../calendar/gui/comp-editor-factory.c:421
+#: ../calendar/gui/comp-editor-factory.c:410
 msgid "Method not supported when opening the calendar"
 msgstr "開啟行事曆時不支援方法"
 
-#: ../calendar/gui/comp-editor-factory.c:427
+#: ../calendar/gui/comp-editor-factory.c:416
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許可權來開啟行事曆"
 
-#: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1273
+#: ../calendar/gui/comp-editor-factory.c:428 ../shell/e-shell.c:1290
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:615
+#: ../calendar/gui/dialogs/alarm-dialog.c:616
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
@@ -5347,66 +5367,70 @@ msgid "Run a program"
 msgstr "執行外部程式"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
+msgid "Select A File"
+msgstr "選取檔案"
+
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 msgid "Send To:"
 msgstr "收件者："
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
 msgstr "傳送電子郵件"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
 msgid "_Arguments:"
 msgstr "引數(_A):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
 msgid "_Program:"
 msgstr "執行程式(_P):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
 msgid "_Repeat the alarm"
 msgstr "重複鬧鈴(_R)"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "之後"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "之前"
 
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "day(s)"
 msgstr "日"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "約會結束"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:22
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "小時"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "分鐘"
 
-#: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: ../calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "約會開始"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:235
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:249
 msgid "Action/Trigger"
 msgstr "動作/觸發"
 
@@ -5421,19 +5445,16 @@ msgstr "加入(_A)"
 msgid "Alarms"
 msgstr "鬧鈴"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:97
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:116
-#: ../composer/e-msg-composer-attachment.glade.h:5
-#: ../composer/e-msg-composer-select-file.c:98
-#: ../composer/e-msg-composer-select-file.c:118
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:92
+#: ../composer/e-msg-composer-select-file.c:93
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-#: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
+#: ../calendar/gui/dialogs/cal-attachment-select-file.c:158
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.c:498
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:485
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
 
@@ -5458,7 +5479,7 @@ msgid ""
 msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
-#: ../mail/mail-config.glade.h:8
+#: ../mail/mail-config.glade.h:10
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
@@ -5497,8 +5518,8 @@ msgid "Display"
 msgstr "顯示"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1091
-#: ../calendar/gui/e-itip-control.c:730
+#: ../calendar/gui/dialogs/recurrence-page.c:1098
+#: ../calendar/gui/e-itip-control.c:740
 msgid "Friday"
 msgstr "星期五"
 
@@ -5513,8 +5534,8 @@ msgstr ""
 "日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1087
-#: ../calendar/gui/e-itip-control.c:726
+#: ../calendar/gui/dialogs/recurrence-page.c:1094
+#: ../calendar/gui/e-itip-control.c:736
 msgid "Monday"
 msgstr "星期一"
 
@@ -5537,8 +5558,7 @@ msgstr ""
 "星期日"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:4
-#: ../mail/mail-config.glade.h:107
+#: ../mail/mail-config.glade.h:109
 msgid "Pick a color"
 msgstr "選取顏色"
 
@@ -5548,8 +5568,8 @@ msgid "S_un"
 msgstr "週日(_U)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
-#: ../calendar/gui/dialogs/recurrence-page.c:1092
-#: ../calendar/gui/e-itip-control.c:731
+#: ../calendar/gui/dialogs/recurrence-page.c:1099
+#: ../calendar/gui/e-itip-control.c:741
 msgid "Saturday"
 msgstr "星期六"
 
@@ -5566,8 +5586,8 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
-#: ../calendar/gui/dialogs/recurrence-page.c:1093
-#: ../calendar/gui/e-itip-control.c:725
+#: ../calendar/gui/dialogs/recurrence-page.c:1100
+#: ../calendar/gui/e-itip-control.c:735
 msgid "Sunday"
 msgstr "星期日"
 
@@ -5585,8 +5605,8 @@ msgid "Template:"
 msgstr "樣板:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1090
-#: ../calendar/gui/e-itip-control.c:729
+#: ../calendar/gui/dialogs/recurrence-page.c:1097
+#: ../calendar/gui/e-itip-control.c:739
 msgid "Thursday"
 msgstr "星期四"
 
@@ -5600,14 +5620,14 @@ msgid "Time format:"
 msgstr "時刻格式:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
-#: ../calendar/gui/dialogs/recurrence-page.c:1088
-#: ../calendar/gui/e-itip-control.c:727
+#: ../calendar/gui/dialogs/recurrence-page.c:1095
+#: ../calendar/gui/e-itip-control.c:737
 msgid "Tuesday"
 msgstr "星期二"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
-#: ../calendar/gui/dialogs/recurrence-page.c:1089
-#: ../calendar/gui/e-itip-control.c:728
+#: ../calendar/gui/dialogs/recurrence-page.c:1096
+#: ../calendar/gui/e-itip-control.c:738
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -5685,81 +5705,46 @@ msgstr "週三(_W)"
 msgid "before every appointment"
 msgstr "前"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:288
+#: ../calendar/gui/dialogs/calendar-setup.c:272
 msgid "Cop_y calendar contents locally for offline operation"
 msgstr "複製行事曆內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:290
+#: ../calendar/gui/dialogs/calendar-setup.c:274
 msgid "Cop_y task list contents locally for offline operation"
 msgstr "複製工作清單內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:292
+#: ../calendar/gui/dialogs/calendar-setup.c:276
 msgid "Cop_y memo list contents locally for offline operation"
 msgstr "複製備忘錄清單內容至本地以便離線作業(_Y)"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:343
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:3
+#: ../calendar/gui/dialogs/calendar-setup.c:346
 msgid "C_olor:"
 msgstr "色彩(_O):"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:380
+#: ../calendar/gui/dialogs/calendar-setup.c:381
 msgid "Task List"
 msgstr "工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:391
+#: ../calendar/gui/dialogs/calendar-setup.c:392
 msgid "Memo List"
 msgstr "備忘錄清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:479
+#: ../calendar/gui/dialogs/calendar-setup.c:478
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:481
+#: ../calendar/gui/dialogs/calendar-setup.c:480
 msgid "New Calendar"
 msgstr "新行事曆"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:566
+#: ../calendar/gui/dialogs/calendar-setup.c:536
 msgid "Task List Properties"
 msgstr "工作清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.c:632
+#: ../calendar/gui/dialogs/calendar-setup.c:592
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:1
-msgid "Add Calendar"
-msgstr "新增行事曆"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Task List"
-msgstr "新增工作清單"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "_Add Calendar"
-msgstr "加入行事曆(_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:6
-msgid "_Add Task List"
-msgstr "新增工作清單(_A)"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:8
-#: ../plugins/calendar-http/calendar-http.c:271
-#: ../plugins/calendar-weather/calendar-weather.c:548
-msgid "_Refresh:"
-msgstr "重新整理(_R):"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:10
-#: ../plugins/caldav/caldav-source.c:247
-#: ../plugins/calendar-http/calendar-http.c:133
-msgid "_URL:"
-msgstr "網址(_U):"
-
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
-#: ../plugins/calendar-weather/calendar-weather.c:566
-msgid "weeks"
-msgstr "週"
-
 #: ../calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
@@ -5769,8 +5754,8 @@ msgid "This task has been deleted."
 msgstr "這項工作已刪除。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
-msgid "This journal entry has been deleted."
-msgstr "這個日誌項目已刪除。"
+msgid "This memo has been deleted."
+msgstr "這個備忘錄已刪除。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
@@ -5791,8 +5776,8 @@ msgid "This task has been changed."
 msgstr "這項工作已變更。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This journal entry has been changed."
-msgstr "這個日誌項目已變更。"
+msgid "This memo has been changed."
+msgstr "這個備忘錄已變更。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:101
 #, c-format
@@ -5804,163 +5789,154 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:515
+#: ../calendar/gui/dialogs/comp-editor-page.c:519
 #, c-format
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2392
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2338
 msgid " to "
 msgstr " 到 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2396
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2342
 msgid " (Completed "
 msgstr " (已完成) "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2398
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2344
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2403
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2349
 msgid " (Due "
 msgstr "(期限)"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2405
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2351
 msgid "Due "
 msgstr "期限 "
 
-#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2921
+#: ../calendar/gui/dialogs/comp-editor.c:209 ../composer/e-msg-composer.c:2850
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
 
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:214
-#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2926
-#: ../composer/e-msg-composer.c:3122
+#: ../calendar/gui/dialogs/comp-editor.c:393 ../composer/e-msg-composer.c:2855
+#: ../composer/e-msg-composer.c:3040
 #, c-format
 msgid "Attached message"
 msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3186
-#: ../mail/em-folder-tree.c:1003 ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:1030 ../mail/message-list.c:1923
+#: ../calendar/gui/dialogs/comp-editor.c:464 ../composer/e-msg-composer.c:3104
+#: ../mail/em-folder-tree.c:1014 ../mail/em-folder-utils.c:366
+#: ../mail/em-folder-view.c:1191 ../mail/message-list.c:2060
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3188
-#: ../mail/em-folder-tree.c:1005 ../mail/message-list.c:1925
+#: ../calendar/gui/dialogs/comp-editor.c:466 ../composer/e-msg-composer.c:3106
+#: ../mail/em-folder-tree.c:1016 ../mail/message-list.c:2062
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:820
+#: ../calendar/gui/dialogs/comp-editor.c:669
+#: ../calendar/gui/dialogs/comp-editor.c:2827 ../mail/em-utils.c:372
+#: ../plugins/prefer-plain/prefer-plain.c:79
+#: ../widgets/misc/e-attachment-bar.c:359
+msgid "attachment"
+msgstr "附件"
+
+#: ../calendar/gui/dialogs/comp-editor.c:831
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:966 ../composer/e-msg-composer.c:2534
+#: ../calendar/gui/dialogs/comp-editor.c:981 ../composer/e-msg-composer.c:2487
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> 個附加檔案"
 msgstr[1] "<b>%d</b> 個附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:998
+#: ../calendar/gui/dialogs/comp-editor.c:1013
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1001
-#: ../calendar/gui/dialogs/comp-editor.c:1530
+#: ../calendar/gui/dialogs/comp-editor.c:1016
+#: ../calendar/gui/dialogs/comp-editor.c:1564
 msgid "Show Attachment _Bar"
 msgstr "顯示附加檔案列(_B)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1120
-#: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/task-page.c:1199
-#: ../composer/e-msg-composer-attachment-bar.c:470
-#: ../composer/e-msg-composer.c:3693
+#: ../calendar/gui/dialogs/comp-editor.c:1135
+#: ../calendar/gui/dialogs/event-page.c:1967
+#: ../calendar/gui/dialogs/task-page.c:1266 ../composer/e-msg-composer.c:3633
 #: ../plugins/groupwise-features/junk-settings.glade.h:8
 #: ../plugins/groupwise-features/properties.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:18
+#: ../widgets/table/e-table-config.glade.h:21
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1121
-#: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3694 ../mail/em-folder-tree.c:2081
-#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
-msgid "_Properties"
-msgstr "屬性(_P)"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1123
-#: ../composer/e-msg-composer-attachment-bar.c:473
-#: ../composer/e-msg-composer.c:3696
+#: ../calendar/gui/dialogs/comp-editor.c:1138
+#: ../composer/e-msg-composer.c:3636
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1554
-#: ../mail/em-format-html-display.c:2300
+#: ../calendar/gui/dialogs/comp-editor.c:1588
+#: ../mail/em-format-html-display.c:2374
 msgid "Show Attachments"
 msgstr "顯示附加檔案"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1555
+#: ../calendar/gui/dialogs/comp-editor.c:1589
 msgid "Press space key to toggle attachment bar"
 msgstr "按下空白鍵切換附加檔案列"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2162
-#: ../calendar/gui/dialogs/comp-editor.c:2205
+#: ../calendar/gui/dialogs/comp-editor.c:2195
+#: ../calendar/gui/dialogs/comp-editor.c:2238
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2168
-#: ../calendar/gui/dialogs/comp-editor.c:2211
+#: ../calendar/gui/dialogs/comp-editor.c:2201
+#: ../calendar/gui/dialogs/comp-editor.c:2244
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2170
-#: ../calendar/gui/dialogs/comp-editor.c:2213
+#: ../calendar/gui/dialogs/comp-editor.c:2203
+#: ../calendar/gui/dialogs/comp-editor.c:2246
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2174
-#: ../calendar/gui/dialogs/comp-editor.c:2217
+#: ../calendar/gui/dialogs/comp-editor.c:2207
+#: ../calendar/gui/dialogs/comp-editor.c:2250
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2176
-#: ../calendar/gui/dialogs/comp-editor.c:2219
+#: ../calendar/gui/dialogs/comp-editor.c:2209
+#: ../calendar/gui/dialogs/comp-editor.c:2252
 #, c-format
 msgid "Task - %s"
 msgstr "工作 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2179
-#: ../calendar/gui/dialogs/comp-editor.c:2222
+#: ../calendar/gui/dialogs/comp-editor.c:2212
+#: ../calendar/gui/dialogs/comp-editor.c:2255
 #, c-format
-msgid "Journal entry - %s"
-msgstr "日誌項目 - %s"
+msgid "Memo - %s"
+msgstr "備忘錄 - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2190
-#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../calendar/gui/dialogs/comp-editor.c:2223
+#: ../calendar/gui/dialogs/comp-editor.c:2265
 msgid "No summary"
 msgstr "沒有摘要"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2777
-#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:406
-#: ../mail/em-utils.c:438 ../widgets/misc/e-attachment-bar.c:350
-msgid "attachment"
-msgstr "附件"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2866
-#: ../calendar/gui/dialogs/comp-editor.c:2920
-#: ../calendar/gui/dialogs/comp-editor.c:2944
+#: ../calendar/gui/dialogs/comp-editor.c:2916
+#: ../calendar/gui/dialogs/comp-editor.c:2970
+#: ../calendar/gui/dialogs/comp-editor.c:2994
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有新的更新，則會放棄對此項目所做的變更"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2968
+#: ../calendar/gui/dialogs/comp-editor.c:3023
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
@@ -5989,8 +5965,8 @@ msgid "The task could not be deleted due to a corba error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
 #: ../calendar/gui/dialogs/delete-error.c:60
-msgid "The journal entry could not be deleted due to a corba error"
-msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+msgid "The memo could not be deleted due to a corba error"
+msgstr "由於 corba 錯誤，所以無法刪除該備忘錄。"
 
 #: ../calendar/gui/dialogs/delete-error.c:63
 msgid "The item could not be deleted due to a corba error"
@@ -6005,8 +5981,8 @@ msgid "The task could not be deleted because permission was denied"
 msgstr "因為許可全被拒絕，所以無法刪除工作。"
 
 #: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The journal entry could not be deleted because permission was denied"
-msgstr "因為許可權被拒絕，所以無法刪除日誌項目。"
+msgid "The memo could not be deleted because permission was denied"
+msgstr "因為許可權被拒絕，所以無法刪除該備忘錄。"
 
 #: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The item could not be deleted because permission was denied"
@@ -6021,8 +5997,8 @@ msgid "The task could not be deleted due to an error"
 msgstr "由於 corba 錯誤，所以無法刪除工作。"
 
 #: ../calendar/gui/dialogs/delete-error.c:92
-msgid "The journal entry could not be deleted due to an error"
-msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+msgid "The memo could not be deleted due to an error"
+msgstr "由於錯誤，所以無法刪除該備忘錄。"
 
 #: ../calendar/gui/dialogs/delete-error.c:95
 msgid "The item could not be deleted due to an error"
@@ -6041,128 +6017,135 @@ msgstr "委託給："
 msgid "Enter Delegate"
 msgstr "輸入代表"
 
-#: ../calendar/gui/dialogs/event-editor.c:564
+#: ../calendar/gui/dialogs/event-editor.c:602
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-#: ../calendar/gui/dialogs/event-editor.c:568
+#: ../calendar/gui/dialogs/event-editor.c:606
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "週期性"
 
-#: ../calendar/gui/dialogs/event-page.c:810
-#: ../calendar/gui/dialogs/event-page.c:2717
+#: ../calendar/gui/dialogs/event-page.c:826
+#: ../calendar/gui/dialogs/event-page.c:2835
 msgid "This event has alarms"
 msgstr "這個事件具有鬧鈴"
 
-#: ../calendar/gui/dialogs/event-page.c:882
+#: ../calendar/gui/dialogs/event-page.c:906
 #: ../calendar/gui/dialogs/event-page.glade.h:11
 #: ../calendar/gui/dialogs/meeting-page.glade.h:5
 #: ../calendar/gui/dialogs/memo-page.glade.h:2
-#: ../calendar/gui/dialogs/task-page.c:441
 msgid "Or_ganizer:"
 msgstr "會議召集人(_G):"
 
-#: ../calendar/gui/dialogs/event-page.c:920
+#: ../calendar/gui/dialogs/event-page.c:944
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-#: ../calendar/gui/dialogs/event-page.c:922
+#: ../calendar/gui/dialogs/event-page.c:946
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
 
-#: ../calendar/gui/dialogs/event-page.c:1087
+#: ../calendar/gui/dialogs/event-page.c:1128
 msgid "Event with no start date"
 msgstr "無開始日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1090
+#: ../calendar/gui/dialogs/event-page.c:1131
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
-#: ../calendar/gui/dialogs/event-page.c:1259
-#: ../calendar/gui/dialogs/memo-page.c:685
-#: ../calendar/gui/dialogs/task-page.c:849
+#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/memo-page.c:734
+#: ../calendar/gui/dialogs/task-page.c:893
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1269
+#: ../calendar/gui/dialogs/event-page.c:1313
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1292
+#: ../calendar/gui/dialogs/event-page.c:1336
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1299
+#: ../calendar/gui/dialogs/event-page.c:1343
 msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
-#: ../calendar/gui/dialogs/event-page.c:1454
-#: ../calendar/gui/dialogs/memo-page.c:720
-#: ../calendar/gui/dialogs/task-page.c:906
+#: ../calendar/gui/dialogs/event-page.c:1505
+#: ../calendar/gui/dialogs/memo-page.c:774
+#: ../calendar/gui/dialogs/task-page.c:952
 msgid "The organizer selected no longer has an account."
 msgstr "選取的召集人已經沒有帳號。"
 
-#: ../calendar/gui/dialogs/event-page.c:1460
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:912
+#: ../calendar/gui/dialogs/event-page.c:1511
+#: ../calendar/gui/dialogs/memo-page.c:780
+#: ../calendar/gui/dialogs/task-page.c:958
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
-#: ../calendar/gui/dialogs/event-page.c:1475
-#: ../calendar/gui/dialogs/task-page.c:927
+#: ../calendar/gui/dialogs/event-page.c:1536
+#: ../calendar/gui/dialogs/task-page.c:982
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
-#: ../calendar/gui/dialogs/event-page.c:1897
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/event-page.c:1968
+#: ../calendar/gui/dialogs/task-page.c:1267
 msgid "_Add "
 msgstr "新增(_A)"
 
-#: ../calendar/gui/dialogs/event-page.c:2624
+#: ../calendar/gui/dialogs/event-page.c:2711
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-#: ../calendar/gui/dialogs/event-page.c:2930
+#: ../calendar/gui/dialogs/event-page.c:2755
+#: ../calendar/gui/dialogs/memo-page.c:990
+#: ../calendar/gui/dialogs/task-page.c:1928
+#, c-format
+msgid "You are acting on behalf of %s"
+msgstr "您正擔任 %s 的代理人"
+
+#: ../calendar/gui/dialogs/event-page.c:3053
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
-#: ../calendar/gui/dialogs/event-page.c:2936
+#: ../calendar/gui/dialogs/event-page.c:3059
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
-#: ../calendar/gui/dialogs/event-page.c:2942
+#: ../calendar/gui/dialogs/event-page.c:3065
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "約會前 %d 分鐘"
 msgstr[1] "約會前 %d 分鐘"
 
-#: ../calendar/gui/dialogs/event-page.c:2955
+#: ../calendar/gui/dialogs/event-page.c:3078
 msgid "Customize"
 msgstr "自訂"
 
 #. an empty string is the same as 'None'
-#: ../calendar/gui/dialogs/event-page.c:2960
+#: ../calendar/gui/dialogs/event-page.c:3083
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
-#: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-itip-control.c:1131 ../composer/e-msg-composer.c:2318
-#: ../filter/filter-rule.c:890 ../mail/em-account-editor.c:701
-#: ../mail/em-account-editor.c:1421 ../mail/em-account-prefs.c:475
-#: ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-cal-model-tasks.c:669
+#: ../calendar/gui/e-itip-control.c:1141 ../filter/filter-rule.c:892
+#: ../mail/em-account-editor.c:701 ../mail/em-account-editor.c:1421
+#: ../mail/em-account-prefs.c:445 ../mail/em-junk-hook.c:83
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
+#: ../plugins/exchange-operations/exchange-delegates-user.c:200
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
-#: ../plugins/itip-formatter/itip-formatter.c:1775
-#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:1507
-#: ../widgets/misc/e-dateedit.c:1721
+#: ../plugins/itip-formatter/itip-formatter.c:1996
+#: ../widgets/misc/e-cell-date-edit.c:247 ../widgets/misc/e-dateedit.c:1531
+#: ../widgets/misc/e-dateedit.c:1745
+#: ../widgets/misc/e-signature-combo-box.c:50
 msgid "None"
 msgstr "無"
 
@@ -6182,17 +6165,11 @@ msgstr "約會前 15 分鐘"
 msgid "Attendee_s..."
 msgstr "到會者(_S)..."
 
-#: ../calendar/gui/dialogs/event-page.glade.h:6
-#: ../calendar/gui/dialogs/memo-page.glade.h:1
-msgid "Ca_tegories..."
-msgstr "分類(_T)..."
-
 #: ../calendar/gui/dialogs/event-page.glade.h:8
 msgid "Custom Alarm:"
 msgstr "自訂鬧鈴:"
 
 #: ../calendar/gui/dialogs/event-page.glade.h:9
-#: ../calendar/gui/dialogs/task-page.glade.h:3
 msgid "D_escription:"
 msgstr "描述(_E):"
 
@@ -6230,56 +6207,6 @@ msgstr "總共"
 msgid "until"
 msgstr "直至"
 
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:1
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "到會者"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:2
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
-msgid "Click here to add an attendee"
-msgstr "按這裡新增到會者"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:3
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "普通名稱"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:4
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "委任自"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:5
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "委派給"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:6
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "語言"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:7
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "成員"
-
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:8
-#: ../calendar/gui/e-meeting-list-view.c:523
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: ../calendar/gui/dialogs/meeting-page.etspec.h:10
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/e-meeting-list-view.c:534
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
-#: ../mail/message-list.etspec.h:16
-msgid "Status"
-msgstr "狀況"
-
 #: ../calendar/gui/dialogs/meeting-page.glade.h:1
 msgid "<b>Att_endees</b>"
 msgstr "<b>到會者(_E)</b>"
@@ -6301,18 +6228,19 @@ msgstr "會議召集人"
 msgid "Organizer:"
 msgstr "會議召集人:"
 
-#: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2452
+#: ../calendar/gui/dialogs/memo-editor.c:219 ../calendar/gui/print.c:2446
 msgid "Memo"
 msgstr "備忘錄"
 
-#: ../calendar/gui/dialogs/memo-page.c:870
+#: ../calendar/gui/dialogs/memo-page.c:952
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s」開啟備忘錄。"
 
-#: ../calendar/gui/dialogs/memo-page.c:1021 ../mail/em-format-html.c:1490
-#: ../mail/em-format-quote.c:200 ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
+#: ../calendar/gui/dialogs/memo-page.c:1136 ../mail/em-format-html.c:1539
+#: ../mail/em-format-html.c:1597 ../mail/em-format-html.c:1623
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:888
+#: ../mail/em-mailer-prefs.c:92 ../mail/message-list.etspec.h:19
 msgid "To"
 msgstr "收件者"
 
@@ -6330,91 +6258,58 @@ msgid "_Description:"
 msgstr "描述(_D):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/dialogs/task-page.c:434
+#: ../calendar/gui/dialogs/task-page.c:451
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
 msgstr "群組(_G):"
 
-#: ../calendar/gui/dialogs/new-calendar.glade.h:1
-msgid "<b>Calendar options</b>"
-msgstr "<b>行事曆選項</b>"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:2
-msgid "Add New Calendar"
-msgstr "新增行事曆"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:3
-msgid "Calendar Group"
-msgstr "行事曆群組"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:4
-msgid "Calendar Location"
-msgstr "行事曆位置"
-
-#: ../calendar/gui/dialogs/new-calendar.glade.h:5
-msgid "Calendar Name"
-msgstr "行事曆名稱"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:1
-msgid "<b>Task List Options</b>"
-msgstr "<b>工作清單選項</b>"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:2
-msgid "Add New Task List"
-msgstr "新增工作清單"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:3
-msgid "Task List Group"
-msgstr "工作清單群組"
-
-#: ../calendar/gui/dialogs/new-task-list.glade.h:4
-msgid "Task List Name"
-msgstr "工作清單名稱"
-
 #: ../calendar/gui/dialogs/recur-comp.c:52
+#, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "您正在修改週期性事件。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:54
+#, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "您正在委任週期性事件。您想要委派什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:58
+#, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "您正在修改週期性工作。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid ""
-"You are modifying a recurring journal entry. What would you like to modify?"
-msgstr "您正在修改週期性日誌項目。您想要修改什麼？"
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "您正在修改週期性備忘錄。您想要修改什麼？"
 
-#: ../calendar/gui/dialogs/recur-comp.c:90
+#: ../calendar/gui/dialogs/recur-comp.c:87
 msgid "This Instance Only"
 msgstr "限此例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:94
+#: ../calendar/gui/dialogs/recur-comp.c:91
 msgid "This and Prior Instances"
 msgstr "此例項和先前的例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:100
+#: ../calendar/gui/dialogs/recur-comp.c:97
 msgid "This and Future Instances"
 msgstr "此例項和以後的例項"
 
-#: ../calendar/gui/dialogs/recur-comp.c:105
+#: ../calendar/gui/dialogs/recur-comp.c:102
 msgid "All Instances"
 msgstr "所有例項"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:505
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:826
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:932
+#: ../calendar/gui/dialogs/recurrence-page.c:939
 msgid "on"
 msgstr "的"
 
@@ -6422,7 +6317,7 @@ msgstr "的"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:996
+#: ../calendar/gui/dialogs/recurrence-page.c:1003
 msgid "first"
 msgstr "一"
 
@@ -6431,7 +6326,7 @@ msgstr "一"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1002
+#: ../calendar/gui/dialogs/recurrence-page.c:1009
 msgid "second"
 msgstr "二"
 
@@ -6439,7 +6334,7 @@ msgstr "二"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1007
+#: ../calendar/gui/dialogs/recurrence-page.c:1014
 msgid "third"
 msgstr "三"
 
@@ -6447,7 +6342,7 @@ msgstr "三"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1012
+#: ../calendar/gui/dialogs/recurrence-page.c:1019
 msgid "fourth"
 msgstr "四"
 
@@ -6455,13 +6350,13 @@ msgstr "四"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1024
 msgid "last"
 msgstr "最後"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1043
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 msgid "Other Date"
 msgstr "其它日期"
 
@@ -6469,7 +6364,7 @@ msgstr "其它日期"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/recurrence-page.c:1058
 msgid "1st to 10th"
 msgstr "1日至10日"
 
@@ -6477,7 +6372,7 @@ msgstr "1日至10日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1057
+#: ../calendar/gui/dialogs/recurrence-page.c:1064
 msgid "11th to 20th"
 msgstr "11日至20日"
 
@@ -6485,45 +6380,45 @@ msgstr "11日至20日"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1063
+#: ../calendar/gui/dialogs/recurrence-page.c:1070
 msgid "21st to 31st"
 msgstr "21日至31日"
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/gui/dialogs/recurrence-page.c:1086
+#: ../calendar/gui/dialogs/recurrence-page.c:1093
 msgid "day"
 msgstr "天"
 
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1226
+#: ../calendar/gui/dialogs/recurrence-page.c:1233
 msgid "on the"
 msgstr "在第"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1419
+#: ../calendar/gui/dialogs/recurrence-page.c:1426
 msgid "occurrences"
 msgstr "次"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2159
+#: ../calendar/gui/dialogs/recurrence-page.c:2167
 msgid "Add exception"
 msgstr "加入例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2202
+#: ../calendar/gui/dialogs/recurrence-page.c:2210
 msgid "Could not get a selection to modify."
 msgstr "無法取得要編輯的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2208
+#: ../calendar/gui/dialogs/recurrence-page.c:2216
 msgid "Modify exception"
 msgstr "編輯例外"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2254
+#: ../calendar/gui/dialogs/recurrence-page.c:2262
 msgid "Could not get a selection to delete."
 msgstr "無法取得要刪除的選取區。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2385
+#: ../calendar/gui/dialogs/recurrence-page.c:2393
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -6532,7 +6427,7 @@ msgid "<b>Exceptions</b>"
 msgstr "<b>例外</b>"
 
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
-#: ../mail/mail-config.glade.h:2
+#: ../mail/mail-config.glade.h:3
 msgid "<b>Preview</b>"
 msgstr "<b>預覽</b>"
 
@@ -6579,7 +6474,7 @@ msgstr "年"
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-#: ../calendar/gui/dialogs/task-details-page.c:517
+#: ../calendar/gui/dialogs/task-details-page.c:515
 msgid "Web Page"
 msgstr "網頁"
 
@@ -6594,48 +6489,48 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #. Pass TRUE as is_utc, so it gets converted to the current
 #. timezone.
 #: ../calendar/gui/dialogs/task-details-page.glade.h:4
-#: ../calendar/gui/e-cal-component-preview.c:231
-#: ../calendar/gui/e-cal-model-tasks.c:347
-#: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/e-itip-control.c:923
-#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
-#: ../calendar/gui/print.c:2513 ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-cal-component-preview.c:236
+#: ../calendar/gui/e-cal-model-tasks.c:358
+#: ../calendar/gui/e-cal-model-tasks.c:675
+#: ../calendar/gui/e-calendar-table.c:402 ../calendar/gui/e-itip-control.c:933
+#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
+#: ../calendar/gui/print.c:2518 ../plugins/save-calendar/csv-format.c:386
 msgid "Completed"
 msgstr "已完成"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:5
-#: ../calendar/gui/e-cal-component-preview.c:250
-#: ../calendar/gui/e-calendar-table.c:387 ../mail/message-list.c:1034
+#: ../calendar/gui/e-cal-component-preview.c:255
+#: ../calendar/gui/e-calendar-table.c:327 ../mail/message-list.c:1065
 msgid "High"
 msgstr "高"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:6
-#: ../calendar/gui/e-cal-component-preview.c:228
-#: ../calendar/gui/e-cal-model-tasks.c:345
-#: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-cal-model-tasks.c:735
-#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2510
+#: ../calendar/gui/e-cal-component-preview.c:233
+#: ../calendar/gui/e-cal-model-tasks.c:356
+#: ../calendar/gui/e-cal-model-tasks.c:673
+#: ../calendar/gui/e-cal-model-tasks.c:748
+#: ../calendar/gui/e-calendar-table.c:401 ../calendar/gui/print.c:2515
 msgid "In Progress"
 msgstr "進行中"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:7
-#: ../calendar/gui/e-cal-component-preview.c:254
-#: ../calendar/gui/e-calendar-table.c:389 ../mail/message-list.c:1032
+#: ../calendar/gui/e-cal-component-preview.c:259
+#: ../calendar/gui/e-calendar-table.c:329 ../mail/message-list.c:1063
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
-#: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:924 ../calendar/gui/e-calendar-table.c:388
-#: ../mail/message-list.c:1033
+#: ../calendar/gui/e-cal-component-preview.c:257
+#: ../calendar/gui/e-cal-model.c:965 ../calendar/gui/e-calendar-table.c:328
+#: ../mail/message-list.c:1064
 msgid "Normal"
 msgstr "正常"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:9
-#: ../calendar/gui/e-cal-component-preview.c:238
-#: ../calendar/gui/e-cal-model-tasks.c:343
-#: ../calendar/gui/e-cal-model-tasks.c:658
-#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/print.c:2507
+#: ../calendar/gui/e-cal-component-preview.c:243
+#: ../calendar/gui/e-cal-model-tasks.c:354
+#: ../calendar/gui/e-cal-model-tasks.c:671
+#: ../calendar/gui/e-calendar-table.c:400 ../calendar/gui/print.c:2512
 msgid "Not Started"
 msgstr "未開始"
 
@@ -6648,7 +6543,7 @@ msgid "Stat_us:"
 msgstr "狀態(_U):"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
-#: ../calendar/gui/e-calendar-table.c:390
+#: ../calendar/gui/e-calendar-table.c:330
 msgid "Undefined"
 msgstr "未指定"
 
@@ -6665,20 +6560,25 @@ msgstr "優先順序(_P):"
 msgid "_Web Page:"
 msgstr "網頁(_W):"
 
-#: ../calendar/gui/dialogs/task-editor.c:425
-#: ../calendar/gui/tasks-component.c:1245
+#: ../calendar/gui/dialogs/task-editor.c:426
+#: ../calendar/gui/tasks-component.c:1322
 msgid "_Task"
 msgstr "工作(_T)"
 
-#: ../calendar/gui/dialogs/task-editor.c:429
+#: ../calendar/gui/dialogs/task-editor.c:430
 msgid "Task Details"
 msgstr "工作詳細資料"
 
-#: ../calendar/gui/dialogs/task-page.c:822
+#: ../calendar/gui/dialogs/task-page.c:459
+#: ../calendar/gui/dialogs/task-page.glade.h:4
+msgid "Organi_zer:"
+msgstr "會議召集人(_Z):"
+
+#: ../calendar/gui/dialogs/task-page.c:866
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-#: ../calendar/gui/dialogs/task-page.c:1650
+#: ../calendar/gui/dialogs/task-page.c:1885
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法在 '%s' 開啟工作。"
@@ -6691,9 +6591,9 @@ msgstr "到會者(_N)..."
 msgid "Categor_ies..."
 msgstr "分類(_I)..."
 
-#: ../calendar/gui/dialogs/task-page.glade.h:4
-msgid "Or_ganiser:"
-msgstr "召集人(_G):"
+#: ../calendar/gui/dialogs/task-page.glade.h:3
+msgid "De_scription:"
+msgstr "描述(_S):"
 
 #: ../calendar/gui/dialogs/task-page.glade.h:7
 msgid "Time zone:"
@@ -6703,49 +6603,6 @@ msgstr "時區:"
 msgid "_Due date:"
 msgstr "到期日(_D):"
 
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:2
-msgid "<b>Free/Busy C_alendars</b>"
-msgstr "<b>空閒/忙碌行事曆(_A)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "<b>Publishing Frequency</b>"
-msgstr "<b>發佈頻率</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:4
-msgid "<b>Publishing _Location</b>"
-msgstr "<b>發佈位置(_L)</b>"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
-msgid "Free/Busy Publishing Settings"
-msgstr "空閒/忙碌發佈設定"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:6
-msgid "_Daily"
-msgstr "每天(_D)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:7
-msgid "_Manual"
-msgstr "手動(_M)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:8
-#: ../plugins/publish-calendar/publish-calendar.glade.h:23
-msgid "_Password:"
-msgstr "密碼(_P):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
-#: ../plugins/publish-calendar/publish-calendar.glade.h:25
-msgid "_Remember password"
-msgstr "記住密碼(_R)"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:10
-#: ../plugins/publish-calendar/publish-calendar.glade.h:27
-msgid "_Username:"
-msgstr "使用者名稱(_U):"
-
-#: ../calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "_Weekly"
-msgstr "每週(_W)"
-
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -6822,72 +6679,72 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:72
-#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2913
+#: ../calendar/gui/e-cal-component-memo-preview.c:74
+#: ../calendar/gui/e-cal-component-preview.c:72 ../mail/em-folder-view.c:3327
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:155
-#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
+#: ../calendar/gui/e-cal-component-memo-preview.c:160
+#: ../calendar/gui/e-cal-component-preview.c:160 ../filter/filter-rule.c:805
+#: ../shell/e-shell-folder-title-bar.c:593
 msgid "Untitled"
 msgstr "未命名"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:206
-#: ../calendar/gui/e-cal-component-preview.c:195
-#: ../calendar/gui/e-cal-component-preview.c:206
+#: ../calendar/gui/e-cal-component-memo-preview.c:212
+#: ../calendar/gui/e-cal-component-preview.c:200
+#: ../calendar/gui/e-cal-component-preview.c:211
 msgid "Start Date:"
 msgstr "開始日期："
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:219
-#: ../calendar/gui/e-cal-component-preview.c:269
-#: ../calendar/gui/e-itip-control.c:1191
-#: ../calendar/gui/e-itip-control.glade.h:4
-#: ../composer/e-msg-composer-attachment.glade.h:2
-#: ../mail/mail-config.glade.h:68 ../widgets/misc/e-attachment.glade.h:2
+#: ../calendar/gui/e-cal-component-memo-preview.c:225
+#: ../calendar/gui/e-cal-component-preview.c:274
+#: ../calendar/gui/e-itip-control.c:1201
+#: ../calendar/gui/e-itip-control.glade.h:4 ../mail/mail-config.glade.h:69
+#: ../widgets/misc/e-attachment.glade.h:2
 msgid "Description:"
 msgstr "描述:"
 
-#: ../calendar/gui/e-cal-component-memo-preview.c:252
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-memo-preview.c:261
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Web Page:"
 msgstr "網頁："
 
-#: ../calendar/gui/e-cal-component-preview.c:188
-#: ../calendar/gui/e-itip-control.c:1135
+#: ../calendar/gui/e-cal-component-preview.c:193
+#: ../calendar/gui/e-itip-control.c:1145
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "摘要:"
 
-#: ../calendar/gui/e-cal-component-preview.c:217
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Due Date:"
 msgstr "截止日期："
 
 #. write status
 #. Status
-#: ../calendar/gui/e-cal-component-preview.c:224
-#: ../calendar/gui/e-itip-control.c:1159
+#: ../calendar/gui/e-cal-component-preview.c:229
+#: ../calendar/gui/e-itip-control.c:1169
 #: ../plugins/exchange-operations/exchange-account-setup.c:269
-#: ../plugins/itip-formatter/itip-view.c:961
+#: ../plugins/itip-formatter/itip-view.c:1029
 msgid "Status:"
 msgstr "狀態:"
 
-#: ../calendar/gui/e-cal-component-preview.c:248
+#: ../calendar/gui/e-cal-component-preview.c:253
 msgid "Priority:"
 msgstr "優先程度："
 
-#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:317
+#: ../calendar/gui/e-cal-model.c:324 ../calendar/gui/e-calendar-table.c:305
 msgid "Public"
 msgstr "公開"
 
-#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:258 ../calendar/gui/e-cal-model.c:326
+#: ../calendar/gui/e-calendar-table.c:306
 msgid "Private"
 msgstr "私人"
 
-#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
-#: ../calendar/gui/e-calendar-table.c:367
+#: ../calendar/gui/e-cal-list-view.c:259 ../calendar/gui/e-cal-model.c:328
+#: ../calendar/gui/e-calendar-table.c:307
 msgid "Confidential"
 msgstr "機密"
 
@@ -6896,29 +6753,29 @@ msgid "End Date"
 msgstr "結束日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Start Date"
 msgstr "開始日期"
 
 #: ../calendar/gui/e-cal-list-view.etspec.h:5
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-memo-table.etspec.h:5 ../mail/mail-dialogs.glade.h:20
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:20
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Summary"
 msgstr "摘要"
 
 #: ../calendar/gui/e-cal-model-calendar.c:183
-#: ../calendar/gui/e-calendar-table.c:439
+#: ../calendar/gui/e-calendar-table.c:379
 msgid "Free"
 msgstr "空閒"
 
 #: ../calendar/gui/e-cal-model-calendar.c:186
-#: ../calendar/gui/e-calendar-table.c:440
-#: ../calendar/gui/e-meeting-time-sel.c:411
+#: ../calendar/gui/e-calendar-table.c:380
+#: ../calendar/gui/e-meeting-time-sel.c:413
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../calendar/gui/e-cal-model-tasks.c:610
+#: ../calendar/gui/e-cal-model-tasks.c:623
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -6928,204 +6785,199 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1023 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:193
-#: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
-#: ../calendar/gui/e-meeting-store.c:764
+#: ../calendar/gui/e-meeting-store.c:156 ../calendar/gui/e-meeting-store.c:166
+#: ../calendar/gui/e-meeting-store.c:749
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
-#: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
+#: ../calendar/gui/e-cal-model-tasks.c:1023 ../calendar/gui/e-cal-model.c:971
 #: ../calendar/gui/e-meeting-list-view.c:194
-#: ../calendar/gui/e-meeting-store.c:178
+#: ../calendar/gui/e-meeting-store.c:168
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
 msgid "No"
 msgstr "否"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-popup.c:107
+#: ../calendar/gui/e-cal-model.c:330 ../calendar/gui/e-cal-popup.c:107
 #: ../calendar/gui/e-cal-popup.c:124 ../calendar/gui/e-cal-popup.c:171
-#: ../calendar/gui/e-itip-control.c:1176 ../calendar/gui/e-itip-control.c:1317
+#: ../calendar/gui/e-itip-control.c:1186 ../calendar/gui/e-itip-control.c:1326
 #: ../calendar/gui/e-meeting-list-view.c:169
 #: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:159
-#: ../calendar/gui/e-meeting-store.c:222 ../mail/em-utils.c:1213
-#: ../plugins/itip-formatter/itip-formatter.c:240
-#: ../plugins/itip-formatter/itip-formatter.c:1800
-#: ../plugins/plugin-manager/plugin-manager.c:68
-#: ../widgets/misc/e-attachment-bar.c:710
-#: ../widgets/misc/e-charset-picker.c:63
+#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:149
+#: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/print.c:969
+#: ../calendar/gui/print.c:986 ../mail/em-utils.c:1294
+#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/plugin-manager/plugin-manager.c:84
+#: ../widgets/misc/e-attachment-bar.c:721
+#: ../widgets/misc/e-charset-picker.c:64
 msgid "Unknown"
 msgstr "不明"
 
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model.c:967
 msgid "Recurring"
 msgstr "循環模式"
 
-#: ../calendar/gui/e-cal-model.c:928
+#: ../calendar/gui/e-cal-model.c:969
 msgid "Assigned"
 msgstr "已指定"
 
-#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:426
 msgid "Save As..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2146
+#: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2219
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
-#: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:225 ../mail/em-popup.c:454
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:276 ../calendar/gui/e-calendar-table.c:1282
-#: ../calendar/gui/e-calendar-view.c:1699 ../calendar/gui/e-memo-table.c:903
-#: ../mail/em-folder-view.c:1144 ../mail/em-popup.c:554 ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:279 ../calendar/gui/e-calendar-table.c:1329
+#: ../calendar/gui/e-calendar-view.c:1678 ../calendar/gui/e-memo-table.c:923
+#: ../mail/em-folder-view.c:1341 ../mail/em-popup.c:571 ../mail/em-popup.c:582
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:277 ../mail/em-popup.c:555
-#: ../mail/em-popup.c:566
+#: ../calendar/gui/e-cal-popup.c:280 ../mail/em-popup.c:572
+#: ../mail/em-popup.c:583
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
 
-#: ../calendar/gui/e-cal-popup.c:278
+#: ../calendar/gui/e-cal-popup.c:281
 msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
 
-#: ../calendar/gui/e-cal-popup.c:399 ../mail/em-popup.c:776
+#: ../calendar/gui/e-cal-popup.c:402 ../mail/em-popup.c:791
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-#: ../calendar/gui/e-calendar-table.c:409
+#: ../calendar/gui/e-calendar-table.c:349
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:410
+#: ../calendar/gui/e-calendar-table.c:350
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:411
+#: ../calendar/gui/e-calendar-table.c:351
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:412
+#: ../calendar/gui/e-calendar-table.c:352
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:413
+#: ../calendar/gui/e-calendar-table.c:353
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:414
+#: ../calendar/gui/e-calendar-table.c:354
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:415
+#: ../calendar/gui/e-calendar-table.c:355
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:416
+#: ../calendar/gui/e-calendar-table.c:356
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:417
+#: ../calendar/gui/e-calendar-table.c:357
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:418
+#: ../calendar/gui/e-calendar-table.c:358
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:419
+#: ../calendar/gui/e-calendar-table.c:359
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:704
-#: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
+#: ../calendar/gui/e-calendar-table.c:635
+#: ../calendar/gui/e-calendar-view.c:677 ../calendar/gui/e-memo-table.c:439
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
-#: ../calendar/gui/e-calendar-table.c:957
-#: ../calendar/gui/e-calendar-view.c:803 ../calendar/gui/e-memo-table.c:659
+#: ../calendar/gui/e-calendar-table.c:917
+#: ../calendar/gui/e-calendar-view.c:805 ../calendar/gui/e-memo-table.c:643
 msgid "Updating objects"
 msgstr "更新物件"
 
-#: ../calendar/gui/e-calendar-table.c:1106
-#: ../calendar/gui/e-calendar-view.c:1248 ../calendar/gui/e-memo-table.c:798
-#: ../composer/e-msg-composer.c:1351
+#: ../calendar/gui/e-calendar-table.c:1101
+#: ../calendar/gui/e-calendar-view.c:1227 ../calendar/gui/e-memo-table.c:818
+#: ../composer/e-msg-composer.c:1472
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1277
-#: ../calendar/gui/e-calendar-view.c:1681
+#: ../calendar/gui/e-calendar-table.c:1324
+#: ../calendar/gui/e-calendar-view.c:1660
 msgid "New _Task"
 msgstr "新增工作(_T)"
 
-#: ../calendar/gui/e-calendar-table.c:1281 ../calendar/gui/e-memo-table.c:902
+#: ../calendar/gui/e-calendar-table.c:1328 ../calendar/gui/e-memo-table.c:922
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
-#: ../calendar/gui/e-calendar-table.c:1283
-#: ../calendar/gui/e-calendar-view.c:1684
-#: ../calendar/gui/e-calendar-view.c:1700 ../calendar/gui/e-memo-table.c:904
-#: ../mail/em-folder-view.c:1145
-#: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
-#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
-#: ../ui/evolution-tasks.xml.h:29
-msgid "_Print..."
-msgstr "列印(_P)..."
+#: ../calendar/gui/e-calendar-table.c:1330
+#: ../calendar/gui/e-calendar-view.c:1663 ../calendar/gui/e-memo-table.c:924
+msgid "P_rint..."
+msgstr "列印(_R)..."
 
-#: ../calendar/gui/e-calendar-table.c:1287
-#: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
+#: ../calendar/gui/e-calendar-table.c:1334
+#: ../calendar/gui/e-calendar-view.c:1683 ../calendar/gui/e-memo-table.c:928
 #: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
 #: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
-#: ../calendar/gui/e-calendar-table.c:1289
-#: ../calendar/gui/e-calendar-view.c:1687
-#: ../calendar/gui/e-calendar-view.c:1706 ../calendar/gui/e-memo-table.c:910
+#: ../calendar/gui/e-calendar-table.c:1336
+#: ../calendar/gui/e-calendar-view.c:1666
+#: ../calendar/gui/e-calendar-view.c:1685 ../calendar/gui/e-memo-table.c:930
 #: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:43
 #: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
 #: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1293 ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1340 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
+#: ../calendar/gui/e-calendar-table.c:1341 ../calendar/gui/e-memo-table.c:934
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCale_ndar 轉寄"
 
-#: ../calendar/gui/e-calendar-table.c:1295
+#: ../calendar/gui/e-calendar-table.c:1342
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1296
+#: ../calendar/gui/e-calendar-table.c:1343
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1297
+#: ../calendar/gui/e-calendar-table.c:1344
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1298
+#: ../calendar/gui/e-calendar-table.c:1345
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "標示選定的工作為未完成(_M)"
 
-#: ../calendar/gui/e-calendar-table.c:1303
+#: ../calendar/gui/e-calendar-table.c:1350
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-#: ../calendar/gui/e-calendar-table.c:1536
+#: ../calendar/gui/e-calendar-table.c:1587
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
@@ -7135,7 +6987,7 @@ msgstr "請按這裡增加新的工作"
 msgid "% Complete"
 msgstr "% 完成"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:656
+#: ../calendar/gui/e-calendar-table.etspec.h:5
 msgid "Complete"
 msgstr "完成"
 
@@ -7148,7 +7000,7 @@ msgid "Due date"
 msgstr "截止日期"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:8
-#: ../plugins/save-calendar/csv-format.c:397
+#: ../plugins/save-calendar/csv-format.c:393
 msgid "Priority"
 msgstr "優先順序"
 
@@ -7156,105 +7008,112 @@ msgstr "優先順序"
 msgid "Start date"
 msgstr "開始日期"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:12
-msgid "Task sort"
-msgstr "工作排序"
+#: ../calendar/gui/e-calendar-table.etspec.h:10
+#: ../calendar/gui/e-meeting-list-view.c:538
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:70
+#: ../mail/message-list.etspec.h:17
+msgid "Status"
+msgstr "狀況"
 
-#: ../calendar/gui/e-calendar-view.c:1367
+#: ../calendar/gui/e-calendar-view.c:1346
 msgid "Moving items"
 msgstr "移動項目"
 
-#: ../calendar/gui/e-calendar-view.c:1369
+#: ../calendar/gui/e-calendar-view.c:1348
 msgid "Copying items"
 msgstr "複製項目"
 
-#: ../calendar/gui/e-calendar-view.c:1678
+#: ../calendar/gui/e-calendar-view.c:1657
 msgid "New _Appointment..."
 msgstr "新增約會(_A)..."
 
-#: ../calendar/gui/e-calendar-view.c:1679
+#: ../calendar/gui/e-calendar-view.c:1658
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-#: ../calendar/gui/e-calendar-view.c:1680
+#: ../calendar/gui/e-calendar-view.c:1659
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
 
 #. FIXME: hook in this somehow
-#: ../calendar/gui/e-calendar-view.c:1691
+#: ../calendar/gui/e-calendar-view.c:1670
 msgid "_Current View"
 msgstr "目前檢視(_C)"
 
-#: ../calendar/gui/e-calendar-view.c:1693
+#: ../calendar/gui/e-calendar-view.c:1672
 msgid "Select T_oday"
 msgstr "選擇今天(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1694
+#: ../calendar/gui/e-calendar-view.c:1673
 msgid "_Select Date..."
 msgstr "選擇日期(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1710
+#: ../calendar/gui/e-calendar-view.c:1679
+msgid "Pri_nt..."
+msgstr "列印(_N)..."
+
+#: ../calendar/gui/e-calendar-view.c:1689
 msgid "Cop_y to Calendar..."
 msgstr "複製至行事曆(_Y)..."
 
-#: ../calendar/gui/e-calendar-view.c:1711
+#: ../calendar/gui/e-calendar-view.c:1690
 msgid "Mo_ve to Calendar..."
 msgstr "移至行事曆(_V)..."
 
-#: ../calendar/gui/e-calendar-view.c:1712
+#: ../calendar/gui/e-calendar-view.c:1691
 msgid "_Delegate Meeting..."
 msgstr "委派會議(_D)..."
 
-#: ../calendar/gui/e-calendar-view.c:1713
+#: ../calendar/gui/e-calendar-view.c:1692
 msgid "_Schedule Meeting..."
 msgstr "會議排程(_S)..."
 
-#: ../calendar/gui/e-calendar-view.c:1714
+#: ../calendar/gui/e-calendar-view.c:1693
 msgid "_Forward as iCalendar..."
 msgstr "以 iCale_ndar 轉寄..."
 
-#: ../calendar/gui/e-calendar-view.c:1715
+#: ../calendar/gui/e-calendar-view.c:1694
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1716 ../mail/em-folder-view.c:1139
-#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../calendar/gui/e-calendar-view.c:1695 ../mail/em-folder-view.c:1335
+#: ../mail/em-popup.c:576 ../mail/em-popup.c:587
 #: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-#: ../calendar/gui/e-calendar-view.c:1721
+#: ../calendar/gui/e-calendar-view.c:1700
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
 
-#: ../calendar/gui/e-calendar-view.c:1722 ../ui/evolution-calendar.xml.h:9
+#: ../calendar/gui/e-calendar-view.c:1701 ../ui/evolution-calendar.xml.h:9
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
-#: ../calendar/gui/e-calendar-view.c:1723
+#: ../calendar/gui/e-calendar-view.c:1702
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:2175
+#: ../calendar/gui/e-calendar-view.c:2202
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
 
 #. With SunOne accouts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-view.c:2179
+#: ../calendar/gui/e-calendar-view.c:2206
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2481
+#: ../calendar/gui/e-calendar-view.c:2222 ../calendar/gui/print.c:2475
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2226
+#: ../calendar/gui/e-calendar-view.c:2256
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -7269,15 +7128,13 @@ msgstr "%Y-%m-%d (%a) %H:%M:%S"
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%Y-%m-%d (%a) %p %I:%M:%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:124
+#: ../calendar/gui/e-cell-date-edit-text.c:127
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
-"\n"
 "%s"
 msgstr ""
 "日期必須依此格式輸入：\n"
-"\n"
 "%s"
 
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
@@ -7295,26 +7152,26 @@ msgstr "間隔 %02i 分鐘"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:1311
-#: ../calendar/gui/e-day-view.c:2089
+#: ../calendar/gui/e-day-view-top-item.c:1354
+#: ../calendar/gui/e-day-view.c:2141
 #: ../calendar/gui/e-week-view-main-item.c:310
-#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1643
+#: ../calendar/gui/e-week-view-main-item.c:524 ../calendar/gui/print.c:1656
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:746 ../calendar/gui/e-day-view.c:1089
-#: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:952
+#: ../calendar/gui/e-day-view.c:766 ../calendar/gui/e-day-view.c:1119
+#: ../calendar/gui/e-week-view.c:507 ../calendar/gui/print.c:813
 msgid "am"
 msgstr "上午"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:749 ../calendar/gui/e-day-view.c:1092
-#: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:954
+#: ../calendar/gui/e-day-view.c:769 ../calendar/gui/e-day-view.c:1122
+#: ../calendar/gui/e-week-view.c:510 ../calendar/gui/print.c:815
 msgid "pm"
 msgstr "下午"
 
-#: ../calendar/gui/e-itip-control.c:759
+#: ../calendar/gui/e-itip-control.c:769
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
 
@@ -7323,7 +7180,7 @@ msgstr "是。(複雜循環)"
 #. Every %d day/days"
 #. For Translators : 'Every day' is event Recurring every day
 #. For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit
-#: ../calendar/gui/e-itip-control.c:775
+#: ../calendar/gui/e-itip-control.c:785
 #, c-format
 msgid "Every day"
 msgid_plural "Every %d days"
@@ -7335,7 +7192,7 @@ msgstr[1] "每 %d 天"
 #. Every %d week/weeks"
 #. For Translators : 'Every week' is event Recurring every week
 #. For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit
-#: ../calendar/gui/e-itip-control.c:785
+#: ../calendar/gui/e-itip-control.c:795
 #, c-format
 msgid "Every week"
 msgid_plural "Every %d weeks"
@@ -7344,7 +7201,7 @@ msgstr[1] "每 %d 週"
 
 #. For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname)
 #. For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit
-#: ../calendar/gui/e-itip-control.c:789
+#: ../calendar/gui/e-itip-control.c:799
 #, c-format
 msgid "Every week on "
 msgid_plural "Every %d weeks on "
@@ -7352,19 +7209,19 @@ msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
 #. For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)'
-#: ../calendar/gui/e-itip-control.c:798
+#: ../calendar/gui/e-itip-control.c:808
 msgid " and "
 msgstr " 和 "
 
 #. For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.'
-#: ../calendar/gui/e-itip-control.c:806
+#: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "The %s day of "
 msgstr "%s 日於 "
 
 #. For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.'
 #. eg,third monday of every month
-#: ../calendar/gui/e-itip-control.c:821
+#: ../calendar/gui/e-itip-control.c:831
 #, c-format
 msgid "The %s %s of "
 msgstr "%s %s 日於 "
@@ -7375,7 +7232,7 @@ msgstr "%s %s 日於 "
 #. For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.'
 #. For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.'
 #. %d is a digit
-#: ../calendar/gui/e-itip-control.c:834
+#: ../calendar/gui/e-itip-control.c:844
 #, c-format
 msgid "every month"
 msgid_plural "every %d months"
@@ -7387,7 +7244,7 @@ msgstr[1] "每 %d 月"
 #. Every %d year/years"
 #. For Translators : 'Every year' is event Recurring every year
 #. For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit
-#: ../calendar/gui/e-itip-control.c:843
+#: ../calendar/gui/e-itip-control.c:853
 #, c-format
 msgid "Every year"
 msgid_plural "Every %d years"
@@ -7396,7 +7253,7 @@ msgstr[1] "每 %d 年"
 
 #. For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit
 #. For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit
-#: ../calendar/gui/e-itip-control.c:856
+#: ../calendar/gui/e-itip-control.c:866
 #, c-format
 msgid "a total of %d time"
 msgid_plural " a total of %d times"
@@ -7404,334 +7261,333 @@ msgstr[0] "總共 %d 次"
 msgstr[1] "總共 %d 次"
 
 #. For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'
-#: ../calendar/gui/e-itip-control.c:866
+#: ../calendar/gui/e-itip-control.c:876
 msgid ", ending on "
 msgstr "，結束於 "
 
 #. For Translators : 'starts' is starts:date implying a task starts on what date
-#: ../calendar/gui/e-itip-control.c:888
+#: ../calendar/gui/e-itip-control.c:898
 msgid "Starts"
 msgstr "開始"
 
 #. For Translators : 'ends' is ends:date implying a task ends on what date
-#: ../calendar/gui/e-itip-control.c:902
+#: ../calendar/gui/e-itip-control.c:912
 msgid "Ends"
 msgstr "結束"
 
-#: ../calendar/gui/e-itip-control.c:936
-#: ../plugins/save-calendar/csv-format.c:395
+#: ../calendar/gui/e-itip-control.c:946
+#: ../plugins/save-calendar/csv-format.c:391
 msgid "Due"
 msgstr "截止"
 
-#: ../calendar/gui/e-itip-control.c:976 ../calendar/gui/e-itip-control.c:1033
+#: ../calendar/gui/e-itip-control.c:986 ../calendar/gui/e-itip-control.c:1043
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:993
+#: ../calendar/gui/e-itip-control.c:1003
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
-#: ../calendar/gui/e-itip-control.c:1065 ../calendar/gui/e-itip-control.c:1081
-#: ../calendar/gui/e-itip-control.c:1092 ../calendar/gui/e-itip-control.c:1109
-#: ../plugins/itip-formatter/itip-view.c:342
-#: ../plugins/itip-formatter/itip-view.c:343
-#: ../plugins/itip-formatter/itip-view.c:410
-#: ../plugins/itip-formatter/itip-view.c:411
-#: ../plugins/itip-formatter/itip-view.c:478
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../calendar/gui/e-itip-control.c:1075 ../calendar/gui/e-itip-control.c:1091
+#: ../calendar/gui/e-itip-control.c:1102 ../calendar/gui/e-itip-control.c:1119
+#: ../plugins/itip-formatter/itip-view.c:347
+#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:435
+#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:523
+#: ../plugins/itip-formatter/itip-view.c:524
 msgid "An unknown person"
 msgstr "不明人士"
 
 #. Describe what the user can do
-#: ../calendar/gui/e-itip-control.c:1116
+#: ../calendar/gui/e-itip-control.c:1126
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
-#: ../calendar/gui/e-itip-control.c:1164
+#: ../calendar/gui/e-itip-control.c:1174
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
-#: ../calendar/gui/itip-utils.c:687
-#: ../plugins/itip-formatter/itip-formatter.c:1788
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:199
+#: ../calendar/gui/itip-utils.c:728
+#: ../plugins/itip-formatter/itip-formatter.c:2009
 msgid "Accepted"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:1168 ../calendar/gui/itip-utils.c:690
-#: ../plugins/itip-formatter/itip-formatter.c:1791
+#: ../calendar/gui/e-itip-control.c:1178 ../calendar/gui/itip-utils.c:731
+#: ../plugins/itip-formatter/itip-formatter.c:2012
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:1172
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../calendar/gui/itip-utils.c:693 ../calendar/gui/itip-utils.c:722
-#: ../plugins/itip-formatter/itip-formatter.c:1794
+#: ../calendar/gui/e-meeting-store.c:178 ../calendar/gui/e-meeting-store.c:201
+#: ../calendar/gui/itip-utils.c:734 ../calendar/gui/itip-utils.c:763
+#: ../plugins/itip-formatter/itip-formatter.c:2015
 msgid "Declined"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-itip-control.c:1256
+#: ../calendar/gui/e-itip-control.c:1266
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
 msgstr "會議已經取消，但是在您的行事曆中找不到"
 
-#: ../calendar/gui/e-itip-control.c:1258
+#: ../calendar/gui/e-itip-control.c:1268
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經取消，但是在您的工作清單中找不到"
 
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-itip-control.c:1346
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1338
+#: ../calendar/gui/e-itip-control.c:1347
 msgid "Meeting Information"
 msgstr "會議資訊"
 
-#: ../calendar/gui/e-itip-control.c:1344
+#: ../calendar/gui/e-itip-control.c:1353
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 
-#: ../calendar/gui/e-itip-control.c:1346
+#: ../calendar/gui/e-itip-control.c:1355
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請您出席此次會議。"
 
-#: ../calendar/gui/e-itip-control.c:1347
+#: ../calendar/gui/e-itip-control.c:1356
 msgid "Meeting Proposal"
 msgstr "會議提案"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1353
+#: ../calendar/gui/e-itip-control.c:1362
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
-#: ../calendar/gui/e-itip-control.c:1354
+#: ../calendar/gui/e-itip-control.c:1363
 msgid "Meeting Update"
 msgstr "會議更新"
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1367
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> 希望收到最新的會議資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1359
+#: ../calendar/gui/e-itip-control.c:1368
 msgid "Meeting Update Request"
 msgstr "會議更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1375
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1376
 msgid "Meeting Reply"
 msgstr "會議答覆"
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1383
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
-#: ../calendar/gui/e-itip-control.c:1375
+#: ../calendar/gui/e-itip-control.c:1384
 msgid "Meeting Cancelation"
 msgstr "會議取消"
 
-#: ../calendar/gui/e-itip-control.c:1385 ../calendar/gui/e-itip-control.c:1462
-#: ../calendar/gui/e-itip-control.c:1502
+#: ../calendar/gui/e-itip-control.c:1394 ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1395
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
 
-#: ../calendar/gui/e-itip-control.c:1413
+#: ../calendar/gui/e-itip-control.c:1422
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1414
+#: ../calendar/gui/e-itip-control.c:1423
 msgid "Task Information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/e-itip-control.c:1421
+#: ../calendar/gui/e-itip-control.c:1430
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> 要求 %s 進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1423
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> 要求您進行工作。"
 
-#: ../calendar/gui/e-itip-control.c:1424
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Proposal"
 msgstr "工作計劃"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1430
+#: ../calendar/gui/e-itip-control.c:1439
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> 希望加入一項既存的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1431
+#: ../calendar/gui/e-itip-control.c:1440
 msgid "Task Update"
 msgstr "工作更新"
 
-#: ../calendar/gui/e-itip-control.c:1435
+#: ../calendar/gui/e-itip-control.c:1444
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> 希望收到最新的工作資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1445
 msgid "Task Update Request"
 msgstr "工作更新請求"
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1452
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1453
 msgid "Task Reply"
 msgstr "工作回覆"
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1460
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> 已經取消工作。"
 
-#: ../calendar/gui/e-itip-control.c:1452
+#: ../calendar/gui/e-itip-control.c:1461
 msgid "Task Cancelation"
 msgstr "工作取消"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1472
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
 
-#: ../calendar/gui/e-itip-control.c:1487
+#: ../calendar/gui/e-itip-control.c:1496
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1488
+#: ../calendar/gui/e-itip-control.c:1497
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:1492
+#: ../calendar/gui/e-itip-control.c:1501
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的空閒/忙碌資訊。"
 
-#: ../calendar/gui/e-itip-control.c:1493
+#: ../calendar/gui/e-itip-control.c:1502
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
 
-#: ../calendar/gui/e-itip-control.c:1497
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
-#: ../calendar/gui/e-itip-control.c:1498
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
-#: ../calendar/gui/e-itip-control.c:1503
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
-#: ../calendar/gui/e-itip-control.c:1578
+#: ../calendar/gui/e-itip-control.c:1588
 msgid "The message does not appear to be properly formed"
 msgstr "郵件似乎沒有被適當地組成"
 
-#: ../calendar/gui/e-itip-control.c:1637
+#: ../calendar/gui/e-itip-control.c:1647
 msgid "The message contains only unsupported requests."
 msgstr "這個郵件只包含不支援的請求。"
 
-#: ../calendar/gui/e-itip-control.c:1670
+#: ../calendar/gui/e-itip-control.c:1680
 msgid "The attachment does not contain a valid calendar message"
 msgstr "附件並未包含合法的行事曆訊息"
 
-#: ../calendar/gui/e-itip-control.c:1702
+#: ../calendar/gui/e-itip-control.c:1712
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: ../calendar/gui/e-itip-control.c:1936
+#: ../calendar/gui/e-itip-control.c:1954
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: ../calendar/gui/e-itip-control.c:1964
+#: ../calendar/gui/e-itip-control.c:1988
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: ../calendar/gui/e-itip-control.c:1974
+#: ../calendar/gui/e-itip-control.c:2005
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: ../calendar/gui/e-itip-control.c:1986
+#: ../calendar/gui/e-itip-control.c:2023
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: ../calendar/gui/e-itip-control.c:2003
+#: ../calendar/gui/e-itip-control.c:2047
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: ../calendar/gui/e-itip-control.c:2006
-#: ../plugins/itip-formatter/itip-formatter.c:1108
+#: ../calendar/gui/e-itip-control.c:2054
+#: ../plugins/itip-formatter/itip-formatter.c:1234
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: ../calendar/gui/e-itip-control.c:2030 ../calendar/gui/e-itip-control.c:2078
+#: ../calendar/gui/e-itip-control.c:2085 ../calendar/gui/e-itip-control.c:2142
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2032 ../calendar/gui/e-itip-control.c:2082
+#: ../calendar/gui/e-itip-control.c:2091 ../calendar/gui/e-itip-control.c:2150
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
-#: ../calendar/gui/e-itip-control.c:2162
+#: ../calendar/gui/e-itip-control.c:2230
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
 
-#: ../calendar/gui/e-itip-control.c:2234
+#: ../calendar/gui/e-itip-control.c:2301
 msgid "Update"
 msgstr "更新"
 
-#: ../calendar/gui/e-itip-control.c:2262
+#: ../calendar/gui/e-itip-control.c:2329
 #: ../plugins/groupwise-features/process-meeting.c:48
 msgid "Accept"
 msgstr "接受"
 
-#: ../calendar/gui/e-itip-control.c:2263
+#: ../calendar/gui/e-itip-control.c:2330
 msgid "Tentatively accept"
 msgstr "暫時接受"
 
-#: ../calendar/gui/e-itip-control.c:2264
+#: ../calendar/gui/e-itip-control.c:2331
 #: ../plugins/groupwise-features/process-meeting.c:50
 msgid "Decline"
 msgstr "婉拒"
 
-#: ../calendar/gui/e-itip-control.c:2293
+#: ../calendar/gui/e-itip-control.c:2360
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
 
-#: ../calendar/gui/e-itip-control.c:2321
+#: ../calendar/gui/e-itip-control.c:2388
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
-#: ../calendar/gui/e-itip-control.c:2349
+#: ../calendar/gui/e-itip-control.c:2416
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
-#: ../calendar/gui/e-itip-control.c:2377 ../calendar/gui/itip-utils.c:710
-#: ../mail/mail-send-recv.c:451 ../mail/mail-send-recv.c:504
+#: ../calendar/gui/e-itip-control.c:2444 ../calendar/gui/itip-utils.c:751
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -7781,65 +7637,69 @@ msgid "Attendees"
 msgstr "到會者"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:99 ../calendar/gui/e-meeting-store.c:116
-#: ../calendar/gui/e-meeting-store.c:758
+#: ../calendar/gui/e-meeting-store.c:89 ../calendar/gui/e-meeting-store.c:106
+#: ../calendar/gui/e-meeting-store.c:743 ../calendar/gui/print.c:965
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:101 ../calendar/gui/e-meeting-store.c:118
-#: ../widgets/table/e-table-config-no-group.glade.h:7
-#: ../widgets/table/e-table-config.glade.h:6
+#: ../calendar/gui/e-meeting-store.c:91 ../calendar/gui/e-meeting-store.c:108
+#: ../calendar/gui/print.c:966 ../widgets/table/e-table-config.glade.h:7
 msgid "Group"
 msgstr "群組"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
+#: ../calendar/gui/e-meeting-store.c:93 ../calendar/gui/e-meeting-store.c:110
+#: ../calendar/gui/print.c:967
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:168
-#: ../calendar/gui/e-meeting-store.c:105 ../calendar/gui/e-meeting-store.c:122
+#: ../calendar/gui/e-meeting-store.c:95 ../calendar/gui/e-meeting-store.c:112
+#: ../calendar/gui/print.c:968
 msgid "Room"
 msgstr "會議室"
 
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
+#: ../calendar/gui/e-meeting-store.c:124 ../calendar/gui/e-meeting-store.c:141
+#: ../calendar/gui/print.c:982
 msgid "Chair"
 msgstr "主席"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:136 ../calendar/gui/e-meeting-store.c:153
-#: ../calendar/gui/e-meeting-store.c:761
+#: ../calendar/gui/e-meeting-store.c:126 ../calendar/gui/e-meeting-store.c:143
+#: ../calendar/gui/e-meeting-store.c:746 ../calendar/gui/print.c:983
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:155
+#: ../calendar/gui/e-meeting-store.c:128 ../calendar/gui/e-meeting-store.c:145
+#: ../calendar/gui/print.c:984
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:140 ../calendar/gui/e-meeting-store.c:157
+#: ../calendar/gui/e-meeting-store.c:130 ../calendar/gui/e-meeting-store.c:147
+#: ../calendar/gui/print.c:985
 msgid "Non-Participant"
 msgstr "缺席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../calendar/gui/e-meeting-store.c:771
+#: ../calendar/gui/e-meeting-store.c:174 ../calendar/gui/e-meeting-store.c:197
+#: ../calendar/gui/e-meeting-store.c:756
 msgid "Needs Action"
 msgstr "需要動作"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
-#: ../calendar/gui/e-meeting-time-sel.c:410
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:203
+#: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Tentative"
 msgstr "暫訂"
 
 #: ../calendar/gui/e-meeting-list-view.c:208
-#: ../calendar/gui/e-meeting-store.c:192 ../calendar/gui/e-meeting-store.c:215
-#: ../calendar/gui/itip-utils.c:696
-#: ../plugins/itip-formatter/itip-formatter.c:1797
+#: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
+#: ../calendar/gui/itip-utils.c:737
+#: ../plugins/itip-formatter/itip-formatter.c:2018
 msgid "Delegated"
 msgstr "已委派"
 
@@ -7848,14 +7708,20 @@ msgstr "已委派"
 msgid "Attendee                          "
 msgstr "到會者"
 
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#. To translators: RSVP means "please reply"
+#: ../calendar/gui/e-meeting-list-view.c:526
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:8
+msgid "RSVP"
+msgstr "RSVP"
+
+#: ../calendar/gui/e-meeting-store.c:186 ../calendar/gui/e-meeting-store.c:209
 msgid "In Process"
 msgstr "進行中"
 
 #. This is a strftime() format string %A = full weekday name,
 #. %B = full month name, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:464
-#: ../calendar/gui/e-meeting-time-sel.c:2111
+#: ../calendar/gui/e-meeting-time-sel.c:2137
 msgid "%A, %B %d, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
@@ -7864,7 +7730,7 @@ msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 #. This is a strftime() format string %a = abbreviated weekday name,
 #. %m = month number, %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
-#: ../calendar/gui/e-meeting-time-sel.c:2144
+#: ../calendar/gui/e-meeting-time-sel.c:2168
 msgid "%a %m/%d/%Y"
 msgstr "%Y-%m-%d (%a)"
 
@@ -7874,84 +7740,108 @@ msgstr "%Y-%m-%d (%a)"
 msgid "%m/%d/%Y"
 msgstr "%Y-%m-%d"
 
-#: ../calendar/gui/e-meeting-time-sel.c:412 ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-#: ../calendar/gui/e-meeting-time-sel.c:413
+#: ../calendar/gui/e-meeting-time-sel.c:415
 msgid "No Information"
 msgstr "沒有資訊"
 
-#: ../calendar/gui/e-meeting-time-sel.c:427
+#: ../calendar/gui/e-meeting-time-sel.c:430
 msgid "A_ttendees..."
 msgstr "到會者(_T)..."
 
-#: ../calendar/gui/e-meeting-time-sel.c:444
+#: ../calendar/gui/e-meeting-time-sel.c:451
 msgid "O_ptions"
 msgstr "選項(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:461
+#: ../calendar/gui/e-meeting-time-sel.c:468
 msgid "Show _only working hours"
 msgstr "只顯示工作時間(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:471
+#: ../calendar/gui/e-meeting-time-sel.c:478
 msgid "Show _zoomed out"
 msgstr "顯示縮小(_Z)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:486
+#: ../calendar/gui/e-meeting-time-sel.c:493
 msgid "_Update free/busy"
 msgstr "更新空閒/忙碌(_U)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:501
+#: ../calendar/gui/e-meeting-time-sel.c:508
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:519
+#: ../calendar/gui/e-meeting-time-sel.c:526
 msgid "_Autopick"
 msgstr "自動選擇(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:534
+#: ../calendar/gui/e-meeting-time-sel.c:541
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:551
+#: ../calendar/gui/e-meeting-time-sel.c:558
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:560
+#: ../calendar/gui/e-meeting-time-sel.c:567
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:569
+#: ../calendar/gui/e-meeting-time-sel.c:576
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:578
+#: ../calendar/gui/e-meeting-time-sel.c:585
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
 
-#: ../calendar/gui/e-meeting-time-sel.c:614
+#: ../calendar/gui/e-meeting-time-sel.c:621
 msgid "_Start time:"
 msgstr "開始時刻(_S):"
 
-#: ../calendar/gui/e-meeting-time-sel.c:641
+#: ../calendar/gui/e-meeting-time-sel.c:648
 msgid "_End time:"
 msgstr "結束時刻(_E):"
 
-#: ../calendar/gui/e-memo-table.c:919
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "到會者"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:2
+msgid "Click here to add an attendee"
+msgstr "按這裡新增到會者"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "普通名稱"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "委任自"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "委派給"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "語言"
+
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "成員"
+
+#: ../calendar/gui/e-memo-table.c:939
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
-#: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:1090 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
-#: ../calendar/gui/e-memo-table.etspec.h:3
-msgid "Memo sort"
-msgstr "備忘錄排序"
-
-#: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
-#: ../calendar/gui/gnome-cal.c:2771
+#: ../calendar/gui/e-memos.c:790 ../calendar/gui/e-tasks.c:922
+#: ../calendar/gui/gnome-cal.c:2867
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7960,38 +7850,33 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-#: ../calendar/gui/e-memos.c:772
+#: ../calendar/gui/e-memos.c:839
 msgid "Loading memos"
 msgstr "正在載入備忘錄"
 
-#: ../calendar/gui/e-memos.c:853
+#: ../calendar/gui/e-memos.c:920
 #, c-format
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-#: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
+#: ../calendar/gui/e-memos.c:1093 ../calendar/gui/e-tasks.c:1327
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
-#: ../calendar/gui/e-pub-utils.c:322
-#, c-format
-msgid "Enter the password for %s"
-msgstr "輸入 %s 的密碼"
-
-#: ../calendar/gui/e-tasks.c:885
+#: ../calendar/gui/e-tasks.c:972
 msgid "Loading tasks"
 msgstr "正在載入工作"
 
-#: ../calendar/gui/e-tasks.c:972
+#: ../calendar/gui/e-tasks.c:1059
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
-#: ../calendar/gui/e-tasks.c:1217
+#: ../calendar/gui/e-tasks.c:1304
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
-#: ../calendar/gui/e-tasks.c:1267
+#: ../calendar/gui/e-tasks.c:1354
 msgid "Expunging"
 msgstr "除去中"
 
@@ -8003,47 +7888,47 @@ msgstr "選擇一個時區"
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
 #: ../calendar/gui/e-week-view-main-item.c:327
-#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1624
+#: ../calendar/gui/e-week-view-main-item.c:541 ../calendar/gui/print.c:1637
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:820
+#: ../calendar/gui/gnome-cal.c:828
 msgid "Updating query"
 msgstr "正在更新查詢"
 
-#: ../calendar/gui/gnome-cal.c:2428
+#: ../calendar/gui/gnome-cal.c:2508
 msgid "_Custom View"
 msgstr "自訂檢視(_C)"
 
-#: ../calendar/gui/gnome-cal.c:2429
+#: ../calendar/gui/gnome-cal.c:2509
 msgid "_Save Custom View"
 msgstr "儲存自訂檢視(_S)"
 
-#: ../calendar/gui/gnome-cal.c:2434
+#: ../calendar/gui/gnome-cal.c:2514
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-#: ../calendar/gui/gnome-cal.c:2600
+#: ../calendar/gui/gnome-cal.c:2691
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-#: ../calendar/gui/gnome-cal.c:2619
+#: ../calendar/gui/gnome-cal.c:2710
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-#: ../calendar/gui/gnome-cal.c:2628
+#: ../calendar/gui/gnome-cal.c:2719
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-#: ../calendar/gui/gnome-cal.c:2736
+#: ../calendar/gui/gnome-cal.c:2826
 #, c-format
 msgid "Opening %s"
 msgstr "開啟 %s"
 
-#: ../calendar/gui/gnome-cal.c:3664
+#: ../calendar/gui/gnome-cal.c:3783
 msgid "Purging"
 msgstr "清除"
 
@@ -8103,134 +7988,133 @@ msgstr "九月"
 msgid "_Select Today"
 msgstr "選擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
-#: ../calendar/gui/itip-utils.c:563
+#: ../calendar/gui/itip-utils.c:449 ../calendar/gui/itip-utils.c:498
+#: ../calendar/gui/itip-utils.c:604
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
 
-#: ../calendar/gui/itip-utils.c:448
+#: ../calendar/gui/itip-utils.c:485
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
+#: ../calendar/gui/itip-utils.c:690 ../calendar/gui/itip-utils.c:813
 msgid "Event information"
 msgstr "事件資訊"
 
-#: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
+#: ../calendar/gui/itip-utils.c:692 ../calendar/gui/itip-utils.c:815
 msgid "Task information"
 msgstr "工作資訊"
 
-#: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:776
-msgid "Journal information"
-msgstr "日誌資訊"
+#: ../calendar/gui/itip-utils.c:694 ../calendar/gui/itip-utils.c:817
+msgid "Memo information"
+msgstr "備忘錄資訊"
 
-#: ../calendar/gui/itip-utils.c:655 ../calendar/gui/itip-utils.c:794
+#: ../calendar/gui/itip-utils.c:696 ../calendar/gui/itip-utils.c:835
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-#: ../calendar/gui/itip-utils.c:657
+#: ../calendar/gui/itip-utils.c:698
 msgid "Calendar information"
 msgstr "行事曆資訊"
 
-#: ../calendar/gui/itip-utils.c:706
+#: ../calendar/gui/itip-utils.c:747
 msgid "Updated"
 msgstr "已更新"
 
-#: ../calendar/gui/itip-utils.c:714
+#: ../calendar/gui/itip-utils.c:755
 msgid "Refresh"
 msgstr "重整清單"
 
-#: ../calendar/gui/itip-utils.c:718
+#: ../calendar/gui/itip-utils.c:759
 msgid "Counter-proposal"
 msgstr "計算計劃"
 
-#: ../calendar/gui/itip-utils.c:790
+#: ../calendar/gui/itip-utils.c:831
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-#: ../calendar/gui/itip-utils.c:800
+#: ../calendar/gui/itip-utils.c:841
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
 
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:1008
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
-#: ../calendar/gui/memos-component.c:451
+#: ../calendar/gui/memos-component.c:464
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-#: ../calendar/gui/memos-component.c:527
+#: ../calendar/gui/memos-component.c:544
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 項備忘錄"
 msgstr[1] "%d 項備忘錄"
 
-#: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:520
-#: ../mail/mail-component.c:562
+#: ../calendar/gui/memos-component.c:546 ../calendar/gui/tasks-component.c:537
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
 msgstr[0] "，已選擇 %d 個"
 msgstr[1] "，已選擇 %d 個"
 
-#: ../calendar/gui/memos-component.c:576
+#: ../calendar/gui/memos-component.c:593
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
 
-#: ../calendar/gui/memos-component.c:874
+#: ../calendar/gui/memos-component.c:953
 #, c-format
 msgid "Unable to open the memo list '%s' for creating events and meetings"
 msgstr "無法開啟備忘錄清單「%s」來建立事件和會議"
 
-#: ../calendar/gui/memos-component.c:887
+#: ../calendar/gui/memos-component.c:966
 msgid "There is no calendar available for creating memos"
 msgstr "沒有可用的行事曆來建立備忘錄"
 
-#: ../calendar/gui/memos-component.c:983
+#: ../calendar/gui/memos-component.c:1076
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
 
-#: ../calendar/gui/memos-component.c:1166
+#: ../calendar/gui/memos-component.c:1259
 msgid "New memo"
 msgstr "新增備忘錄"
 
-#: ../calendar/gui/memos-component.c:1167
+#: ../calendar/gui/memos-component.c:1260
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-#: ../calendar/gui/memos-component.c:1168
+#: ../calendar/gui/memos-component.c:1261
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-#: ../calendar/gui/memos-component.c:1174
+#: ../calendar/gui/memos-component.c:1267
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
-#: ../calendar/gui/memos-component.c:1175
+#: ../calendar/gui/memos-component.c:1268
 msgid "_Shared memo"
 msgstr "共用備忘錄(_S)"
 
-#: ../calendar/gui/memos-component.c:1176
+#: ../calendar/gui/memos-component.c:1269
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
 
-#: ../calendar/gui/memos-component.c:1182
+#: ../calendar/gui/memos-component.c:1275
 msgid "New memo list"
 msgstr "新備忘錄清單"
 
-#: ../calendar/gui/memos-component.c:1183
+#: ../calendar/gui/memos-component.c:1276
 msgid "Memo li_st"
 msgstr "備忘錄清單(_S)"
 
-#: ../calendar/gui/memos-component.c:1184
+#: ../calendar/gui/memos-component.c:1277
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
 # zh_HK: msgstr "打印備忘錄"
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/memos-control.c:356 ../calendar/gui/memos-control.c:372
 msgid "Print Memos"
 msgstr "列印備忘錄"
 
@@ -8257,323 +8141,295 @@ msgstr ""
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:770 ../calendar/gui/migration.c:938
+#: ../calendar/gui/migration.c:780 ../calendar/gui/migration.c:948
+#, c-format
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:799
+#: ../calendar/gui/migration.c:809
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
 #. FIXME: domain/code
-#: ../calendar/gui/migration.c:967
+#: ../calendar/gui/migration.c:977
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法移轉工作 `%s'"
 
-#: ../calendar/gui/migration.c:1211
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:404
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:435
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:548
+#: ../calendar/gui/migration.c:1226
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:402
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:433
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:546
 msgid "Notes"
 msgstr "備註"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "1st"
 msgstr "1日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "2nd"
 msgstr "2日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "3rd"
 msgstr "3日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "4th"
 msgstr "4日"
 
-#: ../calendar/gui/print.c:654
+#: ../calendar/gui/print.c:515
 msgid "5th"
 msgstr "5日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "6th"
 msgstr "6日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "7th"
 msgstr "7日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "8th"
 msgstr "8日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "9th"
 msgstr "9日"
 
-#: ../calendar/gui/print.c:655
+#: ../calendar/gui/print.c:516
 msgid "10th"
 msgstr "10日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "11th"
 msgstr "11日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "12th"
 msgstr "12日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "13th"
 msgstr "13日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "14th"
 msgstr "14日"
 
-#: ../calendar/gui/print.c:656
+#: ../calendar/gui/print.c:517
 msgid "15th"
 msgstr "15日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "16th"
 msgstr "16日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "17th"
 msgstr "17日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "18th"
 msgstr "18日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "19th"
 msgstr "19日"
 
-#: ../calendar/gui/print.c:657
+#: ../calendar/gui/print.c:518
 msgid "20th"
 msgstr "20日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "21st"
 msgstr "21日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "22nd"
 msgstr "22日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "23rd"
 msgstr "23日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "24th"
 msgstr "24日"
 
-#: ../calendar/gui/print.c:658
+#: ../calendar/gui/print.c:519
 msgid "25th"
 msgstr "25日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "26th"
 msgstr "26日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "27th"
 msgstr "27日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "28th"
 msgstr "28日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "29th"
 msgstr "29日"
 
-#: ../calendar/gui/print.c:659
+#: ../calendar/gui/print.c:520
 msgid "30th"
 msgstr "30日"
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:521
 msgid "31st"
 msgstr "31日"
 
-#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
-#: ../calendar/gui/print.c:735
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
+#: ../calendar/gui/print.c:596
 msgid "Su"
 msgstr "日"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "Mo"
 msgstr "一"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "Tu"
 msgstr "二"
 
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:596
 msgid "We"
 msgstr "三"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Th"
 msgstr "四"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Fr"
 msgstr "五"
 
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:597
 msgid "Sa"
 msgstr "六"
 
-#. Day
-#: ../calendar/gui/print.c:2047
-msgid "Selected day (%a %b %d %Y)"
-msgstr "選擇的日期(%Y 年 %-m 月 %-d 日 (%a))"
-
-#: ../calendar/gui/print.c:2072 ../calendar/gui/print.c:2076
-msgid "%a %b %d"
-msgstr "%-m 月 %-d 日 (%a)"
-
-#: ../calendar/gui/print.c:2073
-msgid "%a %d %Y"
-msgstr "%Y 年 %-m 月 %-d 日 (%a)"
-
-#: ../calendar/gui/print.c:2077 ../calendar/gui/print.c:2079
-#: ../calendar/gui/print.c:2080
-msgid "%a %b %d %Y"
-msgstr "%Y 年 %-m 月 %-d 日 (%a)"
-
-#: ../calendar/gui/print.c:2084
-#, c-format
-msgid "Selected week (%s - %s)"
-msgstr "選定的週(%s - %s)"
-
-#. Month
-#: ../calendar/gui/print.c:2092
-msgid "Selected month (%b %Y)"
-msgstr "選定的月份(%Y 年 %-m 月)"
-
-#. Year
-#: ../calendar/gui/print.c:2099
-msgid "Selected year (%Y)"
-msgstr "選定的年份(%Y)"
-
-#: ../calendar/gui/print.c:2448
+#: ../calendar/gui/print.c:2442
 msgid "Appointment"
 msgstr "約會"
 
-#: ../calendar/gui/print.c:2450
+#: ../calendar/gui/print.c:2444
 msgid "Task"
 msgstr "工作"
 
-#: ../calendar/gui/print.c:2472
+#: ../calendar/gui/print.c:2466
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
-#: ../calendar/gui/print.c:2523
+#: ../calendar/gui/print.c:2488
+msgid "Attendees: "
+msgstr "到會者:"
+
+#: ../calendar/gui/print.c:2528
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-#: ../calendar/gui/print.c:2540
+#: ../calendar/gui/print.c:2545
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-#: ../calendar/gui/print.c:2552
+#: ../calendar/gui/print.c:2557
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-#: ../calendar/gui/print.c:2564
+#: ../calendar/gui/print.c:2569
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-#: ../calendar/gui/print.c:2577
+#: ../calendar/gui/print.c:2582
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-#: ../calendar/gui/print.c:2588
+#: ../calendar/gui/print.c:2593
 msgid "Contacts: "
 msgstr "連絡人: "
 
-# zh_HK: msgstr "打印項目"
-#: ../calendar/gui/print.c:2654 ../calendar/gui/print.c:2723
-msgid "Print Item"
-msgstr "列印項目"
+#. TODO Allow the user to customize the title.
+#: ../calendar/gui/print.c:2695
+msgid "Upcoming Appointments"
+msgstr "即將開始的約會"
 
-#: ../calendar/gui/tasks-component.c:442
+#: ../calendar/gui/tasks-component.c:455
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-#: ../calendar/gui/tasks-component.c:518
+#: ../calendar/gui/tasks-component.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d 項工作"
 msgstr[1] "%d 項工作"
 
-#: ../calendar/gui/tasks-component.c:567
+#: ../calendar/gui/tasks-component.c:584
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
 
-#: ../calendar/gui/tasks-component.c:878
+#: ../calendar/gui/tasks-component.c:941
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "無法開啟工作清單 '%s' 來建立事件和會議"
 
-#: ../calendar/gui/tasks-component.c:891
+#: ../calendar/gui/tasks-component.c:954
 msgid "There is no calendar available for creating tasks"
 msgstr "沒有可用的行事曆來建立工作"
 
-#: ../calendar/gui/tasks-component.c:988
+#: ../calendar/gui/tasks-component.c:1065
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
 
-#: ../calendar/gui/tasks-component.c:1244
+#: ../calendar/gui/tasks-component.c:1321
 msgid "New task"
 msgstr "新增工作"
 
-#: ../calendar/gui/tasks-component.c:1246
+#: ../calendar/gui/tasks-component.c:1323
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-#: ../calendar/gui/tasks-component.c:1252
+#: ../calendar/gui/tasks-component.c:1329
 msgid "New assigned task"
 msgstr "新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1253
+#: ../calendar/gui/tasks-component.c:1330
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-#: ../calendar/gui/tasks-component.c:1254
+#: ../calendar/gui/tasks-component.c:1331
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-#: ../calendar/gui/tasks-component.c:1260
+#: ../calendar/gui/tasks-component.c:1337
 msgid "New task list"
 msgstr "新工作清單"
 
-#: ../calendar/gui/tasks-component.c:1261
+#: ../calendar/gui/tasks-component.c:1338
 msgid "Tas_k list"
 msgstr "工作清單(_K)"
 
-#: ../calendar/gui/tasks-component.c:1262
+#: ../calendar/gui/tasks-component.c:1339
 msgid "Create a new task list"
 msgstr "建立新工作清單"
 
-#: ../calendar/gui/tasks-control.c:446
+#: ../calendar/gui/tasks-control.c:455
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -8585,25 +8441,21 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: ../calendar/gui/tasks-control.c:449
+#: ../calendar/gui/tasks-control.c:458 ../mail/em-folder-view.c:1131
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
-#: ../calendar/gui/tasks-control.c:483
+#: ../calendar/gui/tasks-control.c:495 ../calendar/gui/tasks-control.c:511
 msgid "Print Tasks"
 msgstr "列印工作"
 
-#. The first letter of each day of the week starting with Sunday
-#: ../calendar/gui/weekday-picker.c:319
-msgid "SMTWTFS"
-msgstr "日一二三四五六"
-
 #: ../calendar/importers/icalendar-importer.c:79
 msgid "Appointments and Meetings"
 msgstr "約會和會議"
 
 #: ../calendar/importers/icalendar-importer.c:337
 #: ../calendar/importers/icalendar-importer.c:620
+#: ../plugins/itip-formatter/itip-formatter.c:1562
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
@@ -10165,201 +10017,125 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-#: ../composer/e-msg-composer-attachment-bar.c:105
-#, c-format
-msgid "%.0fK"
-msgstr "%.0fK"
-
-#: ../composer/e-msg-composer-attachment-bar.c:108
-#, c-format
-msgid "%.0fM"
-msgstr "%.0fM"
-
-#: ../composer/e-msg-composer-attachment-bar.c:111
-#, c-format
-msgid "%.0fG"
-msgstr "%.0fG"
-
-#: ../composer/e-msg-composer-attachment-bar.c:740
-#: ../widgets/misc/e-attachment-bar.c:1017
-msgid "Attachment Bar"
-msgstr "附加檔案列"
-
-#: ../composer/e-msg-composer-attachment.c:187
-#: ../composer/e-msg-composer-attachment.c:203
-#: ../composer/e-msg-composer-attachment.c:297
-#: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:241 ../widgets/misc/e-attachment.c:256
-#: ../widgets/misc/e-attachment.c:439 ../widgets/misc/e-attachment.c:456
-#, c-format
-msgid "Cannot attach file %s: %s"
-msgstr "不能附加檔案 %s： %s"
-
-#: ../composer/e-msg-composer-attachment.c:195
-#: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
-#, c-format
-msgid "Cannot attach file %s: not a regular file"
-msgstr "不能附加檔案 %s：不是一個合法的檔案"
-
-#: ../composer/e-msg-composer-attachment.glade.h:1
-#: ../widgets/misc/e-attachment.glade.h:1
-msgid "Attachment Properties"
-msgstr "附件內容"
-
-#: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../widgets/misc/e-attachment.glade.h:3
-msgid "File name:"
-msgstr "檔案名稱:"
-
-#: ../composer/e-msg-composer-attachment.glade.h:4
-#: ../widgets/misc/e-attachment.glade.h:4
-msgid "MIME type:"
-msgstr "MIME 類型:"
+#: ../composer/e-composer-name-header.c:95
+msgid "Click here for the address book"
+msgstr "按這裡新增目錄服務"
 
-#: ../composer/e-msg-composer-hdrs.c:570
+#: ../composer/e-composer-post-header.c:117
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-#: ../composer/e-msg-composer-hdrs.c:571
+#: ../composer/e-composer-post-header.c:118
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
-#: ../composer/e-msg-composer-hdrs.c:603
-msgid "Click here for the address book"
-msgstr "按這裡新增目錄服務"
+#: ../composer/e-composer-post-header.c:152
+msgid "Click here to select folders to post to"
+msgstr "按一下這裡，選取要張貼的資料夾"
 
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: ../composer/e-msg-composer-hdrs.c:635
-msgid "_Reply-To:"
-msgstr "回覆地址(_R):"
+#. Now add the signature stuff.
+#: ../composer/e-msg-composer-hdrs.c:221
+msgid "Si_gnature:"
+msgstr "簽名檔(_G):"
 
-#.
-#. * From
-#.
-#: ../composer/e-msg-composer-hdrs.c:642
+#: ../composer/e-msg-composer-hdrs.c:326
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-#.
-#. * Subject
-#.
-#: ../composer/e-msg-composer-hdrs.c:649
-msgid "S_ubject:"
-msgstr "主旨(_U):"
+#: ../composer/e-msg-composer-hdrs.c:332
+msgid "_Reply-To:"
+msgstr "回覆地址(_R):"
 
-#: ../composer/e-msg-composer-hdrs.c:658
+#: ../composer/e-msg-composer-hdrs.c:335
 msgid "_To:"
 msgstr "收件者(_T):"
 
-#: ../composer/e-msg-composer-hdrs.c:659
+#: ../composer/e-msg-composer-hdrs.c:337
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
-#: ../composer/e-msg-composer-hdrs.c:662
+#: ../composer/e-msg-composer-hdrs.c:340
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-#: ../composer/e-msg-composer-hdrs.c:663
+#: ../composer/e-msg-composer-hdrs.c:342
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
-#: ../composer/e-msg-composer-hdrs.c:666
+#: ../composer/e-msg-composer-hdrs.c:346
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-#: ../composer/e-msg-composer-hdrs.c:667
+#: ../composer/e-msg-composer-hdrs.c:348
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr "輸入郵件密件副本的收件者"
+"appearing in the recipient list of the message"
+msgstr ""
+"輸入郵件密件副本的收件者，他們會收到這封郵件但不會出現在郵件的收件者清單"
 
-#.
-#. * Post-To
-#.
-#: ../composer/e-msg-composer-hdrs.c:674
+#: ../composer/e-msg-composer-hdrs.c:353
 msgid "_Post To:"
 msgstr "張貼到(_P):"
 
-#: ../composer/e-msg-composer-hdrs.c:679
-msgid "Click here to select folders to post to"
-msgstr "按一下這裡，選取要張貼的資料夾"
-
-#: ../composer/e-msg-composer-hdrs.c:684
-msgid "Post To:"
-msgstr "張貼到:"
+#: ../composer/e-msg-composer-hdrs.c:356
+msgid "S_ubject:"
+msgstr "主旨(_U):"
 
-#: ../composer/e-msg-composer-select-file.c:82
+#: ../composer/e-msg-composer-select-file.c:77
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-#: ../composer/e-msg-composer-select-file.c:243
+#: ../composer/e-msg-composer-select-file.c:198
 msgid "Insert Attachment"
 msgstr "插入附加檔案"
 
-#: ../composer/e-msg-composer.c:830
+#: ../composer/e-msg-composer.c:819
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽署送出的郵件：此帳號沒有設定簽章憑證"
 
-#: ../composer/e-msg-composer.c:837
+#: ../composer/e-msg-composer.c:826
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr "無法加密送出的郵件：沒有設定加密憑證(此帳號)"
 
-#: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2563
+#: ../composer/e-msg-composer.c:1418 ../composer/e-msg-composer.c:2516
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2566
-#: ../composer/e-msg-composer.c:3939
+#: ../composer/e-msg-composer.c:1421 ../composer/e-msg-composer.c:2519
+#: ../composer/e-msg-composer.c:3881
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
-#: ../composer/e-msg-composer.c:1332 ../composer/e-msg-composer.c:1366
-#: ../plugins/mail-remote/e-corba-utils.c:135
+#: ../composer/e-msg-composer.c:1453 ../composer/e-msg-composer.c:1487
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-#: ../composer/e-msg-composer.c:1404
+#: ../composer/e-msg-composer.c:1525
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
-#: ../composer/e-msg-composer.c:1412
+#: ../composer/e-msg-composer.c:1533
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
-#: ../composer/e-msg-composer.c:1697
+#: ../composer/e-msg-composer.c:1820
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
 #. NB: This function is never used anymore
-#: ../composer/e-msg-composer.c:1732
+#: ../composer/e-msg-composer.c:1856
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2198 ../mail/em-account-editor.c:606
-#: ../mail/em-account-editor.c:651 ../mail/em-account-editor.c:718
-msgid "Autogenerated"
-msgstr "自動產生的"
-
-#: ../composer/e-msg-composer.c:2301
-msgid "Si_gnature:"
-msgstr "簽名檔(_G):"
-
-#: ../composer/e-msg-composer.c:2577 ../composer/e-msg-composer.c:3821
-#: ../composer/e-msg-composer.c:3824
+#: ../composer/e-msg-composer.c:2530 ../composer/e-msg-composer.c:3761
+#: ../composer/e-msg-composer.c:3764
 msgid "Compose Message"
 msgstr "編輯郵件"
 
-#: ../composer/e-msg-composer.c:5048
+#: ../composer/e-msg-composer.c:5034
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -10499,7 +10275,7 @@ msgstr "撰寫郵件前，您需要先設定帳號。"
 msgid "_Do not Recover"
 msgstr "不要復原(_D)"
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:31 ../shell/main.c:310
 msgid "_Recover"
 msgstr "復原(_R)"
 
@@ -10508,18 +10284,16 @@ msgid "_Save Message"
 msgstr "儲存郵件(_S)"
 
 #: ../data/evolution.desktop.in.in.h:1
-#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/main.c:523
-msgid "Evolution"
-msgstr "Evolution"
+msgid "Evolution Mail and Calendar"
+msgstr "Evolution 郵件與行事曆"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:574
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:672
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟體"
 
 #: ../data/evolution.desktop.in.in.h:3
-msgid "The Evolution PIM and Email Client"
-msgstr "Evolution PIM 與郵件客戶端"
+msgid "Manage your email, contacts and schedule"
+msgstr "管理您的郵件、連絡人和行程"
 
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
@@ -10529,109 +10303,6 @@ msgstr "地址卡"
 msgid "calendar information"
 msgstr "行事曆資訊"
 
-#: ../designs/OOA/ooa.glade.h:1
-#: ../plugins/exchange-operations/exchange-oof.glade.h:1
-msgid ""
-"<b>Currently, your status is \"Out of the Office\". </b>\n"
-"\n"
-"Would you like to change your status to \"In the Office\"? "
-msgstr ""
-"<b>目前您的狀態是「不在辦公室」。</b>\n"
-"\n"
-"要變更狀態為「在辦公室」嗎？ "
-
-#: ../designs/OOA/ooa.glade.h:4
-#: ../plugins/exchange-operations/exchange-oof.glade.h:4
-msgid "<b>Out of Office Message:</b>"
-msgstr "<b>外出訊息：</b>"
-
-#: ../designs/OOA/ooa.glade.h:5
-#: ../plugins/exchange-operations/exchange-oof.glade.h:5
-msgid "<b>Status:</b>"
-msgstr "<b>狀態：</b>"
-
-#: ../designs/OOA/ooa.glade.h:6
-#: ../plugins/exchange-operations/exchange-oof.glade.h:6
-msgid ""
-"<small>The message specified below will be automatically sent to each person "
-"who sends\n"
-"mail to you while you are out of the office.</small>"
-msgstr ""
-"<small>當您不在辦公室時，以下指定的郵件將會自動傳送給\n"
-"每一位傳送郵件給您的人。</small>"
-
-#: ../designs/OOA/ooa.glade.h:8
-#: ../plugins/exchange-operations/exchange-oof.glade.h:8
-msgid "I am currently in the office"
-msgstr "我目前在辦公室"
-
-#: ../designs/OOA/ooa.glade.h:9
-#: ../plugins/exchange-operations/exchange-oof.glade.h:9
-msgid "I am currently out of the office"
-msgstr "我目前不在辦公室"
-
-#: ../designs/OOA/ooa.glade.h:10
-msgid "No, Do not Change Status"
-msgstr "否，請不要變更狀態"
-
-#: ../designs/OOA/ooa.glade.h:12
-#: ../plugins/exchange-operations/exchange-oof.glade.h:11
-msgid "Out of Office Assistant"
-msgstr "外出助理"
-
-#: ../designs/OOA/ooa.glade.h:13
-#: ../plugins/exchange-operations/exchange-oof.glade.h:12
-msgid "Yes, Change Status"
-msgstr "是，請變更狀態"
-
-#: ../designs/read_receipts/read.glade.h:1
-msgid "<b>Receiving Email</b>"
-msgstr "<b>正在接收電子郵件</b>"
-
-#: ../designs/read_receipts/read.glade.h:2
-msgid "<b>Sending Email:</b>"
-msgstr "<b>正在傳送電子郵件:</b>"
-
-#: ../designs/read_receipts/read.glade.h:3
-msgid ""
-"<small>This page allows you to choose if you want to be notified via a read "
-"receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests "
-"a receipt from you.</small>"
-msgstr ""
-"<small>此頁面可以讓您選擇，當別人閱讀您的郵件後，是否傳送讀信回條，\n"
-"以及指定當某人要求您傳送回條時，Evolution 要做什麼。</small>"
-
-#: ../designs/read_receipts/read.glade.h:5
-msgid "Always send back a read receipt"
-msgstr "一定送回讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:6
-msgid "Ask me if I want to send back a read receipt"
-msgstr "詢問我是否要傳送讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:7
-msgid "Never send back a read receipt"
-msgstr "永遠不傳送讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:8
-msgid "Read Receipts"
-msgstr "讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:9
-msgid "Request a read receipt for all messages I send"
-msgstr "要求所有我傳送的郵件都索取讀信回條"
-
-#: ../designs/read_receipts/read.glade.h:10
-msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "除非郵件傳送至郵寄清單，而不是給我個人"
-
-#: ../designs/read_receipts/read.glade.h:11
-msgid ""
-"When you receive an email with a read receipt request, what should Evolution "
-"do?"
-msgstr "當您收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
-
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Evolution 錯誤"
@@ -10654,6 +10325,19 @@ msgstr "Evolution 查詢"
 msgid "Internal error, unknown error '%s' requested"
 msgstr "內部錯誤，要求的不明錯誤 '%s'>"
 
+#: ../e-util/e-print.c:138
+msgid "An error occurred while printing"
+msgstr "在列印時發生錯誤"
+
+#: ../e-util/e-print.c:145
+msgid "The printing system reported the following details about the error:"
+msgstr "列印系統回報下列關於此錯誤的詳細資訊："
+
+#: ../e-util/e-print.c:151
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "列印系統沒有回報任何關於此錯誤的額外資訊。"
+
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "無法開啟檔案「{0}」。"
@@ -10674,151 +10358,229 @@ msgstr "檔案存在「{0}」。"
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
-#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:134
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:141
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-#: ../e-util/eggtrayicon.c:121
-msgid "The orientation of the tray."
-msgstr "系統匣的方向。"
+#: ../e-util/e-util-labels.c:45
+msgid "I_mportant"
+msgstr "重要(_M)"
+
+#. red
+#: ../e-util/e-util-labels.c:46
+msgid "_Work"
+msgstr "工作(_W)"
+
+#. orange
+#: ../e-util/e-util-labels.c:47
+msgid "_Personal"
+msgstr "個人(_P)"
+
+#. green
+#: ../e-util/e-util-labels.c:48
+msgid "_To Do"
+msgstr "待辦事項(_T)"
+
+#. blue
+#: ../e-util/e-util-labels.c:49
+msgid "_Later"
+msgstr "稍後(_L)"
+
+#: ../e-util/e-util-labels.c:317
+msgid "Label _Name:"
+msgstr "標籤名稱(_N):"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Edit Label"
+msgstr "編輯標籤"
+
+#: ../e-util/e-util-labels.c:339
+msgid "Add Label"
+msgstr "加入標籤"
 
-#: ../filter/filter-datespec.c:78
+#: ../e-util/e-util-labels.c:357
+msgid "Label name cannot be empty."
+msgstr "標籤的名稱不能空白。"
+
+#: ../e-util/e-util-labels.c:362
+msgid "Label with same tag already exists. Rename your label please."
+msgstr "已存在同樣的標籤。請更改標籤名稱。"
+
+#: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "1 秒前"
 msgstr[1] "%d 秒前"
 
-#: ../filter/filter-datespec.c:79
+#: ../filter/filter-datespec.c:80
+#, c-format
+msgid "1 second in the future"
+msgid_plural "%d seconds in the future"
+msgstr[0] "1 秒後"
+msgstr[1] "%d 秒後"
+
+#: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "1 分鐘前"
 msgstr[1] "%d 分鐘前"
 
-#: ../filter/filter-datespec.c:80
+#: ../filter/filter-datespec.c:81
+#, c-format
+msgid "1 minute in the future"
+msgid_plural "%d minutes in the future"
+msgstr[0] "1 分鐘後"
+msgstr[1] "%d 分鐘後"
+
+#: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "1 小時前"
 msgstr[1] "%d 小時前"
 
-#: ../filter/filter-datespec.c:81
+#: ../filter/filter-datespec.c:82
+#, c-format
+msgid "1 hour in the future"
+msgid_plural "%d hours in the future"
+msgstr[0] "1 小時後"
+msgstr[1] "%d 小時後"
+
+#: ../filter/filter-datespec.c:83
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
 msgstr[0] "1 日前"
 msgstr[1] "%d 日前"
 
-#: ../filter/filter-datespec.c:82
+#: ../filter/filter-datespec.c:83
+#, c-format
+msgid "1 day in the future"
+msgid_plural "%d days in the future"
+msgstr[0] "1 天後"
+msgstr[1] "%d 天後"
+
+#: ../filter/filter-datespec.c:84
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "1 週前"
 msgstr[1] "%d 週前"
 
-#: ../filter/filter-datespec.c:83
+#: ../filter/filter-datespec.c:84
+#, c-format
+msgid "1 week in the future"
+msgid_plural "%d weeks in the future"
+msgstr[0] "1 週後"
+msgstr[1] "%d 週後"
+
+#: ../filter/filter-datespec.c:85
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
 msgstr[0] "1 月前"
 msgstr[1] "%d 月前"
 
-#: ../filter/filter-datespec.c:84
+#: ../filter/filter-datespec.c:85
+#, c-format
+msgid "1 month in the future"
+msgid_plural "%d months in the future"
+msgstr[0] "1 個月後"
+msgstr[1] "%d 個月後"
+
+#: ../filter/filter-datespec.c:86
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
 msgstr[0] "1 年前"
 msgstr[1] "%d 年前"
 
-#: ../filter/filter-datespec.c:285
+#: ../filter/filter-datespec.c:86
+#, c-format
+msgid "1 year in the future"
+msgid_plural "%d years in the future"
+msgstr[0] "1 年後"
+msgstr[1] "%d 年後"
+
+#: ../filter/filter-datespec.c:287
 msgid "<click here to select a date>"
 msgstr "<按這裏選擇日期>"
 
-#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:290 ../filter/filter-datespec.c:301
+#: ../filter/filter-datespec.c:312
 msgid "now"
 msgstr "現在"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/filter-datespec.c:295
+#: ../filter/filter-datespec.c:297
 msgid "%d-%b-%Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../filter/filter-datespec.c:415
+#: ../filter/filter-datespec.c:451
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
-#: ../filter/filter-file.c:296 ../filter/filter-file.c:302
+#: ../filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1053 ../mail/mail-config.glade.h:92
-msgid "Important"
-msgstr "重要"
-
-#. forest green
-#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
-#: ../mail/mail-config.glade.h:147
-msgid "To Do"
-msgstr "待辦"
-
-#. blue
-#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
-#: ../mail/mail-config.glade.h:97
-msgid "Later"
-msgstr "稍後"
-
-#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:533
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "測試"
 
-#: ../filter/filter-rule.c:799
-msgid "_Search name:"
-msgstr "搜尋名稱(_S):"
+#: ../filter/filter-rule.c:800
+msgid "R_ule name:"
+msgstr "規則名稱(_U):"
 
-#: ../filter/filter-rule.c:827
+#: ../filter/filter-rule.c:828
 msgid "Find items that meet the following criteria"
 msgstr "尋找符合下列條件的項目"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:862
+msgid "A_dd Filter Criteria"
+msgstr "加入過濾器規則(_D)"
+
+#: ../filter/filter-rule.c:868
 msgid "If all criteria are met"
 msgstr "如果全部條件符合"
 
-#: ../filter/filter-rule.c:866
+#: ../filter/filter-rule.c:868
 msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
-#: ../filter/filter-rule.c:868
+#: ../filter/filter-rule.c:870
 msgid "_Find items:"
 msgstr "尋找項目(_F):"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "Replies"
 msgstr "回覆"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
-#: ../filter/filter-rule.c:890
+#: ../filter/filter-rule.c:892
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-#: ../filter/filter-rule.c:892
-msgid "Include threads"
-msgstr "包括線串"
+#: ../filter/filter-rule.c:894
+msgid "I_nclude threads"
+msgstr "包括郵件群組(_N)"
 
-#: ../filter/filter-rule.c:987 ../filter/filter.glade.h:3
-#: ../mail/em-utils.c:311
+#: ../filter/filter-rule.c:990 ../filter/filter.glade.h:3
+#: ../mail/em-utils.c:309
 msgid "Incoming"
 msgstr "內送"
 
-#: ../filter/filter-rule.c:987 ../mail/em-utils.c:312
+#: ../filter/filter-rule.c:990 ../mail/em-utils.c:310
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -10842,7 +10604,7 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
-#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:73
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:76
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -10910,35 +10672,46 @@ msgstr "相對於目前時間的時差"
 msgid "ago"
 msgstr "前"
 
-#: ../filter/filter.glade.h:17
+#: ../filter/filter.glade.h:16
+#, fuzzy
+msgid "in the future"
+msgstr "1 天後"
+
+#: ../filter/filter.glade.h:18
 msgid "months"
 msgstr "月"
 
-#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:181
+#: ../filter/filter.glade.h:19 ../mail/mail-config.glade.h:182
 msgid "seconds"
 msgstr "秒後"
 
-#: ../filter/filter.glade.h:19
+#: ../filter/filter.glade.h:20
 msgid "the current time"
 msgstr "目前時間"
 
-#: ../filter/filter.glade.h:20
+#: ../filter/filter.glade.h:21
 msgid "the time you specify"
 msgstr "您所指定的時間"
 
-#: ../filter/filter.glade.h:22
+#: ../filter/filter.glade.h:22 ../plugins/calendar-http/calendar-http.c:291
+#: ../plugins/calendar-weather/calendar-weather.c:564
+#: ../plugins/google-account-setup/google-source.c:398
+msgid "weeks"
+msgstr "週"
+
+#: ../filter/filter.glade.h:23
 msgid "years"
 msgstr "年"
 
-#: ../filter/rule-editor.c:378
+#: ../filter/rule-editor.c:380
 msgid "Add Rule"
 msgstr "新增規則"
 
-#: ../filter/rule-editor.c:454
+#: ../filter/rule-editor.c:459
 msgid "Edit Rule"
 msgstr "編輯規則"
 
-#: ../filter/rule-editor.c:732
+#: ../filter/rule-editor.c:747
 msgid "Rule name"
 msgstr "規則名稱"
 
@@ -10983,22 +10756,21 @@ msgstr "Evolution 郵件撰寫器組態控制"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 郵件優先設定控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
-#: ../mail/importers/elm-importer.c:341
-#: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:580
-#: ../mail/mail-component.c:581 ../mail/mail-component.c:722
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:611
+#: ../mail/importers/elm-importer.c:329 ../mail/importers/pine-importer.c:382
+#: ../mail/mail-component.c:572 ../mail/mail-component.c:573
+#: ../mail/mail-component.c:737
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: ../mail/em-account-prefs.c:532
+#: ../mail/em-account-prefs.c:502
 msgid "Mail Accounts"
 msgstr "郵件帳號"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
-#: ../mail/mail-config.glade.h:100
+#: ../mail/mail-config.glade.h:102
 msgid "Mail Preferences"
 msgstr "郵件偏好設定"
 
@@ -11025,116 +10797,114 @@ msgstr ""
 "並選取核取方塊來接受它\n"
 
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
-#: ../mail/em-vfolder-rule.c:511
+#: ../mail/em-vfolder-rule.c:512
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
+#: ../mail/em-account-editor.c:606 ../mail/em-account-editor.c:651
+#: ../mail/em-account-editor.c:718 ../widgets/misc/e-signature-combo-box.c:78
+msgid "Autogenerated"
+msgstr "自動產生的"
+
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-#: ../mail/em-account-editor.c:1812 ../mail/mail-config.glade.h:91
+#: ../mail/em-account-editor.c:1822 ../mail/mail-config.glade.h:93
 msgid "Identity"
 msgstr "身分"
 
-#: ../mail/em-account-editor.c:1861 ../mail/mail-config.glade.h:119
+#: ../mail/em-account-editor.c:1871 ../mail/mail-config.glade.h:120
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
-#: ../mail/em-account-editor.c:2046
-msgid "Automatically check for _new mail every"
+#: ../mail/em-account-editor.c:2053
+msgid "Check for _new messages every"
 msgstr "自動檢查新郵件每(_N)"
 
-#: ../mail/em-account-editor.c:2227 ../mail/mail-config.glade.h:131
+#: ../mail/em-account-editor.c:2061
+msgid "minu_tes"
+msgstr "分鐘(_T)"
+
+#: ../mail/em-account-editor.c:2235 ../mail/mail-config.glade.h:131
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-#: ../mail/em-account-editor.c:2286 ../mail/mail-config.glade.h:67
+#: ../mail/em-account-editor.c:2294 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2352 ../mail/mail-config.glade.h:125
+#: ../mail/em-account-editor.c:2360 ../mail/mail-config.glade.h:126
 #: ../plugins/exchange-operations/exchange-account-setup.c:317
 msgid "Security"
 msgstr "安全性"
 
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:2389 ../mail/em-account-editor.c:2480
+#: ../mail/em-account-editor.c:2397 ../mail/em-account-editor.c:2488
 msgid "Receiving Options"
 msgstr "接收選項"
 
-#: ../mail/em-account-editor.c:2390 ../mail/em-account-editor.c:2481
-msgid "Checking for New Mail"
+#: ../mail/em-account-editor.c:2398 ../mail/em-account-editor.c:2489
+msgid "Checking for New Messages"
 msgstr "檢查新郵件"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:33
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-#: ../mail/em-account-editor.c:2832 ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2840 ../mail/mail-config.glade.h:83
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:409
-msgid "Disable"
-msgstr "停用"
-
-#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
-#: ../mail/em-account-prefs.c:411
-msgid "Enable"
-msgstr "啟用"
-
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:466
+#: ../mail/em-account-prefs.c:436
 msgid "[Default]"
 msgstr "[預設值]"
 
-#. g_object_set((GObject *)renderer, "activatable", TRUE, NULL);
-#: ../mail/em-account-prefs.c:519 ../mail/em-composer-prefs.c:930
-#: ../plugins/plugin-manager/plugin-manager.c:205
-#: ../plugins/publish-calendar/publish-calendar.c:493
+#: ../mail/em-account-prefs.c:489 ../mail/em-composer-prefs.c:947
+#: ../plugins/plugin-manager/plugin-manager.c:323
+#: ../plugins/publish-calendar/publish-calendar.c:510
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../mail/em-account-prefs.c:525
+#: ../mail/em-account-prefs.c:495
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: ../mail/em-account-prefs.c:527
+#: ../mail/em-account-prefs.c:497
 msgid "Protocol"
 msgstr "通訊協定"
 
-#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
-#: ../mail/mail-config.c:1033
+#: ../mail/em-composer-prefs.c:304 ../mail/em-composer-prefs.c:430
+#: ../mail/mail-config.c:1062
 msgid "Unnamed"
 msgstr "未命名的"
 
-#: ../mail/em-composer-prefs.c:936
+#: ../mail/em-composer-prefs.c:953
 msgid "Language(s)"
 msgstr "語言"
 
-#: ../mail/em-composer-prefs.c:979
+#: ../mail/em-composer-prefs.c:996
 msgid "Add signature script"
 msgstr "新增簽名程序檔"
 
-#: ../mail/em-composer-prefs.c:999
+#: ../mail/em-composer-prefs.c:1016
 msgid "Signature(s)"
 msgstr "簽名檔"
 
-#: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:897 ../mail/em-format-quote.c:399
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-#: ../mail/em-composer-utils.c:1665
+#: ../mail/em-composer-utils.c:1702
 msgid "an unknown sender"
 msgstr "不明的寄件者"
 
 #. Note to translators: this is the attribution string used when quoting messages.
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
-#: ../mail/em-composer-utils.c:1712
+#: ../mail/em-composer-utils.c:1749
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -11142,6 +10912,10 @@ msgstr ""
 "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
 "${TimeZone}，${Sender} 提到："
 
+#: ../mail/em-composer-utils.c:1890
+msgid "-----Original Message-----"
+msgstr "-----原始郵件-----"
+
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
 msgstr "過濾器規則(_F)"
@@ -11164,365 +10938,401 @@ msgid "Attachments"
 msgstr "附加檔案"
 
 #: ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "密件副本(BCC)"
+
+#: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "嗶聲"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "副本(CC)"
+
+#: ../mail/em-filter-i18n.h:9
+msgid "Completed On"
+msgstr "已完成於"
+
+#: ../mail/em-filter-i18n.h:10
 msgid "contains"
 msgstr "包含"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "複製至資料夾"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "收件日期"
 
-#: ../mail/em-filter-i18n.h:10
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "送件日期"
 
-#: ../mail/em-filter-i18n.h:11
-#: ../plugins/groupwise-features/share-folder.c:777
+#: ../mail/em-filter-i18n.h:14
+#: ../plugins/groupwise-features/share-folder.c:778
 #: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
 #: ../ui/evolution-mail-message.xml.h:25 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "刪除"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "已刪除"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:16
 msgid "does not contain"
 msgstr "不包含"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:17
 msgid "does not end with"
 msgstr "不是以此結束"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:18
 msgid "does not exist"
 msgstr "不存在"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:19
 msgid "does not return"
 msgstr "沒有傳回"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:20
 msgid "does not sound like"
 msgstr "不類似"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:21
 msgid "does not start with"
 msgstr "不是以此開始"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:22
 msgid "Do Not Exist"
 msgstr "不存在"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:23
 msgid "Draft"
 msgstr "草稿"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:24
 msgid "ends with"
 msgstr "以此終結"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:25
 msgid "Exist"
 msgstr "存在"
 
-#: ../mail/em-filter-i18n.h:23
+#: ../mail/em-filter-i18n.h:26
 msgid "exists"
 msgstr "存在"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:27
 msgid "Expression"
 msgstr "詞句"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:28
 msgid "Follow Up"
 msgstr "跟隨"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:29 ../mail/em-migrate.c:1054
+msgid "Important"
+msgstr "重要"
+
+#: ../mail/em-filter-i18n.h:30
 msgid "is"
 msgstr "是"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:31
 msgid "is after"
 msgstr "是之後的"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:32
 msgid "is before"
 msgstr "是之前的"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:33
 msgid "is Flagged"
 msgstr "有標幟"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:34
 msgid "is greater than"
 msgstr "大於"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:35
 msgid "is less than"
 msgstr "小於"
 
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:36
 msgid "is not"
 msgstr "不是"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:37
 msgid "is not Flagged"
 msgstr "沒有標幟"
 
-#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:94
+#: ../mail/em-filter-i18n.h:38
+msgid "is not set"
+msgstr "未設定"
+
+#: ../mail/em-filter-i18n.h:39
+msgid "is set"
+msgstr "設定"
+
+#: ../mail/em-filter-i18n.h:40 ../mail/mail-config.glade.h:96
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:41
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-#: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
+#: ../mail/em-filter-i18n.h:42 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "標籤"
 
-#: ../mail/em-filter-i18n.h:38
+#: ../mail/em-filter-i18n.h:43
 msgid "Mailing list"
 msgstr "郵件列表"
 
-#: ../mail/em-filter-i18n.h:39
+#: ../mail/em-filter-i18n.h:44
 msgid "Match All"
 msgstr "符合全部"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:45
 msgid "Message Body"
 msgstr "郵件內容"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:46
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:47
 msgid "Message is Junk"
 msgstr "垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:43
+#: ../mail/em-filter-i18n.h:48
 msgid "Message is not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:49
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:50
 msgid "Pipe to Program"
 msgstr "建立程式管道"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:51
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
+#. Translators: "Read" as in "has been read" (em-filter-i18n.h)
+#. Translators: "Read" as in "has been read" (message-tag-followup.c)
+#: ../mail/em-filter-i18n.h:53 ../mail/message-tag-followup.c:82
 msgid "Read"
 msgstr "已閱讀"
 
-#: ../mail/em-filter-i18n.h:48 ../mail/message-list.etspec.h:11
+#: ../mail/em-filter-i18n.h:54 ../mail/message-list.etspec.h:12
 msgid "Recipients"
 msgstr "收件者"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:55
 msgid "Regex Match"
 msgstr "正規表示式相配"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:56
 msgid "Replied to"
 msgstr "回覆"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:57
 msgid "returns"
 msgstr "傳回"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:58
 msgid "returns greater than"
 msgstr "傳回大於"
 
-#: ../mail/em-filter-i18n.h:53
+#: ../mail/em-filter-i18n.h:59
 msgid "returns less than"
 msgstr "傳回小於"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:60
 msgid "Run Program"
 msgstr "執行程式"
 
-#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
+#: ../mail/em-filter-i18n.h:61 ../mail/message-list.etspec.h:13
 msgid "Score"
 msgstr "目標"
 
-#: ../mail/em-filter-i18n.h:56 ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:62 ../mail/message-list.etspec.h:14
 msgid "Sender"
 msgstr "寄件者"
 
-#: ../mail/em-filter-i18n.h:57
+#: ../mail/em-filter-i18n.h:63
+msgid "Set Label"
+msgstr "設定標籤"
+
+#: ../mail/em-filter-i18n.h:64
 msgid "Set Status"
 msgstr "設定狀態"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:65
 msgid "Size (kB)"
 msgstr "大小 (kB)"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:66
 msgid "sounds like"
 msgstr "類似"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:67
 msgid "Source Account"
 msgstr "來源帳號"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:68
 msgid "Specific header"
 msgstr "指定檔頭"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:69
 msgid "starts with"
 msgstr "以此開始"
 
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:71
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1661
-#: ../mail/em-format-quote.c:313 ../mail/em-format.c:853
-#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:17
-#: ../mail/message-tag-followup.c:336
-#: ../plugins/groupwise-features/properties.glade.h:6
+#: ../mail/em-filter-i18n.h:72 ../mail/em-format-html.c:1696
+#: ../mail/em-format-quote.c:320 ../mail/em-format.c:891
+#: ../mail/em-mailer-prefs.c:95 ../mail/message-list.etspec.h:18
+#: ../mail/message-tag-followup.c:337
+#: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
 msgid "Subject"
 msgstr "主旨"
 
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:73
 msgid "Unset Status"
 msgstr "取消設定狀態"
 
 #. and now for the action area
-#: ../mail/em-filter-rule.c:488
-msgid "<b>Then</b>"
-msgstr "<b>然後</b>"
+#: ../mail/em-filter-rule.c:489
+msgid "Then"
+msgstr "接著依"
 
-#: ../mail/em-folder-browser.c:168
+#: ../mail/em-filter-rule.c:517
+msgid "Add Ac_tion"
+msgstr "加入動作(_T)"
+
+#: ../mail/em-folder-browser.c:189
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)..."
 
-#: ../mail/em-folder-browser.c:190
+#: ../mail/em-folder-browser.c:214
 msgid "All Messages"
 msgstr "所有郵件"
 
-#: ../mail/em-folder-browser.c:191
+#: ../mail/em-folder-browser.c:215
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-#: ../mail/em-folder-browser.c:193
+#: ../mail/em-folder-browser.c:217
 msgid "No Label"
 msgstr "無標籤"
 
-#: ../mail/em-folder-browser.c:200
+#: ../mail/em-folder-browser.c:224
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-#: ../mail/em-folder-browser.c:201
+#: ../mail/em-folder-browser.c:225
 msgid "Recent Messages"
 msgstr "最近的郵件"
 
-#: ../mail/em-folder-browser.c:202
+#: ../mail/em-folder-browser.c:226
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-#: ../mail/em-folder-browser.c:203
+#: ../mail/em-folder-browser.c:227
 msgid "Messages with Attachments"
 msgstr "有附加檔案的郵件"
 
-#: ../mail/em-folder-browser.c:204
+#: ../mail/em-folder-browser.c:228
 msgid "Important Messages"
 msgstr "重要郵件"
 
-#: ../mail/em-folder-browser.c:205
+#: ../mail/em-folder-browser.c:229
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-#: ../mail/em-folder-browser.c:1028
+#: ../mail/em-folder-browser.c:1123
 msgid "Account Search"
 msgstr "帳號搜尋"
 
-#: ../mail/em-folder-browser.c:1072
+#: ../mail/em-folder-browser.c:1176
 msgid "All Account Search"
 msgstr "所有的帳號搜尋"
 
+#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
+#: ../mail/em-folder-properties.c:149
+msgid "Unread messages:"
+msgid_plural "Unread messages:"
+msgstr[0] "未讀郵件:"
+msgstr[1] "未讀郵件:"
+
 #. TODO: can this be done in a loop?
 #. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:150
+#: ../mail/em-folder-properties.c:163
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
 msgstr[1] "所有郵件:"
 
-#. to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567
-#: ../mail/em-folder-properties.c:163
-msgid "Unread messages:"
-msgid_plural "Unread messages:"
-msgstr[0] "未讀郵件:"
-msgstr[1] "未讀郵件:"
-
-#: ../mail/em-folder-properties.c:316
-#: ../plugins/groupwise-features/properties.glade.h:2
+#: ../mail/em-folder-properties.c:323
+#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Folder Properties"
 msgstr "資料夾內容"
 
-#: ../mail/em-folder-selection-button.c:123
+#: ../mail/em-folder-selection-button.c:124
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
-#: ../mail/em-folder-selector.c:261
-msgid "Create"
-msgstr "建立"
+#: ../mail/em-folder-selector.c:262
+msgid "C_reate"
+msgstr "建立(_R)"
 
-#: ../mail/em-folder-selector.c:265
+#: ../mail/em-folder-selector.c:266
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
-#: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
+#: ../mail/em-folder-tree-model.c:204 ../mail/em-folder-tree-model.c:206
+#: ../mail/mail-vfolder.c:935 ../mail/mail-vfolder.c:1020
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:210 ../mail/em-folder-tree-model.c:212
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:494 ../mail/mail-component.c:157
 msgid "Drafts"
 msgstr "草稿"
 
 #. translators: standard local mailbox names
-#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:151
-#: ../plugins/exchange-operations/exchange-folder.c:587
+#: ../mail/em-folder-tree-model.c:497 ../mail/em-folder-tree.c:2552
+#: ../mail/mail-component.c:156
+#: ../plugins/exchange-operations/exchange-delegates-user.c:83
+#: ../plugins/exchange-operations/exchange-folder.c:593
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:500 ../mail/mail-component.c:158
 msgid "Outbox"
 msgstr "寄件匣"
 
-#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:154
+#: ../mail/em-folder-tree-model.c:502 ../mail/mail-component.c:159
 msgid "Sent"
 msgstr "已傳送"
 
-#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
+#: ../mail/em-folder-tree-model.c:524 ../mail/em-folder-tree-model.c:831
 msgid "Loading..."
 msgstr "載入中..."
 
@@ -11541,349 +11351,383 @@ msgstr "載入中..."
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:366
+#: ../mail/em-folder-tree.c:372
 #, c-format
 msgid "folder-display|%s (%u)"
 msgstr "%s (%u)"
 
-#: ../mail/em-folder-tree.c:717
+#: ../mail/em-folder-tree.c:732
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-#: ../mail/em-folder-tree.c:877
+#: ../mail/em-folder-tree.c:891
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-#: ../mail/em-folder-tree.c:879
+#: ../mail/em-folder-tree.c:893
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-#: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1827
+#: ../mail/em-folder-tree.c:900 ../mail/message-list.c:1968
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1829
+#: ../mail/em-folder-tree.c:902 ../mail/message-list.c:1970
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-#: ../mail/em-folder-tree.c:904
+#: ../mail/em-folder-tree.c:917
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
-#: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:1011 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:1001 ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:1012 ../ui/evolution-mail-message.xml.h:118
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-#: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
+#: ../mail/em-folder-tree.c:1721 ../mail/mail-ops.c:1055
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
 
-#: ../mail/em-folder-tree.c:2065 ../ui/evolution-addressbook.xml.h:64
-#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:29
+#: ../mail/em-folder-tree.c:2094 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:34
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:58 ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:63 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:54
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../mail/em-folder-tree.c:2066
+#: ../mail/em-folder-tree.c:2095
 msgid "Open in _New Window"
 msgstr "在新視窗開啟(_N)"
 
-#: ../mail/em-folder-tree.c:2070
-msgid "_Copy..."
-msgstr "複製(_C)..."
-
-#: ../mail/em-folder-tree.c:2071
-msgid "_Move..."
-msgstr "移動(_M)..."
-
 #. FIXME: need to disable for nochildren folders
-#: ../mail/em-folder-tree.c:2075
+#: ../mail/em-folder-tree.c:2100
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)..."
 
-#: ../mail/em-folder-tree.c:2078 ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2103
+msgid "_Move..."
+msgstr "移動(_M)..."
+
+#: ../mail/em-folder-tree.c:2110 ../ui/evolution-mail-list.xml.h:39
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:131
+#: ../mail/em-folder-tree.c:2111
+msgid "Re_fresh"
+msgstr "重新整理(_F)"
+
+#: ../mail/em-folder-tree.c:2112
+msgid "Fl_ush Outbox"
+msgstr "清理寄件匣(_U)"
+
+#: ../mail/em-folder-tree.c:2118 ../mail/mail.error.xml.h:138
 msgid "_Empty Trash"
 msgstr "清空回收筒(_E)"
 
-#: ../mail/em-folder-utils.c:104
+#: ../mail/em-folder-utils.c:103
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s」複製到「%s」"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1030
-#: ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1191
+#: ../mail/em-folder-view.c:1206
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1045
+#: ../mail/em-folder-utils.c:366 ../mail/em-folder-view.c:1206
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:581
-#: ../plugins/groupwise-features/share-folder-common.c:145
+#: ../mail/em-folder-utils.c:587
+#: ../plugins/groupwise-features/share-folder-common.c:143
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Create folder"
 msgstr "建立資料夾"
 
-#: ../mail/em-folder-utils.c:730
+#: ../mail/em-folder-utils.c:745
 #: ../plugins/groupwise-features/install-shared.c:164
-#: ../plugins/groupwise-features/share-folder-common.c:388
+#: ../plugins/groupwise-features/share-folder-common.c:385
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
-#: ../mail/em-folder-view.c:966 ../mail/mail.error.xml.h:66
+#: ../mail/em-folder-view.c:1095 ../mail/mail.error.xml.h:70
 msgid "Mail Deletion Failed"
 msgstr "刪除郵件失敗"
 
-#: ../mail/em-folder-view.c:967 ../mail/mail.error.xml.h:119
+#: ../mail/em-folder-view.c:1096 ../mail/mail.error.xml.h:126
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "您沒有足夠的權限刪除此封郵件。"
 
-#: ../mail/em-folder-view.c:1138 ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1334 ../ui/evolution-mail-message.xml.h:128
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1140 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../mail/em-folder-view.c:1336 ../mail/em-popup.c:578 ../mail/em-popup.c:589
 #: ../ui/evolution-mail-message.xml.h:110
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/em-folder-view.c:1143 ../ui/evolution-mail-message.xml.h:107
+#. EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone
+#: ../mail/em-folder-view.c:1340 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
-#: ../mail/em-folder-view.c:1149
+#: ../mail/em-folder-view.c:1342
+#: ../plugins/print-message/org-gnome-print-message.xml.h:3
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:44
+#: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-tasks.xml.h:29
+msgid "_Print..."
+msgstr "列印(_P)..."
+
+#: ../mail/em-folder-view.c:1346
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
-#: ../mail/em-folder-view.c:1150
+#: ../mail/em-folder-view.c:1347
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
-#: ../mail/em-folder-view.c:1151
+#: ../mail/em-folder-view.c:1348
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
-#: ../mail/em-folder-view.c:1154
+#: ../mail/em-folder-view.c:1351
 msgid "Mar_k as Read"
 msgstr "標示成已閱讀(_K)"
 
-#: ../mail/em-folder-view.c:1155
+#: ../mail/em-folder-view.c:1352
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
-#: ../mail/em-folder-view.c:1156
+#: ../mail/em-folder-view.c:1353
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
-#: ../mail/em-folder-view.c:1157
+#: ../mail/em-folder-view.c:1354
 msgid "Mark as Un_important"
 msgstr "標示成不重要(_I)"
 
-#: ../mail/em-folder-view.c:1158
+#: ../mail/em-folder-view.c:1355
 msgid "Mark as _Junk"
 msgstr "標示成垃圾郵件(_J)"
 
-#: ../mail/em-folder-view.c:1159
+#: ../mail/em-folder-view.c:1356
 msgid "Mark as _Not Junk"
 msgstr "標示成非垃圾郵件(_N)"
 
-#: ../mail/em-folder-view.c:1160
+#: ../mail/em-folder-view.c:1357
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)..."
 
-#: ../mail/em-folder-view.c:1162
+#: ../mail/em-folder-view.c:1359
 msgid "_Label"
 msgstr "標籤(_L)"
 
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../mail/em-folder-view.c:1163 ../widgets/misc/e-dateedit.c:475
+#: ../mail/em-folder-view.c:1360 ../widgets/misc/e-dateedit.c:498
 msgid "_None"
 msgstr "無(_N)"
 
-#: ../mail/em-folder-view.c:1168
+#: ../mail/em-folder-view.c:1363
+msgid "_New Label"
+msgstr "新增標籤(_N)"
+
+#: ../mail/em-folder-view.c:1367
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
-#: ../mail/em-folder-view.c:1169
+#: ../mail/em-folder-view.c:1368
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
-#: ../mail/em-folder-view.c:1172
+#: ../mail/em-folder-view.c:1371
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
-#: ../mail/em-folder-view.c:1173
-msgid "Search Folder from _Subject"
+#. Translators: The following strings are used while creating a new search folder, to specify what parameter the search folder would be based on.
+#: ../mail/em-folder-view.c:1373
+msgid "Search Folder based on _Subject"
 msgstr "從主旨建立搜尋資料夾(_S)"
 
-#: ../mail/em-folder-view.c:1174
-msgid "Search Folder from Se_nder"
+#: ../mail/em-folder-view.c:1374
+msgid "Search Folder based on Se_nder"
 msgstr "從寄件者建立搜尋資料夾(_N)"
 
-#: ../mail/em-folder-view.c:1175
-msgid "Search Folder from _Recipients"
+#: ../mail/em-folder-view.c:1375
+msgid "Search Folder based on _Recipients"
 msgstr "從收件者建立搜尋資料夾(_R)"
 
-#: ../mail/em-folder-view.c:1176
-msgid "Search Folder from Mailing _List"
+#: ../mail/em-folder-view.c:1376
+msgid "Search Folder based on Mailing _List"
 msgstr "從郵件清單建立搜尋資料夾(_L)"
 
-#: ../mail/em-folder-view.c:1180
-msgid "Filter on Sub_ject"
+#. Translators: The following strings are used while creating a new message filter, to specify what parameter the filter would be based on.
+#: ../mail/em-folder-view.c:1381
+msgid "Filter based on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
-#: ../mail/em-folder-view.c:1181
-msgid "Filter on Sen_der"
+#: ../mail/em-folder-view.c:1382
+msgid "Filter based on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
-#: ../mail/em-folder-view.c:1182
-msgid "Filter on Re_cipients"
+#: ../mail/em-folder-view.c:1383
+msgid "Filter based on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
-#: ../mail/em-folder-view.c:1183
-msgid "Filter on _Mailing List"
+#: ../mail/em-folder-view.c:1384
+msgid "Filter based on _Mailing List"
 msgstr "從通信論壇建立過濾器(_M)"
 
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:2036 ../mail/em-folder-view.c:2080
+#: ../mail/em-folder-view.c:2266 ../mail/em-folder-view.c:2310
 msgid "Default"
 msgstr "預設值"
 
-# zh_HK: msgstr "打印郵件"
-#: ../mail/em-folder-view.c:2185 ../mail/em-folder-view.c:2190
-#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
-#: ../plugins/print-message/print-message.c:87
-msgid "Print Message"
-msgstr "列印郵件"
-
-#: ../mail/em-folder-view.c:2349
+#: ../mail/em-folder-view.c:2528
 msgid "Unable to retrieve message"
 msgstr "無法接收郵件"
 
 #: ../mail/em-folder-view.c:2547
+msgid "Retrieving Message..."
+msgstr "取回郵件..."
+
+#: ../mail/em-folder-view.c:2806
+msgid "C_all To..."
+msgstr ""
+
+#: ../mail/em-folder-view.c:2809
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
 
-#: ../mail/em-folder-view.c:2548
+#: ../mail/em-folder-view.c:2810
 msgid "_From this Address"
 msgstr "從這個位址(_F)"
 
-#: ../mail/em-folder-view.c:2549
+#: ../mail/em-folder-view.c:2811
 msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
-#: ../mail/em-folder-view.c:2906
+#: ../mail/em-folder-view.c:3308
 #, c-format
 msgid "Click to mail %s"
 msgstr "按一下來傳送郵件 %s"
 
-#: ../mail/em-folder-view.c:2911
+#: ../mail/em-folder-view.c:3320
+#, c-format
+msgid "Click to call %s"
+msgstr "按一下播號給 %s"
+
+#: ../mail/em-folder-view.c:3325
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:514
+#: ../mail/em-format-html-display.c:515
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
-#: ../mail/em-format-html-display.c:657
-msgid "Fi_nd:"
-msgstr "尋找(_N):"
+#: ../mail/em-format-html-display.c:659
+msgid "Fin_d:"
+msgstr "尋找(_D):"
 
 #. gtk_box_pack_start ((GtkBox *)(hbox2), p->search_entry_box, TRUE, TRUE, 5);
-#: ../mail/em-format-html-display.c:681
+#: ../mail/em-format-html-display.c:683
 msgid "_Previous"
 msgstr "上一個(_P)"
 
-#: ../mail/em-format-html-display.c:686
+#: ../mail/em-format-html-display.c:688
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: ../mail/em-format-html-display.c:691
+#: ../mail/em-format-html-display.c:693
 msgid "M_atch case"
 msgstr "區分大小寫(_A)"
 
-#: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:992 ../mail/em-format-html.c:635
 msgid "Unsigned"
 msgstr "未簽名"
 
-#: ../mail/em-format-html-display.c:938
+#: ../mail/em-format-html-display.c:992
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此郵件未簽名。不保證此郵件已驗證。"
 
-#: ../mail/em-format-html-display.c:939 ../mail/em-format-html.c:620
+#: ../mail/em-format-html-display.c:993 ../mail/em-format-html.c:636
 msgid "Valid signature"
 msgstr "有效的簽名"
 
-#: ../mail/em-format-html-display.c:939
+#: ../mail/em-format-html-display.c:993
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此郵件已簽名而且有效，表示它非常有可能是驗證的郵件。"
 
-#: ../mail/em-format-html-display.c:940 ../mail/em-format-html.c:621
+#: ../mail/em-format-html-display.c:994 ../mail/em-format-html.c:637
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../mail/em-format-html-display.c:940
+#: ../mail/em-format-html-display.c:994
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "郵件的簽名無法檢驗，可能已在傳送時被更動了。"
 
-#: ../mail/em-format-html-display.c:941
-msgid "Valid signature, cannot verify sender"
-msgstr "簽名有效，但無法檢驗寄件者"
+#: ../mail/em-format-html-display.c:995 ../mail/em-format-html.c:638
+msgid "Valid signature, but cannot verify sender"
+msgstr "簽名有效，但是無法檢驗寄件者"
 
-#: ../mail/em-format-html-display.c:941
+#: ../mail/em-format-html-display.c:995
 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:947 ../mail/em-format-html.c:628
+#: ../mail/em-format-html-display.c:996 ../mail/em-format-html.c:639
+msgid "Signature exists, but need public key"
+msgstr "簽章存在，但需要公開金鑰"
+
+#: ../mail/em-format-html-display.c:996
+msgid ""
+"This message is signed with a signature, but there is no corresponding "
+"public key."
+msgstr "此郵件有一個有效的簽名，但是沒有對應的公開金鑰。"
+
+#: ../mail/em-format-html-display.c:1003 ../mail/em-format-html.c:645
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:947
+#: ../mail/em-format-html-display.c:1003
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
 msgstr "此郵件未加密。它的內容在透過網際網路傳送可能會被檢閱。"
 
-#: ../mail/em-format-html-display.c:948 ../mail/em-format-html.c:629
+#: ../mail/em-format-html-display.c:1004 ../mail/em-format-html.c:646
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html-display.c:948
+#: ../mail/em-format-html-display.c:1004
 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 "
@@ -11892,21 +11736,21 @@ msgstr ""
 "此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時"
 "日，並不是無法檢視此郵件的內容。"
 
-#: ../mail/em-format-html-display.c:949 ../mail/em-format-html.c:630
+#: ../mail/em-format-html-display.c:1005 ../mail/em-format-html.c:647
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html-display.c:949
+#: ../mail/em-format-html-display.c:1005
 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:950 ../mail/em-format-html.c:631
+#: ../mail/em-format-html-display.c:1006 ../mail/em-format-html.c:648
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html-display.c:950
+#: ../mail/em-format-html-display.c:1006
 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 "
@@ -11915,89 +11759,93 @@ msgstr ""
 "此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件"
 "的內容。"
 
-#: ../mail/em-format-html-display.c:1051 ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:1107 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../mail/em-format-html-display.c:1066
+#: ../mail/em-format-html-display.c:1122
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-#: ../mail/em-format-html-display.c:1385
+#: ../mail/em-format-html-display.c:1441
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1393
+#: ../mail/em-format-html-display.c:1449
 msgid "Overdue:"
 msgstr "到期日:"
 
 # (Abel) combine with previous entry
-#: ../mail/em-format-html-display.c:1396
+#: ../mail/em-format-html-display.c:1452
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/em-format-html-display.c:1456
+#: ../mail/em-format-html-display.c:1512
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1457
+#: ../mail/em-format-html-display.c:1513
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../mail/em-format-html-display.c:1458
+#: ../mail/em-format-html-display.c:1514
 msgid "_Fit to Width"
 msgstr "符合寬度(_F)"
 
-#: ../mail/em-format-html-display.c:1459
+#: ../mail/em-format-html-display.c:1515
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
-#: ../mail/em-format-html-display.c:1900 ../mail/em-format-html-display.c:2505
-#: ../mail/mail-config.glade.h:44 ../mail/message-list.etspec.h:1
+#: ../mail/em-format-html-display.c:1959 ../mail/em-format-html-display.c:2572
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-#: ../mail/em-format-html-display.c:2107
-msgid "Select folder to save all attachments..."
-msgstr "選擇用來儲存所有的附加檔案的資料夾..."
+#: ../mail/em-format-html-display.c:2173
+msgid "Save attachment as"
+msgstr "另存附加檔案為"
+
+#: ../mail/em-format-html-display.c:2177
+msgid "Select folder to save all attachments"
+msgstr "選擇用來儲存所有附加檔案的資料夾"
 
-#: ../mail/em-format-html-display.c:2154
+#: ../mail/em-format-html-display.c:2228
 msgid "_Save Selected..."
 msgstr "儲存選取的(_S)..."
 
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:2221
+#: ../mail/em-format-html-display.c:2295
 #, c-format
 msgid "%d at_tachment"
 msgid_plural "%d at_tachments"
 msgstr[0] "%d 個附件(_T)"
 msgstr[1] "%d 個附件(_T)"
 
-#: ../mail/em-format-html-display.c:2228 ../mail/em-format-html-display.c:2306
+#: ../mail/em-format-html-display.c:2302 ../mail/em-format-html-display.c:2380
 msgid "S_ave"
 msgstr "儲存(_A)"
 
-#: ../mail/em-format-html-display.c:2239
+#: ../mail/em-format-html-display.c:2313
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-#: ../mail/em-format-html-display.c:2302
+#: ../mail/em-format-html-display.c:2376
 msgid "No Attachment"
 msgstr "無附件"
 
-#: ../mail/em-format-html-display.c:2433 ../mail/em-format-html-display.c:2478
+#: ../mail/em-format-html-display.c:2507 ../mail/em-format-html-display.c:2545
 msgid "View _Unformatted"
 msgstr "檢閱未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2435
+#: ../mail/em-format-html-display.c:2509
 msgid "Hide _Unformatted"
 msgstr "隱藏未排版的(_U)"
 
-#: ../mail/em-format-html-display.c:2497
+#: ../mail/em-format-html-display.c:2564
 msgid "O_pen With"
 msgstr "以...開啟(_O)"
 
-#: ../mail/em-format-html-display.c:2566
+#: ../mail/em-format-html-display.c:2635
 msgid ""
 "Evolution cannot render this email as it is too large to handle. You can "
 "view it unformatted or with an external text editor."
@@ -12005,148 +11853,229 @@ msgstr ""
 "Evolution 無法顯示此封電子郵件，因為它已超出能處理的大小。您可以用不排版的方"
 "式或使用外部文字編輯器來閱讀它。"
 
-#: ../mail/em-format-html-print.c:141
+#: ../mail/em-format-html-print.c:156
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-#: ../mail/em-format-html.c:484 ../mail/em-format-html.c:486
+#: ../mail/em-format-html.c:489 ../mail/em-format-html.c:498
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
 
-#: ../mail/em-format-html.c:622
-msgid "Valid signature but cannot verify sender"
-msgstr "簽名有效，但是無法檢驗寄件者"
+#: ../mail/em-format-html.c:910
+msgid "Unknown external-body part."
+msgstr "未知的外加本文部分。"
 
-#: ../mail/em-format-html.c:893
+#: ../mail/em-format-html.c:918
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
-#: ../mail/em-format-html.c:923
+#: ../mail/em-format-html.c:948
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-#: ../mail/em-format-html.c:934
+#: ../mail/em-format-html.c:959
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-#: ../mail/em-format-html.c:936
+#: ../mail/em-format-html.c:961
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: ../mail/em-format-html.c:957
+#: ../mail/em-format-html.c:982
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
-#: ../mail/em-format-html.c:968
+#: ../mail/em-format-html.c:993
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
-#: ../mail/em-format-html.c:1195
+#: ../mail/em-format-html.c:1221
 msgid "Formatting message"
 msgstr "格式化郵件"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:85
-#: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
-msgid "From"
-msgstr "寄件者"
-
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:849 ../mail/em-mailer-prefs.c:86
-msgid "Reply-To"
-msgstr "回覆"
+#: ../mail/em-format-html.c:1388
+msgid "Formatting Message..."
+msgstr "格式化郵件..."
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:851 ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1540 ../mail/em-format-html.c:1604
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:889 ../mail/em-mailer-prefs.c:93
 msgid "Cc"
 msgstr "副本"
 
-#: ../mail/em-format-html.c:1490 ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:852 ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1541 ../mail/em-format-html.c:1610
+#: ../mail/em-format-html.c:1629 ../mail/em-format-quote.c:207
+#: ../mail/em-format.c:890 ../mail/em-mailer-prefs.c:94
 msgid "Bcc"
 msgstr "密件副本"
 
 #. pseudo-header
-#: ../mail/em-format-html.c:1665 ../mail/em-format-quote.c:322
-#: ../mail/em-mailer-prefs.c:1045
+#: ../mail/em-format-html.c:1700 ../mail/em-format-quote.c:329
+#: ../mail/em-mailer-prefs.c:1458
 msgid "Mailer"
 msgstr "寄件者"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: ../mail/em-format-html.c:1692
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
+#: ../mail/em-format-html.c:1727
+msgid " (%a, %R %Z)"
+msgstr " (%a, %R %Z)"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: ../mail/em-format-html.c:1695
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: ../mail/em-format-html.c:1705 ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:854 ../mail/em-mailer-prefs.c:91
-#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
-#: ../widgets/misc/e-dateedit.c:363
+#: ../mail/em-format-html.c:1732
+msgid " (%R %Z)"
+msgstr " (%R %Z)"
+
+#: ../mail/em-format-html.c:1744 ../mail/em-format-quote.c:336
+#: ../mail/em-format.c:892 ../mail/em-mailer-prefs.c:96
+#: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:346
+#: ../widgets/misc/e-dateedit.c:368
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format-html.c:1728 ../mail/em-format.c:855
-#: ../mail/em-mailer-prefs.c:92
+#: ../mail/em-format-html.c:1767 ../mail/em-format.c:893
+#: ../mail/em-mailer-prefs.c:97
 msgid "Newsgroups"
 msgstr "新聞群組"
 
-#: ../mail/em-format.c:1119
+#. To translators: This message suggests to the receipients that the sender of the mail is
+#. different from the one listed in From field.
+#.
+#: ../mail/em-format-html.c:1860
+#, c-format
+msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
+msgstr "這封郵件是由 <b>%s</b> 代表 <b>%s</b> 寄出"
+
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:886
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:7
+#: ../mail/message-tag-followup.c:333
+msgid "From"
+msgstr "寄件者"
+
+#: ../mail/em-format-quote.c:207 ../mail/em-format.c:887
+#: ../mail/em-mailer-prefs.c:91
+msgid "Reply-To"
+msgstr "回覆"
+
+#: ../mail/em-format.c:1157
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
-#: ../mail/em-format.c:1158 ../mail/em-format.c:1306 ../mail/em-format.c:1608
+#: ../mail/em-format.c:1196
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 
-#: ../mail/em-format.c:1288 ../mail/em-format.c:1444
+#: ../mail/em-format.c:1333 ../mail/em-format.c:1489
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
-#: ../mail/em-format.c:1296
+#: ../mail/em-format.c:1341
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "多部份/已加密不支援的加密類型"
 
-#: ../mail/em-format.c:1463
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message"
+msgstr "無法剖析 PGP/MIME 郵件"
+
+#: ../mail/em-format.c:1351
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "無法剖析 PGP/MIME 郵件：未知的錯誤"
+
+#: ../mail/em-format.c:1508
 msgid "Unsupported signature format"
 msgstr "不支援的簽名格式"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1587
 msgid "Error verifying signature"
 msgstr "檢驗簽名發生錯誤"
 
-#: ../mail/em-format.c:1471 ../mail/em-format.c:1537
+#: ../mail/em-format.c:1516 ../mail/em-format.c:1578 ../mail/em-format.c:1587
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
-#: ../mail/em-mailer-prefs.c:103
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message"
+msgstr "無法剖析 PGP 郵件"
+
+#: ../mail/em-format.c:1659
+msgid "Could not parse PGP message: Unknown error"
+msgstr "無法剖析 PGP 郵件：未知的錯誤"
+
+#: ../mail/em-mailer-prefs.c:108
 msgid "Every time"
 msgstr "每次"
 
-#: ../mail/em-mailer-prefs.c:104
+#: ../mail/em-mailer-prefs.c:109
 msgid "Once per day"
 msgstr "每天一次"
 
-#: ../mail/em-mailer-prefs.c:105
+#: ../mail/em-mailer-prefs.c:110
 msgid "Once per week"
 msgstr "每週一次"
 
-#: ../mail/em-mailer-prefs.c:106
+#: ../mail/em-mailer-prefs.c:111
 msgid "Once per month"
 msgstr "每月一次"
 
-#: ../mail/em-migrate.c:1210
+#: ../mail/em-mailer-prefs.c:341
+msgid "Add Custom Junk Header"
+msgstr "加入自訂垃圾郵件檔頭"
+
+#: ../mail/em-mailer-prefs.c:345
+msgid "Header Name:"
+msgstr "標頭名稱:"
+
+#: ../mail/em-mailer-prefs.c:346
+msgid "Header Value Contains:"
+msgstr "標頭數值包含:"
+
+#: ../mail/em-mailer-prefs.c:451
+msgid "Contains Value"
+msgstr "包含數值"
+
+#: ../mail/em-mailer-prefs.c:473
+msgid "Color"
+msgstr "色彩"
+
+#: ../mail/em-mailer-prefs.c:476
+msgid "Tag"
+msgstr "標籤"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1086 ../mail/em-mailer-prefs.c:1140
+#, c-format
+msgid "%s plugin is available and the binary is installed."
+msgstr "%s 外掛程式已可使用並且該軟體也安裝完成。"
+
+#. May be a better text
+#: ../mail/em-mailer-prefs.c:1094 ../mail/em-mailer-prefs.c:1149
+#, c-format
+msgid ""
+"%s plugin is not available. Please check whether the package is installed."
+msgstr "%s 外掛程式尚無法使用。請檢查是否有安裝該套件。"
+
+#: ../mail/em-mailer-prefs.c:1115
+msgid "No Junk plugin available"
+msgstr "沒有可用的垃圾郵件外掛程式"
+
+#. green
+#: ../mail/em-migrate.c:1057
+msgid "To Do"
+msgstr "待辦"
+
+#. blue
+#: ../mail/em-migrate.c:1058
+msgid "Later"
+msgstr "稍後"
+
+#: ../mail/em-migrate.c:1211
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12157,109 +12086,109 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-#: ../mail/em-migrate.c:1649
+#: ../mail/em-migrate.c:1650
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
-#: ../mail/em-migrate.c:1675
+#: ../mail/em-migrate.c:1676
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
-#: ../mail/em-migrate.c:1860
+#: ../mail/em-migrate.c:1861
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
-#: ../mail/em-migrate.c:2064
+#: ../mail/em-migrate.c:2065
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2078
+#: ../mail/em-migrate.c:2079
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 
-#: ../mail/em-migrate.c:2107
+#: ../mail/em-migrate.c:2108
 #, c-format
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
-#: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
+#: ../mail/em-migrate.c:2579 ../mail/em-migrate.c:2591
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
 
-#: ../mail/em-migrate.c:2713
+#: ../mail/em-migrate.c:2827
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
-#: ../mail/em-migrate.c:2732
+#: ../mail/em-migrate.c:2846
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
 "無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
 
-#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
+#: ../mail/em-popup.c:574 ../mail/em-popup.c:585
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../mail/em-popup.c:575 ../mail/em-popup.c:586
 #: ../ui/evolution-mail-message.xml.h:83
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-#: ../mail/em-popup.c:622
+#: ../mail/em-popup.c:639
 msgid "_Add to Address Book"
 msgstr "加入到通訊錄(_A)"
 
-#: ../mail/em-subscribe-editor.c:603
+#: ../mail/em-subscribe-editor.c:595
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
-#: ../mail/em-subscribe-editor.c:633
+#: ../mail/em-subscribe-editor.c:628
 msgid "Subscribed"
 msgstr "已訂閱"
 
-#: ../mail/em-subscribe-editor.c:637
+#: ../mail/em-subscribe-editor.c:632
 msgid "Folder"
 msgstr "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: ../mail/em-subscribe-editor.c:835
+#: ../mail/em-subscribe-editor.c:834
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: ../mail/em-subscribe-editor.c:856
+#: ../mail/em-subscribe-editor.c:855
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
-#: ../mail/em-utils.c:124
-msgid "Do not show this message again."
-msgstr "不要再顯示這個訊息。"
+#: ../mail/em-utils.c:121
+msgid "_Do not show this message again."
+msgstr "不要再顯示這個訊息(_D)"
 
-#: ../mail/em-utils.c:319
+#: ../mail/em-utils.c:317
 msgid "Message Filters"
 msgstr "郵件規則"
 
-#: ../mail/em-utils.c:404 ../mail/em-utils.c:436
+#: ../mail/em-utils.c:370
 msgid "message"
 msgstr "郵件"
 
-#: ../mail/em-utils.c:571
+#: ../mail/em-utils.c:645
 msgid "Save Message..."
 msgstr "儲存郵件…"
 
-#: ../mail/em-utils.c:620
+#: ../mail/em-utils.c:694
 msgid "Add address"
 msgstr "新增地址"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:1104
+#: ../mail/em-utils.c:1178
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
@@ -12268,125 +12197,193 @@ msgstr "來自 %s 的郵件"
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-#: ../mail/em-vfolder-rule.c:591
+#: ../mail/em-vfolder-rule.c:592
 msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
-#: ../mail/evolution-mail.schemas.in.in.h:1
+#: ../mail/evolution-mail.schemas.in.h:1
 msgid "Allows evolution to display text part of limited size"
 msgstr "允許 evolution 顯示內文部份的限制大小"
 
-#: ../mail/evolution-mail.schemas.in.in.h:2
+#: ../mail/evolution-mail.schemas.in.h:2
+msgid "Always request read receipt"
+msgstr "一定要求讀信回條"
+
+#: ../mail/evolution-mail.schemas.in.h:3
+msgid "Amount of time in seconds the error should be showed on the status bar."
+msgstr "錯誤訊息在狀態列中顯示的時間(秒)。"
+
+#: ../mail/evolution-mail.schemas.in.h:4
+msgid "Automatic emoticon recognition"
+msgstr "自動表情辨識"
+
+#: ../mail/evolution-mail.schemas.in.h:5
 msgid "Automatic link recognition"
 msgstr "自動連結辨識"
 
-#: ../mail/evolution-mail.schemas.in.in.h:3
-msgid "Automatic smiley recognition"
-msgstr "自動辨認笑臉符號"
-
-#: ../mail/evolution-mail.schemas.in.in.h:4
+#: ../mail/evolution-mail.schemas.in.h:6
 msgid "Check incoming mail being junk"
 msgstr "檢查內送的垃圾郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:5
+#: ../mail/evolution-mail.schemas.in.h:7
 msgid "Citation highlight color"
 msgstr "引用反白色彩"
 
-#: ../mail/evolution-mail.schemas.in.in.h:6
+#: ../mail/evolution-mail.schemas.in.h:8
 msgid "Citation highlight color."
 msgstr "引用反白色彩。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:7
+#: ../mail/evolution-mail.schemas.in.h:9
 msgid "Composer Window default height"
 msgstr "撰寫視窗預設高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:8
+#: ../mail/evolution-mail.schemas.in.h:10
 msgid "Composer Window default width"
 msgstr "撰寫視窗預設寬度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:9
+#: ../mail/evolution-mail.schemas.in.h:11
+msgid "Composer load/attach directory"
+msgstr "編輯器讀取/附加目錄"
+
+#: ../mail/evolution-mail.schemas.in.h:12
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "壓縮在 TO/CC/BCC 中位址的顯示方式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:10
+#: ../mail/evolution-mail.schemas.in.h:13
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr "將 TO/CC/BCC 中位址的顯示方式壓縮為 address_count 中指定的長度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:11
+#: ../mail/evolution-mail.schemas.in.h:14
 msgid "Default charset in which to compose messages"
 msgstr "用於撰寫郵件的預設字元集"
 
-#: ../mail/evolution-mail.schemas.in.in.h:12
+#: ../mail/evolution-mail.schemas.in.h:15
 msgid "Default charset in which to compose messages."
 msgstr "用於撰寫郵件的預設字元集。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:13
+#: ../mail/evolution-mail.schemas.in.h:16
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-#: ../mail/evolution-mail.schemas.in.in.h:14
+#: ../mail/evolution-mail.schemas.in.h:17
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:15
+#: ../mail/evolution-mail.schemas.in.h:18
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:16
-msgid "Default height of the Composer Window"
-msgstr "撰寫視窗的預設高度"
+#: ../mail/evolution-mail.schemas.in.h:19
+msgid "Default height of the Composer Window."
+msgstr "撰寫視窗的預設高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:17
-msgid "Default height of the Message Window"
-msgstr "郵件視窗的預設高度"
+#: ../mail/evolution-mail.schemas.in.h:20
+msgid "Default height of the message window."
+msgstr "郵件視窗的預設高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:18
-msgid "Default height of the Subscribe dialog"
-msgstr "訂閱對話方塊的預設高度"
+#: ../mail/evolution-mail.schemas.in.h:21
+msgid "Default height of the subscribe dialog."
+msgstr "訂閱對話方塊的預設高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:19
+#: ../mail/evolution-mail.schemas.in.h:22
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:20
-msgid "Default width of the Composer Window"
-msgstr "撰寫視窗的預設寬度"
+#: ../mail/evolution-mail.schemas.in.h:23
+msgid "Default value for thread expand state"
+msgstr "相關郵件展開狀態的預設數值"
+
+#: ../mail/evolution-mail.schemas.in.h:24
+msgid "Default width of the Composer Window."
+msgstr "撰寫視窗的預設寬度。"
+
+#: ../mail/evolution-mail.schemas.in.h:25
+msgid "Default width of the message window."
+msgstr "郵件視窗的預設寬度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:21
-msgid "Default width of the Message Window"
-msgstr "郵件視窗的預設寬度"
+#: ../mail/evolution-mail.schemas.in.h:26
+msgid "Default width of the subscribe dialog."
+msgstr "訂閱對話方塊的預設寬度。"
+
+#: ../mail/evolution-mail.schemas.in.h:27
+msgid "Determines whether to lookup in addressbook for sender email"
+msgstr "決定是否在通訊錄中尋找寄件者電子郵件帳號"
+
+#: ../mail/evolution-mail.schemas.in.h:28
+msgid ""
+"Determines whether to loopup the sender email in addressbook. If found, it "
+"shouldn't be a spam. It looks up in the books marked for autocompletion. It "
+"can be slow, if remote addressbooks (like ldap) are marked for "
+"autocompletion."
+msgstr ""
+"決定是否在通訊錄中尋找寄件者電子郵件帳號。如果找得到，就不判斷為垃圾郵件。它"
+"會搜尋標記為自動補齊的通訊錄。但若標記為自動補齊的是遠端通訊錄（像 ldap），則"
+"速度可能會很慢。"
+
+#: ../mail/evolution-mail.schemas.in.h:29
+msgid "Determines whether to use custom headers to check for junk"
+msgstr "決定是否使用自訂標頭來檢查垃圾郵件"
+
+#: ../mail/evolution-mail.schemas.in.h:30
+msgid ""
+"Determines whether to use custom headers to check for junk. If this option "
+"is enabled and the headers are mentioned, it will be improve the junk "
+"checking speed."
+msgstr ""
+"決定是否使用自訂標頭來檢查垃圾郵件。如果啟用這個選項並且提供標頭，將會提升垃"
+"圾郵件檢查的速度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:22
-msgid "Default width of the Subscribe dialog"
-msgstr "訂閱對話方塊的預設寬度"
+#: ../mail/evolution-mail.schemas.in.h:31
+msgid "Directory for loading/attaching files to composer."
+msgstr "用來郵件編輯器載入/附加檔案的目錄。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:23
-msgid "Directory for saving mail component files"
-msgstr "用來存放郵件元件檔的目錄"
+#: ../mail/evolution-mail.schemas.in.h:32
+msgid "Directory for saving mail component files."
+msgstr "用來儲存郵件元件檔的目錄。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:24
+#: ../mail/evolution-mail.schemas.in.h:33
 msgid "Draw spelling error indicators on words as you type."
 msgstr "當您輸入內容時在文字上顯示拼字錯誤指示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:25
+#: ../mail/evolution-mail.schemas.in.h:34
+msgid "Empty Junk folders on exit"
+msgstr "離開時清空垃圾郵件資料夾"
+
+#: ../mail/evolution-mail.schemas.in.h:35
 msgid "Empty Trash folders on exit"
 msgstr "結束時清空垃圾資料夾"
 
-#: ../mail/evolution-mail.schemas.in.in.h:26
+#: ../mail/evolution-mail.schemas.in.h:36
+msgid "Empty all Junk folders when exiting Evolution."
+msgstr "離開 Evolution 時清空所有垃圾郵件資料夾。"
+
+#: ../mail/evolution-mail.schemas.in.h:37
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
-#: ../mail/evolution-mail.schemas.in.in.h:27
+#: ../mail/evolution-mail.schemas.in.h:38
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "啟用插入號模式，如此您可以在閱讀郵件時看到游標。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:28
+#: ../mail/evolution-mail.schemas.in.h:39
+msgid "Enable or disable magic space bar"
+msgstr "啟用或停用神奇空白鍵"
+
+#: ../mail/evolution-mail.schemas.in.h:40
 msgid "Enable or disable type ahead search feature"
 msgstr "啟用或停用隨打即查功能"
 
-#: ../mail/evolution-mail.schemas.in.in.h:29
+#: ../mail/evolution-mail.schemas.in.h:41
+msgid "Enable search folders"
+msgstr "啟用搜尋資料夾"
+
+#: ../mail/evolution-mail.schemas.in.h:42
+msgid "Enable search folders on startup."
+msgstr "啟用程式開始時搜尋資料夾。"
+
+#: ../mail/evolution-mail.schemas.in.h:43
 msgid ""
 "Enable side bar search feature so that you can start interactive searching "
 "by typing in the text. Use is that you can easily find a folder in that side "
@@ -12397,35 +12394,45 @@ msgstr ""
 "輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾"
 "的位置。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:30
+#: ../mail/evolution-mail.schemas.in.h:44
+msgid ""
+"Enable this to use Space bar key to scroll in message preview, message list "
+"and folders."
+msgstr "啟用此選項可在郵件預覽、郵件清單和資料夾中使用空白鍵捲動畫面。"
+
+#: ../mail/evolution-mail.schemas.in.h:45
 msgid "Enable to render message text part of limited size."
 msgstr "啟用以顯示限制大小的郵件文字。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:31
+#: ../mail/evolution-mail.schemas.in.h:46
 msgid "Enable/disable caret mode"
 msgstr "啟用/停用插入號模式"
 
-#: ../mail/evolution-mail.schemas.in.in.h:32
+#: ../mail/evolution-mail.schemas.in.h:47
 msgid "Height of the message-list pane"
 msgstr "郵件清單窗格高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:33
+#: ../mail/evolution-mail.schemas.in.h:48
 msgid "Height of the message-list pane."
 msgstr "郵件清單窗格的高度。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:34
+#: ../mail/evolution-mail.schemas.in.h:49
+msgid "Hides the per-folder preview and removes the selection"
+msgstr "隱藏各資料夾預覽並移除選取區"
+
+#: ../mail/evolution-mail.schemas.in.h:50
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:35
+#: ../mail/evolution-mail.schemas.in.h:51
 msgid ""
 "If the \"Preview\" pane is on, then show it side-by-side rather than "
 "vertically."
 msgstr "當「預覽」窗格開啟時，將它緊貼顯示而非重疊顯示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:36
+#: ../mail/evolution-mail.schemas.in.h:52
 msgid ""
 "If there isn't a builtin viewer for a particular mime-type inside Evolution, "
 "any mime-types appearing in this list which map to a bonobo-component viewer "
@@ -12435,27 +12442,50 @@ msgstr ""
 "mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於"
 "顯示內容。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:37
+#: ../mail/evolution-mail.schemas.in.h:53
 msgid "It disables/enables the prompt while marking multiple messages."
 msgstr "這會停用/啟用標記多個郵件時的提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:38
+#: ../mail/evolution-mail.schemas.in.h:54
+msgid ""
+"It disables/enables the repeated prompts to ask if offline sync is required "
+"before going into offline mode."
+msgstr "它啟用/停用在進入離線模式前是否重複提示有無離線前同步的需求。"
+
+#: ../mail/evolution-mail.schemas.in.h:55
+msgid ""
+"It disables/enables the repeated prompts to warn that deleting messages from "
+"a search folder permanently deletes the message, not simply removing it from "
+"the search results."
+msgstr ""
+"它啟用/停用在從搜尋資料夾中刪除郵件時是否重複提示以警告那將會永久刪除郵件，而"
+"非僅是將郵件自搜尋結果中移除。"
+
+#: ../mail/evolution-mail.schemas.in.h:56
+msgid "Last time empty junk was run"
+msgstr "上次清空垃圾郵件的時間"
+
+#: ../mail/evolution-mail.schemas.in.h:57
 msgid "Last time empty trash was run"
 msgstr "上次清空回收筒的時間"
 
-#: ../mail/evolution-mail.schemas.in.in.h:39
+#: ../mail/evolution-mail.schemas.in.h:58
+msgid "Level beyond which the message should be logged."
+msgstr "應記錄的郵件等級。"
+
+#: ../mail/evolution-mail.schemas.in.h:59
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:40
+#: ../mail/evolution-mail.schemas.in.h:60
 msgid "List of accepted licenses"
 msgstr "接收的授權清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:41
+#: ../mail/evolution-mail.schemas.in.h:61
 msgid "List of accounts"
 msgstr "帳號清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:42
+#: ../mail/evolution-mail.schemas.in.h:62
 msgid ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
@@ -12463,11 +12493,11 @@ msgstr ""
 "Evolution 的郵件元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts "
 "相關的字串命名子目錄。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:43
+#: ../mail/evolution-mail.schemas.in.h:63
 msgid "List of custom headers and whether they are enabled."
 msgstr "自訂檔頭以及它們是否啟用的清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:44
+#: ../mail/evolution-mail.schemas.in.h:64
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -12475,227 +12505,261 @@ msgstr ""
 "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color "
 "使用 HTML 十六進位編碼。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:45
+#: ../mail/evolution-mail.schemas.in.h:65
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "mime 類型清單，檢查 bonobo 元件檢視器"
 
-#: ../mail/evolution-mail.schemas.in.in.h:46
+#: ../mail/evolution-mail.schemas.in.h:66
 msgid "List of protocol names whose license has been accepted."
 msgstr "已經接受其授權的協定清單。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:47
+#: ../mail/evolution-mail.schemas.in.h:67
 msgid "Load images for HTML messages over http"
 msgstr "透過 http 載入 HTML 郵件的影像"
 
-#: ../mail/evolution-mail.schemas.in.in.h:48
+#: ../mail/evolution-mail.schemas.in.h:68
 msgid ""
 "Load images for HTML messages over http(s). Possible values are: 0 - Never "
-"load images off the net 1 - Load images in mail from contacts 2 - Always "
-"load images off the net"
+"load images off the net. 1 - Load images in messages from contacts. 2 - "
+"Always load images off the net."
 msgstr ""
-"透過 http(s) 載入 HTML 郵件的影像。可能的值為：\n"
-"0 – 不從網路載入影像\n"
-"1 – 如果寄件者是在通訊錄時，載入影像\n"
-"2 - 一定從網路載入影像"
+"透過 http(s) 載入 HTML 郵件的影像。可能的值為：0 – 不從網路載入影像。 1 – 如"
+"果寄件者是在通訊錄時，載入影像。2 - 一定從網路載入影像。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:49
+#: ../mail/evolution-mail.schemas.in.h:69
 msgid "Log filter actions"
 msgstr "記錄過濾器動作"
 
-#: ../mail/evolution-mail.schemas.in.in.h:50
+#: ../mail/evolution-mail.schemas.in.h:70
 msgid "Log filter actions to the specified log file."
 msgstr "將過濾器動作記錄到指定的記錄檔案。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:51
+#: ../mail/evolution-mail.schemas.in.h:71
 msgid "Logfile to log filter actions"
 msgstr "用於記錄過濾器動作的記錄檔案"
 
-#: ../mail/evolution-mail.schemas.in.in.h:52
+#: ../mail/evolution-mail.schemas.in.h:72
 msgid "Logfile to log filter actions."
 msgstr "用於記錄過濾器動作的記錄檔案。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:53
+#: ../mail/evolution-mail.schemas.in.h:73
 msgid "Mark as Seen after specified timeout"
 msgstr "在指定的時限過後，標示成已閱讀"
 
-#: ../mail/evolution-mail.schemas.in.in.h:54
+#: ../mail/evolution-mail.schemas.in.h:74
 msgid "Mark as Seen after specified timeout."
 msgstr "在指定的時限過後，標示成已閱讀。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:55
+#: ../mail/evolution-mail.schemas.in.h:75
 msgid "Mark citations in the message \"Preview\""
 msgstr "在郵件「預覽」中標示引用"
 
-#: ../mail/evolution-mail.schemas.in.in.h:56
+#: ../mail/evolution-mail.schemas.in.h:76
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:57
+#: ../mail/evolution-mail.schemas.in.h:77
 msgid "Message Window default height"
 msgstr "郵件視窗預設高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:58
+#: ../mail/evolution-mail.schemas.in.h:78
 msgid "Message Window default width"
 msgstr "郵件視窗預設寬度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:59
+#: ../mail/evolution-mail.schemas.in.h:79
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "訊息顯示樣式 (「一般」、「完整檔頭」、「來源」)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:60
+#: ../mail/evolution-mail.schemas.in.h:80
+msgid "Minimum days between emptying the junk on exit"
+msgstr "結束時清空垃圾郵件最少間隔天數"
+
+#: ../mail/evolution-mail.schemas.in.h:81
 msgid "Minimum days between emptying the trash on exit"
 msgstr "結束時清空回收筒最少間隔天數"
 
-#: ../mail/evolution-mail.schemas.in.in.h:61
+#: ../mail/evolution-mail.schemas.in.h:82
+msgid "Minimum time between emptying the junk on exit, in days."
+msgstr "結束時清空垃圾郵件最少間隔天數。"
+
+#: ../mail/evolution-mail.schemas.in.h:83
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "結束時清空回收筒最少間隔天數。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:62
-msgid "New Mail Notify sound file"
-msgstr "新郵件通知聲音檔案"
-
-#: ../mail/evolution-mail.schemas.in.in.h:63
-msgid "New Mail Notify type"
-msgstr "新郵件通知類型"
-
-#: ../mail/evolution-mail.schemas.in.in.h:64
+#: ../mail/evolution-mail.schemas.in.h:84
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "顯示於 TO/CC/BCC 中位址的長度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:65
+#: ../mail/evolution-mail.schemas.in.h:85
 msgid "Prompt on empty subject"
 msgstr "沒有主旨時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:66
+#: ../mail/evolution-mail.schemas.in.h:86
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:67
+#: ../mail/evolution-mail.schemas.in.h:87
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:68
+#: ../mail/evolution-mail.schemas.in.h:88
+msgid "Prompt to check if the user wants to go offline immediately"
+msgstr "提示使用者以確認是否立即進入離線"
+
+#: ../mail/evolution-mail.schemas.in.h:89
+msgid "Prompt when deleting messages in search folder"
+msgstr "當刪除搜尋資料夾中的郵件時顯示提示"
+
+#: ../mail/evolution-mail.schemas.in.h:90
 msgid "Prompt when user expunges"
 msgstr "使用者清空時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:69
+#: ../mail/evolution-mail.schemas.in.h:91
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:70
+#: ../mail/evolution-mail.schemas.in.h:92
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:71
+#: ../mail/evolution-mail.schemas.in.h:93
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時，顯示提示。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:72
+#: ../mail/evolution-mail.schemas.in.h:94
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:73
+#: ../mail/evolution-mail.schemas.in.h:95
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:74
+#: ../mail/evolution-mail.schemas.in.h:96
 msgid "Prompt while marking multiple messages"
 msgstr "當標記多個郵件時提示"
 
-#: ../mail/evolution-mail.schemas.in.in.h:75
+#: ../mail/evolution-mail.schemas.in.h:97
+msgid "Recognize emoticons in text and replace them with images."
+msgstr "辨認文字中的表情符號並取代成圖示。"
+
+#: ../mail/evolution-mail.schemas.in.h:98
 msgid "Recognize links in text and replace them."
 msgstr "辨認文字中的連結並將之取代。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:76
-msgid "Recognize smileys in text and replace them with images."
-msgstr "辨認文字中的笑臉符號並取代成圖示。"
-
-#: ../mail/evolution-mail.schemas.in.in.h:77
-msgid "Run junk test on incoming mail"
-msgstr "在內送的郵件執行垃圾郵件檢查"
+#: ../mail/evolution-mail.schemas.in.h:99
+msgid "Run junk test on incoming mail."
+msgstr "在內送的郵件執行垃圾郵件檢查。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:78
+#: ../mail/evolution-mail.schemas.in.h:100
 msgid "Save directory"
 msgstr "儲存目錄"
 
-#: ../mail/evolution-mail.schemas.in.in.h:79
+#: ../mail/evolution-mail.schemas.in.h:101
+msgid "Search for the sender photo in local addressbooks"
+msgstr "在本地端通訊錄搜尋寄件者相片"
+
+#: ../mail/evolution-mail.schemas.in.h:102
 msgid "Send HTML mail by default"
 msgstr "預設傳送 HTML 郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:80
+#: ../mail/evolution-mail.schemas.in.h:103
 msgid "Send HTML mail by default."
 msgstr "預設傳送 HTML 郵件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:81
+#: ../mail/evolution-mail.schemas.in.h:104
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-#: ../mail/evolution-mail.schemas.in.in.h:82
+#: ../mail/evolution-mail.schemas.in.h:105
 msgid "Show animated images as animations."
 msgstr "播放動畫影像。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:83
+#: ../mail/evolution-mail.schemas.in.h:106
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-#: ../mail/evolution-mail.schemas.in.in.h:84
+#: ../mail/evolution-mail.schemas.in.h:107
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:87
+#: ../mail/evolution-mail.schemas.in.h:108
+msgid "Show photo of the sender"
+msgstr "顯示寄件者的相片"
+
+#: ../mail/evolution-mail.schemas.in.h:111
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
-"list"
-msgstr "在郵件清單的組合欄中顯示寄件者的電子郵件"
+"list."
+msgstr "在郵件清單的組合欄中顯示寄件者的電子郵件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:88
+#: ../mail/evolution-mail.schemas.in.h:112
+msgid "Show the photo of the sender in the message reading pane."
+msgstr "在郵件閱讀窗格中顯示寄件者的相片。"
+
+#: ../mail/evolution-mail.schemas.in.h:113
 msgid "Show the sender email in the messages column in the message list"
 msgstr "在郵件清單的郵件欄中顯示寄件者的電子郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:89
-msgid "Sound file to play when new mail arrives."
-msgstr "新郵件送到時要播放的音效檔案"
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Specifies the header to check for junk."
+msgstr "指定檢查垃圾郵件用的標頭。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:90
-msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "指定使用者要使用的「新郵件通知」類型。"
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Specifies the header to check for junk. The format is headername=value in "
+"gconf."
+msgstr "指定檢查垃圾郵件用的標頭。其格式為 gconf 中的 headername=value。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:91
+#: ../mail/evolution-mail.schemas.in.h:116
 msgid "Spell check inline"
 msgstr "行內拼字檢查"
 
-#: ../mail/evolution-mail.schemas.in.in.h:92
+#: ../mail/evolution-mail.schemas.in.h:117
 msgid "Subscribe dialog default height"
 msgstr "訂閱對話方塊預設高度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:93
+#: ../mail/evolution-mail.schemas.in.h:118
 msgid "Subscribe dialog default width"
 msgstr "訂閱對話方塊預設寬度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:94
+#: ../mail/evolution-mail.schemas.in.h:119
 msgid "Terminal font"
 msgstr "終端機字型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:95
+#: ../mail/evolution-mail.schemas.in.h:120
 msgid "Text message part limit"
 msgstr "文字郵件限制"
 
-#: ../mail/evolution-mail.schemas.in.in.h:96
+#: ../mail/evolution-mail.schemas.in.h:121
+msgid "The default plugin for Junk hook"
+msgstr "垃圾釣鉤的預設外掛程式"
+
+#: ../mail/evolution-mail.schemas.in.h:122
+msgid "The last time empty junk was run, in days since the epoch."
+msgstr "上次執行清空垃圾郵件的時間，從電腦紀元後算起的日數。"
+
+#: ../mail/evolution-mail.schemas.in.h:123
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "上次執行清單回收筒的時間，從紀元後算起的日數。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:97
-msgid "The terminal font for mail display"
-msgstr "用於郵件顯示的終端機字型"
+#: ../mail/evolution-mail.schemas.in.h:124
+msgid "The terminal font for mail display."
+msgstr "用於顯示郵件的終端機字型。"
+
+#: ../mail/evolution-mail.schemas.in.h:125
+msgid "The variable width font for mail display."
+msgstr "用於顯示郵件的變動寬度字型。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:98
-msgid "The variable width font for mail display"
-msgstr "用於郵件顯示的變動寬度字型"
+#: ../mail/evolution-mail.schemas.in.h:126
+msgid ""
+"This can have three possible values. 0 for errors. 1 for warnings. 2 for "
+"debug messages."
+msgstr "這裡可使用三種數值。 0 為錯誤，1 為警告，2 為除錯訊息。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:99
+#: ../mail/evolution-mail.schemas.in.h:127
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "evolution. The default is 4MB / 4096 KB and is specified interms of KB."
@@ -12703,7 +12767,24 @@ msgstr ""
 "這裡決定了郵件內文在 evolution 中可排版的最大容量。預設的大小是 4MB / 4096 "
 "KB，以 KB 來指定。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:100
+#: ../mail/evolution-mail.schemas.in.h:128
+msgid ""
+"This is the default junk plugin, even though there are multiple plugins "
+"enabled. If the default listed plugin is disabled, then it won't fall back "
+"to the other available plugins."
+msgstr ""
+"這是預設的垃圾郵件外掛程式，即使已啟用了其他的外掛程式。如果停用這裡列出的預"
+"設外掛程式，並不會影響其他可用的外掛程式。"
+
+#: ../mail/evolution-mail.schemas.in.h:129
+msgid ""
+"This key is read only once and reset to false after read. This unselects the "
+"mail in the list and removes the preview for that folder."
+msgstr ""
+"這個鍵值只能讀取一次，並會在讀取後設為 false。這樣會取消在清單中對該郵件的選"
+"取並移除對該資料夾的預覽。"
+
+#: ../mail/evolution-mail.schemas.in.h:130
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -12713,141 +12794,167 @@ msgstr ""
 "此金鑰應該包含 XML 清單，它會指定自訂檔頭，以及是否顯示它們。XML 結構的格式"
 "是 &lt;header enabled&gt; - 如果檔頭會顯示在郵件檢視，則設定成 enabled。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:101
+#: ../mail/evolution-mail.schemas.in.h:131
+msgid "This option would help in improving the speed of fetching."
+msgstr "這個選項能協助增進接收的速度。"
+
+#: ../mail/evolution-mail.schemas.in.h:132
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
 msgstr "這會設定在預設郵件清單檢視中顯示位址的長度，超過的部分會顯示「...」。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:102
+#: ../mail/evolution-mail.schemas.in.h:133
+msgid ""
+"This setting specifies whether the threads should be in expanded or "
+"collapsed state by default. Evolution requires a restart."
+msgstr ""
+"這個設定值指定相關郵件預設為展開或收摺的狀態。Evolution 將需要重新啟動。"
+
+#: ../mail/evolution-mail.schemas.in.h:134
+msgid ""
+"This setting specifies whether the threads should be sorted based on latest "
+"message in each thread, rather than by message's date. Evolution requires a "
+"restart."
+msgstr ""
+"這個設定值指定相關郵件要依每個郵件群組最新的郵件排序，而非依照郵件的日期。"
+"Evolution 將需要重新啟動。"
+
+#: ../mail/evolution-mail.schemas.in.h:135
 msgid "Thread the message list."
 msgstr "串接郵件清單。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:103
+#: ../mail/evolution-mail.schemas.in.h:136
 msgid "Thread the message-list"
 msgstr "串接郵件清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:104
+#: ../mail/evolution-mail.schemas.in.h:137
 msgid "Thread the message-list based on Subject"
 msgstr "以主旨為基礎串接郵件清單"
 
-#: ../mail/evolution-mail.schemas.in.in.h:105
-msgid "Timeout for marking message as Seen"
+#: ../mail/evolution-mail.schemas.in.h:138
+msgid "Timeout for marking message as seen"
 msgstr "將郵件標示成已閱讀的時限"
 
-#: ../mail/evolution-mail.schemas.in.in.h:106
-msgid "Timeout for marking message as Seen."
+#: ../mail/evolution-mail.schemas.in.h:139
+msgid "Timeout for marking message as seen."
 msgstr "將郵件標示成已閱讀的時限。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:107
+#: ../mail/evolution-mail.schemas.in.h:140
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Use Spamassassin daemon and client"
-msgstr "使用 Spamasssassin 伺服程式和用戶端"
+#: ../mail/evolution-mail.schemas.in.h:141
+msgid "Use SpamAssassin daemon and client"
+msgstr "使用 SpamAsssassin 伺服程式和客戶端"
 
-#: ../mail/evolution-mail.schemas.in.in.h:109
-msgid "Use Spamassassin daemon and client (spamc/spamd)"
-msgstr "使用 Spamasssassin 伺服程式和用戶端 (spamc/spamd)"
+#: ../mail/evolution-mail.schemas.in.h:142
+msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+msgstr "使用 SpamAsssassin 伺服程式和客戶端 (spamc/spamd)。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:110
+#: ../mail/evolution-mail.schemas.in.h:143
 msgid "Use custom fonts"
 msgstr "使用自訂字型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:111
-msgid "Use custom fonts for displaying mail"
-msgstr "使用自訂字型來顯示郵件"
+#: ../mail/evolution-mail.schemas.in.h:144
+msgid "Use custom fonts for displaying mail."
+msgstr "使用自訂字型來顯示郵件。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:112
+#: ../mail/evolution-mail.schemas.in.h:145
 msgid "Use only local spam tests."
 msgstr "只使用本地垃圾郵件測試。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:113
+#: ../mail/evolution-mail.schemas.in.h:146
 msgid "Use only the local spam tests (no DNS)."
 msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:114
+#: ../mail/evolution-mail.schemas.in.h:147
 msgid "Use side-by-side or wide layout"
 msgstr "使用緊貼或寬配置"
 
-#: ../mail/evolution-mail.schemas.in.in.h:115
+#: ../mail/evolution-mail.schemas.in.h:148
 msgid "Variable width font"
 msgstr "變動寬度字型"
 
-#: ../mail/evolution-mail.schemas.in.in.h:116
+#: ../mail/evolution-mail.schemas.in.h:149
 msgid "View/Bcc menu item is checked"
 msgstr "檢視/密件副本功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:117
+#: ../mail/evolution-mail.schemas.in.h:150
 msgid "View/Bcc menu item is checked."
 msgstr "檢視/密件副本功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:118
+#: ../mail/evolution-mail.schemas.in.h:151
 msgid "View/Cc menu item is checked"
 msgstr "檢視/副本功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:119
+#: ../mail/evolution-mail.schemas.in.h:152
 msgid "View/Cc menu item is checked."
 msgstr "檢視/副本功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:120
+#: ../mail/evolution-mail.schemas.in.h:153
 msgid "View/From menu item is checked"
 msgstr "檢視/寄件者功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:121
+#: ../mail/evolution-mail.schemas.in.h:154
 msgid "View/From menu item is checked."
 msgstr "檢視/寄件者功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:122
+#: ../mail/evolution-mail.schemas.in.h:155
 msgid "View/PostTo menu item is checked"
 msgstr "檢視/張貼功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:123
+#: ../mail/evolution-mail.schemas.in.h:156
 msgid "View/PostTo menu item is checked."
 msgstr "檢視/張貼功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:124
+#: ../mail/evolution-mail.schemas.in.h:157
 msgid "View/ReplyTo menu item is checked"
 msgstr "檢視/回覆功能表項目已選取"
 
-#: ../mail/evolution-mail.schemas.in.in.h:125
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid "View/ReplyTo menu item is checked."
 msgstr "檢視/回覆功能表項目已選取。"
 
-#: ../mail/evolution-mail.schemas.in.in.h:126
+#: ../mail/evolution-mail.schemas.in.h:159
+msgid "Whether a read receipt request gets added to every message by default."
+msgstr "是否預設在每封郵件加入讀信回條的要求"
+
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
-msgstr "當郵件不包含 In-Reply-To 或 References 檔頭時，是否按照主旨放回線串。"
+msgstr "當郵件不包含 In-Reply-To 或 References 檔頭時，是否按照主旨放回郵件群組。"
+
+#: ../mail/evolution-mail.schemas.in.h:161
+msgid "Whether sort threads based on latest message in that thread"
+msgstr "是否依郵件群組中最新的郵件來排序相關郵件"
 
-#: ../mail/evolution-mail.schemas.in.in.h:127
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Width of the message-list pane"
 msgstr "郵件清單窗格寬度"
 
-#: ../mail/evolution-mail.schemas.in.in.h:128
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Width of the message-list pane."
 msgstr "郵件清單窗格的寬度。"
 
-#: ../mail/importers/elm-importer.c:192
+#: ../mail/importers/elm-importer.c:184
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
-#: ../mail/importers/elm-importer.c:381
+#: ../mail/importers/elm-importer.c:369
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
 
-#: ../mail/importers/elm-importer.c:382
+#: ../mail/importers/elm-importer.c:370
 msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
 #: ../mail/importers/evolution-mbox-importer.c:83
-#: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
 #: ../mail/importers/evolution-mbox-importer.c:86
-#: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
 msgstr "選取資料夾來輸入"
 
@@ -12859,119 +12966,29 @@ msgstr "Berkeley 郵件信箱 (mbox)"
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "匯入 Berkeley 郵件信箱格式資料夾"
 
-#: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:233 ../shell/e-shell-importer.c:529
-#, c-format
-msgid "Importing `%s'"
-msgstr "正在匯入 ‘%s’"
-
-#: ../mail/importers/evolution-outlook-importer.c:266
-#: ../mail/importers/netscape-importer.c:1254
-#: ../plugins/startup-wizard/startup-wizard.c:235
-#: ../shell/e-shell-importer.c:536
-msgid "Please wait"
-msgstr "請稍候"
-
-#: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
 msgstr "正在匯入信箱"
 
-#: ../mail/importers/mail-importer.c:376
+#: ../mail/importers/mail-importer.c:232 ../shell/e-shell-importer.c:518
 #, c-format
-msgid "Scanning %s"
-msgstr "掃描 %s"
+msgid "Importing `%s'"
+msgstr "正在匯入 ‘%s’"
 
-#: ../mail/importers/netscape-importer.c:74
+#: ../mail/importers/mail-importer.c:372
 #, c-format
-msgid "Priority Filter \"%s\""
-msgstr "優先順序過濾器「%s」"
-
-#: ../mail/importers/netscape-importer.c:663
-msgid ""
-"Some of your Netscape email filters are based on\n"
-"email priorities, which are not used in Evolution.\n"
-"Instead, Evolution provides scores in the range of\n"
-"-3 to 3 that can be assigned to emails and filtered\n"
-"accordingly.\n"
-"\n"
-"As a workaround, a set of filters called \"Priority Filter\"\n"
-"was added that converts Netscape's email priorities into\n"
-"Evolution's scores, and the affected filters use scores instead\n"
-"of priorities. Check the imported filters to make sure\n"
-"everything still works as intended."
-msgstr ""
-"有些 Netscape 郵件過濾器是以電子郵件的優先權\n"
-"為基礎的，而在 Evolution 中則沒有這種用法。\n"
-"Evolution 的替代方式是提供範圍從 -3 到 3 的點數\n"
-"給電子郵件，並且根據此數值來過濾。\n"
-"\n"
-"\n"
-"目前的解決方案是加入一組名為「優先順序過濾器」\n"
-"的過濾器來將 Netscape 的電子郵件優先權轉換為\n"
-"Evolution 的點數，而受影響的過濾器會使用點數來\n"
-"代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
-"照您想要的方式運作。"
-
-#: ../mail/importers/netscape-importer.c:687
-msgid ""
-"Some of your Netscape email filters use\n"
-"the \"Ignore Thread\" or \"Watch Thread\"\n"
-"feature, which is not supported in Evolution.\n"
-"These filters will be dropped."
-msgstr ""
-"有些 Netscape 郵件過濾器使用\n"
-"「忽略對話」或「監看對話」的\n"
-"功能，而 Evolution 並不支援它。\n"
-"這些過濾器則會被丟棄。"
-
-#: ../mail/importers/netscape-importer.c:704
-msgid ""
-"Some of your Netscape email filters test the\n"
-"body of emails for (in)equality to a given string,\n"
-"which is not supported in Evolution. Those filters\n"
-"were modified to test whether that string is or is not\n"
-"contained in the message body."
-msgstr ""
-"有些 Netscape 郵件過濾器可以測試\n"
-"電子郵件的內文是否與所給的字串相等，\n"
-"Evolution 不支援此功能。那些過濾器\n"
-"會被修改成測試郵件的內文是否包含\n"
-"該字串。"
-
-#: ../mail/importers/netscape-importer.c:1251
-msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution 正在匯入舊有的 Netscape 資料"
-
-#: ../mail/importers/netscape-importer.c:1708
-msgid "Importing Netscape data"
-msgstr "輸入 Netscape 資料"
-
-#: ../mail/importers/netscape-importer.c:1908
-msgid "Settings"
-msgstr "設定值"
-
-#: ../mail/importers/netscape-importer.c:1913
-msgid "Mail Filters"
-msgstr "郵件規則"
-
-#: ../mail/importers/netscape-importer.c:1934
-msgid ""
-"Evolution has found Netscape mail files.\n"
-"Would you like them to be imported into Evolution?"
-msgstr ""
-"Evolution 找到 Netscape 格式的郵件。\n"
-"是否將它們匯入至 Evolution？"
+msgid "Scanning %s"
+msgstr "掃描 %s"
 
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
-#: ../mail/importers/pine-importer.c:433
+#: ../mail/importers/pine-importer.c:428
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
 
-#: ../mail/importers/pine-importer.c:434
+#: ../mail/importers/pine-importer.c:429
 msgid "Import mail from Pine."
 msgstr "從 Pine 匯入郵件。"
 
@@ -12999,166 +13016,198 @@ msgstr "%s 郵件列表"
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: ../mail/mail-component.c:523
+#: ../mail/mail-component.c:533
+#, c-format
+msgid "%d selected, "
+msgid_plural "%d selected, "
+msgstr[0] "已選擇 %d 個，"
+msgstr[1] "已選擇 %d 個，"
+
+#: ../mail/mail-component.c:537
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 msgstr[1] "%d 封已刪除"
 
-#: ../mail/mail-component.c:525
+#: ../mail/mail-component.c:539
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 msgstr[1] "%d 封垃圾"
 
-#: ../mail/mail-component.c:548
+#: ../mail/mail-component.c:542
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 msgstr[1] "%d 個草稿"
 
-#: ../mail/mail-component.c:550
+#: ../mail/mail-component.c:544
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 msgstr[1] "%d 封已傳送"
 
-#: ../mail/mail-component.c:552
+#: ../mail/mail-component.c:546
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d 封未傳送"
 msgstr[1] "%d 封未傳送"
 
-#: ../mail/mail-component.c:556
+#: ../mail/mail-component.c:552
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d 封未讀，"
+msgstr[1] "%d 封未讀，"
+
+#: ../mail/mail-component.c:553
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 msgstr[1] "共 %d 封"
 
-#: ../mail/mail-component.c:558
-#, c-format
-msgid ", %d unread"
-msgid_plural ", %d unread"
-msgstr[0] "%d 封未讀"
-msgstr[1] "%d 封未讀"
-
-#: ../mail/mail-component.c:840
+#: ../mail/mail-component.c:890
 msgid "New Mail Message"
 msgstr "新增郵件"
 
-#: ../mail/mail-component.c:841
+#: ../mail/mail-component.c:891
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-#: ../mail/mail-component.c:842
+#: ../mail/mail-component.c:892
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-#: ../mail/mail-component.c:848
+#: ../mail/mail-component.c:898
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
 
-#: ../mail/mail-component.c:849
+#: ../mail/mail-component.c:899
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-#: ../mail/mail-component.c:850
+#: ../mail/mail-component.c:900
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
 
-#: ../mail/mail-component.c:996
+#: ../mail/mail-component.c:1047
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級郵件或資料夾失敗。"
 
-#: ../mail/mail-config.c:85
-msgid "I_mportant"
-msgstr "重要(_M)"
+#: ../mail/mail-component.c:1516
+msgid "Error"
+msgstr "錯誤"
 
-#. red
-#: ../mail/mail-config.c:86
-msgid "_Work"
-msgstr "工作(_W)"
+#: ../mail/mail-component.c:1516
+msgid "Errors"
+msgstr "錯誤"
 
-#. orange
-#: ../mail/mail-config.c:87
-msgid "_Personal"
-msgstr "個人(_P)"
+#: ../mail/mail-component.c:1517
+msgid "Warnings and Errors"
+msgstr "警告與錯誤"
 
-#. forest green
-#: ../mail/mail-config.c:88
-msgid "_To Do"
-msgstr "待辦事項(_T)"
+#: ../mail/mail-component.c:1518
+msgid "Debug"
+msgstr "偵錯"
 
-#. blue
-#: ../mail/mail-config.c:89
-msgid "_Later"
-msgstr "稍後(_L)"
+#: ../mail/mail-component.c:1518
+msgid "Error, Warnings and Debug messages"
+msgstr "錯誤、警告與除錯訊息"
+
+#: ../mail/mail-component.c:1628
+msgid "Debug Logs"
+msgstr "除錯紀錄檔"
+
+#: ../mail/mail-component.c:1632
+msgid "Show _errors in the status bar for"
+msgstr "在狀態列顯示此錯誤(_E)"
+
+#: ../mail/mail-component.c:1639
+msgid "seconds."
+msgstr "秒。"
+
+#: ../mail/mail-component.c:1649
+msgid "Log Messages:"
+msgstr "紀錄檔訊息:"
+
+#: ../mail/mail-component.c:1701
+msgid "Log Level"
+msgstr "紀錄等級"
+
+#: ../mail/mail-component.c:1708 ../widgets/misc/e-dateedit.c:410
+msgid "Time"
+msgstr "時間"
+
+#: ../mail/mail-component.c:1715 ../mail/message-list.c:2400
+#: ../mail/message-list.etspec.h:10
+msgid "Messages"
+msgstr "郵件"
 
 #: ../mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " 檢查可支援的類型(_E) "
 
-#: ../mail/mail-config.glade.h:3
+#: ../mail/mail-config.glade.h:2
+msgid "(Note: Requires restart)"
+msgstr "(注意：需要重新啟動)"
+
+#: ../mail/mail-config.glade.h:4
 msgid "<b>SSL is not supported in this build of Evolution</b>"
 msgstr "<b>此 Evolution 版本不支援 SSL</b>"
 
-#: ../mail/mail-config.glade.h:4
+#: ../mail/mail-config.glade.h:5
+msgid "<b>Sender  Photograph</b>"
+msgstr "<b>寄件者相片</b>"
+
+#: ../mail/mail-config.glade.h:6
 msgid "<b>Sig_natures</b>"
 msgstr "<b>簽章(_N)</b>"
 
-#: ../mail/mail-config.glade.h:5
+#: ../mail/mail-config.glade.h:7
+msgid "<b>Top Posting Option</b> (Not Recommended)"
+msgstr ""
+
+#: ../mail/mail-config.glade.h:8
 msgid "<b>_Languages</b>"
 msgstr "<b>語言(_L)</b>"
 
-#: ../mail/mail-config.glade.h:6
-msgid "<small>This will make the the filter more reliable, but slower</small>"
-msgstr "<small>此會讓過濾器更可靠，但速度變慢</small>"
-
-#: ../mail/mail-config.glade.h:7
+#: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Account Information</span>"
 msgstr "<span weight=\"bold\">帳號資訊</span>"
 
-#: ../mail/mail-config.glade.h:9
-msgid "<span weight=\"bold\">Authentication Type</span>"
-msgstr "<span weight=\"bold\">驗證類型</span>"
-
-#: ../mail/mail-config.glade.h:10
+#: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Authentication</span>"
 msgstr "<span weight=\"bold\">驗證</span>"
 
-#: ../mail/mail-config.glade.h:11
+#: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Composing Messages</span>"
 msgstr "<span weight=\"bold\">撰寫郵件</span>"
 
-#: ../mail/mail-config.glade.h:12
+#: ../mail/mail-config.glade.h:13
 msgid "<span weight=\"bold\">Configuration</span>"
 msgstr "<span weight=\"bold\">組態</span>"
 
-#: ../mail/mail-config.glade.h:13
+#: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Default Behavior</span>"
 msgstr "<span weight=\"bold\">預設行為</span>"
 
-#: ../mail/mail-config.glade.h:14
+#: ../mail/mail-config.glade.h:15
 msgid "<span weight=\"bold\">Delete Mail</span>"
 msgstr "<span weight=\"bold\">刪除郵件</span>"
 
-#: ../mail/mail-config.glade.h:15
-msgid "<span weight=\"bold\">Displayed Mail _Headers</span>"
-msgstr "<span weight=\"bold\">顯示的郵件檔頭(_H)</span>"
-
 #: ../mail/mail-config.glade.h:16
-msgid "<span weight=\"bold\">Filter Options</span>"
-msgstr "<span weight=\"bold\">過濾器選項</span>"
+msgid "<span weight=\"bold\">Displayed Message _Headers</span>"
+msgstr "<span weight=\"bold\">顯示的郵件檔頭(_H)</span>"
 
 #: ../mail/mail-config.glade.h:18
-msgid "<span weight=\"bold\">Labels and Colors</span>"
-msgstr "<span weight=\"bold\">標籤和色彩</span>"
+msgid "<span weight=\"bold\">Labels</span>"
+msgstr "<span weight=\"bold\">標籤</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
@@ -13177,47 +13226,47 @@ msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">郵件回條</span>"
 
 #: ../mail/mail-config.glade.h:23
-msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">新郵件通知</span>"
-
-#: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
 msgid "<span weight=\"bold\">Optional Information</span>"
 msgstr "<span weight=\"bold\">選擇性資訊</span>"
 
-#: ../mail/mail-config.glade.h:25
+#: ../mail/mail-config.glade.h:24
 msgid "<span weight=\"bold\">Options</span>"
 msgstr "<span weight=\"bold\">選項</span>"
 
-#: ../mail/mail-config.glade.h:26
+#: ../mail/mail-config.glade.h:25
 msgid "<span weight=\"bold\">Pretty Good Privacy (PGP/GPG)</span>"
 msgstr "<span weight=\"bold\">嚴密隱私權 (PGP/GPG)</span>"
 
 # zh_HK: msgstr "<span weight=\"bold\">打印用的字型</span>"
-#: ../mail/mail-config.glade.h:27
+#: ../mail/mail-config.glade.h:26
 msgid "<span weight=\"bold\">Printed Fonts</span>"
 msgstr "<span weight=\"bold\">列印用的字型</span>"
 
-#: ../mail/mail-config.glade.h:28
+#: ../mail/mail-config.glade.h:27
 msgid "<span weight=\"bold\">Required Information</span>"
 msgstr "<span weight=\"bold\">必要資訊</span>"
 
-#: ../mail/mail-config.glade.h:29
+#: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Secure MIME (S/MIME)</span>"
 msgstr "<span weight=\"bold\">安全 MIME (S/MIME)</span>"
 
-#: ../mail/mail-config.glade.h:30
+#: ../mail/mail-config.glade.h:29
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全性</span>"
 
-#: ../mail/mail-config.glade.h:31
+#: ../mail/mail-config.glade.h:30
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">己傳送的和草稿郵件</span>"
 
-#: ../mail/mail-config.glade.h:32
+#: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">伺服器組態</span>"
 
+#: ../mail/mail-config.glade.h:32
+msgid "<span weight=\"bold\">_Authentication Type</span>"
+msgstr "<span weight=\"bold\">驗證類型(_A)</span>"
+
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "帳號總管"
@@ -13235,7 +13284,7 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "使用此帳號時一定在外送的郵件簽名(_W)"
 
 #: ../mail/mail-config.glade.h:38
-msgid "Also encrypt to sel_f when sending encrypted mail"
+msgid "Also encrypt to sel_f when sending encrypted messages"
 msgstr "當傳送加密郵件時也加密本身(_F)"
 
 #: ../mail/mail-config.glade.h:39
@@ -13251,65 +13300,65 @@ msgid "Always _trust keys in my keyring when encrypting"
 msgstr "加密時永遠信任我的鑰匙圈裡的金鑰(_T)"
 
 #: ../mail/mail-config.glade.h:42
-msgid "Always encrypt to _myself when sending encrypted mail"
+msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
 #: ../mail/mail-config.glade.h:43
+msgid "Always request rea_d receipt"
+msgstr "永遠要求讀信回條(_D)"
+
+#: ../mail/mail-config.glade.h:44
 msgid "Attach original message"
 msgstr "附加原始郵件"
 
-#: ../mail/mail-config.glade.h:45
-msgid "Automatically insert _smiley images"
-msgstr "自動插入笑臉圖片(_S)"
-
 #: ../mail/mail-config.glade.h:46
+msgid "Automatically insert _emoticon images"
+msgstr "自動插入表情符號(_E)"
+
+#: ../mail/mail-config.glade.h:47
 msgid "Baltic (ISO-8859-13)"
 msgstr "波羅的海語系 (ISO-8859-13)"
 
-#: ../mail/mail-config.glade.h:47
+#: ../mail/mail-config.glade.h:48
 msgid "Baltic (ISO-8859-4)"
 msgstr "波羅的海語系 (ISO-8859-4)"
 
-#: ../mail/mail-config.glade.h:48
-msgid "Beep w_hen new mail arrives"
-msgstr "當新郵件到達時發出嗶聲(_H)"
-
 #: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
 msgstr "字元集(_H):"
 
 #: ../mail/mail-config.glade.h:50
-msgid "Ch_eck for Supported Types "
-msgstr " 檢查可支援的類型(_E) "
+msgid "C_heck custom headers for junk"
+msgstr "檢查垃圾郵件自訂標頭(_H)"
 
 #: ../mail/mail-config.glade.h:51
-msgid "Check in_coming mail for junk"
-msgstr "檢查內送郵件是否為垃圾郵件(_N)"
+msgid "Ch_eck for Supported Types "
+msgstr " 檢查可支援的類型(_E) "
 
 #: ../mail/mail-config.glade.h:52
+msgid "Check incoming _messages for junk"
+msgstr "檢查內送郵件是否為垃圾郵件(_M)"
+
+#: ../mail/mail-config.glade.h:53
 msgid "Check spelling while I _type"
 msgstr "當我輸入時檢查拼字(_T)"
 
-#: ../mail/mail-config.glade.h:53
+#: ../mail/mail-config.glade.h:54
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢查內送的垃圾郵件訊息"
 
-#: ../mail/mail-config.glade.h:54
+#: ../mail/mail-config.glade.h:55
 msgid "Cle_ar"
 msgstr "清除(_A)"
 
-#: ../mail/mail-config.glade.h:55
+#: ../mail/mail-config.glade.h:56
 msgid "Clea_r"
 msgstr "清除(_R)"
 
-#: ../mail/mail-config.glade.h:56
+#: ../mail/mail-config.glade.h:57
 msgid "Color for _misspelled words:"
 msgstr "拼錯字的顏色(_M):"
 
-#: ../mail/mail-config.glade.h:57
-msgid "Colors"
-msgstr "色彩"
-
 #: ../mail/mail-config.glade.h:58
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
@@ -13338,134 +13387,150 @@ msgstr "預設值(_F)"
 msgid "Default character e_ncoding:"
 msgstr "預設字元編碼(_N):"
 
-#: ../mail/mail-config.glade.h:69
-msgid "Digitally _sign outgoing messages (by default)"
-msgstr "為外送的郵件加上數位簽章 [預設值] (_S)"
+#: ../mail/mail-config.glade.h:68
+msgid "Delete junk messages on e_xit"
+msgstr "離開時刪除垃圾郵件(_X)"
 
 #: ../mail/mail-config.glade.h:70
-msgid "Do not format text contents in mails if the text si_ze exceeds"
-msgstr "不排版郵件內文的文字大小上限(_Z)"
+msgid "Digitally sign o_utgoing messages (by default)"
+msgstr "為外送的郵件加上數位簽章 [預設值] (_U)"
 
 #: ../mail/mail-config.glade.h:71
+msgid "Do _not mark messages as junk if sender is in my addressbook"
+msgstr "若寄件者在我的通訊錄中就不要將郵件標記為垃圾郵件(_N)"
+
+#: ../mail/mail-config.glade.h:72
+msgid "Do not format text contents in messages if the text si_ze exceeds"
+msgstr "不排版郵件內文的文字大小上限(_Z)"
+
+#: ../mail/mail-config.glade.h:73
 msgid "Do not quote original message"
 msgstr "不要引用原始郵件"
 
-#: ../mail/mail-config.glade.h:72
+#: ../mail/mail-config.glade.h:74
 msgid "Done"
 msgstr "完成"
 
-#: ../mail/mail-config.glade.h:73
+#: ../mail/mail-config.glade.h:75
 msgid "Drafts _Folder:"
 msgstr "草稿匣(_F):"
 
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "啟用(_E)"
-
-#: ../mail/mail-config.glade.h:75
+#: ../mail/mail-config.glade.h:76
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
 
-#: ../mail/mail-config.glade.h:76
+#: ../mail/mail-config.glade.h:77
 msgid "Email _Address:"
 msgstr "電子郵件位址(_A):"
 
-#: ../mail/mail-config.glade.h:77
+#: ../mail/mail-config.glade.h:78
 msgid "Empty trash folders on e_xit"
 msgstr "離開時清空回收筒資料夾(_X)"
 
-#: ../mail/mail-config.glade.h:78
+#: ../mail/mail-config.glade.h:79
+msgid "Enable Magic S_pacebar "
+msgstr "啟用神奇空白鍵(_P)"
+
+#: ../mail/mail-config.glade.h:80
+msgid "Enable Sea_rch Folders"
+msgstr "啟用搜尋資料夾(_R)"
+
+#: ../mail/mail-config.glade.h:81
 msgid "Encry_ption certificate:"
 msgstr "加密憑證(_P):"
 
-#: ../mail/mail-config.glade.h:79
+#: ../mail/mail-config.glade.h:82
 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
+#: ../mail/mail-config.glade.h:84
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
-#: ../mail/mail-config.glade.h:83
+#: ../mail/mail-config.glade.h:85
+msgid "Fix_ed width Font:"
+msgstr "固定寬度字型(_E):"
+
+#: ../mail/mail-config.glade.h:86
 msgid "Font Properties"
 msgstr "字型內容"
 
-#: ../mail/mail-config.glade.h:84
+#: ../mail/mail-config.glade.h:87
 msgid "Format messages in _HTML"
 msgstr "將郵件格式化為 _HTML"
 
-#: ../mail/mail-config.glade.h:85
+#: ../mail/mail-config.glade.h:88
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-#: ../mail/mail-config.glade.h:87
-msgid "HTML Mail"
+#: ../mail/mail-config.glade.h:90
+msgid "HTML Messages"
 msgstr "HTML 郵件"
 
-#: ../mail/mail-config.glade.h:88
+#: ../mail/mail-config.glade.h:91
 msgid "Headers"
 msgstr "檔頭"
 
-#: ../mail/mail-config.glade.h:89
+#: ../mail/mail-config.glade.h:92
 msgid "Highlight _quotations with"
 msgstr "強調引文為(_Q)"
 
-#: ../mail/mail-config.glade.h:90
-msgid "I_nclude remote tests"
-msgstr "包含遠端測試(_N)"
-
-#: ../mail/mail-config.glade.h:93
+#: ../mail/mail-config.glade.h:94
 msgid "Inline"
 msgstr "行內"
 
 #: ../mail/mail-config.glade.h:95
+msgid "Inline original message (Outlook style)"
+msgstr "內嵌原始郵件 (Outlook 風格)"
+
+#: ../mail/mail-config.glade.h:97
 msgid "KB"
 msgstr "KB"
 
-#: ../mail/mail-config.glade.h:96
+#: ../mail/mail-config.glade.h:98 ../mail/message-list.etspec.h:8
+msgid "Labels"
+msgstr "標籤"
+
+#: ../mail/mail-config.glade.h:99
 msgid "Languages Table"
 msgstr "語言表"
 
-#: ../mail/mail-config.glade.h:98
+#: ../mail/mail-config.glade.h:100
 msgid "Mail Configuration"
 msgstr "郵件組態"
 
-#: ../mail/mail-config.glade.h:99
+#: ../mail/mail-config.glade.h:101
 msgid "Mail Headers Table"
 msgstr "郵件檔頭表"
 
-#: ../mail/mail-config.glade.h:101
+#: ../mail/mail-config.glade.h:103
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-#: ../mail/mail-config.glade.h:102
+#: ../mail/mail-config.glade.h:104
 msgid "Message Composer"
 msgstr "郵件編輯器"
 
-#: ../mail/mail-config.glade.h:103
+#: ../mail/mail-config.glade.h:105
+msgid ""
+"Note: Underscore in the label name is used as mnemonic identifier in menu."
+msgstr "注意：在標籤名稱中的底線是用來標記選單中的捷徑鍵。"
+
+#: ../mail/mail-config.glade.h:106
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
 msgstr "注意：在首次連線之前將不會提示您輸入密碼"
 
-#: ../mail/mail-config.glade.h:104
+#: ../mail/mail-config.glade.h:107
 msgid "Or_ganization:"
 msgstr "團體(_G):"
 
-#: ../mail/mail-config.glade.h:105
+#: ../mail/mail-config.glade.h:108
 msgid "PGP/GPG _Key ID:"
 msgstr "_PGP/GPG 金鑰 ID:"
 
-#: ../mail/mail-config.glade.h:108
-msgid "Play sound file when new mail arri_ves"
-msgstr "當新郵件到達時播放聲音檔案(_V)"
-
-#: ../mail/mail-config.glade.h:109
+#: ../mail/mail-config.glade.h:110
 msgid ""
 "Please enter a descriptive name for this account in the space below.\n"
 "This name will be used for display purposes only."
@@ -13473,7 +13538,7 @@ msgstr ""
 "請在下面的空間輸入描述這個帳號的名稱。\n"
 "這個名稱將只做為顯示之用。"
 
-#: ../mail/mail-config.glade.h:111
+#: ../mail/mail-config.glade.h:112
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -13481,7 +13546,7 @@ msgstr ""
 "請輸入以下關於寄送郵件方式的資訊。如果您不清楚，請聯絡系統管理員或網路服務供"
 "應商。"
 
-#: ../mail/mail-config.glade.h:112
+#: ../mail/mail-config.glade.h:113
 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 "
@@ -13490,70 +13555,66 @@ msgstr ""
 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出"
 "的郵件內包含這些資訊。"
 
-#: ../mail/mail-config.glade.h:113
+#: ../mail/mail-config.glade.h:114
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
-#: ../mail/mail-config.glade.h:114
+#: ../mail/mail-config.glade.h:115
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: ../mail/mail-config.glade.h:115
+#: ../mail/mail-config.glade.h:116
 msgid "Quote original message"
 msgstr "引用原始郵件"
 
-#: ../mail/mail-config.glade.h:116
+#: ../mail/mail-config.glade.h:117
 msgid "Quoted"
 msgstr "引用"
 
-#: ../mail/mail-config.glade.h:117
+#: ../mail/mail-config.glade.h:118
 msgid "Re_member password"
 msgstr "記住密碼(_M)"
 
-#: ../mail/mail-config.glade.h:118
+#: ../mail/mail-config.glade.h:119
 msgid "Re_ply-To:"
 msgstr "回覆地址(_P):"
 
-#: ../mail/mail-config.glade.h:120
+#: ../mail/mail-config.glade.h:121
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
-#: ../mail/mail-config.glade.h:121
+#: ../mail/mail-config.glade.h:122
+msgid "S_earch for sender photograph only in local addressbooks"
+msgstr "只搜尋本地端通訊錄中的寄件者相片(_E)"
+
+#: ../mail/mail-config.glade.h:123
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-#: ../mail/mail-config.glade.h:122
+#: ../mail/mail-config.glade.h:124
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
 
-#: ../mail/mail-config.glade.h:123
+#: ../mail/mail-config.glade.h:125
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-#: ../mail/mail-config.glade.h:124
-msgid "Se_lect..."
-msgstr "選取(_L)..."
-
-#: ../mail/mail-config.glade.h:126
+#: ../mail/mail-config.glade.h:127
 msgid "Select HTML fixed width font"
 msgstr "選擇 HTML 固定寬度字型"
 
-#: ../mail/mail-config.glade.h:127
+#: ../mail/mail-config.glade.h:128
 msgid "Select HTML fixed width font for printing"
 msgstr "選擇用於列印的 HTML 固定寬度字型"
 
-#: ../mail/mail-config.glade.h:128
+#: ../mail/mail-config.glade.h:129
 msgid "Select HTML variable width font"
 msgstr "選擇 HTML 可變寬度字型"
 
-#: ../mail/mail-config.glade.h:129
+#: ../mail/mail-config.glade.h:130
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
-#: ../mail/mail-config.glade.h:130
-msgid "Select sound file"
-msgstr "選擇聲音檔案"
-
 #: ../mail/mail-config.glade.h:132
 msgid "Sending Mail"
 msgstr "傳送郵件"
@@ -13587,24 +13648,20 @@ msgid "Signatures Table"
 msgstr "簽章表"
 
 #: ../mail/mail-config.glade.h:140
-msgid "Specify _filename:"
-msgstr "指定檔案名稱(_F):"
-
-#: ../mail/mail-config.glade.h:141
 msgid "Spell Checking"
 msgstr "拼字檢查"
 
-#: ../mail/mail-config.glade.h:142
+#: ../mail/mail-config.glade.h:141
 msgid "T_ype: "
 msgstr "類型(_Y):"
 
-#: ../mail/mail-config.glade.h:143
+#: ../mail/mail-config.glade.h:142
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出已經安裝字典的語言。"
 
-#: ../mail/mail-config.glade.h:144
+#: ../mail/mail-config.glade.h:143
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -13614,7 +13671,12 @@ msgstr ""
 "簽名檔。您指定的名稱只會作為\n"
 "顯示之用。"
 
-#: ../mail/mail-config.glade.h:148
+#: ../mail/mail-config.glade.h:146
+msgid ""
+"This option will be overridden if a match for custom junk headers is found."
+msgstr "如果找到符合的自訂垃圾郵件標頭這個選項就會被覆蓋。"
+
+#: ../mail/mail-config.glade.h:147
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
@@ -13622,15 +13684,16 @@ msgstr ""
 "輸入想用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
-#: ../mail/mail-config.glade.h:150 ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
+#: ../plugins/google-account-setup/google-source.c:358
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
-#: ../mail/mail-config.glade.h:151
+#: ../mail/mail-config.glade.h:150
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
-#: ../mail/mail-config.glade.h:152
+#: ../mail/mail-config.glade.h:151
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -13640,88 +13703,100 @@ msgstr ""
 "\n"
 "按一下「下一步」開始。 "
 
-#: ../mail/mail-config.glade.h:156
+#: ../mail/mail-config.glade.h:154
 msgid "_Add Signature"
 msgstr "加入簽名檔(_A)"
 
-#: ../mail/mail-config.glade.h:157
+#: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
 msgstr "一定自網路下載影像(_A)"
 
-#: ../mail/mail-config.glade.h:158
-msgid "_Do not notify me when new mail arrives"
-msgstr "當新郵件到達時不要通知我(_D)"
+#: ../mail/mail-config.glade.h:156
+msgid "_Default junk plugin:"
+msgstr "預設垃圾郵件外掛程式(_D):"
 
-#: ../mail/mail-config.glade.h:159
+#: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "不簽署會議邀請 (相容於 _Outlook)"
 
-#: ../mail/mail-config.glade.h:161
+#: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
 msgstr "轉寄方式(_F):"
 
-#: ../mail/mail-config.glade.h:162
-msgid "_Load images in mail from contacts"
-msgstr "載入由連絡人寄出的郵件中的圖片(_L)"
+#: ../mail/mail-config.glade.h:160
+msgid "_Keep Signature above the original message on replying"
+msgstr "回信時保留原始郵件的簽名(_K)"
 
-#: ../mail/mail-config.glade.h:163
+#: ../mail/mail-config.glade.h:161
+msgid "_Load images in messages from contacts"
+msgstr "載入由連絡人寄出郵件中的圖片(_L)"
+
+#: ../mail/mail-config.glade.h:162
 msgid "_Make this my default account"
 msgstr "設為我的預設帳號(_M)"
 
-#: ../mail/mail-config.glade.h:164
+#: ../mail/mail-config.glade.h:163
 msgid "_Mark messages as read after"
 msgstr "標示郵件為已閱讀於(_M)"
 
-#: ../mail/mail-config.glade.h:166
+#: ../mail/mail-config.glade.h:165
 msgid "_Never load images from the Internet"
 msgstr "一定不自網路下載影像(_N)"
 
-#: ../mail/mail-config.glade.h:167
+#: ../mail/mail-config.glade.h:166
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-#: ../mail/mail-config.glade.h:168
+#: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "當傳送 _HTML 郵件給不想收到這類郵件的連絡人時顯示提示"
 
-#: ../mail/mail-config.glade.h:169
+#: ../mail/mail-config.glade.h:168
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
-#: ../mail/mail-config.glade.h:170
+#: ../mail/mail-config.glade.h:169
 msgid "_Reply style:"
 msgstr "回覆方式(_R):"
 
-#: ../mail/mail-config.glade.h:171
+#: ../mail/mail-config.glade.h:170
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
+#: ../mail/mail-config.glade.h:171
+msgid "_Select..."
+msgstr "選取(_S)..."
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:174
 msgid "_Show image animations"
 msgstr "顯示動畫影像(_S)"
 
 #: ../mail/mail-config.glade.h:175
+msgid "_Show the photograph of sender in the message preview"
+msgstr "在郵件預覽顯示寄件者相片(_S)"
+
+#: ../mail/mail-config.glade.h:176
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮短 _To / Cc / Bcc 檔頭為"
 
-#: ../mail/mail-config.glade.h:176
+#: ../mail/mail-config.glade.h:177
 msgid "_Use Secure Connection:"
 msgstr "使用安全連線(_U):"
 
-#: ../mail/mail-config.glade.h:177
+#: ../mail/mail-config.glade.h:178
 msgid "_Use the same fonts as other applications"
 msgstr "使用與其他應用程式相同的字型(_U)"
 
-#: ../mail/mail-config.glade.h:178
+#: ../mail/mail-config.glade.h:179
 msgid "addresses"
 msgstr "地址"
 
-#: ../mail/mail-config.glade.h:179
+#: ../mail/mail-config.glade.h:180
 msgid "color"
 msgstr "色彩"
 
-#: ../mail/mail-config.glade.h:180
+#: ../mail/mail-config.glade.h:181
 msgid "description"
 msgstr "描述"
 
@@ -13757,7 +13832,7 @@ msgstr "所有本地端資料夾"
 msgid "Case _sensitive"
 msgstr "區分大小寫(_S)"
 
-#: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
+#: ../mail/mail-dialogs.glade.h:9
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
@@ -13769,8 +13844,7 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在郵件內尋找"
 
-#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:298
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
@@ -13798,7 +13872,7 @@ msgstr "保全性資訊"
 msgid "Specific folders"
 msgstr "指定的資料夾"
 
-#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:3
+#: ../mail/mail-dialogs.glade.h:21
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -13810,11 +13884,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "接受授權(_A)"
 
-#: ../mail/mail-dialogs.glade.h:24 ../mail/message-tags.glade.h:5
+#: ../mail/mail-dialogs.glade.h:24
 msgid "_Due By:"
 msgstr "到期於(_D):"
 
-#: ../mail/mail-dialogs.glade.h:25 ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:25
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
@@ -13822,7 +13896,7 @@ msgstr "標幟(_F):"
 msgid "_Tick this to accept the license agreement"
 msgstr "選取此項來接受授權合約(_T)"
 
-#: ../mail/mail-folder-cache.c:858
+#: ../mail/mail-folder-cache.c:823
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -13831,17 +13905,17 @@ msgstr "Pinging %s"
 msgid "Filtering Selected Messages"
 msgstr "過濾選擇的郵件"
 
-#: ../mail/mail-ops.c:266
+#: ../mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 #. sending mail, filtering failed
-#: ../mail/mail-ops.c:566
+#: ../mail/mail-ops.c:560
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../mail/mail-ops.c:578 ../mail/mail-ops.c:607
+#: ../mail/mail-ops.c:572 ../mail/mail-ops.c:601
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -13850,12 +13924,16 @@ msgstr ""
 "無法附加至 %s：%s\n"
 "改附加至本地「寄件匣」。"
 
-#: ../mail/mail-ops.c:624
+#: ../mail/mail-ops.c:618
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」：%s"
 
-#: ../mail/mail-ops.c:736
+#: ../mail/mail-ops.c:724
+msgid "Sending message"
+msgstr "正在傳送郵件"
+
+#: ../mail/mail-ops.c:734
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
@@ -13865,15 +13943,15 @@ msgstr "正在傳送郵件 %d / %d"
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
-#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:652
+#: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:704
 msgid "Canceled."
 msgstr "已取消。"
 
-#: ../mail/mail-ops.c:765
+#: ../mail/mail-ops.c:765 ../mail/mail-send-recv.c:706
 msgid "Complete."
 msgstr "完成。"
 
-#: ../mail/mail-ops.c:862
+#: ../mail/mail-ops.c:869
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
@@ -13887,77 +13965,77 @@ msgstr "將郵件移到 %s"
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
-#: ../mail/mail-ops.c:1170
+#: ../mail/mail-ops.c:1161
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-#: ../mail/mail-ops.c:1213
+#: ../mail/mail-ops.c:1202
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
-#: ../mail/mail-ops.c:1285
+#: ../mail/mail-ops.c:1267
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
-#: ../mail/mail-ops.c:1363
+#: ../mail/mail-ops.c:1338
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
-#: ../mail/mail-ops.c:1457
+#: ../mail/mail-ops.c:1427
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾「%s」"
 
-#: ../mail/mail-ops.c:1522
+#: ../mail/mail-ops.c:1490
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-#: ../mail/mail-ops.c:1523
+#: ../mail/mail-ops.c:1491
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-#: ../mail/mail-ops.c:1578
+#: ../mail/mail-ops.c:1545
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
-#: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
+#: ../mail/mail-ops.c:1582 ../mail/mail-ops.c:1632
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
-#: ../mail/mail-ops.c:1662
+#: ../mail/mail-ops.c:1629
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "清空 '%s' 的回收筒"
 
-#: ../mail/mail-ops.c:1663
+#: ../mail/mail-ops.c:1630
 msgid "Local Folders"
 msgstr "本機資料夾"
 
-#: ../mail/mail-ops.c:1746
+#: ../mail/mail-ops.c:1711
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
-#: ../mail/mail-ops.c:1856
+#: ../mail/mail-ops.c:1818
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
-#: ../mail/mail-ops.c:1942
+#: ../mail/mail-ops.c:1903
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
-#: ../mail/mail-ops.c:2013
+#: ../mail/mail-ops.c:1973
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13966,11 +14044,11 @@ msgstr ""
 "儲存郵件到：%s 時發生錯誤：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2085
+#: ../mail/mail-ops.c:2045
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-#: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
+#: ../mail/mail-ops.c:2057 ../mail/mail-ops.c:2063
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13979,69 +14057,75 @@ msgstr ""
 "不能建立輸出檔案：%s：\n"
 " %s"
 
-#: ../mail/mail-ops.c:2114
+#: ../mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
-#: ../mail/mail-ops.c:2263
+#: ../mail/mail-ops.c:2219
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
 
-#: ../mail/mail-ops.c:2379
+#: ../mail/mail-ops.c:2315
+#, c-format
+msgid "Preparing account '%s' for offline"
+msgstr "準備帳號「%s」離線工作"
+
+#: ../mail/mail-ops.c:2401
 msgid "Checking Service"
 msgstr "檢查服務"
 
-#: ../mail/mail-send-recv.c:159
+#: ../mail/mail-send-recv.c:190
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:349
+#: ../mail/mail-send-recv.c:393
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
 
-#: ../mail/mail-send-recv.c:356
+#: ../mail/mail-send-recv.c:400
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-#: ../mail/mail-send-recv.c:453
+#: ../mail/mail-send-recv.c:510
 msgid "Updating..."
 msgstr "正在更新..."
 
-#: ../mail/mail-send-recv.c:453 ../mail/mail-send-recv.c:506
+#: ../mail/mail-send-recv.c:510 ../mail/mail-send-recv.c:583
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:792
+#, c-format
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
-#: ../mail/mail-session.c:198
+#: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "請輸入 %s 所需的密語"
 
-#: ../mail/mail-session.c:200
+#: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "輸入密語"
 
-#: ../mail/mail-session.c:203
+#: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-#: ../mail/mail-session.c:205
+#: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-#: ../mail/mail-session.c:243
+#: ../mail/mail-session.c:254
 msgid "User canceled operation."
 msgstr "使用者已取消操作。"
 
@@ -14054,7 +14138,6 @@ msgid "Enter a name for this signature."
 msgstr "輸入這個簽名檔的名稱。"
 
 #: ../mail/mail-signature-editor.c:434
-#: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "名稱:"
 
@@ -14082,26 +14165,26 @@ msgstr "轉寄的郵件"
 msgid "Invalid folder: `%s'"
 msgstr "資料夾無效:`%s'"
 
-#: ../mail/mail-vfolder.c:91
+#: ../mail/mail-vfolder.c:89
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:233
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新 '%s:%s' 的搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:247
+#: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新 '%s' 的搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1023
+#: ../mail/mail-vfolder.c:1059
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
-#: ../mail/mail-vfolder.c:1107
+#: ../mail/mail-vfolder.c:1148
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
@@ -14299,68 +14382,86 @@ msgid "Delete account?"
 msgstr "刪除帳號？"
 
 #: ../mail/mail.error.xml.h:45
+msgid "Delete messages in Search Folder &quot;{0}&quot;?"
+msgstr "是否刪除搜尋資料夾 &quot;{0}&quot;？"
+
+#: ../mail/mail.error.xml.h:46
+msgid "Delete messages in Search Folder?"
+msgstr "是否刪除搜尋資料夾中的郵件？"
+
+#: ../mail/mail.error.xml.h:47
 msgid "Discard changes?"
 msgstr "是否放棄變更？"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:48
+msgid "Do not d_elete"
+msgstr "不要刪除(_E)"
+
+#: ../mail/mail.error.xml.h:49
 msgid "Do not delete"
 msgstr "不要刪除"
 
-#: ../mail/mail.error.xml.h:47
+#: ../mail/mail.error.xml.h:50
 msgid "Do not disable"
 msgstr "不要停用"
 
-#: ../mail/mail.error.xml.h:48
-msgid "Do you want the operation to be performed in the subfolders?"
+#: ../mail/mail.error.xml.h:51
+msgid "Do you want the operation to be performed also in the subfolders?"
 msgstr "是否想在子資料夾中一併進行這項操作程序？"
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
+msgid ""
+"Do you want to locally synchronize the folders that are marked for offline "
+"usage?"
+msgstr "是否要在本地端同步那些標記為離線使用的資料夾？"
+
+#: ../mail/mail.error.xml.h:53
 msgid "Do you want to mark all messages as read?"
 msgstr "是否要將全部的郵件標示成已閱讀？"
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:54
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更？"
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:55
 msgid "Enter password."
 msgstr "輸入密碼。"
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:56
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:57
 msgid "Error while performing operation."
 msgstr "執行作業時，發生錯誤。"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:58
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:60
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:61
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "如果您選擇繼續，將無法復原這些郵件。"
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
 msgstr "如果您選擇刪除資料夾，它的所有內容和子資料夾內容會永遠消失。"
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:63
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "如果繼續，所有的代理伺服器帳號會永久刪除。"
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:64
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -14368,29 +14469,29 @@ msgstr ""
 "如果繼續，該帳號的資訊以及\n"
 "它所有的代理伺服器會永遠刪除。"
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:66
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:67
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
 msgstr "如果您選擇結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:68
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:69
 msgid "Invalid authentication"
 msgstr "無效的驗證"
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:71
 msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:72
 msgid ""
 "Many email systems add an Apparently-To header to messages that only have "
 "BCC recipients. This header, if added, will list all of your recipients to "
@@ -14401,39 +14502,39 @@ msgstr ""
 "了此檔頭，會永遠列示郵件中所有的收件者。要避免此情況，應該至少新增一個「收件"
 "者：」或「副本：」收件者。"
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:73
 msgid "Mark all messages as read"
 msgstr "將全部的郵件標示成已閱讀"
 
-#: ../mail/mail.error.xml.h:70
-msgid "Mark all messages in subfolders as read?"
-msgstr "是否子資料夾中全部的郵件標示成已閱讀？"
-
-#: ../mail/mail.error.xml.h:71
-msgid "Mark as _Read"
-msgstr "標示成已閱讀(_R)"
+#: ../mail/mail.error.xml.h:74
+msgid "Mark all messages in this folder and subfolders as read?"
+msgstr "是否將此資料夾及其子資料夾中全部的郵件標示成已閱讀？"
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
 
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "No sources selected."
 msgstr "未選取來源。"
 
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
+msgid "Only on _Current Folder"
+msgstr "只在目前的資料夾(_C)"
+
+#: ../mail/mail.error.xml.h:79
 msgid "Opening too many messages at once may take a long time."
 msgstr "一次開啟過多郵件可能會花費許多時間。"
 
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:80
 msgid "Please check your account settings and try again."
 msgstr "請檢查帳號設定並再試一次。"
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:81
 msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:82
 msgid ""
 "Please enter a valid email address in the To: field. You can search for "
 "email addresses by clicking on the To: button next to the entry box."
@@ -14441,58 +14542,64 @@ msgstr ""
 "請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
 "「收件者：」按鈕，搜尋電子郵件地址。"
 
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:83
 msgid ""
 "Please make sure the following recipients are willing and able to receive "
 "HTML email:\n"
-"{0}\n"
-"Send anyway?"
+"{0}"
 msgstr ""
-"請確定以下收件者希望並且可以接收HTML 電子郵件：\n"
-"{0}\n"
-"立即傳送？"
+"請確定以下收件者希望並且可以接收 HTML 電子郵件：\n"
+"{0}"
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Please provide an unique name to identify this signature."
 msgstr "請輸入可供辨識這個簽名檔的獨特名稱。"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "Please wait."
 msgstr "請稍候。"
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
 msgstr "移轉舊郵件資料夾「{0}」發生問題。"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid "Querying server"
 msgstr "查詢伺服器"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:89
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的驗證演算法清單。"
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid "Read receipt requested."
 msgstr "要求讀信回條。"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Search Folders automatically updated."
 msgstr "搜尋資料夾自動更新。"
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:93
 msgid "Send Receipt"
 msgstr "傳送回條"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Signature Already Exists"
 msgstr "簽名檔已經存在"
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
+msgid "Synchronize"
+msgstr "同步化"
+
+#: ../mail/mail.error.xml.h:96
+msgid "Synchronize folders locally for offline usage?"
+msgstr "是否同步資料夾以供離線使用？"
+
+#: ../mail/mail.error.xml.h:97
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -14500,7 +14607,7 @@ msgstr ""
 "Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪"
 "除。"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:98
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
@@ -14515,7 +14622,7 @@ msgstr ""
 "此檔頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件"
 "者：」或「副本：」收件者。 "
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:101
 msgid ""
 "The following Search Folder(s):\n"
 "{0}\n"
@@ -14529,7 +14636,7 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:106
 msgid ""
 "The following filter rule(s):\n"
 "{0}\n"
@@ -14543,11 +14650,11 @@ msgstr ""
 "    「{1}」\n"
 "而且已更新。"
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:111
 msgid "The script file must exist and be executable."
 msgstr "程序檔必須存在而且可以執行。"
 
-#: ../mail/mail.error.xml.h:107
+#: ../mail/mail.error.xml.h:112
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -14555,76 +14662,85 @@ msgstr ""
 "此資料夾可能已經自動新增。\n"
 "需要時，請移至搜尋資料夾編輯器，以手動方式新增它。"
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:114
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "因為您沒有啟用選擇用來寄送的帳號，所以無法傳送此郵件。"
 
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:115
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "因為您沒有指定任何收件者，所以無法傳送此郵件"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:116
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:117
 msgid "This signature has been changed, but has not been saved."
 msgstr "此簽章已經變更，但尚未儲存。"
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:118
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
 msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺服器。"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:120
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替？"
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:122
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:123
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾？"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:124
+msgid ""
+"Warning: Deleting messages from a Search Folder will delete the actual "
+"message from one of your local or remote folders.\n"
+"Do you really want to do this?"
+msgstr ""
+"警告：從搜尋資料夾中刪除郵件將會自您的本地或遠端資料夾刪除實際的郵件。\n"
+"是否確定要這麼做？"
+
+#: ../mail/mail.error.xml.h:127
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:128
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:129
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:130
 msgid "You must name this Search Folder."
 msgstr "您必須命名此搜尋資料夾。"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:131
 msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -14633,98 +14749,98 @@ msgstr ""
 "您必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾，然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:134
 msgid "Your login to your server &quot;{0}&quot; as &quot;{0}&quot; failed."
 msgstr "您登入伺服器「{0}」以「{0}」身分，但失敗。"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:135
 msgid "_Append"
 msgstr "添加(_A)"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:136
 msgid "_Discard changes"
 msgstr "放棄變更(_D)"
 
-#: ../mail/mail.error.xml.h:130
-msgid "_Do not Mark as Read"
-msgstr "不要標示成已閱讀(_D)"
+#: ../mail/mail.error.xml.h:137
+msgid "_Do not Synchronize"
+msgstr "不要同步(_D)"
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:139
 msgid "_Expunge"
 msgstr "清除(_E)"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:140
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-#: ../mail/message-list.c:1022
+#: ../mail/mail.error.xml.h:143
+msgid "on Current Folder and _Subfolders"
+msgstr "於目前的資料夾及子資料夾(_S)"
+
+#: ../mail/message-list.c:1053
 msgid "Unseen"
 msgstr "未閱讀"
 
-#: ../mail/message-list.c:1023
+#: ../mail/message-list.c:1054
 msgid "Seen"
 msgstr "已閱讀"
 
-#: ../mail/message-list.c:1024
+#: ../mail/message-list.c:1055
 msgid "Answered"
 msgstr "已回覆"
 
-#: ../mail/message-list.c:1025
+#: ../mail/message-list.c:1056
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-#: ../mail/message-list.c:1026
+#: ../mail/message-list.c:1057
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-#: ../mail/message-list.c:1030
+#: ../mail/message-list.c:1061
 msgid "Lowest"
 msgstr "最低"
 
-#: ../mail/message-list.c:1031
+#: ../mail/message-list.c:1062
 msgid "Lower"
 msgstr "低"
 
-#: ../mail/message-list.c:1035
+#: ../mail/message-list.c:1066
 msgid "Higher"
 msgstr "高"
 
-#: ../mail/message-list.c:1036
+#: ../mail/message-list.c:1067
 msgid "Highest"
 msgstr "最高"
 
-#: ../mail/message-list.c:1469 ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1611 ../widgets/table/e-cell-date.c:55
 msgid "?"
 msgstr "？"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1476 ../plugins/itip-formatter/itip-view.c:202
-#: ../widgets/table/e-cell-date.c:72
+#: ../mail/message-list.c:1618 ../plugins/itip-formatter/itip-view.c:206
+#: ../widgets/table/e-cell-date.c:70
 msgid "Today %l:%M %p"
 msgstr "今天%p %-l:%M"
 
-#: ../mail/message-list.c:1485 ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1627 ../widgets/table/e-cell-date.c:80
 msgid "Yesterday %l:%M %p"
 msgstr "昨天%p %-l:%M"
 
-#: ../mail/message-list.c:1497 ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1639 ../widgets/table/e-cell-date.c:92
 msgid "%a %l:%M %p"
 msgstr "%A%p %-l:%M"
 
-#: ../mail/message-list.c:1505 ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1647 ../widgets/table/e-cell-date.c:100
 msgid "%b %d %l:%M %p"
 msgstr "%-m 月 %-d 日%p %-l:%M"
 
-#: ../mail/message-list.c:1507 ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1649 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %Y"
 msgstr "%Y 年 %-m 月 %-d 日"
 
-#: ../mail/message-list.c:2263 ../mail/message-list.etspec.h:9
-msgid "Messages"
-msgstr "郵件"
-
-#: ../mail/message-list.c:3654
+#: ../mail/message-list.c:3843
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -14744,15 +14860,15 @@ msgstr "有標幟的"
 msgid "Follow Up Flag"
 msgstr "跟隨標幟"
 
-#: ../mail/message-list.etspec.h:10
+#: ../mail/message-list.etspec.h:11
 msgid "Received"
 msgstr "已接收"
 
-#: ../mail/message-list.etspec.h:14
+#: ../mail/message-list.etspec.h:15
 msgid "Sent Messages"
 msgstr "傳送郵件"
 
-#: ../mail/message-list.etspec.h:15
+#: ../mail/message-list.etspec.h:16
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "大小"
@@ -14781,15 +14897,15 @@ msgstr "轉寄"
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
-#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
-#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
+#: ../mail/message-tag-followup.c:84 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
-#: ../mail/message-tag-followup.c:84
+#: ../mail/message-tag-followup.c:85
 msgid "Review"
 msgstr "檢閱"
 
@@ -14825,6 +14941,60 @@ msgstr "本地端通訊錄"
 msgid "Provides core functionality for local address books."
 msgstr "提供本地端行事曆的核心功能。"
 
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:1
+msgid "Enable attachment reminder plugin"
+msgstr "啟用附加檔案提醒外掛程式"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:2
+msgid "Enable attachment reminder plugin."
+msgstr "啟用附加檔案提醒外掛程式。"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:3
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body"
+msgstr "讓附加檔案提醒外掛程式用來搜尋郵件內文的關鍵字清單"
+
+#: ../plugins/attachment-reminder/apps-evolution-attachment-reminder.schemas.in.h:4
+msgid ""
+"List of clues for the attachment reminder plugin to look for in a message "
+"body."
+msgstr "讓附加檔案提醒外掛程式用來搜尋郵件內文的關鍵字清單。"
+
+#: ../plugins/attachment-reminder/attachment-reminder.c:475
+msgid "Keywords"
+msgstr "關鍵字"
+
+#: ../plugins/attachment-reminder/attachment-reminder.glade.h:1
+msgid "Remind _missing attachments"
+msgstr "提醒遺失的附加檔案(_M)"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:1
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:1
+msgid "Attachment Reminder"
+msgstr "附加檔案提醒程式"
+
+#: ../plugins/attachment-reminder/org-gnome-evolution-attachment-reminder.eplug.xml.h:2
+msgid ""
+"Looks for clues in a message for mention of attachments and warns if the "
+"attachment is missing"
+msgstr "在郵件中尋找關鍵字以提醒其中的附加檔案並且可在附加檔案遺失時提出警告"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:2
+msgid ""
+"Evolution has found some keywords that suggest that this message should "
+"contain an attachment, but cannot find one."
+msgstr ""
+"Evolution 已找到某些代表該郵件應含有附加檔案的關鍵字，卻找不到這個附加檔案。"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
+msgid "Message has no attachments"
+msgstr "郵件沒有附加檔案"
+
+#: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
+msgid "_Continue Editing"
+msgstr "繼續編輯(_C)"
+
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
@@ -14836,38 +15006,125 @@ msgstr ""
 msgid "Audio inline plugin"
 msgstr "郵件音訊外掛程式"
 
-#: ../plugins/backup-restore/backup-restore.c:51
-msgid "Select name of Evolution archive"
-msgstr "選擇 Evolution 檔案庫的名稱"
+#: ../plugins/backup-restore/backup-restore.c:96
+msgid "Select name of the Evolution backup file"
+msgstr "選擇 Evolution 備份檔案的名稱"
 
-#: ../plugins/backup-restore/backup-restore.c:61
+#: ../plugins/backup-restore/backup-restore.c:120
 msgid "_Restart Evolution after backup"
 msgstr "備份後重新啟動 E_volution"
 
-#: ../plugins/backup-restore/backup-restore.c:89
-msgid "Select Evolution archive to restore"
-msgstr "選擇要復原的 Evolution 檔案庫"
+#: ../plugins/backup-restore/backup-restore.c:139
+msgid "Select name of the Evolution backup file to restore"
+msgstr "選擇要還原的 Evolution 備份檔案名稱"
 
-#: ../plugins/backup-restore/backup-restore.c:97
+#: ../plugins/backup-restore/backup-restore.c:163
 msgid "_Restart Evolution after restore"
 msgstr "回存後重新啟動 E_volution"
 
-#: ../plugins/backup-restore/backup.c:109
+#: ../plugins/backup-restore/backup-restore.c:236
+msgid "Restore from backup"
+msgstr "從備份還原"
+
+#: ../plugins/backup-restore/backup-restore.c:238
+msgid ""
+"You can restore Evolution from your backup. It can restore all the Mails, "
+"Calendars, Tasks, Memos, Contacts. \n"
+"It also restores all your personal settings, mail filters etc."
+msgstr ""
+"您可以從備份中還原 Evolution。它可以還原所有的郵件、行事曆、工作、備忘錄、連"
+"絡人。\n"
+"它也可以還原您所有的個人設定、郵件過濾器等。"
+
+#: ../plugins/backup-restore/backup-restore.c:244
+msgid "_Restore Evolution from the backup file"
+msgstr "從備份檔案還原 Evol_ution"
+
+#: ../plugins/backup-restore/backup-restore.c:251
+msgid "Please select an Evolution Archive to restore:"
+msgstr "選擇要還原的 Evolution 檔案庫："
+
+#: ../plugins/backup-restore/backup-restore.c:254
+msgid "Choose a file to restore"
+msgstr "選擇要還原的檔案"
+
+#: ../plugins/backup-restore/backup.c:40
 msgid "Backup Evolution directory"
 msgstr "備份 Evolution 目錄"
 
-#: ../plugins/backup-restore/backup.c:111
+#: ../plugins/backup-restore/backup.c:42
 msgid "Restore Evolution directory"
 msgstr "回存 Evolution 目錄"
 
-#: ../plugins/backup-restore/backup.c:113
-msgid "Check Evolution archive"
-msgstr "檢查 Evolution 檔案庫"
+#: ../plugins/backup-restore/backup.c:44
+msgid "Check Evolution Backup"
+msgstr "檢查 Evolution 備份"
 
-#: ../plugins/backup-restore/backup.c:115
+#: ../plugins/backup-restore/backup.c:46
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
+#: ../plugins/backup-restore/backup.c:48
+msgid "With Graphical User Interface"
+msgstr "使用圖形使用者介面"
+
+#: ../plugins/backup-restore/backup.c:69
+#: ../plugins/backup-restore/backup.c:110
+msgid "Shutting down Evolution"
+msgstr "正在關閉 Evolution"
+
+#: ../plugins/backup-restore/backup.c:74
+msgid "Backing Evolution accounts and settings"
+msgstr "備份 Evolution 的帳號與設定值"
+
+#: ../plugins/backup-restore/backup.c:78
+msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
+msgstr "正在備份 Evolution 資料 (郵件、連絡人、行事曆、工作、備忘錄)"
+
+#: ../plugins/backup-restore/backup.c:88
+msgid "Backup complete"
+msgstr "備份完成"
+
+#: ../plugins/backup-restore/backup.c:93
+#: ../plugins/backup-restore/backup.c:136
+msgid "Restarting Evolution"
+msgstr "重新啟動 Evolution"
+
+#: ../plugins/backup-restore/backup.c:114
+msgid "Backup current Evolution data"
+msgstr "備份目前的 Evolution 資料"
+
+#: ../plugins/backup-restore/backup.c:119
+msgid "Extracting files from backup"
+msgstr "從備份解開檔案"
+
+#: ../plugins/backup-restore/backup.c:125
+msgid "Loading Evolution settings"
+msgstr "正在讀取 Evolution 的設定值"
+
+#: ../plugins/backup-restore/backup.c:129
+msgid "Removing temporary backup files"
+msgstr "移除暫存的備份檔案"
+
+#: ../plugins/backup-restore/backup.c:249
+#, c-format
+msgid "Backing up to the folder %s"
+msgstr "正備份至資料夾 %s"
+
+#: ../plugins/backup-restore/backup.c:254
+#, c-format
+msgid "Restoring from the folder %s"
+msgstr "從資料夾還原 %s"
+
+#. Backup / Restore only can have GUI. We should restrict the rest
+#: ../plugins/backup-restore/backup.c:270
+msgid "Evolution Backup"
+msgstr "Evolution 備份"
+
+#: ../plugins/backup-restore/backup.c:270
+msgid "Evolution Restore"
+msgstr "Evolution 還原"
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:1
 msgid "A plugin for backing up and restore Evolution data and settings."
 msgstr "備份與回存 Evolution 的資料與設定值的外掛程式。"
@@ -14877,49 +15134,89 @@ msgstr "備份與回存 Evolution 的資料與設定值的外掛程式。"
 msgid "Backup and restore plugin"
 msgstr "備份與回存外掛程式。"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
-msgid "Backup Settings..."
-msgstr "備份設定值..."
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:1
+msgid "Are you sure you want to close Evolution?"
+msgstr "確定要關閉 Evolution？"
 
-#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:2
+msgid ""
+"Are you sure you want to restore Evolution from the selected backup file?"
+msgstr "確定要從選定的備份檔案還原 Evolution？"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:3
+msgid ""
+"Evolution backup can start only when Evolution is not running. Please make "
+"sure that you save and close all your unsaved windows before proceeding.  If "
+"you want Evolution to restart automatically after backup, please enable the "
+"toggle button."
+msgstr ""
+"Evolution 備份只能在 Evolution 沒有執行時啟動。在進行之前請確定您已儲存並關閉"
+"所有未儲存的視窗。如果希望 Evolution 在備份後自動重新啟動，請啟用切換按鈕。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:4
+msgid "Invalid Evolution backup file"
+msgstr "無效的 Evolution 備份檔案"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:5
+msgid "Please select a valid backup file to restore."
+msgstr "請選擇有效的備份檔案來還原。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.error.xml.h:6
+msgid ""
+"This will delete all your current Evolution data and settings and restore "
+"them from your backup. Evolution restore can start only when Evolution is "
+"not running. Please make sure that you close all your unsaved windows before "
+"you proceed. If you want Evolution to restart automatically restart after "
+"restore, please enable the toggle button."
+msgstr ""
+"這將會刪除所有 Evolution 目前的資料與設定值並從備份中還原它們。Evolution 還原"
+"只能在 Evolution 沒有執行時啟動。如果希望 Evolution 在還原後自動重新啟動，請"
+"啟用切換按鈕。"
+
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup and restore Evolution data and settings"
 msgstr "備份與回存 Evolution 的資料與設定值"
 
+#: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
+msgid "R_estore Settings..."
+msgstr "還原設定值(_E)..."
+
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
-msgid "Restore Settings..."
-msgstr "回存設定值..."
+msgid "_Backup Settings..."
+msgstr "備份設定值(_B)..."
 
-#: ../plugins/bbdb/bbdb.c:447 ../plugins/bbdb/bbdb.c:456
+#: ../plugins/bbdb/bbdb.c:541 ../plugins/bbdb/bbdb.c:550
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:471
+#: ../plugins/bbdb/bbdb.c:565
 msgid ""
-"_Automatically create entries in the addressbook when responding to mail"
+"_Automatically create entries in the addressbook when responding to messages"
 msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
 
-#: ../plugins/bbdb/bbdb.c:477
+#: ../plugins/bbdb/bbdb.c:571
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入連絡人用的通訊錄"
 
-#: ../plugins/bbdb/bbdb.c:492
+#: ../plugins/bbdb/bbdb.c:586
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息連絡人"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:507
+#: ../plugins/bbdb/bbdb.c:601
 msgid ""
-"Periodically synchronize contact information and images from gaim buddy list"
-msgstr "定期從 gaim 的好友清單同步連絡人資訊"
+"Periodically synchronize contact information and images from Pidgin buddy "
+"list"
+msgstr "定期從 Pidgin 的好友清單同步連絡人資訊"
 
-#: ../plugins/bbdb/bbdb.c:513
-msgid "Select Address book for Gaim buddy list"
-msgstr "選擇給 Gaim 好友名單用的通訊錄"
+#: ../plugins/bbdb/bbdb.c:607
+msgid "Select Address book for Pidgin buddy list"
+msgstr "選擇給 Pidgin 好友名單用的通訊錄"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:524
+#: ../plugins/bbdb/bbdb.c:618
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
@@ -14936,11 +15233,39 @@ msgstr ""
 msgid "BBDB"
 msgstr "BBDB"
 
+#: ../plugins/bogo-junk-plugin/bf-junk-filter.c:303
+msgid "Convert message text to _Unicode"
+msgstr "將郵件文字轉換為 _Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:1
+msgid "Convert mail messages to Unicode"
+msgstr "將郵件轉換為 Unicode"
+
+#: ../plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.h:2
+msgid ""
+"Convert message text to Unicode UTF-8 to unify spam/ham tokens coming from "
+"different character sets."
+msgstr "將郵件文字轉換為 Unicode UTF-8 以統一來自不同字集的 spam/ham 特徵。"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:1
+msgid "Bogofilter Options"
+msgstr "Bogofilter 選項"
+
+#: ../plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml.h:2
+msgid "Filters junk messages using Bogofilter."
+msgstr "使用 Bogofilter 過濾垃圾郵件。"
+
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
+#: ../plugins/caldav/caldav-source.c:247
+#: ../plugins/calendar-http/calendar-http.c:135
+msgid "_URL:"
+msgstr "網址(_U):"
+
 #: ../plugins/caldav/caldav-source.c:269
+#: ../plugins/google-account-setup/google-source.c:351
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
@@ -14960,10 +15285,20 @@ msgstr "本地行事曆"
 msgid "Provides core functionality for local calendars."
 msgstr "提供本地行事曆的核心功能。"
 
-#: ../plugins/calendar-http/calendar-http.c:339
+#: ../plugins/calendar-http/calendar-http.c:273
+#: ../plugins/calendar-weather/calendar-weather.c:546
+#: ../plugins/google-account-setup/google-source.c:375
+msgid "_Refresh:"
+msgstr "重新整理(_R):"
+
+#: ../plugins/calendar-http/calendar-http.c:341
 msgid "_Secure connection"
 msgstr "安全連線(_S)"
 
+#: ../plugins/calendar-http/calendar-http.c:406
+msgid "Userna_me:"
+msgstr "使用者名稱(_M):"
+
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP 行事曆"
@@ -15005,15 +15340,15 @@ msgstr "天氣：雷暴"
 msgid "Select a location"
 msgstr "選擇一個位置"
 
-#: ../plugins/calendar-weather/calendar-weather.c:654
+#: ../plugins/calendar-weather/calendar-weather.c:652
 msgid "_Units:"
 msgstr "單位(_U):"
 
-#: ../plugins/calendar-weather/calendar-weather.c:661
+#: ../plugins/calendar-weather/calendar-weather.c:659
 msgid "Metric (Celsius, cm, etc)"
 msgstr "公制(攝氏、公分等)"
 
-#: ../plugins/calendar-weather/calendar-weather.c:662
+#: ../plugins/calendar-weather/calendar-weather.c:660
 msgid "Imperial (Fahrenheit, inches, etc)"
 msgstr "英制(華氏、公吋等)"
 
@@ -15037,11 +15372,11 @@ msgstr ""
 msgid "Copy tool"
 msgstr "複製工具"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:1
 msgid "Check whether Evolution is the default mailer"
 msgstr "檢查 Evolution 是否為預設的郵件程式"
 
-#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
+#: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "每次啟動 Evolution 時，檢查它是否為預設的郵件程式。"
@@ -15058,8 +15393,13 @@ msgstr "預設郵件客戶端程式"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是否要將 Evolution 設為您的預設電子郵件客戶端程式？"
 
-#: ../plugins/default-source/default-source.c:82
-#: ../plugins/default-source/default-source.c:109
+#: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
+#: ../shell/main.c:624
+msgid "Evolution"
+msgstr "Evolution"
+
+#: ../plugins/default-source/default-source.c:81
+#: ../plugins/default-source/default-source.c:108
 msgid "Mark as _default folder"
 msgstr "標示為預設資料夾(_D)"
 
@@ -15149,7 +15489,7 @@ msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 帳號的授權設定"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
-msgid "Delegation Assitant"
+msgid "Delegation Assistant"
 msgstr "委派設定助理"
 
 #. Miscelleneous settings
@@ -15171,35 +15511,36 @@ msgstr "資料夾大小"
 msgid "Exchange Settings"
 msgstr "Exchange 設定值"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:610
+#: ../plugins/exchange-operations/exchange-account-setup.c:625
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:636
+#: ../plugins/exchange-operations/exchange-account-setup.c:651
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:829
-msgid "Authentication Type"
-msgstr "驗證類型"
+#: ../plugins/exchange-operations/exchange-account-setup.c:854
+msgid "_Authentication Type"
+msgstr "驗證類型(_A)"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:843
+#: ../plugins/exchange-operations/exchange-account-setup.c:868
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
-#: ../plugins/exchange-operations/exchange-contacts.c:213
+#: ../plugins/exchange-operations/exchange-account-setup.c:974
+#: ../plugins/exchange-operations/exchange-contacts.c:212
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../plugins/exchange-operations/exchange-account-setup.c:951
-#: ../plugins/exchange-operations/exchange-contacts.c:215
+#: ../plugins/exchange-operations/exchange-account-setup.c:976
+#: ../plugins/exchange-operations/exchange-contacts.c:214
+#, c-format
 msgid "0 KB"
 msgstr "0 KB"
 
 #: ../plugins/exchange-operations/exchange-calendar.c:191
-#: ../plugins/exchange-operations/exchange-contacts.c:166
+#: ../plugins/exchange-operations/exchange-contacts.c:165
 msgid ""
 "Evolution is in offline mode. You cannot create or modify folders now.\n"
 "Please switch to online mode for such operations."
@@ -15241,68 +15582,113 @@ msgstr "您目前的密碼已過期。請立即變更您的密碼。"
 msgid "Your password will expire in the next %d days"
 msgstr "您的密碼將在 %d 天後到期"
 
-#. Custom
-#: ../plugins/exchange-operations/exchange-delegates-user.c:144
+#: ../plugins/exchange-operations/exchange-delegates-user.c:159
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:580
-#: ../widgets/table/e-table-header-item.c:1554
 msgid "Custom"
 msgstr "自訂"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:191
+#: ../plugins/exchange-operations/exchange-delegates-user.c:189
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
+msgid "Editor (read, create, edit)"
+msgstr "編輯者 (讀取、建立、編輯)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:193
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
+msgid "Author (read, create)"
+msgstr "原著者 (讀取，建立)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:197
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
+msgid "Reviewer (read-only)"
+msgstr "檢閱者 (僅限讀取)"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:247
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:6
 msgid "Delegate Permissions"
 msgstr "委託許可權"
 
-#: ../plugins/exchange-operations/exchange-delegates-user.c:202
+#: ../plugins/exchange-operations/exchange-delegates-user.c:258
 #: ../plugins/exchange-operations/exchange-permissions-dialog.c:188
 #, c-format
 msgid "Permissions for %s"
 msgstr "%s 的許可權"
 
+#. To translators: This is a part of the message to be sent to the delegatee
+#. summarizing the permissions assigned to him.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:348
+msgid ""
+"This message was sent automatically by Evolution to inform you that you have "
+"been designated as a delegate. You can now send messages on my behalf."
+msgstr ""
+"這封郵件是由 Evolution 自動寄出以通知您已經被指派為代理人。您現在可以代表我寄"
+"發郵件。"
+
+#. To translators: Another chunk of the same message.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:353
+msgid "You have been given the following permissions on my folders:"
+msgstr "您已經得到我的資料夾的權限有："
+
+#. To translators: This message is included if the delegatee has been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:371
+msgid "You are also permitted to see my private items."
+msgstr "您也被允許查看我的私人項目。"
+
+#. To translators: This message is included if the delegatee has not been given access
+#. to the private items.
+#.
+#: ../plugins/exchange-operations/exchange-delegates-user.c:378
+msgid "However you are not permitted to see my private items."
+msgstr "然而您並未得到允許觀看我的私人項目。"
+
+#: ../plugins/exchange-operations/exchange-delegates-user.c:410
+#, c-format
+msgid "You have been designated as a delegate for %s"
+msgstr "您已經被指派為 %s 的代理人"
+
 #: ../plugins/exchange-operations/exchange-delegates.c:421
 msgid "Delegate To"
 msgstr "委託給"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:562
+#: ../plugins/exchange-operations/exchange-delegates.c:586
 #, c-format
 msgid "Remove the delegate %s?"
 msgstr "要移除委託 %s 嗎？"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:680
+#: ../plugins/exchange-operations/exchange-delegates.c:704
 msgid "Could not access Active Directory"
 msgstr "無法存取 Active Directory"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:692
+#: ../plugins/exchange-operations/exchange-delegates.c:716
 msgid "Could not find self in Active Directory"
 msgstr "Active Directory 中找不到自己"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:705
+#: ../plugins/exchange-operations/exchange-delegates.c:729
 #, c-format
 msgid "Could not find delegate %s in Active Directory"
 msgstr "Active Directory 中找不到委託 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:717
+#: ../plugins/exchange-operations/exchange-delegates.c:741
 #, c-format
 msgid "Could not remove delegate %s"
 msgstr "無法移除委託 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:777
+#: ../plugins/exchange-operations/exchange-delegates.c:801
 msgid "Could not update list of delegates."
 msgstr "無法更新委託的清單。"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:795
+#: ../plugins/exchange-operations/exchange-delegates.c:819
 #, c-format
 msgid "Could not add delegate %s"
 msgstr "無法新增委託 %s"
 
-#: ../plugins/exchange-operations/exchange-delegates.c:963
+#: ../plugins/exchange-operations/exchange-delegates.c:987
 msgid "Error reading delegates list."
 msgstr "讀取委託清單錯誤。"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:1
-msgid "Author (read, create)"
-msgstr "原著者 (讀取，建立)"
-
 #. Translators: This is used for permissions for <user> for the folder Calendar.
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:3
 msgid "C_alendar:"
@@ -15317,18 +15703,10 @@ msgstr "連絡人(_N)"
 msgid "Delegates"
 msgstr "委託"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:8
-msgid "Editor (read, create, edit)"
-msgstr "編輯者 (讀取、建立、編輯)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:10
 msgid "Permissions for"
 msgstr "許可權"
 
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:11
-msgid "Reviewer (read-only)"
-msgstr "檢閱者 (僅限讀取)"
-
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:12
 msgid ""
 "These users will be able to send mail on your behalf\n"
@@ -15346,8 +15724,12 @@ msgstr "委託可以查看私人的項目(_D)"
 msgid "_Inbox:"
 msgstr "收件匣(_I)："
 
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:18
+msgid "_Summarize permissions"
+msgstr "許可權摘要(_S)"
+
 #. Translators: This is used for permissions for <user> for the folder Tasks.
-#: ../plugins/exchange-operations/exchange-delegates.glade.h:19
+#: ../plugins/exchange-operations/exchange-delegates.glade.h:20
 msgid "_Tasks:"
 msgstr "工作(_T)："
 
@@ -15356,11 +15738,11 @@ msgstr "工作(_T)："
 msgid "Permissions..."
 msgstr "權限..."
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:135
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:133
 msgid "Folder Name"
 msgstr "資料夾名稱"
 
-#: ../plugins/exchange-operations/exchange-folder-size-display.c:139
+#: ../plugins/exchange-operations/exchange-folder-size-display.c:137
 msgid "Folder Size"
 msgstr "資料夾大小"
 
@@ -15374,23 +15756,70 @@ msgid "Exchange Folder Tree"
 msgstr "Exchange 資料夾樹"
 
 #: ../plugins/exchange-operations/exchange-folder.c:66
-#: ../plugins/exchange-operations/exchange-folder.c:229
-#: ../plugins/exchange-operations/exchange-folder.c:239
+#: ../plugins/exchange-operations/exchange-folder.c:235
+#: ../plugins/exchange-operations/exchange-folder.c:245
 msgid "Unsubscribe Folder..."
 msgstr "取消訂閱資料夾..."
 
-#: ../plugins/exchange-operations/exchange-folder.c:459
-#: ../plugins/exchange-operations/exchange-folder.c:514
+#: ../plugins/exchange-operations/exchange-folder.c:465
+#: ../plugins/exchange-operations/exchange-folder.c:520
 #, c-format
 msgid "Really unsubscribe from folder \"%s\"?"
 msgstr "確定要取消訂閱資料夾「%s」？"
 
-#: ../plugins/exchange-operations/exchange-folder.c:471
-#: ../plugins/exchange-operations/exchange-folder.c:526
+#: ../plugins/exchange-operations/exchange-folder.c:477
+#: ../plugins/exchange-operations/exchange-folder.c:532
 #, c-format
 msgid "Unsubscribe from \"%s\""
 msgstr "取消訂閱「%s」"
 
+#: ../plugins/exchange-operations/exchange-oof.glade.h:1
+msgid ""
+"<b>Currently, your status is \"Out of the Office\". </b>\n"
+"\n"
+"Would you like to change your status to \"In the Office\"? "
+msgstr ""
+"<b>目前您的狀態是「不在辦公室」。</b>\n"
+"\n"
+"要變更狀態為「在辦公室」嗎？ "
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:4
+msgid "<b>Out of Office Message:</b>"
+msgstr "<b>外出訊息：</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:5
+msgid "<b>Status:</b>"
+msgstr "<b>狀態：</b>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:6
+msgid ""
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
+"mail to you while you are out of the office.</small>"
+msgstr ""
+"<small>當您不在辦公室時，以下指定的郵件將會自動傳送給\n"
+"每一位傳送郵件給您的人。</small>"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:8
+msgid "I am currently in the office"
+msgstr "我目前在辦公室"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:9
+msgid "I am currently out of the office"
+msgstr "我目前不在辦公室"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:10
+msgid "No, Don't Change Status"
+msgstr "否，請不要變更狀態"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:11
+msgid "Out of Office Assistant"
+msgstr "外出助理"
+
+#: ../plugins/exchange-operations/exchange-oof.glade.h:12
+msgid "Yes, Change Status"
+msgstr "是，請變更狀態"
+
 #: ../plugins/exchange-operations/exchange-passwd-expiry.glade.h:1
 msgid "Password Expiry Warning..."
 msgstr "密碼到期警告"
@@ -15471,10 +15900,6 @@ msgstr "讀取項目"
 msgid "Role: "
 msgstr "角色： "
 
-#: ../plugins/exchange-operations/exchange-oof.glade.h:10
-msgid "No, Don't Change Status"
-msgstr "否，請不要變更狀態"
-
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:1
 msgid "<b>Message Settings</b>"
 msgstr "<b>郵件設定值</b>"
@@ -15522,14 +15947,26 @@ msgid "Request a _read receipt for this message"
 msgstr "要求這封郵件索取讀信回條(_R)"
 
 #: ../plugins/exchange-operations/exchange-send-options.glade.h:14
+msgid "Send as Delegate"
+msgstr "以代理人身分寄信"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:15
 msgid "_Sensitivity: "
 msgstr "敏感度(_S):"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:144
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:16
+msgid "_User"
+msgstr "使用者(_U)"
+
+#: ../plugins/exchange-operations/exchange-send-options.glade.h:17
+msgid "button-user"
+msgstr ""
+
+#: ../plugins/exchange-operations/exchange-user-dialog.c:143
 msgid "Select User"
 msgstr "選擇使用者"
 
-#: ../plugins/exchange-operations/exchange-user-dialog.c:182
+#: ../plugins/exchange-operations/exchange-user-dialog.c:181
 msgid "Address Book..."
 msgstr "通訊錄..."
 
@@ -15680,7 +16117,7 @@ msgid "Folder offline"
 msgstr "資料夾離線"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-#: ../shell/e-shell.c:1271
+#: ../shell/e-shell.c:1288
 msgid "Generic error"
 msgstr "一般錯誤"
 
@@ -15727,34 +16164,38 @@ msgid "Password successfully changed."
 msgstr "密碼已成功的變更。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:50
+msgid "Please enter a Delegate's ID or deselect the Send as a Delegate option."
+msgstr "請輸入代理人的 ID 或取消「以代理人身分寄信」選項。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
 msgid "Please make sure the Global Catalog Server name is correct."
 msgstr "請確定全域型錄伺服器名稱是正確的。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:51
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
 msgid "Please restart Evolution for changes to take effect"
 msgstr "請重新啟動 Evolution 以使變更生效"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:52
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
 msgid "Please select a user."
 msgstr "請選取一個使用者。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:53
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
 msgid "Server rejected password because it is too weak."
 msgstr "伺服器拒絕密碼，因為它太容易被破解。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:54
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
 msgid "The Exchange account will be disabled when you quit Evolution"
 msgstr "Exchange 帳號將會在您離開 Evolution 時停用"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:55
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange account will be removed when you quit Evolution"
 msgstr "Exchange 帳號將會在您結束 Evolution 時移除"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid "The Exchange server is not compatible with Exchange Connector."
 msgstr "此 Exchange 伺服器無法與 Exchange Connector 相容。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:58
 msgid ""
 "The server is running Exchange 5.5. Exchange Connector \n"
 "supports Microsoft Exchange 2000 and 2003 only."
@@ -15762,7 +16203,7 @@ msgstr ""
 "此伺服器執行的是 Exchange 5.5。Exchange Connector \n"
 "僅支援 Microsoft Exchange 2000 和 2003。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:59
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:60
 msgid ""
 "This probably means that your server requires \n"
 "you to specify the Windows domain name \n"
@@ -15776,63 +16217,69 @@ msgstr ""
 "\n"
 "或者可能只是您把密碼打錯了。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:64
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
 msgid "Try again with a different password."
 msgstr "請使用不同的密碼再試一次。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:65
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to add user to access control list:"
 msgstr "無法將使用者加入存取控制清單："
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unable to edit delegates."
 msgstr "無法編輯委任。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
 msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生不明的錯誤"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:68
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
 msgid "Unknown error."
 msgstr "不明的錯誤。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:69
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unknown type"
 msgstr "未知的類型"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "Unsupported operation"
 msgstr "不支援的操作"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You are nearing your quota available for storing mail on this server."
 msgstr "您已經接近在此伺服器儲存郵件的 quota 配額。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+msgid ""
+"You are permitted to send a message on behalf of only one delegator at a "
+"time."
+msgstr "一個代理人只允許每次寄出一封郵件。"
+
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You cannot make yourself your own delegate"
 msgstr "您無法將自己設為您自己的委託"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "You have exceeded your quota for storing mail on this server."
 msgstr "您已經超過了在此伺服器儲存郵件的 quota 配額。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid "You may only configure a single Exchange account."
 msgstr "您可以只設定一個單一的 Exchange 帳號。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
 msgstr "目前的使用量為：{0} KB。請試著刪除一些郵件來空出部分空間。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
 msgstr "目前的使用量為：{0} KB。您現在將無法傳送或接收郵件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:79
 msgid ""
 "Your current usage is: {0} KB. You will not be able to send mail until you "
 "clear up some space by deleting some mail."
@@ -15840,19 +16287,19 @@ msgstr ""
 "目前的使用量為：{0} KB。除非您刪除一些郵件來空出部分空間，否則將無法傳送郵"
 "件。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
 msgid "Your password has expired."
 msgstr "您的密碼已經到期。"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:80
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
 msgid "{0} cannot be added to an access control list"
 msgstr "{0} 無法加入存取控制清單"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:81
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:83
 msgid "{0} is already a delegate"
 msgstr "{0} 已經是一個委託了"
 
-#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:82
+#: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:84
 msgid "{0} is already in the list"
 msgstr "{0} 已經在清單中"
 
@@ -15864,7 +16311,51 @@ msgstr "訂閱其他使用者的工作"
 msgid "Check folder permissions"
 msgstr "檢查資料夾權限"
 
-#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:1
+msgid ""
+"A plugin for using an external editor as the composer. You can send only "
+"plain-text messages."
+msgstr "使用外部編輯器做為郵件編輯器的外掛程式。您只能寄出純文字郵件。"
+
+#. the path to the shared library
+#: ../plugins/external-editor/org-gnome-external-editor.eplug.xml.h:3
+msgid "External Editor"
+msgstr "外部編輯器"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:1
+msgid "Compose in External Editor"
+msgstr "以外部編輯器撰寫"
+
+#: ../plugins/external-editor/org-gnome-external-editor.xml.h:2
+msgid "Compose messages using an external editor"
+msgstr "使用外部編輯器來編寫郵件"
+
+#: ../plugins/face/face.c:57
+msgid "Select a (48*48) png of size < 700bytes"
+msgstr "選擇小於 700 位元組的 (48*48) png"
+
+#: ../plugins/face/face.c:67
+msgid "PNG files"
+msgstr "PNG 檔案"
+
+#: ../plugins/face/org-gnome-face-ui.xml.h:1
+msgid "_Face"
+msgstr "面貌(_F)"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:1
+msgid ""
+"Attach Face header to outgoing messages. First time the user needs to "
+"configure a 48*48 png image. It is base64 encoded and stored in ~/.evolution/"
+"faces This will be used in messages that are sent further."
+msgstr ""
+"在外寄的郵件中附加大頭貼標頭。第一次使用時需要先設定一張 48*48 的 png 相片。"
+"它會以 base 64 編碼並儲存於 ~/.evolution/faces 這會用在未來所寄出的郵件中。"
+
+#: ../plugins/face/org-gnome-face.eplug.xml.h:2
+msgid "Face"
+msgstr "面貌"
+
+#: ../plugins/folder-unsubscribe/folder-unsubscribe.c:56
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "取消訂閱資料夾 「%s」"
@@ -15881,7 +16372,20 @@ msgstr "取消訂閱資料夾"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-#: ../plugins/groupwise-account-setup/camel-gw-listener.c:434
+#: ../plugins/google-account-setup/google-source.c:71
+#: ../plugins/google-account-setup/google-source.c:78
+msgid "Google"
+msgstr "Google"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:1
+msgid "A plugin to setup google calendar."
+msgstr "用來設定 Google 行事曆的外掛程式。"
+
+#: ../plugins/google-account-setup/org-gnome-evolution-google.eplug.xml.h:2
+msgid "Google sources"
+msgstr "Google 來源"
+
+#: ../plugins/groupwise-account-setup/camel-gw-listener.c:432
 msgid "Checklist"
 msgstr "檢查清單"
 
@@ -15926,15 +16430,16 @@ msgstr "安裝分享資料夾"
 msgid "Shared Folder Installation"
 msgstr "分享資料夾安裝"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:77
+#: ../plugins/groupwise-features/junk-mail-settings.c:78
 msgid "Junk Settings"
 msgstr "垃圾郵件設定值"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:90
-msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>垃圾郵件設定值</b>"
+#: ../plugins/groupwise-features/junk-mail-settings.c:91
+#: ../plugins/groupwise-features/junk-settings.glade.h:3
+msgid "Junk Mail Settings"
+msgstr "垃圾郵件設定值"
 
-#: ../plugins/groupwise-features/junk-mail-settings.c:112
+#: ../plugins/groupwise-features/junk-mail-settings.c:115
 msgid "Junk Mail Settings..."
 msgstr "垃圾郵件設定值..."
 
@@ -15946,10 +16451,6 @@ msgstr "<b>垃圾郵件清單：</b>"
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../plugins/groupwise-features/junk-settings.glade.h:3
-msgid "Junk Mail Settings"
-msgstr "垃圾郵件設定值"
-
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
 msgid "_Disable"
@@ -15997,27 +16498,27 @@ msgstr "暫時套用"
 msgid "<b>Users:</b>"
 msgstr "<b>使用者：</b>"
 
+#: ../plugins/groupwise-features/properties.glade.h:2
+msgid "C_ustomize notification message"
+msgstr "自訂通知訊息(_U)"
+
 #: ../plugins/groupwise-features/properties.glade.h:3
-#: ../widgets/table/e-table-click-to-add.c:509
+msgid "Con_tacts..."
+msgstr "連絡人(_T)..."
+
+#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../widgets/table/e-table-click-to-add.c:517
 msgid "Message"
 msgstr "郵件"
 
-#: ../plugins/groupwise-features/properties.glade.h:5
+#: ../plugins/groupwise-features/properties.glade.h:6
 msgid "Shared Folder Notification"
 msgstr "分享資料夾通知"
 
-#: ../plugins/groupwise-features/properties.glade.h:7
+#: ../plugins/groupwise-features/properties.glade.h:8
 msgid "The participants will receive the following notification.\n"
 msgstr "參與者將會收到下列通知。\n"
 
-#: ../plugins/groupwise-features/properties.glade.h:10
-msgid "_Contacts..."
-msgstr "連絡人(_C)..."
-
-#: ../plugins/groupwise-features/properties.glade.h:11
-msgid "_Customize notification message"
-msgstr "自訂通知訊息(_C)"
-
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "未分享(_N)"
@@ -16067,14 +16568,14 @@ msgid "Subscribe to my _notifications"
 msgstr "訂閱至我的通知(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
-msgid "_Read"
-msgstr "已閱讀(_R)"
-
-#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:14
 msgid "_Write"
 msgstr "寫入(_W)"
 
+#. To Translators: strip the part in front of the | and the | itself
+#: ../plugins/groupwise-features/proxy-add-dialog.glade.h:15
+msgid "permission to read|_Read"
+msgstr "讀(_R)"
+
 #: ../plugins/groupwise-features/proxy-listing.glade.h:1
 msgid "Proxy"
 msgstr "代理伺服器"
@@ -16098,73 +16599,93 @@ msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a groupwise
 #. * feature by which one person can send/read mails/appointments using another person's identity
 #. * without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy-login.c:516
+#: ../plugins/groupwise-features/proxy-login.c:521
 msgid "_Proxy Login..."
 msgstr "代理伺服器登入(_P)..."
 
-#: ../plugins/groupwise-features/proxy.c:697
+#: ../plugins/groupwise-features/proxy.c:701
 msgid "The Proxy tab will be available only when the account is online."
 msgstr "代理伺服器頁籤只有在帳號上線時才會出現。"
 
-#: ../plugins/groupwise-features/proxy.c:702
+#: ../plugins/groupwise-features/proxy.c:706
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 
-#: ../plugins/groupwise-features/share-folder-common.c:322
-#: ../plugins/groupwise-features/share-folder.c:760
+#: ../plugins/groupwise-features/share-folder-common.c:319
+#: ../plugins/groupwise-features/share-folder.c:761
 msgid "Users"
 msgstr "使用者"
 
-#: ../plugins/groupwise-features/share-folder-common.c:323
+#: ../plugins/groupwise-features/share-folder-common.c:320
 msgid "Enter the users and set permissions"
 msgstr "輸入使用者並設定權限"
 
-#: ../plugins/groupwise-features/share-folder-common.c:342
+#: ../plugins/groupwise-features/share-folder-common.c:339
 msgid "New _Shared Folder..."
 msgstr "新增分享資料夾(_S)..."
 
-#: ../plugins/groupwise-features/share-folder-common.c:450
+#: ../plugins/groupwise-features/share-folder-common.c:447
 msgid "Sharing"
 msgstr "分享"
 
-#: ../plugins/groupwise-features/share-folder.c:765
+#: ../plugins/groupwise-features/share-folder.c:766
 msgid "Add   "
 msgstr "新增"
 
-#: ../plugins/groupwise-features/share-folder.c:771
+#: ../plugins/groupwise-features/share-folder.c:772
 msgid "Modify"
 msgstr "修改"
 
-#: ../plugins/groupwise-features/status-track.c:118
+#: ../plugins/groupwise-features/status-track.c:105
 msgid "Message Status"
 msgstr "郵件狀態"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:132
-msgid "<b>Subject</b> :"
-msgstr "<b>主旨</b>:"
+#: ../plugins/groupwise-features/status-track.c:119
+msgid "Subject:"
+msgstr "主旨:"
+
+#: ../plugins/groupwise-features/status-track.c:133
+msgid "From:"
+msgstr "寄件者:"
 
-#: ../plugins/groupwise-features/status-track.c:144
-msgid "<b>From</b> :"
-msgstr "<b>寄件者</b>:"
+#: ../plugins/groupwise-features/status-track.c:148
+msgid "Creation date:"
+msgstr "建立日期:"
 
-#: ../plugins/groupwise-features/status-track.c:157
-msgid "<b>Creation date</b> :"
-msgstr "<b>建立日期</b>:"
+#: ../plugins/groupwise-features/status-track.c:187
+msgid "Recipient: "
+msgstr "收件者:"
 
-#: ../plugins/groupwise-features/status-track.c:177
-msgid "<b>Recipients </b>"
-msgstr "<b>收件者</b>"
+#: ../plugins/groupwise-features/status-track.c:194
+msgid "Delivered: "
+msgstr "已遞送:"
 
-#: ../plugins/groupwise-features/status-track.c:181
-msgid "<b>Action</b>"
-msgstr "<b>動作</b>"
+#: ../plugins/groupwise-features/status-track.c:200
+msgid "Opened: "
+msgstr "已開啟:"
 
-#: ../plugins/groupwise-features/status-track.c:185
-msgid "<b>Date and Time</b>"
-msgstr "<b>日期與時刻</b>"
+#: ../plugins/groupwise-features/status-track.c:205
+msgid "Accepted: "
+msgstr "已接受:"
 
-#: ../plugins/groupwise-features/status-track.c:242
+#: ../plugins/groupwise-features/status-track.c:210
+msgid "Deleted: "
+msgstr "已刪除:"
+
+#: ../plugins/groupwise-features/status-track.c:215
+msgid "Declined: "
+msgstr "已婉拒:"
+
+#: ../plugins/groupwise-features/status-track.c:220
+msgid "Completed: "
+msgstr "已完成: "
+
+#: ../plugins/groupwise-features/status-track.c:225
+msgid "Undelivered: "
+msgstr "未遞送:"
+
+#: ../plugins/groupwise-features/status-track.c:249
 msgid "Track Message Status..."
 msgstr "追蹤郵件狀態..."
 
@@ -16176,15 +16697,11 @@ msgstr "用來設定 hula 行事曆來源的外掛程式。"
 msgid "Hula Account Setup"
 msgstr "Hula 帳號設定"
 
-#: ../plugins/imap-features/imap-headers.c:133
-msgid "Custom Header"
-msgstr "自訂檔頭"
-
-#: ../plugins/imap-features/imap-headers.c:245
+#: ../plugins/imap-features/imap-headers.c:322
 msgid "Custom Headers"
 msgstr "自訂檔頭"
 
-#: ../plugins/imap-features/imap-headers.c:252
+#: ../plugins/imap-features/imap-headers.c:335
 msgid "IMAP Headers"
 msgstr "IMAP 檔頭"
 
@@ -16193,8 +16710,8 @@ msgid "<b>Custom Headers</b>"
 msgstr "<b>自訂檔頭</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:2
-msgid "<b>IMAP Headers </b>"
-msgstr "<b>IMAP 檔頭</b>"
+msgid "<b>IMAP Headers</b>"
+msgstr "<b>IMAP 標頭</b>"
 
 #: ../plugins/imap-features/imap-headers.glade.h:3
 msgid "Basic and _Mailing List Headers (Default)"
@@ -16245,20 +16762,20 @@ msgstr "匯入至行事曆(_I)"
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:203
+#: ../plugins/import-ics-attachments/icsimporter.c:206
 msgid "Import ICS"
 msgstr "匯入 ICS"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:231
+#: ../plugins/import-ics-attachments/icsimporter.c:233
 msgid "Select Task List"
 msgstr "選擇工作清單"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:235
+#: ../plugins/import-ics-attachments/icsimporter.c:237
 msgid "Select Calendar"
 msgstr "選擇行事曆"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:266
-#: ../shell/e-shell-importer.c:714
+#: ../plugins/import-ics-attachments/icsimporter.c:267
+#: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "匯入(_I)"
 
@@ -16271,25 +16788,38 @@ msgstr "匯入至行事曆"
 msgid "Imports ICS attachments to calendar."
 msgstr "匯入 ICS 附加檔案到行事曆。"
 
-#: ../plugins/ipod-sync/evolution-ipod-sync.c:62
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:34
+msgid "Hardware Abstraction Layer not loaded"
+msgstr "無法載入硬體抽象層"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:35
 msgid ""
-"<span weight=\"bold\" size=\"larger\">Search for a iPod failed</span>\n"
-"\n"
-"Evolution could not find a iPod to synchronize with.Either it is not "
+"The \"hald\" service is required but not currently running. Please enable "
+"the service and rerun this program, or contact your system administrator."
+msgstr ""
+"「hald」服務是必要的但目前並未執行。請啟用該服務後再回到本程式，或者連絡您的"
+"系統管理者。"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:68
+msgid "Search for an iPod failed"
+msgstr "搜尋 iPod 失敗"
+
+#: ../plugins/ipod-sync/evolution-ipod-sync.c:69
+msgid ""
+"Evolution could not find an iPod to synchronize with. Either the iPod is not "
 "connected to the system or it is not powered on."
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">搜尋 iPod 失敗</span>\n"
-"\n"
-"Evolution 無法找到要同步化的 iPod。可能是它尚未連接到系統或者沒有打開電源。"
+"Evolution 無法找到要同步化的 iPod。可能是 iPod 尚未連接到系統或者沒有打開電"
+"源。"
 
-#: ../plugins/ipod-sync/ical-format.c:137
-#: ../plugins/save-calendar/ical-format.c:194
+#: ../plugins/ipod-sync/ical-format.c:133
+#: ../plugins/save-calendar/ical-format.c:190
 msgid "iCalendar format (.ics)"
 msgstr "iCalendar 格式 (.ics)"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:1
-msgid "Synchronize the selected task/calendar/addressbook with Apple iPod"
-msgstr "與 Apple iPod 同步選擇的工作/行事曆/通訊錄"
+msgid "Synchronize the selected task/memo/calendar/addressbook with Apple iPod"
+msgstr "與 Apple iPod 同步選擇的工作/備忘錄/行事曆/通訊錄"
 
 #: ../plugins/ipod-sync/org-gnome-ipod-sync-evolution.eplug.xml.h:2
 msgid "Synchronize to iPod"
@@ -16299,581 +16829,643 @@ msgstr "同步化 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod 同步化"
 
-#: ../plugins/ipod-sync/sync.c:158
-msgid "No output directory!"
-msgstr "沒有輸出目錄！"
-
-#: ../plugins/ipod-sync/sync.c:159
-msgid ""
-"The output directory was not found on iPod! Please ensure that iPod has been "
-"correctly set up and try again."
-msgstr "在 iPod 上找不到輸出的目錄！請確定 iPod 已正確設定後再試一次。"
-
-#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
-msgid "Could not export data!"
-msgstr "無法匯出資料！"
-
-#: ../plugins/ipod-sync/sync.c:203
-msgid "Exporting data failed."
-msgstr "匯出資料失敗。"
-
-#: ../plugins/ipod-sync/sync.c:231
-msgid "Could not open addressbook!"
-msgstr "無法開啟通訊錄！"
-
-#: ../plugins/ipod-sync/sync.c:232
-msgid "Could not open the Evolution addressbook to export data."
-msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
-
-#: ../plugins/ipod-sync/sync.c:291
-msgid "Could not open calendar/todo!"
-msgstr "無法開啟行事曆/工作！"
-
-#: ../plugins/ipod-sync/sync.c:292
-msgid "Could not open the Evolution calendar/todo list to export data."
-msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
-
-#: ../plugins/itip-formatter/itip-formatter.c:274
-#: ../plugins/itip-formatter/itip-formatter.c:395
+#: ../plugins/itip-formatter/itip-formatter.c:429
+#: ../plugins/itip-formatter/itip-formatter.c:554
 #, c-format
 msgid "Failed to load the calendar '%s'"
 msgstr "載入行事曆「%s」失敗"
 
-#: ../plugins/itip-formatter/itip-formatter.c:415
+#: ../plugins/itip-formatter/itip-formatter.c:574
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-#: ../plugins/itip-formatter/itip-formatter.c:441
+#: ../plugins/itip-formatter/itip-formatter.c:600
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:517
+#: ../plugins/itip-formatter/itip-formatter.c:676
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-#: ../plugins/itip-formatter/itip-formatter.c:524
+#: ../plugins/itip-formatter/itip-formatter.c:683
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
-#: ../plugins/itip-formatter/itip-formatter.c:528
+#: ../plugins/itip-formatter/itip-formatter.c:687
 msgid "Unable to find this task in any task list"
 msgstr "無法在任何工作清單中找到這項工作"
 
-#: ../plugins/itip-formatter/itip-formatter.c:532
-msgid "Unable to find this journal entry in any journal"
-msgstr "無法在任何日誌中找到這個日誌項目"
+#: ../plugins/itip-formatter/itip-formatter.c:691
+msgid "Unable to find this memo in any memo list"
+msgstr "無法在任何備忘錄清單中找到這項備忘錄"
 
-#: ../plugins/itip-formatter/itip-formatter.c:605
+#: ../plugins/itip-formatter/itip-formatter.c:764
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-#: ../plugins/itip-formatter/itip-formatter.c:801
+#: ../plugins/itip-formatter/itip-formatter.c:927
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:859
+#: ../plugins/itip-formatter/itip-formatter.c:985
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "無法傳送項目至行事曆「%s」。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:871
+#: ../plugins/itip-formatter/itip-formatter.c:997
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "傳送至行事曆 '%s' 並設為已接受"
 
-#: ../plugins/itip-formatter/itip-formatter.c:875
+#: ../plugins/itip-formatter/itip-formatter.c:1001
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "傳送至行事曆 '%s' 並設為不確定的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:880
+#: ../plugins/itip-formatter/itip-formatter.c:1006
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "傳送至行事曆 '%s' 並設為已婉拒"
 
-#: ../plugins/itip-formatter/itip-formatter.c:885
+#: ../plugins/itip-formatter/itip-formatter.c:1011
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "傳送至行事曆「%s」並設為已取消"
 
-#: ../plugins/itip-formatter/itip-formatter.c:979
+#: ../plugins/itip-formatter/itip-formatter.c:1105
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:986
+#: ../plugins/itip-formatter/itip-formatter.c:1112
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:988
+#: ../plugins/itip-formatter/itip-formatter.c:1114
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1073
+#: ../plugins/itip-formatter/itip-formatter.c:1199
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1100
+#: ../plugins/itip-formatter/itip-formatter.c:1226
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "無法更新到會者。%s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1104
+#: ../plugins/itip-formatter/itip-formatter.c:1230
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1231
+#: ../plugins/itip-formatter/itip-formatter.c:1255
+msgid "Meeting information sent"
+msgstr "會議資訊寄出"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1258
+msgid "Task information sent"
+msgstr "工作資訊寄出"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1261
+msgid "Memo information sent"
+msgstr "備忘錄資訊寄出"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1270
+msgid "Unable to send meeting information, the meeting does not exist"
+msgstr "無法寄出會議資訊，該會議並不存在"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1273
+msgid "Unable to send task information, the task does not exist"
+msgstr "無法寄出工作資訊，該項工作不存在"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1276
+msgid "Unable to send memo information, the memo does not exist"
+msgstr "無法寄出備忘錄資訊，該備忘錄並不存在"
+
+#: ../plugins/itip-formatter/itip-formatter.c:1351
+#: ../plugins/itip-formatter/itip-formatter.c:1366
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1232
+#: ../plugins/itip-formatter/itip-formatter.c:1352
+#: ../plugins/itip-formatter/itip-formatter.c:1367
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1267
-#: ../plugins/itip-formatter/itip-formatter.c:1285
-#: ../plugins/itip-formatter/itip-formatter.c:1363
+#: ../plugins/itip-formatter/itip-formatter.c:1402
+#: ../plugins/itip-formatter/itip-formatter.c:1420
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 msgid "The item in the calendar is not valid"
 msgstr "行事曆中的項目是無效的"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1268
-#: ../plugins/itip-formatter/itip-formatter.c:1286
-#: ../plugins/itip-formatter/itip-formatter.c:1364
+#: ../plugins/itip-formatter/itip-formatter.c:1403
+#: ../plugins/itip-formatter/itip-formatter.c:1421
+#: ../plugins/itip-formatter/itip-formatter.c:1503
 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:1297
+#: ../plugins/itip-formatter/itip-formatter.c:1432
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1298
+#: ../plugins/itip-formatter/itip-formatter.c:1433
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
+#: ../plugins/itip-formatter/itip-formatter.c:2123
+msgid "This meeting recurs"
+msgstr "這個會議的循環規則為"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2126
+msgid "This task recurs"
+msgstr "這項工作的循環規則為"
+
+#: ../plugins/itip-formatter/itip-formatter.c:2129
+msgid "This memo recurs"
+msgstr "這個備忘錄的循環規則為"
+
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2103
+#: ../plugins/itip-formatter/itip-formatter.c:2334
 msgid "_Delete message after acting"
 msgstr "完成後刪除郵件(_D)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2113
-#: ../plugins/itip-formatter/itip-formatter.c:2145
+#: ../plugins/itip-formatter/itip-formatter.c:2344
+#: ../plugins/itip-formatter/itip-formatter.c:2376
 msgid "Conflict Search"
 msgstr "衝突的搜尋"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2128
+#: ../plugins/itip-formatter/itip-formatter.c:2359
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "選擇要搜尋會議衝突的行事曆"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:188 ../ui/evolution-calendar.xml.h:34
-#: ../widgets/misc/e-cell-date-edit.c:241
+#: ../plugins/itip-formatter/itip-view.c:192 ../ui/evolution-calendar.xml.h:34
+#: ../widgets/misc/e-cell-date-edit.c:239
 msgid "Today"
 msgstr "今天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:193
+#: ../plugins/itip-formatter/itip-view.c:197
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:197
+#: ../plugins/itip-formatter/itip-view.c:201
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:206
+#: ../plugins/itip-formatter/itip-view.c:210
 msgid "Today %l:%M:%S %p"
 msgstr "今天%p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:216
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Tomorrow"
 msgstr "明天"
 
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:221
+#: ../plugins/itip-formatter/itip-view.c:225
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
 #. strftime format of a time,
 #. in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:225
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:230
+#: ../plugins/itip-formatter/itip-view.c:234
 msgid "Tomorrow %l:%M %p"
 msgstr "明天%p %-l:%M"
 
 #. strftime format of a time,
 #. in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:234
+#: ../plugins/itip-formatter/itip-view.c:238
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "明天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:253
+#: ../plugins/itip-formatter/itip-view.c:257
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:258
+#: ../plugins/itip-formatter/itip-view.c:262
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:262
+#: ../plugins/itip-formatter/itip-view.c:266
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:267
+#: ../plugins/itip-formatter/itip-view.c:271
 msgid "%A %l:%M %p"
 msgstr "%A%p %-l:%M"
 
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:271
+#: ../plugins/itip-formatter/itip-view.c:275
 msgid "%A %l:%M:%S %p"
 msgstr "%A%p %-l:%M:%S"
 
 #. strftime format of a weekday and a date
 #. without a year.
-#: ../plugins/itip-formatter/itip-view.c:280
+#: ../plugins/itip-formatter/itip-view.c:284
 msgid "%A, %B %e"
 msgstr "%-m 月 %d 日 (%A)"
 
 #. strftime format of a weekday, a date
 #. without a year and a time,
 #. in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A, %B %e %H:%M"
 msgstr "%-m 月 %d 日 (%A) %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:290
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%-m 月 %d 日 (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:295
+#: ../plugins/itip-formatter/itip-view.c:299
 msgid "%A, %B %e %l:%M %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:299
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%-m 月 %d 日 (%A) %p %-l:%M:%S"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e, %Y"
 msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:310
+#: ../plugins/itip-formatter/itip-view.c:314
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:314
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:319
+#: ../plugins/itip-formatter/itip-view.c:323
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M"
 
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:323
+#: ../plugins/itip-formatter/itip-view.c:327
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M:%S"
 
-#: ../plugins/itip-formatter/itip-view.c:348
+#: ../plugins/itip-formatter/itip-view.c:352
+#: ../plugins/itip-formatter/itip-view.c:440
+#: ../plugins/itip-formatter/itip-view.c:528
+#, c-format
+msgid "Please respond on behalf of <b>%s</b>"
+msgstr "請代表 <b>%s</b> 回覆"
+
+#: ../plugins/itip-formatter/itip-view.c:354
+#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:530
+#, c-format
+msgid "Received on behalf of <b>%s</b>"
+msgstr "代表 <b>%s</b> 接收"
+
+#: ../plugins/itip-formatter/itip-view.c:359
 #, c-format
 msgid "<b>%s</b> through %s has published the following meeting information:"
 msgstr "<b>%s</b> 由於 %s 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:350
+#: ../plugins/itip-formatter/itip-view.c:361
 #, c-format
 msgid "<b>%s</b> has published the following meeting information:"
 msgstr "<b>%s</b> 已經發佈下列會議資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:355
+#: ../plugins/itip-formatter/itip-view.c:366
 #, c-format
 msgid "<b>%s</b> has delegated the following meeting to you:"
 msgstr "<b>%s</b> 已經委派下列會議給您："
 
-#: ../plugins/itip-formatter/itip-view.c:358
+#: ../plugins/itip-formatter/itip-view.c:369
 #, c-format
 msgid "<b>%s</b> through %s requests your presence at the following meeting:"
 msgstr "<b>%s</b> 由於 %s 邀請您出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:360
+#: ../plugins/itip-formatter/itip-view.c:371
 #, c-format
 msgid "<b>%s</b> requests your presence at the following meeting:"
 msgstr "<b>%s</b> 邀請您出席下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:366
+#: ../plugins/itip-formatter/itip-view.c:377
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 由於 %s 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:368
+#: ../plugins/itip-formatter/itip-view.c:379
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting:"
 msgstr "<b>%s</b> 希望加入一個既存的會議："
 
-#: ../plugins/itip-formatter/itip-view.c:371
+#: ../plugins/itip-formatter/itip-view.c:383
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following meeting:"
+msgstr "<b>%s</b> 透過 %s 希望收到下列會議的最新資訊："
+
+#: ../plugins/itip-formatter/itip-view.c:385
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:374
+#: ../plugins/itip-formatter/itip-view.c:389
+#, c-format
+msgid "<b>%s</b> through %s has sent back the following meeting response:"
+msgstr "<b>%s</b> 透過 %s 傳送了下列會議的回覆："
+
+#: ../plugins/itip-formatter/itip-view.c:391
 #, c-format
 msgid "<b>%s</b> has sent back the following meeting response:"
 msgstr "<b>%s</b> 傳送了下列會議的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:378
+#: ../plugins/itip-formatter/itip-view.c:395
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following meeting:"
 msgstr "<b>%s</b> 由於 %s 已經消取下列會議："
 
-#: ../plugins/itip-formatter/itip-view.c:380
+#: ../plugins/itip-formatter/itip-view.c:397
 #, c-format
 msgid "<b>%s</b> has canceled the following meeting."
 msgstr "<b>%s</b> 已經消取下列會議。"
 
-#: ../plugins/itip-formatter/itip-view.c:383
+#: ../plugins/itip-formatter/itip-view.c:401
+#, c-format
+msgid "<b>%s</b> through %s has proposed the following meeting changes."
+msgstr "<b>%s</b> 透過 %s 已經答覆了下列會議變更。"
+
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "<b>%s</b> has proposed the following meeting changes."
 msgstr "<b>%s</b> 已經答覆了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:387
+#: ../plugins/itip-formatter/itip-view.c:407
 #, c-format
 msgid "<b>%s</b> through %s has declined the following meeting changes:"
 msgstr "<b>%s</b> 由於 %s 已經婉拒了下列會議變更："
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:409
 #, c-format
 msgid "<b>%s</b> has declined the following meeting changes."
 msgstr "<b>%s</b> 已經婉拒了下列會議變更。"
 
-#: ../plugins/itip-formatter/itip-view.c:416
+#: ../plugins/itip-formatter/itip-view.c:447
 #, c-format
 msgid "<b>%s</b> through %s has published the following task:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列工作資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:418
+#: ../plugins/itip-formatter/itip-view.c:449
 #, c-format
 msgid "<b>%s</b> has published the following task:"
 msgstr "<b>%s</b> 已經發佈了下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:454
 #, c-format
 msgid "<b>%s</b> requests the assignment of %s to the following task:"
 msgstr "<b>%s</b> 指派 %s 加入下列工作："
 
-#: ../plugins/itip-formatter/itip-view.c:426
+#: ../plugins/itip-formatter/itip-view.c:457
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
 msgstr "<b>%s</b> 由於 %s 已經指派您一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:428
+#: ../plugins/itip-formatter/itip-view.c:459
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
 msgstr "<b>%s</b> 已經指派您一項工作："
 
-#: ../plugins/itip-formatter/itip-view.c:434
+#: ../plugins/itip-formatter/itip-view.c:465
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing task:"
 msgstr "<b>%s</b> 由於 %s 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:436
+#: ../plugins/itip-formatter/itip-view.c:467
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task:"
 msgstr "<b>%s</b> 希望加入一項既存的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:439
+#: ../plugins/itip-formatter/itip-view.c:471
+#, c-format
+msgid ""
+"<b>%s</b> through %s wishes to receive the latest information for the "
+"following assigned task:"
+msgstr "<b>%s</b> 透過 %s 希望收到下列指派工作的最新資訊："
+
+#: ../plugins/itip-formatter/itip-view.c:473
 #, c-format
 msgid ""
 "<b>%s</b> wishes to receive the latest information for the following "
 "assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
-#: ../plugins/itip-formatter/itip-view.c:442
+#: ../plugins/itip-formatter/itip-view.c:477
+#, c-format
+msgid ""
+"<b>%s</b> through %s has sent back the following assigned task response:"
+msgstr "<b>%s</b> 透過 %s 傳送了下列指派工作的回覆："
+
+#: ../plugins/itip-formatter/itip-view.c:479
 #, c-format
 msgid "<b>%s</b> has sent back the following assigned task response:"
 msgstr "<b>%s</b> 傳送了下列指派工作的回覆："
 
-#: ../plugins/itip-formatter/itip-view.c:446
+#: ../plugins/itip-formatter/itip-view.c:483
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已經取消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:448
+#: ../plugins/itip-formatter/itip-view.c:485
 #, c-format
 msgid "<b>%s</b> has canceled the following assigned task:"
 msgstr "<b>%s</b> 已經取消下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:451
+#: ../plugins/itip-formatter/itip-view.c:489
+#, c-format
+msgid ""
+"<b>%s</b> through %s has proposed the following task assignment changes:"
+msgstr "<b>%s</b> 透過 %s 已經回覆下列指派工作的變更："
+
+#: ../plugins/itip-formatter/itip-view.c:491
 #, c-format
 msgid "<b>%s</b> has proposed the following task assignment changes:"
 msgstr "<b>%s</b> 已經回覆下列指派工作的變更："
 
-#: ../plugins/itip-formatter/itip-view.c:455
+#: ../plugins/itip-formatter/itip-view.c:495
 #, c-format
 msgid "<b>%s</b> through %s has declined the following assigned task:"
 msgstr "<b>%s</b> 由於 %s 已婉拒了下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:457
+#: ../plugins/itip-formatter/itip-view.c:497
 #, c-format
 msgid "<b>%s</b> has declined the following assigned task:"
 msgstr "<b>%s</b> 已經婉拒下列指派的工作："
 
-#: ../plugins/itip-formatter/itip-view.c:484
+#: ../plugins/itip-formatter/itip-view.c:535
 #, c-format
 msgid "<b>%s</b> through %s has published the following memo:"
 msgstr "<b>%s</b> 由於 %s 已經發佈了下列備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:486
+#: ../plugins/itip-formatter/itip-view.c:537
 #, c-format
 msgid "<b>%s</b> has published the following memo:"
 msgstr "<b>%s</b> 已經發佈了備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:542
 #, c-format
 msgid "<b>%s</b> through %s wishes to add to an existing memo:"
 msgstr "<b>%s</b> 由於 %s 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:544
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing memo:"
 msgstr "<b>%s</b> 希望加入一個既存的備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:548
 #, c-format
 msgid "<b>%s</b> through %s has canceled the following shared memo:"
 msgstr "<b>%s</b> 由於 %s 已經消取下列共用備忘錄："
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:550
 #, c-format
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經取消下列共用備忘錄："
 
 #. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:755
+#: ../plugins/itip-formatter/itip-view.c:821
 msgid "_Open Calendar"
 msgstr "開啟行事曆(_O)"
 
-#: ../plugins/itip-formatter/itip-view.c:761
-#: ../plugins/itip-formatter/itip-view.c:765
-#: ../plugins/itip-formatter/itip-view.c:771
-#: ../plugins/itip-formatter/itip-view.c:788
-#: ../plugins/itip-formatter/itip-view.c:793
+#: ../plugins/itip-formatter/itip-view.c:827
+#: ../plugins/itip-formatter/itip-view.c:831
+#: ../plugins/itip-formatter/itip-view.c:837
+#: ../plugins/itip-formatter/itip-view.c:854
+#: ../plugins/itip-formatter/itip-view.c:859
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:762
-#: ../plugins/itip-formatter/itip-view.c:767
-#: ../plugins/itip-formatter/itip-view.c:774
-#: ../plugins/itip-formatter/itip-view.c:790
-#: ../plugins/itip-formatter/itip-view.c:795
+#: ../plugins/itip-formatter/itip-view.c:828
+#: ../plugins/itip-formatter/itip-view.c:833
+#: ../plugins/itip-formatter/itip-view.c:840
+#: ../plugins/itip-formatter/itip-view.c:856
+#: ../plugins/itip-formatter/itip-view.c:861
 msgid "_Accept"
 msgstr "接受(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:765
+#: ../plugins/itip-formatter/itip-view.c:831
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
+#: ../plugins/itip-formatter/itip-view.c:832
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:766
-#: ../plugins/itip-formatter/itip-view.c:772
-#: ../plugins/itip-formatter/itip-view.c:789
-#: ../plugins/itip-formatter/itip-view.c:794
+#: ../plugins/itip-formatter/itip-view.c:832
+#: ../plugins/itip-formatter/itip-view.c:838
+#: ../plugins/itip-formatter/itip-view.c:855
+#: ../plugins/itip-formatter/itip-view.c:860
 msgid "_Tentative"
 msgstr "暫訂(_T)"
 
-#: ../plugins/itip-formatter/itip-view.c:767
+#: ../plugins/itip-formatter/itip-view.c:833
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:778
+#: ../plugins/itip-formatter/itip-view.c:844
 msgid "_Send Information"
 msgstr "傳送資訊(_S)"
 
 #. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:782
+#: ../plugins/itip-formatter/itip-view.c:848
 msgid "_Update Attendee Status"
 msgstr "更新出席狀態(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:785
+#: ../plugins/itip-formatter/itip-view.c:851
 msgid "_Update"
 msgstr "更新(_U)"
 
 #. Start time
-#: ../plugins/itip-formatter/itip-view.c:944
+#: ../plugins/itip-formatter/itip-view.c:1012
 msgid "Start time:"
 msgstr "開始時間:"
 
 #. End time
-#: ../plugins/itip-formatter/itip-view.c:953
+#: ../plugins/itip-formatter/itip-view.c:1021
 msgid "End time:"
 msgstr "結束時間:"
 
 #. Comment
-#: ../plugins/itip-formatter/itip-view.c:969
-#: ../plugins/itip-formatter/itip-view.c:1019
+#: ../plugins/itip-formatter/itip-view.c:1037
+#: ../plugins/itip-formatter/itip-view.c:1087
 msgid "Comment:"
 msgstr "註解："
 
-#: ../plugins/itip-formatter/itip-view.c:1033
-msgid "Send u_pdates to attendees"
-msgstr "傳送更新給到會者(_P)"
+#: ../plugins/itip-formatter/itip-view.c:1073
+msgid "Send _reply to sender"
+msgstr "回覆寄件者(_R)"
+
+#: ../plugins/itip-formatter/itip-view.c:1101
+msgid "Send _updates to attendees"
+msgstr "傳送更新給到會者(_U)"
 
-#: ../plugins/itip-formatter/itip-view.c:1042
-msgid "A_pply to all instances"
+#: ../plugins/itip-formatter/itip-view.c:1110
+msgid "_Apply to all instances"
 msgstr "套用至所有實體(_A)"
 
-#: ../plugins/itip-formatter/itip-view.c:1711
+#: ../plugins/itip-formatter/itip-view.c:1119
+msgid "Show time as _free"
+msgstr "顯示時間為空閒(_F)"
+
+#: ../plugins/itip-formatter/itip-view.c:1852
 msgid "_Tasks :"
 msgstr "工作(_T):"
 
-#: ../plugins/itip-formatter/itip-view.c:1713
+#: ../plugins/itip-formatter/itip-view.c:1854
 msgid "Memos :"
 msgstr "備忘錄:"
 
@@ -16912,32 +17504,152 @@ msgstr "允許停用帳號。"
 msgid "Disable Account"
 msgstr "停用帳號"
 
-#: ../plugins/mail-remote/client.c:30
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:1
+msgid "Beep or play sound file."
+msgstr "發出嗶聲或播放聲音檔案。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:2
+msgid "Blink icon in notification area."
+msgstr "讓通知區的圖示閃爍。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:3
+msgid "Enable D-Bus messages."
+msgstr "啟用 D-Bus 訊息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:4
+msgid "Enable icon in notification area."
+msgstr "啟用通知區的圖示。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Generates a D-Bus message when new mail messages arrive."
+msgstr "當新郵件到達時產生 D-BUS 訊息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid ""
+"If true, then beep, otherwise will play sound file when new messages arrive."
+msgstr "如果為 true，則當新郵件抵達時發出嗶聲或播放聲音檔。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Notify new messages for Inbox only."
+msgstr "只通知收件匣的新郵件。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid "Play sound when new messages arrive."
+msgstr "當新郵件到達時播放聲音檔案。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
+msgid "Popup message together with the icon."
+msgstr "在圖示上彈出新郵件。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Show new mail icon in notification area when new messages arrive."
+msgstr "當新郵件到達時在通知區顯示新郵件圖示。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
+msgid "Sound file name to be played."
+msgstr "要播放的聲音檔案名稱。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr "新郵件送到時要播放的音效檔案，如果不是使用嗶聲模式。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:13
+msgid "Whether play sound or beep when new messages arrive."
+msgstr "當新郵件到達時是否播放聲音檔案或發出嗶聲。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:14
+msgid "Whether show message over the icon when new messages arrive."
+msgstr "是否在新郵件抵達時於圖示上彈出訊息。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:15
+msgid "Whether the icon should blink or not."
+msgstr "圖示是否要閃爍。"
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:16
+msgid "Whether to notify new messages in Inbox folder only."
+msgstr "是否只通知收件匣的新郵件。"
+
+#: ../plugins/mail-notification/mail-notification.c:254
+msgid "Generate a _D-Bus message"
+msgstr "產生 _D-Bus 訊息"
+
+#. To translators: '%d' is the number of mails recieved and '%s' is the name of the folder
+#: ../plugins/mail-notification/mail-notification.c:363
 #, c-format
-msgid "System error: %s"
-msgstr "系統錯誤： %s"
+msgid ""
+"You have received %d new message\n"
+"in %s."
+msgid_plural ""
+"You have received %d new messages\n"
+"in %s."
+msgstr[0] ""
+"您已經接收 %d 封郵件\n"
+"到 %s 。 "
+msgstr[1] ""
+"您已經接收 %d 封郵件\n"
+"到 %s 。 "
 
-#: ../plugins/mail-remote/client.c:32
+#: ../plugins/mail-notification/mail-notification.c:368
 #, c-format
-msgid "Camel error: %s"
-msgstr "Camel 錯誤： %s"
+msgid "You have received %d new message."
+msgid_plural "You have received %d new messages."
+msgstr[0] "您已經接收 %d 封郵件 。 "
+msgstr[1] "您已經接收 %d 封郵件 。 "
+
+#: ../plugins/mail-notification/mail-notification.c:380
+#: ../plugins/mail-notification/mail-notification.c:385
+msgid "New email"
+msgstr "新郵件"
+
+#: ../plugins/mail-notification/mail-notification.c:440
+msgid "Show icon in _notification area"
+msgstr "在通知區中顯示圖示(_N)"
+
+#: ../plugins/mail-notification/mail-notification.c:443
+msgid "B_link icon in notification area"
+msgstr "讓通知區圖示閃爍(_L)"
+
+#: ../plugins/mail-notification/mail-notification.c:445
+msgid "Popup _message together with the icon"
+msgstr "在圖示上彈出訊息(_M)"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:476
-msgid "Account cannot send e-mail"
-msgstr "帳號不能傳送電子郵件"
+#: ../plugins/mail-notification/mail-notification.c:626
+msgid "_Play sound when new messages arrive"
+msgstr "當新郵件到達時播放聲音檔案(_P)"
 
-#: ../plugins/mail-remote/evolution-mail-store.c:605
-msgid "No store available"
-msgstr "沒有可用的儲存空間"
+#: ../plugins/mail-notification/mail-notification.c:632
+msgid "_Beep"
+msgstr "嗶聲(_B)"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
+#: ../plugins/mail-notification/mail-notification.c:633
+msgid "Play _sound file"
+msgstr "播放聲音檔案(_S)"
+
+#: ../plugins/mail-notification/mail-notification.c:644
+msgid "Specify _filename:"
+msgstr "指定檔案名稱(_F):"
+
+#: ../plugins/mail-notification/mail-notification.c:645
+msgid "Select sound file"
+msgstr "選擇聲音檔案"
+
+#: ../plugins/mail-notification/mail-notification.c:646
+msgid "Pl_ay"
+msgstr "播放(_A)"
+
+#: ../plugins/mail-notification/mail-notification.c:785
+msgid "Notify new messages for _Inbox only"
+msgstr "只通知收件匣的新郵件(_I)"
+
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
 msgid ""
-"A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "實作 CORBA 介面以存取遠端郵件資料的外掛程式。"
+"Generates a D-Bus message or notifies the user with an icon in notification "
+"area and a notification message whenever a new message has arrived."
+msgstr "當新郵件抵達時產生 D-Bus 訊息或在通知區以圖示和通知訊息知會使用者。"
 
-#: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
-msgid "Mail Remote"
-msgstr "遠端郵件"
+#: ../plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
+msgid "Mail Notification"
+msgstr "郵件通知"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
@@ -16953,6 +17665,17 @@ msgstr "轉換為會議(_V)"
 msgid "Mail to meeting"
 msgstr "寄信到會議"
 
+#: ../plugins/mail-to-task/mail-to-task.c:270
+#, c-format
+msgid "Cannot open calendar. %s"
+msgstr "無法開啟行事曆。%s"
+
+#: ../plugins/mail-to-task/mail-to-task.c:275
+msgid ""
+"Selected source is read only, thus cannot create task there. Select other "
+"source, please."
+msgstr "選定的來源是唯讀的，因此不能在這裡建立工作。請選擇其他的來源。"
+
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
@@ -17155,12 +17878,12 @@ msgid "Marks the selected calendar for offline viewing."
 msgstr "將選定的行事曆標示成可供離線閱覽。"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:3
-msgid "_Do not make this available offline"
+msgid "_Do not make available for offline use"
 msgstr "不允許此項在離線狀態使用(_D)"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:4
-msgid "_Mark Calendar for offline use"
-msgstr "將行事曆標為供離線使用(_M)"
+msgid "_Make available for offline use"
+msgstr "標記為供離線使用(_M)"
 
 #: ../plugins/mono/org-gnome-evolution-mono.eplug.xml.h:1
 msgid "A plugin which implements mono plugins."
@@ -17170,25 +17893,13 @@ msgstr "實作 mono 功能的外掛程式。"
 msgid "Mono Loader"
 msgstr "Mono 載入器"
 
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:1
-msgid "Generates a D-BUS message when new mail arrives."
-msgstr "當新郵件到達時產生 D-BUS 郵件。"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
-msgid "New Mail Notification"
-msgstr "新郵件通知"
-
-#: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
-msgid "New mail notify"
-msgstr "新郵件通知"
-
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
-#: ../plugins/plugin-manager/plugin-manager.c:180
+#: ../plugins/plugin-manager/plugin-manager.c:225
 msgid "Plugin Manager"
 msgstr "外掛管理程式"
 
@@ -17200,22 +17911,33 @@ msgstr "啟用與停用外掛程式"
 msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
-#: ../plugins/plugin-manager/plugin-manager.c:43
+#: ../plugins/plugin-manager/plugin-manager.c:57
 msgid "Author(s)"
 msgstr "作者"
 
-#: ../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
+#: ../plugins/plugin-manager/plugin-manager.c:58
+#: ../widgets/table/e-table-config.glade.h:6
 msgid "Description"
 msgstr "描述:"
 
-#: ../plugins/plugin-manager/plugin-manager.c:193
+#: ../plugins/plugin-manager/plugin-manager.c:238
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些變更在重新啟動後才會生效"
 
-#: ../plugins/plugin-manager/plugin-manager.c:202
-#: ../plugins/plugin-manager/plugin-manager.c:262
+#: ../plugins/plugin-manager/plugin-manager.c:260
+msgid "Overview"
+msgstr "概覽"
+
+#: ../plugins/plugin-manager/plugin-manager.c:261
+msgid "Configuration"
+msgstr "組態"
+
+#: ../plugins/plugin-manager/plugin-manager.c:277
+msgid "There is no configuration option for this plugin."
+msgstr "這個外掛程式沒有設定的選項。"
+
+#: ../plugins/plugin-manager/plugin-manager.c:330
+#: ../plugins/plugin-manager/plugin-manager.c:392
 msgid "Plugin"
 msgstr "外掛程式"
 
@@ -17239,26 +17961,31 @@ msgstr "純文字模型"
 msgid "Prefer plain-text"
 msgstr "偏好純文字"
 
-#: ../plugins/prefer-plain/prefer-plain.c:105
+#: ../plugins/prefer-plain/prefer-plain.c:139
 msgid "Show HTML if present"
 msgstr "如提供 HTML 則顯示之"
 
-#: ../plugins/prefer-plain/prefer-plain.c:106
+#: ../plugins/prefer-plain/prefer-plain.c:140
 msgid "Prefer PLAIN"
 msgstr "偏好純文字"
 
-#: ../plugins/prefer-plain/prefer-plain.c:107
+#: ../plugins/prefer-plain/prefer-plain.c:141
 msgid "Only ever show PLAIN"
 msgstr "只以純文字顯示"
 
-#: ../plugins/prefer-plain/prefer-plain.c:150
-msgid "HTML Mode"
-msgstr "HTML 模式"
+#: ../plugins/prefer-plain/prefer-plain.c:184
+msgid "HTML _Mode"
+msgstr "HT_ML 模式"
 
 # msgstr "提供自郵件編輯器打印郵件的選項"
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
-msgid "Gives an option to print mail from composer"
-msgstr "提供自郵件編輯器列印郵件的選項"
+msgid "Gives an option to print from the composer."
+msgstr "提供自郵件編輯器列印郵件的選項。"
+
+# zh_HK: msgstr "打印郵件"
+#: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
+msgid "Print Message"
+msgstr "列印郵件"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
@@ -17296,7 +18023,13 @@ msgstr "位置"
 msgid "_Publish Calendar Information"
 msgstr "發佈行事曆資訊(_P)"
 
-#: ../plugins/publish-calendar/publish-calendar.c:399
+#: ../plugins/publish-calendar/publish-calendar.c:91
+#: ../smime/gui/component.c:47
+#, c-format
+msgid "Enter the password for `%s'"
+msgstr "輸入 `%s' 的密碼"
+
+#: ../plugins/publish-calendar/publish-calendar.c:416
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
 
@@ -17318,6 +18051,10 @@ msgstr ""
 "每週\n"
 "手動(透過「動作」選單)"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "啟用(_E)"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:10
 msgid "P_ort:"
 msgstr "連接埠(_O):"
@@ -17356,10 +18093,22 @@ msgstr "服務類型(_T):"
 msgid "_File:"
 msgstr "檔案(_F):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:23
+msgid "_Password:"
+msgstr "密碼(_P):"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
+#: ../plugins/publish-calendar/publish-calendar.glade.h:25
+msgid "_Remember password"
+msgstr "記住密碼(_R)"
+
+#: ../plugins/publish-calendar/publish-calendar.glade.h:27
+msgid "_Username:"
+msgstr "使用者名稱(_U):"
+
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -17368,19 +18117,31 @@ msgstr ""
 "iCal\n"
 "空閒/忙碌"
 
-#: ../plugins/sa-junk-plugin/em-junk-filter.c:102
-msgid "Spamassassin (built-in)"
-msgstr "Spamassassin (內建)"
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:108
+msgid "SpamAssassin (built-in)"
+msgstr "SpamAssassin (內建)"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:848
+msgid "This will make Spamassasin more reliable, but slower"
+msgstr "這會讓 Spamassasin 更可靠，但速度變慢"
+
+#: ../plugins/sa-junk-plugin/em-junk-filter.c:854
+msgid "I_nclude remote tests"
+msgstr "包含遠端測試(_N)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
 msgid ""
-"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"Filters junk messages using SpamAssassin. This plugin requires SpamAssassin "
 "to be installed."
-msgstr "使用 Spamassassin 過濾垃圾郵件。這個外掛程式需要安裝 Spamassassin。"
+msgstr "使用 SpamAssassin 過濾垃圾郵件。這個外掛程式需要安裝 SpamAssassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
-msgid "Spamassassin junk plugin"
-msgstr "Spamassassin 垃圾郵件外掛程式"
+msgid "SpamAssassin junk plugin"
+msgstr "SpamAssassin 垃圾郵件外掛程式"
+
+#: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:3
+msgid "Spamassassin Options"
+msgstr "SpamAssassin 選項"
 
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:1
 msgid "A plugin for saving all attachments or parts of a message at once."
@@ -17388,7 +18149,7 @@ msgstr "提供一次儲存所有附伴或郵件的各部分的外掛程式。"
 
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
-#: ../plugins/save-attachments/save-attachments.c:334
+#: ../plugins/save-attachments/save-attachments.c:330
 msgid "Save attachments"
 msgstr "儲存附加檔案"
 
@@ -17400,16 +18161,16 @@ msgstr "儲存附加檔案..."
 msgid "Save all attachments"
 msgstr "儲存所有的附加檔案"
 
-#: ../plugins/save-attachments/save-attachments.c:340
+#: ../plugins/save-attachments/save-attachments.c:336
 msgid "Select save base name"
 msgstr "選擇儲存的基本名稱"
 
-#: ../plugins/save-attachments/save-attachments.c:359
+#: ../plugins/save-attachments/save-attachments.c:355
 msgid "MIME Type"
 msgstr "MIME 類型"
 
-#: ../plugins/save-attachments/save-attachments.c:367
-#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:20
+#: ../plugins/save-attachments/save-attachments.c:363
+#: ../ui/evolution-editor.xml.h:12 ../ui/evolution-message-composer.xml.h:25
 msgid "Save"
 msgstr "儲存"
 
@@ -17417,79 +18178,79 @@ msgstr "儲存"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:171
+#: ../plugins/save-calendar/csv-format.c:167
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "Description List"
 msgstr "描述清單"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Categories List"
 msgstr "分類清單"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "Comment List"
 msgstr "註解清單"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "Created"
 msgstr "已建立"
 
-#: ../plugins/save-calendar/csv-format.c:392
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Contact List"
 msgstr "連絡人清單"
 
-#: ../plugins/save-calendar/csv-format.c:393
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Start"
 msgstr "開始"
 
-#: ../plugins/save-calendar/csv-format.c:394
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "End"
 msgstr "結束"
 
-#: ../plugins/save-calendar/csv-format.c:396
+#: ../plugins/save-calendar/csv-format.c:392
 msgid "percent Done"
 msgstr "％已完成"
 
-#: ../plugins/save-calendar/csv-format.c:398
+#: ../plugins/save-calendar/csv-format.c:394
 msgid "URL"
 msgstr "網址"
 
-#: ../plugins/save-calendar/csv-format.c:399
+#: ../plugins/save-calendar/csv-format.c:395
 msgid "Attendees List"
 msgstr "到會者清單"
 
-#: ../plugins/save-calendar/csv-format.c:401
+#: ../plugins/save-calendar/csv-format.c:397
 msgid "Modified"
 msgstr "已修改"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:545
 msgid "Advanced options for the CSV format"
 msgstr "CSV 格式的進階選項"
 
-#: ../plugins/save-calendar/csv-format.c:559
+#: ../plugins/save-calendar/csv-format.c:552
 msgid "Prepend a header"
 msgstr "預設的檔頭"
 
-#: ../plugins/save-calendar/csv-format.c:568
+#: ../plugins/save-calendar/csv-format.c:561
 msgid "Value delimiter:"
 msgstr "數值定界符:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:567
 msgid "Record delimiter:"
 msgstr "記錄定界符:"
 
-#: ../plugins/save-calendar/csv-format.c:580
+#: ../plugins/save-calendar/csv-format.c:573
 msgid "Encapsulate values with:"
 msgstr "以此封裝數值:"
 
-#: ../plugins/save-calendar/csv-format.c:602
+#: ../plugins/save-calendar/csv-format.c:595
 msgid "Comma separated value format (.csv)"
 msgstr "逗號隔開的數值格式 (.csv)"
 
@@ -17510,16 +18271,15 @@ msgstr "儲存至磁碟(_S)"
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:158
+#: ../plugins/save-calendar/rdf-format.c:154
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:397
+#: ../plugins/save-calendar/rdf-format.c:390
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:169
-#: ../plugins/save-calendar/save-calendar.c:180
+#: ../plugins/save-calendar/save-calendar.c:164
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
@@ -17536,6 +18296,10 @@ msgid "Show _only this Calendar"
 msgstr "只顯示這個行事曆(_O)"
 
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:4
+msgid "Show _only this Memo List"
+msgstr "只顯示此備忘錄清單(_O)"
+
+#: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:5
 msgid "Show _only this Task List"
 msgstr "只顯示此工作清單(_O)"
 
@@ -17547,15 +18311,15 @@ msgstr "處理啟動精靈的外掛程式。"
 msgid "Startup wizard"
 msgstr "啟動精靈"
 
-#: ../plugins/startup-wizard/startup-wizard.c:85
+#: ../plugins/startup-wizard/startup-wizard.c:84
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
 
-#: ../plugins/startup-wizard/startup-wizard.c:88
+#: ../plugins/startup-wizard/startup-wizard.c:87
 msgid "Welcome"
 msgstr "歡迎使用"
 
-#: ../plugins/startup-wizard/startup-wizard.c:89
+#: ../plugins/startup-wizard/startup-wizard.c:88
 msgid ""
 "Welcome to Evolution. The next few screens will allow Evolution to connect "
 "to your email accounts, and to import files from other applications. \n"
@@ -17567,26 +18331,32 @@ msgstr ""
 "\n"
 "請按一下「下一步」按鈕繼續。 "
 
-#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../plugins/startup-wizard/startup-wizard.c:134
 msgid "Importing files"
 msgstr "匯入檔案"
 
-#: ../plugins/startup-wizard/startup-wizard.c:138
-#: ../shell/e-shell-importer.c:149
+#: ../plugins/startup-wizard/startup-wizard.c:136
+#: ../shell/e-shell-importer.c:147
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
-#: ../plugins/startup-wizard/startup-wizard.c:153
-#: ../shell/e-shell-importer.c:411
+#: ../plugins/startup-wizard/startup-wizard.c:151
+#: ../shell/e-shell-importer.c:400
 #, c-format
 msgid "From %s:"
 msgstr "來自 %s："
 
-#: ../plugins/startup-wizard/startup-wizard.c:233
-#: ../shell/e-shell-importer.c:522
+#: ../plugins/startup-wizard/startup-wizard.c:231
+#: ../shell/e-shell-importer.c:511
+#, c-format
 msgid "Importing data."
 msgstr "匯入資料。"
 
+#: ../plugins/startup-wizard/startup-wizard.c:233
+#: ../shell/e-shell-importer.c:525
+msgid "Please wait"
+msgstr "請稍候"
+
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
 msgstr "指示相關郵件功能是否應以主旨為準。"
@@ -17601,8 +18371,16 @@ msgstr "以主旨為基礎串接郵件"
 
 #. Create the checkbox we will display, complete with mnemonic that is unique in the dialog
 #: ../plugins/subject-thread/subject-thread.c:54
-msgid "Fall back to threading messages by sub_ject"
-msgstr "退回到依主旨的相關郵件(_J)"
+msgid "F_all back to threading messages by subject"
+msgstr "退回到依主旨的相關郵件(_A)"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:1
+msgid "A simple plugin which uses ytnef to decode tnef attachments."
+msgstr "使用 ytnef 解碼 tnef 附加檔案的簡易外掛程式。"
+
+#: ../plugins/tnef-attachments/org-gnome-tnef-attachments.eplug.xml.h:2
+msgid "TNEF Attachment decoder"
+msgstr "TNEF 附加檔案解碼器"
 
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
@@ -17612,87 +18390,95 @@ msgstr "Evolution Shell"
 msgid "Evolution Shell Config factory"
 msgstr "Evolution Shell 設定工廠"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:1
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution 測試"
 
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:2
+#: ../shell/test/GNOME_Evolution_Test.server.in.in.h:2
 msgid "Evolution Test component"
 msgstr "Evolution 測試元件"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:1
-msgid "A string description of the current printer settings"
-msgstr "目前印表機設定值的描述字串"
+#: ../shell/apps_evolution_shell.schemas.in.h:1
+msgid "A string description of the current printer settings."
+msgstr "目前印表機設定值的描述字串。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:2
+#: ../shell/apps_evolution_shell.schemas.in.h:2
 msgid "Configuration version"
 msgstr "組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:3
+#: ../shell/apps_evolution_shell.schemas.in.h:3
+msgid "Decides whether the crash detection should be run or not."
+msgstr "決定是否應執行當機偵測功能。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:4
 msgid "Default sidebar width"
 msgstr "預設資訊方塊列寬度"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:4
+#: ../shell/apps_evolution_shell.schemas.in.h:5
 msgid "Default window height"
 msgstr "預設視窗高度"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:5
+#: ../shell/apps_evolution_shell.schemas.in.h:6
 msgid "Default window state"
 msgstr "預設視窗狀態"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:6
+#: ../shell/apps_evolution_shell.schemas.in.h:7
 msgid "Default window width"
 msgstr "預設視窗寬度"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:7
+#: ../shell/apps_evolution_shell.schemas.in.h:8
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "啟動時預設顯示的元件相關 ID 或別名。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:8
+#: ../shell/apps_evolution_shell.schemas.in.h:9
 msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:9
+#: ../shell/apps_evolution_shell.schemas.in.h:10
 msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:10
+#: ../shell/apps_evolution_shell.schemas.in.h:11
 msgid "Sidebar is visible"
 msgstr "顯示側邊欄"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
+#: ../shell/apps_evolution_shell.schemas.in.h:12
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:12 ../shell/main.c:472
+#: ../shell/apps_evolution_shell.schemas.in.h:13
+msgid "Skip recovery warning dialog"
+msgstr "忽略復原警告對話方塊"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:14 ../shell/main.c:569
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:13
+#: ../shell/apps_evolution_shell.schemas.in.h:15
 msgid "Statusbar is visible"
 msgstr "狀態列設為顯示"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:14
+#: ../shell/apps_evolution_shell.schemas.in.h:16
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
 msgstr ""
 "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:15
+#: ../shell/apps_evolution_shell.schemas.in.h:17
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:16
+#: ../shell/apps_evolution_shell.schemas.in.h:18
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設寬度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:17
+#: ../shell/apps_evolution_shell.schemas.in.h:19
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:18
+#: ../shell/apps_evolution_shell.schemas.in.h:20
 msgid ""
 "The last upgraded configuration version of Evolution, with major/minor/"
 "configuration level (for example \"2.6.0\")."
@@ -17700,7 +18486,7 @@ msgstr ""
 "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如"
 "「2.6.0」) 。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:19
+#: ../shell/apps_evolution_shell.schemas.in.h:21
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -17709,45 +18495,53 @@ msgstr ""
 "視窗按鈕的風格。可以是「文字」、「圖示」、「兩者」、「工具列」。如果設為「工"
 "具列」，按鈕的風格會依 GNOME 工具列設定值決定。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:20
+#: ../shell/apps_evolution_shell.schemas.in.h:22
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
 # zh_HK: msgstr "Evolution 是否以離線模式啟動取代線上模式。"
-#: ../shell/apps_evolution_shell.schemas.in.in.h:21
+#: ../shell/apps_evolution_shell.schemas.in.h:23
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:22
+#: ../shell/apps_evolution_shell.schemas.in.h:24
+msgid "Whether crash detection should be done or not"
+msgstr "是否使用當機偵測。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:25
 msgid "Whether or not the window should be maximized."
 msgstr "視窗是否可以最大化。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:23
+#: ../shell/apps_evolution_shell.schemas.in.h:26
 msgid "Whether the sidebar should be visible."
 msgstr "是否可以看到側邊欄。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:24
+#: ../shell/apps_evolution_shell.schemas.in.h:27
 msgid "Whether the status bar should be visible."
 msgstr "是否顯示狀態列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:25
+#: ../shell/apps_evolution_shell.schemas.in.h:28
 msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:26
+#: ../shell/apps_evolution_shell.schemas.in.h:29
 msgid ""
 "Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:27
+#: ../shell/apps_evolution_shell.schemas.in.h:30
+msgid "Whether the warning dialog in recovery of Evolution is skipped."
+msgstr "是否省略 Evulution 復原的警告對話方塊。"
+
+#: ../shell/apps_evolution_shell.schemas.in.h:31
 msgid "Whether the window buttons should be visible."
 msgstr "是否可以看到視窗按鈕。"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:28
+#: ../shell/apps_evolution_shell.schemas.in.h:32
 msgid "Window button style"
 msgstr "視窗按鈕風格"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:29
+#: ../shell/apps_evolution_shell.schemas.in.h:33
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
@@ -17763,16 +18557,11 @@ msgstr "作用中的連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按「確定」關閉這些連線以離線"
 
-#: ../shell/e-shell-folder-title-bar.c:584
-#: ../shell/e-shell-folder-title-bar.c:585
-msgid "(Untitled)"
-msgstr "(未命名)"
-
-#: ../shell/e-shell-importer.c:137
+#: ../shell/e-shell-importer.c:135
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
-#: ../shell/e-shell-importer.c:140
+#: ../shell/e-shell-importer.c:138
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list.\n"
@@ -17784,11 +18573,11 @@ msgstr ""
 "\n"
 "若您不清楚檔案類型，請選擇「自動」。Evolution 會嘗試找出適當的處理方法。"
 
-#: ../shell/e-shell-importer.c:146
+#: ../shell/e-shell-importer.c:144
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
 
-#: ../shell/e-shell-importer.c:152
+#: ../shell/e-shell-importer.c:150
 msgid ""
 "Evolution checked for settings to import from the following\n"
 "applications: Pine, Netscape, Elm, iCalendar. No importable\n"
@@ -17800,27 +18589,27 @@ msgstr ""
 "輸入的設定值。如果您想\n"
 "再試一次，請按一下「上一步」按鈕。\n"
 
-#: ../shell/e-shell-importer.c:291
+#: ../shell/e-shell-importer.c:288
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-#: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
+#: ../shell/e-shell-importer.c:293
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../shell/e-shell-importer.c:313
+#: ../shell/e-shell-importer.c:302
 msgid "File _type:"
 msgstr "檔案類型(_T):"
 
-#: ../shell/e-shell-importer.c:349
+#: ../shell/e-shell-importer.c:338
 msgid "Import data and settings from _older programs"
 msgstr "從舊程式輸入資料和設定值(_O)"
 
-#: ../shell/e-shell-importer.c:352
+#: ../shell/e-shell-importer.c:341
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-#: ../shell/e-shell-settings-dialog.c:318
+#: ../shell/e-shell-settings-dialog.c:313
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
@@ -17844,27 +18633,34 @@ msgstr "資料夾名稱不可以包括 “#” 字元。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "‘.’ 和 ‘..’ 是資料夾保留名稱。"
 
-#: ../shell/e-shell-window-commands.c:76
+#. To translators: This is the window title and %s is the
+#. component name. Most translators will want to keep it as is.
+#: ../shell/e-shell-view.c:50 ../shell/e-shell-window.c:342
+#, c-format
+msgid "%s - Evolution"
+msgstr "%s - Evolution"
+
+#: ../shell/e-shell-window-commands.c:77
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "系統似乎沒有安裝 GNOME Pilot 工具。"
 
-#: ../shell/e-shell-window-commands.c:84
+#: ../shell/e-shell-window-commands.c:85
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
 
-#: ../shell/e-shell-window-commands.c:132
+#: ../shell/e-shell-window-commands.c:141
 msgid "Bug buddy is not installed."
 msgstr "未安裝設計錯誤部份。"
 
-#: ../shell/e-shell-window-commands.c:135
+#: ../shell/e-shell-window-commands.c:144
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-commands.c:565
+#: ../shell/e-shell-window-commands.c:663
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
@@ -17875,25 +18671,29 @@ msgstr ""
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: ../shell/e-shell-window-commands.c:576
+#: ../shell/e-shell-window-commands.c:674
 msgid "Evolution Website"
 msgstr "Evolution 網站"
 
+#: ../shell/e-shell-window-commands.c:692
+msgid "Error opening the FAQ webpage."
+msgstr "開啟 FAQ 網頁時發生錯誤"
+
 # zh_HK: msgstr "線上工作(_W)"
-#: ../shell/e-shell-window-commands.c:782
+#: ../shell/e-shell-window-commands.c:889
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:795 ../ui/evolution.xml.h:55
+#: ../shell/e-shell-window-commands.c:902 ../ui/evolution.xml.h:56
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-#: ../shell/e-shell-window-commands.c:808
+#: ../shell/e-shell-window-commands.c:915
 msgid "Work Offline"
 msgstr "離線工作"
 
 # zh_HK: msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
-#: ../shell/e-shell-window.c:381
+#: ../shell/e-shell-window.c:382
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 
@@ -17906,33 +18706,33 @@ msgstr "Evolution 正在離線的程序中。"
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
-#: ../shell/e-shell-window.c:796
+#: ../shell/e-shell-window.c:805
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-#: ../shell/e-shell.c:635
-msgid "Uknown system error."
+#: ../shell/e-shell.c:640
+msgid "Unknown system error."
 msgstr "不明的系統錯誤。"
 
-#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
+#: ../shell/e-shell.c:838 ../shell/e-shell.c:839
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-#: ../shell/e-shell.c:1263 ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1280 ../widgets/misc/e-cell-date-edit.c:255
 msgid "OK"
 msgstr "確認"
 
-#: ../shell/e-shell.c:1265
+#: ../shell/e-shell.c:1282
 msgid "Invalid arguments"
 msgstr "無效的參數"
 
-#: ../shell/e-shell.c:1267
+#: ../shell/e-shell.c:1284
 msgid "Cannot register on OAF"
 msgstr "不能於 OAF 註冊"
 
-#: ../shell/e-shell.c:1269
+#: ../shell/e-shell.c:1286
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
@@ -17942,15 +18742,15 @@ msgstr "找不到組態資料庫"
 msgid "New"
 msgstr "新增"
 
-#: ../shell/evolution-test-component.c:140
+#: ../shell/test/evolution-test-component.c:107
 msgid "New Test"
 msgstr "新測試"
 
-#: ../shell/evolution-test-component.c:141
+#: ../shell/test/evolution-test-component.c:108
 msgid "_Test"
 msgstr "測試(_T)"
 
-#: ../shell/evolution-test-component.c:142
+#: ../shell/test/evolution-test-component.c:109
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
@@ -17993,7 +18793,7 @@ msgstr ""
 "匯入到 Evolution。"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:234
+#: ../shell/main.c:226
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -18028,7 +18828,7 @@ msgstr ""
 "我們希望您享受工作成果，而且我們\n"
 "熱切希望您提供意見！\n"
 
-#: ../shell/main.c:258
+#: ../shell/main.c:250
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -18036,40 +18836,67 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-#: ../shell/main.c:265
+#: ../shell/main.c:257
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
 
-#: ../shell/main.c:470
+#: ../shell/main.c:307
+msgid "Evolution Crash Detection"
+msgstr "Evolution 當機偵測"
+
+#: ../shell/main.c:309
+msgid "Ig_nore"
+msgstr "忽略(_N)"
+
+#: ../shell/main.c:324
+#, no-c-format
+msgid ""
+"Evolution appears to have exited unexpectedly the last time it was\n"
+"run.  As a precautionary measure, all preview panes will be hidden.\n"
+"You can restore the preview panes from the View menu.\n"
+msgstr ""
+"Evolution 上次執行時似乎發生不正常的關閉。\n"
+"為了預防它再度發生，所有的預覽窗格都會隱藏起來。\n"
+"您可以從「檢視」選單還原這些預覽窗格。\n"
+
+#: ../shell/main.c:335
+msgid "_Do not show this message again"
+msgstr "不要再顯示這個訊息(_D)"
+
+#: ../shell/main.c:567
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
 # zh_HK: msgstr "以線上模式啟動"
-#: ../shell/main.c:474
+#: ../shell/main.c:571
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: ../shell/main.c:477
+#: ../shell/main.c:574
 msgid "Forcibly shut down all Evolution components"
 msgstr "強制關閉所有 Evoultion 元件"
 
-#: ../shell/main.c:481
+#: ../shell/main.c:578
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
-#: ../shell/main.c:484
+#: ../shell/main.c:581
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
-#: ../shell/main.c:486
+#: ../shell/main.c:583
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-#: ../shell/main.c:516
+#: ../shell/main.c:585
+msgid "Disable preview pane of Mail, Contacts and Tasks."
+msgstr "停用郵件、連絡人和工作的預覽窗格。"
+
+#: ../shell/main.c:615
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
 
-#: ../shell/main.c:527
+#: ../shell/main.c:628
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -18234,49 +19061,59 @@ msgstr ""
 "因為您不信任發出此憑證的憑證單位，所以除非在此指示，否則您將不信任此憑證的有"
 "效性。"
 
-#: ../smime/gui/certificate-manager.c:136
-#: ../smime/gui/certificate-manager.c:144
-#: ../smime/gui/certificate-manager.c:375
-#: ../smime/gui/certificate-manager.c:383
-#: ../smime/gui/certificate-manager.c:595
-#: ../smime/gui/certificate-manager.c:603
+#: ../smime/gui/certificate-manager.c:137
+#: ../smime/gui/certificate-manager.c:380
+#: ../smime/gui/certificate-manager.c:604
 msgid "Select a certificate to import..."
 msgstr "選取要匯入的憑證..."
 
-#: ../smime/gui/certificate-manager.c:267
-#: ../smime/gui/certificate-manager.c:472
-#: ../smime/gui/certificate-manager.c:690
+#: ../smime/gui/certificate-manager.c:146
+msgid "All PKCS12 files"
+msgstr "所有的 PKCS12 檔案"
+
+#: ../smime/gui/certificate-manager.c:151
+#: ../smime/gui/certificate-manager.c:394
+#: ../smime/gui/certificate-manager.c:618
+msgid "All files"
+msgstr "所有檔案"
+
+#: ../smime/gui/certificate-manager.c:271
+#: ../smime/gui/certificate-manager.c:480
+#: ../smime/gui/certificate-manager.c:702
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
-#: ../smime/gui/certificate-manager.c:276
-#: ../smime/gui/certificate-manager.c:490
+#: ../smime/gui/certificate-manager.c:280
+#: ../smime/gui/certificate-manager.c:498
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:289 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "序號"
 
-#: ../smime/gui/certificate-manager.c:293
+#: ../smime/gui/certificate-manager.c:297
 msgid "Expires"
 msgstr "到期"
 
-#: ../smime/gui/certificate-manager.c:481
+#: ../smime/gui/certificate-manager.c:389
+msgid "All email certificate files"
+msgstr "所有的電子郵件憑證檔案"
+
+#: ../smime/gui/certificate-manager.c:489
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
 
+#: ../smime/gui/certificate-manager.c:613
+msgid "All CA certificate files"
+msgstr "所有的 CA 憑證檔案"
+
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "憑證檢視器:%s"
 
-#: ../smime/gui/component.c:47
-#, c-format
-msgid "Enter the password for `%s'"
-msgstr "輸入 `%s' 的密碼"
-
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
@@ -18491,7 +19328,7 @@ msgid "_Edit CA Trust"
 msgstr "編輯憑證管理中心 (_CA) 信任度"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:676
+#: ../smime/lib/e-cert-db.c:679
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
@@ -18670,30 +19507,6 @@ msgstr "輸入 PKCS12 檔案的密碼:"
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
-#: ../tools/evolution-launch-composer.c:321
-msgid "An attachment to add."
-msgstr "要新增的附件。"
-
-#: ../tools/evolution-launch-composer.c:322
-msgid "Content type of the attachment."
-msgstr "附件的內容類型。"
-
-#: ../tools/evolution-launch-composer.c:323
-msgid "The filename to display in the mail."
-msgstr "要顯示在郵件的檔案名稱。"
-
-#: ../tools/evolution-launch-composer.c:324
-msgid "Description of the attachment."
-msgstr "附件的描述。"
-
-#: ../tools/evolution-launch-composer.c:325
-msgid "Mark attachment to be shown inline by default."
-msgstr "將附件標示成預設顯示在行內。"
-
-#: ../tools/evolution-launch-composer.c:326
-msgid "Default subject for the message."
-msgstr "郵件的預設主旨。"
-
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -18819,6 +19632,10 @@ msgstr "重新命名選定的資料夾"
 msgid "S_ave Address Book As VCard"
 msgstr "將通訊錄另存為 VC_ard"
 
+#: ../ui/evolution-addressbook.xml.h:31
+msgid "Save as VCard..."
+msgstr "儲存為 VCard..."
+
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "將選定的連絡人儲存為 VCard。"
@@ -18827,7 +19644,7 @@ msgstr "將選定的連絡人儲存為 VCard。"
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "將選定資料夾中的連絡人儲存為 VCard"
 
-#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2722
 msgid "Select All"
 msgstr "全選"
 
@@ -18902,7 +19719,7 @@ msgstr "將連絡人移到(_M)..."
 msgid "_Move Folder Contacts To"
 msgstr "將資料夾連絡人移到(_M)"
 
-#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:47
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:48
 msgid "_New"
 msgstr "新增(_N)"
 
@@ -19106,23 +19923,24 @@ msgstr "關閉"
 msgid "I_nsert"
 msgstr "插入(_N)"
 
-#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:42
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-message-composer.xml.h:47
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
 #: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:45 ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-message-composer.xml.h:50 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "關閉(_C)"
 
 #: ../ui/evolution-editor.xml.h:19 ../ui/evolution-mail-messagedisplay.xml.h:6
-#: ../ui/evolution-message-composer.xml.h:48
+#: ../ui/evolution-message-composer.xml.h:53
 #: ../ui/evolution-signature-editor.xml.h:25
 #: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:42
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:20 ../ui/evolution.xml.h:44
+#: ../ui/evolution-editor.xml.h:20 ../ui/evolution-mail-global.xml.h:24
+#: ../ui/evolution.xml.h:45
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -19179,87 +19997,91 @@ msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
 #: ../ui/evolution-event-editor.xml.h:16
+msgid "Send _Options"
+msgstr "傳送選項(_O)"
+
+#: ../ui/evolution-event-editor.xml.h:17
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:24 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-#: ../ui/evolution-event-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:26
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-#: ../ui/evolution-event-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:27
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
 
-#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-memo-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:6
 #: ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "分類(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:30 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-#: ../ui/evolution-event-editor.xml.h:30
+#: ../ui/evolution-event-editor.xml.h:31
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:33 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:33
+#: ../ui/evolution-event-editor.xml.h:34
 msgid "_Recurrence"
 msgstr "週期性(_R)"
 
-#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
+#: ../ui/evolution-event-editor.xml.h:36 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
@@ -19284,79 +20106,95 @@ msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
 #: ../ui/evolution-mail-global.xml.h:7
+msgid "Download messages of accounts/folders marked for offline"
+msgstr "下載標記為離線使用的帳號/資料夾之郵件"
+
+#: ../ui/evolution-mail-global.xml.h:8
 msgid "Empty _Trash"
 msgstr "清空回收筒(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:9 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-#: ../ui/evolution-mail-global.xml.h:9
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
 #. Alphabetical by name, yo
-#: ../ui/evolution-mail-global.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-#: ../ui/evolution-mail-global.xml.h:12
+#: ../ui/evolution-mail-global.xml.h:13
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
-#: ../ui/evolution-mail-global.xml.h:13
+#: ../ui/evolution-mail-global.xml.h:14
 msgid "Show Message _Preview"
 msgstr "顯示郵件預覽(_P)"
 
-#: ../ui/evolution-mail-global.xml.h:14
+#: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview below the message list"
 msgstr "在郵件清單下方顯示郵件預覽"
 
-#: ../ui/evolution-mail-global.xml.h:15
+#: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview side-by-side with the message list"
 msgstr "在郵件清單旁顯示郵件預覽"
 
-#: ../ui/evolution-mail-global.xml.h:16
+#: ../ui/evolution-mail-global.xml.h:17
 msgid "Show message preview window"
 msgstr "顯示郵件預覽視窗"
 
-#: ../ui/evolution-mail-global.xml.h:17
+#: ../ui/evolution-mail-global.xml.h:18
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
-#: ../ui/evolution-mail-global.xml.h:18
+#: ../ui/evolution-mail-global.xml.h:19
+msgid "View the debug console for log messages"
+msgstr "檢視紀錄檔訊息的除錯主控台"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
 
-#: ../ui/evolution-mail-global.xml.h:19
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Copy Folder To..."
 msgstr "複製資料夾到(_C)..."
 
-#: ../ui/evolution-mail-global.xml.h:20
+#: ../ui/evolution-mail-global.xml.h:22
+msgid "_Debug Logs"
+msgstr "除錯紀錄檔(_D)"
+
+#: ../ui/evolution-mail-global.xml.h:23
+msgid "_Download Messages for Offline Usage"
+msgstr "下載離線使用的郵件(_D)"
+
+#: ../ui/evolution-mail-global.xml.h:25
 msgid "_Message Filters"
 msgstr "郵件規則(_M)"
 
-#: ../ui/evolution-mail-global.xml.h:21
+#: ../ui/evolution-mail-global.xml.h:26
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)..."
 
-#: ../ui/evolution-mail-global.xml.h:22
+#: ../ui/evolution-mail-global.xml.h:27
 msgid "_New..."
 msgstr "新增(_N)..."
 
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:28
 msgid "_Preview"
 msgstr "預覽(_P)"
 
 #.
 #. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
 #.
-#: ../ui/evolution-mail-global.xml.h:27
+#: ../ui/evolution-mail-global.xml.h:32
 msgid "_Subscriptions"
 msgstr "訂閱(_S)"
 
-#: ../ui/evolution-mail-global.xml.h:28
+#: ../ui/evolution-mail-global.xml.h:33
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
@@ -19419,62 +20257,82 @@ msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
 #: ../ui/evolution-mail-list.xml.h:17
+msgid "Mark all messages in the folder as read"
+msgstr "將資料夾中全部的郵件標示成已閱讀"
+
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:21
+msgid "Re_fresh..."
+msgstr "重新整理(_F)..."
+
+#: ../ui/evolution-mail-list.xml.h:22
+msgid "Refresh the folder"
+msgstr "重新載入資料夾"
+
+#: ../ui/evolution-mail-list.xml.h:23
+msgid "Select Message S_ubthread"
+msgstr "選擇郵件子群組(_U)"
+
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Select _All Messages"
 msgstr "選擇全部的郵件(_A)"
 
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Select all and only the messages that are not currently selected"
 msgstr "選擇全部目前未選定的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:24
+#: ../ui/evolution-mail-list.xml.h:28
+msgid "Select all replies to the currently selected message"
+msgstr "選擇所有回覆選定郵件的信"
+
+#: ../ui/evolution-mail-list.xml.h:29
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:30
 msgid "Show Hidde_n Messages"
 msgstr "顯示隱藏的郵件(_N)"
 
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:31
 msgid "Show messages that have been temporarily hidden"
 msgstr "顯示暫時隱藏的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:32
 msgid "Temporarily hide all messages that have already been read"
 msgstr "將已閱讀的郵件暫時隱藏"
 
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:33
 msgid "Temporarily hide the selected messages"
 msgstr "將選定的郵件暫時隱藏"
 
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:34
 msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
-#: ../ui/evolution-mail-list.xml.h:31
+#: ../ui/evolution-mail-list.xml.h:36
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:37 ../ui/evolution-mail-message.xml.h:116
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -19779,8 +20637,8 @@ msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
 #: ../ui/evolution-mail-message.xml.h:87
-msgid "Search Folder from Recipients..."
-msgstr "收件者搜尋資料夾..."
+msgid "Search Folder from Recipien_ts..."
+msgstr "從收件者搜尋資料夾(_T)..."
 
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
@@ -19802,7 +20660,7 @@ msgstr "選取所有文字(_A)"
 msgid "Select all the text in a message"
 msgstr "選擇郵件中的所有文字"
 
-#: ../ui/evolution-mail-message.xml.h:93
+#: ../ui/evolution-mail-message.xml.h:93 ../ui/evolution.xml.h:27
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
@@ -19906,23 +20764,28 @@ msgstr "上一封郵件(_P)"
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-#: ../ui/evolution-mail-message.xml.h:128
+#. Translators: "Read" as in "has been read" (evolution-mail-message.xml)
+#: ../ui/evolution-mail-message.xml.h:127
+msgid "_Read"
+msgstr "已閱讀(_R)"
+
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:131
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:132
 msgid "_Zoom"
 msgstr "縮放(_Z)"
 
-#: ../ui/evolution-mail-message.xml.h:132
+#: ../ui/evolution-mail-message.xml.h:133
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
@@ -19930,7 +20793,7 @@ msgstr "放大(_Z)"
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
-#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:18
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -20024,144 +20887,164 @@ msgid "PGP Sign"
 msgstr "PGP 加簽"
 
 #: ../ui/evolution-message-composer.xml.h:17
+msgid "PGP _Encrypt"
+msgstr "PG_P 加密"
+
+#: ../ui/evolution-message-composer.xml.h:18
+msgid "PGP _Sign"
+msgstr "P_GP 加簽"
+
+#: ../ui/evolution-message-composer.xml.h:19
 msgid "R_equest Read Receipt"
 msgstr "要求讀信回條(_E)"
 
-#: ../ui/evolution-message-composer.xml.h:18
+#: ../ui/evolution-message-composer.xml.h:20
+msgid "S/MIME En_crypt"
+msgstr "_S/MIME 加密"
+
+#: ../ui/evolution-message-composer.xml.h:21
 msgid "S/MIME Encrypt"
 msgstr "S/MIME 加密"
 
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-message-composer.xml.h:22
+msgid "S/MIME Sig_n"
+msgstr "S/MI_ME 加簽"
+
+#: ../ui/evolution-message-composer.xml.h:23
 msgid "S/MIME Sign"
 msgstr "S/MIME 加簽"
 
-#: ../ui/evolution-message-composer.xml.h:21
+#: ../ui/evolution-message-composer.xml.h:24
+msgid "S_end"
+msgstr "傳送(_E)"
+
+#: ../ui/evolution-message-composer.xml.h:26
 msgid "Save As"
 msgstr "另存新檔"
 
-#: ../ui/evolution-message-composer.xml.h:22
+#: ../ui/evolution-message-composer.xml.h:27
 msgid "Save Draft"
 msgstr "儲存草稿"
 
-#: ../ui/evolution-message-composer.xml.h:23
+#: ../ui/evolution-message-composer.xml.h:28
 msgid "Save _As..."
 msgstr "另存新檔(_A)..."
 
-#: ../ui/evolution-message-composer.xml.h:24
+#: ../ui/evolution-message-composer.xml.h:29
 msgid "Save _Draft"
 msgstr "儲存草稿(_D)"
 
-#: ../ui/evolution-message-composer.xml.h:25
+#: ../ui/evolution-message-composer.xml.h:30
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-#: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-message-composer.xml.h:31
 msgid "Save in folder..."
 msgstr "儲存至資料夾..."
 
-#: ../ui/evolution-message-composer.xml.h:27
+#: ../ui/evolution-message-composer.xml.h:32
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
-#: ../ui/evolution-message-composer.xml.h:28
+#: ../ui/evolution-message-composer.xml.h:33
 msgid "Save the current file with a different name"
 msgstr "使用另一名稱儲存目前的檔案"
 
-#: ../ui/evolution-message-composer.xml.h:29
+#: ../ui/evolution-message-composer.xml.h:34
 msgid "Save the message in a specified folder"
 msgstr "將郵件儲存至指定的資料夾"
 
-#: ../ui/evolution-message-composer.xml.h:30
+#: ../ui/evolution-message-composer.xml.h:35
 msgid "Send"
 msgstr "傳送"
 
-#: ../ui/evolution-message-composer.xml.h:31
+#: ../ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送郵件"
 
-#: ../ui/evolution-message-composer.xml.h:32
+#: ../ui/evolution-message-composer.xml.h:37
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-#: ../ui/evolution-message-composer.xml.h:33
+#: ../ui/evolution-message-composer.xml.h:38
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-#: ../ui/evolution-message-composer.xml.h:34
+#: ../ui/evolution-message-composer.xml.h:39
 msgid "Sign this message with your PGP key"
 msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
-#: ../ui/evolution-message-composer.xml.h:35
+#: ../ui/evolution-message-composer.xml.h:40
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
-#: ../ui/evolution-message-composer.xml.h:36
+#: ../ui/evolution-message-composer.xml.h:41
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:37
+#: ../ui/evolution-message-composer.xml.h:42
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:38
+#: ../ui/evolution-message-composer.xml.h:43
 msgid "Toggles whether the From chooser is displayed"
 msgstr "切換寄件者選擇器的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:39
+#: ../ui/evolution-message-composer.xml.h:44
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "切換是否顯示「張貼至」欄位"
 
-#: ../ui/evolution-message-composer.xml.h:40
+#: ../ui/evolution-message-composer.xml.h:45
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-message-composer.xml.h:46
 msgid "Toggles whether the To field is displayed"
 msgstr "切換是否顯示「收件者」欄位"
 
-#: ../ui/evolution-message-composer.xml.h:43
+#: ../ui/evolution-message-composer.xml.h:48
 msgid "_Bcc Field"
 msgstr "密件副本欄位(_B)"
 
-#: ../ui/evolution-message-composer.xml.h:44
+#: ../ui/evolution-message-composer.xml.h:49
 msgid "_Cc Field"
 msgstr "副本欄位(_C)"
 
-#: ../ui/evolution-message-composer.xml.h:46
+#: ../ui/evolution-message-composer.xml.h:51
 msgid "_Delete all"
 msgstr "全部刪除(_D)"
 
-#: ../ui/evolution-message-composer.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:54
 msgid "_From Field"
 msgstr "寄件者欄位(_F)"
 
-#: ../ui/evolution-message-composer.xml.h:50
+#: ../ui/evolution-message-composer.xml.h:55
 msgid "_Open..."
 msgstr "開啟(_O)..."
 
-#: ../ui/evolution-message-composer.xml.h:51
+#: ../ui/evolution-message-composer.xml.h:56
 msgid "_Post-To Field"
 msgstr "張貼到欄位(_P)"
 
-#: ../ui/evolution-message-composer.xml.h:52
+#: ../ui/evolution-message-composer.xml.h:57
 msgid "_Prioritize Message"
 msgstr "郵件優先權(_P)"
 
-#: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-message-composer.xml.h:58
 msgid "_Reply-To Field"
 msgstr "回覆欄位(_R)"
 
-#: ../ui/evolution-message-composer.xml.h:55
+#: ../ui/evolution-message-composer.xml.h:60
 msgid "_Security"
 msgstr "安全性(_S)"
 
-#: ../ui/evolution-message-composer.xml.h:56
+#: ../ui/evolution-message-composer.xml.h:61
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "傳送選項(_S)"
 
-#: ../ui/evolution-message-composer.xml.h:57
+#: ../ui/evolution-message-composer.xml.h:62
 msgid "_To Field"
 msgstr "數件者欄位(_T)"
 
@@ -20319,81 +21202,89 @@ msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
 #: ../ui/evolution.xml.h:10
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
+
+#: ../ui/evolution.xml.h:11
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-#: ../ui/evolution.xml.h:11
+#: ../ui/evolution.xml.h:12
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
 
-#: ../ui/evolution.xml.h:12
+#: ../ui/evolution.xml.h:13
 msgid "Hide window buttons"
 msgstr "隱藏視窗按鈕"
 
-#: ../ui/evolution.xml.h:13
+#: ../ui/evolution.xml.h:14
 msgid "I_mport..."
 msgstr "匯入(_M)..."
 
-#: ../ui/evolution.xml.h:14
-msgid "Icons _and text"
+#: ../ui/evolution.xml.h:15
+msgid "Icons _and Text"
 msgstr "圖示及文字(_A)"
 
-#: ../ui/evolution.xml.h:15
+#: ../ui/evolution.xml.h:16
 msgid "Import data from other programs"
 msgstr "匯入其他程式的資料"
 
-#: ../ui/evolution.xml.h:16
+#: ../ui/evolution.xml.h:17
 msgid "Lay_out"
 msgstr "佈局(_O)"
 
-#: ../ui/evolution.xml.h:18
+#: ../ui/evolution.xml.h:19
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-#: ../ui/evolution.xml.h:19
+#: ../ui/evolution.xml.h:20
+msgid "Open the Frequently Asked Questions webpage"
+msgstr "開啟常見問題(FAQ)網頁"
+
+#: ../ui/evolution.xml.h:21
+msgid "Page Set_up..."
+msgstr "頁面設定(_U)..."
+
+#: ../ui/evolution.xml.h:22
 msgid "Prefere_nces"
 msgstr "偏好設定(_N)"
 
-#: ../ui/evolution.xml.h:20
+#: ../ui/evolution.xml.h:23
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-#: ../ui/evolution.xml.h:21
+#: ../ui/evolution.xml.h:24
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-#: ../ui/evolution.xml.h:22
+#: ../ui/evolution.xml.h:25
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-#: ../ui/evolution.xml.h:23
+#: ../ui/evolution.xml.h:26
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
 
-#: ../ui/evolution.xml.h:24
+#: ../ui/evolution.xml.h:28
 msgid "Show Side _Bar"
 msgstr "顯示側邊欄(_B)"
 
-#: ../ui/evolution.xml.h:25
+#: ../ui/evolution.xml.h:29
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: ../ui/evolution.xml.h:26
+#: ../ui/evolution.xml.h:30
 msgid "Show _Toolbar"
 msgstr "顯示工具列(_T)"
 
-#: ../ui/evolution.xml.h:27
+#: ../ui/evolution.xml.h:31
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-#: ../ui/evolution.xml.h:28
+#: ../ui/evolution.xml.h:32
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
 #: ../ui/evolution.xml.h:33
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
@@ -20407,7 +21298,7 @@ msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 #: ../ui/evolution.xml.h:36
-msgid "Tool_bar style"
+msgid "Tool_bar Style"
 msgstr "工具列風格(_B)"
 
 #: ../ui/evolution.xml.h:37
@@ -20430,35 +21321,39 @@ msgstr "關閉視窗(_C)"
 msgid "_Forget Passwords"
 msgstr "遺忘密碼(_F)"
 
-#: ../ui/evolution.xml.h:45
-msgid "_Hide buttons"
-msgstr "隱藏按鈕(_H)"
+#: ../ui/evolution.xml.h:44
+msgid "_Frequently Asked Questions"
+msgstr "常見問題(_FAQ)"
 
 #: ../ui/evolution.xml.h:46
-msgid "_Icons only"
+msgid "_Hide Buttons"
+msgstr "隱藏按鈕(_H)"
+
+#: ../ui/evolution.xml.h:47
+msgid "_Icons Only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:49
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution.xml.h:50
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:51
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:52
 msgid "_Synchronization Options..."
 msgstr "同步化選項(_S)..."
 
-#: ../ui/evolution.xml.h:52
-msgid "_Text only"
+#: ../ui/evolution.xml.h:53
+msgid "_Text Only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:54
+#: ../ui/evolution.xml.h:55
 msgid "_Window"
 msgstr "視窗(_O)"
 
@@ -20470,9 +21365,9 @@ msgstr "依公司(_C)"
 msgid "_Address Cards"
 msgstr "地址卡(_A)"
 
-#: ../views/addressbook/galview.xml.h:3
-msgid "_Phone List"
-msgstr "電話清單(_P)"
+#: ../views/addressbook/galview.xml.h:3 ../views/calendar/galview.xml.h:3
+msgid "_List View"
+msgstr "清單檢視(_L)"
 
 #: ../views/calendar/galview.xml.h:1
 msgid "W_eek View"
@@ -20482,10 +21377,6 @@ msgstr "週檢視(_E)"
 msgid "_Day View"
 msgstr "日檢視(_D)"
 
-#: ../views/calendar/galview.xml.h:3
-msgid "_List View"
-msgstr "清單檢視(_L)"
-
 #: ../views/calendar/galview.xml.h:4
 msgid "_Month View"
 msgstr "月檢視(_M)"
@@ -20539,11 +21430,11 @@ msgid "With _Status"
 msgstr "設定狀態(_S)"
 
 #. Put the ""UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:211
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:402
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:404
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:213
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:406
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:757
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:408
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:410
+#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:759
 msgid "UTC"
 msgstr "UTC"
 
@@ -20572,19 +21463,19 @@ msgstr ""
 "使用滑鼠左鍵拉近地圖的區域，然後選取時區。\n"
 "使用滑鼠右鍵拉遠。"
 
-#: ../widgets/menus/gal-define-views-dialog.c:76
-#: ../widgets/menus/gal-define-views-model.c:188
+#: ../widgets/menus/gal-define-views-dialog.c:78
+#: ../widgets/menus/gal-define-views-model.c:186
 msgid "Collection"
 msgstr "收集"
 
-#: ../widgets/menus/gal-define-views-dialog.c:325
+#: ../widgets/menus/gal-define-views-dialog.c:360
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定義 %s 的檢視"
 
-#: ../widgets/menus/gal-define-views-dialog.c:333
-#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:368
+#: ../widgets/menus/gal-define-views-dialog.c:370
 msgid "Define Views"
 msgstr "定義檢視"
 
@@ -20593,22 +21484,18 @@ msgstr "定義檢視"
 msgid "Define Views for \"%s\""
 msgstr "定義「%s」的檢視"
 
-#: ../widgets/menus/gal-define-views.glade.h:5
-msgid "_Edit..."
-msgstr "編輯(_E)..."
-
-#: ../widgets/menus/gal-view-factory-etable.c:39
-#: ../widgets/table/e-table-header-item.c:1909
-#: ../widgets/table/e-table-scrolled.c:222
-#: ../widgets/table/e-table-scrolled.c:223
+#: ../widgets/menus/gal-view-factory-etable.c:37
+#: ../widgets/table/e-table-header-item.c:1921
+#: ../widgets/table/e-table-scrolled.c:216
+#: ../widgets/table/e-table-scrolled.c:217
 msgid "Table"
 msgstr "表格"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:228
 msgid "Instance"
 msgstr "實體"
 
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
+#: ../widgets/menus/gal-view-instance-save-as-dialog.c:286
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
@@ -20621,17 +21508,17 @@ msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
 #. bonobo displays this string so it must be in locale
-#: ../widgets/menus/gal-view-instance.c:587
-#: ../widgets/menus/gal-view-menus.c:350
+#: ../widgets/menus/gal-view-instance.c:582
+#: ../widgets/menus/gal-view-menus.c:354
 msgid "Custom View"
 msgstr "自訂檢視"
 
-#: ../widgets/menus/gal-view-instance.c:588
+#: ../widgets/menus/gal-view-instance.c:583
 msgid "Save Custom View"
 msgstr "儲存自訂檢視"
 
-#: ../widgets/menus/gal-view-instance.c:592
-#: ../widgets/menus/gal-view-menus.c:372
+#: ../widgets/menus/gal-view-instance.c:587
+#: ../widgets/menus/gal-view-menus.c:378
 msgid "Define Views..."
 msgstr "定義檢視..."
 
@@ -20639,15 +21526,32 @@ msgstr "定義檢視..."
 msgid "C_urrent View"
 msgstr "目前檢視(_U)"
 
+#: ../widgets/menus/gal-view-menus.c:315
+#, c-format
+msgid "Select View: %s"
+msgstr "選擇檢視：%s"
+
 #: ../widgets/menus/gal-view-menus.c:359
+msgid "Current view is a customized view"
+msgstr "目前的檢視方式是自訂的檢視"
+
+#: ../widgets/menus/gal-view-menus.c:364
 msgid "Save Custom View..."
 msgstr "儲存自訂檢視..."
 
-#: ../widgets/menus/gal-view-new-dialog.c:80
+#: ../widgets/menus/gal-view-menus.c:369
+msgid "Save current custom view"
+msgstr "儲存目前的自訂檢視"
+
+#: ../widgets/menus/gal-view-menus.c:383
+msgid "Create or edit views"
+msgstr "建立或編輯檢視(_C)"
+
+#: ../widgets/menus/gal-view-new-dialog.c:72
 msgid "Factory"
 msgstr "工廠"
 
-#: ../widgets/menus/gal-view-new-dialog.c:115
+#: ../widgets/menus/gal-view-new-dialog.c:107
 msgid "Define New View"
 msgstr "定義新的檢視"
 
@@ -20663,19 +21567,40 @@ msgstr "檢視的類型"
 msgid "Type of view:"
 msgstr "檢視的類型:"
 
+#: ../widgets/misc/e-attachment-bar.c:1028
+msgid "Attachment Bar"
+msgstr "附加檔案列"
+
+#: ../widgets/misc/e-attachment.c:291 ../widgets/misc/e-attachment.c:306
+#: ../widgets/misc/e-attachment.c:507 ../widgets/misc/e-attachment.c:524
+#, c-format
+msgid "Cannot attach file %s: %s"
+msgstr "不能附加檔案 %s： %s"
+
+#: ../widgets/misc/e-attachment.c:299 ../widgets/misc/e-attachment.c:516
+#, c-format
+msgid "Cannot attach file %s: not a regular file"
+msgstr "不能附加檔案 %s：不是一個合法的檔案"
+
+#: ../widgets/misc/e-attachment.glade.h:1
+msgid "Attachment Properties"
+msgstr "附件內容"
+
+#: ../widgets/misc/e-attachment.glade.h:3
+msgid "File name:"
+msgstr "檔案名稱:"
+
+#: ../widgets/misc/e-attachment.glade.h:4
+msgid "MIME type:"
+msgstr "MIME 類型:"
+
 #: ../widgets/misc/e-attachment.glade.h:5
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: ../widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "一二三四五六日"
-
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1089
-#: ../widgets/misc/e-calendar-item.c:1743
+#: ../widgets/misc/e-calendar-item.c:1077
+#: ../widgets/misc/e-calendar-item.c:1724
 msgid "%B %Y"
 msgstr "%Y 年 %-m 月"
 
@@ -20683,222 +21608,205 @@ msgstr "%Y 年 %-m 月"
 msgid "Month Calendar"
 msgstr "月行事曆"
 
-#: ../widgets/misc/e-canvas-background.c:457
-#: ../widgets/misc/e-canvas-background.c:458 ../widgets/text/e-entry.c:1237
-#: ../widgets/text/e-entry.c:1238 ../widgets/text/e-text.c:3581
-#: ../widgets/text/e-text.c:3582
+#: ../widgets/misc/e-canvas-background.c:453
+#: ../widgets/misc/e-canvas-background.c:454 ../widgets/text/e-text.c:3642
+#: ../widgets/text/e-text.c:3643
 msgid "Fill color"
 msgstr "填入色彩"
 
-#: ../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:1244
-#: ../widgets/text/e-entry.c:1245 ../widgets/text/e-entry.c:1251
-#: ../widgets/text/e-entry.c:1252 ../widgets/text/e-text.c:3588
-#: ../widgets/text/e-text.c:3589 ../widgets/text/e-text.c:3596
-#: ../widgets/text/e-text.c:3597
+#: ../widgets/misc/e-canvas-background.c:460
+#: ../widgets/misc/e-canvas-background.c:461
+#: ../widgets/misc/e-canvas-background.c:467
+#: ../widgets/misc/e-canvas-background.c:468 ../widgets/text/e-text.c:3649
+#: ../widgets/text/e-text.c:3650 ../widgets/text/e-text.c:3657
+#: ../widgets/text/e-text.c:3658
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
-#: ../widgets/misc/e-canvas-background.c:478
-#: ../widgets/misc/e-canvas-background.c:479 ../widgets/text/e-entry.c:1258
-#: ../widgets/text/e-entry.c:1259 ../widgets/text/e-text.c:3603
-#: ../widgets/text/e-text.c:3604
+#: ../widgets/misc/e-canvas-background.c:474
+#: ../widgets/misc/e-canvas-background.c:475 ../widgets/text/e-text.c:3664
+#: ../widgets/text/e-text.c:3665
 msgid "Fill stipple"
 msgstr "填入網點"
 
-#: ../widgets/misc/e-canvas-background.c:485
-#: ../widgets/misc/e-canvas-background.c:486
+#: ../widgets/misc/e-canvas-background.c:481
+#: ../widgets/misc/e-canvas-background.c:482
 msgid "X1"
 msgstr "X1"
 
-#: ../widgets/misc/e-canvas-background.c:492
-#: ../widgets/misc/e-canvas-background.c:493
+#: ../widgets/misc/e-canvas-background.c:488
+#: ../widgets/misc/e-canvas-background.c:489
 msgid "X2"
 msgstr "X2"
 
-#: ../widgets/misc/e-canvas-background.c:499
-#: ../widgets/misc/e-canvas-background.c:500
+#: ../widgets/misc/e-canvas-background.c:495
+#: ../widgets/misc/e-canvas-background.c:496
 msgid "Y1"
 msgstr "Y1"
 
-#: ../widgets/misc/e-canvas-background.c:506
-#: ../widgets/misc/e-canvas-background.c:507
+#: ../widgets/misc/e-canvas-background.c:502
+#: ../widgets/misc/e-canvas-background.c:503
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1429
-#: ../widgets/table/e-table-group-container.c:974
-#: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3017
+#: ../widgets/misc/e-canvas-vbox.c:92 ../widgets/misc/e-reflow.c:1426
+#: ../widgets/table/e-table-group-container.c:973
+#: ../widgets/table/e-table-group-leaf.c:635
+#: ../widgets/table/e-table-item.c:3062
 msgid "Minimum width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1430
-#: ../widgets/table/e-table-group-container.c:975
-#: ../widgets/table/e-table-group-leaf.c:637
-#: ../widgets/table/e-table-item.c:3018
+#: ../widgets/misc/e-canvas-vbox.c:93 ../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:3063
 msgid "Minimum Width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
+#: ../widgets/misc/e-canvas-vbox.c:104 ../widgets/misc/e-canvas-vbox.c:105
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "間距"
 
-#: ../widgets/misc/e-cell-date-edit.c:233
+#: ../widgets/misc/e-cell-date-edit.c:231
 msgid "Now"
 msgstr "現在"
 
-#: ../widgets/misc/e-cell-date-edit.c:793
+#: ../widgets/misc/e-cell-date-edit.c:795
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
 
-#: ../widgets/misc/e-cell-percent.c:76
+#: ../widgets/misc/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
 
-#: ../widgets/misc/e-charset-picker.c:64
+#: ../widgets/misc/e-charset-picker.c:65
+msgid "Arabic"
+msgstr "阿拉伯"
+
+#: ../widgets/misc/e-charset-picker.c:66
 msgid "Baltic"
 msgstr "波羅的海語"
 
-#: ../widgets/misc/e-charset-picker.c:65
+#: ../widgets/misc/e-charset-picker.c:67
 msgid "Central European"
 msgstr "中歐語系"
 
-#: ../widgets/misc/e-charset-picker.c:66
+#: ../widgets/misc/e-charset-picker.c:68
 msgid "Chinese"
 msgstr "中文"
 
-#: ../widgets/misc/e-charset-picker.c:67
+#: ../widgets/misc/e-charset-picker.c:69
 msgid "Cyrillic"
 msgstr "斯拉夫文"
 
-#: ../widgets/misc/e-charset-picker.c:68
+#: ../widgets/misc/e-charset-picker.c:70
 msgid "Greek"
 msgstr "希臘文"
 
-#: ../widgets/misc/e-charset-picker.c:69
+#: ../widgets/misc/e-charset-picker.c:71
 msgid "Hebrew"
 msgstr "希伯來語"
 
-#: ../widgets/misc/e-charset-picker.c:70
+#: ../widgets/misc/e-charset-picker.c:72
 msgid "Japanese"
 msgstr "日文"
 
-#: ../widgets/misc/e-charset-picker.c:71
+#: ../widgets/misc/e-charset-picker.c:73
 msgid "Korean"
 msgstr "韓文"
 
-#: ../widgets/misc/e-charset-picker.c:72
+#: ../widgets/misc/e-charset-picker.c:74
 msgid "Thai"
 msgstr "泰文"
 
-#: ../widgets/misc/e-charset-picker.c:73
+#: ../widgets/misc/e-charset-picker.c:75
 msgid "Turkish"
 msgstr "土耳其語"
 
-#: ../widgets/misc/e-charset-picker.c:74
+#: ../widgets/misc/e-charset-picker.c:76
 msgid "Unicode"
 msgstr "萬國碼"
 
-#: ../widgets/misc/e-charset-picker.c:75
+#: ../widgets/misc/e-charset-picker.c:77
 msgid "Western European"
 msgstr "西歐語系"
 
-#: ../widgets/misc/e-charset-picker.c:76
+#: ../widgets/misc/e-charset-picker.c:78
 msgid "Western European, New"
 msgstr "西歐語系，新"
 
-#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
+#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
+#: ../widgets/misc/e-charset-picker.c:99
 msgid "Traditional"
 msgstr "正體"
 
-#: ../widgets/misc/e-charset-picker.c:97 ../widgets/misc/e-charset-picker.c:98
-#: ../widgets/misc/e-charset-picker.c:99
 #: ../widgets/misc/e-charset-picker.c:100
+#: ../widgets/misc/e-charset-picker.c:101
+#: ../widgets/misc/e-charset-picker.c:102
+#: ../widgets/misc/e-charset-picker.c:103
 msgid "Simplified"
 msgstr "簡體"
 
-#: ../widgets/misc/e-charset-picker.c:103
+#: ../widgets/misc/e-charset-picker.c:106
 msgid "Ukrainian"
 msgstr "烏克蘭語"
 
-#: ../widgets/misc/e-charset-picker.c:106
+#: ../widgets/misc/e-charset-picker.c:109
 msgid "Visual"
 msgstr "視覺"
 
-#: ../widgets/misc/e-charset-picker.c:175
+#: ../widgets/misc/e-charset-picker.c:178
 #, c-format
 msgid "Unknown character set: %s"
 msgstr "不明的字元集：%s"
 
-#: ../widgets/misc/e-charset-picker.c:220
+#: ../widgets/misc/e-charset-picker.c:223
 msgid "Character Encoding"
 msgstr "字元編碼"
 
-#: ../widgets/misc/e-charset-picker.c:235
+#: ../widgets/misc/e-charset-picker.c:238
 msgid "Enter the character set to use"
 msgstr "輸入要使用的字元集"
 
-#: ../widgets/misc/e-charset-picker.c:342
+#: ../widgets/misc/e-charset-picker.c:345
 msgid "Other..."
 msgstr "其它..."
 
-#: ../widgets/misc/e-charset-picker.c:483
+#: ../widgets/misc/e-charset-picker.c:486
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-#: ../widgets/misc/e-clipped-label.c:111
-msgid "..."
-msgstr "..."
-
-#: ../widgets/misc/e-dateedit.c:321
+#: ../widgets/misc/e-dateedit.c:324
 msgid "Date and Time"
 msgstr "日期與時刻"
 
-#: ../widgets/misc/e-dateedit.c:340
+#: ../widgets/misc/e-dateedit.c:345
 msgid "Text entry to input date"
 msgstr "用來輸入日期的文字項目"
 
-#: ../widgets/misc/e-dateedit.c:362
+#: ../widgets/misc/e-dateedit.c:367
 msgid "Click this button to show a calendar"
 msgstr "按此按鈕以顯示行事曆"
 
-#: ../widgets/misc/e-dateedit.c:384
+#: ../widgets/misc/e-dateedit.c:409
 msgid "Combo box to select time"
 msgstr "用以選擇時刻的組合式方塊"
 
-#: ../widgets/misc/e-dateedit.c:385
-msgid "Time"
-msgstr "時間"
-
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-dateedit.c:484
 msgid "No_w"
 msgstr "現在(_W)"
 
-#: ../widgets/misc/e-dateedit.c:467
+#: ../widgets/misc/e-dateedit.c:490
 msgid "_Today"
 msgstr "今天(_T)"
 
-#. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
-msgid "%H:%M"
-msgstr "%H:%M"
-
-#. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
-msgid "%I:%M %p"
-msgstr "%I %M:%p"
-
-#: ../widgets/misc/e-dateedit.c:1634
+#: ../widgets/misc/e-dateedit.c:1655
 msgid "Invalid Date Value"
 msgstr "無效的日期數值"
 
-#: ../widgets/misc/e-dateedit.c:1660
+#: ../widgets/misc/e-dateedit.c:1684
 msgid "Invalid Time Value"
 msgstr "無效的時刻數值"
 
@@ -20936,11 +21844,11 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3312
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3356
 msgid "Expander Size"
 msgstr "展開器大小"
 
-#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3313
+#: ../widgets/misc/e-expander.c:224 ../widgets/table/e-tree.c:3357
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
@@ -20953,61 +21861,61 @@ msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:129 ../widgets/misc/e-filter-bar.c:170
-#: ../widgets/misc/e-filter-bar.c:291 ../widgets/misc/e-filter-bar.c:727
+#: ../widgets/misc/e-filter-bar.c:130 ../widgets/misc/e-filter-bar.c:183
+#: ../widgets/misc/e-filter-bar.c:311 ../widgets/misc/e-filter-bar.c:748
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
 #. FIXME: get the toplevel window...
-#: ../widgets/misc/e-filter-bar.c:218
+#: ../widgets/misc/e-filter-bar.c:234
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
-#: ../widgets/misc/e-filter-bar.c:251
+#: ../widgets/misc/e-filter-bar.c:271
 msgid "_Searches"
 msgstr "搜尋(_S)"
 
-#: ../widgets/misc/e-filter-bar.c:253
+#: ../widgets/misc/e-filter-bar.c:273
 msgid "Searches"
 msgstr "搜尋"
 
-#: ../widgets/misc/e-filter-bar.h:100 ../widgets/misc/e-filter-bar.h:111
+#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:101 ../widgets/misc/e-filter-bar.h:112
+#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
-#: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
+#: ../widgets/misc/e-filter-bar.h:103 ../widgets/misc/e-filter-bar.h:114
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
-#: ../widgets/misc/e-filter-bar.h:103
+#: ../widgets/misc/e-filter-bar.h:104
 msgid "All Accounts"
 msgstr "所有的帳號"
 
-#: ../widgets/misc/e-filter-bar.h:104
+#: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Account"
 msgstr "目前的帳號"
 
-#: ../widgets/misc/e-filter-bar.h:105
+#: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-#: ../widgets/misc/e-filter-bar.h:106
+#: ../widgets/misc/e-filter-bar.h:107
 msgid "Current Message"
 msgstr "目前的郵件"
 
-#: ../widgets/misc/e-image-chooser.c:172
+#: ../widgets/misc/e-image-chooser.c:173
 msgid "Choose Image"
 msgstr "選擇影像"
 
-#: ../widgets/misc/e-map.c:629
+#: ../widgets/misc/e-map.c:626
 msgid "World Map"
 msgstr "世界地圖"
 
-#: ../widgets/misc/e-map.c:631
+#: ../widgets/misc/e-map.c:628
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
@@ -21027,77 +21935,86 @@ msgstr "同步私人記錄:"
 msgid "Sync Categories:"
 msgstr "同步分類:"
 
-#: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
+#: ../widgets/misc/e-reflow.c:1448 ../widgets/misc/e-reflow.c:1449
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
+#: ../widgets/misc/e-reflow.c:1455 ../widgets/misc/e-reflow.c:1456
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1465 ../widgets/misc/e-reflow.c:1466
+#: ../widgets/misc/e-reflow.c:1462 ../widgets/misc/e-reflow.c:1463
 msgid "Column width"
 msgstr "欄寬"
 
-#: ../widgets/misc/e-search-bar.c:597
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Search"
+msgstr "搜尋"
+
+#: ../widgets/misc/e-search-bar.c:349 ../widgets/misc/e-search-bar.c:478
+#: ../widgets/misc/e-search-bar.c:480
+msgid "Click here to change the search type"
+msgstr "按這裡以改變搜尋類型"
+
+#: ../widgets/misc/e-search-bar.c:610
 msgid "_Search"
 msgstr "尋找(_S)"
 
-#: ../widgets/misc/e-search-bar.c:603
+#: ../widgets/misc/e-search-bar.c:616
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:604
+#: ../widgets/misc/e-search-bar.c:617
 msgid "_Clear"
 msgstr "清除(_C)"
 
-#: ../widgets/misc/e-search-bar.c:855
+#: ../widgets/misc/e-search-bar.c:872
 msgid "Item ID"
 msgstr "項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:862 ../widgets/text/e-entry.c:1223
-#: ../widgets/text/e-entry.c:1224 ../widgets/text/e-text.c:3503
-#: ../widgets/text/e-text.c:3504
+#: ../widgets/misc/e-search-bar.c:879 ../widgets/text/e-text.c:3564
+#: ../widgets/text/e-text.c:3565
 msgid "Text"
 msgstr "文字"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Dropdown Menu where you can choose
 #. to display "All Messages", "Unread Messages", "Message with 'Important' Label" and so on...
-#: ../widgets/misc/e-search-bar.c:996
+#: ../widgets/misc/e-search-bar.c:1013
 msgid "Sho_w: "
 msgstr "顯示(_W):"
 
 #. To Translators: The "Show: " label is followed by the Quick Search Text input field where one enters
 #. the term to search for
-#: ../widgets/misc/e-search-bar.c:1013
+#: ../widgets/misc/e-search-bar.c:1030
 msgid "Sear_ch: "
 msgstr "搜尋(_C):"
 
 #. To Translators: The " in " label is part of the Quick Search Bar, example:
 #. Search: | <user's_search_term> | in | Current Folder/All Accounts/Current Account
-#: ../widgets/misc/e-search-bar.c:1025
+#: ../widgets/misc/e-search-bar.c:1042
 msgid " i_n "
 msgstr " i_n "
 
-#: ../widgets/misc/e-selection-model-array.c:547
-#: ../widgets/table/e-tree-selection-model.c:811
+#: ../widgets/misc/e-selection-model-array.c:543
+#: ../widgets/table/e-tree-selection-model.c:807
 msgid "Cursor Row"
 msgstr "游標列"
 
-#: ../widgets/misc/e-selection-model-array.c:554
-#: ../widgets/table/e-tree-selection-model.c:818
+#: ../widgets/misc/e-selection-model-array.c:550
+#: ../widgets/table/e-tree-selection-model.c:814
 msgid "Cursor Column"
 msgstr "游標欄"
 
-#: ../widgets/misc/e-selection-model.c:214
+#: ../widgets/misc/e-selection-model.c:210
 msgid "Sorter"
 msgstr "分類器"
 
-#: ../widgets/misc/e-selection-model.c:221
+#: ../widgets/misc/e-selection-model.c:217
 msgid "Selection Mode"
 msgstr "選擇區模式"
 
-#: ../widgets/misc/e-selection-model.c:229
+#: ../widgets/misc/e-selection-model.c:225
 msgid "Cursor Mode"
 msgstr "游標模式"
 
@@ -21234,14 +22151,14 @@ msgid "_When opened:"
 msgstr "當開啟時(_W):"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects")
-#: ../widgets/misc/e-task-widget.c:209
+#: ../widgets/misc/e-task-widget.c:297
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
 #. For Translator only: %s is status message that is displayed (eg "moving items", "updating objects");
 #. %d is a number between 0 and 100, describing the percentage of operation complete
-#: ../widgets/misc/e-task-widget.c:215
+#: ../widgets/misc/e-task-widget.c:303
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
@@ -21266,178 +22183,168 @@ msgstr "可用的分類(_A):"
 msgid "categories"
 msgstr "分類"
 
-#: ../widgets/table/e-cell-combo.c:177
+#: ../widgets/table/e-cell-combo.c:169
 msgid "popup list"
 msgstr "彈出式清單"
 
-#: ../widgets/table/e-cell-date.c:64
+#: ../widgets/table/e-cell-date.c:62
 msgid "%l:%M %p"
 msgstr "%p %l:%M"
 
-#: ../widgets/table/e-cell-pixbuf.c:398
+#: ../widgets/table/e-cell-pixbuf.c:360
 msgid "Selected Column"
 msgstr "選擇的欄"
 
-#: ../widgets/table/e-cell-pixbuf.c:405
+#: ../widgets/table/e-cell-pixbuf.c:367
 msgid "Focused Column"
 msgstr "聚焦的欄"
 
-#: ../widgets/table/e-cell-pixbuf.c:412
+#: ../widgets/table/e-cell-pixbuf.c:374
 msgid "Unselected Column"
 msgstr "未選擇的欄"
 
-#: ../widgets/table/e-cell-text.c:1805
+#: ../widgets/table/e-cell-text.c:1807
 msgid "Strikeout Column"
 msgstr "刪除線欄"
 
-#: ../widgets/table/e-cell-text.c:1812
+#: ../widgets/table/e-cell-text.c:1814
 msgid "Underline Column"
 msgstr "底線欄"
 
-#: ../widgets/table/e-cell-text.c:1819
+#: ../widgets/table/e-cell-text.c:1821
 msgid "Bold Column"
 msgstr "粗體欄"
 
-#: ../widgets/table/e-cell-text.c:1826
+#: ../widgets/table/e-cell-text.c:1828
 msgid "Color Column"
 msgstr "色彩欄"
 
-#: ../widgets/table/e-cell-text.c:1840
+#: ../widgets/table/e-cell-text.c:1842
 msgid "BG Color Column"
 msgstr "背景色彩欄"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:1
-msgid "<- _Remove"
-msgstr "<-移除(_R)"
+#: ../widgets/table/e-table-config.c:152
+msgid "State"
+msgstr "狀態"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Ascending)"
+msgstr "(遞增)"
+
+#: ../widgets/table/e-table-config.c:385 ../widgets/table/e-table-config.c:427
+msgid "(Descending)"
+msgstr "(遞減)"
+
+#: ../widgets/table/e-table-config.c:392
+msgid "Not sorted"
+msgstr "未排序"
+
+#: ../widgets/table/e-table-config.c:433
+msgid "No grouping"
+msgstr "未組成群組"
+
+#: ../widgets/table/e-table-config.c:643
+#: ../widgets/table/e-table-config.glade.h:11
+msgid "Show Fields"
+msgstr "顯示欄位"
+
+#: ../widgets/table/e-table-config.c:664
+msgid "Available Fields"
+msgstr "可用的欄位"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
 msgstr "可用的欄位(_V):"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:3
 #: ../widgets/table/e-table-config.glade.h:2
-#: ../widgets/table/e-table-header-item.c:1575
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Ascending"
 msgstr "遞增"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:4
 #: ../widgets/table/e-table-config.glade.h:3
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:5
 #: ../widgets/table/e-table-config.glade.h:4
-#: ../widgets/table/e-table-header-item.c:1575
+msgid "Clear _All"
+msgstr "全部清除(_A)"
+
+#: ../widgets/table/e-table-config.glade.h:5
+#: ../widgets/table/e-table-header-item.c:1582
 msgid "Descending"
 msgstr "遞減"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:8
-#: ../widgets/table/e-table-config.glade.h:7
+#: ../widgets/table/e-table-config.glade.h:8
 msgid "Group Items By"
 msgstr "將項目組成群組，依"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:9
-#: ../widgets/table/e-table-config.glade.h:8
+#: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Down"
 msgstr "下移(_D)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:10
-#: ../widgets/table/e-table-config.glade.h:9
+#: ../widgets/table/e-table-config.glade.h:10
 msgid "Move _Up"
 msgstr "上移(_U)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:11
-msgid "Sh_ow these fields in order:"
-msgstr "依序顯示這些欄位(_O):"
+#: ../widgets/table/e-table-config.glade.h:12
+msgid "Show _field in View"
+msgstr "顯示檢視中的欄位(_F)"
 
-#: ../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 "顯示欄位"
+#: ../widgets/table/e-table-config.glade.h:13
+msgid "Show field i_n View"
+msgstr "顯示檢視中的欄位(_N)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:13
-#: ../widgets/table/e-table-config.glade.h:11
-msgid "Show field in View"
-msgstr "顯示檢視中的欄位"
+#: ../widgets/table/e-table-config.glade.h:14
+msgid "Show field in _View"
+msgstr "顯示檢視中的欄位(_V)"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:14
-#: ../widgets/table/e-table-config.glade.h:12
+#: ../widgets/table/e-table-config.glade.h:15
 msgid "Sort"
 msgstr "排序"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:15
-#: ../widgets/table/e-table-config.glade.h:13
+#: ../widgets/table/e-table-config.glade.h:16
 msgid "Sort Items By"
 msgstr "排序項目依"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:16
-#: ../widgets/table/e-table-config.glade.h:14
+#: ../widgets/table/e-table-config.glade.h:17
 msgid "Then By"
 msgstr "接著依"
 
-#: ../widgets/table/e-table-config-no-group.glade.h:17
-msgid "_Add ->"
-msgstr "加入(_A)->"
-
-#: ../widgets/table/e-table-config-no-group.glade.h:18
-#: ../widgets/table/e-table-config.glade.h:16
+#: ../widgets/table/e-table-config.glade.h:19
 msgid "_Fields Shown..."
 msgstr "欄位顯示(_F)..."
 
-#: ../widgets/table/e-table-config-no-group.glade.h:19
 #: ../widgets/table/e-table-config.glade.h:20
-msgid "_Sort..."
-msgstr "排序(_S)..."
-
-#: ../widgets/table/e-table-config.c:150
-msgid "State"
-msgstr "狀態"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Ascending)"
-msgstr "(遞增)"
-
-#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
-msgid "(Descending)"
-msgstr "(遞減)"
-
-#: ../widgets/table/e-table-config.c:314
-msgid "Not sorted"
-msgstr "未排序"
-
-#: ../widgets/table/e-table-config.c:355
-msgid "No grouping"
-msgstr "未組成群組"
-
-#: ../widgets/table/e-table-config.c:584
-msgid "Available Fields"
-msgstr "可用的欄位"
-
-#: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
 msgstr "群組依(_G)..."
 
-#: ../widgets/table/e-table-config.glade.h:19
+#: ../widgets/table/e-table-config.glade.h:22
+msgid "_Show field in View"
+msgstr "顯示檢視中的欄位(_S)"
+
+#: ../widgets/table/e-table-config.glade.h:23
 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:637
-#: ../widgets/table/e-table-field-chooser.c:77
-#: ../widgets/table/e-table-header-item.c:1874
+#: ../widgets/table/e-table-config.glade.h:24
+msgid "_Sort..."
+msgstr "排序(_S)..."
+
+#: ../widgets/table/e-table-field-chooser-dialog.c:67
+#: ../widgets/table/e-table-field-chooser-item.c:634
+#: ../widgets/table/e-table-field-chooser.c:67
+#: ../widgets/table/e-table-header-item.c:1886
 msgid "DnD code"
 msgstr "DnD 碼"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:84
-#: ../widgets/table/e-table-field-chooser-item.c:644
-#: ../widgets/table/e-table-field-chooser.c:84
-#: ../widgets/table/e-table-header-item.c:1888
+#: ../widgets/table/e-table-field-chooser-dialog.c:74
+#: ../widgets/table/e-table-field-chooser-item.c:641
+#: ../widgets/table/e-table-field-chooser.c:74
+#: ../widgets/table/e-table-header-item.c:1900
 msgid "Full Header"
 msgstr "完整檔頭"
 
-#: ../widgets/table/e-table-field-chooser-dialog.c:126
+#: ../widgets/table/e-table-field-chooser-dialog.c:116
 msgid "Add a column..."
 msgstr "加入一欄..."
 
@@ -21467,315 +22374,812 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
 msgstr[1] "%s (%d 個項目)"
 
+#: ../widgets/table/e-table-group-container.c:896
 #: ../widgets/table/e-table-group-container.c:897
-#: ../widgets/table/e-table-group-container.c:898
+#: ../widgets/table/e-table-group-leaf.c:572
 #: ../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:3020 ../widgets/table/e-table-item.c:3021
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
+#: ../widgets/table/e-table-group-container.c:903
 #: ../widgets/table/e-table-group-container.c:904
-#: ../widgets/table/e-table-group-container.c:905
+#: ../widgets/table/e-table-group-leaf.c:579
 #: ../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:3265 ../widgets/table/e-tree.c:3266
+#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-tree.c:3309 ../widgets/table/e-tree.c:3310
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
+#: ../widgets/table/e-table-group-container.c:910
 #: ../widgets/table/e-table-group-container.c:911
-#: ../widgets/table/e-table-group-container.c:912
+#: ../widgets/table/e-table-group-leaf.c:586
 #: ../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:3271 ../widgets/table/e-tree.c:3272
+#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-tree.c:3315 ../widgets/table/e-tree.c:3316
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
+#: ../widgets/table/e-table-group-container.c:917
 #: ../widgets/table/e-table-group-container.c:918
-#: ../widgets/table/e-table-group-container.c:919
+#: ../widgets/table/e-table-group-leaf.c:593
 #: ../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:3277 ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-tree.c:3321 ../widgets/table/e-tree.c:3322
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
+#: ../widgets/table/e-table-group-container.c:924
 #: ../widgets/table/e-table-group-container.c:925
-#: ../widgets/table/e-table-group-container.c:926
+#: ../widgets/table/e-table-group-leaf.c:600
 #: ../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:3048 ../widgets/table/e-table-item.c:3049
 msgid "Cursor mode"
 msgstr "游標模式"
 
+#: ../widgets/table/e-table-group-container.c:931
 #: ../widgets/table/e-table-group-container.c:932
-#: ../widgets/table/e-table-group-container.c:933
+#: ../widgets/table/e-table-group-leaf.c:614
 #: ../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:3013 ../widgets/table/e-table-item.c:3014
 msgid "Selection model"
 msgstr "選擇區模型"
 
+#: ../widgets/table/e-table-group-container.c:938
 #: ../widgets/table/e-table-group-container.c:939
-#: ../widgets/table/e-table-group-container.c:940
+#: ../widgets/table/e-table-group-leaf.c:607
 #: ../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:3309 ../widgets/table/e-tree.c:3259
-#: ../widgets/table/e-tree.c:3260
+#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table.c:3307 ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-tree.c:3304
 msgid "Length Threshold"
 msgstr "界限長度"
 
+#: ../widgets/table/e-table-group-container.c:945
 #: ../widgets/table/e-table-group-container.c:946
-#: ../widgets/table/e-table-group-container.c:947
+#: ../widgets/table/e-table-group-leaf.c:649
 #: ../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:3316 ../widgets/table/e-tree.c:3291
-#: ../widgets/table/e-tree.c:3292
+#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table.c:3314 ../widgets/table/e-tree.c:3335
+#: ../widgets/table/e-tree.c:3336
 msgid "Uniform row height"
 msgstr "標準列高"
 
+#: ../widgets/table/e-table-group-container.c:952
 #: ../widgets/table/e-table-group-container.c:953
-#: ../widgets/table/e-table-group-container.c:954
+#: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-group-leaf.c:644
 msgid "Frozen"
 msgstr "凍結"
 
-#: ../widgets/table/e-table-header-item.c:1453
+#: ../widgets/table/e-table-header-item.c:1452
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
 
+#: ../widgets/table/e-table-header-item.c:1472
+msgid "Sort _Ascending"
+msgstr "遞增排序(_A)"
+
 #: ../widgets/table/e-table-header-item.c:1473
-msgid "Sort Ascending"
-msgstr "遞增排序"
+msgid "Sort _Descending"
+msgstr "遞減排序(_D)"
 
 #: ../widgets/table/e-table-header-item.c:1474
-msgid "Sort Descending"
-msgstr "遞減排序"
+msgid "_Unsort"
+msgstr "不排序(_U)"
 
-#: ../widgets/table/e-table-header-item.c:1475
-msgid "Unsort"
-msgstr "不排序"
+#: ../widgets/table/e-table-header-item.c:1476
+msgid "Group By This _Field"
+msgstr "依此欄位做群組(_F)"
 
 #: ../widgets/table/e-table-header-item.c:1477
-msgid "Group By This Field"
-msgstr "依此欄位做群組"
+msgid "Group By _Box"
+msgstr "依方塊為群組(_B)"
 
-#: ../widgets/table/e-table-header-item.c:1478
-msgid "Group By Box"
-msgstr "依方塊為群組"
+#: ../widgets/table/e-table-header-item.c:1479
+msgid "Remove This _Column"
+msgstr "移除此欄(_C)"
 
 #: ../widgets/table/e-table-header-item.c:1480
-msgid "Remove This Column"
-msgstr "移除此欄"
+msgid "Add a C_olumn..."
+msgstr "加入一欄(_O)..."
 
-#: ../widgets/table/e-table-header-item.c:1481
-msgid "Add a Column..."
-msgstr "加入一欄..."
+#: ../widgets/table/e-table-header-item.c:1482
+msgid "A_lignment"
+msgstr "排列(_L)"
 
 #: ../widgets/table/e-table-header-item.c:1483
-msgid "Alignment"
-msgstr "排列"
+msgid "B_est Fit"
+msgstr "最適填滿(_E)"
 
 #: ../widgets/table/e-table-header-item.c:1484
-msgid "Best Fit"
-msgstr "最適填滿"
+msgid "Format Column_s..."
+msgstr "格式化欄(_S)..."
 
-#: ../widgets/table/e-table-header-item.c:1485
-msgid "Format Columns..."
-msgstr "格式欄..."
+#: ../widgets/table/e-table-header-item.c:1486
+msgid "Custo_mize Current View..."
+msgstr "自訂目前的檢視(_M)..."
 
-#: ../widgets/table/e-table-header-item.c:1487
-msgid "Customize Current View..."
-msgstr "自訂目前的檢視..."
+#: ../widgets/table/e-table-header-item.c:1542
+msgid "_Sort By"
+msgstr "排序依(_S)"
 
-#: ../widgets/table/e-table-header-item.c:1536
-msgid "Sort By"
-msgstr "排序依"
+#. Custom
+#: ../widgets/table/e-table-header-item.c:1560
+msgid "_Custom"
+msgstr "自訂(_C)"
 
-#: ../widgets/table/e-table-header-item.c:1881
+#: ../widgets/table/e-table-header-item.c:1893
 msgid "Font Description"
 msgstr "字型描述"
 
-#: ../widgets/table/e-table-header-item.c:1902
-#: ../widgets/table/e-table-sorter.c:175
+#: ../widgets/table/e-table-header-item.c:1914
+#: ../widgets/table/e-table-sorter.c:173
 msgid "Sort Info"
 msgstr "排序資訊"
 
-#: ../widgets/table/e-table-header-item.c:1916
-#: ../widgets/table/e-tree-scrolled.c:221
-#: ../widgets/table/e-tree-scrolled.c:222
+#: ../widgets/table/e-table-header-item.c:1928
+#: ../widgets/table/e-tree-scrolled.c:225
+#: ../widgets/table/e-tree-scrolled.c:226
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3298
-#: ../widgets/table/e-tree.c:3299
+#: ../widgets/table/e-table.c:3321 ../widgets/table/e-tree.c:3342
+#: ../widgets/table/e-tree.c:3343
 msgid "Always search"
 msgstr "總是搜尋"
 
-#: ../widgets/table/e-table.c:3330
+#: ../widgets/table/e-table.c:3328
 msgid "Use click to add"
 msgstr "請按這裡加入"
 
-#: ../widgets/table/e-tree.c:3284 ../widgets/table/e-tree.c:3285
+#: ../widgets/table/e-tree.c:3328 ../widgets/table/e-tree.c:3329
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
-#: ../widgets/table/e-tree.c:3305
+#: ../widgets/table/e-tree.c:3349
 msgid "Retro Look"
 msgstr "懷舊外觀"
 
-#: ../widgets/table/e-tree.c:3306
+#: ../widgets/table/e-tree.c:3350
 msgid "Draw lines and +/- expanders."
 msgstr "繪出線條與 +/- 展開符號。"
 
-#: ../widgets/text/e-entry-test.c:49
-msgid "Minicard Test"
-msgstr "迷你名片測試"
-
-#: ../widgets/text/e-entry-test.c:50
-msgid "Copyright (C) 2000, Helix Code, Inc."
-msgstr "Copyright (C) 2000, Helix Code, Inc."
-
-#: ../widgets/text/e-entry-test.c:52
-msgid "This should test the minicard canvas item"
-msgstr "這可以測試迷你名片畫布項目"
+#: ../widgets/text/e-text.c:2734
+msgid "Input Methods"
+msgstr "輸入法"
 
-#: ../widgets/text/e-entry.c:1216 ../widgets/text/e-entry.c:1217
-#: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
+#: ../widgets/text/e-text.c:3557 ../widgets/text/e-text.c:3558
 msgid "Event Processor"
 msgstr "事件處理器"
 
-#: ../widgets/text/e-entry.c:1230 ../widgets/text/e-entry.c:1231
-#: ../widgets/text/e-text.c:3532 ../widgets/text/e-text.c:3533
+#: ../widgets/text/e-text.c:3571 ../widgets/text/e-text.c:3572
+msgid "Bold"
+msgstr "粗體"
+
+#: ../widgets/text/e-text.c:3578 ../widgets/text/e-text.c:3579
+msgid "Strikeout"
+msgstr "刪除線"
+
+#: ../widgets/text/e-text.c:3585 ../widgets/text/e-text.c:3586
+msgid "Anchor"
+msgstr "錨點"
+
+#: ../widgets/text/e-text.c:3593 ../widgets/text/e-text.c:3594
 msgid "Justification"
 msgstr "左右對齊"
 
-#: ../widgets/text/e-entry.c:1272 ../widgets/text/e-entry.c:1273
-#: ../widgets/text/e-text.c:3632 ../widgets/text/e-text.c:3633
+#: ../widgets/text/e-text.c:3600 ../widgets/text/e-text.c:3601
+msgid "Clip Width"
+msgstr "剪輯寬度"
+
+#: ../widgets/text/e-text.c:3607 ../widgets/text/e-text.c:3608
+msgid "Clip Height"
+msgstr "剪輯高度"
+
+#: ../widgets/text/e-text.c:3614 ../widgets/text/e-text.c:3615
+msgid "Clip"
+msgstr "剪輯"
+
+#: ../widgets/text/e-text.c:3621 ../widgets/text/e-text.c:3622
+msgid "Fill clip rectangle"
+msgstr "填滿剪輯方塊"
+
+#: ../widgets/text/e-text.c:3628 ../widgets/text/e-text.c:3629
+msgid "X Offset"
+msgstr "X 位移"
+
+#: ../widgets/text/e-text.c:3635 ../widgets/text/e-text.c:3636
+msgid "Y Offset"
+msgstr "Y 位移"
+
+#: ../widgets/text/e-text.c:3671 ../widgets/text/e-text.c:3672
+msgid "Text width"
+msgstr "文字寬度"
+
+#: ../widgets/text/e-text.c:3678 ../widgets/text/e-text.c:3679
+msgid "Text height"
+msgstr "文字高度"
+
+#: ../widgets/text/e-text.c:3693 ../widgets/text/e-text.c:3694
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
-#: ../widgets/text/e-entry.c:1279 ../widgets/text/e-entry.c:1280
-#: ../widgets/text/e-text.c:3639 ../widgets/text/e-text.c:3640
+#: ../widgets/text/e-text.c:3700 ../widgets/text/e-text.c:3701
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-entry.c:1286 ../widgets/text/e-entry.c:1287
-#: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
+#: ../widgets/text/e-text.c:3707 ../widgets/text/e-text.c:3708
 msgid "Line wrap"
 msgstr "換行"
 
-#: ../widgets/text/e-entry.c:1293 ../widgets/text/e-entry.c:1294
-#: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
+#: ../widgets/text/e-text.c:3714 ../widgets/text/e-text.c:3715
 msgid "Break characters"
 msgstr "中斷字元"
 
-#: ../widgets/text/e-entry.c:1300 ../widgets/text/e-entry.c:1301
-#: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
+#: ../widgets/text/e-text.c:3721 ../widgets/text/e-text.c:3722
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-entry.c:1307 ../widgets/text/e-entry.c:1308
-#: ../widgets/text/e-text.c:3689 ../widgets/text/e-text.c:3690
-msgid "Allow newlines"
-msgstr "允許新行"
-
-#: ../widgets/text/e-entry.c:1314 ../widgets/text/e-entry.c:1315
-#: ../widgets/text/e-text.c:3682 ../widgets/text/e-text.c:3683
+#: ../widgets/text/e-text.c:3743 ../widgets/text/e-text.c:3744
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-entry.c:1321 ../widgets/text/e-entry.c:1322
-#: ../widgets/text/e-text.c:3696 ../widgets/text/e-text.c:3697
+#: ../widgets/text/e-text.c:3750 ../widgets/text/e-text.c:3751
+msgid "Allow newlines"
+msgstr "允許新行"
+
+#: ../widgets/text/e-text.c:3757 ../widgets/text/e-text.c:3758
 msgid "Draw background"
 msgstr "繪製背景"
 
-#: ../widgets/text/e-entry.c:1328 ../widgets/text/e-entry.c:1329
-#: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
+#: ../widgets/text/e-text.c:3764 ../widgets/text/e-text.c:3765
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-entry.c:1335 ../widgets/text/e-entry.c:1336
-#: ../widgets/text/e-text.c:3710 ../widgets/text/e-text.c:3711
+#: ../widgets/text/e-text.c:3771 ../widgets/text/e-text.c:3772
 msgid "Cursor position"
 msgstr "游標位置"
 
-#: ../widgets/text/e-entry.c:1342 ../widgets/text/e-entry.c:1343
-msgid "Emulate label resize"
-msgstr "模擬標籤縮放"
+#: ../widgets/text/e-text.c:3778 ../widgets/text/e-text.c:3779
+msgid "IM Context"
+msgstr "IM 快顯視窗"
 
-#: ../widgets/text/e-text.c:2739
-msgid "Input Methods"
-msgstr "輸入法"
+#: ../widgets/text/e-text.c:3785 ../widgets/text/e-text.c:3786
+msgid "Handle Popup"
+msgstr "處理彈出式項目"
 
-#: ../widgets/text/e-text.c:3510 ../widgets/text/e-text.c:3511
-msgid "Bold"
-msgstr "粗體"
+#~ msgid "A Folder with this name already exists"
+#~ msgstr "以此為名的資料夾已存在"
 
-#: ../widgets/text/e-text.c:3517 ../widgets/text/e-text.c:3518
-msgid "Strikeout"
-msgstr "刪除線"
+#~ msgid "_Address: "
+#~ msgstr "地址(_A):"
 
-#: ../widgets/text/e-text.c:3524 ../widgets/text/e-text.c:3525
-msgid "Anchor"
-msgstr "錨點"
+#~ msgid "_Categories..."
+#~ msgstr "分類(_C)..."
 
-#: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
-msgid "Clip Width"
-msgstr "剪輯寬度"
+#~ msgid "\n"
+#~ msgstr "\n"
 
-#: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
-msgid "Clip Height"
-msgstr "剪輯高度"
+#~ msgid "Add an email to the List"
+#~ msgstr "新增電子郵件到清單"
 
-#: ../widgets/text/e-text.c:3553 ../widgets/text/e-text.c:3554
-msgid "Clip"
-msgstr "剪輯"
+#~ msgid "Insert email addresses from Address Book"
+#~ msgstr "從通訊錄插入電子郵件位址"
 
-#: ../widgets/text/e-text.c:3560 ../widgets/text/e-text.c:3561
-msgid "Fill clip rectangle"
-msgstr "填滿剪輯方塊"
+#~ msgid "Members"
+#~ msgstr "會員"
 
-#: ../widgets/text/e-text.c:3567 ../widgets/text/e-text.c:3568
-msgid "X Offset"
-msgstr "X 位移"
+#~ msgid "Remove an email address from the List"
+#~ msgstr "從清單移除電子郵件地址"
 
-#: ../widgets/text/e-text.c:3574 ../widgets/text/e-text.c:3575
-msgid "Y Offset"
-msgstr "Y 位移"
+#~ msgid "_Select"
+#~ msgstr "選取(_S)"
 
-#: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
-msgid "Text width"
-msgstr "文字寬度"
+#~ msgid ""
+#~ "The changed email or name of this contact already\n"
+#~ "exists in this folder.  Would you like to add it anyway?"
+#~ msgstr ""
+#~ "此連絡人中改變後的電子郵件或名稱已經\n"
+#~ "存在於此資料夾。您無論如何都要新增它嗎？"
 
-#: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
-msgid "Text height"
-msgstr "文字高度"
+#~ msgid "Print cards"
+#~ msgstr "列印名片"
 
-#: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
-msgid "IM Context"
-msgstr "IM 快顯視窗"
+#~ msgid "Organization"
+#~ msgstr "團體"
 
-#: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
-msgid "Handle Popup"
-msgstr "處理彈出式項目"
+#~ msgid "E-mail"
+#~ msgstr "電子郵件"
+
+#~ msgid "GTK Tree View"
+#~ msgstr "GTK 樹狀檢視模式"
+
+# zh_HK: msgstr "打印信封"
+#~ msgid "Print envelope"
+#~ msgstr "列印信封"
+
+# zh_HK: msgstr "打印連絡人"
+#~ msgid "Print contacts"
+#~ msgstr "列印連絡人"
+
+# zh_HK: msgstr "打印連絡人"
+#~ msgid "Print contact"
+#~ msgstr "列印連絡人"
+
+#~ msgid "Error loading default addressbook."
+#~ msgstr "載入預設目錄服務時發生錯誤"
+
+#~ msgid "Input File"
+#~ msgstr "輸入檔案"
+
+#~ msgid ""
+#~ "All information in these journal entries will be deleted and can not be "
+#~ "restored."
+#~ msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
+
+#~ msgid ""
+#~ "All information on this journal entry will be deleted and can not be "
+#~ "restored."
+#~ msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
+
+#~ msgid "Are you sure you want to delete the journal entry '{0}'?"
+#~ msgstr "確定要刪除日誌項目 '{0}'？"
+
+#~ msgid "Are you sure you want to delete these {0} journal entries?"
+#~ msgstr "確定要刪除這 {0} 日誌項目？"
+
+#~ msgid "Are you sure you want to delete this journal entry?"
+#~ msgstr "確定要刪除此日誌項目？"
+
+#~ msgid ""
+#~ "If you do not send a cancelation notice, the other participants may not "
+#~ "know the journal has been deleted."
+#~ msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
+
+#~ msgid "Add Calendar"
+#~ msgstr "新增行事曆"
+
+#~ msgid "Add Task List"
+#~ msgstr "新增工作清單"
+
+#~ msgid "_Add Calendar"
+#~ msgstr "加入行事曆(_A)"
+
+#~ msgid "_Add Task List"
+#~ msgstr "新增工作清單(_A)"
+
+#~ msgid "This journal entry has been deleted."
+#~ msgstr "這個日誌項目已刪除。"
+
+#~ msgid "This journal entry has been changed."
+#~ msgstr "這個日誌項目已變更。"
+
+#~ msgid "Journal entry - %s"
+#~ msgstr "日誌項目 - %s"
+
+#~ msgid "The journal entry could not be deleted due to a corba error"
+#~ msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+
+#~ msgid "The journal entry could not be deleted because permission was denied"
+#~ msgstr "因為許可權被拒絕，所以無法刪除日誌項目。"
+
+#~ msgid "The journal entry could not be deleted due to an error"
+#~ msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
+
+#~ msgid "Add New Calendar"
+#~ msgstr "新增行事曆"
+
+#~ msgid "Calendar Group"
+#~ msgstr "行事曆群組"
+
+#~ msgid "Calendar Location"
+#~ msgstr "行事曆位置"
+
+#~ msgid "Calendar Name"
+#~ msgstr "行事曆名稱"
+
+#~ msgid "<b>Task List Options</b>"
+#~ msgstr "<b>工作清單選項</b>"
+
+#~ msgid "Add New Task List"
+#~ msgstr "新增工作清單"
+
+#~ msgid "Task List Group"
+#~ msgstr "工作清單群組"
+
+#~ msgid "Task List Name"
+#~ msgstr "工作清單名稱"
+
+#~ msgid ""
+#~ "You are modifying a recurring journal entry. What would you like to "
+#~ "modify?"
+#~ msgstr "您正在修改週期性日誌項目。您想要修改什麼？"
+
+#~ msgid "Or_ganiser:"
+#~ msgstr "召集人(_G):"
+
+#~ msgid "<b>Free/Busy C_alendars</b>"
+#~ msgstr "<b>空閒/忙碌行事曆(_A)</b>"
+
+#~ msgid "<b>Publishing Frequency</b>"
+#~ msgstr "<b>發佈頻率</b>"
+
+#~ msgid "<b>Publishing _Location</b>"
+#~ msgstr "<b>發佈位置(_L)</b>"
+
+#~ msgid "Free/Busy Publishing Settings"
+#~ msgstr "空閒/忙碌發佈設定"
+
+#~ msgid "_Daily"
+#~ msgstr "每天(_D)"
+
+#~ msgid "_Manual"
+#~ msgstr "手動(_M)"
+
+#~ msgid "_Weekly"
+#~ msgstr "每週(_W)"
+
+#~ msgid "Task sort"
+#~ msgstr "工作排序"
+
+#~ msgid "Memo sort"
+#~ msgstr "備忘錄排序"
+
+#~ msgid "Enter the password for %s"
+#~ msgstr "輸入 %s 的密碼"
+
+#~ msgid "Journal information"
+#~ msgstr "日誌資訊"
+
+#~ msgid "Selected day (%a %b %d %Y)"
+#~ msgstr "選擇的日期(%Y 年 %-m 月 %-d 日 (%a))"
+
+#~ msgid "%a %b %d"
+#~ msgstr "%-m 月 %-d 日 (%a)"
+
+#~ msgid "%a %d %Y"
+#~ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
+
+#~ msgid "%a %b %d %Y"
+#~ msgstr "%Y 年 %-m 月 %-d 日 (%a)"
+
+#~ msgid "Selected week (%s - %s)"
+#~ msgstr "選定的週(%s - %s)"
+
+#~ msgid "Selected month (%b %Y)"
+#~ msgstr "選定的月份(%Y 年 %-m 月)"
+
+#~ msgid "Selected year (%Y)"
+#~ msgstr "選定的年份(%Y)"
+
+# zh_HK: msgstr "打印項目"
+#~ msgid "Print Item"
+#~ msgstr "列印項目"
+
+#~ msgid "SMTWTFS"
+#~ msgstr "日一二三四五六"
+
+#~ msgid "%.0fK"
+#~ msgstr "%.0fK"
+
+#~ msgid "%.0fM"
+#~ msgstr "%.0fM"
+
+#~ msgid "%.0fG"
+#~ msgstr "%.0fG"
+
+#~ msgid "Post To:"
+#~ msgstr "張貼到:"
+
+#~ msgid "The Evolution PIM and Email Client"
+#~ msgstr "Evolution PIM 與郵件客戶端"
+
+#~ msgid "No, Do not Change Status"
+#~ msgstr "否，請不要變更狀態"
+
+#~ msgid "<b>Receiving Email</b>"
+#~ msgstr "<b>正在接收電子郵件</b>"
+
+#~ msgid "<b>Sending Email:</b>"
+#~ msgstr "<b>正在傳送電子郵件:</b>"
+
+#~ msgid ""
+#~ "<small>This page allows you to choose if you want to be notified via a "
+#~ "read receipt when a message you\n"
+#~ "sent is read, and to specify what Evolution should do when someone "
+#~ "requests a receipt from you.</small>"
+#~ msgstr ""
+#~ "<small>此頁面可以讓您選擇，當別人閱讀您的郵件後，是否傳送讀信回條，\n"
+#~ "以及指定當某人要求您傳送回條時，Evolution 要做什麼。</small>"
+
+#~ msgid "Ask me if I want to send back a read receipt"
+#~ msgstr "詢問我是否要傳送讀信回條"
+
+#~ msgid "Never send back a read receipt"
+#~ msgstr "永遠不傳送讀信回條"
+
+#~ msgid "Read Receipts"
+#~ msgstr "讀信回條"
+
+#~ msgid "Request a read receipt for all messages I send"
+#~ msgstr "要求所有我傳送的郵件都索取讀信回條"
+
+#~ msgid ""
+#~ "Unless the message is sent to a mailing list, and not to me personally"
+#~ msgstr "除非郵件傳送至郵寄清單，而不是給我個人"
+
+#~ msgid ""
+#~ "When you receive an email with a read receipt request, what should "
+#~ "Evolution do?"
+#~ msgstr "當您收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "系統匣的方向。"
+
+#~ msgid "_Search name:"
+#~ msgstr "搜尋名稱(_S):"
+
+#~ msgid "Disable"
+#~ msgstr "停用"
+
+#~ msgid "Enable"
+#~ msgstr "啟用"
+
+#~ msgid "<b>Then</b>"
+#~ msgstr "<b>然後</b>"
+
+#~ msgid "Valid signature, cannot verify sender"
+#~ msgstr "簽名有效，但無法檢驗寄件者"
+
+#~ msgid "Automatic smiley recognition"
+#~ msgstr "自動辨認笑臉符號"
+
+#~ msgid "New Mail Notify sound file"
+#~ msgstr "新郵件通知聲音檔案"
+
+#~ msgid "New Mail Notify type"
+#~ msgstr "新郵件通知類型"
+
+#~ msgid "Specifies the type of New Mail Notification the user wishes to use."
+#~ msgstr "指定使用者要使用的「新郵件通知」類型。"
+
+#~ msgid "Priority Filter \"%s\""
+#~ msgstr "優先順序過濾器「%s」"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters are based on\n"
+#~ "email priorities, which are not used in Evolution.\n"
+#~ "Instead, Evolution provides scores in the range of\n"
+#~ "-3 to 3 that can be assigned to emails and filtered\n"
+#~ "accordingly.\n"
+#~ "\n"
+#~ "As a workaround, a set of filters called \"Priority Filter\"\n"
+#~ "was added that converts Netscape's email priorities into\n"
+#~ "Evolution's scores, and the affected filters use scores instead\n"
+#~ "of priorities. Check the imported filters to make sure\n"
+#~ "everything still works as intended."
+#~ msgstr ""
+#~ "有些 Netscape 郵件過濾器是以電子郵件的優先權\n"
+#~ "為基礎的，而在 Evolution 中則沒有這種用法。\n"
+#~ "Evolution 的替代方式是提供範圍從 -3 到 3 的點數\n"
+#~ "給電子郵件，並且根據此數值來過濾。\n"
+#~ "\n"
+#~ "\n"
+#~ "目前的解決方案是加入一組名為「優先順序過濾器」\n"
+#~ "的過濾器來將 Netscape 的電子郵件優先權轉換為\n"
+#~ "Evolution 的點數，而受影響的過濾器會使用點數來\n"
+#~ "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
+#~ "照您想要的方式運作。"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters use\n"
+#~ "the \"Ignore Thread\" or \"Watch Thread\"\n"
+#~ "feature, which is not supported in Evolution.\n"
+#~ "These filters will be dropped."
+#~ msgstr ""
+#~ "有些 Netscape 郵件過濾器使用\n"
+#~ "「忽略對話」或「監看對話」的\n"
+#~ "功能，而 Evolution 並不支援它。\n"
+#~ "這些過濾器則會被丟棄。"
+
+#~ msgid ""
+#~ "Some of your Netscape email filters test the\n"
+#~ "body of emails for (in)equality to a given string,\n"
+#~ "which is not supported in Evolution. Those filters\n"
+#~ "were modified to test whether that string is or is not\n"
+#~ "contained in the message body."
+#~ msgstr ""
+#~ "有些 Netscape 郵件過濾器可以測試\n"
+#~ "電子郵件的內文是否與所給的字串相等，\n"
+#~ "Evolution 不支援此功能。那些過濾器\n"
+#~ "會被修改成測試郵件的內文是否包含\n"
+#~ "該字串。"
+
+#~ msgid "Evolution is importing your old Netscape data"
+#~ msgstr "Evolution 正在匯入舊有的 Netscape 資料"
+
+#~ msgid "Importing Netscape data"
+#~ msgstr "輸入 Netscape 資料"
+
+#~ msgid "Settings"
+#~ msgstr "設定值"
+
+#~ msgid "Mail Filters"
+#~ msgstr "郵件規則"
+
+#~ msgid ""
+#~ "Evolution has found Netscape mail files.\n"
+#~ "Would you like them to be imported into Evolution?"
+#~ msgstr ""
+#~ "Evolution 找到 Netscape 格式的郵件。\n"
+#~ "是否將它們匯入至 Evolution？"
+
+#~ msgid "<span weight=\"bold\">Filter Options</span>"
+#~ msgstr "<span weight=\"bold\">過濾器選項</span>"
+
+#~ msgid "<span weight=\"bold\">Labels and Colors</span>"
+#~ msgstr "<span weight=\"bold\">標籤和色彩</span>"
+
+#~ msgid "<span weight=\"bold\">New Mail Notification</span>"
+#~ msgstr "<span weight=\"bold\">新郵件通知</span>"
+
+#~ msgid "Beep w_hen new mail arrives"
+#~ msgstr "當新郵件到達時發出嗶聲(_H)"
+
+#~ msgid "HTML Mail"
+#~ msgstr "HTML 郵件"
+
+#~ msgid "Se_lect..."
+#~ msgstr "選取(_L)..."
+
+#~ msgid "_Do not notify me when new mail arrives"
+#~ msgstr "當新郵件到達時不要通知我(_D)"
+
+#~ msgid "Mark as _Read"
+#~ msgstr "標示成已閱讀(_R)"
+
+#~ msgid "_Do not Mark as Read"
+#~ msgstr "不要標示成已閱讀(_D)"
+
+#~ msgid "<b>Junk Mail Settings</b>"
+#~ msgstr "<b>垃圾郵件設定值</b>"
+
+#~ msgid "_Contacts..."
+#~ msgstr "連絡人(_C)..."
+
+#~ msgid "<b>Subject</b> :"
+#~ msgstr "<b>主旨</b>:"
+
+#~ msgid "<b>From</b> :"
+#~ msgstr "<b>寄件者</b>:"
+
+#~ msgid "<b>Recipients </b>"
+#~ msgstr "<b>收件者</b>"
+
+#~ msgid "<b>Action</b>"
+#~ msgstr "<b>動作</b>"
+
+#~ msgid "<b>Date and Time</b>"
+#~ msgstr "<b>日期與時刻</b>"
+
+#~ msgid ""
+#~ "The output directory was not found on iPod! Please ensure that iPod has "
+#~ "been correctly set up and try again."
+#~ msgstr "在 iPod 上找不到輸出的目錄！請確定 iPod 已正確設定後再試一次。"
+
+#~ msgid "Could not export data!"
+#~ msgstr "無法匯出資料！"
+
+#~ msgid "Exporting data failed."
+#~ msgstr "匯出資料失敗。"
+
+#~ msgid "Could not open addressbook!"
+#~ msgstr "無法開啟通訊錄！"
+
+#~ msgid "Could not open the Evolution addressbook to export data."
+#~ msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
+
+#~ msgid "Could not open calendar/todo!"
+#~ msgstr "無法開啟行事曆/工作！"
+
+#~ msgid "Could not open the Evolution calendar/todo list to export data."
+#~ msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
+
+#~ msgid "Unable to find this journal entry in any journal"
+#~ msgstr "無法在任何日誌中找到這個日誌項目"
+
+#~ msgid "System error: %s"
+#~ msgstr "系統錯誤： %s"
+
+#~ msgid "Camel error: %s"
+#~ msgstr "Camel 錯誤： %s"
+
+#~ msgid "Account cannot send e-mail"
+#~ msgstr "帳號不能傳送電子郵件"
+
+#~ msgid "No store available"
+#~ msgstr "沒有可用的儲存空間"
+
+#~ msgid ""
+#~ "A plugin which implements a CORBA interface for accessing mail data "
+#~ "remotely."
+#~ msgstr "實作 CORBA 介面以存取遠端郵件資料的外掛程式。"
+
+#~ msgid "Mail Remote"
+#~ msgstr "遠端郵件"
+
+#~ msgid "New mail notify"
+#~ msgstr "新郵件通知"
+
+#~ msgid "(Untitled)"
+#~ msgstr "(未命名)"
+
+#~ msgid "An attachment to add."
+#~ msgstr "要新增的附件。"
+
+#~ msgid "Content type of the attachment."
+#~ msgstr "附件的內容類型。"
+
+#~ msgid "The filename to display in the mail."
+#~ msgstr "要顯示在郵件的檔案名稱。"
+
+#~ msgid "Description of the attachment."
+#~ msgstr "附件的描述。"
+
+#~ msgid "Mark attachment to be shown inline by default."
+#~ msgstr "將附件標示成預設顯示在行內。"
+
+#~ msgid "_Phone List"
+#~ msgstr "電話清單(_P)"
+
+#~ msgid "_Edit..."
+#~ msgstr "編輯(_E)..."
+
+#~ msgid "MTWTFSS"
+#~ msgstr "一二三四五六日"
+
+#~ msgid "..."
+#~ msgstr "..."
+
+#~ msgid "%H:%M"
+#~ msgstr "%H:%M"
+
+#~ msgid "%I:%M %p"
+#~ msgstr "%I %M:%p"
+
+#~ msgid "<- _Remove"
+#~ msgstr "<-移除(_R)"
+
+#~ msgid "Sh_ow these fields in order:"
+#~ msgstr "依序顯示這些欄位(_O):"
+
+#~ msgid "_Add ->"
+#~ msgstr "加入(_A)->"
+
+#~ msgid "Minicard Test"
+#~ msgstr "迷你名片測試"
+
+#~ msgid "Copyright (C) 2000, Helix Code, Inc."
+#~ msgstr "Copyright (C) 2000, Helix Code, Inc."
+
+#~ msgid "This should test the minicard canvas item"
+#~ msgstr "這可以測試迷你名片畫布項目"
+
+#~ msgid "Emulate label resize"
+#~ msgstr "模擬標籤縮放"
 
 #~ msgid "ebby"
 #~ msgstr "ebby"
@@ -21823,8 +23227,5 @@ msgstr "處理彈出式項目"
 #~ msgid "Filtering Folder"
 #~ msgstr "過濾資料夾"
 
-#~ msgid "ok_button"
-#~ msgstr "確定按鈕(_B)"
-
 #~ msgid " New "
 #~ msgstr " 新增 "
author	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2008-02-05 17:57:49 +0800
committer	Chao-Hsiung Liao <chliao@src.gnome.org>	2008-02-05 17:57:49 +0800
commit	c62d4443013d64bf55397f2618e44bd0bc8d3b73 (patch)
tree	076ec7bc5bbf72f98e6bec6c7fc54af10b1802a5 /po
parent	8591b2dba30cd153a77c78e5c43d1e196ce0dcf6 (diff)
download	gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.gz gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.bz2 gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.lz gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.xz gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.tar.zst gsoc2013-evolution-c62d4443013d64bf55397f2618e44bd0bc8d3b73.zip