Updated Chinese (Hong Kong) translation. Updated Chinese (Taiwan)

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

svn path=/trunk/; revision=32730

3 files changed, 1283 insertions, 6654 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4b1a6da52e..811b8aa355 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-04  Abel Cheung  <abel@oaka.org>
+
+	* zh_HK.po: Updated Chinese (Hong Kong) translation.
+	* zh_TW.po: Updated Chinese (Taiwan) translation.
+
 2006-09-04  Subhransu Behera  <arya_subhransu@yahoo.co.in>
 
 	* or.po: Updated Oriya Translation.
diff --git a/po/zh_HK.po b/po/zh_HK.po
index cae472402f..a762b426f9 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,39 +1,35 @@
-# traditional Chinese translation of Evolution.
-# Copyright (C) 2001, 03, 04, 05 Free Software Foundation, Inc.
+# Chinese (Hong Kong) translation of Evolution.
+# Copyright (C) 2001, 03, 04, 05, 06 Free Software Foundation, Inc.
 # Joe Man <trmetal@yahoo.com.hk>, 2001.
 # Chao-Hsiung Liao <pesder.liao@msa.hinet.net>, 2003.
 # Craig Jeffares <cjeffares@novell.com>,2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
+# Abel Cheung <abelcheung@gmail.com>, 2006.
 #
-#
-#: ../mail/em-format-html-display.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.7.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-12 03:36+0800\n"
-"PO-Revision-Date: 2006-08-12 09:23+0800\n"
+"PO-Revision-Date: 2006-09-04 15:11+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-"Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
+"Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:180
 msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "新聯絡人"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard-view.c:35
 #: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
@@ -43,33 +39,30 @@ msgstr "新增聯絡人清單"
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "目前的通訊錄資料夾 %s 有 %d 張咭片"
+msgstr[0] "目前的通訊錄資料夾 %s 有 %d 張卡片"
+msgstr[1] "目前的通訊錄資料夾 %s 有 %d 張卡片"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "開啟"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "聯絡人清單: "
 
-# ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
 msgstr "聯絡人: "
 
-# ui/evolution.xml.h:17
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
-msgstr "Evolution 迷你咭片"
+msgstr "Evolution 迷你卡片"
 
 #: ../a11y/calendar/ea-cal-view-event.c:264
 msgid "It has alarms."
 msgstr "它具有鬧鈴。"
 
-# calendar/gui/event-editor-dialog.glade.h:13
 #: ../a11y/calendar/ea-cal-view-event.c:267
 msgid "It has recurrences."
 msgstr "它是週期性約會。"
@@ -78,18 +71,15 @@ msgstr "它是週期性約會。"
 msgid "It is a meeting."
 msgstr "這是一項會議。"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../a11y/calendar/ea-cal-view-event.c:276
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "行事曆事件：摘要為 %s。"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../a11y/calendar/ea-cal-view-event.c:278
 msgid "Calendar Event: It has no summary."
 msgstr "行事曆事件：沒有摘要。"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
@@ -98,30 +88,22 @@ msgstr "行事曆檢視事件"
 msgid "Grab Focus"
 msgstr "得到焦點"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "新增約會"
 
-# calendar/gui/e-day-view.c:3148
-# calendar/gui/e-week-view.c:3279
 #: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "新增會議"
 
-# ui/evolution-calendar.xml.h:12
 #: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "移至今日"
 
-# ui/evolution-calendar.xml.h:11
 #: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "移至日期"
@@ -137,8 +119,8 @@ msgstr "用來檢視與選擇時刻範圍的表格"
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] "它具有 %d 個事件。"
-msgstr[1] "它具有 %d 個事件。"
+msgstr[0] "它有 %d 個事件。"
+msgstr[1] "它有 %d 個事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
@@ -146,7 +128,6 @@ msgstr[1] "它具有 %d 個事件。"
 msgid "It has no events."
 msgstr "它沒有事件。"
 
-# ui/evolution-calendar.xml.h:35
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
@@ -155,7 +136,6 @@ msgstr "它沒有事件。"
 msgid "Work Week View: %s. %s"
 msgstr "工作週檢視：%s。%s"
 
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
@@ -164,7 +144,6 @@ msgstr "工作週檢視：%s。%s"
 msgid "Day View: %s. %s"
 msgstr "日檢視：%s。%s"
 
-# data/evolution.keys.in.h:2
 #: ../a11y/calendar/ea-day-view.c:199
 msgid "calendar view for a work week"
 msgstr "工作週的行事曆檢視"
@@ -173,15 +152,11 @@ msgstr "工作週的行事曆檢視"
 msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
-# calendar/gui/print.c:1093
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:704
 msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
-# calendar/gui/e-day-view-top-item.c:278
-# calendar/gui/e-day-view.c:1308
-# calendar/gui/e-week-view-main-item.c:334
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
@@ -195,9 +170,8 @@ msgstr "%A %d %b %Y"
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
-msgstr "%a %d %b"
+msgstr "%-m 月 %-d 日 (%a)"
 
-# calendar/gui/print.c:1093
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
@@ -205,11 +179,8 @@ msgstr "%a %d %b"
 #: ../calendar/gui/calendar-component.c:714
 #: ../calendar/gui/calendar-component.c:716
 msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
-# calendar/gui/e-day-view-top-item.c:274
-# calendar/gui/e-day-view.c:1294
-# calendar/gui/e-week-view-main-item.c:325
 #: ../a11y/calendar/ea-gnome-calendar.c:216
 #: ../a11y/calendar/ea-gnome-calendar.c:222
 #: ../a11y/calendar/ea-gnome-calendar.c:228
@@ -219,11 +190,8 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/calendar-component.c:741
 #: ../calendar/gui/calendar-component.c:743
 msgid "%d %b %Y"
-msgstr "%d %b %Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
-# calendar/gui/e-day-view-top-item.c:282
-# calendar/gui/e-day-view.c:1321
-# calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
@@ -236,22 +204,18 @@ msgstr "%d %b %Y"
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
-msgstr "%d %b"
+msgstr "%-m 月 %-d 日"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../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 行事曆"
 
-# addressbook/gui/component/addressbook-config.c:430
 #: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "搜尋列"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "evolution 行事曆搜尋列"
@@ -260,24 +224,20 @@ msgstr "evolution 行事曆搜尋列"
 msgid "Jump button"
 msgstr "跳躍按鈕"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
 msgstr "按這裏，你可以找到更多事件。"
 
-# ui/evolution-calendar.xml.h:15
 #: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月檢視：%s。%s"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "週檢視：%s。%s"
 
-# data/evolution.keys.in.h:2
 #: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "用於月的行事曆檢視"
@@ -332,7 +292,6 @@ msgstr "折疊 ETree 中包含此儲存格的列"
 msgid "Table Cell"
 msgstr "表格的儲存格"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
 #: ../widgets/table/e-table-click-to-add.c:574
@@ -347,21 +306,16 @@ msgstr "單擊"
 msgid "sort"
 msgstr "排序"
 
-# calendar/gui/e-day-view-top-item.c:274
-# calendar/gui/e-day-view.c:1294
-# calendar/gui/e-week-view-main-item.c:325
 #: ../a11y/widgets/ea-calendar-item.c:296
 #: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
-msgstr "%d %B %Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
-# data/evolution.keys.in.h:2
 #: ../a11y/widgets/ea-calendar-item.c:304
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "行事曆：從 %s 到 %s"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
 msgstr "evolution 行事曆項目"
@@ -370,7 +324,6 @@ msgstr "evolution 行事曆項目"
 msgid "Combo Button"
 msgstr "組合按鈕"
 
-# mail/mail-config.glade.h:21
 #: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
 msgstr "使用預設值"
@@ -379,16 +332,10 @@ msgstr "使用預設值"
 msgid "Popup Menu"
 msgstr "彈出式選單"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "切換附加檔案列"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
 #: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "使作用"
@@ -397,7 +344,7 @@ msgstr "使作用"
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
-msgstr "此聯絡人的電郵地址已經存在。你無論如何都要加入同樣位址的新咭片嗎？"
+msgstr "此聯絡人的電子郵件地址已經存在。你無論如何都要加入同樣位址的新卡片嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid "Address '{0}' already exists."
@@ -407,7 +354,6 @@ msgstr "通訊錄「{0}」已存在"
 msgid "Cannot move contact."
 msgstr "無法移動聯絡人。"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
@@ -417,16 +363,12 @@ 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 ""
-"請檢查來確定你的密碼拼法正確，而且你使用的是支援的登入方法。請記得許多密碼有"
-"區分大小寫；你可能啟動了大寫鎖定鍵。"
+msgstr "請檢查來確定你的密碼拼法正確，而且你使用的是支援的登入方法。請記得許多密碼有區分大小寫；你可能啟動了大寫鎖定鍵。"
 
-# camel/camel-movemail.c:306
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
 msgstr "無法取得 LDAP 伺服器的綱要資訊。"
 
-# camel/camel-provider.c:140
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
@@ -436,48 +378,38 @@ 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 個人聯絡人"
-"資料夾。"
+msgstr "目前你只能存取 Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 GroupWise 郵件客戶端，以取得你的 GroupWise 常用聯絡人及 Groupwise 個人聯絡人資料夾。"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "刪除通訊錄「{0}」？"
 
-# composer/e-msg-composer.c:805
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "載入通訊錄發生錯誤。"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤： {2}"
 
-# camel/providers/imap/camel-imap-store.c:531
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "無法驗證 LDAP 伺服器。"
 
-# calendar/gui/e-calendar-table.c:714
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1908
 msgid "Failed to delete contact"
 msgstr "刪除聯絡人失敗"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise 通訊錄的建立"
 
-# camel/providers/imap/camel-imap-command.c:487
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺服器未回應有效的綱要資訊。"
 
-# shell/e-storage.c:475
 #: ../addressbook/addressbook.error.xml.h:16
 msgid "Permission Denied."
 msgstr "權限不足。"
@@ -490,7 +422,6 @@ msgstr "伺服器版本"
 msgid "Some features may not work properly with your current server"
 msgstr "某些功能可能無法在你目前的伺服器版本上正常運作"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
@@ -505,16 +436,12 @@ 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 版本，它不支援此功能，或可能設定錯誤。請洽詢"
-"管理員，瞭解支援的搜尋基礎。"
+msgstr "此 LDAP 伺服器可能使用舊的 LDAP 版本，它不支援此功能，或可能設定錯誤。請洽詢管理員，瞭解支援的搜尋基礎。"
 
-# addressbook/conduit/address-conduit.c:201
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
-# addressbook/conduit/address-conduit.c:201
 #: ../addressbook/addressbook.error.xml.h:23
 msgid "This addressbook could not be opened."
 msgstr "無法開啟此通訊錄。"
@@ -533,22 +460,18 @@ msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺服器不支援 LDAPv3 綱要資訊。"
 
-# addressbook/gui/widgets/e-minicard-control.c:282
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open addressbook"
 msgstr "無法開啟通訊錄"
 
-# executive-summary/component/e-summary.c:940
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
 #: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的更改？"
@@ -557,18 +480,14 @@ msgstr "要儲存所做的更改？"
 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 ""
-"你正在嘗試從某一個通訊錄，將聯絡人移至另一個通訊錄，但是它無法從來源移除。你"
-"想要儲存一個副本來代替嗎？"
+msgstr "你正在嘗試從某一個通訊錄，將聯絡人移至另一個通訊錄，但是它無法從來源移除。你想要儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:32
 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 的問題。最好的"
-"解決方案是將該伺服器升級至支援的版太"
+msgstr "你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版太"
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
@@ -601,25 +520,20 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
-# camel/camel-provider.c:140
 #: ../addressbook/conduit/address-conduit.c:1241
 #: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
 msgstr "無法載入通訊錄"
 
-# addressbook/conduit/address-conduit.c:687
-# addressbook/conduit/address-conduit.c:690
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
-# mail/mail-config.glade.h:76
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "自動完成"
@@ -632,12 +546,10 @@ msgstr "聯絡人(_O)"
 msgid "Certificates"
 msgstr "證書"
 
-# ui/evolution-mail.xml.h:19
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "在此設定自動完成"
 
-# ui/evolution-addressbook.xml.h:17
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
@@ -646,32 +558,26 @@ msgstr "在此設定自動完成"
 msgid "Contacts"
 msgstr "聯絡人"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book"
 msgstr "Evolution 通訊錄"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address pop-up"
 msgstr "Evolution 通訊錄地址快顯視窗"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
 msgstr "Evolution 通訊錄地址檢視器"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book card viewer"
-msgstr "Evolution 通訊錄咭片檢視器"
+msgstr "Evolution 通訊錄卡片檢視器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Address Book component"
 msgstr "Evolution 通訊錄元件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution S/Mime 證書管理控制"
@@ -695,7 +601,7 @@ msgstr "在此管理你的 S/MIME 證書"
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
-msgstr "在此電腦"
+msgstr "我的電腦"
 
 #. Create the default Person addressbook
 #. Create the default Person calendar
@@ -714,7 +620,6 @@ msgstr "在此電腦"
 msgid "Personal"
 msgstr "個人"
 
-# addressbook/gui/component/addressbook-config.c:148
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:159
 #: ../addressbook/gui/component/addressbook-migrate.c:501
@@ -725,7 +630,6 @@ msgstr "在 LDAP 伺服器"
 msgid "_Contact"
 msgstr "聯絡人(_C)"
 
-# ui/evolution-addressbook.xml.h:2
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "建立新的聯絡人"
@@ -734,12 +638,10 @@ msgstr "建立新的聯絡人"
 msgid "Contact _List"
 msgstr "聯絡人清單(_L)"
 
-# ui/evolution-addressbook.xml.h:2
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "建立新的聯絡人清單"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/addressbook-component.c:242
 #: ../addressbook/gui/component/addressbook-config.c:1205
 msgid "New Address Book"
@@ -749,7 +651,6 @@ msgstr "新通訊錄"
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
@@ -758,7 +659,6 @@ msgstr "建立新通訊錄"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "升級通訊錄設定值或資料夾失敗。"
 
-# addressbook/gui/component/addressbook-config.c:177
 #: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "基本"
@@ -791,44 +691,34 @@ msgstr "一般"
 msgid "Address Book"
 msgstr "通訊錄"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-# mail/mail-config.glade.h:10
 #: ../addressbook/gui/component/addressbook-config.c:991
 msgid "Authentication"
 msgstr "驗證"
 
-# addressbook/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../addressbook/gui/component/addressbook-config.c:994
 #: ../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/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
 #: ../addressbook/gui/component/addressbook-config.c:995
 #: ../mail/em-folder-browser.c:802
 msgid "Searching"
 msgstr "搜尋中"
 
-# mail/mail-ops.c:898
 #: ../addressbook/gui/component/addressbook-config.c:997
 msgid "Downloading"
 msgstr "下載中"
 
-# addressbook/gui/component/addressbook-config.glade.h:2
 #: ../addressbook/gui/component/addressbook-config.c:1203
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
 msgid "Migrating..."
@@ -840,12 +730,10 @@ msgstr "正在移轉..."
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
-# addressbook/gui/component/addressbook-config.c:148
 #: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
-# mail/mail-config.glade.h:76
 #: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
@@ -911,7 +799,6 @@ msgstr "資料夾名稱不能包含斜線。"
 msgid "A Folder with this name already exists"
 msgstr "以此為名的資料夾已存在"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/addressbook-view.c:956
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
@@ -930,18 +817,10 @@ msgstr "新增通訊錄(_N)"
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/component/addressbook-view.c:959
 msgid "Save As Vcard..."
 msgstr "儲存為 VCard..."
 
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
 #: ../addressbook/gui/component/addressbook-view.c:961
 #: ../calendar/gui/calendar-component.c:582
 #: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
@@ -961,14 +840,12 @@ msgstr "正以匿名方式存取 LDAP 伺服器"
 msgid "Failed to authenticate.\n"
 msgstr "驗證證書失敗。\n"
 
-# camel/camel-smime-context.c:194
 #: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
-# mail/mail-config.glade.h:76
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "Autocomplete length"
 msgstr "自動完成長度"
@@ -985,9 +862,8 @@ msgstr "完成 uris 清單的 EFolderList xml"
 msgid ""
 "Position of the vertical pane, between the card and list views and the "
 "preview pane, in pixels."
-msgstr "垂直窗格的位置，在咭片、清單檢視與預覽窗格之間，以像素計。"
+msgstr "垂直窗格的位置，在卡片、清單檢視與預覽窗格之間，以像素計。"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
 msgstr "顯示預覽窗格"
@@ -996,7 +872,7 @@ msgstr "顯示預覽窗格"
 msgid ""
 "The number of characters that must be typed before Evolution will attempt to "
 "autocomplete."
-msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字元數目。"
+msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字符數目。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -1006,13 +882,11 @@ msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 msgid "URI for the folder last used in the select names dialog."
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-# calendar/gui/e-calendar-table.c:156
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Vertical pane position"
 msgstr "垂直窗格位置"
 
-# ui/evolution.xml.h:32
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "是否顯示預覽窗格。"
@@ -1037,7 +911,6 @@ msgstr "5"
 msgid "636"
 msgstr "636"
 
-# mail/mail-config.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
@@ -1047,18 +920,14 @@ msgstr "<b>驗證</b>"
 msgid "<b>Display</b>"
 msgstr "<b>顯示</b>"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>下載中</b>"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
 #: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>搜尋中</b>"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>伺服器資訊</b>"
@@ -1067,7 +936,6 @@ msgstr "<b>伺服器資訊</b>"
 msgid "<b>Type:</b>"
 msgstr "<b>類型:</b>"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
 msgstr "新增通訊錄"
@@ -1077,7 +945,6 @@ msgstr "新增通訊錄"
 msgid "Always"
 msgstr "永遠"
 
-# camel/camel-sasl-anonymous.c:33
 #: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "匿名"
@@ -1090,15 +957,14 @@ msgstr "基本"
 msgid "Distinguished name"
 msgstr "可辨識名稱"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
-msgstr "電郵地址"
+msgstr "電子郵件地址"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
 msgid ""
 "Evolution will use this email address to authenticate you with the server."
-msgstr "Evolution 會使用此電郵地址，在伺服器驗證你的身份。"
+msgstr "Evolution 會使用此電子郵件地址，在伺服器驗證你的身份。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
 msgid "Find Possible Search Bases"
@@ -1108,15 +974,11 @@ msgstr "尋找可能的搜尋基礎"
 msgid "Lo_gin:"
 msgstr "登入(_G):"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "永不"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
@@ -1124,7 +986,6 @@ msgstr "永不"
 msgid "No encryption"
 msgstr "沒有加密"
 
-# addressbook/gui/component/addressbook-config.c:179
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "一層"
@@ -1137,7 +998,6 @@ msgstr "一層"
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
-# mail/mail-account-gui.c:682
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "搜尋過濾器"
@@ -1146,12 +1006,10 @@ msgstr "搜尋過濾器"
 msgid "Search _base:"
 msgstr "搜尋起點(_B):"
 
-# mail/mail-account-gui.c:682
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "搜尋過濾器(_F):"
 
-# mail/mail-search.c:299
 #: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "搜尋過濾器"
@@ -1161,36 +1019,27 @@ msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
-msgstr ""
-"搜尋過濾器是在進行搜尋時使用的物件類型。如果此項沒有被修改，預設的搜尋目標是"
-"「person」物件類型。"
+msgstr "搜尋過濾器是在進行搜尋時使用的物件類型。如果此項沒有被修改，預設的搜尋目標是「person」物件類型。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
-msgstr ""
-"選取此選項表示，Evolution 只會連線到你的 LDAP 伺服器 (如果你的 LDAP 伺服器支"
-"援 SSL)。"
+msgstr "選取此選項表示，Evolution 只會連線到你的 LDAP 伺服器 (如果你的 LDAP 伺服器支援 SSL)。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
-msgstr ""
-"選取此選項表示，Evolution 只會連線到你的 LDAP 伺服器 (如果你的 LDAP 伺服器支"
-"援 TLS)。"
+msgstr "選取此選項表示，Evolution 只會連線到你的 LDAP 伺服器 (如果你的 LDAP 伺服器支援 TLS)。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
-msgstr ""
-"選取此選項表示，你的伺服器不支援 SSL 或 TLS。這表示你的連線將不安全，而且你的"
-"安全有漏洞。 "
+msgstr "選取此選項表示，你的伺服器不支援 SSL 或 TLS。這表示你的連線將不安全，而且你的安全有漏洞。 "
 
-# calendar/gui/print.c:362
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "子目錄"
@@ -1212,9 +1061,7 @@ msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr ""
-"搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目"
-"錄樹的底層開始。"
+msgstr "搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目錄樹的底層開始。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -1222,9 +1069,7 @@ msgid ""
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
-msgstr ""
-"搜尋範圍會定義你想從網絡目錄樹往下延伸搜尋的深度。\"sub\" 的搜尋範圍會包括搜"
-"尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
+msgstr "搜尋範圍會定義你想從網絡目錄樹往下延伸搜尋的深度。\"sub\" 的搜尋範圍會包括搜尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
@@ -1243,40 +1088,33 @@ msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
-msgstr ""
-"這是 Evolution 將要用來驗證你的方法。注意要設定此項至「電郵位址」需要你"
-"的 LDAP 伺服器的匿名存取。"
+msgstr "這是 Evolution 將要用來驗證你的方法。注意要設定此項至「電子郵件位址」需要你的 LDAP 伺服器的匿名存取。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
-msgstr ""
-"這是此伺服器的名稱，會顯示在你的 Evolution 資料夾清單中。它僅用於顯示用途。 "
+msgstr "這是此伺服器的名稱，會顯示在你的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
-msgstr ""
-"這是 LDAP 伺服器上的埠，Evolution 會嘗試連線到這個地方。已提供標準埠清單。請"
-"洽詢你的系統管理員，瞭解你應該指定的埠。"
+msgstr "這是 LDAP 伺服器上的埠，Evolution 會嘗試連線到這個地方。已提供標準埠清單。請洽詢你的系統管理員，瞭解你應該指定的埠。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
-msgstr "使用電郵位址"
+msgstr "使用電子郵件位址"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:48
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "新增通訊錄(_A)"
@@ -1323,13 +1161,9 @@ msgstr "逾時時間(_T):"
 msgid "_Use secure connection:"
 msgstr "使用安全連線(_U):"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
-msgstr "咭片"
+msgstr "卡片"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:60
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:8
@@ -1342,16 +1176,14 @@ msgstr "咭片"
 msgid "minutes"
 msgstr "分鐘"
 
-# mail/mail-config.glade.h:65
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
-msgstr "<b>電郵</b>"
+msgstr "<b>電子郵件</b>"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:2
 msgid "<b>Home</b>"
 msgstr "<b>住家</b>"
 
-# mail/mail-callbacks.c:1407
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>即時訊息</b>"
@@ -1360,7 +1192,6 @@ msgstr "<b>即時訊息</b>"
 msgid "<b>Job</b>"
 msgstr "<b>工作</b>"
 
-# mail/mail-config.glade.h:65
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>其他</b>"
@@ -1373,12 +1204,10 @@ msgstr "<b>其他</b>"
 msgid "<b>Telephone</b>"
 msgstr "<b>電話</b>"
 
-# mail/mail-config.glade.h:65
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
 msgstr "<b>網址</b>"
 
-# ui/evolution-calendar.xml.h:35
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
@@ -1389,7 +1218,6 @@ msgstr "<b>工作</b>"
 msgid "AIM"
 msgstr "AIM"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../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
@@ -1398,7 +1226,6 @@ msgstr "AIM"
 msgid "Contact"
 msgstr "聯絡人"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../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
@@ -1410,18 +1237,15 @@ msgstr "聯絡人編輯器"
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-# addressbook/printing/e-contact-print.glade.h:25
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Image"
 msgstr "圖片"
 
-# ui/evolution-mail.xml.h:109
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "郵寄地址"
@@ -1430,16 +1254,14 @@ msgstr "郵寄地址"
 msgid "Ni_ckname:"
 msgstr "暱稱(_C):"
 
-# shell/e-shortcuts-view.c:137
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-# mail/mail-config.glade.h:47
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Personal Information"
-msgstr "個人資訊"
+msgstr "個人資料"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Telephone"
@@ -1461,24 +1283,18 @@ msgstr "工作"
 msgid "_Address:"
 msgstr "地址(_A):"
 
-# addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Assistant:"
 msgstr "助理(_A):"
 
-# addressbook/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #: ../calendar/gui/dialogs/event-page.c:875
 #: ../calendar/gui/dialogs/event-page.glade.h:15
@@ -1490,22 +1306,18 @@ msgstr "行事曆(_C):"
 msgid "_Categories..."
 msgstr "分類(_C)..."
 
-# addressbook/contact-editor/fulladdr.glade.h:8
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "縣/市(_C):"
 
-# addressbook/contact-editor/e-contact-editor.c:1248
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Company:"
 msgstr "公司(_C):"
 
-# addressbook/contact-editor/fulladdr.glade.h:4
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Country:"
 msgstr "國家/地區(_C):"
 
-# addressbook/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Department:"
 msgstr "部門(_D):"
@@ -1514,28 +1326,22 @@ msgstr "部門(_D):"
 msgid "_File under:"
 msgstr "歸檔為(_F):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
 msgstr "空閒/忙碌(_F):"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
 msgstr "首頁(_H):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Manager:"
 msgstr "主管(_M):"
 
-# addressbook/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Notes:"
 msgstr "備註(_N):"
 
-# addressbook/contact-editor/contact-editor.glade.h:31
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Office:"
 msgstr "辦公室(_O):"
@@ -1545,12 +1351,10 @@ msgstr "辦公室(_O):"
 msgid "_PO Box:"
 msgstr "郵箱(_P):"
 
-# addressbook/contact-editor/contact-editor.glade.h:32
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Profession:"
 msgstr "職業(_P):"
 
-# addressbook/contact-editor/contact-editor.glade.h:33
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Spouse:"
 msgstr "配偶(_S):"
@@ -1560,21 +1364,20 @@ msgstr "配偶(_S):"
 msgid "_State/Province:"
 msgstr "州/省(_S):"
 
+# (Abel) 職稱和輸入連絡人時的 Title (Dr., Ms.) 有衝突
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
-msgstr "職稱(_T):"
+msgstr "銜頭(_T):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Video Chat:"
-msgstr "視訊交談(_V):"
+msgstr "視像交談(_V):"
 
-# addressbook/contact-editor/contact-editor.glade.h:15
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Wants to receive HTML mail"
-msgstr "想接收 HTML 電郵(_W)"
+msgstr "可接受 H_TML 郵件"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Web Log:"
 msgstr "網誌(_W):"
@@ -1584,7 +1387,6 @@ msgstr "網誌(_W):"
 msgid "_Where:"
 msgstr "通訊錄(_W):"
 
-# addressbook/contact-editor/fulladdr.glade.h:11
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "_Zip/Postal Code:"
 msgstr "郵遞區號(_Z):"
@@ -1651,7 +1453,7 @@ msgstr "南極洲"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:146
 msgid "Antigua And Barbuda"
-msgstr "安地卡及巴布達"
+msgstr "安提瓜和巴布達"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:147
 msgid "Argentina"
@@ -1675,7 +1477,7 @@ msgstr "奧地利"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:152
 msgid "Azerbaijan"
-msgstr "亞賽拜彊"
+msgstr "亞塞拜彊"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:153
 msgid "Bahamas"
@@ -1691,7 +1493,7 @@ msgstr "孟加拉"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:156
 msgid "Barbados"
-msgstr "巴貝多"
+msgstr "巴巴多斯"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:157
 msgid "Belarus"
@@ -1703,11 +1505,11 @@ msgstr "比利時"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:159
 msgid "Belize"
-msgstr "貝里斯"
+msgstr "伯利兹"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:160
 msgid "Benin"
-msgstr "貝南"
+msgstr "貝寧"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:161
 msgid "Bermuda"
@@ -1727,7 +1529,7 @@ msgstr "波斯尼亞-赫芝格維納"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:165
 msgid "Botswana"
-msgstr "波札那"
+msgstr "博茨瓦納"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:166
 msgid "Bouvet Island"
@@ -1751,11 +1553,11 @@ msgstr "保加利亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:171
 msgid "Burkina Faso"
-msgstr "布吉納法索"
+msgstr "布基納法索"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:172
 msgid "Burundi"
-msgstr "浦隆地"
+msgstr "布隆迪"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:173
 msgid "Cambodia"
@@ -1771,11 +1573,11 @@ msgstr "加拿大"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:176
 msgid "Cape Verde"
-msgstr "維德角島"
+msgstr "佛得角島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:177
 msgid "Cayman Islands"
-msgstr "開曼群島"
+msgstr "開曼羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:178
 msgid "Central African Republic"
@@ -1783,7 +1585,7 @@ msgstr "中非"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:179
 msgid "Chad"
-msgstr "查德"
+msgstr "乍得"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:180
 msgid "Chile"
@@ -1799,7 +1601,7 @@ msgstr "聖誕島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:183
 msgid "Cocos (Keeling) Islands"
-msgstr "可可斯群島"
+msgstr "可可斯羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:184
 msgid "Colombia"
@@ -1807,9 +1609,8 @@ msgstr "哥倫比亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:185
 msgid "Comoros"
-msgstr "葛摩"
+msgstr "科摩羅"
 
-# mail/mail-ops.c:917
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "剛果共和國"
@@ -1820,7 +1621,7 @@ msgstr "剛果共和國"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:188
 msgid "Cook Islands"
-msgstr "科克群島"
+msgstr "科克羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:189
 msgid "Costa Rica"
@@ -1852,7 +1653,7 @@ msgstr "丹麥"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:196
 msgid "Djibouti"
-msgstr "吉布地"
+msgstr "吉布提"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:197
 msgid "Dominica"
@@ -1876,11 +1677,11 @@ msgstr "薩爾瓦多"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:202
 msgid "Equatorial Guinea"
-msgstr "赤道幾內亞"
+msgstr "赤道畿內亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:203
 msgid "Eritrea"
-msgstr "厄利垂亞"
+msgstr "厄立特里亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:204
 msgid "Estonia"
@@ -1888,19 +1689,19 @@ msgstr "愛沙尼亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:205
 msgid "Ethiopia"
-msgstr "衣索匹亞"
+msgstr "埃塞俄比亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:206
 msgid "Falkland Islands"
-msgstr "福克蘭群島"
+msgstr "福克蘭羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:207
 msgid "Faroe Islands"
-msgstr "法羅群島"
+msgstr "法羅羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:208
 msgid "Fiji"
-msgstr "斐濟群島"
+msgstr "斐濟羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:209
 msgid "Finland"
@@ -1916,7 +1717,7 @@ msgstr "法屬圭亞那"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:212
 msgid "French Polynesia"
-msgstr "法屬玻里尼西亞"
+msgstr "法屬玻利尼西亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:213
 msgid "French Southern Territories"
@@ -1924,11 +1725,11 @@ msgstr "法屬南部屬地"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:214
 msgid "Gabon"
-msgstr "加彭"
+msgstr "加蓬"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:215
 msgid "Gambia"
-msgstr "甘比亞"
+msgstr "岡比亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:216
 msgid "Georgia"
@@ -1940,7 +1741,7 @@ msgstr "德國"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:218
 msgid "Ghana"
-msgstr "迦納"
+msgstr "加納"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:219
 msgid "Gibraltar"
@@ -1956,7 +1757,7 @@ msgstr "格陵蘭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:222
 msgid "Grenada"
-msgstr "格瑞那達"
+msgstr "格林納達"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:223
 msgid "Guadeloupe"
@@ -1976,15 +1777,15 @@ msgstr "根息"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:227
 msgid "Guinea"
-msgstr "幾內亞"
+msgstr "畿內亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:228
 msgid "Guinea-bissau"
-msgstr "幾內亞比索"
+msgstr "畿內亞比紹"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:229
 msgid "Guyana"
-msgstr "蓋亞納"
+msgstr "圭亞那"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:230
 msgid "Haiti"
@@ -1992,11 +1793,11 @@ msgstr "海地"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:231
 msgid "Heard And McDonald Islands"
-msgstr "赫德及麥當勞群島"
+msgstr "赫德及麥當勞羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:232
 msgid "Holy See"
-msgstr "教廷"
+msgstr "梵蒂岡"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:233
 msgid "Honduras"
@@ -2036,7 +1837,7 @@ msgstr "愛爾蘭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:242
 msgid "Isle of Man"
-msgstr "曼島"
+msgstr "萌島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:243
 msgid "Israel"
@@ -2068,11 +1869,11 @@ msgstr "哈薩克"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:250
 msgid "Kenya"
-msgstr "肯亞"
+msgstr "肯雅"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:251
 msgid "Kiribati"
-msgstr "吉里巴斯"
+msgstr "基里巴斯"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:252
 msgid "Korea, Democratic People's Republic Of"
@@ -2104,11 +1905,11 @@ msgstr "黎巴嫩"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:259
 msgid "Lesotho"
-msgstr "賴索托"
+msgstr "萊索托"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:260
 msgid "Liberia"
-msgstr "賴比瑞亞"
+msgstr "利比里亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:261
 msgid "Libya"
@@ -2116,7 +1917,7 @@ msgstr "利比亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:262
 msgid "Liechtenstein"
-msgstr "列支敦斯登"
+msgstr "列支敦士登"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:263
 msgid "Lithuania"
@@ -2140,7 +1941,7 @@ msgstr "馬達加斯加"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:268
 msgid "Malawi"
-msgstr "馬拉威"
+msgstr "馬拉維"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:269
 msgid "Malaysia"
@@ -2152,7 +1953,7 @@ msgstr "馬爾代夫"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:271
 msgid "Mali"
-msgstr "馬利"
+msgstr "馬里"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:272
 msgid "Malta"
@@ -2160,7 +1961,7 @@ msgstr "馬爾他"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:273
 msgid "Marshall Islands"
-msgstr "馬紹爾群島"
+msgstr "馬紹爾羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:274
 msgid "Martinique"
@@ -2168,13 +1969,12 @@ msgstr "法屬馬丁尼克"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:275
 msgid "Mauritania"
-msgstr "茅利塔尼亞"
+msgstr "毛里塔尼亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:276
 msgid "Mauritius"
 msgstr "毛里裘斯"
 
-# calendar/gui/goto-dialog.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "美亞特"
@@ -2191,8 +1991,6 @@ msgstr "密克羅尼西亞"
 msgid "Moldova, Republic Of"
 msgstr "摩爾多瓦"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "摩納哥"
@@ -2223,7 +2021,7 @@ msgstr "納米比亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:288
 msgid "Nauru"
-msgstr "諾魯"
+msgstr "瑙魯"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:289
 msgid "Nepal"
@@ -2235,7 +2033,7 @@ msgstr "荷蘭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:291
 msgid "Netherlands Antilles"
-msgstr "荷屬安地列斯"
+msgstr "荷屬安的列斯羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:292
 msgid "New Caledonia"
@@ -2243,7 +2041,7 @@ msgstr "新喀里多尼亞島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:293
 msgid "New Zealand"
-msgstr "紐西蘭"
+msgstr "新西蘭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:294
 msgid "Nicaragua"
@@ -2251,11 +2049,11 @@ msgstr "尼加拉瓜"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:295
 msgid "Niger"
-msgstr "尼日"
+msgstr "尼日爾"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:296
 msgid "Nigeria"
-msgstr "奈及利亞"
+msgstr "尼日利亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:297
 msgid "Niue"
@@ -2263,11 +2061,11 @@ msgstr "紐威島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:298
 msgid "Norfolk Island"
-msgstr "諾福克群島"
+msgstr "諾福克羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:299
 msgid "Northern Mariana Islands"
-msgstr "北馬里亞納群島"
+msgstr "北馬里亞納羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:300
 msgid "Norway"
@@ -2283,26 +2081,24 @@ msgstr "巴基斯坦"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:303
 msgid "Palau"
-msgstr "帛琉群島"
+msgstr "帕勞羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:304
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地區"
 
-# addressbook/contact-editor/fulladdr.glade.h:2
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "巴拿馬"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:306
 msgid "Papua New Guinea"
-msgstr "巴布亞新幾內亞"
+msgstr "巴布亞新畿內亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:307
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-# addressbook/printing/e-contact-print.glade.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "秘魯"
@@ -2311,7 +2107,6 @@ msgstr "秘魯"
 msgid "Philippines"
 msgstr "菲律賓"
 
-# ui/evolution-calendar.xml.h:25
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "皮特康"
@@ -2330,7 +2125,7 @@ msgstr "波多黎各"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:314
 msgid "Qatar"
-msgstr "卡達"
+msgstr "卡塔爾"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:315
 msgid "Reunion"
@@ -2350,27 +2145,27 @@ msgstr "盧旺達"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:319
 msgid "Saint Kitts And Nevis"
-msgstr "聖克里斯多福"
+msgstr "聖基茨島及尼維斯聯邦"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:320
 msgid "Saint Lucia"
-msgstr "聖露西亞"
+msgstr "聖盧西亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:321
 msgid "Saint Vincent And The Grenadines"
-msgstr "聖文森"
+msgstr "聖文森特和格林內丁斯"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:322
 msgid "Samoa"
-msgstr "薩摩亞群島"
+msgstr "薩摩亞羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:323
 msgid "San Marino"
-msgstr "聖馬利諾"
+msgstr "聖馬力諾"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:324
 msgid "Sao Tome And Principe"
-msgstr "聖多美及普林西比"
+msgstr "聖多美和普林西比"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:325
 msgid "Saudi Arabia"
@@ -2386,11 +2181,11 @@ msgstr "塞爾維亞和黑山"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:328
 msgid "Seychelles"
-msgstr "塞席爾"
+msgstr "塞舌爾"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:329
 msgid "Sierra Leone"
-msgstr "獅子山"
+msgstr "塞拉利昂"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:330
 msgid "Singapore"
@@ -2406,11 +2201,11 @@ msgstr "斯洛文尼亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:333
 msgid "Solomon Islands"
-msgstr "所羅門群島"
+msgstr "所羅門羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:334
 msgid "Somalia"
-msgstr "索馬利亞"
+msgstr "索馬里"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:335
 msgid "South Africa"
@@ -2418,7 +2213,7 @@ msgstr "南非"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:336
 msgid "South Georgia And The South Sandwich Islands"
-msgstr "南格魯吉亞及南桑威奇群島"
+msgstr "南格魯吉亞及南桑威奇羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:337
 msgid "Spain"
@@ -2434,7 +2229,7 @@ msgstr "聖赫勒拿島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:340
 msgid "St. Pierre And Miquelon"
-msgstr "聖匹及密啟倫群島"
+msgstr "聖匹及密啟倫羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:341
 msgid "Sudan"
@@ -2442,7 +2237,7 @@ msgstr "蘇丹"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:342
 msgid "Suriname"
-msgstr "蘇利南"
+msgstr "蘇里南"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:343
 msgid "Svalbard And Jan Mayen Islands"
@@ -2450,7 +2245,7 @@ msgstr "斯瓦巴及尖棉島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:344
 msgid "Swaziland"
-msgstr "史瓦濟蘭"
+msgstr "斯威士蘭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:345
 msgid "Sweden"
@@ -2470,7 +2265,7 @@ msgstr "臺灣"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:349
 msgid "Tajikistan"
-msgstr "塔吉克"
+msgstr "塔吉克斯坦"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:350
 msgid "Tanzania, United Republic Of"
@@ -2490,11 +2285,11 @@ msgstr "多哥"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:354
 msgid "Tokelau"
-msgstr "托克勞群島"
+msgstr "托克勞羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:355
 msgid "Tonga"
-msgstr "東加"
+msgstr "湯加"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:356
 msgid "Trinidad And Tobago"
@@ -2502,7 +2297,7 @@ msgstr "千里達"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:357
 msgid "Tunisia"
-msgstr "突尼西亞"
+msgstr "突尼斯"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:358
 msgid "Turkey"
@@ -2514,11 +2309,11 @@ msgstr "土庫曼"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:360
 msgid "Turks And Caicos Islands"
-msgstr "土克斯及開科斯群島"
+msgstr "土克斯及開科斯羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:361
 msgid "Tuvalu"
-msgstr "吐瓦魯"
+msgstr "圖瓦盧"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:362
 msgid "Uganda"
@@ -2530,7 +2325,7 @@ msgstr "烏克蘭"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:364
 msgid "United Arab Emirates"
-msgstr "阿拉伯聯合大公國"
+msgstr "阿拉伯聯合酋長國"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:365
 msgid "United Kingdom"
@@ -2538,7 +2333,7 @@ msgstr "英國"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:366
 msgid "United States Minor Outlying Islands"
-msgstr "美屬邊疆群島"
+msgstr "美屬邊疆羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:367
 msgid "Uruguay"
@@ -2550,7 +2345,7 @@ msgstr "烏茲別克"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:369
 msgid "Vanuatu"
-msgstr "萬那杜"
+msgstr "瓦努阿圖"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:370
 msgid "Venezuela"
@@ -2562,11 +2357,11 @@ msgstr "越南"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:372
 msgid "Virgin Islands, British"
-msgstr "英屬維爾京群島"
+msgstr "英屬維爾京羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:373
 msgid "Virgin Islands, U.S."
-msgstr "美屬維爾京群島"
+msgstr "美屬維爾京羣島"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:374
 msgid "Wallis And Futuna Islands"
@@ -2582,7 +2377,7 @@ msgstr "也門"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:377
 msgid "Zambia"
-msgstr "尚比亞"
+msgstr "贊比亞"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:378
 msgid "Zimbabwe"
@@ -2597,12 +2392,10 @@ msgstr "津巴布韋"
 msgid "Name"
 msgstr "名稱"
 
-# mail/mail-callbacks.c:1407
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../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
@@ -2627,7 +2420,6 @@ msgstr "ICQ"
 msgid "Service"
 msgstr "服務"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../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
@@ -2635,21 +2427,16 @@ msgstr "服務"
 msgid "Location"
 msgstr "位置"
 
-# mail/mail-config.glade.h:80
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
 msgid "Username"
 msgstr "使用者名稱"
 
-# addressbook/contact-editor/e-contact-editor.c:1249
-# addressbook/contact-editor/e-contact-editor.c:1311
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "住家"
 
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:206
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
@@ -2671,13 +2458,11 @@ msgstr "Gadu-Gadu"
 msgid "MSN"
 msgstr "MSN"
 
-# shell/e-shortcuts-view.c:137
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "GroupWise"
 msgstr "GroupWise"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 msgid "Source Book"
 msgstr "來源通訊錄"
@@ -2686,27 +2471,22 @@ msgstr "來源通訊錄"
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Is New Contact"
 msgstr "是新聯絡人"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:571
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Required Fields"
 msgstr "必要欄位"
 
-# addressbook/contact-editor/e-contact-editor.c:1247
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 msgid "Changed"
 msgstr "已更改"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
@@ -2715,12 +2495,11 @@ msgstr "聯絡人編輯器 - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
-msgstr "請選取此聯絡人的圖像"
+msgstr "請選取代表此聯絡人的圖片"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
-msgstr "沒有圖像(_N)"
+msgstr "沒有圖片(_N)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
@@ -2746,13 +2525,10 @@ msgstr "%s「%s」含有無效的格式"
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "無效的聯絡人。"
 
-# addressbook/contact-editor/e-contact-quick-add.c:233
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
 msgid "Contact Quick-Add"
 msgstr "快速新增聯絡人"
@@ -2761,22 +2537,18 @@ msgstr "快速新增聯絡人"
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-# mail/mail-config.glade.h:31
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "全名(_F)"
 
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:348
 msgid "E_mail"
-msgstr "電郵(_M)"
+msgstr "電子郵件(_M)"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
@@ -2786,8 +2558,6 @@ msgstr ""
 "確定要刪除\n"
 "聯絡人清單 (%s)？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
@@ -2796,8 +2566,6 @@ msgstr ""
 "你確定要刪除\n"
 "這些聯絡人清單？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
@@ -2807,8 +2575,6 @@ msgstr ""
 "確定要刪除\n"
 "聯絡人 (%s)？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
@@ -2829,7 +2595,6 @@ msgstr "縣/市(_T):"
 msgid "Countr_y:"
 msgstr "國家(_Y):"
 
-# addressbook/backend/ebook/e-card.c:3346
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "完整地址"
@@ -2838,64 +2603,51 @@ msgstr "完整地址"
 msgid "_ZIP Code:"
 msgstr "郵遞區號(_Z):"
 
-# addressbook/contact-editor/fullname.glade.h:2
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "Dr."
 
-# addressbook/contact-editor/fullname.glade.h:3
 #: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr "Esq."
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "全名"
 
-# addressbook/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-# addressbook/contact-editor/fullname.glade.h:5
 #: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-# addressbook/contact-editor/fullname.glade.h:6
 #: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-# addressbook/contact-editor/fullname.glade.h:7
 #: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-# addressbook/contact-editor/fullname.glade.h:8
 #: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-# addressbook/contact-editor/fullname.glade.h:9
 #: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-# addressbook/contact-editor/fullname.glade.h:10
 #: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-# addressbook/contact-editor/fullname.glade.h:11
 #: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-# addressbook/contact-editor/fullname.glade.h:12
 #: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
@@ -2916,7 +2668,6 @@ msgstr "(_Middle):"
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-# mail/mail-config.glade.h:6
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 msgid "Add IM Account"
 msgstr "新增 IM 帳號"
@@ -2943,9 +2694,8 @@ msgstr "\n"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
 msgid "Add an email to the List"
-msgstr "新增電郵到清單"
+msgstr "新增電子郵件到清單"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
 msgid "Contact List Editor"
@@ -2953,21 +2703,19 @@ msgstr "聯絡人清單編輯器"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
 msgid "Insert email addresses from Address Book"
-msgstr "從通訊錄插入電郵位址"
+msgstr "從通訊錄插入電子郵件位址"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Members"
 msgstr "會員"
 
-# composer/e-msg-composer-attachment-bar.c:469
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Remove an email address from the List"
-msgstr "從清單移除電郵地址"
+msgstr "從清單移除電子郵件地址"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
 msgid "_Hide addresses when sending mail to this list"
-msgstr "當傳送電郵至此清單時隱藏其位址(_H)"
+msgstr "當傳送電子郵件至此清單時隱藏其位址(_H)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_List name:"
@@ -2979,9 +2727,8 @@ msgstr "選取(_S)"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
-msgstr "輸入電郵地址或拖曳聯絡人到以下清單(_T)："
+msgstr "輸入電子郵件地址或拖曳聯絡人到以下清單(_T)："
 
-# addressbook/printing/e-contact-print.glade.h:4
 #: ../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
@@ -2991,22 +2738,18 @@ msgstr "輸入電郵地址或拖曳聯絡人到以下清單(_T)："
 msgid "Book"
 msgstr "書本"
 
-# mail/mail-config.glade.h:45
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
 msgid "Is New List"
 msgstr "是新的清單"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "_Members"
 msgstr "成員(_M)"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
 msgid "Contact List Members"
 msgstr "聯絡人清單成員"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "更改後的聯絡人:"
@@ -3025,15 +2768,13 @@ msgid ""
 "The changed email or name of this contact already\n"
 "exists in this folder.  Would you like to add it anyway?"
 msgstr ""
-"此聯絡人中改變後的電郵或名稱已經\n"
+"此聯絡人中改變後的電子郵件或名稱已經\n"
 "存在於此資料夾。你無論如何都要新增它嗎？"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "新的聯絡人:"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "原本的聯絡人:"
@@ -3043,11 +2784,9 @@ msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder.  Would you like to add it anyway?"
 msgstr ""
-"此聯絡人的名稱或電郵地址已經存在\n"
+"此聯絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。你無論如何都要新增它嗎？"
 
-# addressbook/gui/component/addressbook.c:618
-# calendar/gui/gnome-cal.c:233
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:171
 #: ../calendar/gui/cal-search-bar.c:53
@@ -3057,19 +2796,17 @@ msgstr "任何欄位包含"
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
 #: ../addressbook/gui/widgets/e-addressbook-view.c:170
 msgid "Email begins with"
-msgstr "電郵開始於"
+msgstr "電子郵件開始於"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.c:169
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "沒有聯絡人"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
@@ -3085,12 +2822,10 @@ msgstr[1] "%d 個聯絡人"
 msgid "Query"
 msgstr "查詢"
 
-# shell/e-shell-importer.c:384
 #: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "取得書本檢視時發生錯誤"
 
-# addressbook/contact-editor/e-contact-editor.c:1253
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 #: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
@@ -3101,17 +2836,14 @@ msgstr "取得書本檢視時發生錯誤"
 msgid "Model"
 msgstr "模型"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
-msgstr "編輯咭片時發生錯誤"
+msgstr "編輯卡片時發生錯誤"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "來源"
 
-# mail/mail-config.glade.h:78
 #: ../addressbook/gui/widgets/e-addressbook-view.c:243
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
@@ -3121,10 +2853,6 @@ msgstr "來源"
 msgid "Type"
 msgstr "類型"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/widgets/e-addressbook-view.c:833
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2083
 #: ../ui/evolution-addressbook.xml.h:31
@@ -3139,65 +2867,46 @@ msgstr "儲存為 VCard..."
 msgid "_Open"
 msgstr "開啟(_O)"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../addressbook/gui/widgets/e-addressbook-view.c:958
 msgid "_New Contact..."
 msgstr "新增聯絡人(_N)..."
 
-# ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "New Contact _List..."
 msgstr "新增聯絡人清單(_L)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:962
 msgid "_Save as VCard..."
-msgstr "儲存成 VCard(_S)..."
+msgstr "儲存成 _VCard..."
 
-# ui/evolution-mail.xml.h:35
 #: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Forward Contact"
 msgstr "轉寄聯絡人(_F)"
 
-# ui/evolution-mail.xml.h:35
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contacts"
 msgstr "轉寄聯絡人(_F)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "Send _Message to Contact"
-msgstr "傳送電郵給聯絡人(_M)"
+msgstr "傳送郵件給聯絡人(_M)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to List"
-msgstr "傳送電郵給清單(_M)"
+msgstr "傳送郵件給清單(_M)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to Contacts"
-msgstr "傳送電郵給聯絡人(_M)"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
+msgstr "傳送郵件給聯絡人(_M)"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "_Print"
-msgstr "列印(_P)"
+msgstr "打印(_P)"
 
-# addressbook/contact-editor/contact-editor.glade.h:18
 #: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-# addressbook/contact-editor/contact-editor.glade.h:18
 #: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
@@ -3222,71 +2931,56 @@ msgstr "剪下(_T)"
 msgid "_Copy"
 msgstr "複製(_C)"
 
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 msgid "P_aste"
 msgstr "貼上(_A)"
 
-# calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1602
 #: ../calendar/gui/cal-search-bar.c:357
 msgid "Any Category"
 msgstr "任何分類"
 
-# ui/evolution-calendar.xml.h:25
 #. FIXME: Allow range selection in table views, as in minicard view
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1801
 msgid "Print cards"
-msgstr "列印咭片"
+msgstr "打印卡片"
 
-# shell/e-storage.c:467
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1908
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Other error"
 msgstr "其他錯誤"
 
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "助理"
 
-# addressbook/gui/widgets/e-addressbook-view.c:703
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "助理電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1245
-# addressbook/gui/widgets/e-addressbook-view.c:713
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "商務傅真"
 
-# addressbook/gui/widgets/e-addressbook-view.c:704
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "商務電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:715
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
-# addressbook/gui/widgets/e-addressbook-view.c:705
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "回撥電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:712
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "汽車電話"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
@@ -3295,64 +2989,48 @@ msgstr "汽車電話"
 msgid "Categories"
 msgstr "分類"
 
-# addressbook/gui/widgets/e-addressbook-view.c:706
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "公司電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: ../addressbook/gui/widgets/eab-contact-display.c:785
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
-msgstr "電郵"
+msgstr "電子郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/gui/widgets/e-addressbook-view.c:725
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Email 2"
-msgstr "電郵 2"
+msgstr "電子郵件 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1286
-# addressbook/gui/widgets/e-addressbook-view.c:726
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 3"
-msgstr "電郵 3"
+msgstr "電子郵件 3"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "姓"
 
-# addressbook/gui/widgets/e-addressbook-view.c:699
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "歸檔為"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "名"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "住家傳真"
 
-# addressbook/gui/widgets/e-addressbook-view.c:707
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "住家電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:716
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
-# mail/mail-config.glade.h:25
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
@@ -3361,65 +3039,51 @@ msgstr "ISDN 電話"
 msgid "Journal"
 msgstr "日誌"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 #: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "主管"
 
-# addressbook/gui/widgets/e-addressbook-view.c:711
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #: ../addressbook/gui/widgets/eab-contact-display.c:596
 msgid "Mobile Phone"
 msgstr "流動電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:734
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 #: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "暱稱"
 
-# addressbook/gui/widgets/e-addressbook-view.c:736
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 #: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Note"
 msgstr "備註"
 
-# addressbook/gui/widgets/e-addressbook-view.c:729
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "辦公室"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 #: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Organization"
 msgstr "團體"
 
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它傳真"
 
-# addressbook/gui/widgets/e-addressbook-view.c:718
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "其它電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
-msgstr "呼叫器"
+msgstr "call 機"
 
-# addressbook/gui/widgets/e-addressbook-view.c:702
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "主要電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "無線電電話"
@@ -3432,13 +3096,11 @@ msgstr "無線電電話"
 msgid "Role"
 msgstr "角色"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "配偶"
 
-# addressbook/contact-editor/e-contact-editor.c:1260
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
 #. (familiar from Unix device names), and TDD is "Telecommunications
@@ -3449,28 +3111,22 @@ msgstr "配偶"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-# addressbook/contact-editor/e-contact-editor.c:1259
-# addressbook/gui/widgets/e-addressbook-view.c:722
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "電報"
 
-# addressbook/gui/widgets/e-addressbook-view.c:730
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
-msgstr "頭銜"
+msgstr "銜頭"
 
-# mail/message-list.c:677
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "單位"
 
-# addressbook/gui/widgets/e-addressbook-view.c:727
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "網址"
 
-# addressbook/printing/e-contact-print.glade.h:41
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:149
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
@@ -3485,9 +3141,8 @@ msgstr "網址"
 #: ../widgets/table/e-table-item.c:3022 ../widgets/table/e-table-item.c:3023
 #: ../widgets/text/e-text.c:3667 ../widgets/text/e-text.c:3668
 msgid "Width"
-msgstr "寬度"
+msgstr "闊度"
 
-# addressbook/printing/e-contact-print.glade.h:15
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:156
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
@@ -3508,13 +3163,10 @@ msgstr "高度"
 msgid "Has Focus"
 msgstr "得到焦點"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "欄位"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "欄位名稱"
@@ -3531,7 +3183,6 @@ msgstr "最大欄位名稱長度"
 msgid "Column Width"
 msgstr "欄寬"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
 #: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
@@ -3546,7 +3197,6 @@ msgstr ""
 "\n"
 "雙擊這裏以建立新的聯絡人。"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
 #: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
@@ -3561,7 +3211,6 @@ msgstr ""
 "\n"
 "雙擊這裏以建立新的聯絡人。"
 
-# ui/evolution-addressbook.xml.h:19
 #: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
@@ -3572,7 +3221,6 @@ msgstr ""
 "\n"
 "尋找聯絡人。"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
 #: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
@@ -3587,30 +3235,22 @@ msgstr ""
 msgid "Adapter"
 msgstr "轉接器"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
 #: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
-msgstr "工作電郵"
+msgstr "工作電子郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
-msgstr "住家電郵"
+msgstr "住家電子郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
 #: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Other Email"
-msgstr "其它電郵"
+msgstr "其它電子郵件"
 
 #: ../addressbook/gui/widgets/e-minicard.c:172
 msgid "Selected"
 msgstr "已選擇"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:179
 msgid "Has Cursor"
 msgstr "有游標"
@@ -3624,15 +3264,14 @@ msgstr "在瀏覽器內開啟連結(_O)"
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-# ui/evolution-contact-editor.xml.h:13
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
 msgid "_Send New Message To ..."
-msgstr "傳送新電郵至(_S)..."
+msgstr "傳送新郵件至(_S)..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:177
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
-msgstr "複製電郵位址(_E)"
+msgstr "複製電子郵件位址(_E)"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:301
 #: ../addressbook/gui/widgets/eab-contact-display.c:364
@@ -3644,24 +3283,20 @@ msgstr "(映射)"
 msgid "map"
 msgstr "對映"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/widgets/eab-contact-display.c:462
 #: ../addressbook/gui/widgets/eab-contact-display.c:763
 msgid "List Members"
 msgstr "清單成員"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "E-mail"
-msgstr "電郵"
+msgstr "電子郵件"
 
-# addressbook/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Department"
 msgstr "部門"
 
-# addressbook/contact-editor/contact-editor.glade.h:32
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Profession"
 msgstr "職業"
@@ -3672,10 +3307,8 @@ msgstr "位置"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:577
 msgid "Video Chat"
-msgstr "視訊交談"
+msgstr "視像交談"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../addressbook/gui/widgets/eab-contact-display.c:578
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:752
@@ -3691,7 +3324,6 @@ msgstr "視訊交談"
 msgid "Calendar"
 msgstr "行事曆"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../addressbook/gui/widgets/eab-contact-display.c:579
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:591
@@ -3699,7 +3331,6 @@ msgstr "行事曆"
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-# mail/mail-config.glade.h:25
 #: ../addressbook/gui/widgets/eab-contact-display.c:580
 #: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Phone"
@@ -3709,34 +3340,26 @@ msgstr "電話"
 msgid "Fax"
 msgstr "傳真"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 msgid "Home Page"
 msgstr "首頁"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/widgets/eab-contact-display.c:593
 msgid "Web Log"
 msgstr "網誌"
 
-# addressbook/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:598
 msgid "Birthday"
 msgstr "生日"
 
-# addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-# addressbook/contact-editor/contact-editor.glade.h:27
 #: ../addressbook/gui/widgets/eab-contact-display.c:781
 msgid "Job Title"
 msgstr "職稱"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/eab-contact-display.c:812
 msgid "Home page"
 msgstr "首頁"
@@ -3756,28 +3379,21 @@ msgstr "成功"
 msgid "Backend busy"
 msgstr "後端忙碌"
 
-# shell/e-shell-view-menu.c:602
-# shell/e-shell-view-menu.c:614
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "資料庫離線"
 
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "通訊錄不存在"
 
-# ui/evolution-addressbook.xml.h:17
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "No Self Contact defined"
 msgstr "沒有定義自我聯絡人"
 
-# shell/e-storage.c:475
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
@@ -3786,7 +3402,6 @@ msgstr "沒有定義自我聯絡人"
 msgid "Permission denied"
 msgstr "權限不足"
 
-# calendar/gui/calendar-commands.c:266
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
@@ -3797,18 +3412,11 @@ msgstr "找不到聯絡人"
 msgid "Contact ID already exists"
 msgstr "聯絡人 ID 已經存在"
 
-# shell/e-storage.c:477
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
@@ -3819,21 +3427,17 @@ msgstr "通訊協定不支援"
 msgid "Canceled"
 msgstr "已取消"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "無法取消"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
 #: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
-# camel/providers/smtp/camel-smtp-transport.c:218
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
@@ -3844,9 +3448,6 @@ msgstr "要求驗證"
 msgid "TLS not Available"
 msgstr "TLS 無法使用"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
@@ -3868,11 +3469,8 @@ 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 ""
-"我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離"
-"線使用。請於上線模式再次讀取通訊錄以下載它的內容"
+msgstr "我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
-# addressbook/gui/component/addressbook.c:458
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
 msgid ""
@@ -3880,24 +3478,19 @@ msgid ""
 "exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且你有權限存取它。"
 
-# addressbook/gui/component/addressbook.c:445
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
 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/component/addressbook.c:450
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
 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 套件。"
+msgstr "此 Evolution 版本未編譯 LDAP 支援。如果你若想在 Evolution 使用 LDAP，必須安裝啟用 LDAP 的 Evolution 套件。"
 
-# addressbook/gui/component/addressbook.c:445
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3912,7 +3505,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 "在伺服器設定傳回的或是 Evolution 設定顯示的\n"
-"有許多咭片符合此次查詢。\n"
+"有許多卡片符合此次查詢。\n"
 "請使用更加明確的查詢或是提高此目錄服務的目錄\n"
 "伺服器偏好設定中的結果上限。"
 
@@ -3940,33 +3533,27 @@ msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 #: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Error adding contact"
 msgstr "新增聯絡人時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying contact"
 msgstr "修改聯絡人時發生錯誤"
 
-# executive-summary/component/e-summary.c:940
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-# executive-summary/component/e-summary.c:940
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 #: ../addressbook/gui/widgets/eab-gui-util.c:657
 msgid "Error removing contact"
@@ -3994,10 +3581,8 @@ msgid ""
 "Do you want to overwrite it?"
 msgstr ""
 "%s 已經存在\n"
-"你是否要複寫它？"
+"你是否要覆寫它？"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
 #: ../addressbook/gui/widgets/eab-gui-util.c:327
 msgid "Overwrite"
 msgstr "覆寫"
@@ -4017,7 +3602,6 @@ msgstr[1] "個聯絡人"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Select Address Book"
 msgstr "選擇通訊錄"
@@ -4030,51 +3614,37 @@ msgstr "清單"
 msgid "Move contact to"
 msgstr "將聯絡人移到"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../addressbook/gui/widgets/eab-gui-util.c:767
 msgid "Copy contact to"
 msgstr "複製聯絡人到"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Move contacts to"
 msgstr "將聯絡人移到"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/gui/widgets/eab-gui-util.c:772
 msgid "Copy contacts to"
 msgstr "複製聯絡人到"
 
-# addressbook/backend/ebook/e-card.c:3745
 #: ../addressbook/gui/widgets/eab-gui-util.c:998
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
-# addressbook/backend/ebook/e-card.c:3753
 #: ../addressbook/gui/widgets/eab-gui-util.c:1001
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
 
-# mail/mail-config.glade.h:47
 #: ../addressbook/gui/widgets/eab-gui-util.c:1042
 #: ../addressbook/gui/widgets/eab-gui-util.c:1060
 msgid "Contact information"
 msgstr "聯絡人資訊"
 
-# mail/mail-config.glade.h:47
 #: ../addressbook/gui/widgets/eab-gui-util.c:1062
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的聯絡人資訊"
 
-# addressbook/gui/widgets/e-minicard-control.c:282
 #: ../addressbook/gui/widgets/eab-popup-control.c:289
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
@@ -4083,39 +3653,30 @@ msgstr "正在查詢通訊錄…"
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "和 1 個其他咭片。"
-msgstr[1] "和 %d 個其他咭片。"
+msgstr[0] "和另外 1 個聯絡人。"
+msgstr[1] "和另外 %d 個聯絡人。"
 
-# addressbook/printing/e-contact-print.glade.h:11
 #: ../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/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "顯示精簡的 VCard"
 
-# addressbook/gui/widgets/e-minicard-control.c:282
 #: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
-msgstr "咭片檢視模式"
+msgstr "卡片檢視模式"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
-msgstr "GTK 網絡樹檢視"
+msgstr "GTK 樹狀檢視模式"
 
-# shell/e-shell-importer.c:363
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
@@ -4126,7 +3687,6 @@ msgstr "匯入..."
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 與 Tab 匯入程式"
@@ -4143,7 +3703,6 @@ msgstr "Mozilla CSV 與 Tab 匯入程式"
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
@@ -4157,9 +3716,8 @@ msgstr "正在匯入..."
 
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP 資料互換格式 (.ldif)"
+msgstr "LDAP 資料交換格式 (.ldif)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
@@ -4168,55 +3726,47 @@ msgstr "Evolution LDIF 輸入器"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf、.gcrd)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard 輸入器"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
+# zh_HK: msgstr "打印信封"
 #: ../addressbook/printing/e-contact-print-envelope.c:213
 #: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
-msgstr "列印信封"
+msgstr "打印信封"
 
-# ui/evolution-addressbook.xml.h:11
+# zh_HK: msgstr "打印連絡人"
 #: ../addressbook/printing/e-contact-print.c:849
 msgid "Print contacts"
-msgstr "列印聯絡人"
+msgstr "打印連絡人"
 
-# ui/evolution-addressbook.xml.h:11
+# zh_HK: msgstr "打印連絡人"
 #: ../addressbook/printing/e-contact-print.c:939
 #: ../addressbook/printing/e-contact-print.c:967
 msgid "Print contact"
-msgstr "列印聯絡人"
+msgstr "打印連絡人"
 
-# addressbook/printing/e-contact-print.glade.h:1
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:2
 #: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:3
 #: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "結尾的空白:"
 
-# addressbook/printing/e-contact-print.glade.h:4
 #: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "內文"
 
-# addressbook/printing/e-contact-print.glade.h:5
 #: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "下:"
 
-# addressbook/printing/e-contact-print.glade.h:6
 #: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "尺寸:"
@@ -4225,22 +3775,18 @@ msgstr "尺寸:"
 msgid "F_ont..."
 msgstr "字型(_O)..."
 
-# addressbook/printing/e-contact-print.glade.h:8
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "字型"
 
-# addressbook/printing/e-contact-print.glade.h:9
 #: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "頁尾:"
 
-# addressbook/printing/e-contact-print.glade.h:10
 #: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "格式"
 
-# addressbook/printing/e-contact-print.glade.h:11
 #: ../addressbook/printing/e-contact-print.glade.h:11
 #: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
@@ -4251,17 +3797,14 @@ msgstr "格式"
 msgid "Header"
 msgstr "頁首"
 
-# addressbook/printing/e-contact-print.glade.h:12
 #: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "頁首/頁尾"
 
-# addressbook/printing/e-contact-print.glade.h:13
 #: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "標頭"
 
-# addressbook/printing/e-contact-print.glade.h:14
 #: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "每封信的標頭"
@@ -4270,38 +3813,30 @@ msgstr "每封信的標頭"
 msgid "Height:"
 msgstr "高度:"
 
-# addressbook/printing/e-contact-print.glade.h:16
 #: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "一個緊接着另一個"
 
-# addressbook/printing/e-contact-print.glade.h:17
 #: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "包含:"
 
-# addressbook/printing/e-contact-print.glade.h:18
 #: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "橫向"
 
-# addressbook/printing/e-contact-print.glade.h:19
 #: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "左:"
 
-# addressbook/printing/e-contact-print.glade.h:20
 #: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "字母標籤於旁邊"
 
-# addressbook/printing/e-contact-print.glade.h:21
 #: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "邊界"
 
-# addressbook/printing/e-contact-print.glade.h:22
-# executive-summary/component/executive-summary-config.glade.h:4
 #: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "欄數:"
@@ -4310,63 +3845,53 @@ msgstr "欄數:"
 msgid "Options"
 msgstr "選項"
 
-# addressbook/printing/e-contact-print.glade.h:24
 #: ../addressbook/printing/e-contact-print.glade.h:24
 #: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "紙張方向"
 
-# addressbook/printing/e-contact-print.glade.h:25
 #: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "頁"
 
-# addressbook/printing/e-contact-print.glade.h:26
 #: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "頁面設定:"
 
-# addressbook/printing/e-contact-print.glade.h:27
 #: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "使用紙張"
 
-# addressbook/printing/e-contact-print.glade.h:28
 #: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "紙張來源:"
 
-# addressbook/printing/e-contact-print.glade.h:29
 #: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "直向"
 
-# addressbook/printing/e-contact-print.glade.h:30
 #: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "預覽:"
 
-# addressbook/printing/e-contact-print.glade.h:31
+# zh_HK: msgstr "使用灰階打印"
 #: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
-msgstr "使用灰階列印"
+msgstr "使用灰階打印"
 
-# addressbook/printing/e-contact-print.glade.h:32
+# zh_HK: msgstr "偶數頁反向打印"
 #: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
-msgstr "偶數頁以反向列印"
+msgstr "偶數頁反向打印"
 
-# addressbook/printing/e-contact-print.glade.h:33
 #: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "右:"
 
-# addressbook/printing/e-contact-print.glade.h:34
 #: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "區段:"
 
-# addressbook/printing/e-contact-print.glade.h:35
 #: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "網底"
@@ -4379,17 +3904,14 @@ msgstr "網底"
 msgid "Size:"
 msgstr "大小:"
 
-# addressbook/printing/e-contact-print.glade.h:37
 #: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "開始於新頁"
 
-# addressbook/printing/e-contact-print.glade.h:38
 #: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "樣式名稱:"
 
-# addressbook/printing/e-contact-print.glade.h:39
 #: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "上:"
@@ -4401,48 +3923,47 @@ msgstr "類型:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:41
 msgid "Width:"
-msgstr "寬度:"
+msgstr "闊度:"
 
 #: ../addressbook/printing/e-contact-print.glade.h:42
 msgid "_Font..."
 msgstr "字型(_F)..."
 
-# addressbook/contact-editor/contact-editor.glade.h:7
+# zh_HK: msgstr "連絡人打印樣式編輯器測試"
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
-msgstr "聯絡人列印樣式編輯器測試"
+msgstr "連絡人打印樣式編輯器測試"
 
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
 #: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
+msgstr "版權所有 (C) 2000, Ximian, Inc."
 
+# zh_HK: msgstr "這可以測試連絡人打印樣式編輯器工具"
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
-msgstr "這可以測試聯絡人列印樣式編輯器工具"
+msgstr "這可以測試連絡人打印樣式編輯器工具"
 
-# ui/evolution-addressbook.xml.h:17
+# zh_HK: msgstr "連絡人打印測試"
 #: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
-msgstr "聯絡人列印測試"
+msgstr "連絡人打印測試"
 
+# zh_HK: msgstr "這可以測試連絡人打印代碼"
 #: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
-msgstr "這可以測試聯絡人列印代碼"
+msgstr "這可以測試連絡人打印代碼"
 
-# camel/camel-filter-driver.c:671
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "無法開啟檔案"
 
-# camel/camel-provider.c:140
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr "無法取得通訊錄清單"
 
-# addressbook/gui/component/addressbook.c:438
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
@@ -4461,12 +3982,8 @@ msgstr "列出本地通訊錄資料夾"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "Show cards as vcard or csv file"
-msgstr "將咭片顯示成 vcard 或 csv 檔案"
+msgstr "將卡片顯示成 vcard 或 csv 檔案"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
@@ -4478,7 +3995,7 @@ msgstr "在非同步模式匯出"
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid ""
 "The number of cards in one output file in asychronous mode, default size 100."
-msgstr "非同步模式下，一個輸出檔案中的咭片數目，預設大小是 100。"
+msgstr "非同步模式下，一個輸出檔案中的卡片數目，預設大小是 100。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
 msgid "NUMBER"
@@ -4501,23 +4018,18 @@ msgstr "在非同步模式下，輸出必須是檔案。"
 msgid "In normal mode, there is no need for the size option."
 msgstr "在一般模式下，不需要大小選項。"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
-# composer/e-msg-composer.c:805
 #: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "載入預設目錄服務時發生錯誤"
 
-# ui/evolution-message-composer.xml.h:49
 #: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "輸入檔案"
 
-# camel/camel-pgp-context.c:1073
 #: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "沒有提供檔案名稱。"
@@ -4575,106 +4087,77 @@ msgstr "會刪除此會議的所有資訊而且無法復原。"
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
 
-# calendar/gui/dialogs/delete-comp.c:93
 #: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "確定要刪除 '{0}'工作？"
 
-# calendar/gui/dialogs/delete-comp.c:84
 #: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "確定要刪除標題為 '{0}' 的約會？"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "確定要刪除日誌項目 '{0}'？"
 
-# calendar/gui/dialogs/delete-comp.c:84
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "確定要刪除這 {0} 約會？"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "確定要刪除這 {0} 日誌項目？"
 
-# calendar/gui/dialogs/delete-comp.c:93
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "確定要刪除這 {0} 工作？"
 
-# calendar/gui/dialogs/delete-comp.c:120
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "確定要刪除此約會？"
 
-# calendar/gui/dialogs/delete-comp.c:130
 #: ../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 "確定要刪除此日誌項目？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../calendar/calendar.error.xml.h:19
 #: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議？"
 
-# calendar/gui/dialogs/delete-comp.c:125
 #: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作？"
 
-# mail/mail-callbacks.c:1085
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "你確定要傳送沒有摘要的約會？"
 
-# mail/mail-callbacks.c:1085
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "你確定要傳送沒有摘要的工作？"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
 msgstr "不能建立新的事件"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
 #: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」？"
 
-# ui/evolution-contact-editor.xml.h:2
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete memo list '{0}'?"
 msgstr "刪除備忘錄清單「{0}」？"
 
-# ui/evolution-contact-editor.xml.h:2
 #: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
 msgstr "刪除工作清單「{0}」？"
 
-# shell/e-shortcuts-view.c:265
 #: ../calendar/calendar.error.xml.h:27
 msgid "Do _not Send"
 msgstr "不要傳送(_N)"
 
-# calendar/gui/dialogs/delete-comp.c:120
 #: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下載尚在進行中。你是否要儲存此約會？"
@@ -4691,25 +4174,21 @@ msgstr "無法載入編輯器。"
 msgid ""
 "Email invitations will be sent to all participants and allow them to accept "
 "this task."
-msgstr "電郵邀請會傳送給所有參與者並讓他們接受此工作。"
+msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此工作。"
 
 #: ../calendar/calendar.error.xml.h:32
 msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
-msgstr "電郵邀請函會傳送給所有參與者並讓他們回覆。"
+msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
-# calendar/conduits/calendar/calendar-conduit.c:687
-# calendar/conduits/todo/todo-conduit.c:501
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
 msgstr "載入行事曆時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading memo list"
 msgstr "載入備忘錄清單時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
@@ -4760,12 +4239,10 @@ msgstr "這裏有一些需要下載的附件。儲存此工作將會失去這些
 msgid "Some features may not work properly with your current server."
 msgstr "某些功能可能無法在你目前的伺服器版本上正常運作。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 行事曆已經意外結束。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 備忘錄已經意外結束。"
@@ -4796,24 +4273,20 @@ msgstr "這個備忘錄清單將會被永遠移除。"
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
-msgstr "這個工作清單將會被永遠移除。"
+msgstr "這項工作清單將會被永遠移除。"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的更改？"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this memo?"
 msgstr "要儲存對此備忘錄所做的更改？"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的更改？"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "要傳送此日誌項目的取消通知？"
@@ -4843,17 +4316,13 @@ 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 的問題。最好的"
-"解決方案是將該伺服器升級至支援的版本。"
+msgstr "你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版本。"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
-msgstr ""
-"你選擇了一個唯讀的行事曆來源。請切換到行事曆檢視並選取一個能加入約會的行事"
-"曆。"
+msgstr "你選擇了一個唯讀的行事曆來源。請切換到行事曆檢視並選取一個能加入約會的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
@@ -4893,13 +4362,11 @@ msgstr "儲存(_S)"
 msgid "_Save Changes"
 msgstr "儲存更改(_S)"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:73
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "傳送(_S)"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:74
 msgid "_Send Notice"
 msgstr "傳送通知(_S)"
@@ -4917,9 +4384,6 @@ msgstr "輸入密碼"
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
-# addressbook/conduit/address-conduit.c:654
-# calendar/conduits/calendar/calendar-conduit.c:731
-# calendar/conduits/todo/todo-conduit.c:545
 #: ../calendar/conduits/calendar/calendar-conduit.c:1432
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
@@ -4929,54 +4393,40 @@ msgstr "分割多日事件:"
 msgid "Could not start evolution-data-server"
 msgstr "無法啟動 Evolution 資料伺服器"
 
-# calendar/conduits/calendar/calendar-conduit.c:786
-# calendar/conduits/calendar/calendar-conduit.c:789
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
 msgstr "無法讀取 pilot 備忘錄程式區塊"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
 msgid "Could not write pilot's Memo application block"
 msgstr "無法寫入 pilot 備忘錄程式區塊"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/todo/todo-conduit.c:1151
 #: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-# ui/evolution-mail.xml.h:110
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:1358
 msgid "Calendars"
@@ -4986,47 +4436,38 @@ msgstr "行事曆"
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "在這裏設定你的時區、行事曆與工作清單"
 
-# ui/evolution-mail.xml.h:110
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution 行事曆和工作"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution 行事曆組態控制"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution 行事曆排程訊息檢視器"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution 行事曆/工作編輯器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution 的行事曆配件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
 msgstr "Evolution 的備忘錄元件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolution 的工作配件"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "備忘錄(_S)"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../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/memos-component.c:531
@@ -5056,7 +4497,6 @@ msgstr "行事曆(_C)"
 msgid "_Tasks"
 msgstr "工作(_T)"
 
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
@@ -5064,8 +4504,8 @@ msgstr "Evolution 行事曆鬧鈴通知服務"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "分"
-msgstr[1] "分"
+msgstr[0] "分鐘"
+msgstr[1] "分鐘"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
@@ -5076,20 +4516,18 @@ msgstr[1] "分"
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgid_plural "hours"
-msgstr[0] "時"
+msgstr[0] "小時"
+msgstr[1] "小時"
 
-# calendar/gui/event-editor-dialog.glade.h:31
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
 msgid "Start time"
 msgstr "開始時刻"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
 msgstr "約會"
 
-# addressbook/backend/ebook/e-card.c:3442
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1616
@@ -5099,7 +4537,6 @@ msgstr "約會"
 msgid "Location:"
 msgstr "位置:"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:4
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
@@ -5123,24 +4560,20 @@ msgstr "編輯(_E)"
 msgid "_Snooze"
 msgstr "延期(_S)"
 
-# calendar/gui/event-editor-dialog.glade.h:44
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "約會的地點"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1452
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1461
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1471
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
@@ -5150,7 +4583,6 @@ msgstr "沒有可用的地點資訊。"
 msgid "You have %d alarms"
 msgstr "你有 %d 個鬧鈴"
 
-# widgets/misc/e-messagebox.c:159
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 msgid "Warning"
@@ -5163,9 +4595,9 @@ msgid ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 msgstr ""
-"Evolution 尚未支援使用電郵通知的\n"
+"Evolution 尚未支援使用電子郵件通知的\n"
 "行事曆提醒，但是這個提醒被設定為\n"
-"送出電郵。  Evolution 會顯示\n"
+"送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1728
@@ -5185,38 +4617,22 @@ msgstr ""
 "\n"
 "你確定要執行這個程式？"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1742
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1092
-# addressbook/gui/component/addressbook-factory.c:42
-# calendar/conduits/calendar/calendar-conduit.c:1151
-# calendar/conduits/todo/todo-conduit.c:965
-# calendar/gui/alarm-notify/notify-main.c:98
-# calendar/gui/main.c:57
 #: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
-# calendar/gui/alarm-notify/notify-main.c:108
 #: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
-# calendar/gui/event-editor-dialog.glade.h:30
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "失效時間"
 
-# calendar/gui/event-editor.c:1553
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:113
@@ -5226,7 +4642,6 @@ msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-# calendar/gui/event-editor.c:1558
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
 #: ../calendar/gui/misc.c:119
@@ -5236,7 +4651,6 @@ msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-# calendar/gui/event-editor.c:1563
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
@@ -5248,8 +4662,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "鬧鈴程式"
@@ -5266,8 +4678,6 @@ msgstr "今天到期的工作背景色彩，使用 \"#rrggbb\" 格式。"
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "過期工作的背景色彩，使用 \"#rrggbb\" 格式。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
@@ -5281,12 +4691,10 @@ msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日檢視中用來繪製 Marcus Bains 線的色彩"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示"
 
-# mail/mail-ops.c:1449
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Confirm expunge"
 msgstr "清空時確認"
@@ -5295,12 +4703,10 @@ msgstr "清空時確認"
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "必須指明工作日開始與結束於幾時。"
 
-# ui/evolution-event-editor.xml.h:18
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
@@ -5309,7 +4715,6 @@ msgstr "預設提醒的單位"
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Event Gradient"
 msgstr "事件漸層效果"
@@ -5318,12 +4723,10 @@ msgstr "事件漸層效果"
 msgid "Event Transparency"
 msgstr "事件透明效果"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "空閒/忙碌伺服器網址"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Free/busy template URL"
 msgstr "空閒/忙碌範本網址"
@@ -5332,14 +4735,10 @@ msgstr "空閒/忙碌範本網址"
 msgid "Gradient of the events in calendar views."
 msgstr "行事曆檢視中的事件漸層效果。"
 
-# ui/evolution-mail.xml.h:43
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Hide completed tasks"
 msgstr "隱藏已完成的工作"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hide task units"
 msgstr "隱藏工作單位"
@@ -5408,7 +4807,6 @@ msgstr "決定預設提醒的單位數目。"
 msgid "Number of units for determining when to hide tasks."
 msgstr "決定何時隱藏工作的單位數目。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
@@ -5417,15 +4815,13 @@ msgstr "過期的工作色彩"
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
-msgstr ""
-"水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
+msgstr "水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr ""
-"水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
+msgstr "水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid ""
@@ -5443,15 +4839,13 @@ msgstr "垂直窗格的位置，在工作清單與工作預覽窗格之間，以
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr ""
-"垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
+msgstr "垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 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 ""
-"垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
+msgstr "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Programs that are allowed to be run by alarms."
@@ -5465,7 +4859,6 @@ msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
@@ -5482,7 +4875,6 @@ msgstr "在通知匣中顯示鬧鈴畫面"
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "Show the \"Preview\" pane"
@@ -5501,12 +4893,10 @@ msgstr "在事件/會議編輯器中顯示 時區 欄位"
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Show week numbers in date navigator"
 msgstr "在日期導覽顯示週數"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
@@ -5520,17 +4910,13 @@ msgstr "工作垂直窗格位置"
 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 要替換為網域名稱。"
+msgstr "作為空閒/忙碌資料回饋之用的網址範本，%u 要以電子郵件位址的使用者名稱部分來取代，而 %d 要替換為網域名稱。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 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\"。"
+msgstr "用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 \"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Time divisions"
@@ -5540,7 +4926,6 @@ msgstr "時間分隔"
 msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Timezone"
 msgstr "時區"
@@ -5549,8 +4934,7 @@ msgstr "時區"
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
-msgstr ""
-"行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
+msgstr "行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Twenty four hour time format"
@@ -5591,7 +4975,6 @@ msgid ""
 "Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
@@ -5601,7 +4984,6 @@ msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在行事曆中繪出 Marcus Bains 線（代表目前時刻的直線）。"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在工作檢視中隱藏完成的工作。"
@@ -5610,22 +4992,18 @@ msgstr "是否在工作檢視中隱藏完成的工作。"
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否設定約會的預設提醒。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
@@ -5635,17 +5013,14 @@ msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是否使用 24 小時制時間而不是使用上午/下午。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期導覽中顯示週數。"
@@ -5662,7 +5037,6 @@ msgstr "工作日"
 msgid "Workday end hour"
 msgstr "工作日結束小時"
 
-# shell/e-shell-view-menu.c:590
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
 msgid "Workday end minute"
 msgstr "工作日結束分鐘"
@@ -5679,27 +5053,22 @@ msgstr "工作日開始分鐘"
 msgid "daylight savings time"
 msgstr "日光節約時間"
 
-# calendar/gui/gnome-cal.c:234
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "主旨包含"
 
-# calendar/gui/gnome-cal.c:235
 #: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "描述包含"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "分類為"
 
-# calendar/gui/gnome-cal.c:236
 #: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "備註包含"
 
-# calendar/gui/gnome-cal.c:235
 #: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "位置包含"
@@ -5708,31 +5077,24 @@ msgstr "位置包含"
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
+# zh_HK: msgstr "打印"
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
 #: ../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 "列印"
+msgstr "打印"
 
 #: ../calendar/gui/calendar-commands.c:348
 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 ""
-"此作業會永久性刪除比選取時間還舊的所有事件。如果你繼續，將無法復原這些事件。"
+msgstr "此作業會永久性刪除比選取時間還舊的所有事件。如果你繼續，將無法復原這些事件。"
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
-msgstr "清除事件早於"
+msgstr "清除早於這段時間的事件"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
@@ -5764,12 +5126,10 @@ msgstr "生日和週年紀念日"
 msgid "Weather"
 msgstr "天氣"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/calendar-component.c:579
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-# calendar/gui/e-itip-control.glade.h:8
 #: ../calendar/gui/calendar-component.c:896
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
@@ -5783,13 +5143,10 @@ msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/calendar-component.c:1333
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../calendar/gui/calendar-component.c:1541
 msgid "New appointment"
 msgstr "新增約會"
@@ -5798,13 +5155,10 @@ msgstr "新增約會"
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-# ui/evolution-calendar.xml.h:5
 #: ../calendar/gui/calendar-component.c:1543
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/calendar-component.c:1549
 msgid "New meeting"
 msgstr "新增會議"
@@ -5813,13 +5167,10 @@ msgstr "新增會議"
 msgid "M_eeting"
 msgstr "會議(_M)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/calendar-component.c:1551
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../calendar/gui/calendar-component.c:1557
 msgid "New all day appointment"
 msgstr "新的全日約會"
@@ -5828,12 +5179,10 @@ msgstr "新的全日約會"
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-# ui/evolution-calendar.xml.h:5
 #: ../calendar/gui/calendar-component.c:1559
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/calendar-component.c:1565
 msgid "New calendar"
 msgstr "新行事曆"
@@ -5842,33 +5191,26 @@ msgstr "新行事曆"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-# ui/evolution.xml.h:10
 #: ../calendar/gui/calendar-component.c:1567
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "日檢視"
 
-# ui/evolution-calendar.xml.h:35
 #: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "工作週檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "週檢視"
 
-# ui/evolution-calendar.xml.h:15
 #: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "月檢視"
 
-# calendar/conduits/calendar/calendar-conduit.c:687
-# calendar/conduits/todo/todo-conduit.c:501
 #: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "開啟行事曆時發生錯誤"
@@ -5877,41 +5219,30 @@ msgstr "開啟行事曆時發生錯誤"
 msgid "Method not supported when opening the calendar"
 msgstr "開啟行事曆時不支援方法"
 
-# shell/e-storage.c:475
 #: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許可權來開啟行事曆"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-dialog.c:614
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>鬧鈴</b>"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>選項</b>"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>重複</b>"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "新增鬧鈴"
@@ -5928,8 +5259,6 @@ msgstr "自訂鬧鈴聲音"
 msgid "Mes_sage:"
 msgstr "訊息(_S):"
 
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
@@ -5940,24 +5269,19 @@ msgstr "播放音效"
 msgid "Pop up an alert"
 msgstr "顯示提示"
 
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "執行外部程式"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "收件者："
 
-# calendar/gui/event-editor-dialog.glade.h:23
-# calendar/gui/event-editor.c:1594
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
-msgstr "傳送電郵"
+msgstr "傳送電子郵件"
 
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:13
 msgid "_Arguments:"
@@ -5975,17 +5299,14 @@ msgstr "重複鬧鈴(_R)"
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "之後"
 
-# calendar/gui/event-editor-dialog.glade.h:34
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "之前"
 
-# calendar/gui/event-editor-dialog.glade.h:35
 #. 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
@@ -5993,7 +5314,6 @@ msgstr "之前"
 msgid "day(s)"
 msgstr "日"
 
-# calendar/gui/event-editor-dialog.glade.h:36
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "約會結束"
@@ -6002,18 +5322,14 @@ msgstr "約會結束"
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-# calendar/gui/event-editor-dialog.glade.h:39
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
-msgstr "時"
+msgstr "小時"
 
-# calendar/gui/event-editor-dialog.glade.h:42
-# mail/mail-config.glade.h:87
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
-msgstr "分"
+msgstr "分鐘"
 
-# calendar/gui/event-editor-dialog.glade.h:44
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "約會開始"
@@ -6026,7 +5342,6 @@ msgstr "動作/觸發"
 msgid "A_dd"
 msgstr "加入(_A)"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
@@ -6042,13 +5357,10 @@ msgstr "鬧鈴"
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-# composer/e-msg-composer-attachment-bar.c:421
-# ui/evolution-message-composer.xml.h:2
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
@@ -6071,7 +5383,7 @@ msgstr ""
 #, no-c-format
 msgid ""
 "<i>%u and %d will be replaced by user and domain from the email address.</i>"
-msgstr "<i>%u 與 %d 會被替換為電郵位址中的使用者與網域名稱。</i>"
+msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:8
@@ -6088,12 +5400,10 @@ msgstr "<span weight=\"bold\">預設空閒/忙碌伺服器</span>"
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">一般</span>"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">工作清單</span>"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">時間</span>"
@@ -6110,8 +5420,6 @@ msgstr "調整日光節約時間(_V)"
 msgid "Day _ends:"
 msgstr "一日結束於(_E):"
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "顯示"
@@ -6156,8 +5464,6 @@ msgstr ""
 "星期六\n"
 "星期日"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 #: ../mail/mail-config.glade.h:105
@@ -6183,7 +5489,6 @@ msgstr "選擇鬧鈴通知的行事曆"
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
@@ -6203,8 +5508,6 @@ msgstr "今天到期的工作(_A):"
 msgid "T_hu"
 msgstr "週四(_H)"
 
-# addressbook/contact-editor/e-contact-editor.c:1259
-# addressbook/gui/widgets/e-addressbook-view.c:722
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Template:"
 msgstr "樣板:"
@@ -6220,13 +5523,10 @@ msgstr "星期四"
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "時刻格式:"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-# calendar/gui/event-editor.c:476
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:727
@@ -6260,7 +5560,6 @@ msgstr "_24 小時"
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
@@ -6274,7 +5573,6 @@ msgstr "一日開始於(_D):"
 msgid "_Fri"
 msgstr "週五(_F)"
 
-# ui/evolution-mail.xml.h:43
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
@@ -6293,7 +5591,6 @@ msgstr "過期的工作(_O):"
 msgid "_Sat"
 msgstr "週六(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
@@ -6312,7 +5609,6 @@ msgstr "週二(_T)"
 msgid "_Wed"
 msgstr "週三(_W)"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr "前"
@@ -6334,49 +5630,34 @@ msgstr "複製備忘錄清單內容至本地以便離線作業(_Y)"
 msgid "C_olor:"
 msgstr "色彩(_O):"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "工作清單"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "備忘錄清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/dialogs/calendar-setup.c:479
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/calendar-setup.c:481
 msgid "New Calendar"
 msgstr "新行事曆"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.c:566
 msgid "Task List Properties"
 msgstr "工作清單"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/dialogs/calendar-setup.c:632
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 msgid "Add Calendar"
 msgstr "新增行事曆"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Task List"
 msgstr "新增工作清單"
@@ -6385,9 +5666,6 @@ msgstr "新增工作清單"
 msgid "_Add Calendar"
 msgstr "加入行事曆(_A)"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Task List"
 msgstr "新增工作清單(_A)"
@@ -6414,10 +5692,9 @@ msgstr "週"
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
 
-# addressbook/contact-editor/contact-editor.glade.h:34
 #: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
-msgstr "這個工作已刪除。"
+msgstr "這項工作已刪除。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
@@ -6439,7 +5716,7 @@ msgstr "這個事件已更改。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
-msgstr "這個工作已更改。"
+msgstr "這項工作已更改。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
@@ -6455,7 +5732,6 @@ msgstr "%s  你已經做了些更改。放棄這些更改並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  你沒有做任何更改，更新這個編輯器？"
 
-# camel/providers/local/camel-mbox-summary.c:879
 #: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
 msgid "Validation error: %s"
@@ -6465,18 +5741,10 @@ msgstr "確認上的錯誤： %s"
 msgid " to "
 msgstr " 到 "
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
 msgid " (Completed "
 msgstr " (已完成) "
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
 msgid "Completed "
 msgstr "已完成 "
@@ -6485,19 +5753,15 @@ msgstr "已完成 "
 msgid " (Due "
 msgstr "(期限)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
 msgid "Due "
 msgstr "期限 "
 
-# mail/mail-tools.c:219
 #: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
 #: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
@@ -6519,7 +5783,6 @@ msgstr "移動(_M)"
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
-# shell/e-setup.c:163
 #: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "無法更新物件"
@@ -6531,16 +5794,10 @@ msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> 個附加檔案"
 msgstr[1] "<b>%d</b> 個附加檔案"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:980
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附加檔案列(_B)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:983
 #: ../calendar/gui/dialogs/comp-editor.c:1468
 msgid "Show Attachment _Bar"
@@ -6564,16 +5821,12 @@ msgstr "移除(_R)"
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../calendar/gui/dialogs/comp-editor.c:1105
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3654
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:1492
 #: ../mail/em-format-html-display.c:2266
 msgid "Show Attachments"
@@ -6583,37 +5836,29 @@ msgstr "顯示附加檔案"
 msgid "Press space key to toggle attachment bar"
 msgstr "按下空白鍵切換附加檔案列"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:2
 #: ../calendar/gui/dialogs/comp-editor.c:2100
 #: ../calendar/gui/dialogs/comp-editor.c:2143
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/dialogs/comp-editor.c:2106
 #: ../calendar/gui/dialogs/comp-editor.c:2149
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/dialogs/comp-editor.c:2108
 #: ../calendar/gui/dialogs/comp-editor.c:2151
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-# calendar/gui/calendar-model.c:1578
 #: ../calendar/gui/dialogs/comp-editor.c:2112
 #: ../calendar/gui/dialogs/comp-editor.c:2155
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../calendar/gui/dialogs/comp-editor.c:2157
 #, c-format
@@ -6626,7 +5871,6 @@ msgstr "工作 - %s"
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
-# calendar/gui/e-calendar-table.c:159
 #: ../calendar/gui/dialogs/comp-editor.c:2128
 #: ../calendar/gui/dialogs/comp-editor.c:2170
 msgid "No summary"
@@ -6648,12 +5892,10 @@ msgstr "如果有新的更新，則會放棄對此項目所做的更改"
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "無法開啟來源"
 
-# calendar/gui/e-itip-control.c:883
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "無法開啟目的地"
@@ -6714,8 +5956,6 @@ msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
 msgid "The item could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除項目。"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "聯絡人..."
@@ -6729,12 +5969,10 @@ msgstr "委託給："
 msgid "Enter Delegate"
 msgstr "輸入代表"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/dialogs/event-editor.c:564
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-# calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:568
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
@@ -6757,7 +5995,6 @@ msgstr "會議召集人(_G):"
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.c:922
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
@@ -6770,7 +6007,6 @@ msgstr "無開始日期的事件"
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
-# calendar/gui/e-calendar-table.c:154
 #: ../calendar/gui/dialogs/event-page.c:1259
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:849
@@ -6781,7 +6017,6 @@ msgstr "開始日期錯誤"
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-# calendar/gui/event-editor-dialog.glade.h:31
 #: ../calendar/gui/dialogs/event-page.c:1292
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
@@ -6812,13 +6047,11 @@ msgstr "最少需要一個到會者。"
 msgid "_Add "
 msgstr "新增(_A)"
 
-# shell/e-storage.c:475
 #: ../calendar/gui/dialogs/event-page.c:2624
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d day before appointment"
@@ -6826,7 +6059,6 @@ msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
-# calendar/gui/event-editor-dialog.glade.h:36
 #: ../calendar/gui/dialogs/event-page.c:2935
 #, c-format
 msgid "%d hour before appointment"
@@ -6834,7 +6066,6 @@ msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d minute before appointement"
@@ -6863,22 +6094,18 @@ msgstr "自訂"
 msgid "None"
 msgstr "無"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "約會前 1 天"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "約會前 1 小時"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "約會前 15 分鐘"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "到會者(_S)..."
@@ -6897,9 +6124,6 @@ msgstr "自訂鬧鈴:"
 msgid "D_escription:"
 msgstr "描述(_E):"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件描述"
@@ -6909,7 +6133,6 @@ msgstr "事件描述"
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "鬧鈴(_A)"
@@ -6918,15 +6141,15 @@ msgstr "鬧鈴(_A)"
 msgid "_Time:"
 msgstr "時間(_T):"
 
-# calendar/gui/event-editor-dialog.glade.h:37
+# (Abel) 還有一處要用，就是加約會的 main dialog:
+# 時間(T):  [日期] [時間] [for] [1]時 [0]分鐘
 #. 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/event-page.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
-msgstr "舉行"
+msgstr "總共"
 
-# calendar/gui/event-editor-dialog.glade.h:45
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
@@ -6934,45 +6157,36 @@ msgstr "舉行"
 msgid "until"
 msgstr "直至"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "到會者"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../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/e-calendar-table.c:152
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:3
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "普通名稱"
 
-# calendar/gui/e-calendar-table.c:708
-# ui/evolution-task-editor-dialog.xml.h:19
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "委任自"
 
-# calendar/gui/e-calendar-table.c:708
-# ui/evolution-task-editor-dialog.xml.h:19
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:5
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "委派給"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:6
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "語言"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:7
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
@@ -6985,8 +6199,6 @@ msgstr "成員"
 msgid "RSVP"
 msgstr "RSVP"
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
@@ -7003,36 +6215,28 @@ msgstr "<b>到會者(_E)</b>"
 msgid "C_hange Organizer"
 msgstr "更改會議召集人(_H)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
 msgstr "聯絡人(_N)..."
 
-# calendar/gui/e-itip-control.glade.h:9
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
 msgstr "會議召集人"
 
-# calendar/gui/e-itip-control.glade.h:9
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "會議召集人:"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
 msgid "Memo"
 msgstr "備忘錄"
 
-# addressbook/gui/component/addressbook.c:438
 #: ../calendar/gui/dialogs/memo-page.c:868
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s」開啟備忘錄。"
 
-# mail/mail-format.c:762
-# mail/message-list.c:1083
 #: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1488
 #: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
@@ -7048,7 +6252,6 @@ msgstr "開始日(_R):"
 msgid "Su_mmary"
 msgstr "摘要(_M)"
 
-# addressbook/printing/e-contact-print.glade.h:39
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "收件者(_O):"
@@ -7057,61 +6260,44 @@ msgstr "收件者(_O):"
 #: ../calendar/gui/dialogs/task-page.c:434
 #: ../calendar/gui/dialogs/task-page.glade.h:9
 msgid "_Group:"
-msgstr "群組(_G):"
+msgstr "羣組(_G):"
 
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
 msgid "_Memo Content:"
 msgstr "備忘錄內容(_M):"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>行事曆選項</b>"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "Add New Calendar"
 msgstr "新增行事曆"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Calendar Group"
-msgstr "行事曆群組"
+msgstr "行事曆羣組"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Location"
 msgstr "行事曆位置"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Name"
 msgstr "行事曆名稱"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 msgid "<b>Task List Options</b>"
 msgstr "<b>工作清單選項</b>"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "Add New Task List"
 msgstr "新增工作清單"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Task List Group"
-msgstr "工作清單群組"
+msgstr "工作清單羣組"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Name"
 msgstr "工作清單名稱"
@@ -7145,13 +6331,10 @@ msgstr "此例項和先前的例項"
 msgid "This and Future Instances"
 msgstr "此例項和以後的例項"
 
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
 #: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "所有例項"
 
-# calendar/gui/event-editor.c:871
 #: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
@@ -7160,7 +6343,6 @@ msgstr "Evolution 無法編輯這個週期性約會。"
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
-# calendar/gui/event-editor.c:449
 #. 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
@@ -7200,7 +6382,6 @@ msgstr "三"
 msgid "fourth"
 msgstr "四"
 
-# addressbook/contact-editor/fullname.glade.h:8
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (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.
@@ -7209,8 +6390,6 @@ msgstr "四"
 msgid "last"
 msgstr "最後"
 
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
 #. 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
@@ -7241,12 +6420,10 @@ msgstr "11日至20日"
 msgid "21st to 31st"
 msgstr "21日至31日"
 
-# calendar/gui/event-editor.c:474
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "day"
 msgstr "天"
 
-# calendar/gui/event-editor.c:601
 #. 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])."
 #.
@@ -7254,36 +6431,27 @@ msgstr "天"
 msgid "on the"
 msgstr "在第"
 
-# calendar/gui/event-editor.c:754
 #: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "次"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
 #: ../calendar/gui/dialogs/recurrence-page.c:2378
 msgid "Date/Time"
 msgstr "日期/時間"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>例外</b>"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>預覽</b>"
 
-# calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>週期</b>"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #. 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/recurrence-page.glade.h:6
@@ -7296,52 +6464,41 @@ msgstr "每"
 msgid "This appointment rec_urs"
 msgstr "這個約會的循環規則為(_U)"
 
-# calendar/gui/event-editor-dialog.glade.h:38
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "永遠"
 
-# calendar/gui/event-editor-dialog.glade.h:43
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "月"
 
-# calendar/gui/event-editor-dialog.glade.h:46
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "週"
 
-# calendar/gui/event-editor-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "年"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../calendar/gui/dialogs/task-details-page.c:411
 #: ../calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "網頁"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">雜項</span>"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">狀態</span>"
@@ -7358,21 +6515,12 @@ msgstr "<span weight=\"bold\">狀態</span>"
 msgid "Completed"
 msgstr "已完成"
 
-# calendar/gui/calendar-model.c:497
-# calendar/gui/calendar-model.c:1066
-# calendar/gui/dialogs/task-editor-dialog.glade.h:10
-# calendar/gui/e-calendar-table.c:345
-# mail/message-list.c:689
 #: ../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:1031
 msgid "High"
 msgstr "高"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
 #: ../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
@@ -7382,11 +6530,6 @@ msgstr "高"
 msgid "In Progress"
 msgstr "進行中"
 
-# calendar/gui/calendar-model.c:501
-# calendar/gui/calendar-model.c:1070
-# calendar/gui/dialogs/task-editor-dialog.glade.h:12
-# calendar/gui/e-calendar-table.c:347
-# mail/message-list.c:687
 #: ../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:1029
@@ -7400,10 +6543,6 @@ msgstr "低"
 msgid "Normal"
 msgstr "正常"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../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
@@ -7416,14 +6555,10 @@ msgstr "未開始"
 msgid "P_ercent complete:"
 msgstr "完成百分比(_E):"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Stat_us:"
 msgstr "狀態(_U):"
 
-# calendar/gui/calendar-model.c:1064
-# calendar/gui/dialogs/task-editor-dialog.glade.h:22
-# calendar/gui/e-calendar-table.c:348
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:390
 msgid "Undefined"
@@ -7447,8 +6582,6 @@ msgstr "網頁(_W):"
 msgid "_Task"
 msgstr "工作(_T)"
 
-# addressbook/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../calendar/gui/dialogs/task-editor.c:429
 msgid "Task Details"
 msgstr "工作詳細資料"
@@ -7457,13 +6590,11 @@ msgstr "工作詳細資料"
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-# addressbook/gui/component/addressbook.c:438
 #: ../calendar/gui/dialogs/task-page.c:1650
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法在 '%s' 開啟工作。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "到會者(_N)..."
@@ -7496,7 +6627,6 @@ msgstr "<b>發佈頻率</b>"
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>發佈位置(_L)</b>"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "Free/Busy Publishing Settings"
 msgstr "空閒/忙碌發佈設定"
@@ -7514,8 +6644,6 @@ msgstr "手動(_M)"
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
@@ -7530,7 +6658,6 @@ msgstr "使用者名稱(_U):"
 msgid "_Weekly"
 msgstr "每週(_W)"
 
-# calendar/gui/event-editor.c:1543
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -7539,7 +6666,6 @@ msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-# calendar/gui/event-editor.c:1548
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:402
 #, c-format
@@ -7552,7 +6678,6 @@ msgstr[1] "%d 週"
 msgid "Unknown action to be performed"
 msgstr "要執行的未知動作"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:478
@@ -7560,7 +6685,6 @@ msgstr "要執行的未知動作"
 msgid "%s %s before the start of the appointment"
 msgstr "於約會開始前 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:483
@@ -7568,7 +6692,6 @@ msgstr "於約會開始前 %2$s%1$s"
 msgid "%s %s after the start of the appointment"
 msgstr "於約會開始後 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:490
@@ -7576,7 +6699,6 @@ msgstr "於約會開始後 %2$s%1$s"
 msgid "%s at the start of the appointment"
 msgstr "%s 於約會開始時"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:501
@@ -7584,7 +6706,6 @@ msgstr "%s 於約會開始時"
 msgid "%s %s before the end of the appointment"
 msgstr "於約會結束前 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1624
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:506
@@ -7592,7 +6713,6 @@ msgstr "於約會結束前 %2$s%1$s"
 msgid "%s %s after the end of the appointment"
 msgstr "於約會結束後 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1624
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:513
@@ -7614,7 +6734,6 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2861
 #, c-format
@@ -7626,16 +6745,12 @@ msgstr "按一下來開啟 %s"
 msgid "Untitled"
 msgstr "未命名"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #: ../calendar/gui/e-cal-component-memo-preview.c:204
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "開始日期："
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-memo-preview.c:217
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
@@ -7645,25 +6760,21 @@ msgstr "開始日期："
 msgid "Description:"
 msgstr "描述:"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../calendar/gui/e-cal-component-memo-preview.c:250
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "網頁："
 
-# calendar/gui/e-itip-control.glade.h:11
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "摘要:"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:25
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "截止日期："
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
@@ -7673,47 +6784,34 @@ msgstr "截止日期："
 msgid "Status:"
 msgstr "狀態:"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "優先程度："
 
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
 #: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
 #: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
 msgid "Public"
 msgstr "公開"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:366
 msgid "Private"
 msgstr "私人"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:367
 msgid "Confidential"
 msgstr "機密"
 
-# calendar/gui/e-calendar-table.c:153
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "結束日期"
 
-# calendar/gui/e-calendar-table.c:154
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "開始日期"
 
-# calendar/gui/e-calendar-table.c:159
 #: ../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
@@ -7721,20 +6819,17 @@ msgstr "開始日期"
 msgid "Summary"
 msgstr "摘要"
 
-# ui/evolution-calendar.xml.h:36
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:439
 msgid "Free"
 msgstr "空閒"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:440
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "忙碌"
 
-# calendar/gui/calendar-model.c:970
 #: ../calendar/gui/e-cal-model-tasks.c:610
 msgid ""
 "The geographical position must be entered in the format: \n"
@@ -7745,7 +6840,6 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-# calendar/gui/calendar-model.c:1584
 #: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
@@ -7754,7 +6848,6 @@ msgstr ""
 msgid "Yes"
 msgstr "是"
 
-# calendar/gui/calendar-model.c:1584
 #: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:178
@@ -7778,28 +6871,22 @@ msgstr "否"
 msgid "Unknown"
 msgstr "不明"
 
-# calendar/gui/calendar-model.c:1576
 #: ../calendar/gui/e-cal-model.c:926
 msgid "Recurring"
 msgstr "循環模式"
 
-# calendar/gui/calendar-model.c:1578
 #: ../calendar/gui/e-cal-model.c:928
 msgid "Assigned"
 msgstr "已指定"
 
-# widgets/misc/e-filter-bar.h:94
-# widgets/misc/e-filter-bar.h:101
 #: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "另存新檔..."
 
-# mail/mail-display.c:196
 #: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2112
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
-# mail/mail-search.c:138
 #: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
@@ -7820,68 +6907,55 @@ msgstr "設為背景(_B)"
 msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
 
-# mail/mail-display.c:299
 #: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-# calendar/gui/e-calendar-table.c:367
 #: ../calendar/gui/e-calendar-table.c:409
 msgid "0%"
 msgstr "0%"
 
-# calendar/gui/e-calendar-table.c:368
 #: ../calendar/gui/e-calendar-table.c:410
 msgid "10%"
 msgstr "10%"
 
-# calendar/gui/e-calendar-table.c:369
 #: ../calendar/gui/e-calendar-table.c:411
 msgid "20%"
 msgstr "20%"
 
-# calendar/gui/e-calendar-table.c:370
 #: ../calendar/gui/e-calendar-table.c:412
 msgid "30%"
 msgstr "30%"
 
-# calendar/gui/e-calendar-table.c:371
 #: ../calendar/gui/e-calendar-table.c:413
 msgid "40%"
 msgstr "40%"
 
-# calendar/gui/e-calendar-table.c:372
 #: ../calendar/gui/e-calendar-table.c:414
 msgid "50%"
 msgstr "50%"
 
-# calendar/gui/e-calendar-table.c:373
 #: ../calendar/gui/e-calendar-table.c:415
 msgid "60%"
 msgstr "60%"
 
-# calendar/gui/e-calendar-table.c:374
 #: ../calendar/gui/e-calendar-table.c:416
 msgid "70%"
 msgstr "70%"
 
-# calendar/gui/e-calendar-table.c:375
 #: ../calendar/gui/e-calendar-table.c:417
 msgid "80%"
 msgstr "80%"
 
-# calendar/gui/e-calendar-table.c:376
 #: ../calendar/gui/e-calendar-table.c:418
 msgid "90%"
 msgstr "90%"
 
-# calendar/gui/e-calendar-table.c:377
 #: ../calendar/gui/e-calendar-table.c:419
 msgid "100%"
 msgstr "100%"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/e-calendar-table.c:704
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
 msgid "Deleting selected objects"
@@ -7892,14 +6966,12 @@ msgstr "刪除選定的物件"
 msgid "Updating objects"
 msgstr "更新物件"
 
-# composer/e-msg-composer.c:774
 #: ../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:1348
 msgid "Save as..."
 msgstr "另存新檔..."
 
-# ui/evolution-tasks.xml.h:3
 #: ../calendar/gui/e-calendar-table.c:1277
 #: ../calendar/gui/e-calendar-view.c:1681
 msgid "New _Task"
@@ -7918,7 +6990,7 @@ msgstr "開啟網頁(_W)"
 #: ../ui/evolution-mail-message.xml.h:124 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
-msgstr "列印(_P)..."
+msgstr "打印(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1287
 #: ../calendar/gui/e-calendar-view.c:1704 ../calendar/gui/e-memo-table.c:908
@@ -7943,13 +7015,12 @@ msgstr "指派工作(_A)"
 #: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
-msgstr "以 iCalendar 轉寄(_F)"
+msgstr "以 iCale_ndar 轉寄"
 
 #: ../calendar/gui/e-calendar-table.c:1295
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-# calendar/gui/e-calendar-table.c:713
 #: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
@@ -7958,7 +7029,6 @@ msgstr "標示選定的工作為已完成(_M)"
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-# calendar/gui/e-calendar-table.c:713
 #: ../calendar/gui/e-calendar-table.c:1298
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "標示選定的工作為未完成(_M)"
@@ -7967,60 +7037,45 @@ msgstr "標示選定的工作為未完成(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-calendar-table.c:1536
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裏增加新的工作"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% 完成"
 
-# camel/camel-filter-driver.c:694
-# camel/camel-filter-driver.c:793
 #: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:652
 msgid "Complete"
 msgstr "完成"
 
-# calendar/gui/e-calendar-table.c:152
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "完成日期"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "截止日期"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-# calendar/gui/e-calendar-table.c:158
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Priority"
 msgstr "優先順序"
 
-# calendar/gui/e-calendar-table.c:154
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "開始日期"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "工作排序"
 
-# mail/mail-ops.c:898
 #: ../calendar/gui/e-calendar-view.c:1367
 msgid "Moving items"
 msgstr "移動項目"
 
-# mail/mail-ops.c:898
 #: ../calendar/gui/e-calendar-view.c:1369
 msgid "Copying items"
 msgstr "複製項目"
@@ -8033,8 +7088,6 @@ msgstr "新增約會(_A)..."
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/e-calendar-view.c:1680
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
@@ -8070,10 +7123,8 @@ msgstr "會議排程(_S)..."
 
 #: ../calendar/gui/e-calendar-view.c:1714
 msgid "_Forward as iCalendar..."
-msgstr "以 iCalendar 轉寄(_F)..."
+msgstr "以 iCale_ndar 轉寄..."
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
 #: ../calendar/gui/e-calendar-view.c:1715
 msgid "_Reply"
 msgstr "回覆(_R)"
@@ -8084,8 +7135,6 @@ msgstr "回覆(_R)"
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-# calendar/gui/e-day-view.c:3175
-# calendar/gui/e-week-view.c:3309
 #: ../calendar/gui/e-calendar-view.c:1721
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
@@ -8098,21 +7147,18 @@ msgstr "刪除這個事件(_O)"
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
-# calendar/gui/e-itip-control.glade.h:9
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-view.c:2175
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
 
-# calendar/gui/e-itip-control.glade.h:9
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-view.c:2179
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
-# addressbook/backend/ebook/e-card.c:3442
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
 #, c-format
@@ -8125,21 +7171,16 @@ msgstr "位置：%s"
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y-%m-%d (%a) %H:%M:%S"
 
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
 #. strftime format of a weekday, a date and a time, 12-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y-%m-%d (%a) %p %I:%M:%S"
 
-# calendar/gui/calendar-model.c:802
 #: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
 msgid ""
@@ -8151,7 +7192,6 @@ msgstr ""
 "\n"
 "%s"
 
-# calendar/gui/e-day-view-time-item.c:519
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
@@ -8161,9 +7201,6 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-# calendar/gui/e-day-view-top-item.c:274
-# calendar/gui/e-day-view.c:1294
-# calendar/gui/e-week-view-main-item.c:325
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
@@ -8177,30 +7214,22 @@ msgstr "間隔 %02i 分鐘"
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-# calendar/gui/e-day-view.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
 #. 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:1087
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "上午"
 
-# calendar/gui/e-day-view.c:573
-# calendar/gui/e-week-view.c:303
-# calendar/gui/print.c:616
 #. 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:1090
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "下午"
 
-# calendar/gui/event-editor-dialog.glade.h:26
 #: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
@@ -8208,7 +7237,6 @@ msgid_plural "Every %d days"
 msgstr[0] "每天"
 msgstr[1] "每 %d 天"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
@@ -8223,7 +7251,6 @@ msgid_plural "Every %d weeks on "
 msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " 和 "
@@ -8245,7 +7272,6 @@ msgid_plural "every %d months"
 msgstr[0] "每月"
 msgstr[1] "每 %d 月"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
@@ -8264,8 +7290,6 @@ msgstr[1] "總共 %d 次"
 msgid ", ending on "
 msgstr "，結束於 "
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
 #: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "開始"
@@ -8274,27 +7298,20 @@ msgstr "開始"
 msgid "Ends"
 msgstr "結束"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "截止"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #. Title
 #: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
 #: ../plugins/itip-formatter/itip-view.c:340
@@ -8321,7 +7338,6 @@ msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動�
 msgid "Accepted"
 msgstr "接受"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:688
 #: ../plugins/itip-formatter/itip-formatter.c:1751
 msgid "Tentatively Accepted"
@@ -8351,7 +7367,6 @@ msgstr "工作已經取消，但是在你的工作清單中找不到"
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "會議資訊"
@@ -8366,8 +7381,6 @@ msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請你出席此次會議。"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "會議提案"
@@ -8378,7 +7391,6 @@ msgstr "會議提案"
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
 msgstr "會議更新"
@@ -8397,8 +7409,6 @@ msgstr "會議更新請求"
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "會議答覆"
@@ -8408,8 +7418,6 @@ msgstr "會議答覆"
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../calendar/gui/e-itip-control.c:1343
 msgid "Meeting Cancelation"
 msgstr "會議取消"
@@ -8420,7 +7428,6 @@ msgstr "會議取消"
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
-# mail/mail-search.c:268
 #: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
@@ -8430,7 +7437,6 @@ msgstr "不正確的會議訊息"
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
-# widgets/misc/e-messagebox.c:152
 #: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "工作資訊"
@@ -8447,7 +7453,7 @@ msgstr "<b>%s</b> 要求你進行工作。"
 
 #: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
-msgstr "工作計畫"
+msgstr "工作計劃"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1398
@@ -8473,8 +7479,6 @@ msgstr "工作更新請求"
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
 #: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "工作回覆"
@@ -8488,7 +7492,6 @@ msgstr "<b>%s</b> 已經取消工作。"
 msgid "Task Cancelation"
 msgstr "工作取消"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
@@ -8498,7 +7501,6 @@ msgstr "不正確的工作訊息"
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
@@ -8508,7 +7510,6 @@ msgstr "空閒/忙碌資訊"
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求你的空閒/忙碌資訊。"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
@@ -8518,24 +7519,21 @@ msgstr "空閒/忙碌請求"
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
-# mail/mail-callbacks.c:1407
 #: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
-# camel/providers/local/camel-mbox-folder.c:368
 #: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
-msgstr "電郵似乎沒有被適當地組成"
+msgstr "郵件似乎沒有被適當地組成"
 
 #: ../calendar/gui/e-itip-control.c:1605
 msgid "The message contains only unsupported requests."
-msgstr "這個電郵只包含不支援的請求。"
+msgstr "這個郵件只包含不支援的請求。"
 
 #: ../calendar/gui/e-itip-control.c:1638
 msgid "The attachment does not contain a valid calendar message"
@@ -8545,7 +7543,6 @@ msgstr "附件並未包含合法的行事曆訊息"
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "更新完成\n"
@@ -8579,8 +7576,6 @@ msgstr "項目傳送！\n"
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
@@ -8594,7 +7589,6 @@ msgstr "更新"
 msgid "Accept"
 msgstr "接受"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "暫時接受"
@@ -8604,7 +7598,6 @@ msgstr "暫時接受"
 msgid "Decline"
 msgstr "婉拒"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
@@ -8613,55 +7606,44 @@ msgstr "送出空閒/忙碌資訊"
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
-# widgets/misc/e-messagebox.c:152
 #: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
-# ui/evolution-mail.xml.h:2
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:708
 #: ../mail/mail-send-recv.c:447 ../mail/mail-send-recv.c:500
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-# calendar/gui/e-itip-control.glade.h:3
 #: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--到--"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "行事曆訊息"
 
-# calendar/gui/e-itip-control.glade.h:5
 #: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "日期:"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "載入行事曆"
 
-# calendar/gui/e-itip-control.glade.h:8
 #: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "載入行事曆..."
 
-# calendar/gui/e-itip-control.glade.h:10
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "伺服器訊息:"
 
-# addressbook/gui/widgets/e-addressbook-view.c:712
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "主席"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/e-meeting-list-view.c:71
 #: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
@@ -8671,7 +7653,6 @@ msgstr "出席者"
 msgid "Optional Participants"
 msgstr "列席者"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "資源"
@@ -8687,9 +7668,8 @@ msgstr "個別"
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
-msgstr "群組"
+msgstr "羣組"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
@@ -8700,13 +7680,11 @@ msgstr "資源"
 msgid "Room"
 msgstr "會議室"
 
-# addressbook/contact-editor/e-contact-editor.c:1247
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "主席"
 
-# mail/mail-config.glade.h:61
 #: ../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
@@ -8723,15 +7701,12 @@ msgstr "列席者"
 msgid "Non-Participant"
 msgstr "缺席者"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../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
 msgid "Needs Action"
 msgstr "需要動作"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../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:411
@@ -8750,26 +7725,17 @@ msgstr "已委派"
 msgid "Attendee                          "
 msgstr "到會者"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "進行中"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. 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:2113
 msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
-# e-util/e-time-utils.c:269
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
@@ -8777,30 +7743,22 @@ msgstr "%A, %B %d, %Y"
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
 #: ../calendar/gui/e-meeting-time-sel.c:2146
 msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
+msgstr "%Y-%m-%d (%a)"
 
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:472
 msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
+msgstr "%Y-%m-%d"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "沒有資訊"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "A_ttendees..."
 msgstr "到會者(_T)..."
@@ -8833,22 +7791,18 @@ msgstr "自動選擇(_A)"
 msgid ">_>"
 msgstr ">_>"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:545
 #: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:558
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:571
 #: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:584
 #: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
@@ -8865,20 +7819,14 @@ msgstr "結束時刻(_E):"
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裏增加新的備忘錄"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
 msgstr "備忘錄排序"
 
-# mail/mail-mt.c:190
 #: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
 #: ../calendar/gui/gnome-cal.c:2743
 #, c-format
@@ -8889,56 +7837,45 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
 msgstr "正在載入備忘錄"
 
-# mail/mail-ops.c:1262
 #: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
-# camel/camel-smime-context.c:194
 #: ../calendar/gui/e-pub-utils.c:322
 #, c-format
 msgid "Enter the password for %s"
 msgstr "輸入 %s 的密碼"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/e-tasks.c:885
 msgid "Loading tasks"
 msgstr "正在載入工作"
 
-# mail/mail-ops.c:1262
 #: ../calendar/gui/e-tasks.c:972
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
-# calendar/gui/e-calendar-table.c:152
 #: ../calendar/gui/e-tasks.c:1217
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
-# mail/mail-ops.c:1449
 #: ../calendar/gui/e-tasks.c:1267
 msgid "Expunging"
 msgstr "除去中"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../calendar/gui/e-timezone-entry.c:135
 msgid "Select Timezone"
 msgstr "選擇一個時區"
 
-# calendar/gui/e-week-view-main-item.c:342
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
@@ -8951,7 +7888,6 @@ msgstr "%d %B"
 msgid "Updating query"
 msgstr "正在更新查詢"
 
-# widgets/menus/gal-view-menus.c:176
 #: ../calendar/gui/gnome-cal.c:2404
 msgid "_Custom View"
 msgstr "自訂檢視(_C)"
@@ -8960,41 +7896,30 @@ msgstr "自訂檢視(_C)"
 msgid "_Save Custom View"
 msgstr "儲存自訂檢視(_S)"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../calendar/gui/gnome-cal.c:2410
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../calendar/gui/gnome-cal.c:2574
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/gnome-cal.c:2593
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/gnome-cal.c:2602
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-# mail/mail-display.c:299
 #: ../calendar/gui/gnome-cal.c:2708
 #, c-format
 msgid "Opening %s"
 msgstr "開啟 %s"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
 #: ../calendar/gui/gnome-cal.c:3636
 msgid "Purging"
 msgstr "清除"
@@ -9043,7 +7968,6 @@ msgstr "十一月"
 msgid "October"
 msgstr "十月"
 
-# addressbook/gui/component/select-names/select-names.glade.h:3
 #: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "選擇日期"
@@ -9065,27 +7989,22 @@ msgstr "必須指定一個召集人。"
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
 msgid "Event information"
 msgstr "事件資訊"
 
-# widgets/misc/e-messagebox.c:152
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Task information"
 msgstr "工作資訊"
 
-# mail/mail-config.glade.h:47
 #: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Journal information"
 msgstr "日誌資訊"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/itip-utils.c:655
 msgid "Calendar information"
 msgstr "行事曆資訊"
@@ -9094,7 +8013,6 @@ msgstr "行事曆資訊"
 msgid "Updated"
 msgstr "已更新"
 
-# ui/evolution-subscribe.xml.h:4
 #: ../calendar/gui/itip-utils.c:712
 msgid "Refresh"
 msgstr "重整清單"
@@ -9103,13 +8021,11 @@ msgstr "重整清單"
 msgid "Counter-proposal"
 msgstr "計算計劃"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/itip-utils.c:788
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/itip-utils.c:798
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
@@ -9118,27 +8034,25 @@ msgstr "iCalendar 資訊"
 msgid "You must be an attendee of the event."
 msgstr "你必須是此事件的到會者。"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/memos-component.c:451
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-# calendar/gui/event-editor.c:1558
 #: ../calendar/gui/memos-component.c:527
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
-msgstr[0] "%d 備忘錄"
+msgstr[0] "%d 項備忘錄"
+msgstr[1] "%d 項備忘錄"
 
 #: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
-msgstr[0] "，%d 已選擇"
-msgstr[1] "，%d 已選擇"
+msgstr[0] "，已選擇 %d 個"
+msgstr[1] "，已選擇 %d 個"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/memos-component.c:576
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
@@ -9156,41 +8070,30 @@ msgstr "沒有可用的行事曆來建立備忘錄"
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/memos-component.c:1164
 msgid "New memo"
 msgstr "新增備忘錄"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/memos-component.c:1165
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/memos-component.c:1166
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/memos-component.c:1172
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
-# calendar/gui/event-editor.c:1558
 #: ../calendar/gui/memos-component.c:1173
 msgid "_Shared memo"
 msgstr "共用備忘錄(_S)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/memos-component.c:1174
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/memos-component.c:1180
 msgid "New memo list"
 msgstr "新備忘錄清單"
@@ -9199,17 +8102,14 @@ msgstr "新備忘錄清單"
 msgid "Memo li_st"
 msgstr "備忘錄清單(_S)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/memos-component.c:1182
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
-# ui/evolution-contact-editor.xml.h:6
-# ui/evolution-event-editor.xml.h:37
-# ui/evolution-task-editor-dialog.xml.h:40
+# zh_HK: msgstr "打印備忘錄"
 #: ../calendar/gui/memos-control.c:340
 msgid "Print Memos"
-msgstr "列印備忘錄"
+msgstr "打印備忘錄"
 
 #: ../calendar/gui/migration.c:162
 msgid ""
@@ -9238,340 +8138,267 @@ msgstr ""
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
-# shell/e-storage.c:475
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
-# addressbook/gui/component/addressbook.c:438
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法移轉工作 `%s'"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "1st"
 msgstr "1日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "2nd"
 msgstr "2日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "3rd"
 msgstr "3日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "4th"
 msgstr "4日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "5th"
 msgstr "5日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "6th"
 msgstr "6日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "7th"
 msgstr "7日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "8th"
 msgstr "8日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "9th"
 msgstr "9日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "10th"
 msgstr "10日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "11th"
 msgstr "11日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "12th"
 msgstr "12日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "13th"
 msgstr "13日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "14th"
 msgstr "14日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "15th"
 msgstr "15日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "16th"
 msgstr "16日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "17th"
 msgstr "17日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "18th"
 msgstr "18日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "19th"
 msgstr "19日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "20th"
 msgstr "20日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "21st"
 msgstr "21日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "22nd"
 msgstr "22日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "23rd"
 msgstr "23日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "24th"
 msgstr "24日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "25th"
 msgstr "25日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "26th"
 msgstr "26日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "27th"
 msgstr "27日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "28th"
 msgstr "28日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "29th"
 msgstr "29日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "30th"
 msgstr "30日"
 
-# calendar/gui/print.c:306
 #: ../calendar/gui/print.c:580
 msgid "31st"
 msgstr "31日"
 
-# calendar/gui/print.c:362
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
 #: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "日"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "一"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "二"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "三"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "四"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "五"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "六"
 
-# calendar/gui/print.c:1078
 #. Day
 #: ../calendar/gui/print.c:1936
 msgid "Selected day (%a %b %d %Y)"
-msgstr "選擇的日期(%a %b %d %Y)"
+msgstr "選擇的日期(%Y 年 %-m 月 %-d 日 (%a))"
 
-# calendar/gui/print.c:1092
-# calendar/gui/print.c:1096
 #: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
 msgid "%a %b %d"
-msgstr "%a %b %d"
+msgstr "%-m 月 %-d 日 (%a)"
 
-# calendar/gui/print.c:1093
 #: ../calendar/gui/print.c:1962
 msgid "%a %d %Y"
-msgstr "%a %d %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
-# calendar/gui/event-editor.c:3132
-# calendar/gui/print.c:1097
-# calendar/gui/print.c:1099
-# calendar/gui/print.c:1100
 #: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
 #: ../calendar/gui/print.c:1969
 msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
-# calendar/gui/print.c:1104
 #: ../calendar/gui/print.c:1973
 #, c-format
 msgid "Selected week (%s - %s)"
-msgstr "選擇的週(%s - %s)"
+msgstr "選定的週(%s - %s)"
 
-# calendar/gui/print.c:1112
 #. Month
 #: ../calendar/gui/print.c:1981
 msgid "Selected month (%b %Y)"
-msgstr "選擇的月(%b %Y)"
+msgstr "選定的月份(%Y 年 %-m 月)"
 
-# calendar/gui/print.c:1119
 #. Year
 #: ../calendar/gui/print.c:1988
 msgid "Selected year (%Y)"
-msgstr "選擇的年(%Y)"
+msgstr "選定的年份(%Y)"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/print.c:2317
 msgid "Appointment"
 msgstr "約會"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/print.c:2319
 msgid "Task"
 msgstr "工作"
 
-# calendar/gui/e-itip-control.glade.h:11
 #: ../calendar/gui/print.c:2341
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../calendar/gui/print.c:2392
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: ../calendar/gui/print.c:2421
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #: ../calendar/gui/print.c:2433
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-# addressbook/backend/ebook/e-card.c:3467
 #: ../calendar/gui/print.c:2447
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/print.c:2458
 msgid "Contacts: "
 msgstr "聯絡人: "
 
-# calendar/gui/print.c:1321
-# mail/mail-callbacks.c:1447
-# ui/evolution-addressbook.xml.h:10
-# ui/evolution-calendar.xml.h:24
 #: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
 #: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
-msgstr "預覽列印"
+msgstr "預覽打印"
 
-# ui/evolution-contact-editor.xml.h:6
-# ui/evolution-event-editor.xml.h:37
-# ui/evolution-task-editor-dialog.xml.h:40
+# zh_HK: msgstr "打印項目"
 #: ../calendar/gui/print.c:2636
 msgid "Print Item"
-msgstr "列印項目"
+msgstr "打印項目"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/tasks-component.c:441
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-# ui/evolution-tasks.xml.h:3
 #: ../calendar/gui/tasks-component.c:517
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d 個工作"
-msgstr[1] "%d 個工作"
+msgstr[0] "%d 項工作"
+msgstr[1] "%d 項工作"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/tasks-component.c:566
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
@@ -9589,17 +8416,14 @@ msgstr "沒有可用的行事曆來建立工作"
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
 
-# ui/evolution-tasks.xml.h:3
 #: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "新增工作"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-# calendar/gui/calendar-model.c:1578
 #: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "新指定的工作"
@@ -9608,14 +8432,10 @@ msgstr "新指定的工作"
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "新工作清單"
@@ -9624,7 +8444,6 @@ msgstr "新工作清單"
 msgid "Tas_k list"
 msgstr "工作清單(_K)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "建立新工作清單"
@@ -9636,25 +8455,18 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"這個動作會永久地清除所有標示為已完成的工作。如果你要繼續，你將不能復原這些工"
-"作。\n"
+"這個動作會永久地清除所有標示為已完成的工作。如果你要繼續，你將不能復原這些工作。\n"
 "\n"
 "確定清除這些工作？"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
 #: ../calendar/gui/tasks-control.c:449
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
-# ui/evolution-calendar.xml.h:25
 #: ../calendar/gui/tasks-control.c:483
 msgid "Print Tasks"
-msgstr "列印工作"
+msgstr "打印工作"
 
-# calendar/gui/weekday-picker.c:315
-# calendar/gui/weekday-picker.c:410
 #. The first letter of each day of the week starting with Sunday
 #: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
@@ -9669,17 +8481,14 @@ msgstr "約會和會議"
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-# calendar/gui/event-editor-dialog.glade.h:20
 #: ../calendar/importers/icalendar-importer.c:521
 msgid "Reminder!"
 msgstr "提醒！"
@@ -9688,17 +8497,14 @@ msgstr "提醒！"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 檔案 (.vcf)"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
@@ -9782,7 +8588,7 @@ msgstr "非洲/達萊撒蘭"
 
 #: ../calendar/zones.h:25
 msgid "Africa/Djibouti"
-msgstr "非洲/吉布地"
+msgstr "非洲/吉布提"
 
 #: ../calendar/zones.h:26
 msgid "Africa/Douala"
@@ -9946,7 +8752,7 @@ msgstr "美洲/亞松森"
 
 #: ../calendar/zones.h:66
 msgid "America/Barbados"
-msgstr "美洲/巴貝多"
+msgstr "美洲/巴巴多斯"
 
 #: ../calendar/zones.h:67
 msgid "America/Belem"
@@ -9954,7 +8760,7 @@ msgstr "美洲/貝倫"
 
 #: ../calendar/zones.h:68
 msgid "America/Belize"
-msgstr "美洲/貝里斯"
+msgstr "美洲/伯利兹"
 
 #: ../calendar/zones.h:69
 msgid "America/Boa_Vista"
@@ -10078,7 +8884,7 @@ msgstr "美洲/Grand_Turk"
 
 #: ../calendar/zones.h:99
 msgid "America/Grenada"
-msgstr "美洲/格瑞那達"
+msgstr "美洲/格林納達"
 
 #: ../calendar/zones.h:100
 msgid "America/Guadeloupe"
@@ -10094,7 +8900,7 @@ msgstr "美洲/圭亞基爾"
 
 #: ../calendar/zones.h:103
 msgid "America/Guyana"
-msgstr "美洲/蓋亞納"
+msgstr "美洲/圭亞那"
 
 #: ../calendar/zones.h:104
 msgid "America/Halifax"
@@ -10263,7 +9069,7 @@ msgstr "美洲/潘尼爾東"
 
 #: ../calendar/zones.h:145
 msgid "America/Paramaribo"
-msgstr "美洲/巴拉馬利波"
+msgstr "美洲/巴拉馬里波"
 
 #: ../calendar/zones.h:146
 msgid "America/Phoenix"
@@ -10339,7 +9145,7 @@ msgstr "美洲/聖啟斯"
 
 #: ../calendar/zones.h:164
 msgid "America/St_Lucia"
-msgstr "美洲/聖露西亞"
+msgstr "美洲/聖盧西亞"
 
 #: ../calendar/zones.h:165
 msgid "America/St_Thomas"
@@ -10347,7 +9153,7 @@ msgstr "美洲/聖湯母斯"
 
 #: ../calendar/zones.h:166
 msgid "America/St_Vincent"
-msgstr "美洲/聖文森"
+msgstr "美洲/聖文森特和格林內丁斯"
 
 #: ../calendar/zones.h:167
 msgid "America/Swift_Current"
@@ -10547,7 +9353,7 @@ msgstr "亞洲/伊爾庫次克"
 
 #: ../calendar/zones.h:216
 msgid "Asia/Istanbul"
-msgstr "亞洲/伊斯坦堡"
+msgstr "亞洲/伊斯坦布爾"
 
 #: ../calendar/zones.h:217
 msgid "Asia/Jakarta"
@@ -10571,7 +9377,7 @@ msgstr "亞洲/堪察加半島"
 
 #: ../calendar/zones.h:222
 msgid "Asia/Karachi"
-msgstr "亞洲/喀拉蚩"
+msgstr "亞洲/卡拉奇"
 
 #: ../calendar/zones.h:223
 msgid "Asia/Kashgar"
@@ -10651,7 +9457,7 @@ msgstr "亞洲/平壤"
 
 #: ../calendar/zones.h:242
 msgid "Asia/Qatar"
-msgstr "亞洲/卡達"
+msgstr "亞洲/卡塔爾"
 
 #: ../calendar/zones.h:243
 msgid "Asia/Qyzylorda"
@@ -10747,23 +9553,23 @@ msgstr "亞洲/葉勒凡"
 
 #: ../calendar/zones.h:266
 msgid "Atlantic/Azores"
-msgstr "大西洋/亞速爾群島"
+msgstr "大西洋/亞速爾羣島"
 
 #: ../calendar/zones.h:267
 msgid "Atlantic/Bermuda"
-msgstr "大西洋/百幕達群島"
+msgstr "大西洋/百幕達羣島"
 
 #: ../calendar/zones.h:268
 msgid "Atlantic/Canary"
-msgstr "大西洋/加納利群島"
+msgstr "大西洋/加納利羣島"
 
 #: ../calendar/zones.h:269
 msgid "Atlantic/Cape_Verde"
-msgstr "大西洋/維德角群島"
+msgstr "大西洋/佛得角羣島"
 
 #: ../calendar/zones.h:270
 msgid "Atlantic/Faeroe"
-msgstr "大西洋/法羅群島"
+msgstr "大西洋/法羅羣島"
 
 #: ../calendar/zones.h:271
 msgid "Atlantic/Jan_Mayen"
@@ -10771,7 +9577,7 @@ msgstr "大西洋/央棉島"
 
 #: ../calendar/zones.h:272
 msgid "Atlantic/Madeira"
-msgstr "大西洋/馬迪拉群島"
+msgstr "大西洋/馬迪拉羣島"
 
 #: ../calendar/zones.h:273
 msgid "Atlantic/Reykjavik"
@@ -10807,7 +9613,7 @@ msgstr "澳大利亞/達爾溫"
 
 #: ../calendar/zones.h:281
 msgid "Australia/Hobart"
-msgstr "澳大利亞/荷巴特"
+msgstr "澳大利亞/霍巴特"
 
 #: ../calendar/zones.h:282
 msgid "Australia/Lindeman"
@@ -10827,7 +9633,7 @@ msgstr "澳大利亞/伯斯"
 
 #: ../calendar/zones.h:286
 msgid "Australia/Sydney"
-msgstr "澳大利亞/雪梨"
+msgstr "澳大利亞/悉尼"
 
 #: ../calendar/zones.h:287
 msgid "Europe/Amsterdam"
@@ -10891,7 +9697,7 @@ msgstr "歐洲/赫爾辛基"
 
 #: ../calendar/zones.h:302
 msgid "Europe/Istanbul"
-msgstr "歐洲/伊斯坦堡"
+msgstr "歐洲/伊斯坦布爾"
 
 #: ../calendar/zones.h:303
 msgid "Europe/Kaliningrad"
@@ -11051,11 +9857,11 @@ msgstr "印度/可可斯"
 
 #: ../calendar/zones.h:342
 msgid "Indian/Comoro"
-msgstr "印度/科摩羅群島"
+msgstr "印度/科摩羅羣島"
 
 #: ../calendar/zones.h:343
 msgid "Indian/Kerguelen"
-msgstr "印度/克格連群島"
+msgstr "印度/克格連羣島"
 
 #: ../calendar/zones.h:344
 msgid "Indian/Mahe"
@@ -11115,7 +9921,7 @@ msgstr "太平洋/富納富提"
 
 #: ../calendar/zones.h:358
 msgid "Pacific/Galapagos"
-msgstr "太平洋/加拉巴哥群島"
+msgstr "太平洋/加拉巴哥羣島"
 
 #: ../calendar/zones.h:359
 msgid "Pacific/Gambier"
@@ -11155,7 +9961,7 @@ msgstr "太平洋/馬久羅島"
 
 #: ../calendar/zones.h:368
 msgid "Pacific/Marquesas"
-msgstr "太平洋/馬克沙斯群島"
+msgstr "太平洋/馬克沙斯羣島"
 
 #: ../calendar/zones.h:369
 msgid "Pacific/Midway"
@@ -11163,7 +9969,7 @@ msgstr "太平洋/中途島"
 
 #: ../calendar/zones.h:370
 msgid "Pacific/Nauru"
-msgstr "太平洋/諾魯"
+msgstr "太平洋/瑙魯"
 
 #: ../calendar/zones.h:371
 msgid "Pacific/Niue"
@@ -11183,7 +9989,7 @@ msgstr "太平洋/Pago_Pago"
 
 #: ../calendar/zones.h:375
 msgid "Pacific/Palau"
-msgstr "太平洋/帛琉群島"
+msgstr "太平洋/帕勞羣島"
 
 #: ../calendar/zones.h:376
 msgid "Pacific/Pitcairn"
@@ -11199,7 +10005,7 @@ msgstr "太平洋/摩爾斯貝港"
 
 #: ../calendar/zones.h:379
 msgid "Pacific/Rarotonga"
-msgstr "太平洋/拉洛東加島"
+msgstr "太平洋/拉洛湯加島"
 
 #: ../calendar/zones.h:380
 msgid "Pacific/Saipan"
@@ -11215,7 +10021,7 @@ msgstr "太平洋/塔拉瓦"
 
 #: ../calendar/zones.h:383
 msgid "Pacific/Tongatapu"
-msgstr "太平洋/東加塔普島"
+msgstr "太平洋/湯加塔普島"
 
 #: ../calendar/zones.h:384
 msgid "Pacific/Truk"
@@ -11233,37 +10039,29 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-# composer/e-msg-composer-attachment-bar.c:104
 #: ../composer/e-msg-composer-attachment-bar.c:105
 #: ../widgets/misc/e-attachment-bar.c:107
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-# composer/e-msg-composer-attachment-bar.c:108
 #: ../composer/e-msg-composer-attachment-bar.c:108
 #: ../widgets/misc/e-attachment-bar.c:110
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-# composer/e-msg-composer-attachment-bar.c:112
 #: ../composer/e-msg-composer-attachment-bar.c:111
 #: ../widgets/misc/e-attachment-bar.c:113
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer-attachment-bar.c:740
 #: ../widgets/misc/e-attachment-bar.c:1024
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../composer/e-msg-composer-attachment.c:187
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
@@ -11274,8 +10072,6 @@ msgstr "附加檔案列"
 msgid "Cannot attach file %s: %s"
 msgstr "不能附加檔案 %s： %s"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
 #: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
@@ -11283,42 +10079,33 @@ msgstr "不能附加檔案 %s： %s"
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
 
-# composer/e-msg-composer-attachment.glade.h:2
 #: ../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:4
 #: ../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:6
 #: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME 類型:"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../composer/e-msg-composer-hdrs.c:571
 msgid "Choose folders to post the message to."
-msgstr "選取資料夾來張貼電郵。"
+msgstr "選取資料夾來張貼郵件。"
 
-# composer/e-msg-composer-hdrs.c:324
 #: ../composer/e-msg-composer-hdrs.c:603
 msgid "Click here for the address book"
 msgstr "按這裏新增目錄服務"
 
-# composer/e-msg-composer-hdrs.c:361
 #.
 #. * Reply-To:
 #. *
@@ -11330,7 +10117,6 @@ msgstr "按這裏新增目錄服務"
 msgid "_Reply-To:"
 msgstr "回覆地址(_R):"
 
-# composer/e-msg-composer-hdrs.c:355
 #.
 #. * From
 #.
@@ -11338,7 +10124,6 @@ msgstr "回覆地址(_R):"
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-# composer/e-msg-composer-hdrs.c:372
 #.
 #. * Subject
 #.
@@ -11346,39 +10131,32 @@ msgstr "寄件者(_O):"
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-# composer/e-msg-composer-hdrs.c:386
 #: ../composer/e-msg-composer-hdrs.c:658
 msgid "_To:"
 msgstr "收件者(_T):"
 
-# composer/e-msg-composer-hdrs.c:387
 #: ../composer/e-msg-composer-hdrs.c:659
 msgid "Enter the recipients of the message"
-msgstr "輸入電郵的收件者"
+msgstr "輸入郵件的收件者"
 
-# composer/e-msg-composer-hdrs.c:390
 #: ../composer/e-msg-composer-hdrs.c:662
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-# composer/e-msg-composer-hdrs.c:391
 #: ../composer/e-msg-composer-hdrs.c:663
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "輸入電郵副本的收件者"
+msgstr "輸入郵件副本的收件者"
 
-# composer/e-msg-composer-hdrs.c:394
 #: ../composer/e-msg-composer-hdrs.c:666
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-# composer/e-msg-composer-hdrs.c:395
 #: ../composer/e-msg-composer-hdrs.c:667
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
-msgstr "輸入電郵密件副本的收件者"
+msgstr "輸入郵件密件副本的收件者"
 
-# addressbook/gui/component/addressbook-config.c:409
 #.
 #. * Post-To
 #.
@@ -11390,19 +10168,14 @@ msgstr "張貼到(_P):"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裏，選取要張貼的資料夾"
 
-# addressbook/gui/component/addressbook-config.c:409
 #: ../composer/e-msg-composer-hdrs.c:684
 msgid "Post To:"
 msgstr "張貼到:"
 
-# ui/evolution-message-composer.xml.h:1
 #: ../composer/e-msg-composer-select-file.c:82
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer-select-file.c:243
 msgid "Insert Attachment"
 msgstr "插入附加檔案"
@@ -11410,51 +10183,40 @@ msgstr "插入附加檔案"
 #: ../composer/e-msg-composer.c:827
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "無法簽名送出的電郵：此帳號沒有設定簽名證書"
+msgstr "無法簽署送出的郵件：此帳號沒有設定簽署證書"
 
 #: ../composer/e-msg-composer.c:834
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "無法加密送出的電郵：沒有設定加密證書(此帳號)"
+msgstr "無法加密送出的郵件：沒有設定加密證書(此帳號)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
 #: ../composer/e-msg-composer.c:3897
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
-# camel/camel-sasl-login.c:127
 #: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-# camel/camel-filter-driver.c:671
 #: ../composer/e-msg-composer.c:1401
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
 #: ../composer/e-msg-composer.c:1409
 msgid "Unable to retrieve message from editor"
-msgstr "無法從編輯器取得電郵"
+msgstr "無法從編輯器取得郵件"
 
-# mail/mail-search.c:138
 #: ../composer/e-msg-composer.c:1688
 msgid "Untitled Message"
-msgstr "未命名的電郵"
+msgstr "未命名的郵件"
 
-# composer/e-msg-composer.c:966
 #. NB: This function is never used anymore
 #: ../composer/e-msg-composer.c:1723
 msgid "Open File"
@@ -11465,44 +10227,40 @@ msgstr "開啟檔案"
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-# mail/mail-config.glade.h:74
 #: ../composer/e-msg-composer.c:2276
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
 #: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
 #: ../composer/e-msg-composer.c:3782
 msgid "Compose Message"
-msgstr "編輯電郵"
+msgstr "編輯郵件"
 
 #: ../composer/e-msg-composer.c:5006
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
-msgstr "<b>（電郵編輯器包含不能編輯的非文字的電郵內文。）<b>"
+msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
 
 #: ../composer/mail-composer.error.xml.h:1
 msgid ""
 " There are few attachments getting downloaded. Sending the mail will cause "
 "the mail to be sent without those pending attachments "
-msgstr "這裏有一些附件要下載。傳送此電郵將無法一併寄出接下來的附件"
+msgstr "這裏有一些附件要下載。傳送此郵件將無法一併寄出接下來的附件"
 
 #: ../composer/mail-composer.error.xml.h:2
 msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
-# calendar/gui/dialogs/delete-comp.c:87
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "確定要放棄你正在撰寫且標題為 '{0}'的電郵？"
+msgstr "確定要放棄正在撰寫，標題為 ‘{0}’ 的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
-msgstr "因為「{0}」，所以你可能需要選取不同的電郵選項。"
+msgstr "因為「{0}」，所以你可能需要選取不同的郵件選項。"
 
 #: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:18
@@ -11514,49 +10272,40 @@ msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
-msgstr ""
-"關閉此撰寫視窗會永久放棄電郵，除非你選擇儲存電郵至你的「草稿」資料夾。這樣可"
-"以讓你以後再繼續撰寫電郵。"
+msgstr "除非你選擇儲存郵件至「草稿」資料夾，否則關閉此撰寫視窗會永久放棄郵件。儲存草稿可以讓你以後再繼續撰寫郵件。"
 
-# camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
 msgstr "無法建立撰寫視窗。"
 
-# camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
-msgstr "無法建立電郵。"
+msgstr "無法建立郵件。"
 
-# mail/mail-crypto.c:59
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "無法讀取簽名檔案「{0}」。"
+msgstr "無法讀取簽名檔「{0}」。"
 
-# camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
-msgstr "無法擷取電郵來附加 (從 {0})。"
+msgstr "無法擷取郵件來附加 (從 {0})。"
 
-# mail/mail-crypto.c:59
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "無法儲存至自動儲存檔案「{0}」。"
 
 #: ../composer/mail-composer.error.xml.h:12
 msgid "Directories can not be attached to Messages."
-msgstr "無法附加目錄到電郵。"
+msgstr "無法附加目錄到郵件。"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
-msgstr "要復原未完成的電郵？"
+msgstr "要復原未完成的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "下載尚在進行中。你是否要寄出此電郵？"
+msgstr "下載尚在進行中。是否寄出郵件？"
 
-# shell/e-shortcuts.c:381
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
@@ -11565,22 +10314,18 @@ msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
-msgstr ""
-"當你撰寫新電郵時，Evolution 意外結束。復原電郵可以讓你從原來中斷的地方繼續。"
+msgstr "當你撰寫新郵件時，Evolution 意外結束。復原郵件可以讓你從原來中斷的地方繼續。"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
-msgstr "檔案 `{0}' 不是一般檔案而且無法在電郵中傳送。"
+msgstr "檔案 `{0}' 不是一般檔案而且無法在郵件中傳送。"
 
 #: ../composer/mail-composer.error.xml.h:18
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加"
-"它。"
+msgstr "要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加它。"
 
-# composer/evolution-composer.c:355
 #: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -11596,69 +10341,52 @@ msgstr ""
 msgid "Unable to activate the address selector control."
 msgstr "無法啟動地址選擇器控制。"
 
-# mail/mail-search.c:138
 #: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
-msgstr "找到未完成的電郵"
+msgstr "找到未完成的郵件"
 
-# mail/mail-ops.c:1154
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
-msgstr "警告：編輯過的電郵"
+msgstr "警告：編輯過的郵件"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "你無法將檔案 `{0}' 附加到此電郵。"
+msgstr "你無法將檔案 ‘{0}’ 附加到此郵件。"
 
-# mail/mail-callbacks.c:146
 #: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
-msgstr "撰寫電郵前，你需要先設定帳號。"
+msgstr "撰寫郵件前，你需要先設定帳號。"
 
-# shell/e-shortcuts-view.c:265
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Do not Recover"
 msgstr "不要復原(_D)"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Recover"
 msgstr "復原(_R)"
 
-# mail/mail-callbacks.c:1188
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
-msgstr "儲存電郵(_S)"
+msgstr "儲存郵件(_S)"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:522
 msgid "Evolution"
 msgstr "Evolution"
 
-# shell/e-shortcuts-view.c:137
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../data/evolution.desktop.in.in.h:3
 msgid "The Evolution PIM and Email Client"
-msgstr "Evolution PIM 與電郵客戶端"
+msgstr "Evolution PIM 與郵件客戶端"
 
-# data/evolution.keys.in.h:1
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "地址卡"
 
-# data/evolution.keys.in.h:2
 #: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "行事曆資訊"
@@ -11672,7 +10400,7 @@ msgid ""
 msgstr ""
 "<b>目前你的狀態是「不在辦公室」。</b>\n"
 "\n"
-"你要更改你的狀態至「在辦公室」嗎？ "
+"要更改狀態為「在辦公室」嗎？ "
 
 #: ../designs/OOA/ooa.glade.h:4
 #: ../plugins/exchange-operations/exchange-oof.glade.h:4
@@ -11691,8 +10419,8 @@ msgid ""
 "who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
-"<small>當你不在辦公室時，以下指定的電郵將會自動傳送給\n"
-"每一位傳送電郵給你的人。</small>"
+"<small>當你不在辦公室時，以下指定的郵件將會自動傳送給\n"
+"每一位傳送郵件給你的人。</small>"
 
 #: ../designs/OOA/ooa.glade.h:8
 #: ../plugins/exchange-operations/exchange-oof.glade.h:8
@@ -11718,15 +10446,13 @@ msgstr "外出助理"
 msgid "Yes, Change Status"
 msgstr "是，請更改狀態"
 
-# mail/mail-config.glade.h:57
 #: ../designs/read_receipts/read.glade.h:1
 msgid "<b>Receiving Email</b>"
-msgstr "<b>正在接收電郵</b>"
+msgstr "<b>正在接收電子郵件</b>"
 
-# mail/mail-config.glade.h:65
 #: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Sending Email:</b>"
-msgstr "<b>正在傳送電郵:</b>"
+msgstr "<b>正在傳送電子郵件:</b>"
 
 #: ../designs/read_receipts/read.glade.h:3
 msgid ""
@@ -11735,12 +10461,12 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>此頁面可以讓你選擇當你傳送的電郵已閱讀時，是否傳送讀信回條，\n"
+"<small>此頁面可以讓你選擇，當別人閱讀你的郵件後，是否傳送讀信回條，\n"
 "以及指定當某人要求你傳送回條時，Evolution 要做什麼。</small>"
 
 #: ../designs/read_receipts/read.glade.h:5
 msgid "Always send back a read receipt"
-msgstr "永遠送回讀信回條"
+msgstr "一定送回讀信回條"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Ask me if I want to send back a read receipt"
@@ -11756,83 +10482,56 @@ msgstr "讀信回條"
 
 #: ../designs/read_receipts/read.glade.h:9
 msgid "Request a read receipt for all messages I send"
-msgstr "要求所有傳送的電郵都要索取讀信回條"
+msgstr "要求所有我傳送的郵件都索取讀信回條"
 
 #: ../designs/read_receipts/read.glade.h:10
 msgid "Unless the message is sent to a mailing list, and not to me personally"
-msgstr "除非電郵傳送至郵寄清單，而不是給我個人"
+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 要做什麼？"
+msgstr "當你收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
 
-# mail/mail-callbacks.c:1144
-# mail/mail-display.c:96
 #: ../e-util/e-dialog-utils.c:283
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 "同一名稱的檔案已經存在。\n"
-"是否複蓋該檔案？"
+"是否覆蓋該檔案？"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
 #: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Evolution 錯誤"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
-# data/evolution.keys.in.h:2
 #: ../e-util/e-error.c:126
 msgid "Evolution Information"
 msgstr "Evolution 資訊"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../e-util/e-error.c:128
 msgid "Evolution Query"
 msgstr "Evolution 查詢"
 
-# mail/mail-config.glade.h:69
 #. setup a dummy error
 #: ../e-util/e-error.c:454
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "內部錯誤，要求的不明錯誤 '%s'>"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "無法開啟檔案「{0}」。"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file &quot;{0}&quot;."
 msgstr "無法儲存檔案「{0}」。"
@@ -11849,12 +10548,10 @@ msgstr "檔案存在「{0}」。"
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-# calendar/gui/gnome-cal.c:235
 #: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr "系統匣的方向。"
 
-# calendar/gui/event-editor.c:1565
 #: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 second ago"
@@ -11862,7 +10559,6 @@ msgid_plural "%d seconds ago"
 msgstr[0] "1 秒前"
 msgstr[1] "%d 秒前"
 
-# calendar/gui/event-editor.c:1560
 #: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 minute ago"
@@ -11870,7 +10566,6 @@ msgid_plural "%d minutes ago"
 msgstr[0] "1 分鐘前"
 msgstr[1] "%d 分鐘前"
 
-# calendar/gui/event-editor.c:1555
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 hour ago"
@@ -11878,7 +10573,6 @@ msgid_plural "%d hours ago"
 msgstr[0] "1 小時前"
 msgstr[1] "%d 小時前"
 
-# calendar/gui/event-editor.c:1545
 #: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 day ago"
@@ -11886,7 +10580,6 @@ msgid_plural "%d days ago"
 msgstr[0] "1 日前"
 msgstr[1] "%d 日前"
 
-# calendar/gui/event-editor.c:1550
 #: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week ago"
@@ -11916,17 +10609,15 @@ msgstr "<按這裏選擇日期>"
 msgid "now"
 msgstr "現在"
 
-# calendar/gui/print.c:1093
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
 #: ../filter/filter-datespec.c:295
 msgid "%d-%b-%Y"
-msgstr "%d-%b-%Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
 #: ../filter/filter-datespec.c:415
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
-# ui/evolution-message-composer.xml.h:12
 #: ../filter/filter-file.c:293 ../filter/filter-file.c:299
 msgid "Choose a file"
 msgstr "選擇一個檔案"
@@ -11936,15 +10627,12 @@ msgstr "選擇一個檔案"
 msgid "Important"
 msgstr "重要"
 
-# mail/mail-format.c:762
-# mail/message-list.c:1083
 #. forest green
 #: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "待辦"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
 #: ../mail/mail-config.glade.h:95
@@ -11971,7 +10659,6 @@ msgstr "如果全部條件符合"
 msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
-# mail/mail-ops.c:898
 #: ../filter/filter-rule.c:868
 msgid "Find items:"
 msgstr "尋找項目:"
@@ -11990,9 +10677,8 @@ msgstr "回覆和父代"
 
 #: ../filter/filter-rule.c:889
 msgid "No reply or parent"
-msgstr "沒有回復或原始電郵"
+msgstr "沒有回復或原始郵件"
 
-# addressbook/printing/e-contact-print.glade.h:17
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "包括線串"
@@ -12014,13 +10700,10 @@ msgstr "錯誤的正規表示式「{0}」。"
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "無法編譯正規表示式「{1}」。"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "檔案「{0}」不存在或者不是一般檔案。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
 msgstr "缺少日期。"
@@ -12029,7 +10712,6 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
-# calendar/gui/calendar-model.c:1578
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "缺少名稱。"
@@ -12046,12 +10728,10 @@ msgstr "請選擇其他名稱。"
 msgid "You must choose a date."
 msgstr "你必須選取日期。"
 
-# ui/evolution.xml.h:3
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
 msgstr "你必須為這個過濾器命名。"
 
-# ui/evolution.xml.h:3
 #: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
 msgstr "你必須指定一個檔案名稱。"
@@ -12066,14 +10746,14 @@ msgstr "比較"
 
 #: ../filter/filter.glade.h:4
 msgid "Show filters for mail:"
-msgstr "顯示電郵過濾器:"
+msgstr "顯示郵件過濾器:"
 
 #: ../filter/filter.glade.h:5
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
 msgstr ""
-"電郵日期將會與你在這裏指定\n"
+"郵件日期將會與你在這裏指定\n"
 "日期的 12:00am 做比較。"
 
 #: ../filter/filter.glade.h:7
@@ -12081,7 +10761,7 @@ msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
 msgstr ""
-"電郵日期將會與相對於過濾器執行\n"
+"郵件日期將會與相對於過濾器執行\n"
 "的時間作比較。"
 
 #: ../filter/filter.glade.h:9
@@ -12089,7 +10769,7 @@ msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
 msgstr ""
-"電郵日期將會與過濾器執行時的\n"
+"郵件日期將會與過濾器執行時的\n"
 "時間作比較。"
 
 #: ../filter/filter.glade.h:12
@@ -12134,53 +10814,44 @@ msgstr "規則名稱"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:1
 msgid "Composer Preferences"
-msgstr "電郵編輯器偏好設定"
+msgstr "郵件編輯器偏好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid ""
 "Configure mail preferences, including security and message display, here"
-msgstr "在此設定電郵的偏好設定，包含安全性與電郵的顯示"
+msgstr "在此設定郵件的偏好設定，包含安全性與郵件的顯示"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此設定拼字檢查、簽名檔與電郵編輯器"
+msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
 
-# ui/evolution-mail.xml.h:19
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
-msgstr "在此設定你的電郵帳號"
+msgstr "在此設定你的郵件帳號"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
-msgstr "Evolution 電郵"
+msgstr "Evolution 郵件"
 
-# mail/mail-account-editor.c:173
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 電郵帳號組態控制"
+msgstr "Evolution 郵件帳號組態控制"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
-msgstr "Evolution 電郵配件"
+msgstr "Evolution 郵件配件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
-msgstr "Evolution 電郵撰寫器"
+msgstr "Evolution 郵件撰寫器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 電郵撰寫器組態控制"
+msgstr "Evolution 郵件撰寫器組態控制"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
-msgstr "Evolution 電郵優先設定控制"
+msgstr "Evolution 郵件優先設定控制"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:523
 #: ../mail/importers/elm-importer.c:341
@@ -12189,22 +10860,21 @@ msgstr "Evolution 電郵優先設定控制"
 #: ../mail/mail-component.c:579 ../mail/mail-component.c:701
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
-msgstr "電郵"
+msgstr "郵件"
 
-# mail/mail-config.glade.h:6
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: ../mail/em-account-prefs.c:532
 msgid "Mail Accounts"
-msgstr "電郵帳號"
+msgstr "郵件帳號"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:13
 #: ../mail/mail-config.glade.h:98
 msgid "Mail Preferences"
-msgstr "電郵偏好設定"
+msgstr "郵件偏好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:14
 msgid "_Mail"
-msgstr "電郵(_M)"
+msgstr "郵件(_M)"
 
 #: ../mail/em-account-editor.c:403
 #, c-format
@@ -12224,37 +10894,31 @@ msgstr ""
 " %s 授權合約\n"
 "並選取核取方塊來接受它\n"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:511
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
-msgstr "每封電郵皆詢問"
+msgstr "每封郵件皆詢問"
 
-# mail/mail-config.glade.h:35
 #: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "身分"
 
-# mail/mail-config.glade.h:57
 #: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
-msgstr "接收電郵"
+msgstr "接收電子郵件"
 
 #: ../mail/em-account-editor.c:2014
 msgid "Automatically check for _new mail every"
-msgstr "自動檢查新電郵每(_N)"
+msgstr "自動檢查新郵件每(_N)"
 
-# mail/mail-config.glade.h:65
 #: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
-msgstr "傳送電郵"
+msgstr "傳送電子郵件"
 
-# mail/mail-config.glade.h:21
 #: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "預設值"
@@ -12265,29 +10929,23 @@ msgstr "預設值"
 msgid "Security"
 msgstr "安全性"
 
-# mail/mail-config.glade.h:59
 #. Most sections for this is auto-generated fromt the camel config
 #: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Receiving Options"
 msgstr "接收選項"
 
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
 #: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
 msgid "Checking for New Mail"
-msgstr "檢查新電郵"
+msgstr "檢查新郵件"
 
-# mail/mail-config.glade.h:3
 #: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-# mail/mail-config-druid.c:445
 #: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-# mail/mail-accounts.c:197
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
 msgid "Disable"
@@ -12298,14 +10956,11 @@ msgstr "停用"
 msgid "Enable"
 msgstr "啟用"
 
-# mail/mail-config.glade.h:21
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "[預設值]"
 
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
 #. 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
@@ -12313,7 +10968,6 @@ msgstr "[預設值]"
 msgid "Enabled"
 msgstr "已啟用"
 
-# mail/mail-config.glade.h:5
 #: ../mail/em-account-prefs.c:525
 msgid "Account name"
 msgstr "帳號名稱"
@@ -12322,34 +10976,27 @@ msgstr "帳號名稱"
 msgid "Protocol"
 msgstr "通訊協定"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:999
 msgid "Unnamed"
 msgstr "未命名的"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "語言"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-composer-prefs.c:979
 msgid "Add signature script"
-msgstr "新增簽名程序檔"
+msgstr "新增簽署程序檔"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "簽名檔"
 
-# mail/mail-ops.c:1154
 #: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
-msgstr "-------- 轉遞的電郵 --------"
+msgstr "-------- 轉遞的郵件 --------"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "不明的寄件者"
@@ -12361,9 +11008,7 @@ msgstr "不明的寄件者"
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
-"${TimeZone}，${Sender} 提到："
+msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} 提到："
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
@@ -12386,7 +11031,6 @@ msgstr "指定目標"
 msgid "Attachments"
 msgstr "附加檔案"
 
-# addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "嗶聲"
@@ -12407,17 +11051,6 @@ msgstr "收件日期"
 msgid "Date sent"
 msgstr "送件日期"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
 #: ../mail/em-filter-i18n.h:11 ../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
@@ -12494,7 +11127,7 @@ msgstr "是之前的"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
-msgstr "有標幟的"
+msgstr "有標幟"
 
 #: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
@@ -12510,63 +11143,53 @@ msgstr "不是"
 
 #: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
-msgstr "沒有標幟的"
+msgstr "沒有標幟"
 
-# calendar/gui/goto-dialog.glade.h:9
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
-msgstr "垃圾電郵"
+msgstr "垃圾郵件"
 
-# calendar/gui/goto-dialog.glade.h:9
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
-msgstr "垃圾電郵測試"
+msgstr "垃圾郵件測試"
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "標籤"
 
 #: ../mail/em-filter-i18n.h:38
 msgid "Mailing list"
-msgstr "電郵列表"
+msgstr "郵件列表"
 
-# mail/mail-search.c:319
 #: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr "符合全部"
 
 #: ../mail/em-filter-i18n.h:40
 msgid "Message Body"
-msgstr "電郵內容"
+msgstr "郵件內容"
 
 #: ../mail/em-filter-i18n.h:41
 msgid "Message Header"
-msgstr "電郵檔頭"
+msgstr "郵件檔頭"
 
-# views/mail/galview.xml.h:4
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
-msgstr "垃圾電郵"
+msgstr "垃圾郵件"
 
-# mail/folder-browser.c:706
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
-msgstr "非垃圾電郵"
+msgstr "非垃圾郵件"
 
 #: ../mail/em-filter-i18n.h:44
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-# ui/evolution.xml.h:19
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "建立程式管道"
 
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "播放音效"
@@ -12587,7 +11210,6 @@ msgstr "正規表示式相配"
 msgid "Replied to"
 msgstr "回覆"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "傳回"
@@ -12604,7 +11226,6 @@ msgstr "傳回小於"
 msgid "Run Program"
 msgstr "執行程式"
 
-# mail/message-list.c:1081
 #: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Score"
 msgstr "目標"
@@ -12617,7 +11238,6 @@ msgstr "寄件者"
 msgid "Set Status"
 msgstr "設定狀態"
 
-# addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "大小 (kB)"
@@ -12660,74 +11280,61 @@ msgstr "取消設定狀態"
 msgid "<b>Then</b>"
 msgstr "<b>然後</b>"
 
-# ui/evolution-mail.xml.h:10
 #: ../mail/em-folder-browser.c:162
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)..."
 
 #: ../mail/em-folder-browser.c:184
 msgid "All Messages"
-msgstr "所有電郵"
+msgstr "所有郵件"
 
-# mail/mail-search.c:138
 #: ../mail/em-folder-browser.c:185
 msgid "Unread Messages"
-msgstr "未讀電郵"
+msgstr "未讀郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../mail/em-folder-browser.c:187
 msgid "No Label"
 msgstr "無標籤"
 
 #: ../mail/em-folder-browser.c:194
 msgid "Read Messages"
-msgstr "已讀電郵"
+msgstr "已讀郵件"
 
-# ui/evolution-mail.xml.h:114
 #: ../mail/em-folder-browser.c:195
 msgid "Recent Messages"
-msgstr "最近的電郵"
+msgstr "最近的郵件"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../mail/em-folder-browser.c:196
 msgid "Last 5 Days' Messages"
-msgstr "最近 5 天的電郵"
+msgstr "最近 5 天的郵件"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../mail/em-folder-browser.c:197
 msgid "Messages with Attachments"
-msgstr "有附加檔案的電郵"
+msgstr "有附加檔案的郵件"
 
 #: ../mail/em-folder-browser.c:198
 msgid "Important Messages"
-msgstr "重要電郵"
+msgstr "重要郵件"
 
-# mail/folder-browser.c:706
 #: ../mail/em-folder-browser.c:199
 msgid "Messages Not Junk"
-msgstr "非垃圾電郵"
+msgstr "非垃圾郵件"
 
-# camel/providers/smtp/camel-smtp-transport.c:178
 #. 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
 msgid "Total messages:"
 msgid_plural "Total messages:"
-msgstr[0] "所有電郵:"
+msgstr[0] "所有郵件:"
+msgstr[1] "所有郵件:"
 
-# mail/mail-search.c:138
 #. 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[0] "未讀郵件:"
+msgstr[1] "未讀郵件:"
 
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
 #: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "Folder Properties"
@@ -12737,7 +11344,6 @@ msgstr "資料夾內容"
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "建立"
@@ -12746,7 +11352,6 @@ msgstr "建立"
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
 #: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
 msgid "Search Folders"
@@ -12761,7 +11366,6 @@ msgstr "不符合"
 msgid "Drafts"
 msgstr "草稿"
 
-# mail/local-config.glade.h:8
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
 #: ../plugins/exchange-operations/exchange-folder.c:587
@@ -12776,8 +11380,6 @@ msgstr "寄件匣"
 msgid "Sent"
 msgstr "已傳送"
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
 #: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "載入中..."
@@ -12804,38 +11406,31 @@ msgstr "%s (%u)"
 
 #: ../mail/em-folder-tree.c:717
 msgid "Mail Folder Tree"
-msgstr "電郵資料夾樹"
+msgstr "郵件資料夾樹"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-# mail/mail-ops.c:898
 #: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1806
 #, c-format
 msgid "Moving messages into folder %s"
-msgstr "正在將電郵移至資料夾 %s"
+msgstr "正在將郵件移至資料夾 %s"
 
-# mail/mail-ops.c:898
 #: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1808
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "正在複製電郵至資料夾 %s"
+msgstr "正在複製郵件至資料夾 %s"
 
-# camel/providers/imap/camel-imap-provider.c:45
 #: ../mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
-msgstr "無法將電郵拖放到最上層的儲存區"
+msgstr "無法將郵件拖放到最上層的儲存區"
 
 #: ../mail/em-folder-tree.c:1000 ../ui/evolution-mail-message.xml.h:105
 msgid "_Copy to Folder"
@@ -12845,7 +11440,6 @@ msgstr "複製至資料夾(_C)"
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-# mail/mail-ops.c:992
 #: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
@@ -12882,15 +11476,13 @@ msgstr "重新命名(_R)..."
 
 #: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
-msgstr "清空垃圾桶(_E)"
+msgstr "清空回收筒(_E)"
 
-# mail/mail-ops.c:898
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s」複製到「%s」"
 
-# shell/e-shell-importer.c:601
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1007
 #: ../mail/em-folder-view.c:1022
 #: ../mail/importers/evolution-mbox-importer.c:86
@@ -12902,15 +11494,12 @@ msgstr "選擇資料夾"
 msgid "C_opy"
 msgstr "複製(_O)"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-# ui/evolution.xml.h:10
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
@@ -12934,7 +11523,7 @@ msgstr "轉寄(_F)"
 
 #: ../mail/em-folder-view.c:1120 ../ui/evolution-mail-message.xml.h:107
 msgid "_Edit as New Message..."
-msgstr "編輯為新電郵(_E)..."
+msgstr "編輯為新郵件(_E)..."
 
 #: ../mail/em-folder-view.c:1126
 msgid "U_ndelete"
@@ -12966,18 +11555,16 @@ msgstr "標示成不重要(_I)"
 
 #: ../mail/em-folder-view.c:1135
 msgid "Mark as _Junk"
-msgstr "標示成垃圾電郵(_J)"
+msgstr "標示成垃圾郵件(_J)"
 
 #: ../mail/em-folder-view.c:1136
 msgid "Mark as _Not Junk"
-msgstr "標示成非垃圾電郵(_N)"
+msgstr "標示成非垃圾郵件(_N)"
 
 #: ../mail/em-folder-view.c:1137
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)..."
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../mail/em-folder-view.c:1139
 msgid "_Label"
 msgstr "標籤(_L)"
@@ -12998,27 +11585,23 @@ msgstr "清除標幟(_E)"
 
 #: ../mail/em-folder-view.c:1149
 msgid "Crea_te Rule From Message"
-msgstr "從電郵建立規則(_T)"
+msgstr "從郵件建立規則(_T)"
 
-# mail/folder-browser.c:653
 #: ../mail/em-folder-view.c:1150
 msgid "Search Folder from _Subject"
 msgstr "從主旨建立搜尋資料夾(_S)"
 
-# mail/folder-browser.c:656
 #: ../mail/em-folder-view.c:1151
 msgid "Search Folder from Se_nder"
 msgstr "從寄件者建立搜尋資料夾(_N)"
 
-# mail/folder-browser.c:659
 #: ../mail/em-folder-view.c:1152
 msgid "Search Folder from _Recipients"
 msgstr "從收件者建立搜尋資料夾(_R)"
 
-# mail/folder-browser.c:662
 #: ../mail/em-folder-view.c:1153
 msgid "Search Folder from Mailing _List"
-msgstr "從電郵清單建立搜尋資料夾(_L)"
+msgstr "從郵件清單建立搜尋資料夾(_L)"
 
 #: ../mail/em-folder-view.c:1157
 msgid "Filter on Sub_ject"
@@ -13036,115 +11619,100 @@ msgstr "收件者過濾器(_C)"
 msgid "Filter on _Mailing List"
 msgstr "從通信論壇建立過濾器(_M)"
 
-# mail/mail-config.glade.h:21
 #. default charset used in mail view
 #: ../mail/em-folder-view.c:2001 ../mail/em-folder-view.c:2045
 msgid "Default"
 msgstr "預設值"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印郵件"
 #: ../mail/em-folder-view.c:2144
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
 msgid "Print Message"
-msgstr "列印電郵"
+msgstr "打印郵件"
 
 #: ../mail/em-folder-view.c:2300
 msgid "Unable to retrieve message"
-msgstr "無法接收電郵"
+msgstr "無法接收郵件"
 
-# ui/evolution.xml.h:10
 #: ../mail/em-folder-view.c:2498
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:710
 #: ../mail/em-folder-view.c:2499
 msgid "_From this Address"
 msgstr "從這個位址(_F)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:724
 #: ../mail/em-folder-view.c:2500
 msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../mail/em-folder-view.c:2854
 #, c-format
 msgid "Click to mail %s"
-msgstr "按一下來傳送電郵 %s"
+msgstr "按一下來傳送郵件 %s"
 
 #: ../mail/em-folder-view.c:2859
 msgid "Click to hide/unhide addresses"
 msgstr "按這裏隱藏/解除隱藏位址"
 
-# mail/mail-search.c:319
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:503
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
-# mail/mail-search.c:316
 #: ../mail/em-format-html-display.c:646
 msgid "Fi_nd:"
 msgstr "尋找(_N):"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
 #: ../mail/em-format-html-display.c:674
 msgid "Fo_rward"
 msgstr "轉寄(_R)"
 
-# mail/mail-search.c:319
 #: ../mail/em-format-html-display.c:679
 msgid "M_atch case"
 msgstr "區分大小寫(_A)"
 
-# calendar/gui/calendar-model.c:1578
 #: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:617
 msgid "Unsigned"
-msgstr "未簽名"
+msgstr "未簽署"
 
-# mail/mail-format.c:1161
 #: ../mail/em-format-html-display.c:926
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "此電郵未簽名。不保證此電郵已驗證。"
+msgstr "此郵件未簽署。不保證此郵件已驗證。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
 msgid "Valid signature"
-msgstr "有效的簽名"
+msgstr "有效的簽署"
 
-# mail/mail-format.c:1161
 #: ../mail/em-format-html-display.c:927
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
-msgstr "此電郵已簽名而且有效，表示它非常有可能是驗證的電郵。"
+msgstr "此郵件已簽署而且有效，表示它非常有可能是驗證的郵件。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
 msgid "Invalid signature"
-msgstr "無效的簽名"
+msgstr "無效的簽署"
 
 #: ../mail/em-format-html-display.c:928
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
-msgstr "電郵的簽名無法檢驗，可能已在傳送時被更動了。"
+msgstr "郵件的簽署無法檢驗，可能已在傳送時被更動了。"
 
 #: ../mail/em-format-html-display.c:929
 msgid "Valid signature, cannot verify sender"
-msgstr "簽名有效，但無法檢驗寄件者"
+msgstr "簽署有效，但無法檢驗寄件者"
 
 #: ../mail/em-format-html-display.c:929
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
-msgstr "此電郵有一個有效的簽名，但是電郵的寄件者無法檢驗。"
+msgstr "此郵件有一個有效的簽署，但是郵件的寄件者無法檢驗。"
 
 #: ../mail/em-format-html-display.c:935 ../mail/em-format-html.c:626
 msgid "Unencrypted"
@@ -13154,7 +11722,7 @@ msgstr "未加密"
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
-msgstr "此電郵未加密。它的內容在透過互聯網傳送可能會被檢閱。"
+msgstr "此郵件未加密。它的內容在透過互聯網傳送可能會被檢閱。"
 
 #: ../mail/em-format-html-display.c:936 ../mail/em-format-html.c:627
 msgid "Encrypted, weak"
@@ -13165,11 +11733,8 @@ 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 ""
-"此電郵已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時"
-"日，並不是無法檢視此電郵的內容。"
+msgstr "此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時日，並不是無法檢視此郵件的內容。"
 
-# ui/evolution-message-composer.xml.h:13
 #: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
 msgid "Encrypted"
 msgstr "已加密"
@@ -13178,7 +11743,7 @@ msgstr "已加密"
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
-msgstr "此電郵已加密。外面的人難以檢視此電郵的內容。"
+msgstr "此郵件已加密。外面的人難以檢視此郵件的內容。"
 
 #: ../mail/em-format-html-display.c:938 ../mail/em-format-html.c:629
 msgid "Encrypted, strong"
@@ -13189,9 +11754,7 @@ 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 ""
-"此電郵已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此電郵"
-"的內容。"
+msgstr "此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件的內容。"
 
 #: ../mail/em-format-html-display.c:1039 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -13201,20 +11764,18 @@ msgstr "檢視證書(_V)"
 msgid "This certificate is not viewable"
 msgstr "此證書無法檢視"
 
-# mail/message-list.c:977
 #: ../mail/em-format-html-display.c:1373
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "完成於 %B %d, %Y, %l:%M %p"
+msgstr "完成於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../mail/em-format-html-display.c:1381
 msgid "Overdue:"
-msgstr "逾期:"
+msgstr "到期日:"
 
-# mail/message-list.c:977
+# (Abel) combine with previous entry
 #: ../mail/em-format-html-display.c:1384
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "作者 %B %d, %Y, %l:%M %p"
+msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
 #: ../mail/em-format-html-display.c:1444
 msgid "_View Inline"
@@ -13226,21 +11787,17 @@ msgstr "隱藏(_H)"
 
 #: ../mail/em-format-html-display.c:1446
 msgid "_Fit to Width"
-msgstr "符合寬度(_F)"
+msgstr "符合闊度(_F)"
 
 #: ../mail/em-format-html-display.c:1447
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../mail/em-format-html-display.c:1866 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-# mail/mail-display.c:196
 #: ../mail/em-format-html-display.c:2073
 msgid "Select folder to save all attachments..."
 msgstr "選擇用來儲存所有的附加檔案的資料夾..."
@@ -13249,40 +11806,31 @@ msgstr "選擇用來儲存所有的附加檔案的資料夾..."
 msgid "_Save Selected..."
 msgstr "儲存選取的(_S)..."
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:2187
 #, 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:2194 ../mail/em-format-html-display.c:2272
 msgid "S_ave"
 msgstr "儲存(_A)"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
 #: ../mail/em-format-html-display.c:2205
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../mail/em-format-html-display.c:2268
 msgid "No Attachment"
 msgstr "無附件"
 
-# camel/camel-filter-driver.c:748
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-# mail/mail-ops.c:1498
 #: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
@@ -13290,26 +11838,22 @@ msgstr "正在擷取 `%s'"
 
 #: ../mail/em-format-html.c:620
 msgid "Valid signature but cannot verify sender"
-msgstr "簽名有效，但是無法檢驗寄件者"
+msgstr "簽署有效，但是無法檢驗寄件者"
 
-# mail/mail-format.c:1842
 #: ../mail/em-format-html.c:891
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
-# mail/mail-format.c:1787
 #: ../mail/em-format-html.c:921
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-# mail/mail-format.c:1799
 #: ../mail/em-format-html.c:932
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-# mail/mail-format.c:1803
 #: ../mail/em-format-html.c:934
 #, c-format
 msgid "Pointer to local file (%s)"
@@ -13320,44 +11864,36 @@ msgstr "本地檔案指示 (%s)"
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
-# mail/mail-format.c:1837
 #: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
-# mail/mail-ops.c:898
 #: ../mail/em-format-html.c:1193
 msgid "Formatting message"
-msgstr "格式化電郵"
+msgstr "格式化郵件"
 
-# mail/mail-format.c:756
-# mail/message-list.c:1082
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "寄件者"
 
-# mail/mail-format.c:759
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "回覆"
 
-# mail/mail-format.c:765
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "副本"
 
-# composer/e-msg-composer-hdrs.c:394
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "密件副本"
 
-# addressbook/backend/ebook/e-card.c:3428
 #. pseudo-header
 #: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1025
@@ -13374,8 +11910,6 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-# mail/mail-format.c:640
-# mail/message-list.c:1082
 #: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
@@ -13386,23 +11920,20 @@ msgstr "日期"
 #: ../mail/em-format-html.c:1726 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
-msgstr "新聞群組"
+msgstr "新聞羣組"
 
-# mail/mail-format.c:527
 #: ../mail/em-format.c:1102
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
-# mail/mail-format.c:573
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
-msgstr "無法剖析 S/MIME 電郵:未知的錯誤"
+msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 
-# mail/mail-format.c:573
 #: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
-msgstr "無法解析 MIME 格式的電郵。只好顯示原始檔。"
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
 #: ../mail/em-format.c:1279
 msgid "Unsupported encryption type for multipart/encrypted"
@@ -13410,27 +11941,24 @@ msgstr "多部份/已加密不支援的加密類型"
 
 #: ../mail/em-format.c:1446
 msgid "Unsupported signature format"
-msgstr "不支援的簽名格式"
+msgstr "不支援的簽署格式"
 
 #: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Error verifying signature"
-msgstr "檢驗簽名發生錯誤"
+msgstr "檢驗簽署發生錯誤"
 
 #: ../mail/em-format.c:1454 ../mail/em-format.c:1520
 msgid "Unknown error verifying signature"
-msgstr "檢驗簽名發生不明錯誤"
+msgstr "檢驗簽署發生不明錯誤"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "每次"
 
-# calendar/gui/event-editor.c:1545
 #: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "每天一次"
 
-# calendar/gui/event-editor.c:1550
 #: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "每週一次"
@@ -13450,33 +11978,26 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../mail/em-migrate.c:1649
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
-# mail/mail-ops.c:1728
 #: ../mail/em-migrate.c:1675
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
-# mail/mail-ops.c:1728
 #: ../mail/em-migrate.c:1860
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
-# camel/providers/pop3/camel-pop3-store.c:199
 #: ../mail/em-migrate.c:2064
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
 #: ../mail/em-migrate.c:2078
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
@@ -13487,25 +12008,21 @@ msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
 #: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
-msgstr "無法建立本地電郵儲存區 `%s':%s"
+msgstr "無法建立本地郵件儲存區 `%s':%s"
 
-# mail/mail-ops.c:1728
 #: ../mail/em-migrate.c:2713
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
-msgstr "無法在 `%s' 建立本地電郵資料夾:%s"
+msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
 #: ../mail/em-migrate.c:2732
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr ""
-"無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
+msgstr "無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
@@ -13516,10 +12033,9 @@ msgstr "回覆寄件者(_R)"
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-# ui/evolution-contact-editor.xml.h:13
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
-msgstr "傳送新電郵至(_S)…"
+msgstr "傳送新郵件至(_S)…"
 
 #: ../mail/em-popup.c:622
 msgid "_Add to Address Book"
@@ -13529,7 +12045,6 @@ msgstr "加入到通訊錄(_A)"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "已訂閱"
@@ -13547,59 +12062,51 @@ msgstr "請選擇一個伺服器。"
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
-# widgets/misc/e-messagebox.c:224
 #: ../mail/em-utils.c:141
 msgid "Do not show this message again."
 msgstr "不要再顯示這個訊息。"
 
 #: ../mail/em-utils.c:336
 msgid "Message Filters"
-msgstr "電郵規則"
+msgstr "郵件規則"
 
 #: ../mail/em-utils.c:516 ../mail/em-utils.c:553
 msgid "message"
-msgstr "電郵"
+msgstr "郵件"
 
-# mail/mail-callbacks.c:1188
 #: ../mail/em-utils.c:688
 msgid "Save Message..."
-msgstr "儲存電郵…"
+msgstr "儲存郵件…"
 
-# addressbook/backend/ebook/e-card.c:3346
 #: ../mail/em-utils.c:737
 msgid "Add address"
 msgstr "新增地址"
 
-# mail/mail-autofilter.c:229
 #. Drop filename for messages from a mailbox
 #: ../mail/em-utils.c:1221
 #, c-format
 msgid "Messages from %s"
-msgstr "來自 %s 的電郵"
+msgstr "來自 %s 的郵件"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-vfolder-rule.c:591
 msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
-# mail/mail-config.glade.h:12
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "自動連結辨識"
 
-# mail/mail-config.glade.h:12
 #: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
-msgstr "自動微笑辨識\t\t"
+msgstr "自動辨認笑臉符號"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
-msgstr "檢查內送的垃圾電郵"
+msgstr "檢查內送的垃圾郵件"
 
 #: ../mail/evolution-mail.schemas.in.in.h:4
 msgid "Citation highlight color"
@@ -13615,7 +12122,7 @@ msgstr "撰寫視窗預設高度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:7
 msgid "Composer Window default width"
-msgstr "撰寫視窗預設寬度"
+msgstr "撰寫視窗預設闊度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:8
 msgid "Compress display of addresses in TO/CC/BCC"
@@ -13629,66 +12136,55 @@ msgstr "將 TO/CC/BCC 中位址的顯示方式壓縮為 address_count 中指定�
 
 #: ../mail/evolution-mail.schemas.in.in.h:10
 msgid "Default charset in which to compose messages"
-msgstr "用於撰寫電郵的預設字元集"
+msgstr "用於撰寫郵件的預設字符集"
 
 #: ../mail/evolution-mail.schemas.in.in.h:11
 msgid "Default charset in which to compose messages."
-msgstr "用於撰寫電郵的預設字元集。"
+msgstr "用於撰寫郵件的預設字符集。"
 
-# ui/evolution-mail.xml.h:75
 #: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default charset in which to display messages"
-msgstr "用於顯示電郵的預設字元集"
+msgstr "用於顯示郵件的預設字符集"
 
-# ui/evolution-mail.xml.h:75
 #: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default charset in which to display messages."
-msgstr "用於顯示電郵的預設字元集。"
+msgstr "用於顯示郵件的預設字符集。"
 
-# ui/evolution-mail.xml.h:34
 #: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Composer Window"
 msgstr "撰寫視窗的預設高度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default height of the Message Window"
-msgstr "電郵視窗的預設高度"
+msgstr "郵件視窗的預設高度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default height of the Subscribe dialog"
 msgstr "訂閱對話方塊的預設高度"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Composer Window"
-msgstr "撰寫視窗的預設寬度"
+msgstr "撰寫視窗的預設闊度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Default width of the Message Window"
-msgstr "電郵視窗的預設寬度"
+msgstr "郵件視窗的預設闊度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Default width of the Subscribe dialog"
-msgstr "訂閱對話方塊的預設寬度"
+msgstr "訂閱對話方塊的預設闊度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Draw spelling error indicators on words as you type."
-msgstr "當你輸入時在文字上顯示拼字錯誤指示。"
+msgstr "當你輸入內容時在文字上顯示拼字錯誤指示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Empty Trash folders on exit"
@@ -13696,11 +12192,11 @@ msgstr "結束時清空垃圾資料夾"
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "結束 Evolution 時清空所有垃圾筒資料夾"
+msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
-msgstr "啟用插入號模式，如此你可以在閱讀電郵時看到游標。"
+msgstr "啟用插入號模式，如此你可以在閱讀郵件時看到游標。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:26
 msgid "Enable or disable type ahead search feature"
@@ -13712,10 +12208,7 @@ msgid ""
 "by typing in the text. Use is that you can easily find a folder in that side "
 "bar by just typing the folder name and the selection jumps automatically to "
 "that folder."
-msgstr ""
-"啟用側邊欄搜尋功能使你能輸入文字開始互動式搜尋。它的作用是讓你只須在側邊欄中"
-"輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾"
-"的位置。"
+msgstr "啟用側邊欄搜尋功能使你能輸入文字開始互動式搜尋。它的作用是讓你只須在側邊欄中輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾的位置。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
 msgid "Enable/disable caret mode"
@@ -13723,17 +12216,17 @@ msgstr "啟用/停用插入號模式"
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Height of the message-list pane"
-msgstr "電郵清單窗格高度"
+msgstr "郵件清單窗格高度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:30
 msgid "Height of the message-list pane."
-msgstr "電郵清單窗格的高度。"
+msgstr "郵件清單窗格的高度。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:31
 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 或更多的電郵，詢問使用者是否確定要這麼做。"
+msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:32
 msgid ""
@@ -13746,29 +12239,24 @@ 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 檢視器，會用於"
-"顯示內容。"
+msgstr "如果沒有內置檢視器可用於 Evolution 裏面特殊的 mime-type，任何顯示在此清單的 mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於顯示內容。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "It disables/enables the prompt while marking multiple messages."
-msgstr "這會停用/啟用標記多個電郵時的提示。"
+msgstr "這會停用/啟用標記多個郵件時的提示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
 msgid "Last time empty trash was run"
-msgstr "上次清空垃圾筒的時間"
+msgstr "上次清空回收筒的時間"
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-# mail/mail-config.glade.h:6
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of accepted licenses"
 msgstr "接收的授權清單"
 
-# mail/mail-config.glade.h:6
 #: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "List of accounts"
 msgstr "帳號清單"
@@ -13777,9 +12265,7 @@ msgstr "帳號清單"
 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 "
-"相關的字串命名子目錄。"
+msgstr "Evolution 的郵件元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts 相關的字串命名子目錄。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "List of custom headers and whether they are enabled."
@@ -13789,9 +12275,7 @@ msgstr "自訂標頭以及它們是否啟用的清單"
 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 十六進位編碼。"
+msgstr "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color 使用 HTML 十六進位編碼。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "List of mime types to check for bonobo component viewers"
@@ -13803,7 +12287,7 @@ msgstr "已經接受其授權的協定清單。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Load images for HTML messages over http"
-msgstr "透過 http 載入 HTNL 電郵的影像"
+msgstr "透過 http 載入 HTML 郵件的圖像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:45
 msgid ""
@@ -13811,8 +12295,10 @@ msgid ""
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
-"透過 http(s) 載入 HTNL 電郵的影像。可能的值：0 – 從不從網絡載入影像 1 – 如果"
-"寄件者是在通訊錄時，載入影像 2 - 永遠從網絡載入影像"
+"透過 http(s) 載入 HTML 郵件的圖像。可能的值為：\n"
+"0 – 不從網絡載入圖像\n"
+"1 – 如果寄件者是在通訊錄時，載入圖像\n"
+"2 - 一定從網絡載入圖像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Log filter actions"
@@ -13840,20 +12326,19 @@ msgstr "在指定的時限過後，標示成已閱讀。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:52
 msgid "Mark citations in the message \"Preview\""
-msgstr "在電郵「預覽」中標示引用"
+msgstr "在郵件「預覽」中標示引用"
 
 #: ../mail/evolution-mail.schemas.in.in.h:53
 msgid "Mark citations in the message \"Preview\"."
-msgstr "在電郵「預覽」中標示引用。"
+msgstr "在郵件「預覽」中標示引用。"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "Message Window default height"
-msgstr "電郵視窗預設高度"
+msgstr "郵件視窗預設高度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:55
 msgid "Message Window default width"
-msgstr "電郵視窗預設寬度"
+msgstr "郵件視窗預設闊度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:56
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
@@ -13861,21 +12346,19 @@ msgstr "訊息顯示樣式 (「一般」、「完整標頭」、「來源」)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Minimum days between emptying the trash on exit"
-msgstr "結束時清空垃圾筒最少間隔天數"
+msgstr "結束時清空回收筒最少間隔天數"
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "結束時清空垃圾筒最少間隔天數。"
+msgstr "結束時清空回收筒最少間隔天數。"
 
-# mail/mail-config.glade.h:40
 #: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "New Mail Notify sound file"
-msgstr "新電郵通知聲音檔案"
+msgstr "新郵件通知聲音檔案"
 
-# mail/mail-config.glade.h:40
 #: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "New Mail Notify type"
-msgstr "新電郵通知類型"
+msgstr "新郵件通知類型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:61
 msgid "Number of addresses to display in TO/CC/BCC"
@@ -13892,7 +12375,7 @@ msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 #: ../mail/evolution-mail.schemas.in.in.h:64
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
-msgstr "當使用者傳送沒有主旨的電郵時，提示使用者。"
+msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:65
 msgid "Prompt when user expunges"
@@ -13902,22 +12385,19 @@ msgstr "使用者清空時提示"
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Prompt when user tries to open 10 or more messages at once"
-msgstr "當使用者嘗試一次開啟 10 個或更多電郵時提示使用者。"
+msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:68
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "當使用者嘗試傳送 HTML 電郵到不想接收 HTML 電郵的收件者時，顯示提示。"
+msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時，顯示提示。"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr "當使用者傳送不含收件者或副本收件者的電郵時，提示使用者。"
+msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:70
 msgid "Prompt when user tries to send unwanted HTML"
@@ -13925,98 +12405,89 @@ msgstr "當使用者嘗試傳送不想要的 HTML 時提示"
 
 #: ../mail/evolution-mail.schemas.in.in.h:71
 msgid "Prompt while marking multiple messages"
-msgstr "當標記多個電郵時提示"
+msgstr "當標記多個郵件時提示"
 
 #: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Recognize links in text and replace them."
-msgstr "辨識文字中的連結並取代它們。"
+msgstr "辨認文字中的連結並將之取代。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Recognize smileys in text and replace them with images."
-msgstr "辨識文字中的微笑並取代成影像。"
+msgstr "辨認文字中的笑臉符號並取代成圖示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Run junk test on incoming mail"
-msgstr "在內送的電郵執行垃圾電郵檢查"
+msgstr "在內送的郵件執行垃圾郵件檢查"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:200
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Send HTML mail by default"
-msgstr "預設傳送 HTML 電郵"
+msgstr "預設傳送 HTML 郵件"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:200
 #: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Send HTML mail by default."
-msgstr "預設傳送 HTML 電郵。"
+msgstr "預設傳送 HTML 郵件。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Show animated images as animations."
-msgstr "將動畫式影像顯示成動畫。"
+msgstr "播放動畫圖像。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Show deleted messages (with a strike-through) in the message-list."
-msgstr "在電郵清單中顯示刪除的電郵 (加上刪除號)"
+msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-# ui/evolution-mail.xml.h:86
 #: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Show deleted messages in the message-list"
-msgstr "在電郵清單中顯示刪除的電郵"
+msgstr "在郵件清單中顯示刪除的郵件"
 
-# ui/evolution-mail.xml.h:86
 #: ../mail/evolution-mail.schemas.in.in.h:83
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
 "list"
-msgstr "在電郵清單的組合欄中顯示寄件者的電郵"
+msgstr "在郵件清單的組合欄中顯示寄件者的電子郵件"
 
-# ui/evolution-mail.xml.h:86
 #: ../mail/evolution-mail.schemas.in.in.h:84
 msgid "Show the sender email in the messages column in the message list"
-msgstr "在電郵清單的電郵欄中顯示寄件者的電郵"
+msgstr "在郵件清單的郵件欄中顯示寄件者的電子郵件"
 
 #: ../mail/evolution-mail.schemas.in.in.h:85
 msgid "Sound file to play when new mail arrives."
-msgstr "新電郵送到時要播放的音效檔案"
+msgstr "新郵件送到時要播放的音效檔案"
 
 #: ../mail/evolution-mail.schemas.in.in.h:86
 msgid "Specifies the type of New Mail Notification the user wishes to use."
-msgstr "指定使用者要使用的「新電郵通知」類型。"
+msgstr "指定使用者要使用的「新郵件通知」類型。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:87
 msgid "Spell check inline"
 msgstr "行內拼字檢查"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Subscribe dialog default height"
 msgstr "訂閱對話方塊預設高度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:89
 msgid "Subscribe dialog default width"
-msgstr "訂閱對話方塊預設寬度"
+msgstr "訂閱對話方塊預設闊度"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "Terminal font"
 msgstr "終端機字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "上次執行清單垃圾筒的時間，從紀元後算起的日數。"
+msgstr "上次執行清單回收筒的時間，從紀元後算起的日數。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "The terminal font for mail display"
-msgstr "用於電郵顯示的終端機字型"
+msgstr "用於郵件顯示的終端機字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:93
 msgid "The variable width font for mail display"
-msgstr "用於電郵顯示的變動寬度字型"
+msgstr "用於郵件顯示的變動闊度字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:94
 msgid ""
@@ -14024,39 +12495,34 @@ msgid ""
 "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.in.h:95
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
-msgstr "這會設定在預設電郵清單檢視中顯示位址的長度，超過的部分會顯示「...」。"
+msgstr "這會設定在預設郵件清單檢視中顯示位址的長度，超過的部分會顯示「...」。"
 
-# ui/evolution-mail.xml.h:93
 #: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Thread the message list."
-msgstr "串接電郵清單。"
+msgstr "串接郵件清單。"
 
-# ui/evolution-mail.xml.h:93
 #: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Thread the message-list"
-msgstr "串接電郵清單"
+msgstr "串接郵件清單"
 
 #: ../mail/evolution-mail.schemas.in.in.h:98
 msgid "Thread the message-list based on Subject"
-msgstr "以主旨為基礎串接電郵清單"
+msgstr "以主旨為基礎串接郵件清單"
 
 #: ../mail/evolution-mail.schemas.in.in.h:99
 msgid "Timeout for marking message as Seen"
-msgstr "將電郵標示成已閱讀的時限"
+msgstr "將郵件標示成已閱讀的時限"
 
 #: ../mail/evolution-mail.schemas.in.in.h:100
 msgid "Timeout for marking message as Seen."
-msgstr "將電郵標示成已閱讀的時限。"
+msgstr "將郵件標示成已閱讀的時限。"
 
-# mail/mail-config.glade.h:41
 #: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
@@ -14075,24 +12541,23 @@ msgstr "使用自訂字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:105
 msgid "Use custom fonts for displaying mail"
-msgstr "使用自訂字型來顯示電郵"
+msgstr "使用自訂字型來顯示郵件"
 
 #: ../mail/evolution-mail.schemas.in.in.h:106
 msgid "Use only local spam tests."
-msgstr "只使用本地垃圾電郵測試。"
+msgstr "只使用本地垃圾郵件測試。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:107
 msgid "Use only the local spam tests (no DNS)."
-msgstr "只使用本地垃圾電郵測試 (沒有 DNS)。"
+msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
 msgid "Use side-by-side or wide layout"
 msgstr "使用緊貼或寬配置"
 
-# mail/mail-accounts.c:197
 #: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "Variable width font"
-msgstr "變動寬度字型"
+msgstr "變動闊度字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:110
 msgid "View/Bcc menu item is checked"
@@ -14138,37 +12603,33 @@ msgstr "檢視/回覆功能表項目已選取。"
 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.in.h:121
 msgid "Width of the message-list pane"
-msgstr "電郵清單窗格寬度"
+msgstr "郵件清單窗格闊度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:122
 msgid "Width of the message-list pane."
-msgstr "電郵清單窗格的寬度。"
+msgstr "郵件清單窗格的闊度。"
 
-# shell/e-shell-importer.c:363
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
 
 #: ../mail/importers/elm-importer.c:382
 msgid "Import mail from Elm."
-msgstr "從 Elm 匯入電郵。"
+msgstr "從 Elm 匯入郵件。"
 
-# ui/evolution.xml.h:47
 #: ../mail/importers/evolution-mbox-importer.c:83
 #: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
-# mail/mail-account-gui.c:682
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
@@ -14176,18 +12637,17 @@ msgstr "選取資料夾來輸入"
 
 #: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
-msgstr "Berkeley 電郵箱 (mbox)"
+msgstr "Berkeley 郵件信箱 (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
-msgstr "匯入 Berkeley 電郵箱格式資料夾"
+msgstr "匯入 Berkeley 郵件信箱格式資料夾"
 
-# shell/e-shell-importer.c:363
 #: ../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'"
+msgstr "正在匯入 ‘%s’"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
@@ -14196,19 +12656,16 @@ msgstr "輸入 `%s'"
 msgid "Please wait"
 msgstr "請稍候"
 
-# shell/e-shell-importer.c:363
 #: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
-msgstr "輸入信箱"
+msgstr "正在匯入信箱"
 
-# mail/mail-ops.c:599
 #: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -14228,14 +12685,14 @@ msgid ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 msgstr ""
-"有些 Netscape 電郵過濾器是以電郵的優先權\n"
+"有些 Netscape 郵件過濾器是以電子郵件的優先權\n"
 "為基礎的，而在 Evolution 中則沒有這種用法。\n"
 "Evolution 的替代方式是提供範圍從 -3 到 3 的點數\n"
-"給電郵，並且根據此數值來過濾。\n"
+"給電子郵件，並且根據此數值來過濾。\n"
 "\n"
 "\n"
 "目前的解決方案是加入一組名為「優先順序過濾器」\n"
-"的過濾器來將 Netscape 的電郵優先權轉換為\n"
+"的過濾器來將 Netscape 的電子郵件優先權轉換為\n"
 "Evolution 的點數，而受影響的過濾器會使用點數來\n"
 "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
 "照你想要的方式運作。"
@@ -14247,7 +12704,7 @@ msgid ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 msgstr ""
-"有些 Netscape 電郵過濾器使用\n"
+"有些 Netscape 郵件過濾器使用\n"
 "「忽略對話」或「監看對話」的\n"
 "功能，而 Evolution 並不支援它。\n"
 "這些過濾器則會被丟棄。"
@@ -14260,15 +12717,15 @@ msgid ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 msgstr ""
-"有些 Netscape 電郵過濾器可以測試\n"
-"電郵的內文是否與所給的字串相等，\n"
+"有些 Netscape 郵件過濾器可以測試\n"
+"電子郵件的內文是否與所給的字串相等，\n"
 "Evolution 不支援此功能。那些過濾器\n"
-"會被修改成測試電郵的內文是否包含\n"
+"會被修改成測試郵件的內文是否包含\n"
 "該字串。"
 
 #: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution 正在匯入你舊有的 Netscape 資料"
+msgstr "Evolution 正在匯入舊有的 Netscape 資料"
 
 #: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
@@ -14280,57 +12737,48 @@ msgstr "設定值"
 
 #: ../mail/importers/netscape-importer.c:1913
 msgid "Mail Filters"
-msgstr "電郵規則"
+msgstr "郵件規則"
 
-# importers/netscape-importer.c:847
 #: ../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？"
+"Evolution 找到 Netscape 格式的郵件。\n"
+"是否將它們匯入至 Evolution？"
 
-# shell/e-shell-importer.c:363
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
 
 #: ../mail/importers/pine-importer.c:434
 msgid "Import mail from Pine."
-msgstr "從 Pine 匯入電郵。"
+msgstr "從 Pine 匯入郵件。"
 
-# mail/mail-autofilter.c:70
 #: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
-msgstr "電郵送到 %s"
+msgstr "郵件送到 %s"
 
-# mail/mail-autofilter.c:229
 #: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
-msgstr "電郵來自 %s "
+msgstr "郵件來自 %s "
 
-# mail/mail-autofilter.c:213
 #: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
-# mail/mail-autofilter.c:285
 #: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
-msgstr "%s 電郵列表"
+msgstr "%s 郵件列表"
 
-# mail/mail-autofilter.c:335
-# mail/mail-autofilter.c:356
 #: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
@@ -14342,7 +12790,6 @@ msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 msgstr[1] "%d 封已刪除"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
@@ -14350,7 +12797,6 @@ msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 msgstr[1] "%d 封垃圾"
 
-# mail/mail-config.glade.h:26
 #: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
@@ -14358,7 +12804,6 @@ msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 msgstr[1] "%d 個草稿"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:548
 #, c-format
 msgid "%d sent"
@@ -14366,7 +12811,6 @@ msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 msgstr[1] "%d 封已傳送"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
@@ -14381,7 +12825,6 @@ msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 msgstr[1] "共 %d 封"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
@@ -14389,38 +12832,33 @@ msgid_plural ", %d unread"
 msgstr[0] "%d 封未讀"
 msgstr[1] "%d 封未讀"
 
-# ui/evolution-mail.xml.h:109
 #: ../mail/mail-component.c:819
 msgid "New Mail Message"
-msgstr "新增電郵"
+msgstr "新增郵件"
 
 #: ../mail/mail-component.c:820
 msgid "_Mail Message"
-msgstr "電郵訊息(_M)"
+msgstr "郵件訊息(_M)"
 
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
 #: ../mail/mail-component.c:821
 msgid "Compose a new mail message"
-msgstr "編輯新的電郵訊息"
+msgstr "編輯新的郵件訊息"
 
-# mail/mail-vfolder.c:438
 #: ../mail/mail-component.c:827
 msgid "New Mail Folder"
-msgstr "新電郵資料夾"
+msgstr "新郵件資料夾"
 
 #: ../mail/mail-component.c:828
 msgid "Mail _Folder"
-msgstr "電郵資料夾(_F)"
+msgstr "郵件資料夾(_F)"
 
-# ui/evolution.xml.h:10
 #: ../mail/mail-component.c:829
 msgid "Create a new mail folder"
-msgstr "建立新電郵資料夾"
+msgstr "建立新郵件資料夾"
 
 #: ../mail/mail-component.c:973
 msgid "Failed upgrading Mail settings or folders."
-msgstr "升級電郵或資料夾失敗。"
+msgstr "升級郵件或資料夾失敗。"
 
 #: ../mail/mail-config.c:85
 msgid "I_mportant"
@@ -14436,14 +12874,11 @@ msgstr "工作(_W)"
 msgid "_Personal"
 msgstr "個人(_P)"
 
-# mail/mail-format.c:762
-# mail/message-list.c:1083
 #. forest green
 #: ../mail/mail-config.c:88
 msgid "_To Do"
 msgstr "待辦事項(_T)"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: ../mail/mail-config.c:89
 msgid "_Later"
@@ -14483,7 +12918,7 @@ msgstr "<span weight=\"bold\">驗證</span>"
 
 #: ../mail/mail-config.glade.h:11
 msgid "<span weight=\"bold\">Composing Messages</span>"
-msgstr "<span weight=\"bold\">撰寫電郵</span>"
+msgstr "<span weight=\"bold\">撰寫郵件</span>"
 
 #: ../mail/mail-config.glade.h:12
 msgid "<span weight=\"bold\">Configuration</span>"
@@ -14495,11 +12930,11 @@ msgstr "<span weight=\"bold\">預設行為</span>"
 
 #: ../mail/mail-config.glade.h:14
 msgid "<span weight=\"bold\">Delete Mail</span>"
-msgstr "<span weight=\"bold\">刪除電郵</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>"
+msgstr "<span weight=\"bold\">顯示的郵件標頭(_H)</span>"
 
 #: ../mail/mail-config.glade.h:16
 msgid "<span weight=\"bold\">Filter Options</span>"
@@ -14511,25 +12946,23 @@ msgstr "<span weight=\"bold\">標籤和色彩</span>"
 
 #: ../mail/mail-config.glade.h:19
 msgid "<span weight=\"bold\">Loading Images</span>"
-msgstr "<span weight=\"bold\">載入影像</span>"
+msgstr "<span weight=\"bold\">載入圖像</span>"
 
-# views/mail/galview.xml.h:4
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
-msgstr "<span weight=\"bold\">電郵顯示</span>"
+msgstr "<span weight=\"bold\">郵件顯示</span>"
 
 #: ../mail/mail-config.glade.h:21
 msgid "<span weight=\"bold\">Message Fonts</span>"
-msgstr "<span weight=\"bold\">電郵字型</span>"
+msgstr "<span weight=\"bold\">郵件字型</span>"
 
 #: ../mail/mail-config.glade.h:22
 msgid "<span weight=\"bold\">Message Receipts</span>"
-msgstr "<span weight=\"bold\">電郵回條</span>"
+msgstr "<span weight=\"bold\">郵件回條</span>"
 
-# mail/mail-config.glade.h:40
 #: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
-msgstr "<span weight=\"bold\">新電郵通知</span>"
+msgstr "<span weight=\"bold\">新郵件通知</span>"
 
 #: ../mail/mail-config.glade.h:24
 #: ../plugins/publish-calendar/publish-calendar.glade.h:3
@@ -14544,9 +12977,10 @@ msgstr "<span weight=\"bold\">選項</span>"
 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
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">列印的字型</span>"
+msgstr "<span weight=\"bold\">打印用的字型</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -14560,16 +12994,14 @@ msgstr "<span weight=\"bold\">安全 MIME (S/MIME)</span>"
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全性</span>"
 
-# mail/mail-config.glade.h:69
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
-msgstr "<span weight=\"bold\">己傳送的和草稿電郵</span>"
+msgstr "<span weight=\"bold\">己傳送的和草稿郵件</span>"
 
 #: ../mail/mail-config.glade.h:32
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">伺服器組態</span>"
 
-# mail/mail-config.glade.h:5
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "帳號總管"
@@ -14584,32 +13016,31 @@ msgstr "新增命令稿(_S)"
 
 #: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "使用此帳號時永遠在外送的電郵簽名(_W)"
+msgstr "使用此帳號時一定在外送的郵件簽署(_W)"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
-msgstr "當傳送加密電郵時也加密本身(_F)"
+msgstr "當傳送加密郵件時也加密本身(_F)"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "永遠寄送副本(Cc)給(_S):"
+msgstr "一定寄送副本 (_Cc) 給:"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "永遠寄送密件副本(Bcc)給(_B):"
+msgstr "一定寄送密件副本 (_Bcc) 給:"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "加密時永遠信任在我的密碼匙圈裏的密碼匙(_T)"
+msgstr "加密時永遠信任我的密碼匙圈裏的密碼匙(_T)"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
-msgstr "當傳送加密電郵時永遠自我加密(_M)"
+msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
-msgstr "附加原始電郵"
+msgstr "附加原始郵件"
 
 #: ../mail/mail-config.glade.h:45
 msgid "Automatically insert _smiley images"
@@ -14625,11 +13056,11 @@ msgstr "波羅的海語系 (ISO-8859-4)"
 
 #: ../mail/mail-config.glade.h:48
 msgid "Beep w_hen new mail arrives"
-msgstr "當新電郵到達時發出嗶聲(_H)"
+msgstr "當新郵件到達時發出嗶聲(_H)"
 
 #: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
-msgstr "字集(_H):"
+msgstr "字符集(_H):"
 
 #: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
@@ -14637,7 +13068,7 @@ msgstr " 檢查可支援的類型(_E) "
 
 #: ../mail/mail-config.glade.h:51
 msgid "Check in_coming mail for junk"
-msgstr "檢查內送電郵是否為垃圾電郵(_N)"
+msgstr "檢查內送郵件是否為垃圾郵件(_N)"
 
 #: ../mail/mail-config.glade.h:52
 msgid "Check spelling while I _type"
@@ -14645,16 +13076,12 @@ msgstr "當我輸入時檢查拼字(_T)"
 
 #: ../mail/mail-config.glade.h:53
 msgid "Checks incoming mail messages to be Junk"
-msgstr "檢查內送的垃圾電郵訊息"
+msgstr "檢查內送的垃圾郵件訊息"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../mail/mail-config.glade.h:54
 msgid "Cle_ar"
 msgstr "清除(_A)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../mail/mail-config.glade.h:55
 msgid "Clea_r"
 msgstr "清除(_R)"
@@ -14671,7 +13098,6 @@ msgstr "色彩"
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-# mail/mail-config.glade.h:15
 #: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14681,12 +13107,12 @@ msgid ""
 "\n"
 "Click \"Apply\" to save your settings."
 msgstr ""
-"恭喜你，你的電郵組態已經完成。\n"
+"恭喜你，郵件設定已經完成。\n"
 "\n"
 "你現在可以開始使用 Evolution\n"
-"收發電郵。\n"
+"收發電子郵件。\n"
 "\n"
-"按一下「套用」，儲存你的設定值。"
+"請按一下「套用」儲存設定。"
 
 #: ../mail/mail-config.glade.h:65
 msgid "De_fault"
@@ -14694,16 +13120,15 @@ msgstr "預設值(_F)"
 
 #: ../mail/mail-config.glade.h:66
 msgid "Default character e_ncoding:"
-msgstr "預設字元編碼(_N):"
+msgstr "預設字符編碼(_N):"
 
 #: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
-msgstr "數碼簽名外送的電郵 (預設值)(_S)"
+msgstr "為外送的郵件加上數碼簽署 [預設值] (_S)"
 
-# camel/camel-filter-driver.c:671
 #: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
-msgstr "不要引用原始電郵"
+msgstr "不要引用原始郵件"
 
 #: ../mail/mail-config.glade.h:71
 msgid "Done"
@@ -14718,18 +13143,17 @@ msgstr "草稿匣(_F):"
 msgid "E_nable"
 msgstr "啟用(_E)"
 
-# mail/mail-config.glade.h:6
 #: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
-msgstr "電郵帳號"
+msgstr "電子郵件帳號"
 
 #: ../mail/mail-config.glade.h:75
 msgid "Email _Address:"
-msgstr "電郵位址(_A):"
+msgstr "電子郵件位址(_A):"
 
 #: ../mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
-msgstr "離開時清空垃圾桶資料夾(_X)"
+msgstr "離開時清空回收筒資料夾(_X)"
 
 #: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
@@ -14737,37 +13161,32 @@ msgstr "加密證書(_P):"
 
 #: ../mail/mail-config.glade.h:78
 msgid "Encrypt out_going messages (by default)"
-msgstr "加密外送的電郵 (預設值)(_E)"
+msgstr "加密外送的郵件 (預設值)(_E)"
 
 #: ../mail/mail-config.glade.h:80
 msgid "Fi_xed width Font:"
-msgstr "固定寬度字型(_X):"
+msgstr "固定闊度字型(_X):"
 
 #: ../mail/mail-config.glade.h:81
 msgid "Fi_xed-width:"
-msgstr "固定寬度(_X):"
+msgstr "固定闊度(_X):"
 
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
 #: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "字型內容"
 
 #: ../mail/mail-config.glade.h:83
 msgid "Format messages in _HTML"
-msgstr "將電郵格式化為 _HTML"
+msgstr "將郵件格式化為 _HTML"
 
 #: ../mail/mail-config.glade.h:84
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-# mail/mail-config.glade.h:36
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
-msgstr "HTML 電郵"
+msgstr "HTML 郵件"
 
-# addressbook/printing/e-contact-print.glade.h:11
 #: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "標頭"
@@ -14780,40 +13199,35 @@ msgstr "強調引文為(_Q)"
 msgid "I_nclude remote tests"
 msgstr "包含遠端測試(_N)"
 
-# mail/mail-config.glade.h:37
 #: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "行內"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../mail/mail-config.glade.h:94
 msgid "Languages Table"
 msgstr "語言表"
 
-# mail/mail-config.glade.h:40
 #: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
-msgstr "電郵組態"
+msgstr "郵件組態"
 
 #: ../mail/mail-config.glade.h:97
 msgid "Mail Headers Table"
-msgstr "電郵標頭表"
+msgstr "郵件標頭表"
 
-# mail/local-config.glade.h:2
 #: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-# views/mail/galview.xml.h:4
 #: ../mail/mail-config.glade.h:100
 msgid "Message Composer"
-msgstr "電郵編輯器"
+msgstr "郵件編輯器"
 
 #: ../mail/mail-config.glade.h:101
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "注意：在你首次連線之前將不會提示你輸入密碼"
+msgstr "注意：在首次連線之前將不會提示你輸入密碼"
 
 #: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
@@ -14821,11 +13235,11 @@ msgstr "團體(_G):"
 
 #: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG 鑰匙 ID(_K):"
+msgstr "_PGP/GPG 密碼匙 ID:"
 
 #: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
-msgstr "當新電郵到達時播放聲音檔案(_V)"
+msgstr "當新郵件到達時播放聲音檔案(_V)"
 
 #: ../mail/mail-config.glade.h:107
 msgid ""
@@ -14835,40 +13249,31 @@ msgstr ""
 "請在下面的空間輸入描述這個帳號的名稱。\n"
 "這個名稱將只做為顯示之用。"
 
-# mail/mail-config-druid.c:105
 #: ../mail/mail-config.glade.h:109
 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 ""
-"請輸入以下關於你寄送電郵方式的資訊。如果你不清楚，請聯絡你的系統管理員或網絡"
-"服務供應商。"
+msgstr "請輸入以下關於寄送郵件方式的資訊。如果你不清楚，請聯絡系統管理員或網絡服務供應商。"
 
-# mail/mail-config-druid.c:99
 #: ../mail/mail-config.glade.h:110
 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 ""
-"請在下面輸入你的名稱及電郵地址。「選擇性」的欄位不一定要填，除非你希望在送出"
-"的電郵內包含這些資訊。"
+msgstr "請在下面輸入你的名稱及電郵地址。「選擇性」的欄位不一定要填，除非你希望在送出的郵件內包含這些資訊。"
 
 #: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
-msgstr "當傳送的電郵只有指定密件副本收件者時顯示提示(_O)"
+msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-# camel/camel-filter-driver.c:671
 #: ../mail/mail-config.glade.h:113
 msgid "Quote original message"
-msgstr "引用原始電郵"
+msgstr "引用原始郵件"
 
-# mail/mail-config.glade.h:56
 #: ../mail/mail-config.glade.h:114
 msgid "Quoted"
 msgstr "引用"
@@ -14885,55 +13290,49 @@ msgstr "回覆地址(_P):"
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
-# ui/evolution-contact-editor.xml.h:3
 #: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-# mail/mail-ops.c:603
 #: ../mail/mail-config.glade.h:120
 msgid "S_end message receipts:"
-msgstr "傳送電郵回條(_E):"
+msgstr "傳送郵件回條(_E):"
 
 #: ../mail/mail-config.glade.h:121
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-# ui/evolution-contact-editor.xml.h:3
 #: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "選取(_L)..."
 
 #: ../mail/mail-config.glade.h:124
 msgid "Select HTML fixed width font"
-msgstr "選擇 HTML 固定寬度字型"
+msgstr "選擇 HTML 固定闊度字型"
 
 #: ../mail/mail-config.glade.h:125
 msgid "Select HTML fixed width font for printing"
-msgstr "選擇用於列印的 HTML 固定寬度字型"
+msgstr "選擇用於打印的 HTML 固定闊度字型"
 
 #: ../mail/mail-config.glade.h:126
 msgid "Select HTML variable width font"
-msgstr "選擇 HTML 可變寬度字型"
+msgstr "選擇 HTML 可變闊度字型"
 
 #: ../mail/mail-config.glade.h:127
 msgid "Select HTML variable width font for printing"
-msgstr "選擇用於列印的 HTML 可變寬度字型"
+msgstr "選擇用於打印的 HTML 可變闊度字型"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-# mail/mail-config.glade.h:66
 #: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
-msgstr "傳送電郵"
+msgstr "傳送郵件"
 
 #: ../mail/mail-config.glade.h:131
 msgid "Sent _Messages Folder:"
-msgstr "傳送電郵資料夾(_M):"
+msgstr "傳送郵件資料夾(_M):"
 
 #: ../mail/mail-config.glade.h:132
 msgid "Ser_ver requires authentication"
@@ -14945,18 +13344,16 @@ msgstr "伺服器類型(_T):"
 
 #: ../mail/mail-config.glade.h:134
 msgid "Sig_ning certificate:"
-msgstr "簽名證書(_N):"
+msgstr "簽署證書(_N):"
 
 #: ../mail/mail-config.glade.h:135
 msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail-config.glade.h:136
 msgid "Signatures"
-msgstr "簽名"
+msgstr "簽署"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail-config.glade.h:137
 msgid "Signatures Table"
 msgstr "簽署表"
@@ -14977,7 +13374,7 @@ msgstr "類型(_Y):"
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "這裏的語言清單只反映出你已經安裝字典的語言。"
+msgstr "這裏的語言清單只反映出已經安裝字典的語言。"
 
 #: ../mail/mail-config.glade.h:142
 msgid ""
@@ -14985,8 +13382,8 @@ msgid ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
-"這個命令稿的輸出會用來做為你的\n"
-"簽名檔。你所指定的名稱將只做為\n"
+"這個命令稿的輸出會用來作為你的\n"
+"簽名檔。你指定的名稱只會作為\n"
 "顯示之用。"
 
 #: ../mail/mail-config.glade.h:146
@@ -14994,7 +13391,7 @@ msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"輸入你想要用來代表這個帳號的名稱。\n"
+"輸入想用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
 #: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
@@ -15003,16 +13400,15 @@ msgstr "使用者名稱(_N):"
 
 #: ../mail/mail-config.glade.h:149
 msgid "V_ariable-width:"
-msgstr "可變寬度(_A):"
+msgstr "可變闊度(_A):"
 
-# mail/mail-config.glade.h:81
 #: ../mail/mail-config.glade.h:150
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
 "Click \"Forward\" to begin. "
 msgstr ""
-"歡迎使用 Evolution 電郵組態助理。\n"
+"歡迎使用 Evolution 郵件組態助理。\n"
 "\n"
 "按一下「下一步」開始。 "
 
@@ -15022,15 +13418,15 @@ msgstr "加入簽名檔(_A)"
 
 #: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
-msgstr "永遠自網絡下載影像(_A)"
+msgstr "一定自網絡下載圖像(_A)"
 
 #: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
-msgstr "當新電郵到達時不要通知我(_D)"
+msgstr "當新郵件到達時不要通知我(_D)"
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "不要簽署會議邀請(為了相容 _Outlook)"
+msgstr "不簽署會議邀請 (兼容於 _Outlook)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
@@ -15038,7 +13434,7 @@ msgstr "轉寄方式(_F):"
 
 #: ../mail/mail-config.glade.h:160
 msgid "_Load images in mail from contacts"
-msgstr "載入由聯絡人寄出的電郵中的圖片(_L)"
+msgstr "載入由聯絡人寄出的郵件中的圖片(_L)"
 
 #: ../mail/mail-config.glade.h:161
 msgid "_Make this my default account"
@@ -15046,25 +13442,23 @@ msgstr "設為我的預設帳號(_M)"
 
 #: ../mail/mail-config.glade.h:162
 msgid "_Mark messages as read after"
-msgstr "標示電郵為已閱讀於(_M)"
+msgstr "標示郵件為已閱讀於(_M)"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Never load images from the Internet"
-msgstr "永遠不自網絡下載影像(_N)"
+msgstr "一定不自網絡下載圖像(_N)"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
-msgstr "當傳送 _HTML 電郵給不想收到這類電郵的聯絡人時顯示提示"
+msgstr "當傳送 _HTML 郵件給不想收到這類郵件的聯絡人時顯示提示"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
-msgstr "當傳送沒有主旨的電郵時顯示提示(_P)"
+msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
 
 #: ../mail/mail-config.glade.h:168
 msgid "_Reply style:"
@@ -15074,17 +13468,15 @@ msgstr "回覆方式(_R):"
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:172
 msgid "_Show image animations"
-msgstr "顯示動畫影像(_S)"
+msgstr "顯示動畫圖像(_S)"
 
 #: ../mail/mail-config.glade.h:173
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮短 _To / Cc / Bcc 標頭為"
 
-# mail/mail-config.glade.h:79
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "使用安全連線(_U):"
@@ -15115,7 +13507,7 @@ msgstr "<b>搜尋資料夾來源</b>"
 
 #: ../mail/mail-dialogs.glade.h:3
 msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr "<span weight=\"bold\">數碼簽名</span>"
+msgstr "<span weight=\"bold\">數碼簽署</span>"
 
 #: ../mail/mail-dialogs.glade.h:4
 msgid "<span weight=\"bold\">Encryption</span>"
@@ -15133,35 +13525,27 @@ msgstr "所有本地端及可用的遠端資料夾"
 msgid "All local folders"
 msgstr "所有本地端資料夾"
 
-# mail/mail-search.c:298
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "區分大小寫(_S)"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
-# mail/mail-search.c:316
 #: ../mail/mail-dialogs.glade.h:11
 msgid "F_ind:"
 msgstr "尋找(_I):"
 
-# mail/mail-search.c:268
 #: ../mail/mail-dialogs.glade.h:12
 msgid "Find in Message"
-msgstr "在電郵內尋找"
+msgstr "在郵件內尋找"
 
 #: ../mail/mail-dialogs.glade.h:13 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:2
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
-# mail/subscribe-dialog.c:873
 #: ../mail/mail-dialogs.glade.h:14
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
@@ -15178,7 +13562,6 @@ msgstr "未選取"
 msgid "S_erver:"
 msgstr "伺服器(_E):"
 
-# mail/mail-config.glade.h:4
 #: ../mail/mail-dialogs.glade.h:18
 msgid "Security Information"
 msgstr "保全性資訊"
@@ -15192,7 +13575,7 @@ msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
 msgstr ""
-"你選擇要跟隨的電郵已在下面列出。\n"
+"你選擇要跟隨的郵件已在下面列出。\n"
 "請從「標幟」選單中選擇跟隨的動作。"
 
 #: ../mail/mail-dialogs.glade.h:23
@@ -15207,28 +13590,23 @@ msgstr "到期於(_D):"
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
-# mail/mail-config.glade.h:6
 #: ../mail/mail-dialogs.glade.h:26
 msgid "_Tick this to accept the license agreement"
 msgstr "選取此項來接受授權合約(_T)"
 
-# mail/mail-ops.c:599
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-# mail/mail-local.c:812
 #: ../mail/mail-ops.c:105
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
-# mail/mail-config.glade.h:58
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
-msgstr "接收電郵"
+msgstr "接收郵件"
 
-# camel/camel-movemail.c:274
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:566
 #, c-format
@@ -15244,80 +13622,62 @@ msgstr ""
 "無法附加至 %s：%s\n"
 "改附加至本地「寄件匣」。"
 
-# camel/camel-movemail.c:274
 #: ../mail/mail-ops.c:624
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」：%s"
 
-# mail/mail-ops.c:718
 #: ../mail/mail-ops.c:736
 #, c-format
 msgid "Sending message %d of %d"
-msgstr "正在傳送電郵 %d / %d"
+msgstr "正在傳送郵件 %d / %d"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
 #: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
-msgstr "無法傳送第 %d 個電郵 (共 %d 個)"
+msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
-# mail/mail-send-recv.c:471
 #: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:648
 msgid "Canceled."
 msgstr "已取消。"
 
-# mail/mail-ops.c:739
-# mail/mail-send-recv.c:475
 #: ../mail/mail-ops.c:765
 msgid "Complete."
 msgstr "完成。"
 
-# mail/mail-ops.c:825
 #: ../mail/mail-ops.c:862
 msgid "Saving message to folder"
-msgstr "儲存電郵到資料夾"
+msgstr "儲存郵件到資料夾"
 
-# mail/mail-ops.c:898
 #: ../mail/mail-ops.c:947
 #, c-format
 msgid "Moving messages to %s"
-msgstr "將電郵移到 %s"
+msgstr "將郵件移到 %s"
 
-# mail/mail-ops.c:898
 #: ../mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
-msgstr "將電郵複製到 %s"
+msgstr "將郵件複製到 %s"
 
-# mail/mail-ops.c:1154
 #: ../mail/mail-ops.c:1170
 msgid "Forwarded messages"
-msgstr "已轉寄的電郵"
+msgstr "已轉寄的郵件"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1213
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
-# mail/mail-ops.c:1262
 #: ../mail/mail-ops.c:1285
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1363
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Storing folder '%s'"
@@ -15328,72 +13688,60 @@ msgstr "貯藏資料夾「%s」"
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1523
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-# mail/mail-local.c:812
 #: ../mail/mail-ops.c:1578
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
-# mail/mail-ops.c:1449
 #: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
-# shell/e-shell-importer.c:371
 #: ../mail/mail-ops.c:1662
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "清空 '%s' 的垃圾筒"
+msgstr "清空 '%s' 的回收筒"
 
-# mail/mail-config.glade.h:76
 #: ../mail/mail-ops.c:1663
 msgid "Local Folders"
 msgstr "本機資料夾"
 
-# mail/mail-ops.c:1498
 #: ../mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
-msgstr "取回電郵 %s"
+msgstr "取回郵件 %s"
 
-# mail/mail-ops.c:1565
 #: ../mail/mail-ops.c:1856
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "取回 %d 封電郵"
-msgstr[1] "取回 %d 封電郵"
+msgstr[0] "取回 %d 封郵件"
+msgstr[1] "取回 %d 封郵件"
 
-# mail/mail-ops.c:1649
 #: ../mail/mail-ops.c:1942
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
-msgstr[0] "儲存 %d 封電郵"
-msgstr[1] "儲存 %d 封電郵"
+msgstr[0] "儲存 %d 封郵件"
+msgstr[1] "儲存 %d 封郵件"
 
-# mail/mail-ops.c:1755
 #: ../mail/mail-ops.c:2013
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
-"儲存電郵到：%s 時發生錯誤：\n"
+"儲存郵件到：%s 時發生錯誤：\n"
 " %s"
 
-# mail/mail-ops.c:1829
 #: ../mail/mail-ops.c:2085
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-# mail/mail-ops.c:1844
 #: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
 #, c-format
 msgid ""
@@ -15403,19 +13751,16 @@ msgstr ""
 "不能建立輸出檔案：%s：\n"
 " %s"
 
-# mail/mail-ops.c:1872
 #: ../mail/mail-ops.c:2114
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
-# mail/mail-ops.c:1939
 #: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
-# mail/mail-ops.c:1939
 #: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Reconnecting to %s"
@@ -15425,74 +13770,53 @@ msgstr "重新連線到 %s"
 msgid "Checking Service"
 msgstr "檢查服務"
 
-# mail/mail-send-recv.c:138
 #: ../mail/mail-send-recv.c:159
 msgid "Canceling..."
 msgstr "正在取消..."
 
-# mail/mail-send-recv.c:233
 #: ../mail/mail-send-recv.c:345
 msgid "Send & Receive Mail"
-msgstr "傳送與接收電郵"
+msgstr "傳送與接收郵件"
 
 #: ../mail/mail-send-recv.c:352
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-# mail/mail-send-recv.c:285
 #: ../mail/mail-send-recv.c:449
 msgid "Updating..."
 msgstr "正在更新..."
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
 #: ../mail/mail-send-recv.c:449 ../mail/mail-send-recv.c:502
 msgid "Waiting..."
 msgstr "正在等待..."
 
 #: ../mail/mail-send-recv.c:734
 msgid "Checking for new mail"
-msgstr "檢查新電郵"
+msgstr "檢查新郵件"
 
-# camel/camel-smime-context.c:194
 #: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "請輸入 %s 所需的密語"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "輸入密語"
 
-# camel/camel-smime-context.c:194
 #: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-# mail/mail-session.c:161
 #: ../mail/mail-session.c:250
 msgid "User canceled operation."
 msgstr "使用者已取消操作。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "儲存簽名檔"
@@ -15501,14 +13825,11 @@ msgstr "儲存簽名檔"
 msgid "Enter a name for this signature."
 msgstr "輸入這個簽名檔的名稱。"
 
-# addressbook/gui/component/addressbook-config.c:686
-# mail/mail-config.glade.h:43
 #: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "名稱:"
 
-# camel/camel-session.c:479
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
@@ -15517,51 +13838,41 @@ msgstr "無法建立暫存序列目錄 `%s'：%s"
 #: ../mail/mail-tools.c:150
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
-msgstr "正在嘗試移動非 mbox 來源 `%s' 的電郵"
+msgstr "正在嘗試移動非 mbox 來源 `%s' 的郵件"
 
-# mail/mail-tools.c:219
 #: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
-msgstr "轉寄的電郵 - %s"
+msgstr "轉寄的郵件 - %s"
 
-# mail/mail-ops.c:1154
 #: ../mail/mail-tools.c:258
 msgid "Forwarded message"
-msgstr "轉寄的電郵"
+msgstr "轉寄的郵件"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "資料夾無效:`%s'"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-# mail/mail-ops.c:992
 #: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新 '%s:%s' 的搜尋資料夾"
 
-# mail/mail-ops.c:992
 #: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新 '%s' 的搜尋資料夾"
 
-# mail/mail-account-gui.c:682
 #: ../mail/mail-vfolder.c:1023
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
-# mail/mail-account-gui.c:682
 #: ../mail/mail-vfolder.c:1107
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
@@ -15598,56 +13909,48 @@ msgstr "已經有名稱為「{0}」的簽名檔存在。請使用不同的名稱
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "新增有意義的主旨行到你的電郵，可以讓收件者知道你的電郵和什麼事有關。"
+msgstr "為郵件加上有意義的主旨，可以讓收件者知道你的郵件和什麼事有關。"
 
 #: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "你確定要刪除這個帳號以及它所有的代理伺服器？"
+msgstr "確定要刪除這個帳號以及它所有的代理伺服器？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
-msgstr "你確定要刪除這個帳號？"
+msgstr "確定要刪除這個帳號？"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器？"
 
-# mail/mail-callbacks.c:1017
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "你確定要一次開啟 {0} 封電郵？"
+msgstr "你確定要一次過開啟 {0} 封郵件？"
 
-# ui/evolution-mail.xml.h:61
 #: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "要永久移除所有資料夾中所有刪除的電郵？"
+msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
-# mail/mail-callbacks.c:1549
 #: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
-msgstr "要永久移除資料夾「{0}」中所有刪除的電郵？"
+msgstr "要永久移除資料夾「{0}」中所有刪除的郵件？"
 
-# mail/mail-callbacks.c:1085
 #: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
-msgstr "要傳送 HTML 格式的電郵?"
+msgstr "要傳送 HTML 格式的郵件?"
 
-# mail/mail-callbacks.c:1085
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "要傳送只有密件副本收件者的電郵?"
+msgstr "要傳送只有密件副本收件者的郵件?"
 
-# mail/mail-callbacks.c:1085
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
-msgstr "要傳送沒有主旨的電郵？"
+msgstr "要傳送沒有主旨的郵件？"
 
 #: ../mail/mail.error.xml.h:17
 msgid "Because &quot;{0}&quot;."
@@ -15657,75 +13960,54 @@ msgstr "因為「{0}」。"
 msgid "Because &quot;{2}&quot;."
 msgstr "因為「{2}」。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "空白簽名檔"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "無法新增搜尋資料夾「{0}」。"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾複製至「{1}」。"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "無法建立資料夾「{0}」。"
 
-# mail/mail-display.c:236
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫時儲存目錄。"
 
-# shell/e-setup.c:215
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "無法建立儲存目錄，因為「{1}」"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "無法刪除資料夾「{0}」。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "無法刪除系統資料夾「{0}」。"
 
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "無法編輯搜尋資料夾「{0}」，因為它不存在。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾移至「{1}」。"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "無法開啟來源「{1}」"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "無法開啟來源「{2}」。"
 
-# camel/camel-filter-driver.c:671
 #: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "無法開啟目標「{2}」。"
@@ -15735,17 +14017,12 @@ msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
 "license."
-msgstr ""
-"無法讀取授權條款檔案「{0}」，應該是安裝問題造成的。在你同意這項授權之前將無法"
-"使用它。"
+msgstr "無法讀取授權條款檔案「{0}」，應該是安裝問題造成的。在你同意這項授權之前將無法使用它。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」重新命名成「{1}」。"
 
-# camel/providers/local/camel-local-store.c:237
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "無法重新命名或移動系統資料夾「{0}」。"
@@ -15754,55 +14031,33 @@ msgstr "無法重新命名或移動系統資料夾「{0}」。"
 msgid "Cannot save changes to account."
 msgstr "無法儲存帳號更改。"
 
-# camel/providers/imap/camel-imap-folder.c:172
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "無法儲存至目錄「{0}」。"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "無法儲存至檔案「{0}」。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "無法設定簽名程序檔「{0}」。"
+msgstr "無法設定簽署程序檔「{0}」。"
 
+# (Abel) 鍵盤的鍵最好不譯了
 #: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"檢查確定你的密碼拼字正確。請注意很多密碼區分大小寫；你可能啟動了大寫鎖定鍵。"
+msgstr "請檢查密碼拼字是否正確。請注意，很多密碼區分大小寫；你可能按了 Caps Lock。"
 
-# mail/mail-crypto.c:59
 #: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
-msgstr "無法儲存簽名檔案。"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
+msgstr "無法儲存簽署檔案。"
+
 #: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "刪除「{0}」？"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "刪除帳號？"
@@ -15811,52 +14066,38 @@ msgstr "刪除帳號？"
 msgid "Discard changes?"
 msgstr "是否放棄更改？"
 
-# mail/folder-browser.c:717
-# ui/evolution-mail.xml.h:121
 #: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "不要刪除"
 
-# mail/mail-accounts.c:197
 #: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "不要停用"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "你是否想讓此項操作一併於子資料夾中進行？"
+msgstr "是否想在子資料夾中一併進行這項操作程序？"
 
-# ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
-msgstr "是否要將全部的電郵標示成已閱讀？"
+msgstr "是否要將全部的郵件標示成已閱讀？"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的更改？"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "輸入密碼。"
 
-# mail/mail-callbacks.c:1349
 #: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
-# mail/mail-mt.c:193
 #: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "執行作業時，發生錯誤。"
 
-# mail/mail-mt.c:190
 #: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
@@ -15865,21 +14106,19 @@ msgstr "當 {0} 時發生錯誤。"
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
 #: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
 #: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "如果你繼續，將無法復原這些電郵。"
+msgstr "如果你選擇繼續，將無法復原這些郵件。"
 
 #: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr "如果你刪除資料夾，所有它的內容和子資料夾內容會永久刪除。"
+msgstr "如果你選擇刪除資料夾，它的所有內容和子資料夾內容會永遠消失。"
 
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15901,20 +14140,19 @@ msgstr "如果繼續，帳號資訊會永久刪除。"
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "如果你結束，再次啟動 Evolution 之前，不會傳送這些電郵。"
+msgstr "如果你選擇結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
 #: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "忽略"
 
-# mail/mail-config.glade.h:10
 #: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "無效的驗證"
 
 #: ../mail/mail.error.xml.h:65
 msgid "Mail filters automatically updated."
-msgstr "電郵過濾器自動更新。"
+msgstr "郵件過濾器自動更新。"
 
 #: ../mail/mail.error.xml.h:66
 msgid ""
@@ -15922,27 +14160,20 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
-msgstr ""
-"很多電郵系統會新增 Apparently-To 標頭至只有密件副本收件者的電郵。如果加入"
-"了此標頭，會永遠列示電郵中所有的收件者。要避免此情況，你應該至少新增一個「收"
-"件者：」或「副本：」收件者。"
+msgstr "很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果加入了此標頭，會永遠列示郵件中所有的收件者。要避免此情況，應該至少新增一個「收件者：」或「副本：」收件者。"
 
-# ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
-msgstr "將全部的電郵標示成已閱讀"
+msgstr "將全部的郵件標示成已閱讀"
 
-# ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
-msgstr "是否子資料夾中全部的電郵標示成已閱讀？"
+msgstr "是否子資料夾中全部的郵件標示成已閱讀？"
 
 #: ../mail/mail.error.xml.h:69
 msgid "Mark as _Read"
 msgstr "標示成已閱讀(_R)"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
@@ -15953,11 +14184,11 @@ msgstr "未選取來源。"
 
 #: ../mail/mail.error.xml.h:73
 msgid "Opening too many messages at once may take a long time."
-msgstr "一次開啟過多電郵可能會花費許多時間。"
+msgstr "一次開啟過多郵件可能會花費許多時間。"
 
 #: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
-msgstr "請檢查你的帳號設定並再試一次。"
+msgstr "請檢查帳號設定並再試一次。"
 
 #: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
@@ -15967,9 +14198,7 @@ msgstr "請啟用該帳號或使用其他帳號傳送。"
 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 ""
-"請在「收件者：」欄位輸入一個有效的電郵地址。你可以按一下輸入方塊旁邊的"
-"「收件者：」按鈕，搜尋電郵地址。"
+msgstr "請在「收件者：」欄位輸入一個有效的電子郵件地址。你可以按一下輸入方塊旁邊的「收件者：」按鈕，搜尋電子郵件地址。"
 
 #: ../mail/mail.error.xml.h:77
 msgid ""
@@ -15978,7 +14207,7 @@ msgid ""
 "{0}\n"
 "Send anyway?"
 msgstr ""
-"請確定以下收件者希望並且可以接收HTML 電郵：\n"
+"請確定以下收件者希望並且可以接收HTML 電子郵件：\n"
 "{0}\n"
 "立即傳送？"
 
@@ -15992,25 +14221,20 @@ msgstr "請稍候。"
 
 #: ../mail/mail.error.xml.h:82
 msgid "Problem migrating old mail folder &quot;{0}&quot;."
-msgstr "移轉舊電郵資料夾「{0}」發生問題。"
+msgstr "移轉舊郵件資料夾「{0}」發生問題。"
 
 #: ../mail/mail.error.xml.h:83
 msgid "Querying server"
 msgstr "查詢伺服器"
 
-# camel/providers/smtp/camel-smtp-transport.c:214
 #: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的驗證演算法清單。"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "要求讀信回條。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
@@ -16031,9 +14255,7 @@ msgstr "簽名檔已經存在"
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
-msgstr ""
-"Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪"
-"除。"
+msgstr "Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪除。"
 
 #: ../mail/mail.error.xml.h:91
 msgid ""
@@ -16044,11 +14266,9 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"你傳送的聯絡人清單是設定成隱藏清單收件者。\n"
+"傳送的聯絡人清單是設定成隱藏清單收件者。\n"
 "\n"
-"很多電郵系統會新增 Apparently-To 標頭至只有密件副本收件者的電郵。如果新增"
-"此標頭，會列示電郵中所有的收件者。要避免此情況，你應該至少新增一個「收件"
-"者：」或「副本：」收件者。 "
+"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果新增此標頭，會列示郵件中所有的收件者。要避免此情況，你應該至少新增一個「收件者：」或「副本：」收件者。 "
 
 #: ../mail/mail.error.xml.h:94
 msgid ""
@@ -16094,44 +14314,39 @@ msgstr ""
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
-msgstr "因為你沒有啟用選擇用來寄送的帳號，所以無法傳送此電郵。"
+msgstr "因為你沒有啟用選擇用來寄送的帳號，所以無法傳送此郵件。"
 
 #: ../mail/mail.error.xml.h:108
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
-msgstr "因為你沒有指定任何收件者，所以無法傳送此電郵"
+msgstr "因為你沒有指定任何收件者，所以無法傳送此郵件"
 
-# camel/providers/smtp/camel-smtp-transport.c:356
 #: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
-# composer/e-msg-composer.c:941
 #: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
-msgstr "此簽名已經更改，但尚未儲存。"
+msgstr "此簽署已經更改，但尚未儲存。"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
 "This will mark all messages as read in the selected folder and its "
 "subfolders."
-msgstr "這會將標示選定的資料夾及其子資料夾中所有電郵為已閱讀。"
+msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
 
-# camel/providers/imap/camel-imap-store.c:531
 #: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺服器。"
 
-# composer/e-msg-composer.c:877
 #: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替？"
 
-# mail/mail-ops.c:1728
 #: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
@@ -16140,31 +14355,26 @@ msgstr "無法讀取授權檔案。"
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾？"
 
-# mail/mail-account-editor.c:105
 #: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "你沒有填入所有必須的資訊。"
 
 #: ../mail/mail.error.xml.h:118
 msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "你有未寄出的電郵，你無論如何都要離開嗎？"
+msgstr "你有未寄出的郵件，你無論如何都要離開嗎？"
 
 #: ../mail/mail.error.xml.h:119
 msgid "You may not create two accounts with the same name."
 msgstr "你不能用相同的名稱建立兩個帳號。"
 
-# ui/evolution.xml.h:3
 #: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "你必須命名此搜尋資料夾。"
 
-# ui/evolution.xml.h:3
 #: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "你必須指定一個資料夾。"
@@ -16198,106 +14408,85 @@ msgstr "不要標示成已閱讀(_D)"
 msgid "_Expunge"
 msgstr "清除(_E)"
 
-# ui/evolution-mail.xml.h:114
 #: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
-msgstr "開啟電郵(_O)"
+msgstr "開啟郵件(_O)"
 
-# mail/message-list.c:677
 #: ../mail/message-list.c:1019
 msgid "Unseen"
 msgstr "未閱讀"
 
-# mail/message-list.c:678
 #: ../mail/message-list.c:1020
 msgid "Seen"
 msgstr "已閱讀"
 
-# mail/message-list.c:679
 #: ../mail/message-list.c:1021
 msgid "Answered"
 msgstr "已回覆"
 
-# mail/message-list.c:680
 #: ../mail/message-list.c:1022
 msgid "Multiple Unseen Messages"
-msgstr "多個未閱讀的電郵"
+msgstr "多個未閱讀的郵件"
 
-# mail/message-list.c:681
 #: ../mail/message-list.c:1023
 msgid "Multiple Messages"
-msgstr "多個電郵"
+msgstr "多個郵件"
 
-# mail/message-list.c:685
 #: ../mail/message-list.c:1027
 msgid "Lowest"
 msgstr "最低"
 
-# mail/message-list.c:686
 #: ../mail/message-list.c:1028
 msgid "Lower"
 msgstr "低"
 
-# mail/message-list.c:690
 #: ../mail/message-list.c:1032
 msgid "Higher"
 msgstr "高"
 
-# mail/message-list.c:691
 #: ../mail/message-list.c:1033
 msgid "Highest"
 msgstr "最高"
 
-# mail/message-list.c:941
 #: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "？"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
-msgstr "今天 %l:%M %p"
+msgstr "今天%p %-l:%M"
 
-# mail/message-list.c:957
 #: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
-msgstr "昨天 %l:%M %p"
+msgstr "昨天%p %-l:%M"
 
-# mail/message-list.c:969
 #: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%A%p %-l:%M"
 
-# mail/message-list.c:977
 #: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%-m 月 %-d 日%p %-l:%M"
 
-# mail/message-list.c:979
 #: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
-msgstr "%b %d %Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
 #: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
 msgid "Messages"
-msgstr "電郵"
+msgstr "郵件"
 
-# mail/mail-local.c:905
 #: ../mail/message-list.c:3629
 msgid "Generating message list"
-msgstr "產生電郵清單"
+msgstr "產生郵件清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "期限為 "
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "標幟狀態"
@@ -16314,26 +14503,19 @@ msgstr "跟隨標幟"
 msgid "Received"
 msgstr "已接收"
 
-# ui/evolution-mail.xml.h:114
 #: ../mail/message-list.etspec.h:14
 msgid "Sent Messages"
-msgstr "傳送電郵"
+msgstr "傳送郵件"
 
-# addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/message-list.etspec.h:15
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "大小"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
 #: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "原始位置"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
 #: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
@@ -16342,13 +14524,10 @@ msgstr "請勿轉寄"
 msgid "Follow-Up"
 msgstr "跟隨"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "給你的資訊"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
 #: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
@@ -16357,19 +14536,14 @@ msgstr "轉寄"
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
 #: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "檢閱"
@@ -16378,27 +14552,22 @@ msgstr "檢閱"
 msgid "Body contains"
 msgstr "內文包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
-msgstr "電郵包含"
+msgstr "郵件包含"
 
-# calendar/gui/gnome-cal.c:235
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "收件者包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "寄件者包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "主旨包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:6
 msgid "Subject or Sender contains"
 msgstr "主旨或寄件者包含"
@@ -16415,85 +14584,65 @@ msgstr "提供本地端行事曆的核心功能。"
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
-msgstr ""
-"用來顯示電郵中音效附件的格式外掛程式，它可以讓你在 evolution 中直接播放它們。"
+msgstr "用來顯示郵件中音效附件的格式外掛程式，它可以讓你在 evolution 中直接播放它們。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
-msgstr "電郵音訊外掛程式"
+msgstr "郵件音訊外掛程式"
 
 #: ../plugins/backup-restore/backup-restore.c:51
 msgid "Select name of Evolution archive"
 msgstr "選擇 Evolution 檔案庫的名稱"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
-msgstr "備份後重新啟動 Evolution(_R)"
+msgstr "備份後重新啟動 E_volution"
 
 #: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
 msgstr "選擇要復原的 Evolution 檔案庫"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
-msgstr "回存後重新啟動 Evolution(_R)"
+msgstr "回存後重新啟動 E_volution"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
 msgstr "備份 Evolution 目錄"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
 msgstr "回存 Evolution 目錄"
 
-# data/evolution.desktop.in.h:2
 #: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "檢查 Evolution 檔案庫"
 
-# shell/main.c:138
 #: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../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 的資料與設定值的外掛程式。"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
 msgstr "備份與回存外掛程式。"
 
-# ui/evolution-mail.xml.h:110
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "備份設定值..."
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
 msgstr "備份與回存 Evolution 的資料與設定值"
 
-# ui/evolution-mail.xml.h:110
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr "回存設定值..."
 
-# addressbook/gui/component/e-address-widget.c:424
-# addressbook/gui/component/select-names/e-select-names-popup.c:347
 #: ../plugins/bbdb/bbdb.c:443 ../plugins/bbdb/bbdb.c:452
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
@@ -16503,15 +14652,12 @@ msgstr "自動加入的聯絡人"
 #: ../plugins/bbdb/bbdb.c:467
 msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
-msgstr "在回覆電郵時自動在通訊錄中建立項目(_A)"
+msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
 
-# addressbook/gui/component/e-address-widget.c:424
-# addressbook/gui/component/select-names/e-select-names-popup.c:347
 #: ../plugins/bbdb/bbdb.c:473
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入聯絡人用的通訊錄"
 
-# mail/mail-callbacks.c:1407
 #: ../plugins/bbdb/bbdb.c:488
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息聯絡人"
@@ -16522,7 +14668,6 @@ msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "定期從 gaim 的好友清單同步聯絡人資訊"
 
-# importers/pine-importer.c:661
 #: ../plugins/bbdb/bbdb.c:509
 msgid "Select Address book for Gaim buddy list"
 msgstr "選擇給 Gaim 好友名單用的通訊錄"
@@ -16537,17 +14682,12 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
-msgstr ""
-"回覆電郵時自動在通訊錄中填入姓名與電郵位址。同時也會在好友清單中填入 IM "
-"聯絡人資訊。"
+msgstr "回覆郵件時自動在通訊錄中填入姓名與電子郵件位址。同時也會在好友清單中填入 IM 聯絡人資訊。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
@@ -16556,8 +14696,6 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "本地行事曆"
@@ -16566,13 +14704,10 @@ msgstr "本地行事曆"
 msgid "Provides core functionality for local calendars."
 msgstr "提供本地行事曆的核心功能。"
 
-# mail/mail-config.glade.h:79
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
 msgstr "安全連線(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP 行事曆"
@@ -16602,8 +14737,6 @@ msgstr "天氣：下雪"
 msgid "Weather: Snow"
 msgstr "天氣：下雪"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
 msgstr "天氣：艷陽"
@@ -16612,13 +14745,10 @@ msgstr "天氣：艷陽"
 msgid "Weather: Thunderstorms"
 msgstr "天氣：雷暴"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:267
 msgid "Select a location"
 msgstr "選擇一個位置"
 
-# mail/message-list.c:677
 #: ../plugins/calendar-weather/calendar-weather.c:654
 msgid "_Units:"
 msgstr "單位(_U):"
@@ -16635,8 +14765,6 @@ msgstr "英制(華氏、公吋等)"
 msgid "Provides core functionality for weather calendars."
 msgstr "提供氣象行事曆的核心功能。"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "氣象行事曆"
@@ -16645,9 +14773,7 @@ msgstr "氣象行事曆"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
-"用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓你複製東西到剪貼簿"
-"裏。"
+msgstr "用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓你複製東西到剪貼簿裏。"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16655,35 +14781,30 @@ msgstr "複製工具"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:1
 msgid "Check whether Evolution is the default mailer"
-msgstr "檢查 Evolution 是否為預設的電郵程式"
+msgstr "檢查 Evolution 是否為預設的郵件程式"
 
 #: ../plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in.h:2
 msgid ""
 "Every time Evolution starts, check whether or not it is the default mailer."
-msgstr "每次啟動 Evolution 時，檢查它是否為預設的電郵程式。"
+msgstr "每次啟動 Evolution 時，檢查它是否為預設的郵件程式。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
 msgid "Checks whether Evolution is the default mail client on startup."
-msgstr "在啟動時檢查 Evolution 是否為預設的電郵客戶端程式。"
+msgstr "在啟動時檢查 Evolution 是否為預設的郵件客戶端程式。"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
-msgstr "預設電郵客戶端程式"
+msgstr "預設郵件客戶端程式"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:1
 msgid "Do you want to make Evolution your default e-mail client?"
-msgstr "你是否要將 Evolution 設為你的預設電郵客戶端程式？"
+msgstr "你是否要將 Evolution 設為你的預設電子郵件客戶端程式？"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default folder"
 msgstr "標示為預設資料夾(_D)"
 
-# mail/mail-config.glade.h:21
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
 msgstr "預設來源"
@@ -16732,7 +14853,6 @@ msgid ""
 "password authentication."
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "不在辦公室"
@@ -16743,7 +14863,7 @@ msgid ""
 "each person who sends mail to you while you are out of the office."
 msgstr ""
 "以下指定的訊息將會自動傳送給\n"
-"每一位在你離開辦公室時傳送電郵給你的人。"
+"每一位在你離開辦公室時傳送郵件給你的人。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:276
 #: ../plugins/exchange-operations/exchange-account-setup.c:281
@@ -16755,7 +14875,6 @@ msgstr "我目前不在辦公室"
 msgid "I am in the office"
 msgstr "我目前在辦公室"
 
-# camel/camel-smime-context.c:194
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
@@ -16771,7 +14890,6 @@ msgstr "更改密碼"
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 帳號的授權設定"
 
-# shell/importer/import.glade.h:2
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
 msgstr "委派設定助理"
@@ -16786,14 +14904,10 @@ msgstr "雜項"
 msgid "View the size of all Exchange folders"
 msgstr "檢視所有 Exchange 資料夾的大小"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
 #: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "資料夾大小"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
@@ -16803,18 +14917,14 @@ msgstr "Exchange 設定值"
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
 #: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
-# mail/mail-config.glade.h:11
 #: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "驗證類型"
 
-# mail/mail-config.glade.h:1
 #: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
@@ -16955,7 +15065,7 @@ msgid ""
 "These users will be able to send mail on your behalf\n"
 "and access your folders with the permissions you give them."
 msgstr ""
-"透過你給予這些使用者的許可權，它們將可以以你的身分傳送電郵，\n"
+"透過你給予這些使用者的許可權，它們將可以以你的身分傳送郵件，\n"
 "並存取你的資料夾。"
 
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:14
@@ -16981,8 +15091,6 @@ msgstr "權限..."
 msgid "Folder Name"
 msgstr "資料夾名稱"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "資料夾大小"
@@ -17124,8 +15232,6 @@ msgid ""
 "and features."
 msgstr "處理 Exchange 帳號指定操作與功能集合的外掛程式。"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Exchange 操作"
@@ -17138,7 +15244,6 @@ msgstr "因組態問題而無法更改密碼。"
 msgid "Cannot display folders."
 msgstr "無法顯示資料夾。"
 
-# mail/mail-mt.c:193
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot perform the operation."
 msgstr "無法執行此項操作。"
@@ -17175,7 +15280,6 @@ msgstr "無法連接 Exchange 伺服器。"
 msgid "Could not connect to server {0}."
 msgstr "無法連線到伺服器 {0}。"
 
-# camel/camel-movemail.c:306
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not determine folder permissions for delegates."
 msgstr "無法決定委派的資料夾權限。"
@@ -17196,7 +15300,6 @@ msgstr "無法將 {0} 設為委託"
 msgid "Could not read folder permissions"
 msgstr "無法讀取資料夾許可權"
 
-# camel/camel-provider.c:140
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions."
 msgstr "無法讀取資料夾權限。"
@@ -17245,7 +15348,6 @@ msgstr ""
 "{0}\n"
 "  "
 
-# shell/e-storage.c:475
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Failed to update delegates:"
 msgstr "無法更新委派："
@@ -17258,7 +15360,6 @@ msgstr "資料夾已存在"
 msgid "Folder does not exist"
 msgstr "資料夾不存在"
 
-# ui/evolution.xml.h:39
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder offline"
 msgstr "資料夾離線"
@@ -17280,7 +15381,7 @@ msgstr "如果 OWA 在別的路徑執行，你必須在帳號組態對話方塊�
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:41
 msgid "Mailbox for {0} is not on this server."
-msgstr "{0} 的電郵箱並不在此伺服器上。"
+msgstr "{0} 的郵件箱並不在此伺服器上。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:42
 msgid "Make sure the URL is correct and try again."
@@ -17300,11 +15401,8 @@ msgstr "沒有為此帳號設定「全域型錄」伺服器。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:46
 msgid "No mailbox for user {0} on {1}."
-msgstr "在 {1} 上沒有使用者 {0} 的電郵箱。"
+msgstr "在 {1} 上沒有使用者 {0} 的郵件箱。"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No such user {0}"
 msgstr "查無此使用者 {0}"
@@ -17339,7 +15437,7 @@ msgstr "Exchange 帳號將會在你結束 Evolution 時移除"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:56
 msgid "The Exchange server is not compatible with Exchange Connector."
-msgstr "此 Exchange 伺服器無法與 Exchange Connector 相容。"
+msgstr "此 Exchange 伺服器無法與 Exchange Connector 兼容。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:57
 msgid ""
@@ -17371,13 +15469,10 @@ msgstr "請使用不同的密碼再試一次。"
 msgid "Unable to add user to access control list:"
 msgstr "無法將使用者加入存取控制清單："
 
-# mail/mail-ops.c:1728
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to edit delegates."
 msgstr "無法編輯委任。"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生不明的錯誤"
@@ -17390,14 +15485,13 @@ msgstr "不明的錯誤。"
 msgid "Unknown type"
 msgstr "未知的類型"
 
-# mail/mail-session.c:161
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unsupported operation"
 msgstr "不支援的操作"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:71
 msgid "You are nearing your quota available for storing mail on this server."
-msgstr "你已經接近在此伺服器儲存電郵的 quota 配額。"
+msgstr "你已經接近在此伺服器儲存郵件的 quota 配額。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
 msgid "You cannot make yourself your own delegate"
@@ -17405,7 +15499,7 @@ msgstr "你無法將自己設為你自己的委託"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
 msgid "You have exceeded your quota for storing mail on this server."
-msgstr "你已經超過了在此伺服器儲存電郵的 quota 配額。"
+msgstr "你已經超過了在此伺服器儲存郵件的 quota 配額。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
 msgid "You may only configure a single Exchange account."
@@ -17415,21 +15509,19 @@ msgstr "你可以只設定一個單一的 Exchange 帳號。"
 msgid ""
 "Your current usage is: {0} KB. Try to clear up some space by deleting some "
 "mail."
-msgstr "目前的使用量為：{0} KB。請試着刪除一些電郵來空出部分空間。"
+msgstr "目前的使用量為：{0} KB。請嘗試刪除一些郵件來空出部分空間。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:76
 msgid ""
 "Your current usage is: {0} KB. You will not be able to either send or "
 "receive mail now."
-msgstr "目前的使用量為：{0} KB。你現在將無法傳送或接收電郵。"
+msgstr "目前的使用量為：{0} KB。你現在將無法傳送或接收郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:77
 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。除非你刪除一些電郵來空出部分空間，否則將無法傳送郵"
-"件。"
+msgstr "目前的使用量為：{0} KB。除非你刪除一些郵件來空出部分空間，否則將無法傳送郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "Your password has expired."
@@ -17455,7 +15547,6 @@ msgstr "訂閱其他使用者的工作"
 msgid "Check folder permissions"
 msgstr "檢查資料夾權限"
 
-# mail/subscribe-dialog.c:273
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17463,7 +15554,7 @@ msgstr "取消訂閱資料夾 「%s」"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:1
 msgid "Allows unsubscribing of mail folders in the folder tree context menu."
-msgstr "允許在資料夾樹的快顯選單中取消訂閱電郵資料夾。"
+msgstr "允許在資料夾樹的快顯選單中取消訂閱郵件資料夾。"
 
 #: ../plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml.h:2
 msgid "Unsubscribe Folders"
@@ -17473,7 +15564,6 @@ msgstr "取消訂閱資料夾"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:736
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
@@ -17484,34 +15574,33 @@ msgstr "備註"
 msgid "Checklist"
 msgstr "檢查清單"
 
-# shell/e-shortcuts-view.c:137
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "Groupwise Account Setup"
 msgstr "Groupware 帳號設定"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:77
 msgid "Junk Settings"
-msgstr "垃圾電郵設定值"
+msgstr "垃圾郵件設定值"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:90
 msgid "<b>Junk Mail Settings</b>"
-msgstr "<b>垃圾電郵設定值</b>"
+msgstr "<b>垃圾郵件設定值</b>"
 
 #: ../plugins/groupwise-features/junk-mail-settings.c:112
 msgid "Junk Mail Settings..."
-msgstr "垃圾電郵設定值..."
+msgstr "垃圾郵件設定值..."
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:1
 msgid "<b>Junk List:</b>"
-msgstr "<b>垃圾電郵清單：</b>"
+msgstr "<b>垃圾郵件清單：</b>"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:2
 msgid "Email:"
-msgstr "電郵:"
+msgstr "電子郵件:"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:3
 msgid "Junk Mail Settings"
-msgstr "垃圾電郵設定值"
+msgstr "垃圾郵件設定值"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:5
 #: ../plugins/mail-account-disable/mail-account-disable.c:46
@@ -17524,22 +15613,20 @@ msgstr "啟用(_E)"
 
 #: ../plugins/groupwise-features/junk-settings.glade.h:7
 msgid "_Junk List"
-msgstr "垃圾電郵清單(_J)"
+msgstr "垃圾郵件清單(_J)"
 
 #: ../plugins/groupwise-features/mail-retract.c:53
 msgid "Message retracted successfully"
-msgstr "電郵已成功收回"
+msgstr "郵件已成功收回"
 
-# mail/mail-config.glade.h:58
 #: ../plugins/groupwise-features/mail-retract.c:60
 msgid "Retract Mail"
-msgstr "收回電郵"
+msgstr "收回郵件"
 
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:1
 msgid "Add Send Options to groupwise messages"
 msgstr "將 傳送 選項加入 groupwise 訊息"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:19
@@ -17550,12 +15637,10 @@ msgstr "傳送選項"
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "提供 Groupwise 帳號功能的外掛程式。"
 
-# shell/e-shortcuts-view.c:137
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
 msgstr "Groupware 功能"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "暫時套用"
@@ -17564,11 +15649,10 @@ msgstr "暫時套用"
 msgid "<b>Users:</b>"
 msgstr "<b>使用者：</b>"
 
-# views/mail/galview.xml.h:4
 #: ../plugins/groupwise-features/properties.glade.h:3
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
-msgstr "電郵"
+msgstr "郵件"
 
 #: ../plugins/groupwise-features/properties.glade.h:5
 msgid "Shared Folder Notification"
@@ -17578,21 +15662,14 @@ msgstr "分享資料夾通知"
 msgid "The participants will receive the following notification.\n"
 msgstr "參與者將會收到下列通知。\n"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
 #: ../plugins/groupwise-features/properties.glade.h:10
 msgid "_Contacts..."
 msgstr "聯絡人(_C)..."
 
-# camel/camel-movemail.c:306
 #: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Customize notification message"
 msgstr "自訂通知訊息(_C)"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "未分享(_N)"
@@ -17601,7 +15678,6 @@ msgstr "未分享(_N)"
 msgid "_Shared With ..."
 msgstr "分享給(_S)..."
 
-# addressbook/printing/e-contact-print.glade.h:35
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
 msgstr "分享(_S)"
@@ -17663,7 +15739,6 @@ msgstr "<b>帳號名稱</b>"
 msgid "Proxy Login"
 msgstr "登入代理伺服器"
 
-# camel/camel-smime-context.c:194
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
 #: ../plugins/groupwise-features/proxy.c:503
@@ -17687,7 +15762,6 @@ msgstr "代理伺服器頁籤只有在帳號上線時才會出現。"
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 
-# mail/mail-config.glade.h:80
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "使用者"
@@ -17700,27 +15774,22 @@ msgstr "輸入使用者並設定權限"
 msgid "New _Shared Folder..."
 msgstr "新增分享資料夾(_S)..."
 
-# addressbook/printing/e-contact-print.glade.h:35
 #: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "分享"
 
-# mail/mail-callbacks.c:1188
 #: ../plugins/groupwise-features/status-track.c:242
 msgid "Track Message Status..."
-msgstr "追蹤電郵狀態..."
+msgstr "追蹤郵件狀態..."
 
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:1
 msgid "A plugin to setup hula calendar sources."
 msgstr "用來設定 hula 行事曆來源的外掛程式。"
 
-# shell/e-shortcuts-view.c:137
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
 msgstr "Hula 帳號設定"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
 msgstr "匯入至行事曆(_I)"
@@ -17729,23 +15798,14 @@ msgstr "匯入至行事曆(_I)"
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
-# importers/elm-importer.c:512
-# importers/netscape-importer.c:780
-# importers/pine-importer.c:646
-# shell/e-shell-importer.c:653
-# shell/importer/import.glade.h:4
 #: ../plugins/import-ics-attachments/icsimporter.c:198
 msgid "Import ICS"
 msgstr "匯入 ICS"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../plugins/import-ics-attachments/icsimporter.c:226
 msgid "Select Task List"
 msgstr "選擇工作清單"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../plugins/import-ics-attachments/icsimporter.c:230
 msgid "Select Calendar"
 msgstr "選擇行事曆"
@@ -17755,7 +15815,6 @@ msgstr "選擇行事曆"
 msgid "_Import"
 msgstr "匯入(_I)"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17773,7 +15832,6 @@ msgstr "同步化 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod 同步化"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../plugins/ipod-sync/sync.c:158
 msgid "No output directory!"
 msgstr "沒有輸出目錄！"
@@ -17784,7 +15842,6 @@ msgid ""
 "correctly set up and try again."
 msgstr "在 iPod 上找不到輸出的目錄！請確定 iPod 已正確設定後再試一次。"
 
-# mail/mail-ops.c:1872
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
 msgstr "無法匯出資料！"
@@ -17793,17 +15850,14 @@ msgstr "無法匯出資料！"
 msgid "Exporting data failed."
 msgstr "匯出資料失敗。"
 
-# camel/camel-provider.c:140
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
 msgstr "無法開啟通訊錄！"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
 msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
 
-# calendar/gui/e-itip-control.c:883
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
 msgstr "無法開啟行事曆/工作！"
@@ -17812,7 +15866,6 @@ msgstr "無法開啟行事曆/工作！"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:274
 #: ../plugins/itip-formatter/itip-formatter.c:391
 #, c-format
@@ -17824,25 +15877,22 @@ msgstr "載入行事曆「%s」失敗"
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:437
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:513
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:520
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
 #: ../plugins/itip-formatter/itip-formatter.c:524
 msgid "Unable to find this task in any task list"
-msgstr "無法在任何工作清單中找到這個工作"
+msgstr "無法在任何工作清單中找到這項工作"
 
 #: ../plugins/itip-formatter/itip-formatter.c:528
 msgid "Unable to find this journal entry in any journal"
@@ -17852,12 +15902,10 @@ msgstr "無法在任何日誌中找到這個日誌項目"
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
 #: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
@@ -17888,12 +15936,10 @@ msgstr "傳送至行事曆「%s」並設為已取消"
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../plugins/itip-formatter/itip-formatter.c:978
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../plugins/itip-formatter/itip-formatter.c:980
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
@@ -17902,7 +15948,6 @@ msgstr "無法傳送取消通知給代理人"
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:1092
 #, c-format
 msgid "Unable to update attendee. %s"
@@ -17912,7 +15957,6 @@ msgstr "無法更新到會者。%s"
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-# shell/e-storage.c:465
 #: ../plugins/itip-formatter/itip-formatter.c:1223
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
@@ -17921,9 +15965,8 @@ msgstr "附帶的行事曆是無效的"
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
-msgstr "此電郵宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
+msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-# ui/evolution-calendar.xml.h:22
 #: ../plugins/itip-formatter/itip-formatter.c:1259
 #: ../plugins/itip-formatter/itip-formatter.c:1277
 #: ../plugins/itip-formatter/itip-formatter.c:1355
@@ -17936,8 +15979,7 @@ msgstr "行事曆中的項目是無效的"
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr ""
-"此電郵確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
+msgstr "此郵件確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "The calendar attached contains multiple items"
@@ -17953,7 +15995,7 @@ msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中
 #. FIXME Need a schema for this
 #: ../plugins/itip-formatter/itip-formatter.c:2063
 msgid "_Delete message after acting"
-msgstr "完成後刪除電郵(_D)"
+msgstr "完成後刪除郵件(_D)"
 
 #: ../plugins/itip-formatter/itip-formatter.c:2073
 #: ../plugins/itip-formatter/itip-formatter.c:2105
@@ -17971,26 +16013,23 @@ msgstr "選擇要搜尋會議衝突的行事曆"
 msgid "Today"
 msgstr "今天"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:191
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M:%S %p"
-msgstr "今天 %l:%M:%S %p"
+msgstr "今天%p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:214
@@ -18003,26 +16042,23 @@ msgstr "明天"
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
-# e-util/e-time-utils.c:315
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %l:%M %p"
-msgstr "明天 %l:%M %p"
+msgstr "明天%p %-l:%M"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "明天 %l:%M:%S %p"
+msgstr "明天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:251
@@ -18030,112 +16066,89 @@ msgstr "明天 %l:%M:%S %p"
 msgid "%A"
 msgstr "%A"
 
-# e-util/e-time-utils.c:312
-# widgets/misc/e-dateedit.c:1259
-# widgets/misc/e-dateedit.c:1318
-# widgets/misc/e-dateedit.c:1497
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:256
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
-# e-util/e-time-utils.c:315
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
-# mail/message-list.c:969
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
+msgstr "%A%p %-l:%M"
 
-# e-util/e-time-utils.c:323
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
+msgstr "%A%p %-l:%M:%S"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A, %B %e"
-msgstr "%A, %B %e"
+msgstr "%-m 月 %d 日 (%A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. 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:284
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %e %H:%M"
+msgstr "%-m 月 %d 日 (%A) %H:%M"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %B %e %H:%M:%S"
+msgstr "%-m 月 %d 日 (%A) %H:%M:%S"
 
-# mail/message-list.c:977
 #. 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:293
 msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %B %e %l:%M %p"
+msgstr "%-m 月 %d 日 (%A) %p %-l:%M"
 
-# mail/message-list.c:977
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %B %e %l:%M:%S %p"
+msgstr "%-m 月 %d 日 (%A) %p %-l:%M:%S"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e, %Y"
-msgstr "%A, %B %e, %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %e, %Y %H:%M"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %B %e, %Y %H:%M:%S"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M:%S"
 
-# mail/message-list.c:977
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %B %e, %Y %l:%M %p"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M"
 
-# mail/message-list.c:977
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M:%S"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
@@ -18226,12 +16239,12 @@ msgstr "<b>%s</b> 指派 %s 加入下列工作："
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> 由於 %s 已經指派你一個工作："
+msgstr "<b>%s</b> 由於 %s 已經指派你一項工作："
 
 #: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> 已經指派你一個工作："
+msgstr "<b>%s</b> 已經指派你一項工作："
 
 #: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
@@ -18310,7 +16323,6 @@ msgstr "<b>%s</b> 由於 %s 已經消取下列共用備忘錄："
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經取消下列共用備忘錄："
 
-# ui/evolution-addressbook.xml.h:7
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:753
 msgid "_Open Calendar"
@@ -18336,12 +16348,10 @@ msgstr "接受(_A)"
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../plugins/itip-formatter/itip-view.c:764
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../plugins/itip-formatter/itip-view.c:764
 #: ../plugins/itip-formatter/itip-view.c:770
 #: ../plugins/itip-formatter/itip-view.c:787
@@ -18353,7 +16363,6 @@ msgstr "暫訂(_T)"
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:776
 msgid "_Send Information"
@@ -18368,26 +16377,22 @@ msgstr "更新出席狀態(_U)"
 msgid "_Update"
 msgstr "更新(_U)"
 
-# calendar/gui/event-editor-dialog.glade.h:31
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:942
 msgid "Start time:"
 msgstr "開始時間:"
 
-# calendar/gui/event-editor-dialog.glade.h:30
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:951
 msgid "End time:"
 msgstr "結束時間:"
 
-# addressbook/contact-editor/e-contact-editor.c:1248
 #. Comment
 #: ../plugins/itip-formatter/itip-view.c:967
 #: ../plugins/itip-formatter/itip-view.c:1017
 msgid "Comment:"
 msgstr "註解："
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Send u_pdates to attendees"
 msgstr "傳送更新給到會者(_P)"
@@ -18400,17 +16405,14 @@ msgstr "套用至所有實體(_A)"
 msgid "_Tasks :"
 msgstr "工作(_T):"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../plugins/itip-formatter/itip-view.c:1711
 msgid "Memos :"
 msgstr "備忘錄:"
 
-# ui/evolution-mail.xml.h:23
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
-msgstr "顯示電郵中的文字/行事曆部分。"
+msgstr "顯示郵件中的文字/行事曆部分。"
 
-# shell/importer/intelligent.c:186
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Itip 格式器"
@@ -18442,13 +16444,11 @@ msgstr "允許停用帳號。"
 msgid "Disable Account"
 msgstr "停用帳號"
 
-# camel/providers/local/camel-mbox-summary.c:879
 #: ../plugins/mail-remote/client.c:30
 #, c-format
 msgid "System error: %s"
 msgstr "系統錯誤： %s"
 
-# camel/providers/local/camel-mbox-summary.c:879
 #: ../plugins/mail-remote/client.c:32
 #, c-format
 msgid "Camel error: %s"
@@ -18456,9 +16456,8 @@ msgstr "Camel 錯誤： %s"
 
 #: ../plugins/mail-remote/evolution-mail-store.c:476
 msgid "Account cannot send e-mail"
-msgstr "帳號不能傳送電郵"
+msgstr "帳號不能傳送電子郵件"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../plugins/mail-remote/evolution-mail-store.c:605
 msgid "No store available"
 msgstr "沒有可用的儲存空間"
@@ -18466,17 +16465,17 @@ msgstr "沒有可用的儲存空間"
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:1
 msgid ""
 "A plugin which implements a CORBA interface for accessing mail data remotely."
-msgstr "實作 CORBA 介面以存取遠端電郵資料的外掛程式。"
+msgstr "實作 CORBA 介面以存取遠端郵件資料的外掛程式。"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
 msgid "Mail Remote"
-msgstr "遠端電郵"
+msgstr "遠端郵件"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:1
 msgid ""
 "A plugin which allows the creation of meetings from the contents of a mail "
 "message."
-msgstr "可以從電郵訊息的內容建立會議的外掛程式。"
+msgstr "可以從郵件訊息的內容建立會議的外掛程式。"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
 msgid "Con_vert to Meeting"
@@ -18490,29 +16489,25 @@ msgstr "寄信到會議"
 msgid ""
 "A plugin which allows the creation of tasks from the contents of a mail "
 "message."
-msgstr "可以從電郵訊息的內容建立工作的外掛程式。"
+msgstr "可以從郵件訊息的內容建立工作的外掛程式。"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:1
 msgid "Con_vert to Task"
 msgstr "轉換為工作(_V)"
 
-# mail/mail-autofilter.c:70
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
 msgstr "寄信到工作"
 
-# ui/evolution-mail.xml.h:59
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 msgid "Convert the selected message to a new task"
-msgstr "將選定的電郵轉換為新的工作"
+msgstr "將選定的郵件轉換為新的工作"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
 msgstr "聯絡人清單擁有者(_O)"
 
-# data/evolution.desktop.in.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
 msgstr "取得清單檔案庫(_A)"
@@ -18538,9 +16533,8 @@ msgstr "提供一般通信論壇指令的動作 （訂閱、取消訂閱…）�
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
 msgid "_Post message to list"
-msgstr "傳送電郵給論壇(_P)"
+msgstr "傳送郵件給論壇(_P)"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
 msgstr "訂閱論壇(_S)"
@@ -18561,24 +16555,18 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"即將寄出一封電郵至 URL \"{0}\"。你可以自動送出電郵，或是先查看並做些改"
-"變。\n"
+"即將寄出一封電子郵件至 URL \"{0}\"。你可以自動送出郵件，或是先查看並做些改變。\n"
 "\n"
-"在這封電郵送出後不久你應該會收到來自通信論壇的回應。"
+"在這封郵件送出後不久你應該會收到來自通信論壇的回應。"
 
-# mail/mail-config.glade.h:74
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
 msgstr "格式錯誤的標頭"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
 msgid "No e-mail action"
-msgstr "沒有電郵動作"
+msgstr "沒有郵件動作"
 
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "不允許張貼"
@@ -18587,14 +16575,11 @@ msgstr "不允許張貼"
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr ""
-"對此通信論壇的張貼是不被允許的。這可能是一個唯讀的通信論壇。請聯絡論壇的管理"
-"者以取得進一步資訊。"
+msgstr "對此通信論壇的張貼是不被允許的。這可能是一個唯讀的通信論壇。請聯絡論壇的管理者以取得進一步資訊。"
 
-# ui/evolution-contact-editor.xml.h:13
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
-msgstr "傳送電郵到通信論壇？"
+msgstr "傳送郵件到通信論壇？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
@@ -18613,7 +16598,7 @@ msgid ""
 "\n"
 "Header: {1}"
 msgstr ""
-"此電郵的 {0} 檔頭格式錯誤因而無法進行處理。\n"
+"此郵件的 {0} 檔頭格式錯誤因而無法進行處理。\n"
 "\n"
 "檔頭： {1}"
 
@@ -18621,29 +16606,24 @@ msgstr ""
 msgid ""
 "This message does not contain the header information required for this "
 "action."
-msgstr "這封電郵沒有包含此動作所需的檔頭資訊"
+msgstr "這封郵件沒有包含此動作所需的檔頭資訊"
 
-# mail/mail-ops.c:603
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
-msgstr "編輯電郵(_E)"
+msgstr "編輯郵件(_E)"
 
-# mail/mail-ops.c:603
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
 msgid "_Send message"
-msgstr "傳送電郵(_S)"
+msgstr "傳送郵件(_S)"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
 msgstr "聯絡人清單擁有者(_O)"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
-msgstr "聯絡此電郵所屬通信論壇的管理者"
+msgstr "聯絡此郵件所屬通信論壇的管理者"
 
-# data/evolution.desktop.in.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
 msgstr "取得清單檔案庫(_A)"
@@ -18654,32 +16634,28 @@ msgstr "取得清單使用資訊(_U)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:5
 msgid "Get an archive of the list this message belongs to"
-msgstr "取得此電郵所屬論壇的檔案庫"
+msgstr "取得此郵件所屬論壇的檔案庫"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:6
 msgid "Get information about the usage of the list this message belongs to"
-msgstr "取得此電郵所屬論壇的使用方法相關資訊"
+msgstr "取得此郵件所屬論壇的使用方法相關資訊"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
-msgstr "撰寫電郵給此電郵所屬的通信論壇"
+msgstr "撰寫郵件給此郵件所屬的通信論壇"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
-msgstr "訂閱此電郵所屬的通信論壇"
+msgstr "訂閱此郵件所屬的通信論壇"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
-msgstr "取消訂閱此電郵所屬的通信論壇"
+msgstr "取消訂閱此郵件所屬的通信論壇"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:11
 msgid "_Post Message to List"
-msgstr "傳送電郵給論壇(_P)"
+msgstr "傳送郵件給論壇(_P)"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
 msgstr "訂閱論壇(_S)"
@@ -18692,20 +16668,18 @@ msgstr "取消訂閱論壇(_U)"
 msgid "Mark All Read"
 msgstr "全部標示成已讀"
 
-# ui/evolution-mail.xml.h:51
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark Me_ssages as Read"
-msgstr "標示電郵為已讀(_S)"
+msgstr "標示郵件為已讀(_S)"
 
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:3
 msgid "Used for marking all the messages under a folder as read"
-msgstr "用來將資料夾下的所有電郵標記為已讀"
+msgstr "用來將資料夾下的所有郵件標記為已讀"
 
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:1
 msgid "Mark calendar offline"
 msgstr "將行事曆標為離線工作"
 
-# ui/evolution-mail.xml.h:54
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 msgid "Marks the selected calendar for offline viewing."
 msgstr "將選定的行事曆標示成可供離線閱覽。"
@@ -18728,21 +16702,20 @@ 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 電郵。"
+msgstr "當新郵件到達時產生 D-BUS 郵件。"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:2
 msgid "New Mail Notification"
-msgstr "新電郵通知"
+msgstr "新郵件通知"
 
 #: ../plugins/new-mail-notify/org-gnome-new-mail-notify.eplug.xml.h:3
 msgid "New mail notify"
-msgstr "新電郵通知"
+msgstr "新郵件通知"
 
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:1
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 #: ../plugins/plugin-manager/plugin-manager.c:180
@@ -18753,23 +16726,14 @@ msgstr "外掛管理程式"
 msgid "Enable and disable plugins"
 msgstr "啟用與停用外掛程式"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
-# calendar/gui/event-editor-dialog.glade.h:39
 #: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "作者"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
@@ -18780,11 +16744,6 @@ msgstr "描述:"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些更改在重新啟動後才會生效"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
 #: ../plugins/plugin-manager/plugin-manager.c:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
@@ -18797,7 +16756,7 @@ msgid ""
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
-"展示可以讓你選擇停用 HTML 電郵的格式外掛程式的測試用外掛程式。\n"
+"展示可以讓你選擇停用 HTML 郵件的格式外掛程式的測試用外掛程式。\n"
 "\n"
 "此外掛程式僅為未支援的展示程式碼。\n"
 
@@ -18822,30 +16781,27 @@ msgstr "偏好純文字"
 msgid "Only ever show PLAIN"
 msgstr "只以純文字顯示"
 
-# mail/mail-config.glade.h:36
 #: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML 模式"
 
+# msgstr "提供自郵件編輯器打印郵件的選項"
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
-msgstr "提供自電郵編輯器列印電郵的選項"
+msgstr "提供自郵件編輯器打印郵件的選項"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
 #: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:21
 #: ../ui/evolution-mail-message.xml.h:76 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
-msgstr "預覽列印(_V)"
+msgstr "預覽打印(_V)"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印此郵件"
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 msgid "Prints the message"
-msgstr "列印此電郵"
+msgstr "打印此郵件"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution 設定工具"
@@ -18858,24 +16814,18 @@ msgstr "寫入設定資料事件的紀錄檔。"
 msgid "Allows calendars to be published to the web"
 msgstr "允許將行事曆發佈為網頁"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "行事曆發佈"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
 msgstr "位置"
 
-# data/evolution.keys.in.h:2
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "發佈行事曆資訊(_P)"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
@@ -18884,7 +16834,6 @@ msgstr "確定要移除此 URL？"
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">位置</span>"
 
-# views/mail/galview.xml.h:4
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
 msgid "<span weight=\"bold\">Sources</span>"
 msgstr "<span weight=\"bold\">來源</span>"
@@ -18937,12 +16886,10 @@ msgstr "服務類型(_T):"
 msgid "_File:"
 msgstr "檔案(_F):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -18959,39 +16906,33 @@ msgstr "Spamassassin (內置)"
 msgid ""
 "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 垃圾電郵外掛程式"
+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."
-msgstr "提供一次儲存所有附伴或電郵的各部分的外掛程式。"
+msgstr "提供一次儲存所有附伴或郵件的各部分的外掛程式。"
 
-# mail/mail-display.c:196
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 msgid "Save attachments"
 msgstr "儲存附加檔案"
 
-# mail/mail-display.c:196
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
 msgstr "儲存附加檔案..."
 
-# mail/mail-display.c:196
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "儲存所有的附加檔案"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../plugins/save-attachments/save-attachments.c:340
 msgid "Select save base name"
 msgstr "選擇儲存的基本名稱"
 
-# composer/e-msg-composer-attachment.glade.h:6
 #: ../plugins/save-attachments/save-attachments.c:359
 msgid "MIME Type"
 msgstr "MIME 類型"
@@ -19001,8 +16942,6 @@ msgstr "MIME 類型"
 msgid "Save"
 msgstr "儲存"
 
-# widgets/misc/e-calendar-item.c:1061
-# widgets/misc/e-calendar-item.c:2756
 #.
 #. * 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.
@@ -19011,19 +16950,14 @@ msgstr "儲存"
 msgid "%F %T"
 msgstr "%F %T"
 
-# addressbook/contact-editor/fullname.glade.h:4
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "UID"
 msgstr "UID"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
 msgstr "描述清單"
 
-# addressbook/backend/ebook/e-card.c:3467
 #: ../plugins/save-calendar/csv-format.c:388
 msgid "Categories List"
 msgstr "分類清單"
@@ -19032,7 +16966,6 @@ msgstr "分類清單"
 msgid "Comment List"
 msgstr "註解清單"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../plugins/save-calendar/csv-format.c:391
 msgid "Created"
 msgstr "已建立"
@@ -19057,7 +16990,6 @@ msgstr "％已完成"
 msgid "URL"
 msgstr "網址"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
 msgstr "到會者清單"
@@ -19074,7 +17006,6 @@ msgstr "CSV 格式的進階選項"
 msgid "Prepend a header"
 msgstr "預設的檔頭"
 
-# mail/mail-config.glade.h:76
 #: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
 msgstr "數值定界符:"
@@ -19095,13 +17026,10 @@ msgstr "逗號隔開的數值格式 (.csv)"
 msgid "Save Selected"
 msgstr "儲存選取的"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "將選定的行事曆或工作儲存至磁碟。"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
 msgstr "儲存至磁碟(_S)"
@@ -19119,13 +17047,11 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
-# shell/e-shell-importer.c:602
 #: ../plugins/save-calendar/save-calendar.c:169
 #: ../plugins/save-calendar/save-calendar.c:180
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
-# shell/e-shell-importer.c:601
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr "選擇一個來源"
@@ -19134,8 +17060,6 @@ msgstr "選擇一個來源"
 msgid "Selects a single calendar or task source for viewing."
 msgstr "選擇要檢視的單一行事曆或工作來源。"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
 msgstr "只顯示這個行事曆(_O)"
@@ -19152,7 +17076,6 @@ msgstr "處理啟動精靈的外掛程式。"
 msgid "Startup wizard"
 msgstr "啟動精靈"
 
-# shell/importer/import.glade.h:2
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
@@ -19169,7 +17092,7 @@ msgid ""
 "Please click the \"Forward\" button to continue. "
 msgstr ""
 "歡迎使用 Evolution。以下畫面會讓\n"
-"Evolution 連線至你的電郵帳號，然後從其他應用程式輸入檔案。\n"
+"Evolution 連線至你的電子郵件帳號，然後從其他應用程式輸入檔案。\n"
 "\n"
 "請按一下「下一步」按鈕繼續。 "
 
@@ -19178,7 +17101,6 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇你想要匯入的資訊："
 
-# composer/e-msg-composer-hdrs.c:355
 #: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../shell/e-shell-importer.c:411
 #, c-format
@@ -19192,7 +17114,7 @@ msgstr "匯入資料。"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:1
 msgid "Indicates if threading of messages should fall back to subject."
-msgstr "指示相關電郵功能是否應以主旨為準。"
+msgstr "指示相關郵件功能是否應以主旨為準。"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:2
 msgid "Subject Threading"
@@ -19200,69 +17122,57 @@ msgstr "主旨排列"
 
 #: ../plugins/subject-thread/org-gnome-subject-thread.eplug.xml.h:3
 msgid "Thread messages by subject"
-msgstr "以主旨為基礎串接電郵"
+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)"
+msgstr "退回到依主旨的相關郵件(_J)"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution Shell"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Evolution Shell Config factory"
 msgstr "Evolution Shell 設定工廠"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution 測試"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../shell/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 GNOME Print description of the current printer settings"
-msgstr "目前印表機設定值的 GNOME 列印描述"
+msgstr "目前打印機設定值的 GNOME Print 描述字串"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:9
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
 msgstr "組態版本"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
-msgstr "預設資訊方塊列寬度"
+msgstr "預設資訊方塊列闊度"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "預設視窗高度"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
 msgstr "預設視窗狀態"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
-msgstr "預設視窗寬度"
+msgstr "預設視窗闊度"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:7
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "啟動時預設顯示的元件相關 ID 或別名。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:9
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
@@ -19272,11 +17182,9 @@ msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
-msgstr "印表機設定"
+msgstr "打印機設定"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Sidebar is visible"
@@ -19298,45 +17206,38 @@ msgstr "狀態列設為顯示"
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr ""
-"Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
+msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
-# ui/evolution.xml.h:32
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
-# ui/evolution.xml.h:32
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the main window, in pixels."
-msgstr "主視窗的預設寬度，以像素計。"
+msgstr "主視窗的預設闊度，以像素計。"
 
-# ui/evolution.xml.h:32
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "The default width for the sidebar, in pixels."
-msgstr "資訊方塊列的預設寬度，以像素計。"
+msgstr "資訊方塊列的預設闊度，以像素計。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:19
 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」) 。"
+msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 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:21
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
+# zh_HK: msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
@@ -19374,12 +17275,10 @@ msgstr "視窗按鈕風格"
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
-# shell/e-shell-offline-handler.c:554
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>作用中的連線</b>"
 
-# shell/e-shell-offline-handler.c:554
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "作用中的連線"
@@ -19388,8 +17287,6 @@ msgstr "作用中的連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按「確定」關閉這些連線以離線"
 
-# shell/e-shell-folder-title-bar.c:459
-# shell/e-shell-folder-title-bar.c:460
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
@@ -19399,7 +17296,6 @@ msgstr "(未命名)"
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
-# shell/e-shell-importer.c:97
 #: ../shell/e-shell-importer.c:140
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -19412,7 +17308,6 @@ msgstr ""
 "\n"
 "若你不清楚檔案類型，請選擇「自動」。Evolution 會嘗試找出適當的處理方法。"
 
-# ui/evolution.xml.h:4
 #: ../shell/e-shell-importer.c:146
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
@@ -19433,8 +17328,6 @@ msgstr ""
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "選擇一個檔案"
@@ -19451,50 +17344,43 @@ msgstr "從舊程式輸入資料和設定值(_O)"
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
-# camel/camel-pgp-context.c:1073
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
 msgstr "沒有指定資料夾名稱。"
 
 #: ../shell/e-shell-utils.c:125
 msgid "Folder name cannot contain the Return character."
-msgstr "資料夾名稱不能包含換行字元。"
+msgstr "資料夾名稱不能包含換行字符。"
 
 #: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
-msgstr "資料夾名稱不可以包括 \"/\"字元。"
+msgstr "資料夾名稱不可以包括 “/” 字符。"
 
 #: ../shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
-msgstr "資料夾名稱不可以包括 \"#\"字元。"
+msgstr "資料夾名稱不可以包括 “#” 字符。"
 
 #: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
-msgstr "「.」和「..」是資料夾保留名稱。"
+msgstr "‘.’ 和 ‘..’ 是資料夾保留名稱。"
 
 #: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot 工具似乎沒有安裝在系統上。"
+msgstr "系統似乎沒有安裝 GNOME Pilot 工具。"
 
-# camel/camel-filter-driver.c:871
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
 
-# shell/e-shell-view-menu.c:185
 #: ../shell/e-shell-window-commands.c:128
 msgid "Bug buddy is not installed."
 msgstr "未安裝設計錯誤部份。"
 
-# shell/e-shell-view-menu.c:185
 #: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
@@ -19505,28 +17391,28 @@ msgstr "無法執行 Bug buddy。"
 #: ../shell/e-shell-window-commands.c:561
 msgid "translator-credits"
 msgstr ""
-"如對翻譯有任何意見，請送一封電郵給\n"
-"以下地址，GNOME 翻譯隊伍會盡快回覆你：\n"
+"如對翻譯有任何意見，請送一封電子郵件給\n"
+"以下地址，GNOME 翻譯隊伍會儘快回覆你：\n"
 "community@linuxhall.org\n"
 "\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
+# zh_HK: msgstr "線上工作(_W)"
 #: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-# ui/evolution.xml.h:66
 #: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-# ui/evolution.xml.h:39
 #: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "離線工作"
 
+# zh_HK: msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 #: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
@@ -19535,35 +17421,29 @@ msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工�
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
+# zh_HK: msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 #: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
-# mail/mail-autofilter.c:70
 #: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../shell/e-shell.c:634
 msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
-# calendar/gui/e-week-view-main-item.c:342
 #: ../shell/e-shell.c:830 ../shell/e-shell.c:831
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-# widgets/misc/e-cell-date-edit.c:245
 #: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
 #: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "無效的參數"
@@ -19576,24 +17456,15 @@ msgstr "不能於 OAF 註冊"
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
-# ui/evolution-calendar.xml.h:40
-# ui/evolution-event-editor.xml.h:66
-# ui/evolution-task-editor-dialog.xml.h:79
-# ui/evolution.xml.h:58
 #: ../shell/e-user-creatable-items-handler.c:678
 #: ../shell/e-user-creatable-items-handler.c:688
 msgid "New"
 msgstr "新增"
 
-# ui/evolution-calendar.xml.h:40
-# ui/evolution-event-editor.xml.h:66
-# ui/evolution-task-editor-dialog.xml.h:79
-# ui/evolution.xml.h:58
 #: ../shell/e-user-creatable-items-handler.c:693
 msgid " New "
 msgstr " 新增 "
 
-# ui/evolution-tasks.xml.h:3
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新測試"
@@ -19602,48 +17473,38 @@ msgstr "新測試"
 msgid "_Test"
 msgstr "測試(_T)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
-# shell/importer/import.glade.h:1
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "按「匯入」開始將檔案匯入到 Evolution。"
 
-# shell/importer/import.glade.h:2
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Evolution 匯入助理"
 
-# shell/e-shell-importer.c:363
 #: ../shell/import.glade.h:3
 msgid "Import File"
 msgstr "輸入檔案"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../shell/import.glade.h:4
 msgid "Import Location"
 msgstr "輸入位置"
 
-# shell/importer/intelligent.c:186
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "輸入器類型"
 
-# mail/mail-account-gui.c:682
 #: ../shell/import.glade.h:6
 msgid "Select Importers"
 msgstr "選取輸入器"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../shell/import.glade.h:7
 msgid "Select a File"
 msgstr "選取檔案"
 
-# shell/importer/import.glade.h:6
 #: ../shell/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -19675,7 +17536,7 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 "你好。感謝你撥冗下載\n"
-"Evolution 群組套裝軟件搶鮮版。\n"
+"Evolution 羣組套裝軟件搶鮮版。\n"
 "\n"
 "此 Evolution 版本尚未完成。它即將告成，\n"
 "但是部份功能未完成或者無法正常作業。\n"
@@ -19690,9 +17551,6 @@ msgstr ""
 "我們希望你享受工作成果，而且我們\n"
 "熱切希望你提供意見！\n"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../shell/main.c:257
 msgid ""
 "Thanks\n"
@@ -19701,9 +17559,6 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
 #: ../shell/main.c:264
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
@@ -19712,6 +17567,7 @@ msgstr "不要再顯示這個訊息"
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
+# zh_HK: msgstr "以線上模式啟動"
 #: ../shell/main.c:472
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
@@ -19724,7 +17580,6 @@ msgstr "強制關閉所有 Evoultion 元件"
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
-# shell/main.c:185
 #: ../shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
@@ -19733,10 +17588,9 @@ msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../shell/main.c:515
 msgid "- The Evolution PIM and Email Client"
-msgstr "- Evolution PIM 與電郵客戶端"
+msgstr "- Evolution PIM 與郵件客戶端"
 
 #: ../shell/main.c:526
 #, c-format
@@ -19759,7 +17613,6 @@ msgstr "繼續"
 msgid "Delete old data from version {0}?"
 msgstr "從 {0} 版刪除舊資料？"
 
-# mail/mail-config-druid.c:445
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
@@ -19768,15 +17621,12 @@ msgstr "Evolution 無法啟動。"
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
-msgstr ""
-"遺忘你的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示你輸入。"
+msgstr "遺忘你的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示你輸入。"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
 msgstr "磁碟空間不足，無法升級。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
 msgstr "確定要刪除舊資料？"
@@ -19795,8 +17645,7 @@ msgid ""
 msgstr ""
 "「evolution」目錄的所有內容即將永久移除。\n"
 "\n"
-"建議你手動檢查所有的電郵、聯絡人和行事曆資料是否顯示，而且此 Evolution 版"
-"本在刪除舊資料前能正確作業。\n"
+"建議你手動檢查所有的電子郵件、聯絡人和行事曆資料是否顯示，而且此 Evolution 版本在刪除舊資料前能正確作業。\n"
 "\n"
 "刪除之後，未經手動操作，便無法降級至舊的 Evolution 版本。\n"
 
@@ -19811,8 +17660,7 @@ msgid ""
 msgstr ""
 "舊的 Evolution 版本將其資料儲存在不同的位置。\n"
 "\n"
-"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資"
-"料，就可以在方便的時候，手動移除「evolution」的內容。\n"
+"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資料，就可以在方便的時候，手動移除「evolution」的內容。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19862,7 +17710,6 @@ msgstr "遺忘(_F)"
 msgid "_Keep Data"
 msgstr "保留資料(_K)"
 
-# calendar/gui/event-editor-dialog.glade.h:20
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
 msgstr "稍後提醒我(_R)"
@@ -19885,7 +17732,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"證書 '%s' 是一種 CA 證書。\n"
+"證書 '%s' 是核證機關 (CA) 發出的證書。\n"
 "\n"
 "編輯信任設定值："
 
@@ -19894,20 +17741,15 @@ msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
-msgstr ""
-"因為你信任發出此證書的證書單位，所以除非在此指示，否則你將信任此證書的有效"
-"性。"
+msgstr "因為你信任發出此證書的證書單位，所以除非在此指示，否則你將信任此證書的有效性。"
 
 #: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
-msgstr ""
-"因為你不信任發出此證書的證書單位，所以除非在此指示，否則你將不信任此證書的有"
-"效性。"
+msgstr "因為你不信任發出此證書的證書單位，所以除非在此指示，否則你將不信任此證書的有效性。"
 
-# mail/mail-account-gui.c:682
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:144
 #: ../smime/gui/certificate-manager.c:375
@@ -19923,7 +17765,6 @@ msgstr "選取要匯入的證書..."
 msgid "Certificate Name"
 msgstr "證書名稱"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:16
 #: ../smime/gui/certificate-manager.c:276
 #: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
@@ -19938,34 +17779,25 @@ msgstr "序號"
 msgid "Expires"
 msgstr "到期"
 
-# mail/mail-config.glade.h:29
 #: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
-msgstr "電郵地址"
+msgstr "電子郵件地址"
 
 #: ../smime/gui/certificate-viewer.c:341
 #, c-format
 msgid "Certificate Viewer: %s"
 msgstr "證書檢視器:%s"
 
-# camel/camel-smime-context.c:194
 #: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "輸入 `%s' 的密碼"
 
-# camel/camel-smime-context.c:194
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "輸入證書資料庫的新密碼"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "輸入新密碼"
@@ -19989,7 +17821,6 @@ msgstr ""
 "發照者:\n"
 "  主旨：%s\n"
 
-# ui/evolution-calendar.xml.h:13
 #: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "選取證書"
@@ -20006,7 +17837,6 @@ msgstr "<b>證書欄位</b>"
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>證書階層</b>"
 
-# mail/mail-config.glade.h:65
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>欄位值</b>"
@@ -20031,8 +17861,6 @@ msgstr "<b>此證書已經檢驗用途:</b>"
 msgid "<b>Validity</b>"
 msgstr "<b>效力</b>"
 
-# importers/netscape-importer.c:795
-# mail/mail-callbacks.c:1359
 #: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "權威"
@@ -20049,8 +17877,7 @@ msgstr "全部備份"
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr ""
-"信任此 CA 的任何用途前，你應該檢查它的證書以及它的政策和程序 (如果可以的話)。"
+msgstr "信任此核證機關之前，如果可以的話，你應該先檢查它的證書以及它的政策和程序。"
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
@@ -20058,7 +17885,7 @@ msgstr "證書"
 
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
-msgstr "證書中心信任"
+msgstr "核證機關信任度"
 
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
@@ -20068,7 +17895,6 @@ msgstr "證書詳細資訊"
 msgid "Certificates Table"
 msgstr "證書表格"
 
-# calendar/gui/e-calendar-table.c:152
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "一般名稱 (CN)"
@@ -20085,37 +17911,26 @@ msgstr "不信任此證書的有效性"
 msgid "Dummy window only"
 msgstr "限虛擬視窗"
 
-# mail/mail-config.glade.h:86
-# ui/evolution-event-editor.xml.h:58
-# ui/evolution-message-composer.xml.h:45
-# ui/evolution-subscribe.xml.h:10
-# ui/evolution-task-editor-dialog.xml.h:70
-# ui/evolution.xml.h:48
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "編輯"
 
 #: ../smime/gui/smime-ui.glade.h:24
 msgid "Email Certificate Trust Settings"
-msgstr "電郵證書信任設定值"
+msgstr "電子郵件證書信任設定值"
 
 #: ../smime/gui/smime-ui.glade.h:25
 msgid "Email Recipient Certificate"
-msgstr "電郵收件者證書"
+msgstr "電子郵件收件者證書"
 
 #: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
-msgstr "電郵簽名者證書"
+msgstr "電子郵件簽署者證書"
 
 #: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "到期日期"
 
-# importers/elm-importer.c:512
-# importers/netscape-importer.c:780
-# importers/pine-importer.c:646
-# shell/e-shell-importer.c:653
-# shell/importer/import.glade.h:4
 #: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "匯入"
@@ -20128,12 +17943,10 @@ msgstr "發照日期"
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "組織 (O)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
 #: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "組織單位 (OU)"
@@ -20156,32 +17969,28 @@ msgstr "信任此證書的有效性"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "信任此 CA 來識別電郵使用者。"
+msgstr "信任此核證機關 (CA) 來識別電子郵件使用者。"
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "信任此 CA 來識別軟件開發人員。"
+msgstr "信任此核證機關 (CA) 來識別軟件開發人員。"
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr "信任此 CA 來識別網站。"
+msgstr "信任此核證機關 (CA) 來識別網站。"
 
-# ui/evolution-event-editor.xml.h:76
-# ui/evolution-message-composer.xml.h:55
-# ui/evolution-task-editor-dialog.xml.h:90
-# ui/evolution.xml.h:65
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "檢視"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr "你已經從可以識別你身份的組織取得證書:"
+msgstr "你已經有來自這些組織的證書，可以識別你的身份:"
 
 #: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr "你已經擁有檔案的相關證書，可以識別這些證書單位:"
+msgstr "你已經擁有檔案的相關證書，可以識別這些核證機關:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -20193,21 +18002,16 @@ msgstr "你的證書"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr "編輯 CA 信任(_E)"
+msgstr "編輯核證機關 (_CA) 信任度"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:676
 msgid "Certificate already exists"
 msgstr "證書已經存在"
 
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:425
@@ -20252,7 +18056,7 @@ msgstr "PKCS #1 RSA 加密"
 
 #: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
-msgstr "證書鑰匙使用"
+msgstr "證書密碼匙使用"
 
 #: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
@@ -20260,7 +18064,7 @@ msgstr "Netscape 證書類型"
 
 #: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
-msgstr "證書單位鑰匙識別碼"
+msgstr "核證機關密碼匙識別碼"
 
 #: ../smime/lib/e-cert.c:688
 #, c-format
@@ -20283,19 +18087,17 @@ msgstr "主旨公開密碼匙資訊"
 msgid "Subject Public Key Algorithm"
 msgstr "主旨公開密碼匙演算法"
 
-# mail/mail-autofilter.c:213
 #: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "主旨的公開密碼匙"
 
-# camel/camel-filter-driver.c:652
 #: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "錯誤：無法處理延伸"
 
 #: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
-msgstr "物件簽名者"
+msgstr "物件簽署者"
 
 #: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
@@ -20303,40 +18105,35 @@ msgstr "SSL 證書單位"
 
 #: ../smime/lib/e-cert.c:839
 msgid "Email Certificate Authority"
-msgstr "電郵單位"
+msgstr "電子郵件單位"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../smime/lib/e-cert.c:867
 msgid "Signing"
-msgstr "簽名"
+msgstr "簽署"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr "不可拒絕"
 
 #: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
-msgstr "鑰匙加密"
+msgstr "密碼匙加密"
 
-# composer/e-msg-composer-attachment-bar.c:332
-# mail/mail-display.c:122
 #: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "資料密碼"
 
 #: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
-msgstr "鑰匙合同"
+msgstr "密碼匙合同"
 
 #: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
-msgstr "證書簽名者"
+msgstr "證書簽署者"
 
 #: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
-msgstr "CRL 簽名者"
+msgstr "CRL 簽署者"
 
 #: ../smime/lib/e-cert.c:939
 msgid "Critical"
@@ -20355,12 +18152,10 @@ msgstr "延伸"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-# mail/mail-crypto.c:59
 #: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
-msgstr "證書簽名演算法"
+msgstr "證書簽署演算法"
 
-# ui/evolution-message-composer.xml.h:49
 #: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "發照者"
@@ -20369,21 +18164,18 @@ msgstr "發照者"
 msgid "Issuer Unique ID"
 msgstr "發照者獨有 ID"
 
-# mail/mail-autofilter.c:213
 #: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "主旨獨有 ID"
 
-# mail/mail-crypto.c:59
 #: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
-msgstr "證書簽名值"
+msgstr "證書簽署值"
 
 #: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 檔案密碼"
 
-# camel/camel-smime-context.c:194
 #: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "輸入 PKCS12 檔案的密碼:"
@@ -20392,7 +18184,6 @@ msgstr "輸入 PKCS12 檔案的密碼:"
 msgid "Imported Certificate"
 msgstr "輸入的證書"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "要新增的附件。"
@@ -20403,9 +18194,8 @@ msgstr "附件的內容類型。"
 
 #: ../tools/evolution-launch-composer.c:323
 msgid "The filename to display in the mail."
-msgstr "要顯示在電郵的檔案名稱。"
+msgstr "要顯示在郵件的檔案名稱。"
 
-# calendar/gui/gnome-cal.c:235
 #: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "附件的描述。"
@@ -20416,9 +18206,8 @@ msgstr "將附件標示成預設顯示在行內。"
 
 #: ../tools/evolution-launch-composer.c:326
 msgid "Default subject for the message."
-msgstr "電郵的預設主旨。"
+msgstr "郵件的預設主旨。"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -20432,166 +18221,126 @@ msgstr "無法執行 `%s'：%s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "關閉 %s (%s)\n"
 
-# addressbook/gui/component/addressbook-config.glade.h:2
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
 msgstr "改變選定資料夾的屬性"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的聯絡人到(_P)..."
 
-# ui/evolution-addressbook.xml.h:17
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "聯絡人預覽(_P)"
 
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
 #: ../ui/evolution-addressbook.xml.h:6
 #: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "複製"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "複製選擇的聯絡人到另一個資料夾..."
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "複製已選定資料夾中的聯絡人到另一個資料夾"
 
-# ui/evolution-event-editor.xml.h:14
-# ui/evolution-task-editor-dialog.xml.h:15
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "複製選定範圍"
 
-# mail/folder-browser.c:713
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "複製至資料夾..."
 
-# ui/evolution-tasks.xml.h:2
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
 msgstr "建立新通訊錄資料夾"
 
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪下"
 
-# ui/evolution-event-editor.xml.h:16
-# ui/evolution-task-editor-dialog.xml.h:17
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪下選定範圍"
 
-# importers/pine-importer.c:661
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "刪除選定的聯絡人"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
 msgstr "刪除選定的資料夾"
 
-# ui/evolution-mail.xml.h:35
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "轉寄聯絡人"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的聯絡人移到(_V)..."
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "將選擇的聯絡人移至另一個資料夾..."
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
 msgstr "將選定資料夾中的聯絡人移至另一個資料夾"
 
-# mail/folder-browser.c:711
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "移至資料夾..."
 
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
 #: ../ui/evolution-addressbook.xml.h:23
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼上"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的連絡人"
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
-msgstr "預覽將要列印的聯絡人"
+msgstr "預覽將要打印的連絡人"
 
-# ui/evolution-addressbook.xml.h:11
+# zh_HK: msgstr "打印選定的連絡人"
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
-msgstr "列印選定的聯絡人"
+msgstr "打印選定的連絡人"
 
 #: ../ui/evolution-addressbook.xml.h:29
 msgid "Rename the selected folder"
 msgstr "重新命名選定的資料夾"
 
-# importers/pine-importer.c:661
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
 msgstr "將通訊錄另存為 VC_ard"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "將選定的聯絡人儲存為 VCard。"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "將選定資料夾中的聯絡人儲存為 VCard"
 
-# ui/evolution-event-editor.xml.h:48
-# ui/evolution-task-editor-dialog.xml.h:57
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
 msgid "Select All"
 msgstr "全選"
@@ -20602,44 +18351,34 @@ msgstr "全選"
 msgid "Select _All"
 msgstr "全選(_A)"
 
-# ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "選擇全部聯絡人"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
-msgstr "傳送電郵至選取的聯絡人。"
+msgstr "傳送郵件至選取的聯絡人。"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
-msgstr "傳送電郵給聯絡人"
+msgstr "傳送郵件給聯絡人"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-# addressbook/gui/widgets/e-addressbook-view.c:612
 #: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "傳送選定聯絡人給其他使用者。"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "顯示聯絡人預覽視窗"
 
-# ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
 msgstr "停止(_O)"
 
-# ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "停止"
 
-# ui/evolution-addressbook.xml.h:13
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "停止載入"
@@ -20653,7 +18392,6 @@ msgstr "檢視目前的聯絡人"
 msgid "_Actions"
 msgstr "執行(_A)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
 msgstr "複製聯絡人到(_C)..."
@@ -20690,16 +18428,14 @@ msgstr "重新命名(_R)"
 msgid "_Save Contact as VCard..."
 msgstr "將聯絡人儲存為 VCar_d..."
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
 msgstr "將資料夾聯絡人儲存為 VCar_d"
 
 #: ../ui/evolution-addressbook.xml.h:63
 msgid "_Send Message to Contact..."
-msgstr "傳送電郵給聯絡人(_S)..."
+msgstr "傳送郵件給聯絡人(_S)..."
 
-# ui/evolution-calendar.xml.h:7
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "天"
@@ -20708,75 +18444,57 @@ msgstr "天"
 msgid "Delete _all Occurrences"
 msgstr "刪除全部週期(_A)"
 
-# calendar/gui/e-week-view.c:3313
 #: ../ui/evolution-calendar.xml.h:7
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-# ui/evolution-event-editor.xml.h:18
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
 msgstr "刪除這個約會"
 
-# calendar/gui/e-day-view.c:3177
-# calendar/gui/e-week-view.c:3311
 #: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-# ui/evolution-calendar.xml.h:8
 #: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "移至"
 
-# ui/evolution-calendar.xml.h:9
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "向後"
 
-# ui/evolution-calendar.xml.h:10
 #: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "向前"
 
-# addressbook/contact-editor/fullname.glade.h:8
 #: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "清單"
 
-# ui/evolution-calendar.xml.h:15
 #: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "月"
 
-# mail/message-browser.c:210
-# ui/evolution-calendar.xml.h:18
-# ui/evolution-event-editor.xml.h:29
-# ui/evolution-mail.xml.h:57
-# ui/evolution-task-editor-dialog.xml.h:32
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "下一個"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的行事曆內容"
 #: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
-msgstr "預覽將要列印的行事曆內容"
+msgstr "預覽將要打印的行事曆內容"
 
-# mail/message-browser.c:207
-# ui/evolution-event-editor.xml.h:33
-# ui/evolution-mail.xml.h:64
-# ui/evolution-task-editor-dialog.xml.h:36
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "上一個"
 
-# ui/evolution-calendar.xml.h:26
+# zh_HK: msgstr "打印這個行事曆"
 #: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
-msgstr "列印這個行事曆"
+msgstr "打印這個行事曆"
 
 #: ../ui/evolution-calendar.xml.h:23 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
@@ -20794,38 +18512,30 @@ msgstr "選擇日期(_D)"
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
-# ui/evolution-calendar.xml.h:13
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-# shell/e-shell-importer.c:601
 #: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "選取今日"
 
-# addressbook/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "顯示成清單"
 
-# ui/evolution-calendar.xml.h:30
 #: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "顯示一天"
 
-# ui/evolution-calendar.xml.h:31
 #: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "顯示一個月"
 
-# ui/evolution-calendar.xml.h:32
 #: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "顯示一週"
 
-# ui/evolution-calendar.xml.h:33
 #: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "顯示工作週"
@@ -20834,12 +18544,10 @@ msgstr "顯示工作週"
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
 
-# ui/evolution-calendar.xml.h:36
 #: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "週"
 
-# ui/evolution-calendar.xml.h:35
 #: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "工作週"
@@ -20848,46 +18556,34 @@ msgstr "工作週"
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "複製選取的文字至剪貼簿"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-composer-entries.xml.h:3
 msgid "Copy selection to clipboard"
 msgstr "複製選取區至剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "剪下選取的文字至剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:7
 msgid "Cut selection to clipboard"
 msgstr "剪下選取區至剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:9
 msgid "Paste from clipboard"
 msgstr "從剪貼簿貼上"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-# ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
 msgid "Select all text"
 msgstr "選取所有文字"
 
-# ui/evolution-message-composer.xml.h:1
 #: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附加"
@@ -20896,14 +18592,10 @@ msgstr "附加"
 msgid "Click here to attach a file"
 msgstr "按這裏以附加檔案"
 
-# ui/evolution-message-composer.xml.h:4
-# ui/evolution-task-editor-dialog.xml.h:12
 #: ../ui/evolution-editor.xml.h:3
 msgid "Click here to close the current window"
 msgstr "按這裏以關閉目前視窗"
 
-# ui/evolution-message-composer.xml.h:4
-# ui/evolution-task-editor-dialog.xml.h:12
 #: ../ui/evolution-editor.xml.h:4
 msgid "Click here to save the current window"
 msgstr "按這裏以儲存目前視窗"
@@ -20912,13 +18604,6 @@ msgstr "按這裏以儲存目前視窗"
 msgid "Click here to view help available"
 msgstr "按這裏以檢視可用的說明"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
@@ -20967,9 +18652,6 @@ msgstr "全天事件"
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
 #: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
@@ -20993,15 +18675,10 @@ msgstr "按這裏以設定或取消這個事件的鬧鈴"
 msgid "Insert advanced send options"
 msgstr "插入進階傳送選項"
 
-# calendar/gui/e-day-view.c:3175
-# calendar/gui/e-week-view.c:3309
 #: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
 msgstr "將此項設為循環事件"
 
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
@@ -21019,53 +18696,43 @@ msgstr "角色欄位(_O)"
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-# ui/evolution-message-composer.xml.h:39
 #: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
@@ -21075,30 +18742,20 @@ msgstr "鬧鈴(_A)"
 msgid "_Categories"
 msgstr "分類(_C)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:5
-# calendar/gui/e-calendar-table.c:151
-# calendar/gui/event-editor-dialog.glade.h:6
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
 #: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../ui/evolution-event-editor.xml.h:30
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
 #: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
@@ -21108,7 +18765,6 @@ msgstr "私人(_P)"
 msgid "_RSVP"
 msgstr "_RSVP"
 
-# calendar/gui/event-editor-dialog.glade.h:18
 #: ../ui/evolution-event-editor.xml.h:33
 msgid "_Recurrence"
 msgstr "週期性(_R)"
@@ -21121,83 +18777,68 @@ msgstr "狀態欄位(_S)"
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-# ui/evolution-mail.xml.h:3
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
-msgstr "取消目前電郵所作的行動"
+msgstr "取消目前郵件所作的行動"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-global.xml.h:3
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-# ui/evolution-mail.xml.h:16
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
-msgstr "建立一個新資料夾以儲存電郵"
+msgstr "建立一個新資料夾以儲存郵件"
 
-# ui/evolution-mail.xml.h:21
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-# ui/evolution-mail.xml.h:20
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
-msgstr "為新電郵建立或編輯過濾規則"
+msgstr "為新郵件建立或編輯過濾規則"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
-msgstr "清空垃圾桶(_T)"
+msgstr "清空回收筒(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-# ui/evolution-mail.xml.h:61
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:11
 msgid "Permanently remove all deleted messages from all folders"
-msgstr "永久移除在所有資料夾內的全部已刪除的電郵"
+msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-# mail/mail-account-gui.c:682
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
 
 #: ../ui/evolution-mail-global.xml.h:13
 msgid "Show Message _Preview"
-msgstr "顯示電郵預覽(_P)"
+msgstr "顯示郵件預覽(_P)"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Show message preview below the message list"
-msgstr "在電郵清單下方顯示電郵預覽"
+msgstr "在郵件清單下方顯示郵件預覽"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview side-by-side with the message list"
-msgstr "在電郵清單旁顯示電郵預覽"
+msgstr "在郵件清單旁顯示郵件預覽"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
-msgstr "顯示電郵預覽視窗"
+msgstr "顯示郵件預覽視窗"
 
-# ui/evolution-mail.xml.h:90
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:5
-# calendar/gui/e-calendar-table.c:151
-# calendar/gui/event-editor-dialog.glade.h:6
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
@@ -21208,7 +18849,7 @@ msgstr "複製資料夾到(_C)..."
 
 #: ../ui/evolution-mail-global.xml.h:20
 msgid "_Message Filters"
-msgstr "電郵規則(_M)"
+msgstr "郵件規則(_M)"
 
 #: ../ui/evolution-mail-global.xml.h:21
 msgid "_Move Folder To..."
@@ -21218,7 +18859,6 @@ msgstr "移動資料夾到(_M)..."
 msgid "_New..."
 msgstr "新增(_N)..."
 
-# addressbook/printing/e-contact-print.glade.h:30
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Preview"
 msgstr "預覽(_P)"
@@ -21230,149 +18870,128 @@ msgstr "預覽(_P)"
 msgid "_Subscriptions"
 msgstr "訂閱(_S)"
 
-# calendar/gui/e-calendar-table.c:156
 #: ../ui/evolution-mail-global.xml.h:28
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "更改這個資料夾的名稱"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "更改這個資料夾的屬性"
 
 #: ../ui/evolution-mail-list.xml.h:3
 msgid "Collapse All _Threads"
-msgstr "收摺所有相關電郵(_T)"
+msgstr "收摺所有相關郵件(_T)"
 
-# ui/evolution-mail.xml.h:51
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
-msgstr "收摺所有的相關電郵"
+msgstr "收摺所有的相關郵件"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
-msgstr "複製已選定的電郵到剪貼簿"
+msgstr "複製已選定的郵件到剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
-msgstr "將電郵剪下並貼到剪貼簿"
+msgstr "將郵件剪下並貼到剪貼簿"
 
 #: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpand All Threads"
-msgstr "展開所有相關電郵(_X)"
+msgstr "展開所有相關郵件(_X)"
 
 #: ../ui/evolution-mail-list.xml.h:9
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-# ui/evolution-mail.xml.h:51
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
-msgstr "展開所有的相關電郵"
+msgstr "展開所有的相關郵件"
 
 #: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide S_elected Messages"
-msgstr "隱藏選擇的電郵(_E)"
+msgstr "隱藏選擇的郵件(_E)"
 
 #: ../ui/evolution-mail-list.xml.h:13
 msgid "Hide _Deleted Messages"
-msgstr "隱藏已刪除電郵(_D)"
+msgstr "隱藏已刪除郵件(_D)"
 
 #: ../ui/evolution-mail-list.xml.h:14
 msgid "Hide _Read Messages"
-msgstr "隱藏已閱讀的電郵(_R)"
+msgstr "隱藏已閱讀的郵件(_R)"
 
-# ui/evolution-mail.xml.h:45
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
-msgstr "隱藏已刪除的電郵而非將它們以刪除線的形式顯示"
+msgstr "隱藏已刪除的郵件而非將它們以刪除線的形式顯示"
 
 #: ../ui/evolution-mail-list.xml.h:16
 msgid "Mar_k All Messages as Read"
-msgstr "標示所有電郵為已閱讀(_K)"
+msgstr "標示所有郵件為已閱讀(_K)"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
-msgstr "自剪貼簿貼上電郵"
+msgstr "自剪貼簿貼上郵件"
 
-# ui/evolution-mail.xml.h:62
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
-msgstr "永久移除在這個資料夾內已刪除的電郵"
+msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-# ui/evolution-mail.xml.h:62
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
 #: ../ui/evolution-mail-list.xml.h:20
 msgid "Select Message _Thread"
-msgstr "選擇電郵檔頭(_T)"
+msgstr "選擇郵件檔頭(_T)"
 
-# ui/evolution-mail.xml.h:80
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
-msgstr "選擇全部的電郵(_A)"
+msgstr "選擇全部的郵件(_A)"
 
-# ui/evolution-mail.xml.h:78
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
-msgstr "選擇全部目前未選定的電郵"
+msgstr "選擇全部目前未選定的郵件"
 
-# ui/evolution-mail.xml.h:79
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
-msgstr "選擇所有相關的電郵為選定的電郵"
+msgstr "選擇所有相關的郵件為選定的郵件"
 
-# ui/evolution-mail.xml.h:80
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
-msgstr "選擇全部可見的電郵"
+msgstr "選擇全部可見的郵件"
 
 #: ../ui/evolution-mail-list.xml.h:25
 msgid "Show Hidde_n Messages"
-msgstr "顯示隱藏的電郵(_N)"
+msgstr "顯示隱藏的郵件(_N)"
 
-# ui/evolution-mail.xml.h:88
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
-msgstr "顯示暫時隱藏的電郵"
+msgstr "顯示暫時隱藏的郵件"
 
-# ui/evolution-mail.xml.h:91
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
-msgstr "將已閱讀的電郵暫時隱藏"
+msgstr "將已閱讀的郵件暫時隱藏"
 
-# ui/evolution-mail.xml.h:92
 #: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
-msgstr "將選定的電郵暫時隱藏"
+msgstr "將選定的郵件暫時隱藏"
 
-# ui/evolution-mail.xml.h:93
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
-msgstr "相關電郵清單"
+msgstr "相關郵件清單"
 
 #: ../ui/evolution-mail-list.xml.h:31
 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-messagedisplay.xml.h:7
 msgid "_Message"
-msgstr "電郵(_M)"
+msgstr "郵件(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
@@ -21382,7 +19001,6 @@ msgstr "加入寄件者到目錄服務(_D)"
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-# addressbook/gui/component/addressbook-config.c:662
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
@@ -21390,135 +19008,111 @@ msgstr "新增寄件者至通訊錄"
 
 #: ../ui/evolution-mail-message.xml.h:5
 msgid "All Message _Headers"
-msgstr "所有電郵檔頭(_H)"
+msgstr "所有郵件檔頭(_H)"
 
-# ui/evolution-mail.xml.h:1
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
-msgstr "套用過濾器規則於所選定的電郵"
+msgstr "套用過濾器規則於所選定的郵件"
 
 #: ../ui/evolution-mail-message.xml.h:7
 msgid "Check for _Junk"
-msgstr "檢查垃圾電郵(_J)"
+msgstr "檢查垃圾郵件(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:8
 msgid "Compose _New Message"
-msgstr "撰寫新電郵(_N)"
+msgstr "撰寫新郵件(_N)"
 
-# ui/evolution-mail.xml.h:6
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
-msgstr "撰寫回郵給所選定的電郵的全部收件者"
+msgstr "撰寫回郵給所選定的郵件的全部收件者"
 
-# ui/evolution-mail.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
-msgstr "撰寫回郵給所選定電郵的通信論壇"
+msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-# ui/evolution-mail.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
-msgstr "撰寫回郵給所選定的電郵的寄件者"
+msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
-msgstr "複製已選定的電郵到另一個資料夾"
+msgstr "複製已選定的郵件到另一個資料夾"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
-msgstr "複製已選定的電郵到剪貼簿"
+msgstr "複製已選定的郵件到剪貼簿"
 
-# ui/evolution.xml.h:10
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "建立規則(_U)"
 
-# ui/evolution-mail.xml.h:15
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:18
 #: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:11
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-# ui/evolution-mail.xml.h:12
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-# ui/evolution-mail.xml.h:13
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-# ui/evolution-mail.xml.h:14
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
-msgstr "將電郵剪下並貼到剪貼簿"
+msgstr "將郵件剪下並貼到剪貼簿"
 
 #: ../ui/evolution-mail-message.xml.h:24
 msgid "Decrease the text size"
 msgstr "減少文字大小"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
-msgstr "顯示下一封重要的電郵"
+msgstr "顯示下一封重要的郵件"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
-msgstr "顯示下一封電郵"
+msgstr "顯示下一封郵件"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
-msgstr "顯示下一封相關電郵"
+msgstr "顯示下一封相關郵件"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
-msgstr "顯示下一封未閱讀的電郵"
+msgstr "顯示下一封未閱讀的郵件"
 
-# ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
-msgstr "顯示上一封重要的電郵"
+msgstr "顯示上一封重要的郵件"
 
-# ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
-msgstr "顯示上一封電郵"
+msgstr "顯示上一封郵件"
 
-# ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
-msgstr "顯示上一封未閱讀的電郵"
+msgstr "顯示上一封未閱讀的郵件"
 
 #: ../ui/evolution-mail-message.xml.h:33
 msgid "F_orward As..."
@@ -21540,46 +19134,38 @@ msgstr "收件者過濾器(_R)..."
 msgid "Filter on _Subject..."
 msgstr "主旨過濾器(_S)..."
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
-msgstr "篩選所選信件的垃圾電郵狀態"
+msgstr "篩選所選信件的垃圾郵件狀態"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
-msgstr "將選定的電郵加上跟隨標幟"
+msgstr "將選定的郵件加上跟隨標幟"
 
 #: ../ui/evolution-mail-message.xml.h:40
 msgid "Follow _Up..."
 msgstr "跟隨(_U)..."
 
-# ui/evolution-mail.xml.h:30
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
-msgstr "閱讀 HTML 格式的電郵時強迫載入影像"
+msgstr "閱讀 HTML 格式的郵件時強迫載入圖像"
 
-# ui/evolution-mail.xml.h:38
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
-msgstr "將需要轉寄的電郵夾附於新電郵的內文中"
+msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-# ui/evolution-mail.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
-msgstr "將需要轉寄的電郵以回覆電郵方式寄出"
+msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-# ui/evolution-mail.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
-msgstr "將選定的電郵轉寄給某人"
+msgstr "將選定的郵件轉寄給某人"
 
-# ui/evolution-mail.xml.h:41
 #: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
-msgstr "將選定的電郵以附加檔案形式轉寄給某人"
+msgstr "將選定的郵件以附加檔案形式轉寄給某人"
 
-# ui/evolution-message-composer.xml.h:10
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "增加文字大小"
@@ -21588,205 +19174,171 @@ msgstr "增加文字大小"
 msgid "Mar_k as"
 msgstr "標示成(_K)"
 
-# ui/evolution-mail.xml.h:52
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
-msgstr "將選定的電郵標示成已經閱讀"
+msgstr "將選定的郵件標示成已經閱讀"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages as important"
-msgstr "將選定的電郵標示成重要"
+msgstr "將選定的郵件標示成重要"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
-msgstr "將選定的電郵標示成垃圾電郵"
+msgstr "將選定的郵件標示成垃圾郵件"
 
-# ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
-msgstr "將選取的電郵標示成不是垃圾電郵"
+msgstr "將選取的郵件標示成不是垃圾郵件"
 
-# ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
-msgstr "將選定的電郵標示成未閱讀"
+msgstr "將選定的郵件標示成未閱讀"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
-msgstr "將選定的電郵標示成不重要"
+msgstr "將選定的郵件標示成不重要"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
-msgstr "將選定的電郵標示成要刪除"
+msgstr "將選定的郵件標示成要刪除"
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
-msgstr "將選定的電郵移至另一個資料夾"
+msgstr "將選定的郵件移至另一個資料夾"
 
 #: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Important Message"
-msgstr "下一封重要電郵(_I)"
+msgstr "下一封重要郵件(_I)"
 
 #: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Thread"
-msgstr "下一封相關電郵(_T)"
+msgstr "下一封相關郵件(_T)"
 
 #: ../ui/evolution-mail-message.xml.h:61
 msgid "Next _Unread Message"
-msgstr "下一封未閱讀的電郵(_U)"
+msgstr "下一封未閱讀的郵件(_U)"
 
-# calendar/gui/calendar-commands.c:266
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
-msgstr "不是垃圾電郵"
+msgstr "不是垃圾郵件"
 
-# ui/evolution-mail.xml.h:58
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
-msgstr "開啟視窗以便撰寫電郵"
+msgstr "開啟視窗以便撰寫郵件"
 
-# ui/evolution-mail.xml.h:59
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
-msgstr "使用新視窗開啟選定的電郵"
+msgstr "使用新視窗開啟選定的郵件"
 
-# ui/evolution-mail.xml.h:60
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
-msgstr "在撰寫視窗開啟選取的電郵以便編輯"
+msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 
 #: ../ui/evolution-mail-message.xml.h:66
 msgid "P_revious Unread Message"
-msgstr "上一封未閱讀的電郵(_R)"
+msgstr "上一封未閱讀的郵件(_R)"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
-msgstr "自剪貼簿貼上電郵"
+msgstr "自剪貼簿貼上郵件"
 
-# mail/mail-ops.c:825
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
-msgstr "張貼新電郵到資料夾(_T)"
+msgstr "張貼新郵件到資料夾(_T)"
 
 #: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a Repl_y"
 msgstr "張貼回覆(_Y)"
 
-# mail/mail-ops.c:825
 #: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
-msgstr "張貼新電郵到公開資料夾"
+msgstr "張貼新郵件到公開資料夾"
 
-# ui/evolution-message-composer.xml.h:25
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
-msgstr "張貼電郵的回覆至公開資料夾"
+msgstr "張貼郵件的回覆至公開資料夾"
 
 #: ../ui/evolution-mail-message.xml.h:72
 msgid "Pr_evious Important Message"
-msgstr "上一封重要電郵(_E)"
+msgstr "上一封重要郵件(_E)"
 
-# ui/evolution-addressbook.xml.h:8
-# ui/evolution-mail.xml.h:63
+# zh_HK: msgstr "預覽需要打印的郵件"
 #: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
-msgstr "預覽需要列印的電郵"
+msgstr "預覽需要打印的郵件"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印郵件"
 #: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
-msgstr "列印電郵"
+msgstr "打印郵件"
 
 #: ../ui/evolution-mail-message.xml.h:78
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-# ui/evolution-mail.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
-msgstr "將選定的電郵重新導向給某人"
+msgstr "將選定的郵件重新導向給某人"
 
 #: ../ui/evolution-mail-message.xml.h:84
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-# ui/evolution-mail.xml.h:74
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
-msgstr "將選定的電郵另存成文字檔案"
+msgstr "將選定的郵件另存成文字檔案"
 
-# ui/evolution-mail.xml.h:95
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
-# ui/evolution-mail.xml.h:97
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "收件者搜尋資料夾..."
 
-# ui/evolution-mail.xml.h:98
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
-# ui/evolution-mail.xml.h:96
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
-# ui/evolution-mail.xml.h:75
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
-msgstr "搜尋顯示的電郵本文中的文字"
+msgstr "搜尋顯示的郵件本文中的文字"
 
-# ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
-# ui/evolution-mail.xml.h:80
 #: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
-msgstr "選擇電郵中的所有文字"
+msgstr "選擇郵件中的所有文字"
 
-# ui/evolution-event-editor.xml.h:50
-# ui/evolution-task-editor-dialog.xml.h:59
 #: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
-msgstr "設定你目前印表機的版面設定"
+msgstr "設定你目前打印機的版面設定"
 
-# ui/evolution-mail.xml.h:75
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "在顯示的電郵內文中顯示閃爍游標"
+msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages in the normal style"
-msgstr "使用正常模式顯示電郵"
+msgstr "使用正常模式顯示郵件"
 
-# ui/evolution-mail.xml.h:87
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
-msgstr "顯示電郵及詳細檔頭"
+msgstr "顯示郵件及詳細檔頭"
 
-# ui/evolution-mail.xml.h:89
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
-msgstr "顯示電郵原始檔"
+msgstr "顯示郵件原始檔"
 
-# ui/evolution-mail.xml.h:94
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Undelete the selected messages"
-msgstr "取消刪除選定的電郵"
+msgstr "取消刪除選定的郵件"
 
 #: ../ui/evolution-mail-message.xml.h:99
 msgid "Uni_mportant"
@@ -21796,7 +19348,6 @@ msgstr "不重要(_M)"
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-# ui/evolution-message-composer.xml.h:1
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "_Attached"
 msgstr "附件(_A)"
@@ -21811,12 +19362,11 @@ msgstr "清除標幟(_C)"
 
 #: ../ui/evolution-mail-message.xml.h:106
 msgid "_Delete Message"
-msgstr "刪除電郵(_D)"
+msgstr "刪除郵件(_D)"
 
-# mail/mail-search.c:268
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
-msgstr "在電郵內尋找(_F)..."
+msgstr "在郵件內尋找(_F)..."
 
 #: ../ui/evolution-mail-message.xml.h:109
 msgid "_Flag Completed"
@@ -21830,15 +19380,13 @@ msgstr "移至(_G)"
 msgid "_Important"
 msgstr "重要(_I)"
 
-# mail/mail-config.glade.h:37
 #: ../ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "行內(_I)"
 
-# calendar/gui/goto-dialog.glade.h:9
 #: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
-msgstr "垃圾電郵(_J)"
+msgstr "垃圾郵件(_J)"
 
 #: ../ui/evolution-mail-message.xml.h:115
 msgid "_Load Images"
@@ -21846,20 +19394,19 @@ msgstr "載入圖片(_L)"
 
 #: ../ui/evolution-mail-message.xml.h:117
 msgid "_Message Source"
-msgstr "電郵來源(_M)"
+msgstr "郵件來源(_M)"
 
 #: ../ui/evolution-mail-message.xml.h:119
 msgid "_Next Message"
-msgstr "下一封電郵(_N)"
+msgstr "下一封郵件(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:120
 msgid "_Normal Size"
 msgstr "一般大小(_N)"
 
-# calendar/gui/calendar-commands.c:266
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
-msgstr "不是垃圾電郵(_N)"
+msgstr "不是垃圾郵件(_N)"
 
 #: ../ui/evolution-mail-message.xml.h:122
 msgid "_Open in New Window"
@@ -21867,21 +19414,19 @@ msgstr "在新視窗開啟(_O)"
 
 #: ../ui/evolution-mail-message.xml.h:123
 msgid "_Previous Message"
-msgstr "上一封電郵(_P)"
+msgstr "上一封郵件(_P)"
 
-# mail/mail-config.glade.h:56
 #: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-# mail/mail-callbacks.c:1188
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
-msgstr "儲存電郵(_S)..."
+msgstr "儲存郵件(_S)..."
 
 #: ../ui/evolution-mail-message.xml.h:129
 msgid "_Undelete Message"
-msgstr "復原刪除電郵(_U)"
+msgstr "復原刪除郵件(_U)"
 
 #: ../ui/evolution-mail-message.xml.h:130
 msgid "_Unread"
@@ -21895,65 +19440,52 @@ msgstr "縮放(_Z)"
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-# ui/evolution.xml.h:6
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
-# ui/evolution.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "主工具列"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
 msgstr "複製選定的備忘錄"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
 msgstr "剪下選定的備忘錄"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的備忘錄清單"
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
-msgstr "預覽將要列印的備忘錄清單"
+msgstr "預覽將要打印的備忘錄清單"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印備忘錄清單"
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
-msgstr "列印備忘錄清單"
+msgstr "打印備忘錄清單"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
 
-# ui/evolution-mail.xml.h:114
 #: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
-# composer/e-msg-composer-attachment-bar.c:421
-# ui/evolution-message-composer.xml.h:2
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附加檔案"
 
-# ui/evolution-message-composer.xml.h:4
-# ui/evolution-task-editor-dialog.xml.h:12
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
@@ -21964,20 +19496,17 @@ msgstr "附加檔案"
 msgid "Close the current file"
 msgstr "關閉目前檔案"
 
-# calendar/gui/e-day-view.c:3179
 #: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "刪除簽名檔以外的全部事件"
 
-# ui/evolution-message-composer.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
-msgstr "使用 PGP 將這封電郵加密"
+msgstr "使用 PGP 將這封郵件加密"
 
-# ui/evolution-message-composer.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
-msgstr "使用你的 S/MIME 加密證書將這封電郵加密"
+msgstr "使用你的 S/MIME 加密證書將這封郵件加密"
 
 #: ../ui/evolution-message-composer.xml.h:8
 #: ../ui/evolution-signature-editor.xml.h:14
@@ -21986,23 +19515,20 @@ msgstr "格式(_M)"
 
 #: ../ui/evolution-message-composer.xml.h:9
 msgid "Get delivery notification when your message is read"
-msgstr "在你的電郵被閱讀時取得送信通知"
+msgstr "在你的郵件被閱讀時取得送信通知"
 
 #: ../ui/evolution-message-composer.xml.h:10
 msgid "HT_ML"
 msgstr "HT_ML"
 
-# ui/evolution-message-composer.xml.h:12
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "開啟舊檔"
 
-# ui/evolution-message-composer.xml.h:13
 #: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-# ui/evolution-message-composer.xml.h:14
 #: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "PGP 加簽"
@@ -22011,18 +19537,14 @@ msgstr "PGP 加簽"
 msgid "R_equest Read Receipt"
 msgstr "要求讀信回條(_E)"
 
-# ui/evolution-message-composer.xml.h:15
 #: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME 加密"
 
-# ui/evolution-message-composer.xml.h:16
 #: ../ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME 加簽"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
 #: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "另存新檔"
@@ -22043,85 +19565,67 @@ msgstr "儲存草稿(_D)"
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-# ui/evolution-message-composer.xml.h:22
 #: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
 msgstr "儲存至資料夾..."
 
-# ui/evolution-event-editor.xml.h:44
-# ui/evolution-message-composer.xml.h:23
-# ui/evolution-task-editor-dialog.xml.h:53
 #: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
-# ui/evolution-message-composer.xml.h:24
 #: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the current file with a different name"
 msgstr "使用另一名稱儲存目前的檔案"
 
-# ui/evolution-message-composer.xml.h:25
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Save the message in a specified folder"
-msgstr "將電郵儲存至指定的資料夾"
+msgstr "將郵件儲存至指定的資料夾"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../ui/evolution-message-composer.xml.h:29
 msgid "Send"
 msgstr "傳送"
 
-# ui/evolution-message-composer.xml.h:29
 #: ../ui/evolution-message-composer.xml.h:30
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
-msgstr "使用 HTML 格式傳送電郵"
+msgstr "使用 HTML 格式傳送郵件"
 
-# ui/evolution-message-composer.xml.h:31
 #: ../ui/evolution-message-composer.xml.h:31
 msgid "Send this message"
-msgstr "傳送這個電郵"
+msgstr "傳送這個郵件"
 
-# ui/evolution-mail.xml.h:74
 #: ../ui/evolution-message-composer.xml.h:32
 msgid "Set the message priority to high"
-msgstr "將電郵優先權設為「高」"
+msgstr "將郵件優先權設為「高」"
 
-# ui/evolution-message-composer.xml.h:35
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
-msgstr "用你的 PGP 鑰匙給電郵加上數碼簽名"
+msgstr "用你的 PGP 密碼匙為郵件加上數碼簽署"
 
-# ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-message-composer.xml.h:34
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "用你的 S/MIME 簽名證書給電郵加上數碼簽名"
+msgstr "用你的 S/MIME 簽署證書為郵件加上數碼簽署"
 
-# ui/evolution-message-composer.xml.h:37
 #: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:39
 #: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the From chooser is displayed"
 msgstr "切換寄件者選擇器的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "切換是否顯示「張貼至」欄位"
 
-# ui/evolution-message-composer.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the To field is displayed"
 msgstr "切換是否顯示「收件者」欄位"
@@ -22152,7 +19656,7 @@ msgstr "張貼到欄位(_P)"
 
 #: ../ui/evolution-message-composer.xml.h:51
 msgid "_Prioritize Message"
-msgstr "電郵優先權(_P)"
+msgstr "郵件優先權(_P)"
 
 #: ../ui/evolution-message-composer.xml.h:52
 msgid "_Reply-To Field"
@@ -22174,9 +19678,6 @@ msgstr "關閉(_L)"
 msgid "H_TML"
 msgstr "H_TML"
 
-# ui/evolution-contact-editor.xml.h:9
-# ui/evolution-event-editor.xml.h:42
-# ui/evolution-task-editor-dialog.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "儲存後關閉"
@@ -22188,37 +19689,30 @@ msgstr "儲存後關閉"
 msgid "Save and _Close"
 msgstr "儲存後關閉(_C)"
 
-# ui/evolution-contact-editor.xml.h:10
 #: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "儲存這個檔案並關閉視窗"
 
-# ui/evolution-subscribe.xml.h:1
 #: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "新增資料夾到已訂閱的資料夾清單"
 
-# ui/evolution-subscribe.xml.h:4
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "重整清單"
 
-# ui/evolution-subscribe.xml.h:5
 #: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "重整資料夾的清單"
 
-# ui/evolution-subscribe.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "從已訂閱的資料夾清單內將資料夾移除"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "訂閱"
 
-# ui/evolution-subscribe.xml.h:9
 #: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "取消訂閱"
@@ -22229,44 +19723,36 @@ msgstr "反向選擇(_I)"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr "按這裏以改變/檢視該工作的詳細狀態資訊"
+msgstr "按這裏改變/檢視該工作的詳細狀態資料"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
 msgstr "狀態詳細資料"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
 msgstr "時區"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "傳送選項(_S)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
 msgstr "狀態詳細資料(_S)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "複製選定的工作"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
 msgstr "剪下選定的工作"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "刪除已完成的工作"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
@@ -22275,28 +19761,24 @@ msgstr "刪除選定的工作"
 msgid "Mar_k as Complete"
 msgstr "標示為完成(_K)"
 
-# calendar/gui/e-calendar-table.c:713
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
 msgstr "貼上剪貼簿上的工作"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的工作清單"
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
-msgstr "預覽將要列印的工作清單"
+msgstr "預覽將要打印的工作清單"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印工作清單"
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
-msgstr "列印工作清單"
+msgstr "打印工作清單"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
 msgstr "顯示聯絡人預覽視窗"
@@ -22305,7 +19787,6 @@ msgstr "顯示聯絡人預覽視窗"
 msgid "Task _Preview"
 msgstr "工作預覽(_P)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "檢視選取的工作"
@@ -22314,22 +19795,18 @@ msgstr "檢視選取的工作"
 msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
-# ui/evolution.xml.h:1
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "關於 Evolution..."
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "改變 Evolution 的設定值"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "更改工具列的可見性"
 
-# ui/evolution.xml.h:10
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
 msgstr "建立一個新的視窗來顯示這個資料夾"
@@ -22350,12 +19827,10 @@ msgstr "只顯示視窗按鈕的圖示"
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-# ui/evolution.xml.h:19
 #: ../ui/evolution.xml.h:10
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-# ui/evolution-mail.xml.h:32
 #: ../ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
@@ -22384,27 +19859,22 @@ msgstr "佈局(_O)"
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-# calendar/gui/event-editor-dialog.glade.h:13
 #: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "偏好設定(_N)"
 
-# ui/evolution-mail.xml.h:81
 #: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-# ui/evolution-mail.xml.h:81
 #: ../ui/evolution.xml.h:21
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-# ui/evolution-mail.xml.h:82
 #: ../ui/evolution.xml.h:22
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-# mail/mail-config.glade.h:40
 #: ../ui/evolution.xml.h:23
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
@@ -22417,17 +19887,14 @@ msgstr "顯示側邊欄(_B)"
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-# ui/evolution.xml.h:22
 #: ../ui/evolution.xml.h:26
 msgid "Show _Toolbar"
 msgstr "顯示工具列(_T)"
 
-# ui/evolution.xml.h:27
 #: ../ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-# ui/evolution.xml.h:28
 #: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
@@ -22440,12 +19907,10 @@ msgstr "傳送錯誤報告"
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
-# ui/evolution.xml.h:30
 #: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
-# ui/evolution.xml.h:34
 #: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
@@ -22466,7 +19931,6 @@ msgstr "顯示/隱藏狀態列"
 msgid "_About"
 msgstr "關於(_A)"
 
-# ui/evolution.xml.h:6
 #: ../ui/evolution.xml.h:40
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
@@ -22563,16 +20027,14 @@ msgstr "依主旨(_B)"
 msgid "By _Follow Up Flag"
 msgstr "依跟隨標幟(_F)"
 
-# ui/evolution-calendar.xml.h:35
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
 msgstr "用於寬檢視(_W)"
 
 #: ../views/mail/galview.xml.h:8
 msgid "_Messages"
-msgstr "電郵(_M)"
+msgstr "郵件(_M)"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "備忘錄(_M)"
@@ -22594,7 +20056,6 @@ msgstr "設定狀態(_S)"
 msgid "UTC"
 msgstr "UTC"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
 msgstr "<b>時區</b>"
@@ -22603,13 +20064,10 @@ msgstr "<b>時區</b>"
 msgid "<b>_Selection</b>"
 msgstr "<b>選擇(_S)</b>"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "選擇一個時區"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "TimeZone Combobox"
 msgstr "時區組合式方塊 "
@@ -22628,20 +20086,17 @@ msgstr ""
 msgid "Collection"
 msgstr "收集"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定義 %s 的檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
 msgid "Define Views"
 msgstr "定義檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
@@ -22658,18 +20113,14 @@ msgstr "編輯(_E)..."
 msgid "Table"
 msgstr "表格"
 
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
 msgid "Instance"
 msgstr "實體"
 
-# widgets/menus/gal-view-menus.c:176
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
-# ui/evolution-tasks.xml.h:2
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
 msgstr "建立新的檢視(_C)"
@@ -22678,7 +20129,6 @@ msgstr "建立新的檢視(_C)"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-# widgets/menus/gal-view-menus.c:176
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:350
@@ -22689,7 +20139,6 @@ msgstr "自訂檢視"
 msgid "Save Custom View"
 msgstr "儲存自訂檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-view-instance.c:592
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
@@ -22707,7 +20156,6 @@ msgstr "儲存自訂檢視..."
 msgid "Factory"
 msgstr "工廠"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-view-new-dialog.c:115
 msgid "Define New View"
 msgstr "定義新的檢視"
@@ -22728,23 +20176,18 @@ msgstr "檢視的類型:"
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
-# widgets/misc/e-calendar-item.c:422
 #. 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 "一二三四五六日"
 
-# widgets/misc/e-calendar-item.c:1061
-# widgets/misc/e-calendar-item.c:2756
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
 #: ../widgets/misc/e-calendar-item.c:1746
 msgid "%B %Y"
-msgstr "%B %Y"
+msgstr "%Y 年 %-m 月"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "月行事曆"
@@ -22799,34 +20242,29 @@ msgstr "Y2"
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3015
 msgid "Minimum width"
-msgstr "最小寬度"
+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:3016
 msgid "Minimum Width"
-msgstr "最小寬度"
+msgstr "最小闊度"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "間距"
 
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
 #: ../widgets/misc/e-cell-date-edit.c:233
 msgid "Now"
 msgstr "現在"
 
-# widgets/misc/e-cell-date-edit.c:726
 #: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
 
-# calendar/gui/calendar-model.c:1010
 #: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
@@ -22863,7 +20301,6 @@ msgstr "日文"
 msgid "Korean"
 msgstr "韓文"
 
-# calendar/gui/print.c:362
 #: ../widgets/misc/e-charset-picker.c:72
 msgid "Thai"
 msgstr "泰文"
@@ -22884,11 +20321,10 @@ msgstr "西歐語系"
 msgid "Western European, New"
 msgstr "西歐語系，新"
 
-# camel/providers/smtp/camel-smtp-transport.c:206
 #: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
-msgstr "正體"
+msgstr "繁體"
 
 #: ../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
@@ -22903,38 +20339,31 @@ msgstr "烏克蘭語"
 msgid "Visual"
 msgstr "視覺"
 
-# mail/mail-config.glade.h:22
 #: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
-msgstr "不明的字集：%s"
+msgstr "不明的字符集：%s"
 
 #: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
-msgstr "字元編碼"
+msgstr "字符編碼"
 
-# mail/mail-config.glade.h:22
 #: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
-msgstr "輸入要使用的字集"
+msgstr "輸入要使用的字符集"
 
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
 #: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "其它..."
 
 #: ../widgets/misc/e-charset-picker.c:482
 msgid "Ch_aracter Encoding"
-msgstr "字元編碼(_A)"
+msgstr "字符編碼(_A)"
 
-# widgets/misc/e-clipped-label.c:112
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
 #: ../widgets/misc/e-dateedit.c:321
 msgid "Date and Time"
 msgstr "日期與時刻"
@@ -22955,8 +20384,6 @@ msgstr "用以選擇時刻的組合式方塊"
 msgid "Time"
 msgstr "時間"
 
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
 #: ../widgets/misc/e-dateedit.c:461
 msgid "No_w"
 msgstr "現在(_W)"
@@ -22965,25 +20392,16 @@ msgstr "現在(_W)"
 msgid "_Today"
 msgstr "今天(_T)"
 
-# e-util/e-time-utils.c:312
-# widgets/misc/e-dateedit.c:1259
-# widgets/misc/e-dateedit.c:1318
-# widgets/misc/e-dateedit.c:1497
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
 msgid "%H:%M"
 msgstr "%H:%M"
 
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
 msgid "%I:%M %p"
-msgstr "%I:%M %p"
+msgstr "%p %I:%M"
 
-# ui/evolution-mail.xml.h:104
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "展開"
@@ -22996,9 +20414,6 @@ msgstr "是否打開展開器"
 msgid "Text of the expander's label"
 msgstr "展開器標籤的文字"
 
-# calendar/gui/calendar-model.c:1064
-# calendar/gui/dialogs/task-editor-dialog.glade.h:22
-# calendar/gui/e-calendar-table.c:348
 #: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "使用底線"
@@ -23007,7 +20422,7 @@ msgstr "使用底線"
 msgid ""
 "If set, an underline in the text indicates the next character should be used "
 "for the mnemonic accelerator key"
-msgstr "如果設定，文字的底線會指示字元應該當成加速鍵"
+msgstr "如果設定，文字的底線會指示字符應該當成加速鍵"
 
 #: ../widgets/misc/e-expander.c:207
 msgid "Space to put between the label and the child"
@@ -23037,13 +20452,11 @@ msgstr "指示器間距"
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
-# widgets/misc/e-filter-bar.c:239
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:164
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-# widgets/misc/e-filter-bar.c:168
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:213
 msgid "Save Search"
@@ -23065,12 +20478,10 @@ msgstr "儲存搜尋結果(_S)..."
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
-# widgets/misc/e-filter-bar.c:239
 #: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
-# mail/mail-config.glade.h:6
 #: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "所有的帳號"
@@ -23079,22 +20490,18 @@ msgstr "所有的帳號"
 msgid "Current Account"
 msgstr "目前的帳號"
 
-# ui/evolution.xml.h:10
 #: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-# ui/evolution-mail.xml.h:114
 #: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Message"
-msgstr "目前的電郵"
+msgstr "目前的郵件"
 
-# ui/evolution-message-composer.xml.h:12
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
-msgstr "選擇影像"
+msgstr "選擇圖像"
 
-# addressbook/contact-editor/fulladdr.glade.h:5
 #: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "世界地圖"
@@ -23103,9 +20510,7 @@ msgstr "世界地圖"
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
-msgstr ""
-"用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選"
-"擇時區。"
+msgstr "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選擇時區。"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -23115,15 +20520,13 @@ msgstr "同步對象:"
 msgid "Sync Private Records:"
 msgstr "同步私人記錄:"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "同步分類:"
 
-# mail/mail-ops.c:603
 #: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
-msgstr "空白電郵"
+msgstr "空白郵件"
 
 #: ../widgets/misc/e-reflow.c:1458 ../widgets/misc/e-reflow.c:1459
 msgid "Reflow model"
@@ -23167,7 +20570,6 @@ msgstr "顯示(_W):"
 msgid "Sear_ch: "
 msgstr "搜尋(_C):"
 
-# ui/evolution-message-composer.xml.h:26
 #. 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:951
@@ -23184,7 +20586,6 @@ msgstr "游標列"
 msgid "Cursor Column"
 msgstr "游標欄"
 
-# mail/message-list.c:1081
 #: ../widgets/misc/e-selection-model.c:214
 msgid "Sorter"
 msgstr "分類器"
@@ -23201,38 +20602,26 @@ msgstr "游標模式"
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
 msgstr "<b>遞送選項</b>"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
 #: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
 msgstr "<b>回覆</b>"
 
-# mail/mail-config.glade.h:10
 #: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
 msgstr "<b>返回通知</b>"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
 #: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
 msgstr "<b>狀態追蹤</b>"
 
-# ui/evolution-contact-editor.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
 msgstr "自動刪除項目(_U)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:5
-# calendar/gui/e-calendar-table.c:151
-# calendar/gui/event-editor-dialog.glade.h:6
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "分類"
@@ -23245,7 +20634,6 @@ msgstr "建立新的傳送項目至追蹤資訊(_E)"
 msgid "Deli_vered and opened"
 msgstr "已遞送與已開啟(_V)"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
 msgstr "一般選項(_R)"
@@ -23274,8 +20662,6 @@ msgstr ""
 "極機密\n"
 "只有你能看"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
 msgstr "要求回覆(_E)"
@@ -23300,42 +20686,30 @@ msgstr ""
 msgid "When acce_pted:"
 msgstr "當接受時(_P):"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: ../widgets/misc/e-send-options.glade.h:26
 msgid "When co_mpleted:"
-msgstr "當完成時(_M)："
+msgstr "當完成時(_M):"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "When decli_ned:"
 msgstr "當拒絕時(_N):"
 
-# addressbook/printing/e-contact-print.glade.h:41
 #: ../widgets/misc/e-send-options.glade.h:28
 msgid "Wi_thin"
 msgstr "於內(_T)"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/misc/e-send-options.glade.h:29
 msgid "_After:"
 msgstr "之後(_A):"
 
-# widgets/misc/e-messagebox.c:152
 #: ../widgets/misc/e-send-options.glade.h:30
 msgid "_All information"
 msgstr "全部資訊(_A)"
 
-# camel/providers/pop3/camel-pop3-provider.c:39
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Delay message delivery"
-msgstr "延遲電郵遞送(_D)"
-
-# addressbook/contact-editor/contact-editor.glade.h:23
-# mail/folder-browser.c:715
-# mail/mail-config.glade.h:85
-# ui/evolution-event-editor.xml.h:57
-# ui/evolution-mail.xml.h:103
-# ui/evolution-task-editor-dialog.xml.h:69
-# ui/evolution.xml.h:46
+msgstr "延遲郵件遞送(_D)"
+
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delivered"
 msgstr "已遞送(_D)"
@@ -23354,17 +20728,13 @@ msgstr "當有空時(_W)"
 
 #: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When opened:"
-msgstr "當開啟時(_W):     "
+msgstr "當開啟時(_W):"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
@@ -23378,17 +20748,14 @@ msgstr "按這裏以移至 URL"
 msgid "Edit Master Category List..."
 msgstr "編輯主分類清單..."
 
-# addressbook/contact-editor/e-contact-editor.c:603
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
 msgstr "屬於這些分類的項目(_C):"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "_Available Categories:"
 msgstr "可用的分類(_A):"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../widgets/misc/gal-categories.glade.h:4
 msgid "categories"
 msgstr "分類"
@@ -23397,13 +20764,9 @@ msgstr "分類"
 msgid "popup list"
 msgstr "彈出式清單"
 
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%l:%M %p"
+msgstr "%p %l:%M"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"
@@ -23413,7 +20776,6 @@ msgstr "選擇的欄"
 msgid "Focused Column"
 msgstr "聚焦的欄"
 
-# ui/evolution-addressbook.xml.h:11
 #: ../widgets/table/e-cell-pixbuf.c:411
 msgid "Unselected Column"
 msgstr "未選擇的欄"
@@ -23442,7 +20804,6 @@ msgstr "背景色彩欄"
 msgid "<- _Remove"
 msgstr "<-移除(_R)"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
@@ -23468,14 +20829,13 @@ msgstr "遞減"
 #: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
 msgid "Group Items By"
-msgstr "將項目群組化依"
+msgstr "將項目組成羣組，依"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
 msgstr "下移(_D)"
 
-# ui/evolution-mail.xml.h:55
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Up"
@@ -23501,16 +20861,11 @@ msgstr "顯示檢視中的欄位"
 msgid "Sort"
 msgstr "排序"
 
-# ui/evolution-contact-editor.xml.h:6
-# ui/evolution-event-editor.xml.h:37
-# ui/evolution-task-editor-dialog.xml.h:40
 #: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
 msgid "Sort Items By"
 msgstr "排序項目依"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
 msgid "Then By"
@@ -23542,26 +20897,21 @@ msgstr "(遞增)"
 msgid "(Descending)"
 msgstr "(遞減)"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../widgets/table/e-table-config.c:314
 msgid "Not sorted"
 msgstr "未排序"
 
 #: ../widgets/table/e-table-config.c:355
 msgid "No grouping"
-msgstr "未群組"
+msgstr "未組成羣組"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../widgets/table/e-table-config.c:584
 msgid "Available Fields"
 msgstr "可用的欄位"
 
 #: ../widgets/table/e-table-config.glade.h:17
 msgid "_Group By..."
-msgstr "群組依(_G)..."
+msgstr "羣組依(_G)..."
 
 #: ../widgets/table/e-table-config.glade.h:19
 msgid "_Show these fields in order:"
@@ -23581,13 +20931,10 @@ msgstr "DnD 碼"
 msgid "Full Header"
 msgstr "完整檔頭"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
 msgstr "加入一欄..."
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
 msgstr "欄位選擇程式"
@@ -23605,16 +20952,14 @@ msgstr ""
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d 個項目)"
+msgstr[1] "%s : %s (%d 個項目)"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
+msgstr[1] "%s (%d 個項目)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -23633,7 +20978,6 @@ msgstr "列與列間交替使用的色彩"
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
-# calendar/gui/e-calendar-table.c:156
 #: ../widgets/table/e-table-group-container.c:911
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
@@ -23695,7 +21039,6 @@ msgstr "標準列高"
 msgid "Frozen"
 msgstr "凍結"
 
-# widgets/menus/gal-view-menus.c:176
 #: ../widgets/table/e-table-header-item.c:1471
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
@@ -23714,17 +21057,16 @@ msgstr "不排序"
 
 #: ../widgets/table/e-table-header-item.c:1495
 msgid "Group By This Field"
-msgstr "依此欄位做群組"
+msgstr "依此欄位做羣組"
 
 #: ../widgets/table/e-table-header-item.c:1496
 msgid "Group By Box"
-msgstr "依方塊為群組"
+msgstr "依方塊為羣組"
 
 #: ../widgets/table/e-table-header-item.c:1498
 msgid "Remove This Column"
 msgstr "移除此欄"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../widgets/table/e-table-header-item.c:1499
 msgid "Add a Column..."
 msgstr "加入一欄..."
@@ -23741,7 +21083,6 @@ msgstr "最適填滿"
 msgid "Format Columns..."
 msgstr "格式欄..."
 
-# widgets/menus/gal-view-menus.c:176
 #: ../widgets/table/e-table-header-item.c:1505
 msgid "Customize Current View..."
 msgstr "自訂目前的檢視..."
@@ -23750,7 +21091,6 @@ msgstr "自訂目前的檢視..."
 msgid "Sort By"
 msgstr "排序依"
 
-# addressbook/printing/e-contact-print.glade.h:8
 #: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
@@ -23761,7 +21101,6 @@ msgstr "字型組"
 msgid "Sort Info"
 msgstr "排序資訊"
 
-# ui/evolution-calendar.xml.h:36
 #: ../widgets/table/e-table-header-item.c:1934
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
@@ -23785,7 +21124,6 @@ msgstr "游標列"
 msgid "Always search"
 msgstr "總是搜尋"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "請按這裏加入"
@@ -23804,7 +21142,7 @@ msgstr "繪出線條與 +/- 展開符號。"
 
 #: ../widgets/text/e-entry-test.c:49
 msgid "Minicard Test"
-msgstr "迷你咭片測試"
+msgstr "迷你卡片測試"
 
 #: ../widgets/text/e-entry-test.c:50
 msgid "Copyright (C) 2000, Helix Code, Inc."
@@ -23812,12 +21150,8 @@ msgstr "Copyright (C) 2000, Helix Code, Inc."
 
 #: ../widgets/text/e-entry-test.c:52
 msgid "This should test the minicard canvas item"
-msgstr "這可以測試迷你咭片畫布項目"
+msgstr "這可以測試迷你卡片畫布項目"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 msgid "Event Processor"
@@ -23849,12 +21183,12 @@ msgstr "橢圓"
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
 #: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 msgid "Line wrap"
-msgstr "折行"
+msgstr "換行"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 #: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
 msgid "Break characters"
-msgstr "中斷字元"
+msgstr "中斷字符"
 
 #: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
 #: ../widgets/text/e-text.c:3660 ../widgets/text/e-text.c:3661
@@ -23876,7 +21210,6 @@ msgstr "繪製框線"
 msgid "Draw background"
 msgstr "繪製背景"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
 #: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Draw button"
@@ -23909,9 +21242,8 @@ msgstr "錨點"
 
 #: ../widgets/text/e-text.c:3539 ../widgets/text/e-text.c:3540
 msgid "Clip Width"
-msgstr "剪輯寬度"
+msgstr "剪輯闊度"
 
-# addressbook/printing/e-contact-print.glade.h:15
 #: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
 msgid "Clip Height"
 msgstr "剪輯高度"
@@ -23934,7 +21266,7 @@ msgstr "Y 位移"
 
 #: ../widgets/text/e-text.c:3610 ../widgets/text/e-text.c:3611
 msgid "Text width"
-msgstr "文字寬度"
+msgstr "文字闊度"
 
 #: ../widgets/text/e-text.c:3617 ../widgets/text/e-text.c:3618
 msgid "Text height"
@@ -23942,29 +21274,9 @@ msgstr "文字高度"
 
 #: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
 msgid "IM Context"
-msgstr "IM 快顯選單"
+msgstr "IM 快顯視窗"
 
 #: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "work"
-#~ msgstr "工作"
-
-#~ msgid "personal"
-#~ msgstr "個人"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "選擇的行事曆是唯讀的"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "行事曆(_N):"
-
-#~ msgid "Memo:"
-#~ msgstr "備忘錄:"
-
-#~ msgid "      "
-#~ msgstr "      "
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 00dbd4e9fe..bb48c64e10 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,39 +1,35 @@
-# traditional Chinese translation of Evolution.
-# Copyright (C) 2001, 03, 04, 05 Free Software Foundation, Inc.
+# Chinese (Taiwan) translation of Evolution.
+# Copyright (C) 2001, 03, 04, 05, 06 Free Software Foundation, Inc.
 # Joe Man <trmetal@yahoo.com.hk>, 2001.
 # Chao-Hsiung Liao <pesder.liao@msa.hinet.net>, 2003.
 # Craig Jeffares <cjeffares@novell.com>,2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
+# Abel Cheung <abelcheung@gmail.com>, 2006.
 #
-#
-#: ../mail/em-format-html-display.c:683
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 2.7.91\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-08-12 03:36+0800\n"
-"PO-Revision-Date: 2006-08-12 09:23+0800\n"
+"PO-Revision-Date: 2006-09-04 15:11+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-"Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
+"Language-Team: Chinese (Taiwan) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../a11y/addressbook/ea-addressbook-view.c:94
 #: ../a11y/addressbook/ea-addressbook-view.c:103
 #: ../a11y/addressbook/ea-minicard-view.c:180
 msgid "evolution addressbook"
 msgstr "Evolution 通訊錄"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../a11y/addressbook/ea-minicard-view.c:34
 #: ../addressbook/gui/component/addressbook-component.c:226
 msgid "New Contact"
 msgstr "新連絡人"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard-view.c:35
 #: ../addressbook/gui/component/addressbook-component.c:234
 msgid "New Contact List"
@@ -44,23 +40,21 @@ msgstr "新增連絡人清單"
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
 msgstr[0] "目前的通訊錄資料夾 %s 有 %d 張名片"
+msgstr[1] "目前的通訊錄資料夾 %s 有 %d 張名片"
 
 #: ../a11y/addressbook/ea-minicard.c:31
 #: ../ui/evolution-message-composer.xml.h:12
 msgid "Open"
 msgstr "開啟"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard.c:141
 msgid "Contact List: "
 msgstr "連絡人清單: "
 
-# ui/evolution-addressbook.xml.h:17
 #: ../a11y/addressbook/ea-minicard.c:142
 msgid "Contact: "
 msgstr "連絡人: "
 
-# ui/evolution.xml.h:17
 #: ../a11y/addressbook/ea-minicard.c:168
 msgid "evolution minicard"
 msgstr "Evolution 迷你名片"
@@ -69,7 +63,6 @@ msgstr "Evolution 迷你名片"
 msgid "It has alarms."
 msgstr "它具有鬧鈴。"
 
-# calendar/gui/event-editor-dialog.glade.h:13
 #: ../a11y/calendar/ea-cal-view-event.c:267
 msgid "It has recurrences."
 msgstr "它是週期性約會。"
@@ -78,18 +71,15 @@ msgstr "它是週期性約會。"
 msgid "It is a meeting."
 msgstr "這是一項會議。"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../a11y/calendar/ea-cal-view-event.c:276
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "行事曆事件：摘要為 %s。"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../a11y/calendar/ea-cal-view-event.c:278
 msgid "Calendar Event: It has no summary."
 msgstr "行事曆事件：沒有摘要。"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../a11y/calendar/ea-cal-view-event.c:297
 msgid "calendar view event"
 msgstr "行事曆檢視事件"
@@ -98,30 +88,22 @@ msgstr "行事曆檢視事件"
 msgid "Grab Focus"
 msgstr "得到焦點"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../a11y/calendar/ea-cal-view.c:302
 msgid "New Appointment"
 msgstr "新增約會"
 
-# calendar/gui/e-day-view.c:3148
-# calendar/gui/e-week-view.c:3279
 #: ../a11y/calendar/ea-cal-view.c:303
 msgid "New All Day Event"
 msgstr "新增全天事件"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../a11y/calendar/ea-cal-view.c:304
 msgid "New Meeting"
 msgstr "新增會議"
 
-# ui/evolution-calendar.xml.h:12
 #: ../a11y/calendar/ea-cal-view.c:305
 msgid "Go to Today"
 msgstr "移至今日"
 
-# ui/evolution-calendar.xml.h:11
 #: ../a11y/calendar/ea-cal-view.c:306
 msgid "Go to Date"
 msgstr "移至日期"
@@ -137,8 +119,8 @@ msgstr "用來檢視與選擇時刻範圍的表格"
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
-msgstr[0] "它具有 %d 個事件。"
-msgstr[1] "它具有 %d 個事件。"
+msgstr[0] "它有 %d 個事件。"
+msgstr[1] "它有 %d 個事件。"
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
@@ -146,7 +128,6 @@ msgstr[1] "它具有 %d 個事件。"
 msgid "It has no events."
 msgstr "它沒有事件。"
 
-# ui/evolution-calendar.xml.h:35
 #. To translators: First %s is the week, for example "July 10th -
 #. July 14th, 2006". Second %s is the number of events in this work
 #. week, for example "It has %d event/events." or  "It has no events."
@@ -155,7 +136,6 @@ msgstr "它沒有事件。"
 msgid "Work Week View: %s. %s"
 msgstr "工作週檢視：%s。%s"
 
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #. To translators: First %s is the day, for example "Thursday July
 #. 13th, 2006". Second %s is the number of events on this day, for
 #. example "It has %d event/events." or  "It has no events."
@@ -164,7 +144,6 @@ msgstr "工作週檢視：%s。%s"
 msgid "Day View: %s. %s"
 msgstr "日檢視：%s。%s"
 
-# data/evolution.keys.in.h:2
 #: ../a11y/calendar/ea-day-view.c:199
 msgid "calendar view for a work week"
 msgstr "工作週的行事曆檢視"
@@ -173,15 +152,11 @@ msgstr "工作週的行事曆檢視"
 msgid "calendar view for one or more days"
 msgstr "用於一或多日的行事曆檢視"
 
-# calendar/gui/print.c:1093
 #: ../a11y/calendar/ea-gnome-calendar.c:187
 #: ../calendar/gui/calendar-component.c:704
 msgid "%A %d %b %Y"
-msgstr "%A %d %b %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
-# calendar/gui/e-day-view-top-item.c:278
-# calendar/gui/e-day-view.c:1308
-# calendar/gui/e-week-view-main-item.c:334
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
 #. strftime format %a = abbreviated weekday name,
@@ -195,9 +170,8 @@ msgstr "%A %d %b %Y"
 #: ../calendar/gui/e-week-view-main-item.c:319
 #: ../calendar/gui/e-week-view-main-item.c:533
 msgid "%a %d %b"
-msgstr "%a %d %b"
+msgstr "%-m 月 %-d 日 (%a)"
 
-# calendar/gui/print.c:1093
 #: ../a11y/calendar/ea-gnome-calendar.c:192
 #: ../a11y/calendar/ea-gnome-calendar.c:197
 #: ../a11y/calendar/ea-gnome-calendar.c:199
@@ -205,11 +179,8 @@ msgstr "%a %d %b"
 #: ../calendar/gui/calendar-component.c:714
 #: ../calendar/gui/calendar-component.c:716
 msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
-# calendar/gui/e-day-view-top-item.c:274
-# calendar/gui/e-day-view.c:1294
-# calendar/gui/e-week-view-main-item.c:325
 #: ../a11y/calendar/ea-gnome-calendar.c:216
 #: ../a11y/calendar/ea-gnome-calendar.c:222
 #: ../a11y/calendar/ea-gnome-calendar.c:228
@@ -219,11 +190,8 @@ msgstr "%a %d %b %Y"
 #: ../calendar/gui/calendar-component.c:741
 #: ../calendar/gui/calendar-component.c:743
 msgid "%d %b %Y"
-msgstr "%d %b %Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
-# calendar/gui/e-day-view-top-item.c:282
-# calendar/gui/e-day-view.c:1321
-# calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
 #. strftime format %d = day of month, %b = abbreviated
@@ -236,22 +204,18 @@ msgstr "%d %b %Y"
 #: ../calendar/gui/e-week-view-main-item.c:333
 #: ../calendar/gui/e-week-view-main-item.c:547
 msgid "%d %b"
-msgstr "%d %b"
+msgstr "%-m 月 %-d 日"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../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 行事曆"
 
-# addressbook/gui/component/addressbook-config.c:430
 #: ../a11y/calendar/ea-gnome-calendar.c:290
 msgid "search bar"
 msgstr "搜尋列"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../a11y/calendar/ea-gnome-calendar.c:291
 msgid "evolution calendar search bar"
 msgstr "evolution 行事曆搜尋列"
@@ -260,24 +224,20 @@ msgstr "evolution 行事曆搜尋列"
 msgid "Jump button"
 msgstr "跳躍按鈕"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../a11y/calendar/ea-jump-button.c:158
 msgid "Click here, you can find more events."
 msgstr "按這裡，您可以找到更多事件。"
 
-# ui/evolution-calendar.xml.h:15
 #: ../a11y/calendar/ea-week-view.c:157
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "月檢視：%s。%s"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../a11y/calendar/ea-week-view.c:161
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "週檢視：%s。%s"
 
-# data/evolution.keys.in.h:2
 #: ../a11y/calendar/ea-week-view.c:192
 msgid "calendar view for a month"
 msgstr "用於月的行事曆檢視"
@@ -332,7 +292,6 @@ msgstr "折疊 ETree 中包含此儲存格的列"
 msgid "Table Cell"
 msgstr "表格的儲存格"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:44
 #: ../a11y/e-table/gal-a11y-e-table-click-to-add.c:119
 #: ../widgets/table/e-table-click-to-add.c:574
@@ -347,21 +306,16 @@ msgstr "單擊"
 msgid "sort"
 msgstr "排序"
 
-# calendar/gui/e-day-view-top-item.c:274
-# calendar/gui/e-day-view.c:1294
-# calendar/gui/e-week-view-main-item.c:325
 #: ../a11y/widgets/ea-calendar-item.c:296
 #: ../a11y/widgets/ea-calendar-item.c:302
 msgid "%d %B %Y"
-msgstr "%d %B %Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
-# data/evolution.keys.in.h:2
 #: ../a11y/widgets/ea-calendar-item.c:304
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "行事曆：從 %s 到 %s"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../a11y/widgets/ea-calendar-item.c:339
 msgid "evolution calendar item"
 msgstr "evolution 行事曆項目"
@@ -370,7 +324,6 @@ msgstr "evolution 行事曆項目"
 msgid "Combo Button"
 msgstr "組合按鈕"
 
-# mail/mail-config.glade.h:21
 #: ../a11y/widgets/ea-combo-button.c:50
 msgid "Activate Default"
 msgstr "使用預設值"
@@ -379,16 +332,10 @@ msgstr "使用預設值"
 msgid "Popup Menu"
 msgstr "彈出式選單"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../a11y/widgets/ea-expander.c:40
 msgid "Toggle Attachment Bar"
 msgstr "切換附加檔案列"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
 #: ../a11y/widgets/ea-expander.c:50
 msgid "activate"
 msgstr "使作用"
@@ -407,7 +354,6 @@ msgstr "通訊錄「{0}」已存在"
 msgid "Cannot move contact."
 msgstr "無法移動連絡人。"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../addressbook/addressbook.error.xml.h:4
 msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
@@ -417,16 +363,12 @@ 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 ""
-"請檢查來確定您的密碼拼法正確，而且您使用的是支援的登入方法。請記得許多密碼有"
-"區分大小寫；您可能啟動了大寫鎖定鍵。"
+msgstr "請檢查來確定您的密碼拼法正確，而且您使用的是支援的登入方法。請記得許多密碼有區分大小寫；您可能啟動了大寫鎖定鍵。"
 
-# camel/camel-movemail.c:306
 #: ../addressbook/addressbook.error.xml.h:6
 msgid "Could not get schema information for LDAP server."
 msgstr "無法取得 LDAP 伺服器的綱要資訊。"
 
-# camel/camel-provider.c:140
 #: ../addressbook/addressbook.error.xml.h:7
 msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
@@ -436,48 +378,38 @@ 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 個人連絡人"
-"資料夾。"
+msgstr "目前您只能存取 Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 GroupWise 郵件客戶端，以取得您的 GroupWise 常用連絡人及 Groupwise 個人連絡人資料夾。"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
 msgstr "刪除通訊錄「{0}」？"
 
-# composer/e-msg-composer.c:805
 #: ../addressbook/addressbook.error.xml.h:10
 msgid "Error loading addressbook."
 msgstr "載入通訊錄發生錯誤。"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/addressbook.error.xml.h:11
 msgid "Error saving {0} to {1}: {2}"
 msgstr "將 {0} 儲存至 {1} 發生錯誤： {2}"
 
-# camel/providers/imap/camel-imap-store.c:531
 #: ../addressbook/addressbook.error.xml.h:12
 msgid "Failed to authenticate with LDAP server."
 msgstr "無法驗證 LDAP 伺服器。"
 
-# calendar/gui/e-calendar-table.c:714
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:13
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1908
 msgid "Failed to delete contact"
 msgstr "刪除連絡人失敗"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/addressbook.error.xml.h:14
 msgid "GroupWise Address book creation:"
 msgstr "GroupWise 通訊錄的建立"
 
-# camel/providers/imap/camel-imap-command.c:487
 #: ../addressbook/addressbook.error.xml.h:15
 msgid "LDAP server did not respond with valid schema information."
 msgstr "LDAP 伺服器未回應有效的綱要資訊。"
 
-# shell/e-storage.c:475
 #: ../addressbook/addressbook.error.xml.h:16
 msgid "Permission Denied."
 msgstr "權限不足。"
@@ -490,7 +422,6 @@ msgstr "伺服器版本"
 msgid "Some features may not work properly with your current server"
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
@@ -505,16 +436,12 @@ 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 版本，它不支援此功能，或可能設定錯誤。請洽詢"
-"管理員，瞭解支援的搜尋基礎。"
+msgstr "此 LDAP 伺服器可能使用舊的 LDAP 版本，它不支援此功能，或可能設定錯誤。請洽詢管理員，瞭解支援的搜尋基礎。"
 
-# addressbook/conduit/address-conduit.c:201
 #: ../addressbook/addressbook.error.xml.h:22
 msgid "This address book will be removed permanently."
 msgstr "此通訊錄將被永遠移除。"
 
-# addressbook/conduit/address-conduit.c:201
 #: ../addressbook/addressbook.error.xml.h:23
 msgid "This addressbook could not be opened."
 msgstr "無法開啟此通訊錄。"
@@ -533,22 +460,18 @@ msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或
 msgid "This server does not support LDAPv3 schema information."
 msgstr "此伺服器不支援 LDAPv3 綱要資訊。"
 
-# addressbook/gui/widgets/e-minicard-control.c:282
 #: ../addressbook/addressbook.error.xml.h:27
 msgid "Unable to open addressbook"
 msgstr "無法開啟通訊錄"
 
-# executive-summary/component/e-summary.c:940
 #: ../addressbook/addressbook.error.xml.h:28
 msgid "Unable to perform search."
 msgstr "無法執行搜尋。"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
 #: ../addressbook/addressbook.error.xml.h:29
 msgid "Unable to save {0}."
 msgstr "無法儲存 {0}。"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../addressbook/addressbook.error.xml.h:30
 msgid "Would you like to save your changes?"
 msgstr "要儲存所做的變更？"
@@ -557,18 +480,14 @@ msgstr "要儲存所做的變更？"
 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 ""
-"您正在嘗試從某一個通訊錄，將連絡人移至另一個通訊錄，但是它無法從來源移除。您"
-"想要儲存一個副本來代替嗎？"
+msgstr "您正在嘗試從某一個通訊錄，將連絡人移至另一個通訊錄，但是它無法從來源移除。您想要儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:32
 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 的問題。最好的"
-"解決方案是將該伺服器升級至支援的版太"
+msgstr "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版太"
 
 #: ../addressbook/addressbook.error.xml.h:33
 msgid ""
@@ -601,25 +520,20 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/conduit/address-conduit.c:300
 msgid "Default Sync Address:"
 msgstr "預設的同步地址:"
 
-# camel/camel-provider.c:140
 #: ../addressbook/conduit/address-conduit.c:1241
 #: ../addressbook/conduit/address-conduit.c:1242
 msgid "Could not load addressbook"
 msgstr "無法載入通訊錄"
 
-# addressbook/conduit/address-conduit.c:687
-# addressbook/conduit/address-conduit.c:690
 #: ../addressbook/conduit/address-conduit.c:1310
 #: ../addressbook/conduit/address-conduit.c:1313
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
-# mail/mail-config.glade.h:76
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
 msgid "Autocompletion"
 msgstr "自動完成"
@@ -632,12 +546,10 @@ msgstr "連絡人(_O)"
 msgid "Certificates"
 msgstr "憑證"
 
-# ui/evolution-mail.xml.h:19
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Configure autocomplete here"
 msgstr "在此設定自動完成"
 
-# ui/evolution-addressbook.xml.h:17
 #. Create the contacts group
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 #: ../addressbook/gui/component/addressbook-view.c:1332
@@ -646,32 +558,26 @@ msgstr "在此設定自動完成"
 msgid "Contacts"
 msgstr "連絡人"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
 msgid "Evolution Address Book"
 msgstr "Evolution 通訊錄"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Address Book address pop-up"
 msgstr "Evolution 通訊錄地址快顯視窗"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Address Book address viewer"
 msgstr "Evolution 通訊錄地址檢視器"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Address Book card viewer"
 msgstr "Evolution 通訊錄名片檢視器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Address Book component"
 msgstr "Evolution 通訊錄元件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
 #: ../addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution S/Mime 憑證管理控制"
@@ -695,7 +601,7 @@ msgstr "在此管理您的 S/MIME 憑證"
 #: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
-msgstr "在此電腦"
+msgstr "我的電腦"
 
 #. Create the default Person addressbook
 #. Create the default Person calendar
@@ -714,7 +620,6 @@ msgstr "在此電腦"
 msgid "Personal"
 msgstr "個人"
 
-# addressbook/gui/component/addressbook-config.c:148
 #. Create the LDAP source group
 #: ../addressbook/gui/component/addressbook-component.c:159
 #: ../addressbook/gui/component/addressbook-migrate.c:501
@@ -725,7 +630,6 @@ msgstr "在 LDAP 伺服器"
 msgid "_Contact"
 msgstr "連絡人(_C)"
 
-# ui/evolution-addressbook.xml.h:2
 #: ../addressbook/gui/component/addressbook-component.c:228
 msgid "Create a new contact"
 msgstr "建立新的連絡人"
@@ -734,12 +638,10 @@ msgstr "建立新的連絡人"
 msgid "Contact _List"
 msgstr "連絡人清單(_L)"
 
-# ui/evolution-addressbook.xml.h:2
 #: ../addressbook/gui/component/addressbook-component.c:236
 msgid "Create a new contact list"
 msgstr "建立新的連絡人清單"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/addressbook-component.c:242
 #: ../addressbook/gui/component/addressbook-config.c:1205
 msgid "New Address Book"
@@ -749,7 +651,6 @@ msgstr "新通訊錄"
 msgid "Address _Book"
 msgstr "通訊錄(_B)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../addressbook/gui/component/addressbook-component.c:244
 msgid "Create a new address book"
 msgstr "建立新通訊錄"
@@ -758,7 +659,6 @@ msgstr "建立新通訊錄"
 msgid "Failed upgrading Address Book settings or folders."
 msgstr "升級通訊錄設定值或資料夾失敗。"
 
-# addressbook/gui/component/addressbook-config.c:177
 #: ../addressbook/gui/component/addressbook-config.c:332
 msgid "Base"
 msgstr "基本"
@@ -791,44 +691,34 @@ msgstr "一般"
 msgid "Address Book"
 msgstr "通訊錄"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../addressbook/gui/component/addressbook-config.c:989
 msgid "Server Information"
 msgstr "伺服器資訊"
 
-# mail/mail-config.glade.h:10
 #: ../addressbook/gui/component/addressbook-config.c:991
 msgid "Authentication"
 msgstr "驗證"
 
-# addressbook/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../addressbook/gui/component/addressbook-config.c:994
 #: ../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/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
 #: ../addressbook/gui/component/addressbook-config.c:995
 #: ../mail/em-folder-browser.c:802
 msgid "Searching"
 msgstr "搜尋中"
 
-# mail/mail-ops.c:898
 #: ../addressbook/gui/component/addressbook-config.c:997
 msgid "Downloading"
 msgstr "下載中"
 
-# addressbook/gui/component/addressbook-config.glade.h:2
 #: ../addressbook/gui/component/addressbook-config.c:1203
 #: ../addressbook/gui/component/ldap-config.glade.h:13
 msgid "Address Book Properties"
 msgstr "通訊錄內容"
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
 #: ../addressbook/gui/component/addressbook-migrate.c:73
 #: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1202
 msgid "Migrating..."
@@ -840,12 +730,10 @@ msgstr "正在移轉..."
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
 
-# addressbook/gui/component/addressbook-config.c:148
 #: ../addressbook/gui/component/addressbook-migrate.c:629
 msgid "LDAP Servers"
 msgstr "LDAP 伺服器"
 
-# mail/mail-config.glade.h:76
 #: ../addressbook/gui/component/addressbook-migrate.c:744
 msgid "Autocompletion Settings"
 msgstr "自動完成設定"
@@ -911,7 +799,6 @@ msgstr "資料夾名稱不能包含斜線。"
 msgid "A Folder with this name already exists"
 msgstr "以此為名的資料夾已存在"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/addressbook-view.c:956
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
@@ -930,18 +817,10 @@ msgstr "新增通訊錄(_N)"
 msgid "_Delete"
 msgstr "刪除(_D)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/component/addressbook-view.c:959
 msgid "Save As Vcard..."
 msgstr "儲存為 VCard..."
 
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
 #: ../addressbook/gui/component/addressbook-view.c:961
 #: ../calendar/gui/calendar-component.c:582
 #: ../calendar/gui/memos-component.c:454 ../calendar/gui/tasks-component.c:444
@@ -961,14 +840,12 @@ msgstr "正以匿名方式存取 LDAP 伺服器"
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
-# camel/camel-smime-context.c:194
 #: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:479
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "輸入 %s (使用者 %s) 的密碼 "
 
-# mail/mail-config.glade.h:76
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "Autocomplete length"
 msgstr "自動完成長度"
@@ -987,7 +864,6 @@ msgid ""
 "preview pane, in pixels."
 msgstr "垂直窗格的位置，在名片、清單檢視與預覽窗格之間，以像素計。"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:5
 msgid "Show preview pane"
 msgstr "顯示預覽窗格"
@@ -1006,13 +882,11 @@ msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 msgid "URI for the folder last used in the select names dialog."
 msgstr "上次用於選取名稱對話方塊的資料夾 URI"
 
-# calendar/gui/e-calendar-table.c:156
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:9
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:68
 msgid "Vertical pane position"
 msgstr "垂直窗格位置"
 
-# ui/evolution.xml.h:32
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:10
 msgid "Whether to show the preview pane."
 msgstr "是否顯示預覽窗格。"
@@ -1037,7 +911,6 @@ msgstr "5"
 msgid "636"
 msgstr "636"
 
-# mail/mail-config.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:6
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:1
 msgid "<b>Authentication</b>"
@@ -1047,18 +920,14 @@ msgstr "<b>驗證</b>"
 msgid "<b>Display</b>"
 msgstr "<b>顯示</b>"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../addressbook/gui/component/ldap-config.glade.h:8
 msgid "<b>Downloading</b>"
 msgstr "<b>下載中</b>"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
 #: ../addressbook/gui/component/ldap-config.glade.h:9
 msgid "<b>Searching</b>"
 msgstr "<b>搜尋中</b>"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../addressbook/gui/component/ldap-config.glade.h:10
 msgid "<b>Server Information</b>"
 msgstr "<b>伺服器資訊</b>"
@@ -1067,7 +936,6 @@ msgstr "<b>伺服器資訊</b>"
 msgid "<b>Type:</b>"
 msgstr "<b>類型:</b>"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/ldap-config.glade.h:12
 msgid "Add Address Book"
 msgstr "新增通訊錄"
@@ -1077,7 +945,6 @@ msgstr "新增通訊錄"
 msgid "Always"
 msgstr "永遠"
 
-# camel/camel-sasl-anonymous.c:33
 #: ../addressbook/gui/component/ldap-config.glade.h:15
 msgid "Anonymously"
 msgstr "匿名"
@@ -1090,7 +957,6 @@ msgstr "基本"
 msgid "Distinguished name"
 msgstr "可辨識名稱"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/gui/component/ldap-config.glade.h:19
 msgid "Email address"
 msgstr "電子郵件地址"
@@ -1108,15 +974,11 @@ msgstr "尋找可能的搜尋基礎"
 msgid "Lo_gin:"
 msgstr "登入(_G):"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:24
 #: ../mail/em-account-editor.c:776
 msgid "Never"
 msgstr "永不"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #. Translators: This string is a "Use secure connection" option for
 #. the Mailer. It will not use an encrypted connection.
 #: ../addressbook/gui/component/ldap-config.glade.h:25
@@ -1124,7 +986,6 @@ msgstr "永不"
 msgid "No encryption"
 msgstr "沒有加密"
 
-# addressbook/gui/component/addressbook-config.c:179
 #: ../addressbook/gui/component/ldap-config.glade.h:26
 msgid "One"
 msgstr "一層"
@@ -1137,7 +998,6 @@ msgstr "一層"
 msgid "SSL encryption"
 msgstr "SSL 加密"
 
-# mail/mail-account-gui.c:682
 #: ../addressbook/gui/component/ldap-config.glade.h:28
 msgid "Search Filter"
 msgstr "搜尋過濾器"
@@ -1146,12 +1006,10 @@ msgstr "搜尋過濾器"
 msgid "Search _base:"
 msgstr "搜尋起點(_B):"
 
-# mail/mail-account-gui.c:682
 #: ../addressbook/gui/component/ldap-config.glade.h:30
 msgid "Search _filter:"
 msgstr "搜尋過濾器(_F):"
 
-# mail/mail-search.c:299
 #: ../addressbook/gui/component/ldap-config.glade.h:31
 msgid "Search filter"
 msgstr "搜尋過濾器"
@@ -1161,36 +1019,27 @@ msgid ""
 "Search filter is the type of the objects searched for, while performing the "
 "search. If this is not modified, by  default search will be performed on "
 "objectclass of the type \"person\"."
-msgstr ""
-"搜尋過濾器是在進行搜尋時使用的物件類型。如果此項沒有被修改，預設的搜尋目標是"
-"「person」物件類型。"
+msgstr "搜尋過濾器是在進行搜尋時使用的物件類型。如果此項沒有被修改，預設的搜尋目標是「person」物件類型。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports SSL."
-msgstr ""
-"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
-"援 SSL)。"
+msgstr "選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支援 SSL)。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:34
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if your LDAP server supports TLS."
-msgstr ""
-"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
-"援 TLS)。"
+msgstr "選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支援 TLS)。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:35
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS. This means that your connection will be insecure, and that you will be "
 "vulnerable to security exploits."
-msgstr ""
-"選取此選項表示，您的伺服器不支援 SSL 或 TLS。這表示您的連線將不安全，而且您的"
-"安全有漏洞。 "
+msgstr "選取此選項表示，您的伺服器不支援 SSL 或 TLS。這表示您的連線將不安全，而且您的安全有漏洞。 "
 
-# calendar/gui/print.c:362
 #: ../addressbook/gui/component/ldap-config.glade.h:36
 msgid "Sub"
 msgstr "子目錄"
@@ -1212,9 +1061,7 @@ msgid ""
 "The search base is the distinguished name (DN) of the entry where your "
 "searches will begin. If you leave this blank, the search will begin at the "
 "root of the directory tree."
-msgstr ""
-"搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目"
-"錄樹的底層開始。"
+msgstr "搜尋基礎是指項目的可辨識名稱 (DN)，搜尋會由此處開始。如果此處空白，搜尋會在目錄樹的底層開始。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
@@ -1222,9 +1069,7 @@ msgid ""
 "the directory tree. A search scope of \"sub\" will include all entries below "
 "your search base. A search scope of \"one\" will only include the entries "
 "one level beneath your base."
-msgstr ""
-"搜尋範圍會定義您想從網路目錄樹往下延伸搜尋的深度。\"sub\" 的搜尋範圍會包括搜"
-"尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
+msgstr "搜尋範圍會定義您想從網路目錄樹往下延伸搜尋的深度。\"sub\" 的搜尋範圍會包括搜尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
 msgid ""
@@ -1243,31 +1088,25 @@ msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
-msgstr ""
-"這是 Evolution 將要用來驗證您的方法。注意要設定此項至「電子郵件位址」需要您"
-"的 LDAP 伺服器的匿名存取。"
+msgstr "這是 Evolution 將要用來驗證您的方法。注意要設定此項至「電子郵件位址」需要您的 LDAP 伺服器的匿名存取。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:44
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list. It is for display purposes only. "
-msgstr ""
-"這是此伺服器的名稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
+msgstr "這是此伺服器的名稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:45
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. A "
 "list of standard ports has been provided. Ask your system administrator what "
 "port you should specify."
-msgstr ""
-"這是 LDAP 伺服器上的埠，Evolution 會嘗試連線到這個地方。已提供標準埠清單。請"
-"洽詢您的系統管理員，瞭解您應該指定的埠。"
+msgstr "這是 LDAP 伺服器上的埠，Evolution 會嘗試連線到這個地方。已提供標準埠清單。請洽詢您的系統管理員，瞭解您應該指定的埠。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:46
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/gui/component/ldap-config.glade.h:47
 msgid "Using email address"
 msgstr "使用電子郵件位址"
@@ -1276,7 +1115,6 @@ msgstr "使用電子郵件位址"
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/component/ldap-config.glade.h:49
 msgid "_Add Address Book"
 msgstr "新增通訊錄(_A)"
@@ -1323,10 +1161,6 @@ msgstr "逾時時間(_T):"
 msgid "_Use secure connection:"
 msgstr "使用安全連線(_U):"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/gui/component/ldap-config.glade.h:59
 msgid "cards"
 msgstr "名片"
@@ -1342,7 +1176,6 @@ msgstr "名片"
 msgid "minutes"
 msgstr "分鐘"
 
-# mail/mail-config.glade.h:65
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:1
 msgid "<b>Email</b>"
 msgstr "<b>電子郵件</b>"
@@ -1351,7 +1184,6 @@ msgstr "<b>電子郵件</b>"
 msgid "<b>Home</b>"
 msgstr "<b>住家</b>"
 
-# mail/mail-callbacks.c:1407
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:3
 msgid "<b>Instant Messaging</b>"
 msgstr "<b>即時訊息</b>"
@@ -1360,7 +1192,6 @@ msgstr "<b>即時訊息</b>"
 msgid "<b>Job</b>"
 msgstr "<b>工作</b>"
 
-# mail/mail-config.glade.h:65
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:5
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>其他</b>"
@@ -1373,12 +1204,10 @@ msgstr "<b>其他</b>"
 msgid "<b>Telephone</b>"
 msgstr "<b>電話</b>"
 
-# mail/mail-config.glade.h:65
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:8
 msgid "<b>Web Addresses</b>"
 msgstr "<b>網址</b>"
 
-# ui/evolution-calendar.xml.h:35
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:9
 msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
@@ -1389,7 +1218,6 @@ msgstr "<b>工作</b>"
 msgid "AIM"
 msgstr "AIM"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../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
@@ -1398,7 +1226,6 @@ msgstr "AIM"
 msgid "Contact"
 msgstr "連絡人"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../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
@@ -1410,18 +1237,15 @@ msgstr "連絡人編輯器"
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-# addressbook/printing/e-contact-print.glade.h:25
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Image"
 msgstr "圖片"
 
-# ui/evolution-mail.xml.h:109
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:15
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:68
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-# mail/mail-config.glade.h:29
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:16
 msgid "Mailing Address"
 msgstr "郵寄地址"
@@ -1430,13 +1254,11 @@ msgstr "郵寄地址"
 msgid "Ni_ckname:"
 msgstr "暱稱(_C):"
 
-# shell/e-shortcuts-view.c:137
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:18
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:64
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-# mail/mail-config.glade.h:47
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 msgid "Personal Information"
 msgstr "個人資訊"
@@ -1461,24 +1283,18 @@ msgstr "工作"
 msgid "_Address:"
 msgstr "地址(_A):"
 
-# addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "_Anniversary:"
 msgstr "週年紀念日(_A):"
 
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:25
 msgid "_Assistant:"
 msgstr "助理(_A):"
 
-# addressbook/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:26
 msgid "_Birthday:"
 msgstr "生日(_B):"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:27
 #: ../calendar/gui/dialogs/event-page.c:875
 #: ../calendar/gui/dialogs/event-page.glade.h:15
@@ -1490,22 +1306,18 @@ msgstr "行事曆(_C):"
 msgid "_Categories..."
 msgstr "分類(_C)..."
 
-# addressbook/contact-editor/fulladdr.glade.h:8
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
 msgid "_City:"
 msgstr "縣/市(_C):"
 
-# addressbook/contact-editor/e-contact-editor.c:1248
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "_Company:"
 msgstr "公司(_C):"
 
-# addressbook/contact-editor/fulladdr.glade.h:4
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "_Country:"
 msgstr "國家/地區(_C):"
 
-# addressbook/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "_Department:"
 msgstr "部門(_D):"
@@ -1514,28 +1326,22 @@ msgstr "部門(_D):"
 msgid "_File under:"
 msgstr "歸檔為(_F):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:34
 msgid "_Free/Busy:"
 msgstr "空閒/忙碌(_F):"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:35
 msgid "_Home Page:"
 msgstr "首頁(_H):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:36
 msgid "_Manager:"
 msgstr "主管(_M):"
 
-# addressbook/contact-editor/contact-editor.glade.h:12
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:37
 msgid "_Notes:"
 msgstr "備註(_N):"
 
-# addressbook/contact-editor/contact-editor.glade.h:31
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "_Office:"
 msgstr "辦公室(_O):"
@@ -1545,12 +1351,10 @@ msgstr "辦公室(_O):"
 msgid "_PO Box:"
 msgstr "郵箱(_P):"
 
-# addressbook/contact-editor/contact-editor.glade.h:32
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "_Profession:"
 msgstr "職業(_P):"
 
-# addressbook/contact-editor/contact-editor.glade.h:33
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "_Spouse:"
 msgstr "配偶(_S):"
@@ -1560,21 +1364,20 @@ msgstr "配偶(_S):"
 msgid "_State/Province:"
 msgstr "州/省(_S):"
 
+# (Abel) 職稱和輸入連絡人時的 Title (Dr., Ms.) 有衝突
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:43
 #: ../addressbook/gui/contact-editor/fullname.glade.h:17
 msgid "_Title:"
-msgstr "職稱(_T):"
+msgstr "頭銜(_T):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "_Video Chat:"
 msgstr "視訊交談(_V):"
 
-# addressbook/contact-editor/contact-editor.glade.h:15
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Wants to receive HTML mail"
-msgstr "想接收 HTML 郵件(_W)"
+msgstr "可接受 H_TML 郵件"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_Web Log:"
 msgstr "網誌(_W):"
@@ -1584,7 +1387,6 @@ msgstr "網誌(_W):"
 msgid "_Where:"
 msgstr "通訊錄(_W):"
 
-# addressbook/contact-editor/fulladdr.glade.h:11
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "_Zip/Postal Code:"
 msgstr "郵遞區號(_Z):"
@@ -1809,7 +1611,6 @@ msgstr "哥倫比亞"
 msgid "Comoros"
 msgstr "葛摩"
 
-# mail/mail-ops.c:917
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:186
 msgid "Congo"
 msgstr "剛果共和國"
@@ -2174,7 +1975,6 @@ msgstr "茅利塔尼亞"
 msgid "Mauritius"
 msgstr "模里西斯"
 
-# calendar/gui/goto-dialog.glade.h:11
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:277
 msgid "Mayotte"
 msgstr "美亞特"
@@ -2191,8 +1991,6 @@ msgstr "密克羅尼西亞"
 msgid "Moldova, Republic Of"
 msgstr "摩爾多瓦"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
-# calendar/gui/event-editor.c:475
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:281
 msgid "Monaco"
 msgstr "摩納哥"
@@ -2289,7 +2087,6 @@ msgstr "帛琉群島"
 msgid "Palestinian Territory"
 msgstr "巴勒斯坦地區"
 
-# addressbook/contact-editor/fulladdr.glade.h:2
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:305
 msgid "Panama"
 msgstr "巴拿馬"
@@ -2302,7 +2099,6 @@ msgstr "巴布亞紐幾內亞"
 msgid "Paraguay"
 msgstr "巴拉圭"
 
-# addressbook/printing/e-contact-print.glade.h:27
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:308
 msgid "Peru"
 msgstr "秘魯"
@@ -2311,7 +2107,6 @@ msgstr "秘魯"
 msgid "Philippines"
 msgstr "菲律賓"
 
-# ui/evolution-calendar.xml.h:25
 #: ../addressbook/gui/contact-editor/e-contact-editor-address.c:310
 msgid "Pitcairn"
 msgstr "皮特康"
@@ -2597,12 +2392,10 @@ msgstr "辛巴威"
 msgid "Name"
 msgstr "名稱"
 
-# mail/mail-callbacks.c:1407
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "AOL Instant Messenger"
 msgstr "AOL Instant Messenger"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../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
@@ -2627,7 +2420,6 @@ msgstr "ICQ"
 msgid "Service"
 msgstr "服務"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../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
@@ -2635,21 +2427,16 @@ msgstr "服務"
 msgid "Location"
 msgstr "位置"
 
-# mail/mail-config.glade.h:80
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:137
 msgid "Username"
 msgstr "使用者名稱"
 
-# addressbook/contact-editor/e-contact-editor.c:1249
-# addressbook/contact-editor/e-contact-editor.c:1311
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:234
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:205
 #: ../addressbook/gui/widgets/eab-contact-display.c:58
 msgid "Home"
 msgstr "住家"
 
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:242
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:206
 #: ../addressbook/gui/widgets/eab-contact-display.c:59
@@ -2671,13 +2458,11 @@ msgstr "Gadu-Gadu"
 msgid "MSN"
 msgstr "MSN"
 
-# shell/e-shortcuts-view.c:137
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:192
 #: ../addressbook/gui/widgets/eab-contact-display.c:557
 msgid "GroupWise"
 msgstr "GroupWise"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:261
 msgid "Source Book"
 msgstr "來源通訊錄"
@@ -2686,27 +2471,22 @@ msgstr "來源通訊錄"
 msgid "Target Book"
 msgstr "目標通訊錄"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:282
 msgid "Is New Contact"
 msgstr "是新連絡人"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:289
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:571
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:296
 msgid "Required Fields"
 msgstr "必要欄位"
 
-# addressbook/contact-editor/e-contact-editor.c:1247
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 msgid "Changed"
 msgstr "已變更"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:562
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2412
 #, c-format
@@ -2715,12 +2495,11 @@ msgstr "連絡人編輯器 - %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2792
 msgid "Please select an image for this contact"
-msgstr "請選取此連絡人的影像"
+msgstr "請選取代表此連絡人的圖片"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:2793
 msgid "_No image"
-msgstr "沒有影像(_N)"
+msgstr "沒有圖片(_N)"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3097
 msgid ""
@@ -2746,13 +2525,10 @@ msgstr "%s「%s」含有無效的格式"
 msgid "%s'%s' is empty"
 msgstr "%s「%s」是空的"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3149
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
-# addressbook/contact-editor/e-contact-quick-add.c:233
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:290
 msgid "Contact Quick-Add"
 msgstr "快速新增連絡人"
@@ -2761,7 +2537,6 @@ msgstr "快速新增連絡人"
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
-# mail/mail-config.glade.h:31
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
 msgid "_Full name"
 msgstr "全名(_F)"
@@ -2770,13 +2545,10 @@ msgstr "全名(_F)"
 msgid "E_mail"
 msgstr "電子郵件(_M)"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:359
 msgid "_Select Address Book"
 msgstr "選擇通訊錄(_S)"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
@@ -2786,8 +2558,6 @@ msgstr ""
 "確定要刪除\n"
 "連絡人清單 (%s)？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
@@ -2796,8 +2566,6 @@ msgstr ""
 "您確定要刪除\n"
 "這些連絡人清單？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
@@ -2807,8 +2575,6 @@ msgstr ""
 "確定要刪除\n"
 "連絡人 (%s)？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
@@ -2829,7 +2595,6 @@ msgstr "縣/市(_T):"
 msgid "Countr_y:"
 msgstr "國家(_Y):"
 
-# addressbook/backend/ebook/e-card.c:3346
 #: ../addressbook/gui/contact-editor/fulladdr.glade.h:4
 msgid "Full Address"
 msgstr "完整地址"
@@ -2838,64 +2603,51 @@ msgstr "完整地址"
 msgid "_ZIP Code:"
 msgstr "郵遞區號(_Z):"
 
-# addressbook/contact-editor/fullname.glade.h:2
 #: ../addressbook/gui/contact-editor/fullname.glade.h:1
 msgid "Dr."
 msgstr "Dr."
 
-# addressbook/contact-editor/fullname.glade.h:3
 #: ../addressbook/gui/contact-editor/fullname.glade.h:2
 msgid "Esq."
 msgstr "Esq."
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/contact-editor/fullname.glade.h:3
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "Full Name"
 msgstr "全名"
 
-# addressbook/contact-editor/fullname.glade.h:4
 #: ../addressbook/gui/contact-editor/fullname.glade.h:4
 msgid "I"
 msgstr "I"
 
-# addressbook/contact-editor/fullname.glade.h:5
 #: ../addressbook/gui/contact-editor/fullname.glade.h:5
 msgid "II"
 msgstr "II"
 
-# addressbook/contact-editor/fullname.glade.h:6
 #: ../addressbook/gui/contact-editor/fullname.glade.h:6
 msgid "III"
 msgstr "III"
 
-# addressbook/contact-editor/fullname.glade.h:7
 #: ../addressbook/gui/contact-editor/fullname.glade.h:7
 msgid "Jr."
 msgstr "Jr."
 
-# addressbook/contact-editor/fullname.glade.h:8
 #: ../addressbook/gui/contact-editor/fullname.glade.h:8
 msgid "Miss"
 msgstr "Miss"
 
-# addressbook/contact-editor/fullname.glade.h:9
 #: ../addressbook/gui/contact-editor/fullname.glade.h:9
 msgid "Mr."
 msgstr "Mr."
 
-# addressbook/contact-editor/fullname.glade.h:10
 #: ../addressbook/gui/contact-editor/fullname.glade.h:10
 msgid "Mrs."
 msgstr "Mrs."
 
-# addressbook/contact-editor/fullname.glade.h:11
 #: ../addressbook/gui/contact-editor/fullname.glade.h:11
 msgid "Ms."
 msgstr "Ms."
 
-# addressbook/contact-editor/fullname.glade.h:12
 #: ../addressbook/gui/contact-editor/fullname.glade.h:12
 msgid "Sr."
 msgstr "Sr."
@@ -2916,7 +2668,6 @@ msgstr "(_Middle):"
 msgid "_Suffix:"
 msgstr "(_Suffix):"
 
-# mail/mail-config.glade.h:6
 #: ../addressbook/gui/contact-editor/im.glade.h:1
 msgid "Add IM Account"
 msgstr "新增 IM 帳號"
@@ -2945,7 +2696,6 @@ msgstr "\n"
 msgid "Add an email to the List"
 msgstr "新增電子郵件到清單"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:938
 msgid "Contact List Editor"
@@ -2955,12 +2705,10 @@ msgstr "連絡人清單編輯器"
 msgid "Insert email addresses from Address Book"
 msgstr "從通訊錄插入電子郵件位址"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
 msgid "Members"
 msgstr "會員"
 
-# composer/e-msg-composer-attachment-bar.c:469
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
 msgid "Remove an email address from the List"
 msgstr "從清單移除電子郵件地址"
@@ -2981,7 +2729,6 @@ msgstr "選取(_S)"
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr "輸入電子郵件地址或拖曳連絡人到以下清單(_T)："
 
-# addressbook/printing/e-contact-print.glade.h:4
 #: ../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
@@ -2991,22 +2738,18 @@ msgstr "輸入電子郵件地址或拖曳連絡人到以下清單(_T)："
 msgid "Book"
 msgstr "書本"
 
-# mail/mail-config.glade.h:45
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:181
 msgid "Is New List"
 msgstr "是新的清單"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:759
 msgid "_Members"
 msgstr "成員(_M)"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:762
 msgid "Contact List Members"
 msgstr "連絡人清單成員"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "變更後的連絡人:"
@@ -3028,12 +2771,10 @@ msgstr ""
 "此連絡人中改變後的電子郵件或名稱已經\n"
 "存在於此資料夾。您無論如何都要新增它嗎？"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:2
 msgid "New Contact:"
 msgstr "新的連絡人:"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../addressbook/gui/merging/eab-contact-duplicate-detected.glade.h:3
 msgid "Original Contact:"
 msgstr "原本的連絡人:"
@@ -3046,8 +2787,6 @@ msgstr ""
 "此連絡人的名稱或電子郵件地址已經存在\n"
 "於此資料夾。您無論如何都要新增它嗎？"
 
-# addressbook/gui/component/addressbook.c:618
-# calendar/gui/gnome-cal.c:233
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
 #: ../addressbook/gui/widgets/e-addressbook-view.c:171
 #: ../calendar/gui/cal-search-bar.c:53
@@ -3064,12 +2803,10 @@ msgstr "電子郵件開始於"
 msgid "Name begins with"
 msgstr "名稱開始於"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "沒有連絡人"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-model.c:151
 #, c-format
 msgid "%d contact"
@@ -3085,12 +2822,10 @@ msgstr[1] "%d 個連絡人"
 msgid "Query"
 msgstr "查詢"
 
-# shell/e-shell-importer.c:384
 #: ../addressbook/gui/widgets/e-addressbook-model.c:446
 msgid "Error getting book view"
 msgstr "取得書本檢視時發生錯誤"
 
-# addressbook/contact-editor/e-contact-editor.c:1253
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:405
 #: ../widgets/table/e-table-click-to-add.c:502
 #: ../widgets/table/e-table-selection-model.c:311
@@ -3101,17 +2836,14 @@ msgstr "取得書本檢視時發生錯誤"
 msgid "Model"
 msgstr "模型"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:103
 msgid "Error modifying card"
 msgstr "編輯名片時發生錯誤"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../addressbook/gui/widgets/e-addressbook-view.c:229
 msgid "Source"
 msgstr "來源"
 
-# mail/mail-config.glade.h:78
 #: ../addressbook/gui/widgets/e-addressbook-view.c:243
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:11
 #: ../calendar/gui/e-calendar-table.etspec.h:13
@@ -3121,10 +2853,6 @@ msgstr "來源"
 msgid "Type"
 msgstr "類型"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/widgets/e-addressbook-view.c:833
 #: ../addressbook/gui/widgets/e-addressbook-view.c:2083
 #: ../ui/evolution-addressbook.xml.h:31
@@ -3139,65 +2867,46 @@ msgstr "儲存為 VCard..."
 msgid "_Open"
 msgstr "開啟(_O)"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../addressbook/gui/widgets/e-addressbook-view.c:958
 msgid "_New Contact..."
 msgstr "新增連絡人(_N)..."
 
-# ui/evolution-addressbook.xml.h:17
 #: ../addressbook/gui/widgets/e-addressbook-view.c:959
 msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:962
 msgid "_Save as VCard..."
-msgstr "儲存成 VCard(_S)..."
+msgstr "儲存成 _VCard..."
 
-# ui/evolution-mail.xml.h:35
 #: ../addressbook/gui/widgets/e-addressbook-view.c:963
 msgid "_Forward Contact"
 msgstr "轉寄連絡人(_F)"
 
-# ui/evolution-mail.xml.h:35
 #: ../addressbook/gui/widgets/e-addressbook-view.c:964
 msgid "_Forward Contacts"
 msgstr "轉寄連絡人(_F)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.c:965
 msgid "Send _Message to Contact"
 msgstr "傳送郵件給連絡人(_M)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 msgid "Send _Message to List"
 msgstr "傳送郵件給清單(_M)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../addressbook/gui/widgets/e-addressbook-view.c:967
 msgid "Send _Message to Contacts"
 msgstr "傳送郵件給連絡人(_M)"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
 #: ../addressbook/gui/widgets/e-addressbook-view.c:968
 msgid "_Print"
 msgstr "列印(_P)"
 
-# addressbook/contact-editor/contact-editor.glade.h:18
 #: ../addressbook/gui/widgets/e-addressbook-view.c:971
 msgid "Cop_y to Address Book..."
 msgstr "複製到通訊錄(_Y)..."
 
-# addressbook/contact-editor/contact-editor.glade.h:18
 #: ../addressbook/gui/widgets/e-addressbook-view.c:972
 msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
@@ -3222,71 +2931,56 @@ msgstr "剪下(_T)"
 msgid "_Copy"
 msgstr "複製(_C)"
 
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
 #: ../addressbook/gui/widgets/e-addressbook-view.c:977
 msgid "P_aste"
 msgstr "貼上(_A)"
 
-# calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1602
 #: ../calendar/gui/cal-search-bar.c:357
 msgid "Any Category"
 msgstr "任何分類"
 
-# ui/evolution-calendar.xml.h:25
 #. FIXME: Allow range selection in table views, as in minicard view
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1801
 msgid "Print cards"
 msgstr "列印名片"
 
-# shell/e-storage.c:467
 #. E_BOOK_ERROR_OTHER_ERROR
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1908
 #: ../addressbook/gui/widgets/eab-gui-util.c:70
 msgid "Other error"
 msgstr "其他錯誤"
 
-# addressbook/contact-editor/e-contact-editor.c:1242
-# addressbook/gui/widgets/e-addressbook-view.c:733
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:1
 #: ../addressbook/gui/widgets/eab-contact-display.c:576
 msgid "Assistant"
 msgstr "助理"
 
-# addressbook/gui/widgets/e-addressbook-view.c:703
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:2
 msgid "Assistant Phone"
 msgstr "助理電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1245
-# addressbook/gui/widgets/e-addressbook-view.c:713
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:3
 msgid "Business Fax"
 msgstr "商務傅真"
 
-# addressbook/gui/widgets/e-addressbook-view.c:704
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:4
 msgid "Business Phone"
 msgstr "商務電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:715
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Business Phone 2"
 msgstr "商務電話 2"
 
-# addressbook/gui/widgets/e-addressbook-view.c:705
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Callback Phone"
 msgstr "回撥電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:712
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Car Phone"
 msgstr "汽車電話"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:8
 #: ../calendar/gui/dialogs/event-page.glade.h:7
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
@@ -3295,64 +2989,48 @@ msgstr "汽車電話"
 msgid "Categories"
 msgstr "分類"
 
-# addressbook/gui/widgets/e-addressbook-view.c:706
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:9
 msgid "Company Phone"
 msgstr "公司電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: ../addressbook/gui/widgets/eab-contact-display.c:785
 #: ../smime/lib/e-cert.c:827
 msgid "Email"
 msgstr "電子郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/gui/widgets/e-addressbook-view.c:725
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:11
 msgid "Email 2"
 msgstr "電子郵件 2"
 
-# addressbook/contact-editor/e-contact-editor.c:1286
-# addressbook/gui/widgets/e-addressbook-view.c:726
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email 3"
 msgstr "電子郵件 3"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "姓"
 
-# addressbook/gui/widgets/e-addressbook-view.c:699
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:14
 msgid "File As"
 msgstr "歸檔為"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:16
 msgid "Given Name"
 msgstr "名"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:17
 msgid "Home Fax"
 msgstr "住家傳真"
 
-# addressbook/gui/widgets/e-addressbook-view.c:707
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:18
 msgid "Home Phone"
 msgstr "住家電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:716
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:19
 msgid "Home Phone 2"
 msgstr "住家電話 2"
 
-# mail/mail-config.glade.h:25
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "ISDN Phone"
 msgstr "ISDN 電話"
@@ -3361,65 +3039,51 @@ msgstr "ISDN 電話"
 msgid "Journal"
 msgstr "日誌"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:22
 #: ../addressbook/gui/widgets/eab-contact-display.c:575
 msgid "Manager"
 msgstr "主管"
 
-# addressbook/gui/widgets/e-addressbook-view.c:711
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 #: ../addressbook/gui/widgets/eab-contact-display.c:596
 msgid "Mobile Phone"
 msgstr "行動電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:734
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 #: ../addressbook/gui/widgets/eab-contact-display.c:550
 msgid "Nickname"
 msgstr "暱稱"
 
-# addressbook/gui/widgets/e-addressbook-view.c:736
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 #: ../addressbook/gui/widgets/eab-contact-display.c:609
 msgid "Note"
 msgstr "備註"
 
-# addressbook/gui/widgets/e-addressbook-view.c:729
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "辦公室"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 #: ../addressbook/gui/widgets/eab-contact-display.c:571
 msgid "Organization"
 msgstr "團體"
 
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它傳真"
 
-# addressbook/gui/widgets/e-addressbook-view.c:718
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:29
 msgid "Other Phone"
 msgstr "其它電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:30
 msgid "Pager"
 msgstr "呼叫器"
 
-# addressbook/gui/widgets/e-addressbook-view.c:702
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:31
 msgid "Primary Phone"
 msgstr "主要電話"
 
-# addressbook/contact-editor/e-contact-editor.c:1258
-# addressbook/gui/widgets/e-addressbook-view.c:721
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:32
 msgid "Radio"
 msgstr "無線電電話"
@@ -3432,13 +3096,11 @@ msgstr "無線電電話"
 msgid "Role"
 msgstr "角色"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 #: ../addressbook/gui/widgets/eab-contact-display.c:600
 msgid "Spouse"
 msgstr "配偶"
 
-# addressbook/contact-editor/e-contact-editor.c:1260
 #. Translators: This is a vcard standard and stands for the type of
 #. phone used by the hearing impaired. TTY stands for "teletype"
 #. (familiar from Unix device names), and TDD is "Telecommunications
@@ -3449,28 +3111,22 @@ msgstr "配偶"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-# addressbook/contact-editor/e-contact-editor.c:1259
-# addressbook/gui/widgets/e-addressbook-view.c:722
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:42
 msgid "Telex"
 msgstr "電報"
 
-# addressbook/gui/widgets/e-addressbook-view.c:730
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
 msgid "Title"
 msgstr "頭銜"
 
-# mail/message-list.c:677
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Unit"
 msgstr "單位"
 
-# addressbook/gui/widgets/e-addressbook-view.c:727
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Web Site"
 msgstr "網址"
 
-# addressbook/printing/e-contact-print.glade.h:41
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:149
 #: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
@@ -3487,7 +3143,6 @@ msgstr "網址"
 msgid "Width"
 msgstr "寬度"
 
-# addressbook/printing/e-contact-print.glade.h:15
 #: ../addressbook/gui/widgets/e-minicard-label.c:122
 #: ../addressbook/gui/widgets/e-minicard.c:156
 #: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
@@ -3508,13 +3163,10 @@ msgstr "高度"
 msgid "Has Focus"
 msgstr "得到焦點"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "欄位"
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../addressbook/gui/widgets/e-minicard-label.c:143
 msgid "Field Name"
 msgstr "欄位名稱"
@@ -3531,7 +3183,6 @@ msgstr "最大欄位名稱長度"
 msgid "Column Width"
 msgstr "欄寬"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
 #: ../addressbook/gui/widgets/e-minicard-view.c:174
 msgid ""
 "\n"
@@ -3546,7 +3197,6 @@ msgstr ""
 "\n"
 "雙擊這裡以建立新的連絡人。"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
 #: ../addressbook/gui/widgets/e-minicard-view.c:177
 msgid ""
 "\n"
@@ -3561,7 +3211,6 @@ msgstr ""
 "\n"
 "雙擊這裡以建立新的連絡人。"
 
-# ui/evolution-addressbook.xml.h:19
 #: ../addressbook/gui/widgets/e-minicard-view.c:182
 msgid ""
 "\n"
@@ -3572,7 +3221,6 @@ msgstr ""
 "\n"
 "尋找連絡人。"
 
-# addressbook/gui/widgets/e-minicard-view.c:216
 #: ../addressbook/gui/widgets/e-minicard-view.c:184
 msgid ""
 "\n"
@@ -3587,19 +3235,14 @@ msgstr ""
 msgid "Adapter"
 msgstr "轉接器"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
 #: ../addressbook/gui/widgets/e-minicard.c:101
 msgid "Work Email"
 msgstr "工作電子郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/e-minicard.c:102
 msgid "Home Email"
 msgstr "住家電子郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
 #: ../addressbook/gui/widgets/e-minicard.c:103
 msgid "Other Email"
 msgstr "其它電子郵件"
@@ -3608,9 +3251,6 @@ msgstr "其它電子郵件"
 msgid "Selected"
 msgstr "已選擇"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../addressbook/gui/widgets/e-minicard.c:179
 msgid "Has Cursor"
 msgstr "有游標"
@@ -3624,7 +3264,6 @@ msgstr "在瀏覽器內開啟連結(_O)"
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
 
-# ui/evolution-contact-editor.xml.h:13
 #: ../addressbook/gui/widgets/eab-contact-display.c:176
 msgid "_Send New Message To ..."
 msgstr "傳送新郵件至(_S)..."
@@ -3644,24 +3283,20 @@ msgstr "(映射)"
 msgid "map"
 msgstr "對映"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../addressbook/gui/widgets/eab-contact-display.c:462
 #: ../addressbook/gui/widgets/eab-contact-display.c:763
 msgid "List Members"
 msgstr "清單成員"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "E-mail"
 msgstr "電子郵件"
 
-# addressbook/contact-editor/contact-editor.glade.h:24
 #: ../addressbook/gui/widgets/eab-contact-display.c:572
 msgid "Department"
 msgstr "部門"
 
-# addressbook/contact-editor/contact-editor.glade.h:32
 #: ../addressbook/gui/widgets/eab-contact-display.c:573
 msgid "Profession"
 msgstr "職業"
@@ -3674,8 +3309,6 @@ msgstr "位置"
 msgid "Video Chat"
 msgstr "視訊交談"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../addressbook/gui/widgets/eab-contact-display.c:578
 #: ../calendar/gui/calendar-commands.c:119
 #: ../calendar/gui/calendar-component.c:752
@@ -3691,7 +3324,6 @@ msgstr "視訊交談"
 msgid "Calendar"
 msgstr "行事曆"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../addressbook/gui/widgets/eab-contact-display.c:579
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:591
@@ -3699,7 +3331,6 @@ msgstr "行事曆"
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-# mail/mail-config.glade.h:25
 #: ../addressbook/gui/widgets/eab-contact-display.c:580
 #: ../addressbook/gui/widgets/eab-contact-display.c:595
 msgid "Phone"
@@ -3709,34 +3340,26 @@ msgstr "電話"
 msgid "Fax"
 msgstr "傳真"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/eab-contact-display.c:592
 msgid "Home Page"
 msgstr "首頁"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../addressbook/gui/widgets/eab-contact-display.c:593
 msgid "Web Log"
 msgstr "網誌"
 
-# addressbook/contact-editor/contact-editor.glade.h:20
 #: ../addressbook/gui/widgets/eab-contact-display.c:598
 msgid "Birthday"
 msgstr "生日"
 
-# addressbook/contact-editor/contact-editor.glade.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:599
 msgid "Anniversary"
 msgstr "週年紀念日"
 
-# addressbook/contact-editor/contact-editor.glade.h:27
 #: ../addressbook/gui/widgets/eab-contact-display.c:781
 msgid "Job Title"
 msgstr "職稱"
 
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
 #: ../addressbook/gui/widgets/eab-contact-display.c:812
 msgid "Home page"
 msgstr "首頁"
@@ -3756,28 +3379,21 @@ msgstr "成功"
 msgid "Backend busy"
 msgstr "後端忙碌"
 
-# shell/e-shell-view-menu.c:602
-# shell/e-shell-view-menu.c:614
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
 #: ../addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "資料庫離線"
 
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
 #. E_BOOK_ERROR_NO_SUCH_BOOK
 #: ../addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "通訊錄不存在"
 
-# ui/evolution-addressbook.xml.h:17
 #. E_BOOK_ERROR_NO_SELF_CONTACT
 #: ../addressbook/gui/widgets/eab-gui-util.c:55
 msgid "No Self Contact defined"
 msgstr "沒有定義自我連絡人"
 
-# shell/e-storage.c:475
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
@@ -3786,7 +3402,6 @@ msgstr "沒有定義自我連絡人"
 msgid "Permission denied"
 msgstr "權限不足"
 
-# calendar/gui/calendar-commands.c:266
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
 #: ../addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
@@ -3797,18 +3412,11 @@ msgstr "找不到連絡人"
 msgid "Contact ID already exists"
 msgstr "連絡人 ID 已經存在"
 
-# shell/e-storage.c:477
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
 #: ../addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "通訊協定不支援"
 
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
 #. E_BOOK_ERROR_CANCELLED
 #: ../addressbook/gui/widgets/eab-gui-util.c:62
 #: ../calendar/gui/dialogs/task-details-page.glade.h:3
@@ -3819,21 +3427,17 @@ msgstr "通訊協定不支援"
 msgid "Canceled"
 msgstr "已取消"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
 #: ../addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "無法取消"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
 #: ../addressbook/gui/widgets/eab-gui-util.c:64
 #: ../calendar/gui/comp-editor-factory.c:433
 msgid "Authentication Failed"
 msgstr "驗証失敗"
 
-# camel/providers/smtp/camel-smtp-transport.c:218
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
@@ -3844,9 +3448,6 @@ msgstr "要求驗證"
 msgid "TLS not Available"
 msgstr "TLS 無法使用"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
 #: ../addressbook/gui/widgets/eab-gui-util.c:68
@@ -3868,11 +3469,8 @@ 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 ""
-"我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離"
-"線使用。請於上線模式再次讀取通訊錄以下載它的內容"
+msgstr "我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
-# addressbook/gui/component/addressbook.c:458
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
 msgid ""
@@ -3880,24 +3478,19 @@ msgid ""
 "exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且您有權限存取它。"
 
-# addressbook/gui/component/addressbook.c:445
 #: ../addressbook/gui/widgets/eab-gui-util.c:112
 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/component/addressbook.c:450
 #: ../addressbook/gui/widgets/eab-gui-util.c:117
 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 套件。"
+msgstr "此 Evolution 版本未編譯 LDAP 支援。如果您若想在 Evolution 使用 LDAP，必須安裝啟用 LDAP 的 Evolution 套件。"
 
-# addressbook/gui/component/addressbook.c:445
 #: ../addressbook/gui/widgets/eab-gui-util.c:124
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
@@ -3940,33 +3533,27 @@ msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
 msgid "This query did not complete successfully."
 msgstr "這次的查詢並未完全成功。"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 msgid "Error adding list"
 msgstr "新增清單時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:187
 #: ../addressbook/gui/widgets/eab-gui-util.c:704
 msgid "Error adding contact"
 msgstr "新增連絡人時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying list"
 msgstr "編輯清單時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../addressbook/gui/widgets/eab-gui-util.c:198
 msgid "Error modifying contact"
 msgstr "修改連絡人時發生錯誤"
 
-# executive-summary/component/e-summary.c:940
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 msgid "Error removing list"
 msgstr "移除清單時發生錯誤"
 
-# executive-summary/component/e-summary.c:940
 #: ../addressbook/gui/widgets/eab-gui-util.c:210
 #: ../addressbook/gui/widgets/eab-gui-util.c:657
 msgid "Error removing contact"
@@ -3994,10 +3581,8 @@ msgid ""
 "Do you want to overwrite it?"
 msgstr ""
 "%s 已經存在\n"
-"您是否要複寫它？"
+"您是否要覆寫它？"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
 #: ../addressbook/gui/widgets/eab-gui-util.c:327
 msgid "Overwrite"
 msgstr "覆寫"
@@ -4017,7 +3602,6 @@ msgstr[1] "個連絡人"
 msgid "card.vcf"
 msgstr "card.vcf"
 
-# importers/pine-importer.c:661
 #: ../addressbook/gui/widgets/eab-gui-util.c:462
 msgid "Select Address Book"
 msgstr "選擇通訊錄"
@@ -4030,51 +3614,37 @@ msgstr "清單"
 msgid "Move contact to"
 msgstr "將連絡人移到"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../addressbook/gui/widgets/eab-gui-util.c:767
 msgid "Copy contact to"
 msgstr "複製連絡人到"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/gui/widgets/eab-gui-util.c:770
 msgid "Move contacts to"
 msgstr "將連絡人移到"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/gui/widgets/eab-gui-util.c:772
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
-# addressbook/backend/ebook/e-card.c:3745
 #: ../addressbook/gui/widgets/eab-gui-util.c:998
 msgid "Multiple VCards"
 msgstr "多重 VCard"
 
-# addressbook/backend/ebook/e-card.c:3753
 #: ../addressbook/gui/widgets/eab-gui-util.c:1001
 #, c-format
 msgid "VCard for %s"
 msgstr "給 %s 的 VCard"
 
-# mail/mail-config.glade.h:47
 #: ../addressbook/gui/widgets/eab-gui-util.c:1042
 #: ../addressbook/gui/widgets/eab-gui-util.c:1060
 msgid "Contact information"
 msgstr "連絡人資訊"
 
-# mail/mail-config.glade.h:47
 #: ../addressbook/gui/widgets/eab-gui-util.c:1062
 #, c-format
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
 
-# addressbook/gui/widgets/e-minicard-control.c:282
 #: ../addressbook/gui/widgets/eab-popup-control.c:289
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
@@ -4083,39 +3653,30 @@ msgstr "正在查詢通訊錄…"
 #, c-format
 msgid "There is one other contact."
 msgid_plural "There are %d other contacts."
-msgstr[0] "和 1 個其他名片。"
-msgstr[1] "和 %d 個其他名片。"
+msgstr[0] "和另外 1 個連絡人。"
+msgstr[1] "和另外 %d 個連絡人。"
 
-# addressbook/printing/e-contact-print.glade.h:11
 #: ../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/e-addressbook-reflow-adapter.c:135
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:230
-# addressbook/gui/widgets/e-addressbook-view.c:551
-# addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/widgets/eab-vcard-control.c:227
 msgid "Show Compact VCard"
 msgstr "顯示精簡的 VCard"
 
-# addressbook/gui/widgets/e-minicard-control.c:282
 #: ../addressbook/gui/widgets/eab-vcard-control.c:277
 msgid "Save in addressbook"
 msgstr "存入目錄服務"
 
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:25
 msgid "Card View"
 msgstr "名片檢視模式"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../addressbook/gui/widgets/gal-view-factory-treeview.c:26
 msgid "GTK Tree View"
-msgstr "GTK 網路樹檢視"
+msgstr "GTK 樹狀檢視模式"
 
-# shell/e-shell-importer.c:363
 #: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
@@ -4126,7 +3687,6 @@ msgstr "匯入..."
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 與 Tab 匯入程式"
@@ -4143,7 +3703,6 @@ msgstr "Mozilla CSV 與 Tab 匯入程式"
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
@@ -4157,9 +3716,8 @@ msgstr "正在匯入..."
 
 #: ../addressbook/importers/evolution-ldif-importer.c:754
 msgid "LDAP Data Interchange Format (.ldif)"
-msgstr "LDAP 資料互換格式 (.ldif)"
+msgstr "LDAP 資料交換格式 (.ldif)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-ldif-importer.c:755
 msgid "Evolution LDIF importer"
 msgstr "Evolution LDIF 輸入器"
@@ -4168,55 +3726,47 @@ msgstr "Evolution LDIF 輸入器"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf、.gcrd)"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../addressbook/importers/evolution-vcard-importer.c:548
 msgid "Evolution VCard Importer"
 msgstr "Evolution VCard 輸入器"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
+# zh_HK: msgstr "打印信封"
 #: ../addressbook/printing/e-contact-print-envelope.c:213
 #: ../addressbook/printing/e-contact-print-envelope.c:234
 msgid "Print envelope"
 msgstr "列印信封"
 
-# ui/evolution-addressbook.xml.h:11
+# zh_HK: msgstr "打印連絡人"
 #: ../addressbook/printing/e-contact-print.c:849
 msgid "Print contacts"
 msgstr "列印連絡人"
 
-# ui/evolution-addressbook.xml.h:11
+# zh_HK: msgstr "打印連絡人"
 #: ../addressbook/printing/e-contact-print.c:939
 #: ../addressbook/printing/e-contact-print.c:967
 msgid "Print contact"
 msgstr "列印連絡人"
 
-# addressbook/printing/e-contact-print.glade.h:1
 #: ../addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:2
 #: ../addressbook/printing/e-contact-print.glade.h:2
 msgid "8 pt. Tahoma"
 msgstr "8 pt. Tahoma"
 
-# addressbook/printing/e-contact-print.glade.h:3
 #: ../addressbook/printing/e-contact-print.glade.h:3
 msgid "Blank forms at end:"
 msgstr "結尾的空白:"
 
-# addressbook/printing/e-contact-print.glade.h:4
 #: ../addressbook/printing/e-contact-print.glade.h:4
 msgid "Body"
 msgstr "內文"
 
-# addressbook/printing/e-contact-print.glade.h:5
 #: ../addressbook/printing/e-contact-print.glade.h:5
 msgid "Bottom:"
 msgstr "下:"
 
-# addressbook/printing/e-contact-print.glade.h:6
 #: ../addressbook/printing/e-contact-print.glade.h:6
 msgid "Dimensions:"
 msgstr "尺寸:"
@@ -4225,22 +3775,18 @@ msgstr "尺寸:"
 msgid "F_ont..."
 msgstr "字型(_O)..."
 
-# addressbook/printing/e-contact-print.glade.h:8
 #: ../addressbook/printing/e-contact-print.glade.h:8
 msgid "Fonts"
 msgstr "字型"
 
-# addressbook/printing/e-contact-print.glade.h:9
 #: ../addressbook/printing/e-contact-print.glade.h:9
 msgid "Footer:"
 msgstr "頁尾:"
 
-# addressbook/printing/e-contact-print.glade.h:10
 #: ../addressbook/printing/e-contact-print.glade.h:10
 msgid "Format"
 msgstr "格式"
 
-# addressbook/printing/e-contact-print.glade.h:11
 #: ../addressbook/printing/e-contact-print.glade.h:11
 #: ../widgets/table/e-table-click-to-add.c:495
 #: ../widgets/table/e-table-field-chooser-dialog.c:91
@@ -4251,17 +3797,14 @@ msgstr "格式"
 msgid "Header"
 msgstr "頁首"
 
-# addressbook/printing/e-contact-print.glade.h:12
 #: ../addressbook/printing/e-contact-print.glade.h:12
 msgid "Header/Footer"
 msgstr "頁首/頁尾"
 
-# addressbook/printing/e-contact-print.glade.h:13
 #: ../addressbook/printing/e-contact-print.glade.h:13
 msgid "Headings"
 msgstr "標頭"
 
-# addressbook/printing/e-contact-print.glade.h:14
 #: ../addressbook/printing/e-contact-print.glade.h:14
 msgid "Headings for each letter"
 msgstr "每封信的標頭"
@@ -4270,38 +3813,30 @@ msgstr "每封信的標頭"
 msgid "Height:"
 msgstr "高度:"
 
-# addressbook/printing/e-contact-print.glade.h:16
 #: ../addressbook/printing/e-contact-print.glade.h:16
 msgid "Immediately follow each other"
 msgstr "一個緊接著另一個"
 
-# addressbook/printing/e-contact-print.glade.h:17
 #: ../addressbook/printing/e-contact-print.glade.h:17
 msgid "Include:"
 msgstr "包含:"
 
-# addressbook/printing/e-contact-print.glade.h:18
 #: ../addressbook/printing/e-contact-print.glade.h:18
 msgid "Landscape"
 msgstr "橫向"
 
-# addressbook/printing/e-contact-print.glade.h:19
 #: ../addressbook/printing/e-contact-print.glade.h:19
 msgid "Left:"
 msgstr "左:"
 
-# addressbook/printing/e-contact-print.glade.h:20
 #: ../addressbook/printing/e-contact-print.glade.h:20
 msgid "Letter tabs on side"
 msgstr "字母標籤於旁邊"
 
-# addressbook/printing/e-contact-print.glade.h:21
 #: ../addressbook/printing/e-contact-print.glade.h:21
 msgid "Margins"
 msgstr "邊界"
 
-# addressbook/printing/e-contact-print.glade.h:22
-# executive-summary/component/executive-summary-config.glade.h:4
 #: ../addressbook/printing/e-contact-print.glade.h:22
 msgid "Number of columns:"
 msgstr "欄數:"
@@ -4310,63 +3845,53 @@ msgstr "欄數:"
 msgid "Options"
 msgstr "選項"
 
-# addressbook/printing/e-contact-print.glade.h:24
 #: ../addressbook/printing/e-contact-print.glade.h:24
 #: ../e-util/eggtrayicon.c:120
 msgid "Orientation"
 msgstr "紙張方向"
 
-# addressbook/printing/e-contact-print.glade.h:25
 #: ../addressbook/printing/e-contact-print.glade.h:25
 msgid "Page"
 msgstr "頁"
 
-# addressbook/printing/e-contact-print.glade.h:26
 #: ../addressbook/printing/e-contact-print.glade.h:26
 msgid "Page Setup:"
 msgstr "頁面設定:"
 
-# addressbook/printing/e-contact-print.glade.h:27
 #: ../addressbook/printing/e-contact-print.glade.h:27
 msgid "Paper"
 msgstr "使用紙張"
 
-# addressbook/printing/e-contact-print.glade.h:28
 #: ../addressbook/printing/e-contact-print.glade.h:28
 msgid "Paper source:"
 msgstr "紙張來源:"
 
-# addressbook/printing/e-contact-print.glade.h:29
 #: ../addressbook/printing/e-contact-print.glade.h:29
 msgid "Portrait"
 msgstr "直向"
 
-# addressbook/printing/e-contact-print.glade.h:30
 #: ../addressbook/printing/e-contact-print.glade.h:30
 msgid "Preview:"
 msgstr "預覽:"
 
-# addressbook/printing/e-contact-print.glade.h:31
+# zh_HK: msgstr "使用灰階打印"
 #: ../addressbook/printing/e-contact-print.glade.h:31
 msgid "Print using gray shading"
 msgstr "使用灰階列印"
 
-# addressbook/printing/e-contact-print.glade.h:32
+# zh_HK: msgstr "偶數頁反向打印"
 #: ../addressbook/printing/e-contact-print.glade.h:32
 msgid "Reverse on even pages"
-msgstr "偶數頁以反向列印"
+msgstr "偶數頁反向列印"
 
-# addressbook/printing/e-contact-print.glade.h:33
 #: ../addressbook/printing/e-contact-print.glade.h:33
 msgid "Right:"
 msgstr "右:"
 
-# addressbook/printing/e-contact-print.glade.h:34
 #: ../addressbook/printing/e-contact-print.glade.h:34
 msgid "Sections:"
 msgstr "區段:"
 
-# addressbook/printing/e-contact-print.glade.h:35
 #: ../addressbook/printing/e-contact-print.glade.h:35
 msgid "Shading"
 msgstr "網底"
@@ -4379,17 +3904,14 @@ msgstr "網底"
 msgid "Size:"
 msgstr "大小:"
 
-# addressbook/printing/e-contact-print.glade.h:37
 #: ../addressbook/printing/e-contact-print.glade.h:37
 msgid "Start on a new page"
 msgstr "開始於新頁"
 
-# addressbook/printing/e-contact-print.glade.h:38
 #: ../addressbook/printing/e-contact-print.glade.h:38
 msgid "Style name:"
 msgstr "樣式名稱:"
 
-# addressbook/printing/e-contact-print.glade.h:39
 #: ../addressbook/printing/e-contact-print.glade.h:39
 msgid "Top:"
 msgstr "上:"
@@ -4407,7 +3929,7 @@ msgstr "寬度:"
 msgid "_Font..."
 msgstr "字型(_F)..."
 
-# addressbook/contact-editor/contact-editor.glade.h:7
+# zh_HK: msgstr "連絡人打印樣式編輯器測試"
 #: ../addressbook/printing/test-contact-print-style-editor.c:53
 msgid "Contact Print Style Editor Test"
 msgstr "連絡人列印樣式編輯器測試"
@@ -4415,34 +3937,33 @@ msgstr "連絡人列印樣式編輯器測試"
 #: ../addressbook/printing/test-contact-print-style-editor.c:54
 #: ../addressbook/printing/test-print.c:53
 msgid "Copyright (C) 2000, Ximian, Inc."
-msgstr "Copyright (C) 2000, Ximian, Inc."
+msgstr "版權所有 (C) 2000, Ximian, Inc."
 
+# zh_HK: msgstr "這可以測試連絡人打印樣式編輯器工具"
 #: ../addressbook/printing/test-contact-print-style-editor.c:56
 msgid "This should test the contact print style editor widget"
 msgstr "這可以測試連絡人列印樣式編輯器工具"
 
-# ui/evolution-addressbook.xml.h:17
+# zh_HK: msgstr "連絡人打印測試"
 #: ../addressbook/printing/test-print.c:52
 msgid "Contact Print Test"
 msgstr "連絡人列印測試"
 
+# zh_HK: msgstr "這可以測試連絡人打印代碼"
 #: ../addressbook/printing/test-print.c:55
 msgid "This should test the contact print code"
 msgstr "這可以測試連絡人列印代碼"
 
-# camel/camel-filter-driver.c:671
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:667
 #: ../addressbook/tools/evolution-addressbook-export-list-cards.c:703
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:50
 msgid "Can not open file"
 msgstr "無法開啟檔案"
 
-# camel/camel-provider.c:140
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:44
 msgid "Couldn't get list of addressbooks"
 msgstr "無法取得通訊錄清單"
 
-# addressbook/gui/component/addressbook.c:438
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:72
 msgid "failed to open book"
 msgstr "無法開啟通訊錄"
@@ -4463,10 +3984,6 @@ msgstr "列出本地通訊錄資料夾"
 msgid "Show cards as vcard or csv file"
 msgstr "將名片顯示成 vcard 或 csv 檔案"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../addressbook/tools/evolution-addressbook-export.c:60
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
@@ -4501,23 +4018,18 @@ msgstr "在非同步模式下，輸出必須是檔案。"
 msgid "In normal mode, there is no need for the size option."
 msgstr "在一般模式下，不需要大小選項。"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../addressbook/tools/evolution-addressbook-export.c:153
 msgid "Unhandled error"
 msgstr "未處理的錯誤"
 
-# composer/e-msg-composer.c:805
 #: ../addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "載入預設目錄服務時發生錯誤"
 
-# ui/evolution-message-composer.xml.h:49
 #: ../addressbook/tools/evolution-addressbook-import.c:67
 msgid "Input File"
 msgstr "輸入檔案"
 
-# camel/camel-pgp-context.c:1073
 #: ../addressbook/tools/evolution-addressbook-import.c:82
 msgid "No filename provided."
 msgstr "沒有提供檔案名稱。"
@@ -4575,106 +4087,77 @@ msgstr "會刪除此會議的所有資訊而且無法復原。"
 msgid "All information on this task will be deleted and can not be restored."
 msgstr "會刪除此工作的所有資訊而且無法復原。"
 
-# calendar/gui/dialogs/delete-comp.c:93
 #: ../calendar/calendar.error.xml.h:11
 msgid "Are you sure you want to delete the '{0}' task?"
 msgstr "確定要刪除 '{0}'工作？"
 
-# calendar/gui/dialogs/delete-comp.c:84
 #: ../calendar/calendar.error.xml.h:12
 msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "確定要刪除標題為 '{0}' 的約會？"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:13
 msgid "Are you sure you want to delete the journal entry '{0}'?"
 msgstr "確定要刪除日誌項目 '{0}'？"
 
-# calendar/gui/dialogs/delete-comp.c:84
 #: ../calendar/calendar.error.xml.h:14
 msgid "Are you sure you want to delete these {0} appointments?"
 msgstr "確定要刪除這 {0} 約會？"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:15
 msgid "Are you sure you want to delete these {0} journal entries?"
 msgstr "確定要刪除這 {0} 日誌項目？"
 
-# calendar/gui/dialogs/delete-comp.c:93
 #: ../calendar/calendar.error.xml.h:16
 msgid "Are you sure you want to delete these {0} tasks?"
 msgstr "確定要刪除這 {0} 工作？"
 
-# calendar/gui/dialogs/delete-comp.c:120
 #: ../calendar/calendar.error.xml.h:17
 msgid "Are you sure you want to delete this appointment?"
 msgstr "確定要刪除此約會？"
 
-# calendar/gui/dialogs/delete-comp.c:130
 #: ../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 "確定要刪除此日誌項目？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../calendar/calendar.error.xml.h:19
 #: ../calendar/gui/dialogs/delete-comp.c:183
 msgid "Are you sure you want to delete this meeting?"
 msgstr "確定要刪除此會議？"
 
-# calendar/gui/dialogs/delete-comp.c:125
 #: ../calendar/calendar.error.xml.h:20
 #: ../calendar/gui/dialogs/delete-comp.c:186
 msgid "Are you sure you want to delete this task?"
 msgstr "確定要刪除此工作？"
 
-# mail/mail-callbacks.c:1085
 #: ../calendar/calendar.error.xml.h:21
 msgid "Are you sure you want to send the appointment without a summary?"
 msgstr "您確定要傳送沒有摘要的約會？"
 
-# mail/mail-callbacks.c:1085
 #: ../calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to send the task without a summary?"
 msgstr "您確定要傳送沒有摘要的工作？"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/calendar.error.xml.h:23
 msgid "Cannot create a new event"
 msgstr "不能建立新的事件"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
 #: ../calendar/calendar.error.xml.h:24
 msgid "Delete calendar '{0}'?"
 msgstr "刪除行事曆「{0}」？"
 
-# ui/evolution-contact-editor.xml.h:2
 #: ../calendar/calendar.error.xml.h:25
 msgid "Delete memo list '{0}'?"
 msgstr "刪除備忘錄清單「{0}」？"
 
-# ui/evolution-contact-editor.xml.h:2
 #: ../calendar/calendar.error.xml.h:26
 msgid "Delete task list '{0}'?"
 msgstr "刪除工作清單「{0}」？"
 
-# shell/e-shortcuts-view.c:265
 #: ../calendar/calendar.error.xml.h:27
 msgid "Do _not Send"
 msgstr "不要傳送(_N)"
 
-# calendar/gui/dialogs/delete-comp.c:120
 #: ../calendar/calendar.error.xml.h:28
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "下載尚在進行中。您是否要儲存此約會？"
@@ -4698,18 +4181,14 @@ msgid ""
 "Email invitations will be sent to all participants and allow them to reply."
 msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
-# calendar/conduits/calendar/calendar-conduit.c:687
-# calendar/conduits/todo/todo-conduit.c:501
 #: ../calendar/calendar.error.xml.h:33
 msgid "Error loading calendar"
 msgstr "載入行事曆時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../calendar/calendar.error.xml.h:34
 msgid "Error loading memo list"
 msgstr "載入備忘錄清單時發生錯誤"
 
-# shell/e-shell-importer.c:404
 #: ../calendar/calendar.error.xml.h:35
 msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
@@ -4760,12 +4239,10 @@ msgstr "這裡有一些需要下載的附件。儲存此工作將會失去這些
 msgid "Some features may not work properly with your current server."
 msgstr "某些功能可能無法在您目前的伺服器版本上正常運作。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/calendar.error.xml.h:44
 msgid "The Evolution calendar has quit unexpectedly."
 msgstr "Evolution 行事曆已經意外結束。"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/calendar.error.xml.h:45
 msgid "The Evolution memo has quit unexpectedly."
 msgstr "Evolution 備忘錄已經意外結束。"
@@ -4796,24 +4273,20 @@ msgstr "這個備忘錄清單將會被永遠移除。"
 
 #: ../calendar/calendar.error.xml.h:52
 msgid "This task list will be removed permanently."
-msgstr "這個工作清單將會被永遠移除。"
+msgstr "這項工作清單將會被永遠移除。"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:53
 msgid "Would you like to save your changes to this appointment?"
 msgstr "要儲存對此約會所做的變更？"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:54
 msgid "Would you like to save your changes to this memo?"
 msgstr "要儲存對此備忘錄所做的變更？"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../calendar/calendar.error.xml.h:55
 msgid "Would you like to save your changes to this task?"
 msgstr "要儲存對此工作所做的變更？"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../calendar/calendar.error.xml.h:56
 msgid "Would you like to send a cancelation notice for this journal entry?"
 msgstr "要傳送此日誌項目的取消通知？"
@@ -4843,17 +4316,13 @@ 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 的問題。最好的"
-"解決方案是將該伺服器升級至支援的版本。"
+msgstr "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版本。"
 
 #: ../calendar/calendar.error.xml.h:63
 msgid ""
 "You have a read-only calendar source selected. Change to Calendar View and "
 "highlight a calendar that can accept appointments."
-msgstr ""
-"您選擇了一個唯讀的行事曆來源。請切換到行事曆檢視並選取一個能加入約會的行事"
-"曆。"
+msgstr "您選擇了一個唯讀的行事曆來源。請切換到行事曆檢視並選取一個能加入約會的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:64
 msgid "You have changed this appointment, but not yet saved it."
@@ -4893,13 +4362,11 @@ msgstr "儲存(_S)"
 msgid "_Save Changes"
 msgstr "儲存變更(_S)"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:73
 #: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "傳送(_S)"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:74
 msgid "_Send Notice"
 msgstr "傳送通知(_S)"
@@ -4917,9 +4384,6 @@ msgstr "輸入密碼"
 msgid "Split Multi-Day Events:"
 msgstr "分割多日事件:"
 
-# addressbook/conduit/address-conduit.c:654
-# calendar/conduits/calendar/calendar-conduit.c:731
-# calendar/conduits/todo/todo-conduit.c:545
 #: ../calendar/conduits/calendar/calendar-conduit.c:1432
 #: ../calendar/conduits/calendar/calendar-conduit.c:1433
 #: ../calendar/conduits/memo/memo-conduit.c:854
@@ -4929,54 +4393,40 @@ msgstr "分割多日事件:"
 msgid "Could not start evolution-data-server"
 msgstr "無法啟動 Evolution 資料伺服器"
 
-# calendar/conduits/calendar/calendar-conduit.c:786
-# calendar/conduits/calendar/calendar-conduit.c:789
 #: ../calendar/conduits/calendar/calendar-conduit.c:1529
 #: ../calendar/conduits/calendar/calendar-conduit.c:1532
 msgid "Could not read pilot's Calendar application block"
 msgstr "無法讀取 pilot 行事曆程式區塊"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/memo/memo-conduit.c:937
 #: ../calendar/conduits/memo/memo-conduit.c:940
 msgid "Could not read pilot's Memo application block"
 msgstr "無法讀取 pilot 備忘錄程式區塊"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/memo/memo-conduit.c:976
 #: ../calendar/conduits/memo/memo-conduit.c:979
 msgid "Could not write pilot's Memo application block"
 msgstr "無法寫入 pilot 備忘錄程式區塊"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/conduits/todo/todo-conduit.c:239
 msgid "Default Priority:"
 msgstr "預設優先順序:"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/todo/todo-conduit.c:1112
 #: ../calendar/conduits/todo/todo-conduit.c:1115
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-# calendar/conduits/todo/todo-conduit.c:600
-# calendar/conduits/todo/todo-conduit.c:603
 #: ../calendar/conduits/todo/todo-conduit.c:1151
 #: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-# ui/evolution-mail.xml.h:110
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
 #: ../plugins/itip-formatter/itip-formatter.c:2038
 msgid "Calendar and Tasks"
 msgstr "行事曆與工作"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
 #: ../calendar/gui/calendar-component.c:1358
 msgid "Calendars"
@@ -4986,47 +4436,38 @@ msgstr "行事曆"
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "在這裡設定您的時區、行事曆與工作清單"
 
-# ui/evolution-mail.xml.h:110
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution 行事曆和工作"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution 行事曆組態控制"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution 行事曆排程訊息檢視器"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution 行事曆/工作編輯器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution's Calendar component"
 msgstr "Evolution 的行事曆配件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution's Memos component"
 msgstr "Evolution 的備忘錄元件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Tasks component"
 msgstr "Evolution 的工作配件"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Memo_s"
 msgstr "備忘錄(_S)"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../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/memos-component.c:531
@@ -5056,7 +4497,6 @@ msgstr "行事曆(_C)"
 msgid "_Tasks"
 msgstr "工作(_T)"
 
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
 #: ../calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution 行事曆鬧鈴通知服務"
@@ -5064,8 +4504,8 @@ msgstr "Evolution 行事曆鬧鈴通知服務"
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:116
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "分"
-msgstr[1] "分"
+msgstr[0] "分鐘"
+msgstr[1] "分鐘"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:131
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
@@ -5076,20 +4516,18 @@ msgstr[1] "分"
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
 msgid_plural "hours"
-msgstr[0] "時"
+msgstr[0] "小時"
+msgstr[1] "小時"
 
-# calendar/gui/event-editor-dialog.glade.h:31
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:277
 msgid "Start time"
 msgstr "開始時刻"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
 msgid "Appointments"
 msgstr "約會"
 
-# addressbook/backend/ebook/e-card.c:3442
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:2
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1616
@@ -5099,7 +4537,6 @@ msgstr "約會"
 msgid "Location:"
 msgstr "位置:"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:4
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:3
 msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
@@ -5123,24 +4560,20 @@ msgstr "編輯(_E)"
 msgid "_Snooze"
 msgstr "延期(_S)"
 
-# calendar/gui/event-editor-dialog.glade.h:44
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:7
 msgid "location of appointment"
 msgstr "約會的地點"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1452
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1598
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1461
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1463
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1471
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
@@ -5150,7 +4583,6 @@ msgstr "沒有可用的地點資訊。"
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
-# widgets/misc/e-messagebox.c:159
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1696
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1722
 msgid "Warning"
@@ -5185,38 +4617,22 @@ msgstr ""
 "\n"
 "您確定要執行這個程式？"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
 #: ../calendar/gui/alarm-notify/alarm-queue.c:1742
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1092
-# addressbook/gui/component/addressbook-factory.c:42
-# calendar/conduits/calendar/calendar-conduit.c:1151
-# calendar/conduits/todo/todo-conduit.c:965
-# calendar/gui/alarm-notify/notify-main.c:98
-# calendar/gui/main.c:57
 #: ../calendar/gui/alarm-notify/notify-main.c:140
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
-# calendar/gui/alarm-notify/notify-main.c:108
 #: ../calendar/gui/alarm-notify/notify-main.c:153
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
-# calendar/gui/event-editor-dialog.glade.h:30
 #: ../calendar/gui/alarm-notify/util.c:41
 msgid "invalid time"
 msgstr "失效時間"
 
-# calendar/gui/event-editor.c:1553
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/e-alarm-list.c:408
 #: ../calendar/gui/misc.c:113
@@ -5226,7 +4642,6 @@ msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 msgstr[1] "%d 小時"
 
-# calendar/gui/event-editor.c:1558
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
 #: ../calendar/gui/alarm-notify/util.c:72 ../calendar/gui/e-alarm-list.c:414
 #: ../calendar/gui/misc.c:119
@@ -5236,7 +4651,6 @@ msgid_plural "%d minutes"
 msgstr[0] "%d 分"
 msgstr[1] "%d 分"
 
-# calendar/gui/event-editor.c:1563
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
@@ -5248,8 +4662,6 @@ msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 msgstr[1] "%d 秒"
 
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:1
 msgid "Alarm programs"
 msgstr "鬧鈴程式"
@@ -5266,8 +4678,6 @@ msgstr "今天到期的工作背景色彩，使用 \"#rrggbb\" 格式。"
 msgid "Background color of tasks that are overdue, in \"#rrggbb\" format."
 msgstr "過期工作的背景色彩，使用 \"#rrggbb\" 格式。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:5
 msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
@@ -5281,12 +4691,10 @@ msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用
 msgid "Color to draw the Marcus Bains line in the Day View."
 msgstr "在日檢視中用來繪製 Marcus Bains 線的色彩"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:8
 msgid "Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示"
 
-# mail/mail-ops.c:1449
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:9
 msgid "Confirm expunge"
 msgstr "清空時確認"
@@ -5295,12 +4703,10 @@ msgstr "清空時確認"
 msgid "Days on which the start and end of work hours should be indicated."
 msgstr "必須指明工作日開始與結束於幾時。"
 
-# ui/evolution-event-editor.xml.h:18
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:11
 msgid "Default appointment reminder"
 msgstr "預設的約會提醒"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:12
 msgid "Default reminder units"
 msgstr "預設提醒的單位"
@@ -5309,7 +4715,6 @@ msgstr "預設提醒的單位"
 msgid "Default reminder value"
 msgstr "預設提醒的數值"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:14
 msgid "Event Gradient"
 msgstr "事件漸層效果"
@@ -5318,12 +4723,10 @@ msgstr "事件漸層效果"
 msgid "Event Transparency"
 msgstr "事件透明效果"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:16
 msgid "Free/busy server URLs"
 msgstr "空閒/忙碌伺服器網址"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:17
 msgid "Free/busy template URL"
 msgstr "空閒/忙碌範本網址"
@@ -5332,14 +4735,10 @@ msgstr "空閒/忙碌範本網址"
 msgid "Gradient of the events in calendar views."
 msgstr "行事曆檢視中的事件漸層效果。"
 
-# ui/evolution-mail.xml.h:43
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:19
 msgid "Hide completed tasks"
 msgstr "隱藏已完成的工作"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:20
 msgid "Hide task units"
 msgstr "隱藏工作單位"
@@ -5408,7 +4807,6 @@ msgstr "決定預設提醒的單位數目。"
 msgid "Number of units for determining when to hide tasks."
 msgstr "決定何時隱藏工作的單位數目。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
 msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
@@ -5417,15 +4815,13 @@ msgstr "過期的工作色彩"
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels."
-msgstr ""
-"水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
+msgstr "水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr ""
-"水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
+msgstr "水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid ""
@@ -5443,15 +4839,13 @@ msgstr "垂直窗格的位置，在工作清單與工作預覽窗格之間，以
 msgid ""
 "Position of the vertical pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels."
-msgstr ""
-"垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
+msgstr "垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:43
 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 ""
-"垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
+msgstr "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:44
 msgid "Programs that are allowed to be run by alarms."
@@ -5465,7 +4859,6 @@ msgstr "在事件/工作/會議編輯器中顯示 RSVP 欄位"
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 角色 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:47
 msgid "Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間"
@@ -5482,7 +4875,6 @@ msgstr "在通知匣中顯示鬧鈴畫面"
 msgid "Show status field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 狀態 欄位"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:51
 #: ../mail/evolution-mail.schemas.in.in.h:81
 msgid "Show the \"Preview\" pane"
@@ -5501,12 +4893,10 @@ msgstr "在事件/會議編輯器中顯示 時區 欄位"
 msgid "Show type field in the event/task/meeting editor"
 msgstr "在事件/工作/會議編輯器中顯示 類型 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 msgid "Show week numbers in date navigator"
 msgstr "在日期導覽顯示週數"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
 msgid "Tasks due today color"
 msgstr "今天到期工作的色彩"
@@ -5520,17 +4910,13 @@ msgstr "工作垂直窗格位置"
 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 要替換為網域名稱。"
+msgstr "作為空閒/忙碌資料回饋之用的網址範本，%u 要以電子郵件位址的使用者名稱部分來取代，而 %d 要替換為網域名稱。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:60
 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\"。"
+msgstr "用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 \"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:61
 msgid "Time divisions"
@@ -5540,7 +4926,6 @@ msgstr "時間分隔"
 msgid "Time the last alarm ran, in time_t."
 msgstr "上次鬧鈴執行的時間(_T)"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:63
 msgid "Timezone"
 msgstr "時區"
@@ -5549,8 +4934,7 @@ msgstr "時區"
 msgid ""
 "Transparency of the events in calendar views, a value between 0 "
 "(transparent) and 1 (opaque)."
-msgstr ""
-"行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
+msgstr "行事曆檢視中的事件透明化效果，數值介於 0 (完全透明)到 10 (不透明)之間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:65
 msgid "Twenty four hour time format"
@@ -5591,7 +4975,6 @@ msgid ""
 "Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:75
 msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
@@ -5601,7 +4984,6 @@ msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
 msgstr "是否在行事曆中繪出 Marcus Bains 線（代表目前時刻的直線）。"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:77
 msgid "Whether to hide completed tasks in the tasks view."
 msgstr "是否在工作檢視中隱藏完成的工作。"
@@ -5610,22 +4992,18 @@ msgstr "是否在工作檢視中隱藏完成的工作。"
 msgid "Whether to set a default reminder for appointments."
 msgstr "是否設定約會的預設提醒。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:79
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 RSVP 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:80
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 狀態 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:81
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 角色 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:82
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
@@ -5635,17 +5013,14 @@ msgid ""
 "Whether to show times in twenty four hour format instead of using am/pm."
 msgstr "是否使用 24 小時制時間而不是使用上午/下午。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:84
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "是否在事件/會議編輯器中顯示 時區 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:85
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 類型 欄位"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:86
 msgid "Whether to show week numbers in the date navigator."
 msgstr "是否在日期導覽中顯示週數。"
@@ -5662,7 +5037,6 @@ msgstr "工作日"
 msgid "Workday end hour"
 msgstr "工作日結束小時"
 
-# shell/e-shell-view-menu.c:590
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:90
 msgid "Workday end minute"
 msgstr "工作日結束分鐘"
@@ -5679,27 +5053,22 @@ msgstr "工作日開始分鐘"
 msgid "daylight savings time"
 msgstr "日光節約時間"
 
-# calendar/gui/gnome-cal.c:234
 #: ../calendar/gui/cal-search-bar.c:48
 msgid "Summary contains"
 msgstr "主旨包含"
 
-# calendar/gui/gnome-cal.c:235
 #: ../calendar/gui/cal-search-bar.c:49
 msgid "Description contains"
 msgstr "描述包含"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../calendar/gui/cal-search-bar.c:50
 msgid "Category is"
 msgstr "分類為"
 
-# calendar/gui/gnome-cal.c:236
 #: ../calendar/gui/cal-search-bar.c:51
 msgid "Comment contains"
 msgstr "備註包含"
 
-# calendar/gui/gnome-cal.c:235
 #: ../calendar/gui/cal-search-bar.c:52
 msgid "Location contains"
 msgstr "位置包含"
@@ -5708,13 +5077,7 @@ msgstr "位置包含"
 msgid "Unmatched"
 msgstr "沒有相符資料"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:233
-# addressbook/gui/widgets/e-addressbook-view.c:614
-# mail/message-browser.c:199
-# ui/evolution-addressbook.xml.h:9
-# ui/evolution-calendar.xml.h:23
-# ui/evolution-mail.xml.h:65
-# ui/evolution-tasks.xml.h:4
+# zh_HK: msgstr "打印"
 #: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2522
 #: ../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
@@ -5727,12 +5090,11 @@ 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 ""
-"此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
+msgstr "此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
-msgstr "清除事件早於"
+msgstr "清除早於這段時間的事件"
 
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
@@ -5764,12 +5126,10 @@ msgstr "生日和週年紀念日"
 msgid "Weather"
 msgstr "天氣"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/calendar-component.c:579
 msgid "_New Calendar"
 msgstr "新增行事曆(_N)"
 
-# calendar/gui/e-itip-control.glade.h:8
 #: ../calendar/gui/calendar-component.c:896
 msgid "Failed upgrading calendars."
 msgstr "升級行事曆失敗。"
@@ -5783,13 +5143,10 @@ msgstr "無法開啟行事曆 '%s' 來建立事件和會議"
 msgid "There is no calendar available for creating events and meetings"
 msgstr "沒有行事曆可用來建立事件和會議"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/calendar-component.c:1333
 msgid "Calendar Source Selector"
 msgstr "行事曆來源選擇器"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../calendar/gui/calendar-component.c:1541
 msgid "New appointment"
 msgstr "新增約會"
@@ -5798,13 +5155,10 @@ msgstr "新增約會"
 msgid "_Appointment"
 msgstr "約會(_A)"
 
-# ui/evolution-calendar.xml.h:5
 #: ../calendar/gui/calendar-component.c:1543
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/calendar-component.c:1549
 msgid "New meeting"
 msgstr "新增會議"
@@ -5813,13 +5167,10 @@ msgstr "新增會議"
 msgid "M_eeting"
 msgstr "會議(_M)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/calendar-component.c:1551
 msgid "Create a new meeting request"
 msgstr "建立新會議要求"
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../calendar/gui/calendar-component.c:1557
 msgid "New all day appointment"
 msgstr "新的全日約會"
@@ -5828,12 +5179,10 @@ msgstr "新的全日約會"
 msgid "All Day A_ppointment"
 msgstr "全日約會(_P)"
 
-# ui/evolution-calendar.xml.h:5
 #: ../calendar/gui/calendar-component.c:1559
 msgid "Create a new all-day appointment"
 msgstr "建立新的全日約會"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/calendar-component.c:1565
 msgid "New calendar"
 msgstr "新行事曆"
@@ -5842,33 +5191,26 @@ msgstr "新行事曆"
 msgid "Cale_ndar"
 msgstr "行事曆(_N)"
 
-# ui/evolution.xml.h:10
 #: ../calendar/gui/calendar-component.c:1567
 msgid "Create a new calendar"
 msgstr "建立新行事曆"
 
-# addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: ../calendar/gui/calendar-view-factory.c:109
 msgid "Day View"
 msgstr "日檢視"
 
-# ui/evolution-calendar.xml.h:35
 #: ../calendar/gui/calendar-view-factory.c:112
 msgid "Work Week View"
 msgstr "工作週檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../calendar/gui/calendar-view-factory.c:115
 msgid "Week View"
 msgstr "週檢視"
 
-# ui/evolution-calendar.xml.h:15
 #: ../calendar/gui/calendar-view-factory.c:118
 msgid "Month View"
 msgstr "月檢視"
 
-# calendar/conduits/calendar/calendar-conduit.c:687
-# calendar/conduits/todo/todo-conduit.c:501
 #: ../calendar/gui/comp-editor-factory.c:415
 msgid "Error while opening the calendar"
 msgstr "開啟行事曆時發生錯誤"
@@ -5877,41 +5219,30 @@ msgstr "開啟行事曆時發生錯誤"
 msgid "Method not supported when opening the calendar"
 msgstr "開啟行事曆時不支援方法"
 
-# shell/e-storage.c:475
 #: ../calendar/gui/comp-editor-factory.c:427
 msgid "Permission denied to open the calendar"
 msgstr "拒絕許可權來開啟行事曆"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../calendar/gui/comp-editor-factory.c:439 ../shell/e-shell.c:1272
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-dialog.c:614
 msgid "Edit Alarm"
 msgstr "編輯鬧鈴"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:1
 msgid "<b>Alarm</b>"
 msgstr "<b>鬧鈴</b>"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:2
 msgid "<b>Options</b>"
 msgstr "<b>選項</b>"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:3
 msgid "<b>Repeat</b>"
 msgstr "<b>重複</b>"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:4
 msgid "Add Alarm"
 msgstr "新增鬧鈴"
@@ -5928,8 +5259,6 @@ msgstr "自訂鬧鈴聲音"
 msgid "Mes_sage:"
 msgstr "訊息(_S):"
 
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:8
 #: ../calendar/gui/e-alarm-list.c:446
 msgid "Play a sound"
@@ -5940,20 +5269,15 @@ msgstr "播放音效"
 msgid "Pop up an alert"
 msgstr "顯示提示"
 
-# calendar/gui/event-editor-dialog.glade.h:22
-# calendar/gui/event-editor.c:1597
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:10
 #: ../calendar/gui/e-alarm-list.c:458
 msgid "Run a program"
 msgstr "執行外部程式"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:11
 msgid "Send To:"
 msgstr "收件者："
 
-# calendar/gui/event-editor-dialog.glade.h:23
-# calendar/gui/event-editor.c:1594
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:12
 #: ../calendar/gui/e-alarm-list.c:454
 msgid "Send an email"
@@ -5975,17 +5299,14 @@ msgstr "重複鬧鈴(_R)"
 msgid "_Sound:"
 msgstr "聲音(_S):"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:17
 msgid "after"
 msgstr "之後"
 
-# calendar/gui/event-editor-dialog.glade.h:34
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "before"
 msgstr "之前"
 
-# calendar/gui/event-editor-dialog.glade.h:35
 #. 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
@@ -5993,7 +5314,6 @@ msgstr "之前"
 msgid "day(s)"
 msgstr "日"
 
-# calendar/gui/event-editor-dialog.glade.h:36
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:21
 msgid "end of appointment"
 msgstr "約會結束"
@@ -6002,18 +5322,14 @@ msgstr "約會結束"
 msgid "extra times every"
 msgstr "提醒間隔每"
 
-# calendar/gui/event-editor-dialog.glade.h:39
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:23
 msgid "hour(s)"
-msgstr "時"
+msgstr "小時"
 
-# calendar/gui/event-editor-dialog.glade.h:42
-# mail/mail-config.glade.h:87
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:25
 msgid "minute(s)"
-msgstr "分"
+msgstr "分鐘"
 
-# calendar/gui/event-editor-dialog.glade.h:44
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:27
 msgid "start of appointment"
 msgstr "約會開始"
@@ -6026,7 +5342,6 @@ msgstr "動作/觸發"
 msgid "A_dd"
 msgstr "加入(_A)"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/alarm-list-dialog.glade.h:2
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: ../calendar/gui/dialogs/event-page.glade.h:4
@@ -6042,13 +5357,10 @@ msgstr "鬧鈴"
 msgid "_Suggest automatic display of attachment"
 msgstr "建議自動顯示附件(_S)"
 
-# composer/e-msg-composer-attachment-bar.c:421
-# ui/evolution-message-composer.xml.h:2
 #: ../calendar/gui/dialogs/cal-attachment-select-file.c:191
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/cal-prefs-dialog.c:486
 msgid "Selected Calendars for Alarms"
 msgstr "選擇鬧鈴行事曆"
@@ -6088,12 +5400,10 @@ msgstr "<span weight=\"bold\">預設空閒/忙碌伺服器</span>"
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">一般</span>"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "<span weight=\"bold\">Task List</span>"
 msgstr "<span weight=\"bold\">工作清單</span>"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">時間</span>"
@@ -6110,8 +5420,6 @@ msgstr "調整日光節約時間(_V)"
 msgid "Day _ends:"
 msgstr "一日結束於(_E):"
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 msgid "Display"
 msgstr "顯示"
@@ -6156,8 +5464,6 @@ msgstr ""
 "星期六\n"
 "星期日"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:4
 #: ../mail/mail-config.glade.h:105
@@ -6183,7 +5489,6 @@ msgstr "選擇鬧鈴通知的行事曆"
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
@@ -6203,8 +5508,6 @@ msgstr "今天到期的工作(_A):"
 msgid "T_hu"
 msgstr "週四(_H)"
 
-# addressbook/contact-editor/e-contact-editor.c:1259
-# addressbook/gui/widgets/e-addressbook-view.c:722
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "Template:"
 msgstr "樣板:"
@@ -6220,13 +5523,10 @@ msgstr "星期四"
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "Time format:"
 msgstr "時刻格式:"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
-# calendar/gui/event-editor.c:476
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.c:1085
 #: ../calendar/gui/e-itip-control.c:727
@@ -6260,7 +5560,6 @@ msgstr "_24 小時"
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
@@ -6274,7 +5573,6 @@ msgstr "一日開始於(_D):"
 msgid "_Fri"
 msgstr "週五(_F)"
 
-# ui/evolution-mail.xml.h:43
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
@@ -6293,7 +5591,6 @@ msgstr "過期的工作(_O):"
 msgid "_Sat"
 msgstr "週六(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:65
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
@@ -6312,7 +5609,6 @@ msgstr "週二(_T)"
 msgid "_Wed"
 msgstr "週三(_W)"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:71
 msgid "before every appointment"
 msgstr "前"
@@ -6334,49 +5630,34 @@ msgstr "複製備忘錄清單內容至本地以便離線作業(_Y)"
 msgid "C_olor:"
 msgstr "色彩(_O):"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.c:380
 msgid "Task List"
 msgstr "工作清單"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/calendar-setup.c:391
 msgid "Memo List"
 msgstr "備忘錄清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/dialogs/calendar-setup.c:479
 msgid "Calendar Properties"
 msgstr "iCalendar 錯誤"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/calendar-setup.c:481
 msgid "New Calendar"
 msgstr "新行事曆"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.c:566
 msgid "Task List Properties"
 msgstr "工作清單"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/dialogs/calendar-setup.c:632
 msgid "New Memo List"
 msgstr "新增備忘錄清單"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:1
 msgid "Add Calendar"
 msgstr "新增行事曆"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:2
 msgid "Add Task List"
 msgstr "新增工作清單"
@@ -6385,9 +5666,6 @@ msgstr "新增工作清單"
 msgid "_Add Calendar"
 msgstr "加入行事曆(_A)"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Task List"
 msgstr "新增工作清單(_A)"
@@ -6414,10 +5692,9 @@ msgstr "週"
 msgid "This event has been deleted."
 msgstr "這個事件已刪除。"
 
-# addressbook/contact-editor/contact-editor.glade.h:34
 #: ../calendar/gui/dialogs/changed-comp.c:64
 msgid "This task has been deleted."
-msgstr "這個工作已刪除。"
+msgstr "這項工作已刪除。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:68
 msgid "This journal entry has been deleted."
@@ -6439,7 +5716,7 @@ msgstr "這個事件已變更。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
-msgstr "這個工作已變更。"
+msgstr "這項工作已變更。"
 
 #: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This journal entry has been changed."
@@ -6455,7 +5732,6 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 
-# camel/providers/local/camel-mbox-summary.c:879
 #: ../calendar/gui/dialogs/comp-editor-page.c:515
 #, c-format
 msgid "Validation error: %s"
@@ -6465,18 +5741,10 @@ msgstr "確認上的錯誤： %s"
 msgid " to "
 msgstr " 到 "
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2284
 msgid " (Completed "
 msgstr " (已完成) "
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2286
 msgid "Completed "
 msgstr "已完成 "
@@ -6485,19 +5753,15 @@ msgstr "已完成 "
 msgid " (Due "
 msgstr "(期限)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2293
 msgid "Due "
 msgstr "期限 "
 
-# mail/mail-tools.c:219
 #: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2888
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
 #: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2893
@@ -6519,7 +5783,6 @@ msgstr "移動(_M)"
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
-# shell/e-setup.c:163
 #: ../calendar/gui/dialogs/comp-editor.c:802
 msgid "Could not update object"
 msgstr "無法更新物件"
@@ -6531,16 +5794,10 @@ msgid_plural "<b>%d</b> Attachments"
 msgstr[0] "<b>%d</b> 個附加檔案"
 msgstr[1] "<b>%d</b> 個附加檔案"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:980
 msgid "Hide Attachment _Bar"
 msgstr "隱藏附加檔案列(_B)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:983
 #: ../calendar/gui/dialogs/comp-editor.c:1468
 msgid "Show Attachment _Bar"
@@ -6564,16 +5821,12 @@ msgstr "移除(_R)"
 msgid "_Properties"
 msgstr "屬性(_P)"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../calendar/gui/dialogs/comp-editor.c:1105
 #: ../composer/e-msg-composer-attachment-bar.c:473
 #: ../composer/e-msg-composer.c:3654
 msgid "_Add attachment..."
 msgstr "新增附件(_A)..."
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/comp-editor.c:1492
 #: ../mail/em-format-html-display.c:2266
 msgid "Show Attachments"
@@ -6583,37 +5836,29 @@ msgstr "顯示附加檔案"
 msgid "Press space key to toggle attachment bar"
 msgstr "按下空白鍵切換附加檔案列"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:2
 #: ../calendar/gui/dialogs/comp-editor.c:2100
 #: ../calendar/gui/dialogs/comp-editor.c:2143
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/dialogs/comp-editor.c:2106
 #: ../calendar/gui/dialogs/comp-editor.c:2149
 #, c-format
 msgid "Meeting - %s"
 msgstr "會議 - %s"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/dialogs/comp-editor.c:2108
 #: ../calendar/gui/dialogs/comp-editor.c:2151
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
 
-# calendar/gui/calendar-model.c:1578
 #: ../calendar/gui/dialogs/comp-editor.c:2112
 #: ../calendar/gui/dialogs/comp-editor.c:2155
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "指派的工作 - %s"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/comp-editor.c:2114
 #: ../calendar/gui/dialogs/comp-editor.c:2157
 #, c-format
@@ -6626,7 +5871,6 @@ msgstr "工作 - %s"
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
-# calendar/gui/e-calendar-table.c:159
 #: ../calendar/gui/dialogs/comp-editor.c:2128
 #: ../calendar/gui/dialogs/comp-editor.c:2170
 msgid "No summary"
@@ -6648,12 +5892,10 @@ msgstr "如果有新的更新，則會放棄對此項目所做的變更"
 msgid "Unable to use current version!"
 msgstr "無法使用目前的版本！"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #: ../calendar/gui/dialogs/copy-source-dialog.c:61
 msgid "Could not open source"
 msgstr "無法開啟來源"
 
-# calendar/gui/e-itip-control.c:883
 #: ../calendar/gui/dialogs/copy-source-dialog.c:69
 msgid "Could not open destination"
 msgstr "無法開啟目的地"
@@ -6714,8 +5956,6 @@ msgstr "由於 corba 錯誤，所以無法刪除日誌項目。"
 msgid "The item could not be deleted due to an error"
 msgstr "由於錯誤，所以無法刪除項目。"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
 #: ../calendar/gui/dialogs/e-delegate-dialog.glade.h:1
 msgid "Contacts..."
 msgstr "連絡人..."
@@ -6729,12 +5969,10 @@ msgstr "委託給："
 msgid "Enter Delegate"
 msgstr "輸入代表"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/dialogs/event-editor.c:564
 msgid "Appoint_ment"
 msgstr "約會(_M)"
 
-# calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:568
 #: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
@@ -6757,7 +5995,6 @@ msgstr "會議召集人(_G):"
 msgid "_Delegatees"
 msgstr "代理者(_D)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.c:922
 msgid "Atte_ndees"
 msgstr "到會者(_N)"
@@ -6770,7 +6007,6 @@ msgstr "無開始日期的事件"
 msgid "Event with no end date"
 msgstr "無結束日期的事件"
 
-# calendar/gui/e-calendar-table.c:154
 #: ../calendar/gui/dialogs/event-page.c:1259
 #: ../calendar/gui/dialogs/memo-page.c:683
 #: ../calendar/gui/dialogs/task-page.c:849
@@ -6781,7 +6017,6 @@ msgstr "開始日期錯誤"
 msgid "End date is wrong"
 msgstr "結束日期錯誤"
 
-# calendar/gui/event-editor-dialog.glade.h:31
 #: ../calendar/gui/dialogs/event-page.c:1292
 msgid "Start time is wrong"
 msgstr "開始時間錯誤"
@@ -6812,13 +6047,11 @@ msgstr "最少需要一個到會者。"
 msgid "_Add "
 msgstr "新增(_A)"
 
-# shell/e-storage.c:475
 #: ../calendar/gui/dialogs/event-page.c:2624
 #, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "無法開啟行事曆 '%s'。"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.c:2927
 #, c-format
 msgid "%d day before appointment"
@@ -6826,7 +6059,6 @@ msgid_plural "%d days before appointment"
 msgstr[0] "在每個約會前 %d 天"
 msgstr[1] "在每個約會前 %d 天"
 
-# calendar/gui/event-editor-dialog.glade.h:36
 #: ../calendar/gui/dialogs/event-page.c:2935
 #, c-format
 msgid "%d hour before appointment"
@@ -6834,7 +6066,6 @@ msgid_plural "%d hours before appointment"
 msgstr[0] "約會前 %d 小時"
 msgstr[1] "約會前 %d 小時"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.c:2943
 #, c-format
 msgid "%d minute before appointement"
@@ -6863,22 +6094,18 @@ msgstr "自訂"
 msgid "None"
 msgstr "無"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:1
 msgid "1 day before appointment"
 msgstr "約會前 1 天"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:2
 msgid "1 hour before appointment"
 msgstr "約會前 1 小時"
 
-# calendar/gui/event-editor.c:1612
 #: ../calendar/gui/dialogs/event-page.glade.h:3
 msgid "15 minutes before appointment"
 msgstr "約會前 15 分鐘"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/event-page.glade.h:5
 msgid "Attendee_s..."
 msgstr "到會者(_S)..."
@@ -6897,9 +6124,6 @@ msgstr "自訂鬧鈴:"
 msgid "D_escription:"
 msgstr "描述(_E):"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/event-page.glade.h:10
 msgid "Event Description"
 msgstr "事件描述"
@@ -6909,7 +6133,6 @@ msgstr "事件描述"
 msgid "Su_mmary:"
 msgstr "摘要(_M):"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../calendar/gui/dialogs/event-page.glade.h:14
 msgid "_Alarm"
 msgstr "鬧鈴(_A)"
@@ -6918,15 +6141,15 @@ msgstr "鬧鈴(_A)"
 msgid "_Time:"
 msgstr "時間(_T):"
 
-# calendar/gui/event-editor-dialog.glade.h:37
+# (Abel) 還有一處要用，就是加約會的 main dialog:
+# 時間(T):  [日期] [時間] [for] [1]時 [0]分鐘
 #. 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/event-page.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:16
 msgid "for"
-msgstr "舉行"
+msgstr "總共"
 
-# calendar/gui/event-editor-dialog.glade.h:45
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][until][2006/01/01]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/event-page.glade.h:21
@@ -6934,45 +6157,36 @@ msgstr "舉行"
 msgid "until"
 msgstr "直至"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:1
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Attendee"
 msgstr "到會者"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../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/e-calendar-table.c:152
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:3
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:3
 msgid "Common Name"
 msgstr "普通名稱"
 
-# calendar/gui/e-calendar-table.c:708
-# ui/evolution-task-editor-dialog.xml.h:19
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:4
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 msgid "Delegated From"
 msgstr "委任自"
 
-# calendar/gui/e-calendar-table.c:708
-# ui/evolution-task-editor-dialog.xml.h:19
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:5
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Delegated To"
 msgstr "委派給"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:6
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "Language"
 msgstr "語言"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:7
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:7
 msgid "Member"
@@ -6985,8 +6199,6 @@ msgstr "成員"
 msgid "RSVP"
 msgstr "RSVP"
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:520
@@ -7003,36 +6215,28 @@ msgstr "<b>到會者(_E)</b>"
 msgid "C_hange Organizer"
 msgstr "變更會議召集人(_H)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
 #: ../calendar/gui/dialogs/meeting-page.glade.h:3
 msgid "Co_ntacts..."
 msgstr "連絡人(_N)..."
 
-# calendar/gui/e-itip-control.glade.h:9
 #: ../calendar/gui/dialogs/meeting-page.glade.h:6
 msgid "Organizer"
 msgstr "會議召集人"
 
-# calendar/gui/e-itip-control.glade.h:9
 #: ../calendar/gui/dialogs/meeting-page.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:7
 msgid "Organizer:"
 msgstr "會議召集人:"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/dialogs/memo-editor.c:220 ../calendar/gui/print.c:2321
 msgid "Memo"
 msgstr "備忘錄"
 
-# addressbook/gui/component/addressbook.c:438
 #: ../calendar/gui/dialogs/memo-page.c:868
 #, c-format
 msgid "Unable to open memos in '%s'."
 msgstr "無法在「%s」開啟備忘錄。"
 
-# mail/mail-format.c:762
-# mail/message-list.c:1083
 #: ../calendar/gui/dialogs/memo-page.c:1019 ../mail/em-format-html.c:1488
 #: ../mail/em-format-quote.c:200 ../mail/em-format.c:846
 #: ../mail/em-mailer-prefs.c:87 ../mail/message-list.etspec.h:18
@@ -7048,7 +6252,6 @@ msgstr "開始日(_R):"
 msgid "Su_mmary"
 msgstr "摘要(_M)"
 
-# addressbook/printing/e-contact-print.glade.h:39
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
 msgid "T_o:"
 msgstr "收件者(_O):"
@@ -7063,55 +6266,38 @@ msgstr "群組(_G):"
 msgid "_Memo Content:"
 msgstr "備忘錄內容(_M):"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/new-calendar.glade.h:1
 msgid "<b>Calendar options</b>"
 msgstr "<b>行事曆選項</b>"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../calendar/gui/dialogs/new-calendar.glade.h:2
 msgid "Add New Calendar"
 msgstr "新增行事曆"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/dialogs/new-calendar.glade.h:3
 msgid "Calendar Group"
 msgstr "行事曆群組"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/new-calendar.glade.h:4
 msgid "Calendar Location"
 msgstr "行事曆位置"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../calendar/gui/dialogs/new-calendar.glade.h:5
 msgid "Calendar Name"
 msgstr "行事曆名稱"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/dialogs/new-task-list.glade.h:1
 msgid "<b>Task List Options</b>"
 msgstr "<b>工作清單選項</b>"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:2
 msgid "Add New Task List"
 msgstr "新增工作清單"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:3
 msgid "Task List Group"
 msgstr "工作清單群組"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/dialogs/new-task-list.glade.h:4
 msgid "Task List Name"
 msgstr "工作清單名稱"
@@ -7145,13 +6331,10 @@ msgstr "此例項和先前的例項"
 msgid "This and Future Instances"
 msgstr "此例項和以後的例項"
 
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
 #: ../calendar/gui/dialogs/recur-comp.c:105
 msgid "All Instances"
 msgstr "所有例項"
 
-# calendar/gui/event-editor.c:871
 #: ../calendar/gui/dialogs/recurrence-page.c:498
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
@@ -7160,7 +6343,6 @@ msgstr "Evolution 無法編輯這個週期性約會。"
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
-# calendar/gui/event-editor.c:449
 #. 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
@@ -7200,7 +6382,6 @@ msgstr "三"
 msgid "fourth"
 msgstr "四"
 
-# addressbook/contact-editor/fullname.glade.h:8
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] [Monday] [forever]'
 #. * (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.
@@ -7209,8 +6390,6 @@ msgstr "四"
 msgid "last"
 msgstr "最後"
 
-# addressbook/contact-editor/e-contact-editor.c:1255
-# addressbook/gui/widgets/e-addressbook-view.c:719
 #. 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
@@ -7241,12 +6420,10 @@ msgstr "11日至20日"
 msgid "21st to 31st"
 msgstr "21日至31日"
 
-# calendar/gui/event-editor.c:474
 #: ../calendar/gui/dialogs/recurrence-page.c:1083
 msgid "day"
 msgstr "天"
 
-# calendar/gui/event-editor.c:601
 #. 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])."
 #.
@@ -7254,36 +6431,27 @@ msgstr "天"
 msgid "on the"
 msgstr "在第"
 
-# calendar/gui/event-editor.c:754
 #: ../calendar/gui/dialogs/recurrence-page.c:1412
 msgid "occurrences"
 msgstr "次"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
 #: ../calendar/gui/dialogs/recurrence-page.c:2378
 msgid "Date/Time"
 msgstr "日期/時間"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:1
 msgid "<b>Exceptions</b>"
 msgstr "<b>例外</b>"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:2
 #: ../mail/mail-config.glade.h:2
 msgid "<b>Preview</b>"
 msgstr "<b>預覽</b>"
 
-# calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:3
 msgid "<b>Recurrence</b>"
 msgstr "<b>週期</b>"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #. 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/recurrence-page.glade.h:6
@@ -7296,52 +6464,41 @@ msgstr "每"
 msgid "This appointment rec_urs"
 msgstr "這個約會的循環規則為(_U)"
 
-# calendar/gui/event-editor-dialog.glade.h:38
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][day(s)][forever]' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:19
 msgid "forever"
 msgstr "永遠"
 
-# calendar/gui/event-editor-dialog.glade.h:43
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][month(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:22
 msgid "month(s)"
 msgstr "月"
 
-# calendar/gui/event-editor-dialog.glade.h:46
 #. TRANSLATORS: Entire string is for example:
 #. 'This appointment recurs/Every[x][week(s)][for][1]occurrences' (dropdown menu options are in [square brackets])
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:28
 msgid "week(s)"
 msgstr "週"
 
-# calendar/gui/event-editor-dialog.glade.h:47
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:29
 msgid "year(s)"
 msgstr "年"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../calendar/gui/dialogs/task-details-page.c:411
 #: ../calendar/gui/dialogs/task-details-page.c:431
 msgid "Completed date is wrong"
 msgstr "完成日期錯誤 "
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../calendar/gui/dialogs/task-details-page.c:518
 msgid "Web Page"
 msgstr "網頁"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/task-details-page.glade.h:1
 msgid "<span weight=\"bold\">Miscellaneous</span>"
 msgstr "<span weight=\"bold\">雜項</span>"
 
-# views/mail/galview.xml.h:4
 #: ../calendar/gui/dialogs/task-details-page.glade.h:2
 msgid "<span weight=\"bold\">Status</span>"
 msgstr "<span weight=\"bold\">狀態</span>"
@@ -7358,21 +6515,12 @@ msgstr "<span weight=\"bold\">狀態</span>"
 msgid "Completed"
 msgstr "已完成"
 
-# calendar/gui/calendar-model.c:497
-# calendar/gui/calendar-model.c:1066
-# calendar/gui/dialogs/task-editor-dialog.glade.h:10
-# calendar/gui/e-calendar-table.c:345
-# mail/message-list.c:689
 #: ../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:1031
 msgid "High"
 msgstr "高"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
 #: ../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
@@ -7382,11 +6530,6 @@ msgstr "高"
 msgid "In Progress"
 msgstr "進行中"
 
-# calendar/gui/calendar-model.c:501
-# calendar/gui/calendar-model.c:1070
-# calendar/gui/dialogs/task-editor-dialog.glade.h:12
-# calendar/gui/e-calendar-table.c:347
-# mail/message-list.c:687
 #: ../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:1029
@@ -7400,10 +6543,6 @@ msgstr "低"
 msgid "Normal"
 msgstr "正常"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../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
@@ -7416,14 +6555,10 @@ msgstr "未開始"
 msgid "P_ercent complete:"
 msgstr "完成百分比(_E):"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Stat_us:"
 msgstr "狀態(_U):"
 
-# calendar/gui/calendar-model.c:1064
-# calendar/gui/dialogs/task-editor-dialog.glade.h:22
-# calendar/gui/e-calendar-table.c:348
 #: ../calendar/gui/dialogs/task-details-page.glade.h:12
 #: ../calendar/gui/e-calendar-table.c:390
 msgid "Undefined"
@@ -7447,8 +6582,6 @@ msgstr "網頁(_W):"
 msgid "_Task"
 msgstr "工作(_T)"
 
-# addressbook/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../calendar/gui/dialogs/task-editor.c:429
 msgid "Task Details"
 msgstr "工作詳細資料"
@@ -7457,13 +6590,11 @@ msgstr "工作詳細資料"
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
-# addressbook/gui/component/addressbook.c:438
 #: ../calendar/gui/dialogs/task-page.c:1650
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法在 '%s' 開啟工作。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/dialogs/task-page.glade.h:1
 msgid "Atte_ndees..."
 msgstr "到會者(_N)..."
@@ -7496,7 +6627,6 @@ msgstr "<b>發佈頻率</b>"
 msgid "<b>Publishing _Location</b>"
 msgstr "<b>發佈位置(_L)</b>"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:5
 msgid "Free/Busy Publishing Settings"
 msgstr "空閒/忙碌發佈設定"
@@ -7514,8 +6644,6 @@ msgstr "手動(_M)"
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-# addressbook/gui/component/addressbook-config.c:352
-# mail/mail-config.glade.h:60
 #: ../calendar/gui/dialogs/url-editor-dialog.glade.h:9
 #: ../plugins/publish-calendar/publish-calendar.glade.h:25
 msgid "_Remember password"
@@ -7530,7 +6658,6 @@ msgstr "使用者名稱(_U):"
 msgid "_Weekly"
 msgstr "每週(_W)"
 
-# calendar/gui/event-editor.c:1543
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:396
 #, c-format
@@ -7539,7 +6666,6 @@ msgid_plural "%d days"
 msgstr[0] "%d 日"
 msgstr[1] "%d 日"
 
-# calendar/gui/event-editor.c:1548
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
 #: ../calendar/gui/e-alarm-list.c:402
 #, c-format
@@ -7552,7 +6678,6 @@ msgstr[1] "%d 週"
 msgid "Unknown action to be performed"
 msgstr "要執行的未知動作"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:478
@@ -7560,7 +6685,6 @@ msgstr "要執行的未知動作"
 msgid "%s %s before the start of the appointment"
 msgstr "於約會開始前 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:483
@@ -7568,7 +6692,6 @@ msgstr "於約會開始前 %2$s%1$s"
 msgid "%s %s after the start of the appointment"
 msgstr "於約會開始後 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:490
@@ -7576,7 +6699,6 @@ msgstr "於約會開始後 %2$s%1$s"
 msgid "%s at the start of the appointment"
 msgstr "%s 於約會開始時"
 
-# calendar/gui/event-editor.c:1612
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:501
@@ -7584,7 +6706,6 @@ msgstr "%s 於約會開始時"
 msgid "%s %s before the end of the appointment"
 msgstr "於約會結束前 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1624
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
 #: ../calendar/gui/e-alarm-list.c:506
@@ -7592,7 +6713,6 @@ msgstr "於約會結束前 %2$s%1$s"
 msgid "%s %s after the end of the appointment"
 msgstr "於約會結束後 %2$s%1$s"
 
-# calendar/gui/event-editor.c:1624
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
 #: ../calendar/gui/e-alarm-list.c:513
@@ -7614,7 +6734,6 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-cal-component-memo-preview.c:72
 #: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2861
 #, c-format
@@ -7626,16 +6745,12 @@ msgstr "按一下來開啟 %s"
 msgid "Untitled"
 msgstr "未命名"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:18
 #: ../calendar/gui/e-cal-component-memo-preview.c:204
 #: ../calendar/gui/e-cal-component-preview.c:195
 #: ../calendar/gui/e-cal-component-preview.c:206
 msgid "Start Date:"
 msgstr "開始日期："
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../calendar/gui/e-cal-component-memo-preview.c:217
 #: ../calendar/gui/e-cal-component-preview.c:269
 #: ../calendar/gui/e-itip-control.c:1159
@@ -7645,25 +6760,21 @@ msgstr "開始日期："
 msgid "Description:"
 msgstr "描述:"
 
-# addressbook/contact-editor/contact-editor.glade.h:16
 #: ../calendar/gui/e-cal-component-memo-preview.c:250
 #: ../calendar/gui/e-cal-component-preview.c:301
 msgid "Web Page:"
 msgstr "網頁："
 
-# calendar/gui/e-itip-control.glade.h:11
 #: ../calendar/gui/e-cal-component-preview.c:188
 #: ../calendar/gui/e-itip-control.c:1103
 #: ../calendar/gui/e-itip-control.glade.h:9
 msgid "Summary:"
 msgstr "摘要:"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:25
 #: ../calendar/gui/e-cal-component-preview.c:217
 msgid "Due Date:"
 msgstr "截止日期："
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #. write status
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:224
@@ -7673,47 +6784,34 @@ msgstr "截止日期："
 msgid "Status:"
 msgstr "狀態:"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/gui/e-cal-component-preview.c:248
 msgid "Priority:"
 msgstr "優先程度："
 
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
 #: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
 #: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:365
 msgid "Public"
 msgstr "公開"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
 #: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:366
 msgid "Private"
 msgstr "私人"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
 #: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:367
 msgid "Confidential"
 msgstr "機密"
 
-# calendar/gui/e-calendar-table.c:153
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 msgid "End Date"
 msgstr "結束日期"
 
-# calendar/gui/e-calendar-table.c:154
 #: ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:4
 msgid "Start Date"
 msgstr "開始日期"
 
-# calendar/gui/e-calendar-table.c:159
 #: ../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
@@ -7721,20 +6819,17 @@ msgstr "開始日期"
 msgid "Summary"
 msgstr "摘要"
 
-# ui/evolution-calendar.xml.h:36
 #: ../calendar/gui/e-cal-model-calendar.c:183
 #: ../calendar/gui/e-calendar-table.c:439
 msgid "Free"
 msgstr "空閒"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: ../calendar/gui/e-cal-model-calendar.c:186
 #: ../calendar/gui/e-calendar-table.c:440
 #: ../calendar/gui/e-meeting-time-sel.c:412
 msgid "Busy"
 msgstr "忙碌"
 
-# calendar/gui/calendar-model.c:970
 #: ../calendar/gui/e-cal-model-tasks.c:610
 msgid ""
 "The geographical position must be entered in the format: \n"
@@ -7745,7 +6840,6 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-# calendar/gui/calendar-model.c:1584
 #: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:166 ../calendar/gui/e-meeting-store.c:176
@@ -7754,7 +6848,6 @@ msgstr ""
 msgid "Yes"
 msgstr "是"
 
-# calendar/gui/calendar-model.c:1584
 #: ../calendar/gui/e-cal-model-tasks.c:1012 ../calendar/gui/e-cal-model.c:930
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:178
@@ -7778,28 +6871,22 @@ msgstr "否"
 msgid "Unknown"
 msgstr "不明"
 
-# calendar/gui/calendar-model.c:1576
 #: ../calendar/gui/e-cal-model.c:926
 msgid "Recurring"
 msgstr "循環模式"
 
-# calendar/gui/calendar-model.c:1578
 #: ../calendar/gui/e-cal-model.c:928
 msgid "Assigned"
 msgstr "已指定"
 
-# widgets/misc/e-filter-bar.h:94
-# widgets/misc/e-filter-bar.h:101
 #: ../calendar/gui/e-cal-popup.c:177 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "另存新檔..."
 
-# mail/mail-display.c:196
 #: ../calendar/gui/e-cal-popup.c:193 ../mail/em-format-html-display.c:2112
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
-# mail/mail-search.c:138
 #: ../calendar/gui/e-cal-popup.c:222 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
@@ -7820,68 +6907,55 @@ msgstr "設為背景(_B)"
 msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
 
-# mail/mail-display.c:299
 #: ../calendar/gui/e-cal-popup.c:400 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-# calendar/gui/e-calendar-table.c:367
 #: ../calendar/gui/e-calendar-table.c:409
 msgid "0%"
 msgstr "0%"
 
-# calendar/gui/e-calendar-table.c:368
 #: ../calendar/gui/e-calendar-table.c:410
 msgid "10%"
 msgstr "10%"
 
-# calendar/gui/e-calendar-table.c:369
 #: ../calendar/gui/e-calendar-table.c:411
 msgid "20%"
 msgstr "20%"
 
-# calendar/gui/e-calendar-table.c:370
 #: ../calendar/gui/e-calendar-table.c:412
 msgid "30%"
 msgstr "30%"
 
-# calendar/gui/e-calendar-table.c:371
 #: ../calendar/gui/e-calendar-table.c:413
 msgid "40%"
 msgstr "40%"
 
-# calendar/gui/e-calendar-table.c:372
 #: ../calendar/gui/e-calendar-table.c:414
 msgid "50%"
 msgstr "50%"
 
-# calendar/gui/e-calendar-table.c:373
 #: ../calendar/gui/e-calendar-table.c:415
 msgid "60%"
 msgstr "60%"
 
-# calendar/gui/e-calendar-table.c:374
 #: ../calendar/gui/e-calendar-table.c:416
 msgid "70%"
 msgstr "70%"
 
-# calendar/gui/e-calendar-table.c:375
 #: ../calendar/gui/e-calendar-table.c:417
 msgid "80%"
 msgstr "80%"
 
-# calendar/gui/e-calendar-table.c:376
 #: ../calendar/gui/e-calendar-table.c:418
 msgid "90%"
 msgstr "90%"
 
-# calendar/gui/e-calendar-table.c:377
 #: ../calendar/gui/e-calendar-table.c:419
 msgid "100%"
 msgstr "100%"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/e-calendar-table.c:704
 #: ../calendar/gui/e-calendar-view.c:675 ../calendar/gui/e-memo-table.c:482
 msgid "Deleting selected objects"
@@ -7892,14 +6966,12 @@ msgstr "刪除選定的物件"
 msgid "Updating objects"
 msgstr "更新物件"
 
-# composer/e-msg-composer.c:774
 #: ../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:1348
 msgid "Save as..."
 msgstr "另存新檔..."
 
-# ui/evolution-tasks.xml.h:3
 #: ../calendar/gui/e-calendar-table.c:1277
 #: ../calendar/gui/e-calendar-view.c:1681
 msgid "New _Task"
@@ -7943,13 +7015,12 @@ msgstr "指派工作(_A)"
 #: ../calendar/gui/e-calendar-table.c:1294 ../calendar/gui/e-memo-table.c:914
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
-msgstr "以 iCalendar 轉寄(_F)"
+msgstr "以 iCale_ndar 轉寄"
 
 #: ../calendar/gui/e-calendar-table.c:1295
 msgid "_Mark as Complete"
 msgstr "標示為完成(_M)"
 
-# calendar/gui/e-calendar-table.c:713
 #: ../calendar/gui/e-calendar-table.c:1296
 msgid "_Mark Selected Tasks as Complete"
 msgstr "標示選定的工作為已完成(_M)"
@@ -7958,7 +7029,6 @@ msgstr "標示選定的工作為已完成(_M)"
 msgid "_Mark as Incomplete"
 msgstr "標示為未完成(_M)"
 
-# calendar/gui/e-calendar-table.c:713
 #: ../calendar/gui/e-calendar-table.c:1298
 msgid "_Mark Selected Tasks as Incomplete"
 msgstr "標示選定的工作為未完成(_M)"
@@ -7967,60 +7037,45 @@ msgstr "標示選定的工作為未完成(_M)"
 msgid "_Delete Selected Tasks"
 msgstr "刪除選定的工作(_D)"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-calendar-table.c:1536
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "請按這裡增加新的工作"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:2
 #, no-c-format
 msgid "% Complete"
 msgstr "% 完成"
 
-# camel/camel-filter-driver.c:694
-# camel/camel-filter-driver.c:793
 #: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:652
 msgid "Complete"
 msgstr "完成"
 
-# calendar/gui/e-calendar-table.c:152
 #: ../calendar/gui/e-calendar-table.etspec.h:6
 msgid "Completion date"
 msgstr "完成日期"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 msgid "Due date"
 msgstr "截止日期"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-# calendar/gui/e-calendar-table.c:158
 #: ../calendar/gui/e-calendar-table.etspec.h:8
 #: ../plugins/save-calendar/csv-format.c:397
 msgid "Priority"
 msgstr "優先順序"
 
-# calendar/gui/e-calendar-table.c:154
 #: ../calendar/gui/e-calendar-table.etspec.h:9
 msgid "Start date"
 msgstr "開始日期"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "工作排序"
 
-# mail/mail-ops.c:898
 #: ../calendar/gui/e-calendar-view.c:1367
 msgid "Moving items"
 msgstr "移動項目"
 
-# mail/mail-ops.c:898
 #: ../calendar/gui/e-calendar-view.c:1369
 msgid "Copying items"
 msgstr "複製項目"
@@ -8033,8 +7088,6 @@ msgstr "新增約會(_A)..."
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/e-calendar-view.c:1680
 msgid "New _Meeting"
 msgstr "新增會議(_M)"
@@ -8070,10 +7123,8 @@ msgstr "會議排程(_S)..."
 
 #: ../calendar/gui/e-calendar-view.c:1714
 msgid "_Forward as iCalendar..."
-msgstr "以 iCalendar 轉寄(_F)..."
+msgstr "以 iCale_ndar 轉寄..."
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
 #: ../calendar/gui/e-calendar-view.c:1715
 msgid "_Reply"
 msgstr "回覆(_R)"
@@ -8084,8 +7135,6 @@ msgstr "回覆(_R)"
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
-# calendar/gui/e-day-view.c:3175
-# calendar/gui/e-week-view.c:3309
 #: ../calendar/gui/e-calendar-view.c:1721
 msgid "Make this Occurrence _Movable"
 msgstr "將這個事件標示成可移動(_M)"
@@ -8098,21 +7147,18 @@ msgstr "刪除這個事件(_O)"
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
-# calendar/gui/e-itip-control.glade.h:9
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #: ../calendar/gui/e-calendar-view.c:2175
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "召集人: %s <%s>"
 
-# calendar/gui/e-itip-control.glade.h:9
 #. With SunOne accouts, there may be no ':' in organiser.value
 #: ../calendar/gui/e-calendar-view.c:2179
 #, c-format
 msgid "Organizer: %s"
 msgstr "會議召集人: %s"
 
-# addressbook/backend/ebook/e-card.c:3442
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
 #: ../calendar/gui/e-calendar-view.c:2195 ../calendar/gui/print.c:2349
 #, c-format
@@ -8125,21 +7171,16 @@ msgstr "位置：%s"
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:116
 msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %m/%d/%Y %H:%M:%S"
+msgstr "%Y-%m-%d (%a) %H:%M:%S"
 
-# calendar/gui/calendar-model.c:797
-# e-util/e-time-utils.c:287
 #. strftime format of a weekday, a date and a time, 12-hour.
 #: ../calendar/gui/e-cell-date-edit-text.c:119
 msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%Y-%m-%d (%a) %p %I:%M:%S"
 
-# calendar/gui/calendar-model.c:802
 #: ../calendar/gui/e-cell-date-edit-text.c:124
 #, c-format
 msgid ""
@@ -8151,7 +7192,6 @@ msgstr ""
 "\n"
 "%s"
 
-# calendar/gui/e-day-view-time-item.c:519
 #. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
 #. * to change the length of the time division in the calendar day view, e.g.
 #. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
@@ -8161,9 +7201,6 @@ msgstr ""
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
 
-# calendar/gui/e-day-view-top-item.c:274
-# calendar/gui/e-day-view.c:1294
-# calendar/gui/e-week-view-main-item.c:325
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
 #. strftime format %A = full weekday name, %d = day of
@@ -8177,30 +7214,22 @@ msgstr "間隔 %02i 分鐘"
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
-# calendar/gui/e-day-view.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
 #. 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:1087
 #: ../calendar/gui/e-week-view.c:503 ../calendar/gui/print.c:858
 msgid "am"
 msgstr "上午"
 
-# calendar/gui/e-day-view.c:573
-# calendar/gui/e-week-view.c:303
-# calendar/gui/print.c:616
 #. 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:1090
 #: ../calendar/gui/e-week-view.c:506 ../calendar/gui/print.c:860
 msgid "pm"
 msgstr "下午"
 
-# calendar/gui/event-editor-dialog.glade.h:26
 #: ../calendar/gui/e-itip-control.c:759
 msgid "Yes. (Complex Recurrence)"
 msgstr "是。(複雜循環)"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../calendar/gui/e-itip-control.c:770
 #, c-format
 msgid "Every day"
@@ -8208,7 +7237,6 @@ msgid_plural "Every %d days"
 msgstr[0] "每天"
 msgstr[1] "每 %d 天"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../calendar/gui/e-itip-control.c:775
 #, c-format
 msgid "Every week"
@@ -8223,7 +7251,6 @@ msgid_plural "Every %d weeks on "
 msgstr[0] "每週於"
 msgstr[1] "每 %d 週於"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../calendar/gui/e-itip-control.c:785
 msgid " and "
 msgstr " 和 "
@@ -8245,7 +7272,6 @@ msgid_plural "every %d months"
 msgstr[0] "每月"
 msgstr[1] "每 %d 月"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../calendar/gui/e-itip-control.c:816
 #, c-format
 msgid "Every year"
@@ -8264,8 +7290,6 @@ msgstr[1] "總共 %d 次"
 msgid ", ending on "
 msgstr "，結束於 "
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
 #: ../calendar/gui/e-itip-control.c:857
 msgid "Starts"
 msgstr "開始"
@@ -8274,27 +7298,20 @@ msgstr "開始"
 msgid "Ends"
 msgstr "結束"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../calendar/gui/e-itip-control.c:904
 #: ../plugins/save-calendar/csv-format.c:395
 msgid "Due"
 msgstr "截止"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/e-itip-control.c:944 ../calendar/gui/e-itip-control.c:1001
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #. Title
 #: ../calendar/gui/e-itip-control.c:961
 msgid "iCalendar Error"
 msgstr "iCalendar 錯誤"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../calendar/gui/e-itip-control.c:1033 ../calendar/gui/e-itip-control.c:1049
 #: ../calendar/gui/e-itip-control.c:1060 ../calendar/gui/e-itip-control.c:1077
 #: ../plugins/itip-formatter/itip-view.c:340
@@ -8321,7 +7338,6 @@ msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動�
 msgid "Accepted"
 msgstr "接受"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-itip-control.c:1136 ../calendar/gui/itip-utils.c:688
 #: ../plugins/itip-formatter/itip-formatter.c:1751
 msgid "Tentatively Accepted"
@@ -8351,7 +7367,6 @@ msgstr "工作已經取消，但是在您的工作清單中找不到"
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> 已經發佈會議資訊。"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/e-itip-control.c:1306
 msgid "Meeting Information"
 msgstr "會議資訊"
@@ -8366,8 +7381,6 @@ msgstr "<b>%s</b> 邀請 %s 出席此次會議。"
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> 邀請您出席此次會議。"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/e-itip-control.c:1315
 msgid "Meeting Proposal"
 msgstr "會議提案"
@@ -8378,7 +7391,6 @@ msgstr "會議提案"
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b> 希望加入一個既存的會議。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #: ../calendar/gui/e-itip-control.c:1322
 msgid "Meeting Update"
 msgstr "會議更新"
@@ -8397,8 +7409,6 @@ msgstr "會議更新請求"
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> 已經答覆了會議請求。"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/e-itip-control.c:1335
 msgid "Meeting Reply"
 msgstr "會議答覆"
@@ -8408,8 +7418,6 @@ msgstr "會議答覆"
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> 已經消取會議。"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../calendar/gui/e-itip-control.c:1343
 msgid "Meeting Cancelation"
 msgstr "會議取消"
@@ -8420,7 +7428,6 @@ msgstr "會議取消"
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> 傳送了一個難以理解的訊息。"
 
-# mail/mail-search.c:268
 #: ../calendar/gui/e-itip-control.c:1354
 msgid "Bad Meeting Message"
 msgstr "不正確的會議訊息"
@@ -8430,7 +7437,6 @@ msgstr "不正確的會議訊息"
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> 已經發佈了工作資訊。"
 
-# widgets/misc/e-messagebox.c:152
 #: ../calendar/gui/e-itip-control.c:1382
 msgid "Task Information"
 msgstr "工作資訊"
@@ -8447,7 +7453,7 @@ msgstr "<b>%s</b> 要求您進行工作。"
 
 #: ../calendar/gui/e-itip-control.c:1392
 msgid "Task Proposal"
-msgstr "工作計畫"
+msgstr "工作計劃"
 
 #. FIXME Whats going on here?
 #: ../calendar/gui/e-itip-control.c:1398
@@ -8473,8 +7479,6 @@ msgstr "工作更新請求"
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> 已經回覆指派的工作。"
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
 #: ../calendar/gui/e-itip-control.c:1412
 msgid "Task Reply"
 msgstr "工作回覆"
@@ -8488,7 +7492,6 @@ msgstr "<b>%s</b> 已經取消工作。"
 msgid "Task Cancelation"
 msgstr "工作取消"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/gui/e-itip-control.c:1431
 msgid "Bad Task Message"
 msgstr "不正確的工作訊息"
@@ -8498,7 +7501,6 @@ msgstr "不正確的工作訊息"
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> 已經發佈空閒/忙碌資訊。"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/e-itip-control.c:1456
 msgid "Free/Busy Information"
 msgstr "空閒/忙碌資訊"
@@ -8508,7 +7510,6 @@ msgstr "空閒/忙碌資訊"
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> 請求您的空閒/忙碌資訊。"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/e-itip-control.c:1461
 msgid "Free/Busy Request"
 msgstr "空閒/忙碌請求"
@@ -8518,17 +7519,14 @@ msgstr "空閒/忙碌請求"
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> 已經答覆空閒/忙碌請求。"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../calendar/gui/e-itip-control.c:1466
 msgid "Free/Busy Reply"
 msgstr "空閒/忙碌回覆"
 
-# mail/mail-callbacks.c:1407
 #: ../calendar/gui/e-itip-control.c:1471
 msgid "Bad Free/Busy Message"
 msgstr "不正確的空閒/忙碌訊息"
 
-# camel/providers/local/camel-mbox-folder.c:368
 #: ../calendar/gui/e-itip-control.c:1546
 msgid "The message does not appear to be properly formed"
 msgstr "郵件似乎沒有被適當地組成"
@@ -8545,7 +7543,6 @@ msgstr "附件並未包含合法的行事曆訊息"
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: ../calendar/gui/e-itip-control.c:1904
 msgid "Update complete\n"
 msgstr "更新完成\n"
@@ -8579,8 +7576,6 @@ msgstr "項目傳送！\n"
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../calendar/gui/e-itip-control.c:2130
 msgid "Choose an action:"
 msgstr "選擇一個動作:"
@@ -8594,7 +7589,6 @@ msgstr "更新"
 msgid "Accept"
 msgstr "接受"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-itip-control.c:2231
 msgid "Tentatively accept"
 msgstr "暫時接受"
@@ -8604,7 +7598,6 @@ msgstr "暫時接受"
 msgid "Decline"
 msgstr "婉拒"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/e-itip-control.c:2261
 msgid "Send Free/Busy Information"
 msgstr "送出空閒/忙碌資訊"
@@ -8613,55 +7606,44 @@ msgstr "送出空閒/忙碌資訊"
 msgid "Update respondent status"
 msgstr "更新回應狀態"
 
-# widgets/misc/e-messagebox.c:152
 #: ../calendar/gui/e-itip-control.c:2317
 msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
-# ui/evolution-mail.xml.h:2
 #: ../calendar/gui/e-itip-control.c:2345 ../calendar/gui/itip-utils.c:708
 #: ../mail/mail-send-recv.c:447 ../mail/mail-send-recv.c:500
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
 
-# calendar/gui/e-itip-control.glade.h:3
 #: ../calendar/gui/e-itip-control.glade.h:1
 msgid "--to--"
 msgstr "--到--"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/gui/e-itip-control.glade.h:2
 msgid "Calendar Message"
 msgstr "行事曆訊息"
 
-# calendar/gui/e-itip-control.glade.h:5
 #: ../calendar/gui/e-itip-control.glade.h:3
 msgid "Date:"
 msgstr "日期:"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../calendar/gui/e-itip-control.glade.h:5
 msgid "Loading Calendar"
 msgstr "載入行事曆"
 
-# calendar/gui/e-itip-control.glade.h:8
 #: ../calendar/gui/e-itip-control.glade.h:6
 msgid "Loading calendar..."
 msgstr "載入行事曆..."
 
-# calendar/gui/e-itip-control.glade.h:10
 #: ../calendar/gui/e-itip-control.glade.h:8
 msgid "Server Message:"
 msgstr "伺服器訊息:"
 
-# addressbook/gui/widgets/e-addressbook-view.c:712
 #: ../calendar/gui/e-meeting-list-view.c:70
 msgid "Chair Persons"
 msgstr "主席"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/e-meeting-list-view.c:71
 #: ../calendar/gui/e-meeting-list-view.c:154
 msgid "Required Participants"
@@ -8671,7 +7653,6 @@ msgstr "出席者"
 msgid "Optional Participants"
 msgstr "列席者"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:73
 msgid "Resources"
 msgstr "資源"
@@ -8689,7 +7670,6 @@ msgstr "個別"
 msgid "Group"
 msgstr "群組"
 
-# addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:167
 #: ../calendar/gui/e-meeting-store.c:103 ../calendar/gui/e-meeting-store.c:120
 msgid "Resource"
@@ -8700,13 +7680,11 @@ msgstr "資源"
 msgid "Room"
 msgstr "會議室"
 
-# addressbook/contact-editor/e-contact-editor.c:1247
 #: ../calendar/gui/e-meeting-list-view.c:179
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:151
 msgid "Chair"
 msgstr "主席"
 
-# mail/mail-config.glade.h:61
 #: ../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
@@ -8723,15 +7701,12 @@ msgstr "列席者"
 msgid "Non-Participant"
 msgstr "缺席者"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../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
 msgid "Needs Action"
 msgstr "需要動作"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../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:411
@@ -8750,26 +7725,17 @@ msgstr "已委派"
 msgid "Attendee                          "
 msgstr "到會者"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 msgid "In Process"
 msgstr "進行中"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. 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:2113
 msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
-# e-util/e-time-utils.c:269
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
 #. This is a strftime() format string %a = abbreviated weekday
 #. name, %m = month number, %d = month day, %Y = full year.
 #. This is a strftime() format string %a = abbreviated weekday name,
@@ -8777,30 +7743,22 @@ msgstr "%A, %B %d, %Y"
 #: ../calendar/gui/e-meeting-time-sel-item.c:468
 #: ../calendar/gui/e-meeting-time-sel.c:2146
 msgid "%a %m/%d/%Y"
-msgstr "%a %m/%d/%Y"
+msgstr "%Y-%m-%d (%a)"
 
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
 #. This is a strftime() format string %m = month number,
 #. %d = month day, %Y = full year.
 #: ../calendar/gui/e-meeting-time-sel-item.c:472
 msgid "%m/%d/%Y"
-msgstr "%m/%d/%Y"
+msgstr "%Y-%m-%d"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: ../calendar/gui/e-meeting-time-sel.c:413 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "不在辦公室"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "No Information"
 msgstr "沒有資訊"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../calendar/gui/e-meeting-time-sel.c:428
 msgid "A_ttendees..."
 msgstr "到會者(_T)..."
@@ -8833,22 +7791,18 @@ msgstr "自動選擇(_A)"
 msgid ">_>"
 msgstr ">_>"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:545
 #: ../calendar/gui/e-meeting-time-sel.c:552
 msgid "_All people and resources"
 msgstr "所有人員和資源(_A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:558
 #: ../calendar/gui/e-meeting-time-sel.c:561
 msgid "All _people and one resource"
 msgstr "所有人員和一個資源(_P)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:571
 #: ../calendar/gui/e-meeting-time-sel.c:570
 msgid "_Required people"
 msgstr "必要的人員(_R)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:584
 #: ../calendar/gui/e-meeting-time-sel.c:579
 msgid "Required people and _one resource"
 msgstr "必要人員和一個資源(_O)"
@@ -8865,20 +7819,14 @@ msgstr "結束時刻(_E):"
 msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../calendar/gui/e-memo-table.c:1070 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../calendar/gui/e-memo-table.etspec.h:3
 msgid "Memo sort"
 msgstr "備忘錄排序"
 
-# mail/mail-mt.c:190
 #: ../calendar/gui/e-memos.c:724 ../calendar/gui/e-tasks.c:837
 #: ../calendar/gui/gnome-cal.c:2743
 #, c-format
@@ -8889,56 +7837,45 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/e-memos.c:772
 msgid "Loading memos"
 msgstr "正在載入備忘錄"
 
-# mail/mail-ops.c:1262
 #: ../calendar/gui/e-memos.c:853
 #, c-format
 msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/e-memos.c:1026 ../calendar/gui/e-tasks.c:1240
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
-# camel/camel-smime-context.c:194
 #: ../calendar/gui/e-pub-utils.c:322
 #, c-format
 msgid "Enter the password for %s"
 msgstr "輸入 %s 的密碼"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/e-tasks.c:885
 msgid "Loading tasks"
 msgstr "正在載入工作"
 
-# mail/mail-ops.c:1262
 #: ../calendar/gui/e-tasks.c:972
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
-# calendar/gui/e-calendar-table.c:152
 #: ../calendar/gui/e-tasks.c:1217
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
-# mail/mail-ops.c:1449
 #: ../calendar/gui/e-tasks.c:1267
 msgid "Expunging"
 msgstr "除去中"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../calendar/gui/e-timezone-entry.c:135
 msgid "Select Timezone"
 msgstr "選擇一個時區"
 
-# calendar/gui/e-week-view-main-item.c:342
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
@@ -8951,7 +7888,6 @@ msgstr "%d %B"
 msgid "Updating query"
 msgstr "正在更新查詢"
 
-# widgets/menus/gal-view-menus.c:176
 #: ../calendar/gui/gnome-cal.c:2404
 msgid "_Custom View"
 msgstr "自訂檢視(_C)"
@@ -8960,41 +7896,30 @@ msgstr "自訂檢視(_C)"
 msgid "_Save Custom View"
 msgstr "儲存自訂檢視(_S)"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../calendar/gui/gnome-cal.c:2410
 msgid "_Define Views..."
 msgstr "定義檢視(_D)..."
 
-# calendar/gui/e-day-view.c:3146
-# ui/evolution-calendar.xml.h:16
 #: ../calendar/gui/gnome-cal.c:2574
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "載入 %s 的約會"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/gnome-cal.c:2593
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "載入 %s 的工作"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/gnome-cal.c:2602
 #, c-format
 msgid "Loading memos at %s"
 msgstr "正在載入 %s 的備忘錄"
 
-# mail/mail-display.c:299
 #: ../calendar/gui/gnome-cal.c:2708
 #, c-format
 msgid "Opening %s"
 msgstr "開啟 %s"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
 #: ../calendar/gui/gnome-cal.c:3636
 msgid "Purging"
 msgstr "清除"
@@ -9043,7 +7968,6 @@ msgstr "十一月"
 msgid "October"
 msgstr "十月"
 
-# addressbook/gui/component/select-names/select-names.glade.h:3
 #: ../calendar/gui/goto-dialog.glade.h:12
 msgid "Select Date"
 msgstr "選擇日期"
@@ -9065,27 +7989,22 @@ msgstr "必須指定一個召集人。"
 msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/itip-utils.c:647 ../calendar/gui/itip-utils.c:770
 msgid "Event information"
 msgstr "事件資訊"
 
-# widgets/misc/e-messagebox.c:152
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:772
 msgid "Task information"
 msgstr "工作資訊"
 
-# mail/mail-config.glade.h:47
 #: ../calendar/gui/itip-utils.c:651 ../calendar/gui/itip-utils.c:774
 msgid "Journal information"
 msgstr "日誌資訊"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/itip-utils.c:653 ../calendar/gui/itip-utils.c:792
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/itip-utils.c:655
 msgid "Calendar information"
 msgstr "行事曆資訊"
@@ -9094,7 +8013,6 @@ msgstr "行事曆資訊"
 msgid "Updated"
 msgstr "已更新"
 
-# ui/evolution-subscribe.xml.h:4
 #: ../calendar/gui/itip-utils.c:712
 msgid "Refresh"
 msgstr "重整清單"
@@ -9103,13 +8021,11 @@ msgstr "重整清單"
 msgid "Counter-proposal"
 msgstr "計算計劃"
 
-# mail/mail-config.glade.h:61
 #: ../calendar/gui/itip-utils.c:788
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "空閒/忙碌資訊 (%s 到 %s)"
 
-# data/evolution.keys.in.h:2
 #: ../calendar/gui/itip-utils.c:798
 msgid "iCalendar information"
 msgstr "iCalendar 資訊"
@@ -9118,27 +8034,25 @@ msgstr "iCalendar 資訊"
 msgid "You must be an attendee of the event."
 msgstr "您必須是此事件的到會者。"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/memos-component.c:451
 msgid "_New Memo List"
 msgstr "新增備忘錄清單(_N)"
 
-# calendar/gui/event-editor.c:1558
 #: ../calendar/gui/memos-component.c:527
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
-msgstr[0] "%d 備忘錄"
+msgstr[0] "%d 項備忘錄"
+msgstr[1] "%d 項備忘錄"
 
 #: ../calendar/gui/memos-component.c:529 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
-msgstr[0] "，%d 已選擇"
-msgstr[1] "，%d 已選擇"
+msgstr[0] "，已選擇 %d 個"
+msgstr[1] "，已選擇 %d 個"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/memos-component.c:576
 msgid "Failed upgrading memos."
 msgstr "升級備忘錄失敗。"
@@ -9156,41 +8070,30 @@ msgstr "沒有可用的行事曆來建立備忘錄"
 msgid "Memo Source Selector"
 msgstr "備忘錄來源選擇器"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/memos-component.c:1164
 msgid "New memo"
 msgstr "新增備忘錄"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/memos-component.c:1165
 msgid "Mem_o"
 msgstr "備忘錄(_O)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/memos-component.c:1166
 msgid "Create a new memo"
 msgstr "建立新的備忘錄"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../calendar/gui/memos-component.c:1172
 msgid "New shared memo"
 msgstr "新增共用備忘錄"
 
-# calendar/gui/event-editor.c:1558
 #: ../calendar/gui/memos-component.c:1173
 msgid "_Shared memo"
 msgstr "共用備忘錄(_S)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/memos-component.c:1174
 msgid "Create a shared new memo"
 msgstr "建立新的共用備忘錄"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/memos-component.c:1180
 msgid "New memo list"
 msgstr "新備忘錄清單"
@@ -9199,14 +8102,11 @@ msgstr "新備忘錄清單"
 msgid "Memo li_st"
 msgstr "備忘錄清單(_S)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/memos-component.c:1182
 msgid "Create a new memo list"
 msgstr "建立新備忘錄清單"
 
-# ui/evolution-contact-editor.xml.h:6
-# ui/evolution-event-editor.xml.h:37
-# ui/evolution-task-editor-dialog.xml.h:40
+# zh_HK: msgstr "打印備忘錄"
 #: ../calendar/gui/memos-control.c:340
 msgid "Print Memos"
 msgstr "列印備忘錄"
@@ -9238,340 +8138,267 @@ msgstr ""
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
-# shell/e-storage.c:475
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:794
 #, c-format
 msgid "Unable to migrate calendar `%s'"
 msgstr "無法移轉移行事曆 `%s'"
 
-# addressbook/gui/component/addressbook.c:438
 #. FIXME: domain/code
 #: ../calendar/gui/migration.c:962
 #, c-format
 msgid "Unable to migrate tasks `%s'"
 msgstr "無法移轉工作 `%s'"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "1st"
 msgstr "1日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "2nd"
 msgstr "2日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "3rd"
 msgstr "3日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "4th"
 msgstr "4日"
 
-# calendar/gui/print.c:300
 #: ../calendar/gui/print.c:574
 msgid "5th"
 msgstr "5日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "6th"
 msgstr "6日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "7th"
 msgstr "7日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "8th"
 msgstr "8日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "9th"
 msgstr "9日"
 
-# calendar/gui/print.c:301
 #: ../calendar/gui/print.c:575
 msgid "10th"
 msgstr "10日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "11th"
 msgstr "11日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "12th"
 msgstr "12日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "13th"
 msgstr "13日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "14th"
 msgstr "14日"
 
-# calendar/gui/print.c:302
 #: ../calendar/gui/print.c:576
 msgid "15th"
 msgstr "15日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "16th"
 msgstr "16日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "17th"
 msgstr "17日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "18th"
 msgstr "18日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "19th"
 msgstr "19日"
 
-# calendar/gui/print.c:303
 #: ../calendar/gui/print.c:577
 msgid "20th"
 msgstr "20日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "21st"
 msgstr "21日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "22nd"
 msgstr "22日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "23rd"
 msgstr "23日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "24th"
 msgstr "24日"
 
-# calendar/gui/print.c:304
 #: ../calendar/gui/print.c:578
 msgid "25th"
 msgstr "25日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "26th"
 msgstr "26日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "27th"
 msgstr "27日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "28th"
 msgstr "28日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "29th"
 msgstr "29日"
 
-# calendar/gui/print.c:305
 #: ../calendar/gui/print.c:579
 msgid "30th"
 msgstr "30日"
 
-# calendar/gui/print.c:306
 #: ../calendar/gui/print.c:580
 msgid "31st"
 msgstr "31日"
 
-# calendar/gui/print.c:362
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
 #: ../calendar/gui/print.c:655
 msgid "Su"
 msgstr "日"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:655
 msgid "Mo"
 msgstr "一"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:655
 msgid "Tu"
 msgstr "二"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:655
 msgid "We"
 msgstr "三"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:656
 msgid "Th"
 msgstr "四"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:656
 msgid "Fr"
 msgstr "五"
 
-# calendar/gui/print.c:362
 #: ../calendar/gui/print.c:656
 msgid "Sa"
 msgstr "六"
 
-# calendar/gui/print.c:1078
 #. Day
 #: ../calendar/gui/print.c:1936
 msgid "Selected day (%a %b %d %Y)"
-msgstr "選擇的日期(%a %b %d %Y)"
+msgstr "選擇的日期(%Y 年 %-m 月 %-d 日 (%a))"
 
-# calendar/gui/print.c:1092
-# calendar/gui/print.c:1096
 #: ../calendar/gui/print.c:1961 ../calendar/gui/print.c:1965
 msgid "%a %b %d"
-msgstr "%a %b %d"
+msgstr "%-m 月 %-d 日 (%a)"
 
-# calendar/gui/print.c:1093
 #: ../calendar/gui/print.c:1962
 msgid "%a %d %Y"
-msgstr "%a %d %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
-# calendar/gui/event-editor.c:3132
-# calendar/gui/print.c:1097
-# calendar/gui/print.c:1099
-# calendar/gui/print.c:1100
 #: ../calendar/gui/print.c:1966 ../calendar/gui/print.c:1968
 #: ../calendar/gui/print.c:1969
 msgid "%a %b %d %Y"
-msgstr "%a %b %d %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%a)"
 
-# calendar/gui/print.c:1104
 #: ../calendar/gui/print.c:1973
 #, c-format
 msgid "Selected week (%s - %s)"
-msgstr "選擇的週(%s - %s)"
+msgstr "選定的週(%s - %s)"
 
-# calendar/gui/print.c:1112
 #. Month
 #: ../calendar/gui/print.c:1981
 msgid "Selected month (%b %Y)"
-msgstr "選擇的月(%b %Y)"
+msgstr "選定的月份(%Y 年 %-m 月)"
 
-# calendar/gui/print.c:1119
 #. Year
 #: ../calendar/gui/print.c:1988
 msgid "Selected year (%Y)"
-msgstr "選擇的年(%Y)"
+msgstr "選定的年份(%Y)"
 
-# calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/print.c:2317
 msgid "Appointment"
 msgstr "約會"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/print.c:2319
 msgid "Task"
 msgstr "工作"
 
-# calendar/gui/e-itip-control.glade.h:11
 #: ../calendar/gui/print.c:2341
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../calendar/gui/print.c:2392
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../calendar/gui/print.c:2409
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: ../calendar/gui/print.c:2421
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
 #: ../calendar/gui/print.c:2433
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
-# addressbook/backend/ebook/e-card.c:3467
 #: ../calendar/gui/print.c:2447
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
-# ui/evolution-addressbook.xml.h:17
 #: ../calendar/gui/print.c:2458
 msgid "Contacts: "
 msgstr "連絡人: "
 
-# calendar/gui/print.c:1321
-# mail/mail-callbacks.c:1447
-# ui/evolution-addressbook.xml.h:10
-# ui/evolution-calendar.xml.h:24
 #: ../calendar/gui/print.c:2601 ../calendar/gui/print.c:2691
 #: ../calendar/gui/print.c:2820 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "預覽列印"
 
-# ui/evolution-contact-editor.xml.h:6
-# ui/evolution-event-editor.xml.h:37
-# ui/evolution-task-editor-dialog.xml.h:40
+# zh_HK: msgstr "打印項目"
 #: ../calendar/gui/print.c:2636
 msgid "Print Item"
 msgstr "列印項目"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/tasks-component.c:441
 msgid "_New Task List"
 msgstr "新增工作清單(_N)"
 
-# ui/evolution-tasks.xml.h:3
 #: ../calendar/gui/tasks-component.c:517
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
-msgstr[0] "%d 個工作"
-msgstr[1] "%d 個工作"
+msgstr[0] "%d 項工作"
+msgstr[1] "%d 項工作"
 
-# ui/evolution-mail.xml.h:46
 #: ../calendar/gui/tasks-component.c:566
 msgid "Failed upgrading tasks."
 msgstr "升級工作失敗。"
@@ -9589,17 +8416,14 @@ msgstr "沒有可用的行事曆來建立工作"
 msgid "Task Source Selector"
 msgstr "工作來源選擇器"
 
-# ui/evolution-tasks.xml.h:3
 #: ../calendar/gui/tasks-component.c:1170
 msgid "New task"
 msgstr "新增工作"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/tasks-component.c:1172
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
-# calendar/gui/calendar-model.c:1578
 #: ../calendar/gui/tasks-component.c:1178
 msgid "New assigned task"
 msgstr "新指定的工作"
@@ -9608,14 +8432,10 @@ msgstr "新指定的工作"
 msgid "Assigne_d Task"
 msgstr "指派的工作(_D)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/tasks-component.c:1180
 msgid "Create a new assigned task"
 msgstr "建立新指定的工作"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../calendar/gui/tasks-component.c:1186
 msgid "New task list"
 msgstr "新工作清單"
@@ -9624,7 +8444,6 @@ msgstr "新工作清單"
 msgid "Tas_k list"
 msgstr "工作清單(_K)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../calendar/gui/tasks-component.c:1188
 msgid "Create a new task list"
 msgstr "建立新工作清單"
@@ -9636,25 +8455,18 @@ msgid ""
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"這個動作會永久地清除所有標示為已完成的工作。如果您要繼續，您將不能復原這些工"
-"作。\n"
+"這個動作會永久地清除所有標示為已完成的工作。如果您要繼續，您將不能復原這些工作。\n"
 "\n"
 "確定清除這些工作？"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
 #: ../calendar/gui/tasks-control.c:449
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
-# ui/evolution-calendar.xml.h:25
 #: ../calendar/gui/tasks-control.c:483
 msgid "Print Tasks"
 msgstr "列印工作"
 
-# calendar/gui/weekday-picker.c:315
-# calendar/gui/weekday-picker.c:410
 #. The first letter of each day of the week starting with Sunday
 #: ../calendar/gui/weekday-picker.c:319
 msgid "SMTWTFS"
@@ -9669,17 +8481,14 @@ msgstr "約會和會議"
 msgid "Opening calendar"
 msgstr "開啟行事曆"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/importers/icalendar-importer.c:444
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar 檔案 (.ics)"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/importers/icalendar-importer.c:445
 msgid "Evolution iCalendar importer"
 msgstr "Evolution iCalendar 輸入器"
 
-# calendar/gui/event-editor-dialog.glade.h:20
 #: ../calendar/importers/icalendar-importer.c:521
 msgid "Reminder!"
 msgstr "提醒！"
@@ -9688,17 +8497,14 @@ msgstr "提醒！"
 msgid "vCalendar files (.vcf)"
 msgstr "vCalendar 檔案 (.vcf)"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/importers/icalendar-importer.c:574
 msgid "Evolution vCalendar importer"
 msgstr "Evolution vCalendar 輸入器"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../calendar/importers/icalendar-importer.c:736
 msgid "Calendar Events"
 msgstr "行事曆事件"
 
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
 #: ../calendar/importers/icalendar-importer.c:773
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution 行事曆智慧輸入器"
@@ -11233,37 +10039,29 @@ msgstr "太平洋/瓦利斯"
 msgid "Pacific/Yap"
 msgstr "太平洋/雅浦島"
 
-# composer/e-msg-composer-attachment-bar.c:104
 #: ../composer/e-msg-composer-attachment-bar.c:105
 #: ../widgets/misc/e-attachment-bar.c:107
 #, c-format
 msgid "%.0fK"
 msgstr "%.0fK"
 
-# composer/e-msg-composer-attachment-bar.c:108
 #: ../composer/e-msg-composer-attachment-bar.c:108
 #: ../widgets/misc/e-attachment-bar.c:110
 #, c-format
 msgid "%.0fM"
 msgstr "%.0fM"
 
-# composer/e-msg-composer-attachment-bar.c:112
 #: ../composer/e-msg-composer-attachment-bar.c:111
 #: ../widgets/misc/e-attachment-bar.c:113
 #, c-format
 msgid "%.0fG"
 msgstr "%.0fG"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer-attachment-bar.c:740
 #: ../widgets/misc/e-attachment-bar.c:1024
 msgid "Attachment Bar"
 msgstr "附加檔案列"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../composer/e-msg-composer-attachment.c:187
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
@@ -11274,8 +10072,6 @@ msgstr "附加檔案列"
 msgid "Cannot attach file %s: %s"
 msgstr "不能附加檔案 %s： %s"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
 #: ../widgets/misc/e-attachment.c:249 ../widgets/misc/e-attachment.c:448
@@ -11283,42 +10079,33 @@ msgstr "不能附加檔案 %s： %s"
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
 
-# composer/e-msg-composer-attachment.glade.h:2
 #: ../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:4
 #: ../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:6
 #: ../composer/e-msg-composer-attachment.glade.h:4
 #: ../widgets/misc/e-attachment.glade.h:4
 msgid "MIME type:"
 msgstr "MIME 類型:"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../composer/e-msg-composer-hdrs.c:570
 msgid "Posting destination"
 msgstr "張貼的目的端"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../composer/e-msg-composer-hdrs.c:571
 msgid "Choose folders to post the message to."
 msgstr "選取資料夾來張貼郵件。"
 
-# composer/e-msg-composer-hdrs.c:324
 #: ../composer/e-msg-composer-hdrs.c:603
 msgid "Click here for the address book"
 msgstr "按這裡新增目錄服務"
 
-# composer/e-msg-composer-hdrs.c:361
 #.
 #. * Reply-To:
 #. *
@@ -11330,7 +10117,6 @@ msgstr "按這裡新增目錄服務"
 msgid "_Reply-To:"
 msgstr "回覆地址(_R):"
 
-# composer/e-msg-composer-hdrs.c:355
 #.
 #. * From
 #.
@@ -11338,7 +10124,6 @@ msgstr "回覆地址(_R):"
 msgid "Fr_om:"
 msgstr "寄件者(_O):"
 
-# composer/e-msg-composer-hdrs.c:372
 #.
 #. * Subject
 #.
@@ -11346,39 +10131,32 @@ msgstr "寄件者(_O):"
 msgid "S_ubject:"
 msgstr "主旨(_U):"
 
-# composer/e-msg-composer-hdrs.c:386
 #: ../composer/e-msg-composer-hdrs.c:658
 msgid "_To:"
 msgstr "收件者(_T):"
 
-# composer/e-msg-composer-hdrs.c:387
 #: ../composer/e-msg-composer-hdrs.c:659
 msgid "Enter the recipients of the message"
 msgstr "輸入郵件的收件者"
 
-# composer/e-msg-composer-hdrs.c:390
 #: ../composer/e-msg-composer-hdrs.c:662
 msgid "_Cc:"
 msgstr "副本(_C):"
 
-# composer/e-msg-composer-hdrs.c:391
 #: ../composer/e-msg-composer-hdrs.c:663
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "輸入郵件副本的收件者"
 
-# composer/e-msg-composer-hdrs.c:394
 #: ../composer/e-msg-composer-hdrs.c:666
 msgid "_Bcc:"
 msgstr "密件副本(_B):"
 
-# composer/e-msg-composer-hdrs.c:395
 #: ../composer/e-msg-composer-hdrs.c:667
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
 msgstr "輸入郵件密件副本的收件者"
 
-# addressbook/gui/component/addressbook-config.c:409
 #.
 #. * Post-To
 #.
@@ -11390,19 +10168,14 @@ msgstr "張貼到(_P):"
 msgid "Click here to select folders to post to"
 msgstr "按一下這裡，選取要張貼的資料夾"
 
-# addressbook/gui/component/addressbook-config.c:409
 #: ../composer/e-msg-composer-hdrs.c:684
 msgid "Post To:"
 msgstr "張貼到:"
 
-# ui/evolution-message-composer.xml.h:1
 #: ../composer/e-msg-composer-select-file.c:82
 msgid "A_ttach"
 msgstr "附加(_T)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer-select-file.c:243
 msgid "Insert Attachment"
 msgstr "插入附加檔案"
@@ -11410,7 +10183,7 @@ msgstr "插入附加檔案"
 #: ../composer/e-msg-composer.c:827
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "無法簽名送出的郵件：此帳號沒有設定簽名憑證"
+msgstr "無法簽署送出的郵件：此帳號沒有設定簽章憑證"
 
 #: ../composer/e-msg-composer.c:834
 msgid ""
@@ -11418,43 +10191,32 @@ msgid ""
 "account"
 msgstr "無法加密送出的郵件：沒有設定加密憑證(此帳號)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer.c:1294 ../composer/e-msg-composer.c:2530
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../composer/e-msg-composer.c:1297 ../composer/e-msg-composer.c:2533
 #: ../composer/e-msg-composer.c:3897
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
-# camel/camel-sasl-login.c:127
 #: ../composer/e-msg-composer.c:1329 ../composer/e-msg-composer.c:1363
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
 
-# camel/camel-filter-driver.c:671
 #: ../composer/e-msg-composer.c:1401
 msgid "Could not open file"
 msgstr "無法開啟檔案"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
 #: ../composer/e-msg-composer.c:1409
 msgid "Unable to retrieve message from editor"
 msgstr "無法從編輯器取得郵件"
 
-# mail/mail-search.c:138
 #: ../composer/e-msg-composer.c:1688
 msgid "Untitled Message"
 msgstr "未命名的郵件"
 
-# composer/e-msg-composer.c:966
 #. NB: This function is never used anymore
 #: ../composer/e-msg-composer.c:1723
 msgid "Open File"
@@ -11465,13 +10227,10 @@ msgstr "開啟檔案"
 msgid "Autogenerated"
 msgstr "自動產生的"
 
-# mail/mail-config.glade.h:74
 #: ../composer/e-msg-composer.c:2276
 msgid "Si_gnature:"
 msgstr "簽名檔(_G):"
 
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
 #: ../composer/e-msg-composer.c:2544 ../composer/e-msg-composer.c:3779
 #: ../composer/e-msg-composer.c:3782
 msgid "Compose Message"
@@ -11493,12 +10252,11 @@ msgstr "這裡有一些附件要下載。傳送此郵件將無法一併寄出接
 msgid "All accounts have been removed."
 msgstr "所有帳號已經移除。"
 
-# calendar/gui/dialogs/delete-comp.c:87
 #: ../composer/mail-composer.error.xml.h:3
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "確定要放棄您正在撰寫且標題為 '{0}'的郵件？"
+msgstr "確定要放棄正在撰寫，標題為 ‘{0}’ 的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
@@ -11514,31 +10272,24 @@ msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
-msgstr ""
-"關閉此撰寫視窗會永久放棄郵件，除非您選擇儲存郵件至您的「草稿」資料夾。這樣可"
-"以讓您以後再繼續撰寫郵件。"
+msgstr "除非您選擇儲存郵件至「草稿」資料夾，否則關閉此撰寫視窗會永久放棄郵件。儲存草稿可以讓您以後再繼續撰寫郵件。"
 
-# camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:7
 msgid "Could not create composer window."
 msgstr "無法建立撰寫視窗。"
 
-# camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:8
 msgid "Could not create message."
 msgstr "無法建立郵件。"
 
-# mail/mail-crypto.c:59
 #: ../composer/mail-composer.error.xml.h:9
 msgid "Could not read signature file &quot;{0}&quot;."
-msgstr "無法讀取簽名檔案「{0}」。"
+msgstr "無法讀取簽名檔「{0}」。"
 
-# camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:10
 msgid "Could not retrieve messages to attach from {0}."
 msgstr "無法擷取郵件來附加 (從 {0})。"
 
-# mail/mail-crypto.c:59
 #: ../composer/mail-composer.error.xml.h:11
 msgid "Could not save to autosave file &quot;{0}&quot;."
 msgstr "無法儲存至自動儲存檔案「{0}」。"
@@ -11547,16 +10298,14 @@ msgstr "無法儲存至自動儲存檔案「{0}」。"
 msgid "Directories can not be attached to Messages."
 msgstr "無法附加目錄到郵件。"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../composer/mail-composer.error.xml.h:13
 msgid "Do you want to recover unfinished messages?"
 msgstr "要復原未完成的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:14
 msgid "Download in progress. Do you want to send the mail?"
-msgstr "下載尚在進行中。您是否要寄出此郵件？"
+msgstr "下載尚在進行中。是否寄出郵件？"
 
-# shell/e-shortcuts.c:381
 #: ../composer/mail-composer.error.xml.h:15
 msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
@@ -11565,8 +10314,7 @@ msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
-msgstr ""
-"當您撰寫新郵件時，Evolution 意外結束。復原郵件可以讓您從原來中斷的地方繼續。"
+msgstr "當您撰寫新郵件時，Evolution 意外結束。復原郵件可以讓您從原來中斷的地方繼續。"
 
 #: ../composer/mail-composer.error.xml.h:17
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -11576,11 +10324,8 @@ msgstr "檔案 `{0}' 不是一般檔案而且無法在郵件中傳送。"
 msgid ""
 "To attach the contents of this directory, either attach the files in this "
 "directory individually, or create an archive of the directory and attach it."
-msgstr ""
-"要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加"
-"它。"
+msgstr "要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加它。"
 
-# composer/evolution-composer.c:355
 #: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
@@ -11596,69 +10341,52 @@ msgstr ""
 msgid "Unable to activate the address selector control."
 msgstr "無法啟動地址選擇器控制。"
 
-# mail/mail-search.c:138
 #: ../composer/mail-composer.error.xml.h:23
 msgid "Unfinished messages found"
 msgstr "找到未完成的郵件"
 
-# mail/mail-ops.c:1154
 #: ../composer/mail-composer.error.xml.h:24
 msgid "Warning: Modified Message"
 msgstr "警告：編輯過的郵件"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../composer/mail-composer.error.xml.h:25
 msgid "You cannot attach the file `{0}' to this message."
-msgstr "您無法將檔案 `{0}' 附加到此郵件。"
+msgstr "您無法將檔案 ‘{0}’ 附加到此郵件。"
 
-# mail/mail-callbacks.c:146
 #: ../composer/mail-composer.error.xml.h:26
 msgid "You need to configure an account before you can compose mail."
 msgstr "撰寫郵件前，您需要先設定帳號。"
 
-# shell/e-shortcuts-view.c:265
 #: ../composer/mail-composer.error.xml.h:28
 msgid "_Do not Recover"
 msgstr "不要復原(_D)"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:161
-# composer/e-msg-composer-attachment-bar.c:468
-# shell/e-shortcuts-view.c:265
-# shell/e-shortcuts-view.c:388
 #: ../composer/mail-composer.error.xml.h:29
 msgid "_Recover"
 msgstr "復原(_R)"
 
-# mail/mail-callbacks.c:1188
 #: ../composer/mail-composer.error.xml.h:30
 msgid "_Save Message"
 msgstr "儲存郵件(_S)"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../data/evolution.desktop.in.in.h:1
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
 #: ../shell/main.c:522
 msgid "Evolution"
 msgstr "Evolution"
 
-# shell/e-shortcuts-view.c:137
 #: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-commands.c:575
 msgid "Groupware Suite"
 msgstr "Groupware 套裝軟體"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../data/evolution.desktop.in.in.h:3
 msgid "The Evolution PIM and Email Client"
 msgstr "Evolution PIM 與郵件客戶端"
 
-# data/evolution.keys.in.h:1
 #: ../data/evolution.keys.in.in.h:1
 msgid "address card"
 msgstr "地址卡"
 
-# data/evolution.keys.in.h:2
 #: ../data/evolution.keys.in.in.h:2
 msgid "calendar information"
 msgstr "行事曆資訊"
@@ -11672,7 +10400,7 @@ msgid ""
 msgstr ""
 "<b>目前您的狀態是「不在辦公室」。</b>\n"
 "\n"
-"您要變更您的狀態至「在辦公室」嗎？ "
+"要變更狀態為「在辦公室」嗎？ "
 
 #: ../designs/OOA/ooa.glade.h:4
 #: ../plugins/exchange-operations/exchange-oof.glade.h:4
@@ -11718,12 +10446,10 @@ msgstr "外出助理"
 msgid "Yes, Change Status"
 msgstr "是，請變更狀態"
 
-# mail/mail-config.glade.h:57
 #: ../designs/read_receipts/read.glade.h:1
 msgid "<b>Receiving Email</b>"
 msgstr "<b>正在接收電子郵件</b>"
 
-# mail/mail-config.glade.h:65
 #: ../designs/read_receipts/read.glade.h:2
 msgid "<b>Sending Email:</b>"
 msgstr "<b>正在傳送電子郵件:</b>"
@@ -11735,12 +10461,12 @@ msgid ""
 "sent is read, and to specify what Evolution should do when someone requests "
 "a receipt from you.</small>"
 msgstr ""
-"<small>此頁面可以讓您選擇當您傳送的郵件已閱讀時，是否傳送讀信回條，\n"
+"<small>此頁面可以讓您選擇，當別人閱讀您的郵件後，是否傳送讀信回條，\n"
 "以及指定當某人要求您傳送回條時，Evolution 要做什麼。</small>"
 
 #: ../designs/read_receipts/read.glade.h:5
 msgid "Always send back a read receipt"
-msgstr "永遠送回讀信回條"
+msgstr "一定送回讀信回條"
 
 #: ../designs/read_receipts/read.glade.h:6
 msgid "Ask me if I want to send back a read receipt"
@@ -11756,7 +10482,7 @@ msgstr "讀信回條"
 
 #: ../designs/read_receipts/read.glade.h:9
 msgid "Request a read receipt for all messages I send"
-msgstr "要求所有傳送的郵件都要索取讀信回條"
+msgstr "要求所有我傳送的郵件都索取讀信回條"
 
 #: ../designs/read_receipts/read.glade.h:10
 msgid "Unless the message is sent to a mailing list, and not to me personally"
@@ -11768,71 +10494,44 @@ msgid ""
 "do?"
 msgstr "當您收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
 
-# mail/mail-callbacks.c:1144
-# mail/mail-display.c:96
 #: ../e-util/e-dialog-utils.c:283
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 msgstr ""
 "同一名稱的檔案已經存在。\n"
-"是否複蓋該檔案？"
+"是否覆蓋該檔案？"
 
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
 #: ../e-util/e-dialog-utils.c:285 ../e-util/e-system.error.xml.h:6
 msgid "Overwrite file?"
 msgstr "覆蓋檔案？"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:129
 msgid "Evolution Error"
 msgstr "Evolution 錯誤"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../e-util/e-error.c:88 ../e-util/e-error.c:89 ../e-util/e-error.c:127
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
-# data/evolution.keys.in.h:2
 #: ../e-util/e-error.c:126
 msgid "Evolution Information"
 msgstr "Evolution 資訊"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../e-util/e-error.c:128
 msgid "Evolution Query"
 msgstr "Evolution 查詢"
 
-# mail/mail-config.glade.h:69
 #. setup a dummy error
 #: ../e-util/e-error.c:454
 #, c-format
 msgid "Internal error, unknown error '%s' requested"
 msgstr "內部錯誤，要求的不明錯誤 '%s'>"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
 #: ../e-util/e-system.error.xml.h:2
 msgid "Cannot open file &quot;{0}&quot;."
 msgstr "無法開啟檔案「{0}」。"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
 #: ../e-util/e-system.error.xml.h:3
 msgid "Cannot save file &quot;{0}&quot;."
 msgstr "無法儲存檔案「{0}」。"
@@ -11849,12 +10548,10 @@ msgstr "檔案存在「{0}」。"
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
-# calendar/gui/gnome-cal.c:235
 #: ../e-util/eggtrayicon.c:121
 msgid "The orientation of the tray."
 msgstr "系統匣的方向。"
 
-# calendar/gui/event-editor.c:1565
 #: ../filter/filter-datespec.c:78
 #, c-format
 msgid "1 second ago"
@@ -11862,7 +10559,6 @@ msgid_plural "%d seconds ago"
 msgstr[0] "1 秒前"
 msgstr[1] "%d 秒前"
 
-# calendar/gui/event-editor.c:1560
 #: ../filter/filter-datespec.c:79
 #, c-format
 msgid "1 minute ago"
@@ -11870,7 +10566,6 @@ msgid_plural "%d minutes ago"
 msgstr[0] "1 分鐘前"
 msgstr[1] "%d 分鐘前"
 
-# calendar/gui/event-editor.c:1555
 #: ../filter/filter-datespec.c:80
 #, c-format
 msgid "1 hour ago"
@@ -11878,7 +10573,6 @@ msgid_plural "%d hours ago"
 msgstr[0] "1 小時前"
 msgstr[1] "%d 小時前"
 
-# calendar/gui/event-editor.c:1545
 #: ../filter/filter-datespec.c:81
 #, c-format
 msgid "1 day ago"
@@ -11886,7 +10580,6 @@ msgid_plural "%d days ago"
 msgstr[0] "1 日前"
 msgstr[1] "%d 日前"
 
-# calendar/gui/event-editor.c:1550
 #: ../filter/filter-datespec.c:82
 #, c-format
 msgid "1 week ago"
@@ -11916,17 +10609,15 @@ msgstr "<按這裏選擇日期>"
 msgid "now"
 msgstr "現在"
 
-# calendar/gui/print.c:1093
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
 #: ../filter/filter-datespec.c:295
 msgid "%d-%b-%Y"
-msgstr "%d-%b-%Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
 #: ../filter/filter-datespec.c:415
 msgid "Select a time to compare against"
 msgstr "選擇要比對的時間"
 
-# ui/evolution-message-composer.xml.h:12
 #: ../filter/filter-file.c:293 ../filter/filter-file.c:299
 msgid "Choose a file"
 msgstr "選擇一個檔案"
@@ -11936,15 +10627,12 @@ msgstr "選擇一個檔案"
 msgid "Important"
 msgstr "重要"
 
-# mail/mail-format.c:762
-# mail/message-list.c:1083
 #. forest green
 #: ../filter/filter-label.c:124 ../mail/em-migrate.c:1056
 #: ../mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "待辦"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: ../filter/filter-label.c:125 ../mail/em-migrate.c:1057
 #: ../mail/mail-config.glade.h:95
@@ -11971,7 +10659,6 @@ msgstr "如果全部條件符合"
 msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
-# mail/mail-ops.c:898
 #: ../filter/filter-rule.c:868
 msgid "Find items:"
 msgstr "尋找項目:"
@@ -11992,7 +10679,6 @@ msgstr "回覆和父代"
 msgid "No reply or parent"
 msgstr "沒有回復或原始郵件"
 
-# addressbook/printing/e-contact-print.glade.h:17
 #: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "包括線串"
@@ -12014,13 +10700,10 @@ msgstr "錯誤的正規表示式「{0}」。"
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "無法編譯正規表示式「{1}」。"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
 #: ../filter/filter.error.xml.h:3
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "檔案「{0}」不存在或者不是一般檔案。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:631
 #: ../filter/filter.error.xml.h:4
 msgid "Missing date."
 msgstr "缺少日期。"
@@ -12029,7 +10712,6 @@ msgstr "缺少日期。"
 msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
-# calendar/gui/calendar-model.c:1578
 #: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:71
 msgid "Missing name."
 msgstr "缺少名稱。"
@@ -12046,12 +10728,10 @@ msgstr "請選擇其他名稱。"
 msgid "You must choose a date."
 msgstr "您必須選取日期。"
 
-# ui/evolution.xml.h:3
 #: ../filter/filter.error.xml.h:10
 msgid "You must name this filter."
 msgstr "您必須為這個過濾器命名。"
 
-# ui/evolution.xml.h:3
 #: ../filter/filter.error.xml.h:11
 msgid "You must specify a file name."
 msgstr "您必須指定一個檔案名稱。"
@@ -12145,39 +10825,30 @@ msgstr "在此設定郵件的偏好設定，包含安全性與郵件的顯示"
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
 
-# ui/evolution-mail.xml.h:19
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure your email accounts here"
 msgstr "在此設定您的郵件帳號"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Evolution Mail"
 msgstr "Evolution 郵件"
 
-# mail/mail-account-editor.c:173
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolution 郵件帳號組態控制"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail component"
 msgstr "Evolution 郵件配件"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail composer"
 msgstr "Evolution 郵件撰寫器"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolution 郵件撰寫器組態控制"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 郵件優先設定控制"
@@ -12191,7 +10862,6 @@ msgstr "Evolution 郵件優先設定控制"
 msgid "Mail"
 msgstr "郵件"
 
-# mail/mail-config.glade.h:6
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:12
 #: ../mail/em-account-prefs.c:532
 msgid "Mail Accounts"
@@ -12224,23 +10894,19 @@ msgstr ""
 " %s 授權合約\n"
 "並選取核取方塊來接受它\n"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-account-editor.c:482 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:511
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../mail/em-account-editor.c:778
 msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
-# mail/mail-config.glade.h:35
 #: ../mail/em-account-editor.c:1780 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "身分"
 
-# mail/mail-config.glade.h:57
 #: ../mail/em-account-editor.c:1829 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "接收電子郵件"
@@ -12249,12 +10915,10 @@ msgstr "接收電子郵件"
 msgid "Automatically check for _new mail every"
 msgstr "自動檢查新郵件每(_N)"
 
-# mail/mail-config.glade.h:65
 #: ../mail/em-account-editor.c:2195 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
-# mail/mail-config.glade.h:21
 #: ../mail/em-account-editor.c:2254 ../mail/mail-config.glade.h:67
 msgid "Defaults"
 msgstr "預設值"
@@ -12265,29 +10929,23 @@ msgstr "預設值"
 msgid "Security"
 msgstr "安全性"
 
-# mail/mail-config.glade.h:59
 #. Most sections for this is auto-generated fromt the camel config
 #: ../mail/em-account-editor.c:2357 ../mail/em-account-editor.c:2448
 msgid "Receiving Options"
 msgstr "接收選項"
 
-# camel/providers/imap/camel-imap-provider.c:43
-# mail/mail-config.glade.h:13
 #: ../mail/em-account-editor.c:2358 ../mail/em-account-editor.c:2449
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
-# mail/mail-config.glade.h:3
 #: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:33
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
-# mail/mail-config-druid.c:445
 #: ../mail/em-account-editor.c:2800 ../mail/mail-config.glade.h:79
 msgid "Evolution Account Assistant"
 msgstr "Evolution 帳號助理"
 
-# mail/mail-accounts.c:197
 #: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
 msgid "Disable"
@@ -12298,14 +10956,11 @@ msgstr "停用"
 msgid "Enable"
 msgstr "啟用"
 
-# mail/mail-config.glade.h:21
 #. translators: default account indicator
 #: ../mail/em-account-prefs.c:466
 msgid "[Default]"
 msgstr "[預設值]"
 
-# mail/mail-accounts.c:199
-# mail/mail-config.glade.h:30
 #. 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
@@ -12313,7 +10968,6 @@ msgstr "[預設值]"
 msgid "Enabled"
 msgstr "已啟用"
 
-# mail/mail-config.glade.h:5
 #: ../mail/em-account-prefs.c:525
 msgid "Account name"
 msgstr "帳號名稱"
@@ -12322,34 +10976,27 @@ msgstr "帳號名稱"
 msgid "Protocol"
 msgstr "通訊協定"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:999
 msgid "Unnamed"
 msgstr "未命名的"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../mail/em-composer-prefs.c:936
 msgid "Language(s)"
 msgstr "語言"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-composer-prefs.c:979
 msgid "Add signature script"
 msgstr "新增簽名程序檔"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-composer-prefs.c:999
 msgid "Signature(s)"
 msgstr "簽名檔"
 
-# mail/mail-ops.c:1154
 #: ../mail/em-composer-utils.c:874 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../mail/em-composer-utils.c:1665
 msgid "an unknown sender"
 msgstr "不明的寄件者"
@@ -12361,9 +11008,7 @@ msgstr "不明的寄件者"
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
-msgstr ""
-"於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
-"${TimeZone}，${Sender} 提到："
+msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} 提到："
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
@@ -12386,7 +11031,6 @@ msgstr "指定目標"
 msgid "Attachments"
 msgstr "附加檔案"
 
-# addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/em-filter-i18n.h:6
 msgid "Beep"
 msgstr "嗶聲"
@@ -12407,17 +11051,6 @@ msgstr "收件日期"
 msgid "Date sent"
 msgstr "送件日期"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
 #: ../mail/em-filter-i18n.h:11 ../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
@@ -12494,7 +11127,7 @@ msgstr "是之前的"
 
 #: ../mail/em-filter-i18n.h:30
 msgid "is Flagged"
-msgstr "有標幟的"
+msgstr "有標幟"
 
 #: ../mail/em-filter-i18n.h:31
 msgid "is greater than"
@@ -12510,21 +11143,17 @@ msgstr "不是"
 
 #: ../mail/em-filter-i18n.h:34
 msgid "is not Flagged"
-msgstr "沒有標幟的"
+msgstr "沒有標幟"
 
-# calendar/gui/goto-dialog.glade.h:9
 #: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
 #: ../ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾郵件"
 
-# calendar/gui/goto-dialog.glade.h:9
 #: ../mail/em-filter-i18n.h:36
 msgid "Junk Test"
 msgstr "垃圾郵件測試"
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../mail/em-filter-i18n.h:37 ../widgets/misc/e-expander.c:190
 msgid "Label"
 msgstr "標籤"
@@ -12533,7 +11162,6 @@ msgstr "標籤"
 msgid "Mailing list"
 msgstr "郵件列表"
 
-# mail/mail-search.c:319
 #: ../mail/em-filter-i18n.h:39
 msgid "Match All"
 msgstr "符合全部"
@@ -12546,12 +11174,10 @@ msgstr "郵件內容"
 msgid "Message Header"
 msgstr "郵件檔頭"
 
-# views/mail/galview.xml.h:4
 #: ../mail/em-filter-i18n.h:42
 msgid "Message is Junk"
 msgstr "垃圾郵件"
 
-# mail/folder-browser.c:706
 #: ../mail/em-filter-i18n.h:43
 msgid "Message is not Junk"
 msgstr "非垃圾郵件"
@@ -12560,13 +11186,10 @@ msgstr "非垃圾郵件"
 msgid "Move to Folder"
 msgstr "移至資料夾"
 
-# ui/evolution.xml.h:19
 #: ../mail/em-filter-i18n.h:45
 msgid "Pipe to Program"
 msgstr "建立程式管道"
 
-# calendar/gui/event-editor-dialog.glade.h:14
-# calendar/gui/event-editor.c:1588
 #: ../mail/em-filter-i18n.h:46
 msgid "Play Sound"
 msgstr "播放音效"
@@ -12587,7 +11210,6 @@ msgstr "正規表示式相配"
 msgid "Replied to"
 msgstr "回覆"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
 #: ../mail/em-filter-i18n.h:51
 msgid "returns"
 msgstr "傳回"
@@ -12604,7 +11226,6 @@ msgstr "傳回小於"
 msgid "Run Program"
 msgstr "執行程式"
 
-# mail/message-list.c:1081
 #: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:12
 msgid "Score"
 msgstr "目標"
@@ -12617,7 +11238,6 @@ msgstr "寄件者"
 msgid "Set Status"
 msgstr "設定狀態"
 
-# addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/em-filter-i18n.h:58
 msgid "Size (kB)"
 msgstr "大小 (kB)"
@@ -12660,7 +11280,6 @@ msgstr "取消設定狀態"
 msgid "<b>Then</b>"
 msgstr "<b>然後</b>"
 
-# ui/evolution-mail.xml.h:10
 #: ../mail/em-folder-browser.c:162
 msgid "C_reate Search Folder From Search..."
 msgstr "從搜尋建立搜尋資料夾(_R)..."
@@ -12669,13 +11288,10 @@ msgstr "從搜尋建立搜尋資料夾(_R)..."
 msgid "All Messages"
 msgstr "所有郵件"
 
-# mail/mail-search.c:138
 #: ../mail/em-folder-browser.c:185
 msgid "Unread Messages"
 msgstr "未讀郵件"
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../mail/em-folder-browser.c:187
 msgid "No Label"
 msgstr "無標籤"
@@ -12684,19 +11300,14 @@ msgstr "無標籤"
 msgid "Read Messages"
 msgstr "已讀郵件"
 
-# ui/evolution-mail.xml.h:114
 #: ../mail/em-folder-browser.c:195
 msgid "Recent Messages"
 msgstr "最近的郵件"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../mail/em-folder-browser.c:196
 msgid "Last 5 Days' Messages"
 msgstr "最近 5 天的郵件"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../mail/em-folder-browser.c:197
 msgid "Messages with Attachments"
 msgstr "有附加檔案的郵件"
@@ -12705,29 +11316,25 @@ msgstr "有附加檔案的郵件"
 msgid "Important Messages"
 msgstr "重要郵件"
 
-# mail/folder-browser.c:706
 #: ../mail/em-folder-browser.c:199
 msgid "Messages Not Junk"
 msgstr "非垃圾郵件"
 
-# camel/providers/smtp/camel-smtp-transport.c:178
 #. 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
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "所有郵件:"
+msgstr[1] "所有郵件:"
 
-# mail/mail-search.c:138
 #. 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/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
 #: ../mail/em-folder-properties.c:316
 #: ../plugins/groupwise-features/properties.glade.h:2
 msgid "Folder Properties"
@@ -12737,7 +11344,6 @@ msgstr "資料夾內容"
 msgid "<click here to select a folder>"
 msgstr "<按這裏選擇資料夾>"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../mail/em-folder-selector.c:261
 msgid "Create"
 msgstr "建立"
@@ -12746,7 +11352,6 @@ msgstr "建立"
 msgid "Folder _name:"
 msgstr "資料夾名稱(_N):"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
 #: ../mail/mail-vfolder.c:911 ../mail/mail-vfolder.c:984
 msgid "Search Folders"
@@ -12761,7 +11366,6 @@ msgstr "不符合"
 msgid "Drafts"
 msgstr "草稿"
 
-# mail/local-config.glade.h:8
 #. translators: standard local mailbox names
 #: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
 #: ../plugins/exchange-operations/exchange-folder.c:587
@@ -12776,8 +11380,6 @@ msgstr "寄件匣"
 msgid "Sent"
 msgstr "已傳送"
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
 #: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "載入中..."
@@ -12806,33 +11408,26 @@ msgstr "%s (%u)"
 msgid "Mail Folder Tree"
 msgstr "郵件資料夾樹"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/em-folder-tree.c:877
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移動資料夾 %s"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/em-folder-tree.c:879
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
-# mail/mail-ops.c:898
 #: ../mail/em-folder-tree.c:886 ../mail/message-list.c:1806
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
-# mail/mail-ops.c:898
 #: ../mail/em-folder-tree.c:888 ../mail/message-list.c:1808
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
 
-# camel/providers/imap/camel-imap-provider.c:45
 #: ../mail/em-folder-tree.c:904
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
@@ -12845,7 +11440,6 @@ msgstr "複製至資料夾(_C)"
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
-# mail/mail-ops.c:992
 #: ../mail/em-folder-tree.c:1706 ../mail/mail-ops.c:1060
 #, c-format
 msgid "Scanning folders in \"%s\""
@@ -12882,15 +11476,13 @@ msgstr "重新命名(_R)..."
 
 #: ../mail/em-folder-tree.c:2083 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
-msgstr "清空垃圾桶(_E)"
+msgstr "清空回收筒(_E)"
 
-# mail/mail-ops.c:898
 #: ../mail/em-folder-utils.c:104
 #, c-format
 msgid "Copying `%s' to `%s'"
 msgstr "將「%s」複製到「%s」"
 
-# shell/e-shell-importer.c:601
 #: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:1007
 #: ../mail/em-folder-view.c:1022
 #: ../mail/importers/evolution-mbox-importer.c:86
@@ -12902,15 +11494,12 @@ msgstr "選擇資料夾"
 msgid "C_opy"
 msgstr "複製(_O)"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/em-folder-utils.c:581
 #: ../plugins/groupwise-features/share-folder-common.c:145
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "正在建立資料夾 `%s'"
 
-# ui/evolution.xml.h:10
 #: ../mail/em-folder-utils.c:730
 #: ../plugins/groupwise-features/install-shared.c:164
 #: ../plugins/groupwise-features/share-folder-common.c:388
@@ -12976,8 +11565,6 @@ msgstr "標示成非垃圾郵件(_N)"
 msgid "Mark for Follo_w Up..."
 msgstr "標示為跟隨(_W)..."
 
-# addressbook/contact-editor/e-contact-editor.c:1256
-# addressbook/gui/widgets/e-addressbook-view.c:720
 #: ../mail/em-folder-view.c:1139
 msgid "_Label"
 msgstr "標籤(_L)"
@@ -13000,22 +11587,18 @@ msgstr "清除標幟(_E)"
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
-# mail/folder-browser.c:653
 #: ../mail/em-folder-view.c:1150
 msgid "Search Folder from _Subject"
 msgstr "從主旨建立搜尋資料夾(_S)"
 
-# mail/folder-browser.c:656
 #: ../mail/em-folder-view.c:1151
 msgid "Search Folder from Se_nder"
 msgstr "從寄件者建立搜尋資料夾(_N)"
 
-# mail/folder-browser.c:659
 #: ../mail/em-folder-view.c:1152
 msgid "Search Folder from _Recipients"
 msgstr "從收件者建立搜尋資料夾(_R)"
 
-# mail/folder-browser.c:662
 #: ../mail/em-folder-view.c:1153
 msgid "Search Folder from Mailing _List"
 msgstr "從郵件清單建立搜尋資料夾(_L)"
@@ -13036,13 +11619,12 @@ msgstr "收件者過濾器(_C)"
 msgid "Filter on _Mailing List"
 msgstr "從通信論壇建立過濾器(_M)"
 
-# mail/mail-config.glade.h:21
 #. default charset used in mail view
 #: ../mail/em-folder-view.c:2001 ../mail/em-folder-view.c:2045
 msgid "Default"
 msgstr "預設值"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印郵件"
 #: ../mail/em-folder-view.c:2144
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:2
 #: ../plugins/print-message/print-message.c:87
@@ -13053,22 +11635,18 @@ msgstr "列印郵件"
 msgid "Unable to retrieve message"
 msgstr "無法接收郵件"
 
-# ui/evolution.xml.h:10
 #: ../mail/em-folder-view.c:2498
 msgid "Create _Search Folder"
 msgstr "建立搜尋資料夾(_S)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:710
 #: ../mail/em-folder-view.c:2499
 msgid "_From this Address"
 msgstr "從這個位址(_F)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:724
 #: ../mail/em-folder-view.c:2500
 msgid "_To this Address"
 msgstr "到這個位址(_T)"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../mail/em-folder-view.c:2854
 #, c-format
 msgid "Click to mail %s"
@@ -13078,54 +11656,44 @@ msgstr "按一下來傳送郵件 %s"
 msgid "Click to hide/unhide addresses"
 msgstr "按這裡隱藏/解除隱藏位址"
 
-# mail/mail-search.c:319
 #. message-search popup match count string
 #: ../mail/em-format-html-display.c:503
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
-# mail/mail-search.c:316
 #: ../mail/em-format-html-display.c:646
 msgid "Fi_nd:"
 msgstr "尋找(_N):"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
 #: ../mail/em-format-html-display.c:674
 msgid "Fo_rward"
 msgstr "轉寄(_R)"
 
-# mail/mail-search.c:319
 #: ../mail/em-format-html-display.c:679
 msgid "M_atch case"
 msgstr "區分大小寫(_A)"
 
-# calendar/gui/calendar-model.c:1578
 #: ../mail/em-format-html-display.c:926 ../mail/em-format-html.c:617
 msgid "Unsigned"
 msgstr "未簽名"
 
-# mail/mail-format.c:1161
 #: ../mail/em-format-html-display.c:926
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "此郵件未簽名。不保證此郵件已驗證。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-format-html-display.c:927 ../mail/em-format-html.c:618
 msgid "Valid signature"
 msgstr "有效的簽名"
 
-# mail/mail-format.c:1161
 #: ../mail/em-format-html-display.c:927
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "此郵件已簽名而且有效，表示它非常有可能是驗證的郵件。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/em-format-html-display.c:928 ../mail/em-format-html.c:619
 msgid "Invalid signature"
 msgstr "無效的簽名"
@@ -13165,11 +11733,8 @@ 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 ""
-"此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時"
-"日，並不是無法檢視此郵件的內容。"
+msgstr "此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時日，並不是無法檢視此郵件的內容。"
 
-# ui/evolution-message-composer.xml.h:13
 #: ../mail/em-format-html-display.c:937 ../mail/em-format-html.c:628
 msgid "Encrypted"
 msgstr "已加密"
@@ -13189,9 +11754,7 @@ 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 ""
-"此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件"
-"的內容。"
+msgstr "此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件的內容。"
 
 #: ../mail/em-format-html-display.c:1039 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
@@ -13201,20 +11764,18 @@ msgstr "檢視憑證(_V)"
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
-# mail/message-list.c:977
 #: ../mail/em-format-html-display.c:1373
 msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "完成於 %B %d, %Y, %l:%M %p"
+msgstr "完成於 %Y 年 %-m 月 %-d 日%p %-l:%M"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: ../mail/em-format-html-display.c:1381
 msgid "Overdue:"
-msgstr "逾期:"
+msgstr "到期日:"
 
-# mail/message-list.c:977
+# (Abel) combine with previous entry
 #: ../mail/em-format-html-display.c:1384
 msgid "by %B %d, %Y, %l:%M %p"
-msgstr "作者 %B %d, %Y, %l:%M %p"
+msgstr "%Y 年 %-m 月 %-d 日%p %-l:%M"
 
 #: ../mail/em-format-html-display.c:1444
 msgid "_View Inline"
@@ -13232,15 +11793,11 @@ msgstr "符合寬度(_F)"
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../mail/em-format-html-display.c:1866 ../mail/mail-config.glade.h:44
 #: ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
-# mail/mail-display.c:196
 #: ../mail/em-format-html-display.c:2073
 msgid "Select folder to save all attachments..."
 msgstr "選擇用來儲存所有的附加檔案的資料夾..."
@@ -13249,40 +11806,31 @@ msgstr "選擇用來儲存所有的附加檔案的資料夾..."
 msgid "_Save Selected..."
 msgstr "儲存選取的(_S)..."
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #. Cant i put in the number of attachments here ?
 #: ../mail/em-format-html-display.c:2187
 #, 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:2194 ../mail/em-format-html-display.c:2272
 msgid "S_ave"
 msgstr "儲存(_A)"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
 #: ../mail/em-format-html-display.c:2205
 msgid "S_ave All"
 msgstr "儲存全部(_A)"
 
-# composer/e-msg-composer-attachment.glade.h:1
-# mail/mail-config.glade.h:9
-# mail/message-list.c:1081
 #: ../mail/em-format-html-display.c:2268
 msgid "No Attachment"
 msgstr "無附件"
 
-# camel/camel-filter-driver.c:748
 #: ../mail/em-format-html-print.c:130
 #, c-format
 msgid "Page %d of %d"
 msgstr "第 %d / %d 頁"
 
-# mail/mail-ops.c:1498
 #: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
@@ -13292,24 +11840,20 @@ msgstr "正在擷取 `%s'"
 msgid "Valid signature but cannot verify sender"
 msgstr "簽名有效，但是無法檢驗寄件者"
 
-# mail/mail-format.c:1842
 #: ../mail/em-format-html.c:891
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
-# mail/mail-format.c:1787
 #: ../mail/em-format-html.c:921
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
-# mail/mail-format.c:1799
 #: ../mail/em-format-html.c:932
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 「%s」有效的指示"
 
-# mail/mail-format.c:1803
 #: ../mail/em-format-html.c:934
 #, c-format
 msgid "Pointer to local file (%s)"
@@ -13320,44 +11864,36 @@ msgstr "本地檔案指示 (%s)"
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
-# mail/mail-format.c:1837
 #: ../mail/em-format-html.c:966
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (「%s」類型)"
 
-# mail/mail-ops.c:898
 #: ../mail/em-format-html.c:1193
 msgid "Formatting message"
 msgstr "格式化郵件"
 
-# mail/mail-format.c:756
-# mail/message-list.c:1082
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:844 ../mail/em-mailer-prefs.c:85
 #: ../mail/message-list.etspec.h:7 ../mail/message-tag-followup.c:332
 msgid "From"
 msgstr "寄件者"
 
-# mail/mail-format.c:759
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:845 ../mail/em-mailer-prefs.c:86
 msgid "Reply-To"
 msgstr "回覆"
 
-# mail/mail-format.c:765
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:847 ../mail/em-mailer-prefs.c:88
 msgid "Cc"
 msgstr "副本"
 
-# composer/e-msg-composer-hdrs.c:394
 #: ../mail/em-format-html.c:1488 ../mail/em-format-quote.c:200
 #: ../mail/em-format.c:848 ../mail/em-mailer-prefs.c:89
 msgid "Bcc"
 msgstr "密件副本"
 
-# addressbook/backend/ebook/e-card.c:3428
 #. pseudo-header
 #: ../mail/em-format-html.c:1663 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1025
@@ -13374,8 +11910,6 @@ msgstr "<I> (%a, %R %Z)</I>"
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-# mail/mail-format.c:640
-# mail/message-list.c:1082
 #: ../mail/em-format-html.c:1703 ../mail/em-format-quote.c:329
 #: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2 ../widgets/misc/e-dateedit.c:341
@@ -13388,18 +11922,15 @@ msgstr "日期"
 msgid "Newsgroups"
 msgstr "新聞群組"
 
-# mail/mail-format.c:527
 #: ../mail/em-format.c:1102
 #, c-format
 msgid "%s attachment"
 msgstr "%s 附加檔案"
 
-# mail/mail-format.c:573
 #: ../mail/em-format.c:1141 ../mail/em-format.c:1289 ../mail/em-format.c:1591
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 
-# mail/mail-format.c:573
 #: ../mail/em-format.c:1271 ../mail/em-format.c:1427
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
@@ -13420,17 +11951,14 @@ msgstr "檢驗簽名發生錯誤"
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
-# calendar/gui/event-editor-dialog.glade.h:10
 #: ../mail/em-mailer-prefs.c:103
 msgid "Every time"
 msgstr "每次"
 
-# calendar/gui/event-editor.c:1545
 #: ../mail/em-mailer-prefs.c:104
 msgid "Once per day"
 msgstr "每天一次"
 
-# calendar/gui/event-editor.c:1550
 #: ../mail/em-mailer-prefs.c:105
 msgid "Once per week"
 msgstr "每週一次"
@@ -13450,33 +11978,26 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../mail/em-migrate.c:1649
 #, c-format
 msgid "Unable to create new folder `%s': %s"
 msgstr "無法建立新資料夾 `%s'：%s"
 
-# mail/mail-ops.c:1728
 #: ../mail/em-migrate.c:1675
 #, c-format
 msgid "Unable to copy folder `%s' to `%s': %s"
 msgstr "無法複製製資料夾 `%s' 至 `%s'：%s"
 
-# mail/mail-ops.c:1728
 #: ../mail/em-migrate.c:1860
 #, c-format
 msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr "無法掃描 `%s' 現有的信箱：%s"
 
-# camel/providers/pop3/camel-pop3-store.c:199
 #: ../mail/em-migrate.c:2064
 #, c-format
 msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "無法開啟舊的 POP 儲存在伺服器上的資料 `%s':%s"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
 #: ../mail/em-migrate.c:2078
 #, c-format
 msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
@@ -13487,14 +12008,11 @@ msgstr "無法建立 POP 儲存在伺服器上的資料目錄 `%s':%s"
 msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
 #: ../mail/em-migrate.c:2578 ../mail/em-migrate.c:2590
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
 
-# mail/mail-ops.c:1728
 #: ../mail/em-migrate.c:2713
 #, c-format
 msgid "Unable to create local mail folders at `%s': %s"
@@ -13504,8 +12022,7 @@ msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr ""
-"無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
+msgstr "無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
 
 #: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
@@ -13516,7 +12033,6 @@ msgstr "回覆寄件者(_R)"
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
-# ui/evolution-contact-editor.xml.h:13
 #: ../mail/em-popup.c:621
 msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
@@ -13529,7 +12045,6 @@ msgstr "加入到通訊錄(_A)"
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此儲存區不支援訂閱，或者未啟用它們。"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../mail/em-subscribe-editor.c:612
 msgid "Subscribed"
 msgstr "已訂閱"
@@ -13547,7 +12062,6 @@ msgstr "請選擇一個伺服器。"
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
-# widgets/misc/e-messagebox.c:224
 #: ../mail/em-utils.c:141
 msgid "Do not show this message again."
 msgstr "不要再顯示這個訊息。"
@@ -13560,42 +12074,35 @@ msgstr "郵件規則"
 msgid "message"
 msgstr "郵件"
 
-# mail/mail-callbacks.c:1188
 #: ../mail/em-utils.c:688
 msgid "Save Message..."
 msgstr "儲存郵件…"
 
-# addressbook/backend/ebook/e-card.c:3346
 #: ../mail/em-utils.c:737
 msgid "Add address"
 msgstr "新增地址"
 
-# mail/mail-autofilter.c:229
 #. Drop filename for messages from a mailbox
 #: ../mail/em-utils.c:1221
 #, c-format
 msgid "Messages from %s"
 msgstr "來自 %s 的郵件"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-vfolder-editor.c:112
 msgid "Search _Folders"
 msgstr "搜尋資料夾(_F)"
 
-# mail/mail-account-gui.c:682
 #: ../mail/em-vfolder-rule.c:591
 msgid "Search Folder source"
 msgstr "搜尋資料夾來源"
 
-# mail/mail-config.glade.h:12
 #: ../mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr "自動連結辨識"
 
-# mail/mail-config.glade.h:12
 #: ../mail/evolution-mail.schemas.in.in.h:2
 msgid "Automatic smiley recognition"
-msgstr "自動微笑辨識\t\t"
+msgstr "自動辨認笑臉符號"
 
 #: ../mail/evolution-mail.schemas.in.in.h:3
 msgid "Check incoming mail being junk"
@@ -13635,60 +12142,49 @@ msgstr "用於撰寫郵件的預設字元集"
 msgid "Default charset in which to compose messages."
 msgstr "用於撰寫郵件的預設字元集。"
 
-# ui/evolution-mail.xml.h:75
 #: ../mail/evolution-mail.schemas.in.in.h:12
 msgid "Default charset in which to display messages"
 msgstr "用於顯示郵件的預設字元集"
 
-# ui/evolution-mail.xml.h:75
 #: ../mail/evolution-mail.schemas.in.in.h:13
 msgid "Default charset in which to display messages."
 msgstr "用於顯示郵件的預設字元集。"
 
-# ui/evolution-mail.xml.h:34
 #: ../mail/evolution-mail.schemas.in.in.h:14
 msgid "Default forward style"
 msgstr "預設轉遞樣式"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:15
 msgid "Default height of the Composer Window"
 msgstr "撰寫視窗的預設高度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:16
 msgid "Default height of the Message Window"
 msgstr "郵件視窗的預設高度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:17
 msgid "Default height of the Subscribe dialog"
 msgstr "訂閱對話方塊的預設高度"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../mail/evolution-mail.schemas.in.in.h:18
 msgid "Default reply style"
 msgstr "預設回覆樣式"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:19
 msgid "Default width of the Composer Window"
 msgstr "撰寫視窗的預設寬度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:20
 msgid "Default width of the Message Window"
 msgstr "郵件視窗的預設寬度"
 
-# ui/evolution.xml.h:32
 #: ../mail/evolution-mail.schemas.in.in.h:21
 msgid "Default width of the Subscribe dialog"
 msgstr "訂閱對話方塊的預設寬度"
 
 #: ../mail/evolution-mail.schemas.in.in.h:22
 msgid "Draw spelling error indicators on words as you type."
-msgstr "當您輸入時在文字上顯示拼字錯誤指示。"
+msgstr "當您輸入內容時在文字上顯示拼字錯誤指示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:23
 msgid "Empty Trash folders on exit"
@@ -13696,7 +12192,7 @@ msgstr "結束時清空垃圾資料夾"
 
 #: ../mail/evolution-mail.schemas.in.in.h:24
 msgid "Empty all Trash folders when exiting Evolution."
-msgstr "結束 Evolution 時清空所有垃圾筒資料夾"
+msgstr "結束 Evolution 時清空所有垃圾資料夾"
 
 #: ../mail/evolution-mail.schemas.in.in.h:25
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
@@ -13712,10 +12208,7 @@ msgid ""
 "by typing in the text. Use is that you can easily find a folder in that side "
 "bar by just typing the folder name and the selection jumps automatically to "
 "that folder."
-msgstr ""
-"啟用側邊欄搜尋功能使您能輸入文字開始互動式搜尋。它的作用是讓您只須在側邊欄中"
-"輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾"
-"的位置。"
+msgstr "啟用側邊欄搜尋功能使您能輸入文字開始互動式搜尋。它的作用是讓您只須在側邊欄中輸入資料夾名稱就可以輕鬆的找到該資料夾，藉由選取的動作更可以自動跳至該資料夾的位置。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
 msgid "Enable/disable caret mode"
@@ -13746,10 +12239,7 @@ 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 檢視器，會用於"
-"顯示內容。"
+msgstr "如果沒有內建檢視器可用於 Evolution 裏面特殊的 mime-type，任何顯示在此清單的 mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於顯示內容。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "It disables/enables the prompt while marking multiple messages."
@@ -13757,18 +12247,16 @@ msgstr "這會停用/啟用標記多個郵件時的提示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
 msgid "Last time empty trash was run"
-msgstr "上次清空垃圾筒的時間"
+msgstr "上次清空回收筒的時間"
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of Labels and their associated colors"
 msgstr "標籤和相關色彩的清單"
 
-# mail/mail-config.glade.h:6
 #: ../mail/evolution-mail.schemas.in.in.h:37
 msgid "List of accepted licenses"
 msgstr "接收的授權清單"
 
-# mail/mail-config.glade.h:6
 #: ../mail/evolution-mail.schemas.in.in.h:38
 msgid "List of accounts"
 msgstr "帳號清單"
@@ -13777,9 +12265,7 @@ msgstr "帳號清單"
 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 "
-"相關的字串命名子目錄。"
+msgstr "Evolution 的郵件元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts 相關的字串命名子目錄。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "List of custom headers and whether they are enabled."
@@ -13789,9 +12275,7 @@ msgstr "自訂標頭以及它們是否啟用的清單"
 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 十六進位編碼。"
+msgstr "Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color 使用 HTML 十六進位編碼。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:42
 msgid "List of mime types to check for bonobo component viewers"
@@ -13803,7 +12287,7 @@ msgstr "已經接受其授權的協定清單。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:44
 msgid "Load images for HTML messages over http"
-msgstr "透過 http 載入 HTNL 郵件的影像"
+msgstr "透過 http 載入 HTML 郵件的影像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:45
 msgid ""
@@ -13811,8 +12295,10 @@ msgid ""
 "load images off the net 1 - Load images in mail from contacts 2 - Always "
 "load images off the net"
 msgstr ""
-"透過 http(s) 載入 HTNL 郵件的影像。可能的值：0 – 從不從網路載入影像 1 – 如果"
-"寄件者是在通訊錄時，載入影像 2 - 永遠從網路載入影像"
+"透過 http(s) 載入 HTML 郵件的影像。可能的值為：\n"
+"0 – 不從網路載入影像\n"
+"1 – 如果寄件者是在通訊錄時，載入影像\n"
+"2 - 一定從網路載入影像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:46
 msgid "Log filter actions"
@@ -13846,7 +12332,6 @@ msgstr "在郵件「預覽」中標示引用"
 msgid "Mark citations in the message \"Preview\"."
 msgstr "在郵件「預覽」中標示引用。"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../mail/evolution-mail.schemas.in.in.h:54
 msgid "Message Window default height"
 msgstr "郵件視窗預設高度"
@@ -13861,18 +12346,16 @@ msgstr "訊息顯示樣式 (「一般」、「完整標頭」、「來源」)"
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
 msgid "Minimum days between emptying the trash on exit"
-msgstr "結束時清空垃圾筒最少間隔天數"
+msgstr "結束時清空回收筒最少間隔天數"
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
 msgid "Minimum time between emptying the trash on exit, in days."
-msgstr "結束時清空垃圾筒最少間隔天數。"
+msgstr "結束時清空回收筒最少間隔天數。"
 
-# mail/mail-config.glade.h:40
 #: ../mail/evolution-mail.schemas.in.in.h:59
 msgid "New Mail Notify sound file"
 msgstr "新郵件通知聲音檔案"
 
-# mail/mail-config.glade.h:40
 #: ../mail/evolution-mail.schemas.in.in.h:60
 msgid "New Mail Notify type"
 msgstr "新郵件通知類型"
@@ -13902,19 +12385,16 @@ msgstr "使用者清空時提示"
 msgid "Prompt when user only fills Bcc"
 msgstr "當使用者只填寫密件副本時提示"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:67
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者。"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:68
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
-msgstr "當使用者嘗試傳送 HTML 郵件到不想接收 HTML 郵件的收件者時，顯示提示。"
+msgstr "當使用者嘗試傳送 HTML 郵件到不想接受 HTML 郵件的收件者時，顯示提示。"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:69
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "當使用者傳送不含收件者或副本收件者的郵件時，提示使用者。"
@@ -13929,53 +12409,46 @@ msgstr "當標記多個郵件時提示"
 
 #: ../mail/evolution-mail.schemas.in.in.h:72
 msgid "Recognize links in text and replace them."
-msgstr "辨識文字中的連結並取代它們。"
+msgstr "辨認文字中的連結並將之取代。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:73
 msgid "Recognize smileys in text and replace them with images."
-msgstr "辨識文字中的微笑並取代成影像。"
+msgstr "辨認文字中的笑臉符號並取代成圖示。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:74
 msgid "Run junk test on incoming mail"
 msgstr "在內送的郵件執行垃圾郵件檢查"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:200
 #: ../mail/evolution-mail.schemas.in.in.h:75
 msgid "Send HTML mail by default"
 msgstr "預設傳送 HTML 郵件"
 
-# addressbook/gui/component/select-names/e-select-names-popup.c:200
 #: ../mail/evolution-mail.schemas.in.in.h:76
 msgid "Send HTML mail by default."
 msgstr "預設傳送 HTML 郵件。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: ../mail/evolution-mail.schemas.in.in.h:77
 msgid "Show Animations"
 msgstr "顯示動畫"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #: ../mail/evolution-mail.schemas.in.in.h:78
 msgid "Show animated images as animations."
-msgstr "將動畫式影像顯示成動畫。"
+msgstr "播放動畫影像。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:79
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "在郵件清單中顯示刪除的郵件 (加上刪除號)"
 
-# ui/evolution-mail.xml.h:86
 #: ../mail/evolution-mail.schemas.in.in.h:80
 msgid "Show deleted messages in the message-list"
 msgstr "在郵件清單中顯示刪除的郵件"
 
-# ui/evolution-mail.xml.h:86
 #: ../mail/evolution-mail.schemas.in.in.h:83
 msgid ""
 "Show the email of the sender in the messages composite column in the message "
 "list"
 msgstr "在郵件清單的組合欄中顯示寄件者的電子郵件"
 
-# ui/evolution-mail.xml.h:86
 #: ../mail/evolution-mail.schemas.in.in.h:84
 msgid "Show the sender email in the messages column in the message list"
 msgstr "在郵件清單的郵件欄中顯示寄件者的電子郵件"
@@ -13992,7 +12465,6 @@ msgstr "指定使用者要使用的「新郵件通知」類型。"
 msgid "Spell check inline"
 msgstr "行內拼字檢查"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../mail/evolution-mail.schemas.in.in.h:88
 msgid "Subscribe dialog default height"
 msgstr "訂閱對話方塊預設高度"
@@ -14001,14 +12473,13 @@ msgstr "訂閱對話方塊預設高度"
 msgid "Subscribe dialog default width"
 msgstr "訂閱對話方塊預設寬度"
 
-# addressbook/gui/component/addressbook-storage.c:99
 #: ../mail/evolution-mail.schemas.in.in.h:90
 msgid "Terminal font"
 msgstr "終端機字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:91
 msgid "The last time empty trash was run, in days since the epoch."
-msgstr "上次執行清單垃圾筒的時間，從紀元後算起的日數。"
+msgstr "上次執行清單回收筒的時間，從紀元後算起的日數。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:92
 msgid "The terminal font for mail display"
@@ -14024,9 +12495,7 @@ msgid ""
 "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.in.h:95
 msgid ""
@@ -14034,12 +12503,10 @@ msgid ""
 "beyond which a '...' is shown."
 msgstr "這會設定在預設郵件清單檢視中顯示位址的長度，超過的部分會顯示「...」。"
 
-# ui/evolution-mail.xml.h:93
 #: ../mail/evolution-mail.schemas.in.in.h:96
 msgid "Thread the message list."
 msgstr "串接郵件清單。"
 
-# ui/evolution-mail.xml.h:93
 #: ../mail/evolution-mail.schemas.in.in.h:97
 msgid "Thread the message-list"
 msgstr "串接郵件清單"
@@ -14056,7 +12523,6 @@ msgstr "將郵件標示成已閱讀的時限"
 msgid "Timeout for marking message as Seen."
 msgstr "將郵件標示成已閱讀的時限。"
 
-# mail/mail-config.glade.h:41
 #: ../mail/evolution-mail.schemas.in.in.h:101
 msgid "UID string of the default account."
 msgstr "預設帳號的 UID 字串。"
@@ -14089,7 +12555,6 @@ msgstr "只使用本地垃圾郵件測試 (沒有 DNS)。"
 msgid "Use side-by-side or wide layout"
 msgstr "使用緊貼或寬配置"
 
-# mail/mail-accounts.c:197
 #: ../mail/evolution-mail.schemas.in.in.h:109
 msgid "Variable width font"
 msgstr "變動寬度字型"
@@ -14148,12 +12613,10 @@ msgstr "郵件清單窗格寬度"
 msgid "Width of the message-list pane."
 msgstr "郵件清單窗格的寬度。"
 
-# shell/e-shell-importer.c:363
 #: ../mail/importers/elm-importer.c:192
 msgid "Importing Elm data"
 msgstr "輸入 Elm 資料"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/importers/elm-importer.c:381
 msgid "Evolution Elm importer"
 msgstr "Evolution Elm 輸入器"
@@ -14162,13 +12625,11 @@ msgstr "Evolution Elm 輸入器"
 msgid "Import mail from Elm."
 msgstr "從 Elm 匯入郵件。"
 
-# ui/evolution.xml.h:47
 #: ../mail/importers/evolution-mbox-importer.c:83
 #: ../mail/importers/evolution-outlook-importer.c:136
 msgid "Destination folder:"
 msgstr "目的地資料夾:"
 
-# mail/mail-account-gui.c:682
 #: ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder to import into"
@@ -14176,18 +12637,17 @@ msgstr "選取資料夾來輸入"
 
 #: ../mail/importers/evolution-mbox-importer.c:223
 msgid "Berkeley Mailbox (mbox)"
-msgstr "Berkeley 郵件箱 (mbox)"
+msgstr "Berkeley 郵件信箱 (mbox)"
 
 #: ../mail/importers/evolution-mbox-importer.c:224
 msgid "Importer Berkeley Mailbox format folders"
-msgstr "匯入 Berkeley 郵件箱格式資料夾"
+msgstr "匯入 Berkeley 郵件信箱格式資料夾"
 
-# shell/e-shell-importer.c:363
 #: ../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'"
+msgstr "正在匯入 ‘%s’"
 
 #: ../mail/importers/evolution-outlook-importer.c:266
 #: ../mail/importers/netscape-importer.c:1254
@@ -14196,19 +12656,16 @@ msgstr "輸入 `%s'"
 msgid "Please wait"
 msgstr "請稍候"
 
-# shell/e-shell-importer.c:363
 #: ../mail/importers/evolution-outlook-importer.c:310
 #: ../mail/importers/mail-importer.c:148
 msgid "Importing mailbox"
-msgstr "輸入信箱"
+msgstr "正在匯入信箱"
 
-# mail/mail-ops.c:599
 #: ../mail/importers/mail-importer.c:376
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../mail/importers/netscape-importer.c:74
 #, c-format
 msgid "Priority Filter \"%s\""
@@ -14268,7 +12725,7 @@ msgstr ""
 
 #: ../mail/importers/netscape-importer.c:1251
 msgid "Evolution is importing your old Netscape data"
-msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
+msgstr "Evolution 正在匯入舊有的 Netscape 資料"
 
 #: ../mail/importers/netscape-importer.c:1708
 msgid "Importing Netscape data"
@@ -14282,21 +12739,18 @@ msgstr "設定值"
 msgid "Mail Filters"
 msgstr "郵件規則"
 
-# importers/netscape-importer.c:847
 #: ../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？"
+"是否將它們匯入至 Evolution？"
 
-# shell/e-shell-importer.c:363
 #: ../mail/importers/pine-importer.c:229
 msgid "Importing Pine data"
 msgstr "輸入管道資料"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../mail/importers/pine-importer.c:433
 msgid "Evolution Pine importer"
 msgstr "Evolution 管道輸入器"
@@ -14305,32 +12759,26 @@ msgstr "Evolution 管道輸入器"
 msgid "Import mail from Pine."
 msgstr "從 Pine 匯入郵件。"
 
-# mail/mail-autofilter.c:70
 #: ../mail/mail-autofilter.c:79
 #, c-format
 msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
-# mail/mail-autofilter.c:229
 #: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
-# mail/mail-autofilter.c:213
 #: ../mail/mail-autofilter.c:266
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
-# mail/mail-autofilter.c:285
 #: ../mail/mail-autofilter.c:301
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
-# mail/mail-autofilter.c:335
-# mail/mail-autofilter.c:356
 #: ../mail/mail-autofilter.c:372
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
@@ -14342,7 +12790,6 @@ msgid_plural "%d deleted"
 msgstr[0] "%d 封已刪除"
 msgstr[1] "%d 封已刪除"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:523
 #, c-format
 msgid "%d junk"
@@ -14350,7 +12797,6 @@ msgid_plural "%d junk"
 msgstr[0] "%d 封垃圾"
 msgstr[1] "%d 封垃圾"
 
-# mail/mail-config.glade.h:26
 #: ../mail/mail-component.c:546
 #, c-format
 msgid "%d draft"
@@ -14358,7 +12804,6 @@ msgid_plural "%d drafts"
 msgstr[0] "%d 個草稿"
 msgstr[1] "%d 個草稿"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:548
 #, c-format
 msgid "%d sent"
@@ -14366,7 +12811,6 @@ msgid_plural "%d sent"
 msgstr[0] "%d 封已傳送"
 msgstr[1] "%d 封已傳送"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:550
 #, c-format
 msgid "%d unsent"
@@ -14381,7 +12825,6 @@ msgid_plural "%d total"
 msgstr[0] "共 %d 封"
 msgstr[1] "共 %d 封"
 
-# calendar/gui/event-editor.c:1558
 #: ../mail/mail-component.c:556
 #, c-format
 msgid ", %d unread"
@@ -14389,7 +12832,6 @@ msgid_plural ", %d unread"
 msgstr[0] "%d 封未讀"
 msgstr[1] "%d 封未讀"
 
-# ui/evolution-mail.xml.h:109
 #: ../mail/mail-component.c:819
 msgid "New Mail Message"
 msgstr "新增郵件"
@@ -14398,13 +12840,10 @@ msgstr "新增郵件"
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
 #: ../mail/mail-component.c:821
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
-# mail/mail-vfolder.c:438
 #: ../mail/mail-component.c:827
 msgid "New Mail Folder"
 msgstr "新郵件資料夾"
@@ -14413,7 +12852,6 @@ msgstr "新郵件資料夾"
 msgid "Mail _Folder"
 msgstr "郵件資料夾(_F)"
 
-# ui/evolution.xml.h:10
 #: ../mail/mail-component.c:829
 msgid "Create a new mail folder"
 msgstr "建立新郵件資料夾"
@@ -14436,14 +12874,11 @@ msgstr "工作(_W)"
 msgid "_Personal"
 msgstr "個人(_P)"
 
-# mail/mail-format.c:762
-# mail/message-list.c:1083
 #. forest green
 #: ../mail/mail-config.c:88
 msgid "_To Do"
 msgstr "待辦事項(_T)"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #. blue
 #: ../mail/mail-config.c:89
 msgid "_Later"
@@ -14513,7 +12948,6 @@ msgstr "<span weight=\"bold\">標籤和色彩</span>"
 msgid "<span weight=\"bold\">Loading Images</span>"
 msgstr "<span weight=\"bold\">載入影像</span>"
 
-# views/mail/galview.xml.h:4
 #: ../mail/mail-config.glade.h:20
 msgid "<span weight=\"bold\">Message Display</span>"
 msgstr "<span weight=\"bold\">郵件顯示</span>"
@@ -14526,7 +12960,6 @@ msgstr "<span weight=\"bold\">郵件字型</span>"
 msgid "<span weight=\"bold\">Message Receipts</span>"
 msgstr "<span weight=\"bold\">郵件回條</span>"
 
-# mail/mail-config.glade.h:40
 #: ../mail/mail-config.glade.h:23
 msgid "<span weight=\"bold\">New Mail Notification</span>"
 msgstr "<span weight=\"bold\">新郵件通知</span>"
@@ -14544,9 +12977,10 @@ msgstr "<span weight=\"bold\">選項</span>"
 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
 msgid "<span weight=\"bold\">Printed Fonts</span>"
-msgstr "<span weight=\"bold\">列印的字型</span>"
+msgstr "<span weight=\"bold\">列印用的字型</span>"
 
 #: ../mail/mail-config.glade.h:28
 msgid "<span weight=\"bold\">Required Information</span>"
@@ -14560,7 +12994,6 @@ msgstr "<span weight=\"bold\">安全 MIME (S/MIME)</span>"
 msgid "<span weight=\"bold\">Security</span>"
 msgstr "<span weight=\"bold\">安全性</span>"
 
-# mail/mail-config.glade.h:69
 #: ../mail/mail-config.glade.h:31
 msgid "<span weight=\"bold\">Sent and Draft Messages</span>"
 msgstr "<span weight=\"bold\">己傳送的和草稿郵件</span>"
@@ -14569,7 +13002,6 @@ msgstr "<span weight=\"bold\">己傳送的和草稿郵件</span>"
 msgid "<span weight=\"bold\">Server Configuration</span>"
 msgstr "<span weight=\"bold\">伺服器組態</span>"
 
-# mail/mail-config.glade.h:5
 #: ../mail/mail-config.glade.h:34
 msgid "Account Management"
 msgstr "帳號總管"
@@ -14584,7 +13016,7 @@ msgstr "新增命令稿(_S)"
 
 #: ../mail/mail-config.glade.h:37
 msgid "Al_ways sign outgoing messages when using this account"
-msgstr "使用此帳號時永遠在外送的郵件簽名(_W)"
+msgstr "使用此帳號時一定在外送的郵件簽名(_W)"
 
 #: ../mail/mail-config.glade.h:38
 msgid "Also encrypt to sel_f when sending encrypted mail"
@@ -14592,21 +13024,20 @@ msgstr "當傳送加密郵件時也加密本身(_F)"
 
 #: ../mail/mail-config.glade.h:39
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "永遠寄送副本(Cc)給(_S):"
+msgstr "一定寄送副本 (_Cc) 給:"
 
 #: ../mail/mail-config.glade.h:40
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "永遠寄送密件副本(Bcc)給(_B):"
+msgstr "一定寄送密件副本 (_Bcc) 給:"
 
 #: ../mail/mail-config.glade.h:41
 msgid "Always _trust keys in my keyring when encrypting"
-msgstr "加密時永遠信任在我的鑰匙圈裡的金鑰(_T)"
+msgstr "加密時永遠信任我的鑰匙圈裡的金鑰(_T)"
 
 #: ../mail/mail-config.glade.h:42
 msgid "Always encrypt to _myself when sending encrypted mail"
 msgstr "當傳送加密郵件時永遠自我加密(_M)"
 
-# composer/e-msg-composer-attachment-bar.c:501
 #: ../mail/mail-config.glade.h:43
 msgid "Attach original message"
 msgstr "附加原始郵件"
@@ -14629,7 +13060,7 @@ msgstr "當新郵件到達時發出嗶聲(_H)"
 
 #: ../mail/mail-config.glade.h:49
 msgid "C_haracter set:"
-msgstr "字集(_H):"
+msgstr "字元集(_H):"
 
 #: ../mail/mail-config.glade.h:50
 msgid "Ch_eck for Supported Types "
@@ -14647,14 +13078,10 @@ msgstr "當我輸入時檢查拼字(_T)"
 msgid "Checks incoming mail messages to be Junk"
 msgstr "檢查內送的垃圾郵件訊息"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../mail/mail-config.glade.h:54
 msgid "Cle_ar"
 msgstr "清除(_A)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../mail/mail-config.glade.h:55
 msgid "Clea_r"
 msgstr "清除(_R)"
@@ -14671,7 +13098,6 @@ msgstr "色彩"
 msgid "Confirm _when expunging a folder"
 msgstr "刪除資料夾時確認(_W)"
 
-# mail/mail-config.glade.h:15
 #: ../mail/mail-config.glade.h:59
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
@@ -14681,12 +13107,12 @@ msgid ""
 "\n"
 "Click \"Apply\" to save your settings."
 msgstr ""
-"恭喜您，您的郵件組態已經完成。\n"
+"恭喜您，郵件設定已經完成。\n"
 "\n"
 "您現在可以開始使用 Evolution\n"
 "收發電子郵件。\n"
 "\n"
-"按一下「套用」，儲存您的設定值。"
+"請按一下「套用」儲存設定。"
 
 #: ../mail/mail-config.glade.h:65
 msgid "De_fault"
@@ -14698,9 +13124,8 @@ msgstr "預設字元編碼(_N):"
 
 #: ../mail/mail-config.glade.h:69
 msgid "Digitally _sign outgoing messages (by default)"
-msgstr "數位簽名外送的郵件 (預設值)(_S)"
+msgstr "為外送的郵件加上數位簽章 [預設值] (_S)"
 
-# camel/camel-filter-driver.c:671
 #: ../mail/mail-config.glade.h:70
 msgid "Do not quote original message"
 msgstr "不要引用原始郵件"
@@ -14718,7 +13143,6 @@ msgstr "草稿匣(_F):"
 msgid "E_nable"
 msgstr "啟用(_E)"
 
-# mail/mail-config.glade.h:6
 #: ../mail/mail-config.glade.h:74
 msgid "Email Accounts"
 msgstr "電子郵件帳號"
@@ -14729,7 +13153,7 @@ msgstr "電子郵件位址(_A):"
 
 #: ../mail/mail-config.glade.h:76
 msgid "Empty trash folders on e_xit"
-msgstr "離開時清空垃圾桶資料夾(_X)"
+msgstr "離開時清空回收筒資料夾(_X)"
 
 #: ../mail/mail-config.glade.h:77
 msgid "Encry_ption certificate:"
@@ -14747,9 +13171,6 @@ msgstr "固定寬度字型(_X):"
 msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
-# mail/folder-browser-factory.c:198
-# ui/evolution-event-editor.xml.h:39
-# ui/evolution-task-editor-dialog.xml.h:42
 #: ../mail/mail-config.glade.h:82
 msgid "Font Properties"
 msgstr "字型內容"
@@ -14762,12 +13183,10 @@ msgstr "將郵件格式化為 _HTML"
 msgid "Full Nam_e:"
 msgstr "全名(_E):"
 
-# mail/mail-config.glade.h:36
 #: ../mail/mail-config.glade.h:86
 msgid "HTML Mail"
 msgstr "HTML 郵件"
 
-# addressbook/printing/e-contact-print.glade.h:11
 #: ../mail/mail-config.glade.h:87
 msgid "Headers"
 msgstr "標頭"
@@ -14780,17 +13199,14 @@ msgstr "強調引文為(_Q)"
 msgid "I_nclude remote tests"
 msgstr "包含遠端測試(_N)"
 
-# mail/mail-config.glade.h:37
 #: ../mail/mail-config.glade.h:92
 msgid "Inline"
 msgstr "行內"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #: ../mail/mail-config.glade.h:94
 msgid "Languages Table"
 msgstr "語言表"
 
-# mail/mail-config.glade.h:40
 #: ../mail/mail-config.glade.h:96
 msgid "Mail Configuration"
 msgstr "郵件組態"
@@ -14799,12 +13215,10 @@ msgstr "郵件組態"
 msgid "Mail Headers Table"
 msgstr "郵件標頭表"
 
-# mail/local-config.glade.h:2
 #: ../mail/mail-config.glade.h:99
 msgid "Mailbox location"
 msgstr "信箱位置"
 
-# views/mail/galview.xml.h:4
 #: ../mail/mail-config.glade.h:100
 msgid "Message Composer"
 msgstr "郵件編輯器"
@@ -14813,7 +13227,7 @@ msgstr "郵件編輯器"
 msgid ""
 "Note: you will not be prompted for a password until you connect for the "
 "first time"
-msgstr "注意：在您首次連線之前將不會提示您輸入密碼"
+msgstr "注意：在首次連線之前將不會提示您輸入密碼"
 
 #: ../mail/mail-config.glade.h:102
 msgid "Or_ganization:"
@@ -14821,7 +13235,7 @@ msgstr "團體(_G):"
 
 #: ../mail/mail-config.glade.h:103
 msgid "PGP/GPG _Key ID:"
-msgstr "PGP/GPG 鑰匙 ID(_K):"
+msgstr "_PGP/GPG 金鑰 ID:"
 
 #: ../mail/mail-config.glade.h:106
 msgid "Play sound file when new mail arri_ves"
@@ -14835,40 +13249,31 @@ msgstr ""
 "請在下面的空間輸入描述這個帳號的名稱。\n"
 "這個名稱將只做為顯示之用。"
 
-# mail/mail-config-druid.c:105
 #: ../mail/mail-config.glade.h:109
 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 ""
-"請輸入以下關於您寄送郵件方式的資訊。如果您不清楚，請聯絡您的系統管理員或網路"
-"服務供應商。"
+msgstr "請輸入以下關於寄送郵件方式的資訊。如果您不清楚，請聯絡系統管理員或網路服務供應商。"
 
-# mail/mail-config-druid.c:99
 #: ../mail/mail-config.glade.h:110
 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 ""
-"請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出"
-"的郵件內包含這些資訊。"
+msgstr "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出的郵件內包含這些資訊。"
 
 #: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:112
 msgid "Pr_ompt when sending messages with only Bcc recipients defined"
 msgstr "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-# camel/camel-filter-driver.c:671
 #: ../mail/mail-config.glade.h:113
 msgid "Quote original message"
 msgstr "引用原始郵件"
 
-# mail/mail-config.glade.h:56
 #: ../mail/mail-config.glade.h:114
 msgid "Quoted"
 msgstr "引用"
@@ -14885,12 +13290,10 @@ msgstr "回覆地址(_P):"
 msgid "Remember _password"
 msgstr "記住密碼(_P)"
 
-# ui/evolution-contact-editor.xml.h:3
 #: ../mail/mail-config.glade.h:119
 msgid "S_elect..."
 msgstr "選取(_E)..."
 
-# mail/mail-ops.c:603
 #: ../mail/mail-config.glade.h:120
 msgid "S_end message receipts:"
 msgstr "傳送郵件回條(_E):"
@@ -14899,7 +13302,6 @@ msgstr "傳送郵件回條(_E):"
 msgid "S_tandard Font:"
 msgstr "標準字型(_T):"
 
-# ui/evolution-contact-editor.xml.h:3
 #: ../mail/mail-config.glade.h:122
 msgid "Se_lect..."
 msgstr "選取(_L)..."
@@ -14920,13 +13322,10 @@ msgstr "選擇 HTML 可變寬度字型"
 msgid "Select HTML variable width font for printing"
 msgstr "選擇用於列印的 HTML 可變寬度字型"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../mail/mail-config.glade.h:128
 msgid "Select sound file"
 msgstr "選擇聲音檔案"
 
-# mail/mail-config.glade.h:66
 #: ../mail/mail-config.glade.h:130
 msgid "Sending Mail"
 msgstr "傳送郵件"
@@ -14951,12 +13350,10 @@ msgstr "簽名憑證(_N):"
 msgid "Signat_ure:"
 msgstr "簽名檔(_U):"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail-config.glade.h:136
 msgid "Signatures"
 msgstr "簽名"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail-config.glade.h:137
 msgid "Signatures Table"
 msgstr "簽章表"
@@ -14977,7 +13374,7 @@ msgstr "類型(_Y):"
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
-msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
+msgstr "這裡的語言清單只反映出已經安裝字典的語言。"
 
 #: ../mail/mail-config.glade.h:142
 msgid ""
@@ -14985,8 +13382,8 @@ msgid ""
 "signature. The name you specify will be used\n"
 "for display purposes only. "
 msgstr ""
-"這個命令稿的輸出會用來做為您的\n"
-"簽名檔。您所指定的名稱將只做為\n"
+"這個命令稿的輸出會用來作為您的\n"
+"簽名檔。您指定的名稱只會作為\n"
 "顯示之用。"
 
 #: ../mail/mail-config.glade.h:146
@@ -14994,7 +13391,7 @@ msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example: \"Work\" or \"Personal\""
 msgstr ""
-"輸入您想要用來代表這個帳號的名稱。\n"
+"輸入想用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
 #: ../mail/mail-config.glade.h:148 ../plugins/caldav/caldav-source.c:282
@@ -15005,7 +13402,6 @@ msgstr "使用者名稱(_N):"
 msgid "V_ariable-width:"
 msgstr "可變寬度(_A):"
 
-# mail/mail-config.glade.h:81
 #: ../mail/mail-config.glade.h:150
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
@@ -15022,7 +13418,7 @@ msgstr "加入簽名檔(_A)"
 
 #: ../mail/mail-config.glade.h:155
 msgid "_Always load images from the Internet"
-msgstr "永遠自網路下載影像(_A)"
+msgstr "一定自網路下載影像(_A)"
 
 #: ../mail/mail-config.glade.h:156
 msgid "_Do not notify me when new mail arrives"
@@ -15030,7 +13426,7 @@ msgstr "當新郵件到達時不要通知我(_D)"
 
 #: ../mail/mail-config.glade.h:157
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
-msgstr "不要簽署會議邀請(為了相容 _Outlook)"
+msgstr "不簽署會議邀請 (相容於 _Outlook)"
 
 #: ../mail/mail-config.glade.h:159
 msgid "_Forward style:"
@@ -15050,18 +13446,16 @@ msgstr "標示郵件為已閱讀於(_M)"
 
 #: ../mail/mail-config.glade.h:164
 msgid "_Never load images from the Internet"
-msgstr "永遠不自網路下載影像(_N)"
+msgstr "一定不自網路下載影像(_N)"
 
 #: ../mail/mail-config.glade.h:165
 msgid "_Path:"
 msgstr "路徑(_P):"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:166
 msgid "_Prompt when sending HTML messages to contacts that do not want them"
 msgstr "當傳送 _HTML 郵件給不想收到這類郵件的連絡人時顯示提示"
 
-# ui/evolution-mail.xml.h:14
 #: ../mail/mail-config.glade.h:167
 msgid "_Prompt when sending messages with an empty subject line"
 msgstr "當傳送沒有主旨的郵件時顯示提示(_P)"
@@ -15074,7 +13468,6 @@ msgstr "回覆方式(_R):"
 msgid "_Script:"
 msgstr "命令稿(_S):"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #. If enabled, show animation; if disabled, only display a static image without any animation
 #: ../mail/mail-config.glade.h:172
 msgid "_Show image animations"
@@ -15084,7 +13477,6 @@ msgstr "顯示動畫影像(_S)"
 msgid "_Shrink To / Cc / Bcc headers to "
 msgstr "縮短 _To / Cc / Bcc 標頭為"
 
-# mail/mail-config.glade.h:79
 #: ../mail/mail-config.glade.h:174
 msgid "_Use Secure Connection:"
 msgstr "使用安全連線(_U):"
@@ -15133,25 +13525,18 @@ msgstr "所有本地端及可用的遠端資料夾"
 msgid "All local folders"
 msgstr "所有本地端資料夾"
 
-# mail/mail-search.c:298
 #: ../mail/mail-dialogs.glade.h:8
 msgid "Case _sensitive"
 msgstr "區分大小寫(_S)"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../mail/mail-dialogs.glade.h:9 ../mail/message-tags.glade.h:1
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
-# mail/mail-search.c:316
 #: ../mail/mail-dialogs.glade.h:11
 msgid "F_ind:"
 msgstr "尋找(_I):"
 
-# mail/mail-search.c:268
 #: ../mail/mail-dialogs.glade.h:12
 msgid "Find in Message"
 msgstr "在郵件內尋找"
@@ -15161,7 +13546,6 @@ msgstr "在郵件內尋找"
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
-# mail/subscribe-dialog.c:873
 #: ../mail/mail-dialogs.glade.h:14
 msgid "Folder Subscriptions"
 msgstr "資料夾訂閱"
@@ -15178,7 +13562,6 @@ msgstr "未選取"
 msgid "S_erver:"
 msgstr "伺服器(_E):"
 
-# mail/mail-config.glade.h:4
 #: ../mail/mail-dialogs.glade.h:18
 msgid "Security Information"
 msgstr "保全性資訊"
@@ -15207,28 +13590,23 @@ msgstr "到期於(_D):"
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
-# mail/mail-config.glade.h:6
 #: ../mail/mail-dialogs.glade.h:26
 msgid "_Tick this to accept the license agreement"
 msgstr "選取此項來接受授權合約(_T)"
 
-# mail/mail-ops.c:599
 #: ../mail/mail-folder-cache.c:858
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
 
-# mail/mail-local.c:812
 #: ../mail/mail-ops.c:105
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
-# mail/mail-config.glade.h:58
 #: ../mail/mail-ops.c:266
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
-# camel/camel-movemail.c:274
 #. sending mail, filtering failed
 #: ../mail/mail-ops.c:566
 #, c-format
@@ -15244,80 +13622,62 @@ msgstr ""
 "無法附加至 %s：%s\n"
 "改附加至本地「寄件匣」。"
 
-# camel/camel-movemail.c:274
 #: ../mail/mail-ops.c:624
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "無法附加至本地「寄件匣」：%s"
 
-# mail/mail-ops.c:718
 #: ../mail/mail-ops.c:736
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "正在傳送郵件 %d / %d"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
 #: ../mail/mail-ops.c:761
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
-# mail/mail-send-recv.c:471
 #: ../mail/mail-ops.c:763 ../mail/mail-send-recv.c:648
 msgid "Canceled."
 msgstr "已取消。"
 
-# mail/mail-ops.c:739
-# mail/mail-send-recv.c:475
 #: ../mail/mail-ops.c:765
 msgid "Complete."
 msgstr "完成。"
 
-# mail/mail-ops.c:825
 #: ../mail/mail-ops.c:862
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
-# mail/mail-ops.c:898
 #: ../mail/mail-ops.c:947
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
-# mail/mail-ops.c:898
 #: ../mail/mail-ops.c:947
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
-# mail/mail-ops.c:1154
 #: ../mail/mail-ops.c:1170
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1213
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
-# mail/mail-ops.c:1262
 #: ../mail/mail-ops.c:1285
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1363
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1457
 #, c-format
 msgid "Storing folder '%s'"
@@ -15328,41 +13688,33 @@ msgstr "貯藏資料夾「%s」"
 msgid "Expunging and storing account '%s'"
 msgstr "清空和儲存帳號 '%s'"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-ops.c:1523
 #, c-format
 msgid "Storing account '%s'"
 msgstr "儲存帳號 '%s'"
 
-# mail/mail-local.c:812
 #: ../mail/mail-ops.c:1578
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
-# mail/mail-ops.c:1449
 #: ../mail/mail-ops.c:1614 ../mail/mail-ops.c:1665
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
-# shell/e-shell-importer.c:371
 #: ../mail/mail-ops.c:1662
 #, c-format
 msgid "Emptying trash in '%s'"
-msgstr "清空 '%s' 的垃圾筒"
+msgstr "清空 '%s' 的回收筒"
 
-# mail/mail-config.glade.h:76
 #: ../mail/mail-ops.c:1663
 msgid "Local Folders"
 msgstr "本機資料夾"
 
-# mail/mail-ops.c:1498
 #: ../mail/mail-ops.c:1746
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
-# mail/mail-ops.c:1565
 #: ../mail/mail-ops.c:1856
 #, c-format
 msgid "Retrieving %d message"
@@ -15370,7 +13722,6 @@ msgid_plural "Retrieving %d messages"
 msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
-# mail/mail-ops.c:1649
 #: ../mail/mail-ops.c:1942
 #, c-format
 msgid "Saving %d message"
@@ -15378,7 +13729,6 @@ msgid_plural "Saving %d messsages"
 msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
-# mail/mail-ops.c:1755
 #: ../mail/mail-ops.c:2013
 #, c-format
 msgid ""
@@ -15388,12 +13738,10 @@ msgstr ""
 "儲存郵件到：%s 時發生錯誤：\n"
 " %s"
 
-# mail/mail-ops.c:1829
 #: ../mail/mail-ops.c:2085
 msgid "Saving attachment"
 msgstr "儲存附件"
 
-# mail/mail-ops.c:1844
 #: ../mail/mail-ops.c:2098 ../mail/mail-ops.c:2104
 #, c-format
 msgid ""
@@ -15403,19 +13751,16 @@ msgstr ""
 "不能建立輸出檔案：%s：\n"
 " %s"
 
-# mail/mail-ops.c:1872
 #: ../mail/mail-ops.c:2114
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
-# mail/mail-ops.c:1939
 #: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
-# mail/mail-ops.c:1939
 #: ../mail/mail-ops.c:2263
 #, c-format
 msgid "Reconnecting to %s"
@@ -15425,12 +13770,10 @@ msgstr "重新連線到 %s"
 msgid "Checking Service"
 msgstr "檢查服務"
 
-# mail/mail-send-recv.c:138
 #: ../mail/mail-send-recv.c:159
 msgid "Canceling..."
 msgstr "正在取消..."
 
-# mail/mail-send-recv.c:233
 #: ../mail/mail-send-recv.c:345
 msgid "Send & Receive Mail"
 msgstr "傳送與接收郵件"
@@ -15439,13 +13782,10 @@ msgstr "傳送與接收郵件"
 msgid "Cancel _All"
 msgstr "全部取消(_A)"
 
-# mail/mail-send-recv.c:285
 #: ../mail/mail-send-recv.c:449
 msgid "Updating..."
 msgstr "正在更新..."
 
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
 #: ../mail/mail-send-recv.c:449 ../mail/mail-send-recv.c:502
 msgid "Waiting..."
 msgstr "正在等待..."
@@ -15454,45 +13794,29 @@ msgstr "正在等待..."
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
-# camel/camel-smime-context.c:194
 #: ../mail/mail-session.c:205
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "請輸入 %s 所需的密語"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../mail/mail-session.c:207
 msgid "Enter Passphrase"
 msgstr "輸入密語"
 
-# camel/camel-smime-context.c:194
 #: ../mail/mail-session.c:210
 #: ../plugins/exchange-operations/exchange-config-listener.c:711
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../mail/mail-session.c:212
 msgid "Enter Password"
 msgstr "輸入密碼"
 
-# mail/mail-session.c:161
 #: ../mail/mail-session.c:250
 msgid "User canceled operation."
 msgstr "使用者已取消操作。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail-signature-editor.c:384
 msgid "Edit signature"
 msgstr "儲存簽名檔"
@@ -15501,14 +13825,11 @@ msgstr "儲存簽名檔"
 msgid "Enter a name for this signature."
 msgstr "輸入這個簽名檔的名稱。"
 
-# addressbook/gui/component/addressbook-config.c:686
-# mail/mail-config.glade.h:43
 #: ../mail/mail-signature-editor.c:434
 #: ../plugins/groupwise-features/properties.glade.h:4
 msgid "Name:"
 msgstr "名稱:"
 
-# camel/camel-session.c:479
 #: ../mail/mail-tools.c:120
 #, c-format
 msgid "Could not create spool directory `%s': %s"
@@ -15519,49 +13840,39 @@ msgstr "無法建立暫存序列目錄 `%s'：%s"
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "正在嘗試移動非 mbox 來源 `%s' 的郵件"
 
-# mail/mail-tools.c:219
 #: ../mail/mail-tools.c:256
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "轉寄的郵件 - %s"
 
-# mail/mail-ops.c:1154
 #: ../mail/mail-tools.c:258
 msgid "Forwarded message"
 msgstr "轉寄的郵件"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-tools.c:298
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "資料夾無效:`%s'"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail-vfolder.c:91
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "設定搜尋資料夾： %s"
 
-# mail/mail-ops.c:992
 #: ../mail/mail-vfolder.c:240
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "更新 '%s:%s' 的搜尋資料夾"
 
-# mail/mail-ops.c:992
 #: ../mail/mail-vfolder.c:247
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "更新 '%s' 的搜尋資料夾"
 
-# mail/mail-account-gui.c:682
 #: ../mail/mail-vfolder.c:1023
 msgid "Edit Search Folder"
 msgstr "編輯搜尋資料夾"
 
-# mail/mail-account-gui.c:682
 #: ../mail/mail-vfolder.c:1107
 msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
@@ -15598,53 +13909,45 @@ msgstr "已經有名稱為「{0}」的簽名檔存在。請使用不同的名稱
 msgid ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
-msgstr "新增有意義的主旨行到您的郵件，可以讓收件者知道您的郵件和什麼事有關。"
+msgstr "為郵件加上有意義的主旨，可以讓收件者知道您的郵件和什麼事有關。"
 
 #: ../mail/mail.error.xml.h:8
 msgid "Are you sure you want to delete this account and all its proxies?"
-msgstr "您確定要刪除這個帳號以及它所有的代理伺服器？"
+msgstr "確定要刪除這個帳號以及它所有的代理伺服器？"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../mail/mail.error.xml.h:9
 msgid "Are you sure you want to delete this account?"
-msgstr "您確定要刪除這個帳號？"
+msgstr "確定要刪除這個帳號？"
 
 #: ../mail/mail.error.xml.h:10
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器？"
 
-# mail/mail-callbacks.c:1017
 #: ../mail/mail.error.xml.h:11
 msgid "Are you sure you want to open {0} messages at once?"
-msgstr "您確定要一次開啟 {0} 封郵件？"
+msgstr "您確定要一次過開啟 {0} 封郵件？"
 
-# ui/evolution-mail.xml.h:61
 #: ../mail/mail.error.xml.h:12
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr "要永久移除所有資料夾中所有刪除的郵件？"
 
-# mail/mail-callbacks.c:1549
 #: ../mail/mail.error.xml.h:13
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder &quot;{0}&quot;?"
 msgstr "要永久移除資料夾「{0}」中所有刪除的郵件？"
 
-# mail/mail-callbacks.c:1085
 #: ../mail/mail.error.xml.h:14
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "要傳送 HTML 格式的郵件?"
 
-# mail/mail-callbacks.c:1085
 #: ../mail/mail.error.xml.h:15
 msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "要傳送只有密件副本收件者的郵件?"
 
-# mail/mail-callbacks.c:1085
 #: ../mail/mail.error.xml.h:16
 msgid "Are you sure you want to send a message without a subject?"
 msgstr "要傳送沒有主旨的郵件？"
@@ -15657,75 +13960,54 @@ msgstr "因為「{0}」。"
 msgid "Because &quot;{2}&quot;."
 msgstr "因為「{2}」。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail.error.xml.h:20
 msgid "Blank Signature"
 msgstr "空白簽名檔"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:21
 msgid "Cannot add Search Folder &quot;{0}&quot;."
 msgstr "無法新增搜尋資料夾「{0}」。"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../mail/mail.error.xml.h:22
 msgid "Cannot copy folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾複製至「{1}」。"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
 #: ../mail/mail.error.xml.h:23
 msgid "Cannot create folder &quot;{0}&quot;."
 msgstr "無法建立資料夾「{0}」。"
 
-# mail/mail-display.c:236
 #: ../mail/mail.error.xml.h:24
 msgid "Cannot create temporary save directory."
 msgstr "無法建立暫時儲存目錄。"
 
-# shell/e-setup.c:215
 #: ../mail/mail.error.xml.h:25
 msgid "Cannot create the save directory, because &quot;{1}&quot;"
 msgstr "無法建立儲存目錄，因為「{1}」"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:26
 msgid "Cannot delete folder &quot;{0}&quot;."
 msgstr "無法刪除資料夾「{0}」。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:27
 msgid "Cannot delete system folder &quot;{0}&quot;."
 msgstr "無法刪除系統資料夾「{0}」。"
 
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
 #: ../mail/mail.error.xml.h:28
 msgid "Cannot edit Search Folder &quot;{0}&quot; as it does not exist."
 msgstr "無法編輯搜尋資料夾「{0}」，因為它不存在。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:29
 msgid "Cannot move folder &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」資料夾移至「{1}」。"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #: ../mail/mail.error.xml.h:30
 msgid "Cannot open source &quot;{1}&quot;"
 msgstr "無法開啟來源「{1}」"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #: ../mail/mail.error.xml.h:31
 msgid "Cannot open source &quot;{2}&quot;."
 msgstr "無法開啟來源「{2}」。"
 
-# camel/camel-filter-driver.c:671
 #: ../mail/mail.error.xml.h:32
 msgid "Cannot open target &quot;{2}&quot;."
 msgstr "無法開啟目標「{2}」。"
@@ -15735,17 +14017,12 @@ msgid ""
 "Cannot read the license file &quot;{0}&quot;, due to an installation "
 "problem. You will not be able to use this provider until you can accept its "
 "license."
-msgstr ""
-"無法讀取授權條款檔案「{0}」，應該是安裝問題造成的。在您同意這項授權之前將無法"
-"使用它。"
+msgstr "無法讀取授權條款檔案「{0}」，應該是安裝問題造成的。在您同意這項授權之前將無法使用它。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:34
 msgid "Cannot rename &quot;{0}&quot; to &quot;{1}&quot;."
 msgstr "無法將「{0}」重新命名成「{1}」。"
 
-# camel/providers/local/camel-local-store.c:237
 #: ../mail/mail.error.xml.h:35
 msgid "Cannot rename or move system folder &quot;{0}&quot;."
 msgstr "無法重新命名或移動系統資料夾「{0}」。"
@@ -15754,55 +14031,33 @@ msgstr "無法重新命名或移動系統資料夾「{0}」。"
 msgid "Cannot save changes to account."
 msgstr "無法儲存帳號變更。"
 
-# camel/providers/imap/camel-imap-folder.c:172
 #: ../mail/mail.error.xml.h:37
 msgid "Cannot save to directory &quot;{0}&quot;."
 msgstr "無法儲存至目錄「{0}」。"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-maildir-folder.c:209
-# camel/providers/local/camel-maildir-folder.c:217
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
-# camel/providers/local/camel-mh-folder.c:194
-# camel/providers/local/camel-mh-folder.c:202
 #: ../mail/mail.error.xml.h:38
 msgid "Cannot save to file &quot;{0}&quot;."
 msgstr "無法儲存至檔案「{0}」。"
 
-# mail/mail-config.glade.h:74
 #: ../mail/mail.error.xml.h:39
 msgid "Cannot set signature script &quot;{0}&quot;."
-msgstr "無法設定簽名程序檔「{0}」。"
+msgstr "無法設定簽章程序檔「{0}」。"
 
+# (Abel) 鍵盤的鍵最好不譯了
 #: ../mail/mail.error.xml.h:40
 msgid ""
 "Check to make sure your password is spelled correctly. Remember that many "
 "passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"檢查確定您的密碼拼字正確。請注意很多密碼區分大小寫；您可能啟動了大寫鎖定鍵。"
+msgstr "請檢查密碼拼字是否正確。請注意，很多密碼區分大小寫；您可能按了 Caps Lock。"
 
-# mail/mail-crypto.c:59
 #: ../mail/mail.error.xml.h:41
 msgid "Could not save signature file."
-msgstr "無法儲存簽名檔案。"
-
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
+msgstr "無法儲存簽章檔案。"
+
 #: ../mail/mail.error.xml.h:42
 msgid "Delete &quot;{0}&quot;?"
 msgstr "刪除「{0}」？"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../mail/mail.error.xml.h:43
 msgid "Delete account?"
 msgstr "刪除帳號？"
@@ -15811,52 +14066,38 @@ msgstr "刪除帳號？"
 msgid "Discard changes?"
 msgstr "是否放棄變更？"
 
-# mail/folder-browser.c:717
-# ui/evolution-mail.xml.h:121
 #: ../mail/mail.error.xml.h:45
 msgid "Do not delete"
 msgstr "不要刪除"
 
-# mail/mail-accounts.c:197
 #: ../mail/mail.error.xml.h:46
 msgid "Do not disable"
 msgstr "不要停用"
 
 #: ../mail/mail.error.xml.h:47
 msgid "Do you want the operation to be performed in the subfolders?"
-msgstr "您是否想讓此項操作一併於子資料夾中進行？"
+msgstr "是否想在子資料夾中一併進行這項操作程序？"
 
-# ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:48
 msgid "Do you want to mark all messages as read?"
 msgstr "是否要將全部的郵件標示成已閱讀？"
 
-# calendar/gui/dialogs/save-comp.c:51
 #: ../mail/mail.error.xml.h:49
 msgid "Do you wish to save your changes?"
 msgstr "要儲存所做的變更？"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "輸入密碼。"
 
-# mail/mail-callbacks.c:1349
 #: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "載入過濾器定義時發生錯誤。"
 
-# mail/mail-mt.c:193
 #: ../mail/mail.error.xml.h:52
 msgid "Error while performing operation."
 msgstr "執行作業時，發生錯誤。"
 
-# mail/mail-mt.c:190
 #: ../mail/mail.error.xml.h:53
 msgid "Error while {0}."
 msgstr "當 {0} 時發生錯誤。"
@@ -15865,21 +14106,19 @@ msgstr "當 {0} 時發生錯誤。"
 msgid "File exists but cannot overwrite it."
 msgstr "檔案存在但無法覆寫。"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
 #: ../mail/mail.error.xml.h:55
 msgid "File exists but is not a regular file."
 msgstr "檔案存在但不是一般檔案。"
 
 #: ../mail/mail.error.xml.h:56
 msgid "If you continue, you will not be able to recover these messages."
-msgstr "如果您繼續，將無法復原這些郵件。"
+msgstr "如果您選擇繼續，將無法復原這些郵件。"
 
 #: ../mail/mail.error.xml.h:57
 msgid ""
 "If you delete the folder, all of its contents and its subfolders contents "
 "will be deleted permanently."
-msgstr "如果您刪除資料夾，所有它的內容和子資料夾內容會永久刪除。"
+msgstr "如果您選擇刪除資料夾，它的所有內容和子資料夾內容會永遠消失。"
 
 #: ../mail/mail.error.xml.h:58
 msgid "If you proceed, all proxy accounts will be deleted permanently."
@@ -15901,13 +14140,12 @@ msgstr "如果繼續，帳號資訊會永久刪除。"
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
-msgstr "如果您結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
+msgstr "如果您選擇結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
 #: ../mail/mail.error.xml.h:63
 msgid "Ignore"
 msgstr "忽略"
 
-# mail/mail-config.glade.h:10
 #: ../mail/mail.error.xml.h:64
 msgid "Invalid authentication"
 msgstr "無效的驗證"
@@ -15922,17 +14160,12 @@ msgid ""
 "BCC recipients. This header, if added, will list all of your recipients to "
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
-msgstr ""
-"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果加入"
-"了此標頭，會永遠列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收"
-"件者：」或「副本：」收件者。"
+msgstr "很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果加入了此標頭，會永遠列示郵件中所有的收件者。要避免此情況，應該至少新增一個「收件者：」或「副本：」收件者。"
 
-# ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:67
 msgid "Mark all messages as read"
 msgstr "將全部的郵件標示成已閱讀"
 
-# ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:68
 msgid "Mark all messages in subfolders as read?"
 msgstr "是否子資料夾中全部的郵件標示成已閱讀？"
@@ -15941,8 +14174,6 @@ msgstr "是否子資料夾中全部的郵件標示成已閱讀？"
 msgid "Mark as _Read"
 msgstr "標示成已閱讀(_R)"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail.error.xml.h:70
 msgid "Missing folder."
 msgstr "遺漏資料夾。"
@@ -15957,7 +14188,7 @@ msgstr "一次開啟過多郵件可能會花費許多時間。"
 
 #: ../mail/mail.error.xml.h:74
 msgid "Please check your account settings and try again."
-msgstr "請檢查您的帳號設定並再試一次。"
+msgstr "請檢查帳號設定並再試一次。"
 
 #: ../mail/mail.error.xml.h:75
 msgid "Please enable the account or send using another account."
@@ -15967,9 +14198,7 @@ msgstr "請啟用該帳號或使用其他帳號傳送。"
 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 ""
-"請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
-"「收件者：」按鈕，搜尋電子郵件地址。"
+msgstr "請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的「收件者：」按鈕，搜尋電子郵件地址。"
 
 #: ../mail/mail.error.xml.h:77
 msgid ""
@@ -15998,19 +14227,14 @@ msgstr "移轉舊郵件資料夾「{0}」發生問題。"
 msgid "Querying server"
 msgstr "查詢伺服器"
 
-# camel/providers/smtp/camel-smtp-transport.c:214
 #: ../mail/mail.error.xml.h:84
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr "向伺服器查詢支援的驗證演算法清單。"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../mail/mail.error.xml.h:85
 msgid "Read receipt requested."
 msgstr "要求讀信回條。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../mail/mail.error.xml.h:86
 msgid "Really delete folder &quot;{0}&quot; and all of its subfolders?"
 msgstr "確定要刪除資料夾「{0}」以及它所有的子資料夾?"
@@ -16031,9 +14255,7 @@ msgstr "簽名檔已經存在"
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
-msgstr ""
-"Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪"
-"除。"
+msgstr "Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪除。"
 
 #: ../mail/mail.error.xml.h:91
 msgid ""
@@ -16044,11 +14266,9 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"您傳送的連絡人清單是設定成隱藏清單收件者。\n"
+"傳送的連絡人清單是設定成隱藏清單收件者。\n"
 "\n"
-"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果新增"
-"此標頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件"
-"者：」或「副本：」收件者。 "
+"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果新增此標頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件者：」或「副本：」收件者。 "
 
 #: ../mail/mail.error.xml.h:94
 msgid ""
@@ -16101,17 +14321,15 @@ msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "因為您沒有指定任何收件者，所以無法傳送此郵件"
 
-# camel/providers/smtp/camel-smtp-transport.c:356
 #: ../mail/mail.error.xml.h:109
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
-# composer/e-msg-composer.c:941
 #: ../mail/mail.error.xml.h:110
 msgid "This signature has been changed, but has not been saved."
-msgstr "此簽名已經變更，但尚未儲存。"
+msgstr "此簽章已經變更，但尚未儲存。"
 
 #: ../mail/mail.error.xml.h:111
 msgid ""
@@ -16119,19 +14337,16 @@ msgid ""
 "subfolders."
 msgstr "這會將標示選定的資料夾及其子資料夾中所有郵件為已閱讀。"
 
-# camel/providers/imap/camel-imap-store.c:531
 #: ../mail/mail.error.xml.h:112
 msgid "Unable to connect to the GroupWise server."
 msgstr "無法連線至 GroupWise 伺服器。"
 
-# composer/e-msg-composer.c:877
 #: ../mail/mail.error.xml.h:113
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替？"
 
-# mail/mail-ops.c:1728
 #: ../mail/mail.error.xml.h:114
 msgid "Unable to read license file."
 msgstr "無法讀取授權檔案。"
@@ -16140,13 +14355,10 @@ msgstr "無法讀取授權檔案。"
 msgid "Use _Default"
 msgstr "使用預設值(_D)"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../mail/mail.error.xml.h:116
 msgid "Use default drafts folder?"
 msgstr "使用預設的草稿資料夾？"
 
-# mail/mail-account-editor.c:105
 #: ../mail/mail.error.xml.h:117
 msgid "You have not filled in all of the required information."
 msgstr "您沒有填入所有必須的資訊。"
@@ -16159,12 +14371,10 @@ msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 msgid "You may not create two accounts with the same name."
 msgstr "您不能用相同的名稱建立兩個帳號。"
 
-# ui/evolution.xml.h:3
 #: ../mail/mail.error.xml.h:120
 msgid "You must name this Search Folder."
 msgstr "您必須命名此搜尋資料夾。"
 
-# ui/evolution.xml.h:3
 #: ../mail/mail.error.xml.h:121
 msgid "You must specify a folder."
 msgstr "您必須指定一個資料夾。"
@@ -16198,106 +14408,85 @@ msgstr "不要標示成已閱讀(_D)"
 msgid "_Expunge"
 msgstr "清除(_E)"
 
-# ui/evolution-mail.xml.h:114
 #: ../mail/mail.error.xml.h:130
 msgid "_Open Messages"
 msgstr "開啟郵件(_O)"
 
-# mail/message-list.c:677
 #: ../mail/message-list.c:1019
 msgid "Unseen"
 msgstr "未閱讀"
 
-# mail/message-list.c:678
 #: ../mail/message-list.c:1020
 msgid "Seen"
 msgstr "已閱讀"
 
-# mail/message-list.c:679
 #: ../mail/message-list.c:1021
 msgid "Answered"
 msgstr "已回覆"
 
-# mail/message-list.c:680
 #: ../mail/message-list.c:1022
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
-# mail/message-list.c:681
 #: ../mail/message-list.c:1023
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
-# mail/message-list.c:685
 #: ../mail/message-list.c:1027
 msgid "Lowest"
 msgstr "最低"
 
-# mail/message-list.c:686
 #: ../mail/message-list.c:1028
 msgid "Lower"
 msgstr "低"
 
-# mail/message-list.c:690
 #: ../mail/message-list.c:1032
 msgid "Higher"
 msgstr "高"
 
-# mail/message-list.c:691
 #: ../mail/message-list.c:1033
 msgid "Highest"
 msgstr "最高"
 
-# mail/message-list.c:941
 #: ../mail/message-list.c:1451 ../widgets/table/e-cell-date.c:57
 msgid "?"
 msgstr "？"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../mail/message-list.c:1458 ../plugins/itip-formatter/itip-view.c:200
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
-msgstr "今天 %l:%M %p"
+msgstr "今天%p %-l:%M"
 
-# mail/message-list.c:957
 #: ../mail/message-list.c:1467 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
-msgstr "昨天 %l:%M %p"
+msgstr "昨天%p %-l:%M"
 
-# mail/message-list.c:969
 #: ../mail/message-list.c:1479 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
-msgstr "%a %l:%M %p"
+msgstr "%A%p %-l:%M"
 
-# mail/message-list.c:977
 #: ../mail/message-list.c:1487 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgstr "%-m 月 %-d 日%p %-l:%M"
 
-# mail/message-list.c:979
 #: ../mail/message-list.c:1489 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
-msgstr "%b %d %Y"
+msgstr "%Y 年 %-m 月 %-d 日"
 
 #: ../mail/message-list.c:2241 ../mail/message-list.etspec.h:9
 msgid "Messages"
 msgstr "郵件"
 
-# mail/mail-local.c:905
 #: ../mail/message-list.c:3629
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "期限為 "
 
-# calendar/gui/e-meeting-dialog.glade.h:23
-# mail/message-list.c:1081
 #: ../mail/message-list.etspec.h:4
 msgid "Flag Status"
 msgstr "標幟狀態"
@@ -16314,26 +14503,19 @@ msgstr "跟隨標幟"
 msgid "Received"
 msgstr "已接收"
 
-# ui/evolution-mail.xml.h:114
 #: ../mail/message-list.etspec.h:14
 msgid "Sent Messages"
 msgstr "傳送郵件"
 
-# addressbook/printing/e-contact-print.glade.h:36
 #: ../mail/message-list.etspec.h:15
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:4
 msgid "Size"
 msgstr "大小"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
 #: ../mail/message-tag-followup.c:75
 msgid "Call"
 msgstr "原始位置"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
 #: ../mail/message-tag-followup.c:76
 msgid "Do Not Forward"
 msgstr "請勿轉寄"
@@ -16342,13 +14524,10 @@ msgstr "請勿轉寄"
 msgid "Follow-Up"
 msgstr "跟隨"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../mail/message-tag-followup.c:78
 msgid "For Your Information"
 msgstr "給您的資訊"
 
-# mail/message-browser.c:194
-# ui/evolution-mail.xml.h:33
 #: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "轉寄"
@@ -16357,19 +14536,14 @@ msgstr "轉寄"
 msgid "No Response Necessary"
 msgstr "不需要回應"
 
-# mail/message-browser.c:188
-# ui/evolution-mail.xml.h:70
 #: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply"
 msgstr "回覆"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to All"
 msgstr "全部回覆"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../mail/message-tag-followup.c:84
 msgid "Review"
 msgstr "檢閱"
@@ -16378,27 +14552,22 @@ msgstr "檢閱"
 msgid "Body contains"
 msgstr "內文包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:2
 msgid "Message contains"
 msgstr "郵件包含"
 
-# calendar/gui/gnome-cal.c:235
 #: ../mail/searchtypes.xml.h:3
 msgid "Recipients contain"
 msgstr "收件者包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:4
 msgid "Sender contains"
 msgstr "寄件者包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:5
 msgid "Subject contains"
 msgstr "主旨包含"
 
-# addressbook/gui/component/addressbook.c:619
 #: ../mail/searchtypes.xml.h:6
 msgid "Subject or Sender contains"
 msgstr "主旨或寄件者包含"
@@ -16415,8 +14584,7 @@ msgstr "提供本地端行事曆的核心功能。"
 msgid ""
 "A formatter plugin which displays audio attachments inline and allows you to "
 "play them directly from evolution."
-msgstr ""
-"用來顯示郵件中音效附件的格式外掛程式，它可以讓您在 evolution 中直接播放它們。"
+msgstr "用來顯示郵件中音效附件的格式外掛程式，它可以讓您在 evolution 中直接播放它們。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -16426,74 +14594,55 @@ msgstr "郵件音訊外掛程式"
 msgid "Select name of Evolution archive"
 msgstr "選擇 Evolution 檔案庫的名稱"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/backup-restore/backup-restore.c:61
 msgid "_Restart Evolution after backup"
-msgstr "備份後重新啟動 Evolution(_R)"
+msgstr "備份後重新啟動 E_volution"
 
 #: ../plugins/backup-restore/backup-restore.c:89
 msgid "Select Evolution archive to restore"
 msgstr "選擇要復原的 Evolution 檔案庫"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/backup-restore/backup-restore.c:97
 msgid "_Restart Evolution after restore"
-msgstr "回存後重新啟動 Evolution(_R)"
+msgstr "回存後重新啟動 E_volution"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/backup-restore/backup.c:109
 msgid "Backup Evolution directory"
 msgstr "備份 Evolution 目錄"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../plugins/backup-restore/backup.c:111
 msgid "Restore Evolution directory"
 msgstr "回存 Evolution 目錄"
 
-# data/evolution.desktop.in.h:2
 #: ../plugins/backup-restore/backup.c:113
 msgid "Check Evolution archive"
 msgstr "檢查 Evolution 檔案庫"
 
-# shell/main.c:138
 #: ../plugins/backup-restore/backup.c:115
 msgid "Restart Evolution"
 msgstr "重新啟動 Evolution"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../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 的資料與設定值的外掛程式。"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #. the path to the shared library
 #: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:3
 msgid "Backup and restore plugin"
 msgstr "備份與回存外掛程式。"
 
-# ui/evolution-mail.xml.h:110
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:1
 msgid "Backup Settings..."
 msgstr "備份設定值..."
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:2
 msgid "Backup and restore Evolution data and settings"
 msgstr "備份與回存 Evolution 的資料與設定值"
 
-# ui/evolution-mail.xml.h:110
 #: ../plugins/backup-restore/org-gnome-backup-restore.xml.h:3
 msgid "Restore Settings..."
 msgstr "回存設定值..."
 
-# addressbook/gui/component/e-address-widget.c:424
-# addressbook/gui/component/select-names/e-select-names-popup.c:347
 #: ../plugins/bbdb/bbdb.c:443 ../plugins/bbdb/bbdb.c:452
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
@@ -16505,13 +14654,10 @@ msgid ""
 "_Automatically create entries in the addressbook when responding to mail"
 msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
 
-# addressbook/gui/component/e-address-widget.c:424
-# addressbook/gui/component/select-names/e-select-names-popup.c:347
 #: ../plugins/bbdb/bbdb.c:473
 msgid "Select Address book for Automatic Contacts"
 msgstr "選擇給自動加入連絡人用的通訊錄"
 
-# mail/mail-callbacks.c:1407
 #: ../plugins/bbdb/bbdb.c:488
 msgid "Instant Messaging Contacts"
 msgstr "即時訊息連絡人"
@@ -16522,7 +14668,6 @@ msgid ""
 "Periodically synchronize contact information and images from gaim buddy list"
 msgstr "定期從 gaim 的好友清單同步連絡人資訊"
 
-# importers/pine-importer.c:661
 #: ../plugins/bbdb/bbdb.c:509
 msgid "Select Address book for Gaim buddy list"
 msgstr "選擇給 Gaim 好友名單用的通訊錄"
@@ -16537,17 +14682,12 @@ msgid ""
 "Automatically fills your addressbook with names and email addresses as you "
 "reply to messages. Also fills in IM contact information from your buddy "
 "lists."
-msgstr ""
-"回覆郵件時自動在通訊錄中填入姓名與電子郵件位址。同時也會在好友清單中填入 IM "
-"連絡人資訊。"
+msgstr "回覆郵件時自動在通訊錄中填入姓名與電子郵件位址。同時也會在好友清單中填入 IM 連絡人資訊。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
 msgstr "BBDB"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
 #: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
@@ -16556,8 +14696,6 @@ msgstr "CalDAV"
 msgid "Use _SSL"
 msgstr "使用 _SSL"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/calendar-file/org-gnome-calendar-file.eplug.xml.h:1
 msgid "Local Calendars"
 msgstr "本地行事曆"
@@ -16566,13 +14704,10 @@ msgstr "本地行事曆"
 msgid "Provides core functionality for local calendars."
 msgstr "提供本地行事曆的核心功能。"
 
-# mail/mail-config.glade.h:79
 #: ../plugins/calendar-http/calendar-http.c:339
 msgid "_Secure connection"
 msgstr "安全連線(_S)"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../plugins/calendar-http/org-gnome-calendar-http.eplug.xml.h:1
 msgid "HTTP Calendars"
 msgstr "HTTP 行事曆"
@@ -16602,8 +14737,6 @@ msgstr "天氣：下雪"
 msgid "Weather: Snow"
 msgstr "天氣：下雪"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../plugins/calendar-weather/calendar-weather.c:65
 msgid "Weather: Sunny"
 msgstr "天氣：艷陽"
@@ -16612,13 +14745,10 @@ msgstr "天氣：艷陽"
 msgid "Weather: Thunderstorms"
 msgstr "天氣：雷暴"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../plugins/calendar-weather/calendar-weather.c:267
 msgid "Select a location"
 msgstr "選擇一個位置"
 
-# mail/message-list.c:677
 #: ../plugins/calendar-weather/calendar-weather.c:654
 msgid "_Units:"
 msgstr "單位(_U):"
@@ -16635,8 +14765,6 @@ msgstr "英制(華氏、公吋等)"
 msgid "Provides core functionality for weather calendars."
 msgstr "提供氣象行事曆的核心功能。"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml.h:2
 msgid "Weather Calendars"
 msgstr "氣象行事曆"
@@ -16645,9 +14773,7 @@ msgstr "氣象行事曆"
 msgid ""
 "A test plugin which demonstrates a popup menu plugin which lets you copy "
 "things to the clipboard."
-msgstr ""
-"用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓您複製東西到剪貼簿"
-"裡。"
+msgstr "用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓您複製東西到剪貼簿裡。"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:3
 msgid "Copy tool"
@@ -16666,8 +14792,6 @@ msgstr "每次啟動 Evolution 時，檢查它是否為預設的郵件程式。"
 msgid "Checks whether Evolution is the default mail client on startup."
 msgstr "在啟動時檢查 Evolution 是否為預設的郵件客戶端程式。"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:2
 msgid "Default Mail Client "
 msgstr "預設郵件客戶端程式"
@@ -16676,14 +14800,11 @@ msgstr "預設郵件客戶端程式"
 msgid "Do you want to make Evolution your default e-mail client?"
 msgstr "您是否要將 Evolution 設為您的預設電子郵件客戶端程式？"
 
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
 #: ../plugins/default-source/default-source.c:82
 #: ../plugins/default-source/default-source.c:109
 msgid "Mark as _default folder"
 msgstr "標示為預設資料夾(_D)"
 
-# mail/mail-config.glade.h:21
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:1
 msgid "Default Sources"
 msgstr "預設來源"
@@ -16732,7 +14853,6 @@ msgid ""
 "password authentication."
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: ../plugins/exchange-operations/exchange-account-setup.c:257
 msgid "Out Of Office"
 msgstr "不在辦公室"
@@ -16755,7 +14875,6 @@ msgstr "我目前不在辦公室"
 msgid "I am in the office"
 msgstr "我目前在辦公室"
 
-# camel/camel-smime-context.c:194
 #. Change Password
 #: ../plugins/exchange-operations/exchange-account-setup.c:328
 msgid "Change the password for Exchange account"
@@ -16771,7 +14890,6 @@ msgstr "變更密碼"
 msgid "Manage the delegate settings for Exchange account"
 msgstr "管理 Exchange 帳號的授權設定"
 
-# shell/importer/import.glade.h:2
 #: ../plugins/exchange-operations/exchange-account-setup.c:337
 msgid "Delegation Assitant"
 msgstr "委派設定助理"
@@ -16786,14 +14904,10 @@ msgstr "雜項"
 msgid "View the size of all Exchange folders"
 msgstr "檢視所有 Exchange 資料夾的大小"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
 #: ../plugins/exchange-operations/exchange-account-setup.c:361
 msgid "Folders Size"
 msgstr "資料夾大小"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../plugins/exchange-operations/exchange-account-setup.c:368
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:3
 msgid "Exchange Settings"
@@ -16803,18 +14917,14 @@ msgstr "Exchange 設定值"
 msgid "_OWA URL:"
 msgstr "_OWA URL:"
 
-# camel/camel-sasl-anonymous.c:110
-# camel/camel-sasl-plain.c:87
 #: ../plugins/exchange-operations/exchange-account-setup.c:636
 msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
-# mail/mail-config.glade.h:11
 #: ../plugins/exchange-operations/exchange-account-setup.c:829
 msgid "Authentication Type"
 msgstr "驗證類型"
 
-# mail/mail-config.glade.h:1
 #: ../plugins/exchange-operations/exchange-account-setup.c:843
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
@@ -16981,8 +15091,6 @@ msgstr "權限..."
 msgid "Folder Name"
 msgstr "資料夾名稱"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
 #: ../plugins/exchange-operations/exchange-folder-size-display.c:139
 msgid "Folder Size"
 msgstr "資料夾大小"
@@ -17124,8 +15232,6 @@ msgid ""
 "and features."
 msgstr "處理 Exchange 帳號指定操作與功能集合的外掛程式。"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:2
 msgid "Exchange Operations"
 msgstr "Exchange 操作"
@@ -17138,7 +15244,6 @@ msgstr "因組態問題而無法變更密碼。"
 msgid "Cannot display folders."
 msgstr "無法顯示資料夾。"
 
-# mail/mail-mt.c:193
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
 msgid "Cannot perform the operation."
 msgstr "無法執行此項操作。"
@@ -17175,7 +15280,6 @@ msgstr "無法連接 Exchange 伺服器。"
 msgid "Could not connect to server {0}."
 msgstr "無法連線到伺服器 {0}。"
 
-# camel/camel-movemail.c:306
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:12
 msgid "Could not determine folder permissions for delegates."
 msgstr "無法決定委派的資料夾權限。"
@@ -17196,7 +15300,6 @@ msgstr "無法將 {0} 設為委託"
 msgid "Could not read folder permissions"
 msgstr "無法讀取資料夾許可權"
 
-# camel/camel-provider.c:140
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:17
 msgid "Could not read folder permissions."
 msgstr "無法讀取資料夾權限。"
@@ -17245,7 +15348,6 @@ msgstr ""
 "{0}\n"
 "  "
 
-# shell/e-storage.c:475
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:34
 msgid "Failed to update delegates:"
 msgstr "無法更新委派："
@@ -17258,7 +15360,6 @@ msgstr "資料夾已存在"
 msgid "Folder does not exist"
 msgstr "資料夾不存在"
 
-# ui/evolution.xml.h:39
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:37
 msgid "Folder offline"
 msgstr "資料夾離線"
@@ -17302,9 +15403,6 @@ msgstr "沒有為此帳號設定「全域型錄」伺服器。"
 msgid "No mailbox for user {0} on {1}."
 msgstr "在 {1} 上沒有使用者 {0} 的郵件箱。"
 
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# camel/providers/local/camel-mh-folder.c:185
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:47
 msgid "No such user {0}"
 msgstr "查無此使用者 {0}"
@@ -17371,13 +15469,10 @@ msgstr "請使用不同的密碼再試一次。"
 msgid "Unable to add user to access control list:"
 msgstr "無法將使用者加入存取控制清單："
 
-# mail/mail-ops.c:1728
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:66
 msgid "Unable to edit delegates."
 msgstr "無法編輯委任。"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:67
 msgid "Unknown error looking up {0}"
 msgstr "查詢 {0} 時發生不明的錯誤"
@@ -17390,7 +15485,6 @@ msgstr "不明的錯誤。"
 msgid "Unknown type"
 msgstr "未知的類型"
 
-# mail/mail-session.c:161
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:70
 msgid "Unsupported operation"
 msgstr "不支援的操作"
@@ -17427,9 +15521,7 @@ msgstr "目前的使用量為：{0} KB。您現在將無法傳送或接收郵件
 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。除非您刪除一些郵件來空出部分空間，否則將無法傳送郵"
-"件。"
+msgstr "目前的使用量為：{0} KB。除非您刪除一些郵件來空出部分空間，否則將無法傳送郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:78
 msgid "Your password has expired."
@@ -17455,7 +15547,6 @@ msgstr "訂閱其他使用者的工作"
 msgid "Check folder permissions"
 msgstr "檢查資料夾權限"
 
-# mail/subscribe-dialog.c:273
 #: ../plugins/folder-unsubscribe/folder-unsubscribe.c:57
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
@@ -17473,7 +15564,6 @@ msgstr "取消訂閱資料夾"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:736
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:390
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:421
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:600
@@ -17484,7 +15574,6 @@ msgstr "備註"
 msgid "Checklist"
 msgstr "檢查清單"
 
-# shell/e-shortcuts-view.c:137
 #: ../plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml.h:1
 msgid "Groupwise Account Setup"
 msgstr "Groupware 帳號設定"
@@ -17530,7 +15619,6 @@ msgstr "垃圾郵件清單(_J)"
 msgid "Message retracted successfully"
 msgstr "郵件已成功收回"
 
-# mail/mail-config.glade.h:58
 #: ../plugins/groupwise-features/mail-retract.c:60
 msgid "Retract Mail"
 msgstr "收回郵件"
@@ -17539,7 +15627,6 @@ msgstr "收回郵件"
 msgid "Add Send Options to groupwise messages"
 msgstr "將 傳送 選項加入 groupwise 訊息"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: ../plugins/groupwise-features/org-gnome-compose-send-options.xml.h:2
 #: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:19
@@ -17550,12 +15637,10 @@ msgstr "傳送選項"
 msgid "A plugin for the features in Groupwise accounts."
 msgstr "提供 Groupwise 帳號功能的外掛程式。"
 
-# shell/e-shortcuts-view.c:137
 #: ../plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml.h:2
 msgid "Groupwise Features"
 msgstr "Groupware 功能"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../plugins/groupwise-features/process-meeting.c:49
 msgid "Accept Tentatively"
 msgstr "暫時套用"
@@ -17564,7 +15649,6 @@ msgstr "暫時套用"
 msgid "<b>Users:</b>"
 msgstr "<b>使用者：</b>"
 
-# views/mail/galview.xml.h:4
 #: ../plugins/groupwise-features/properties.glade.h:3
 #: ../widgets/table/e-table-click-to-add.c:509
 msgid "Message"
@@ -17578,21 +15662,14 @@ msgstr "分享資料夾通知"
 msgid "The participants will receive the following notification.\n"
 msgstr "參與者將會收到下列通知。\n"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:24
-# calendar/gui/event-editor-dialog.glade.h:29
 #: ../plugins/groupwise-features/properties.glade.h:10
 msgid "_Contacts..."
 msgstr "連絡人(_C)..."
 
-# camel/camel-movemail.c:306
 #: ../plugins/groupwise-features/properties.glade.h:11
 msgid "_Customize notification message"
 msgstr "自訂通知訊息(_C)"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../plugins/groupwise-features/properties.glade.h:12
 msgid "_Not Shared"
 msgstr "未分享(_N)"
@@ -17601,7 +15678,6 @@ msgstr "未分享(_N)"
 msgid "_Shared With ..."
 msgstr "分享給(_S)..."
 
-# addressbook/printing/e-contact-print.glade.h:35
 #: ../plugins/groupwise-features/properties.glade.h:15
 msgid "_Sharing"
 msgstr "分享(_S)"
@@ -17663,7 +15739,6 @@ msgstr "<b>帳號名稱</b>"
 msgid "Proxy Login"
 msgstr "登入代理伺服器"
 
-# camel/camel-smime-context.c:194
 #: ../plugins/groupwise-features/proxy-login.c:220
 #: ../plugins/groupwise-features/proxy-login.c:263
 #: ../plugins/groupwise-features/proxy.c:503
@@ -17687,7 +15762,6 @@ msgstr "代理伺服器頁籤只有在帳號上線時才會出現。"
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr "代理伺服器頁籤只有在啟用此帳號時才會出現。"
 
-# mail/mail-config.glade.h:80
 #: ../plugins/groupwise-features/share-folder-common.c:322
 msgid "Users"
 msgstr "使用者"
@@ -17700,12 +15774,10 @@ msgstr "輸入使用者並設定權限"
 msgid "New _Shared Folder..."
 msgstr "新增分享資料夾(_S)..."
 
-# addressbook/printing/e-contact-print.glade.h:35
 #: ../plugins/groupwise-features/share-folder-common.c:450
 msgid "Sharing"
 msgstr "分享"
 
-# mail/mail-callbacks.c:1188
 #: ../plugins/groupwise-features/status-track.c:242
 msgid "Track Message Status..."
 msgstr "追蹤郵件狀態..."
@@ -17714,13 +15786,10 @@ msgstr "追蹤郵件狀態..."
 msgid "A plugin to setup hula calendar sources."
 msgstr "用來設定 hula 行事曆來源的外掛程式。"
 
-# shell/e-shortcuts-view.c:137
 #: ../plugins/hula-account-setup/org-gnome-evolution-hula-account-setup.eplug.xml.h:2
 msgid "Hula Account Setup"
 msgstr "Hula 帳號設定"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
 msgstr "匯入至行事曆(_I)"
@@ -17729,23 +15798,14 @@ msgstr "匯入至行事曆(_I)"
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
-# importers/elm-importer.c:512
-# importers/netscape-importer.c:780
-# importers/pine-importer.c:646
-# shell/e-shell-importer.c:653
-# shell/importer/import.glade.h:4
 #: ../plugins/import-ics-attachments/icsimporter.c:198
 msgid "Import ICS"
 msgstr "匯入 ICS"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
 #: ../plugins/import-ics-attachments/icsimporter.c:226
 msgid "Select Task List"
 msgstr "選擇工作清單"
 
-# ui/evolution-addressbook.xml.h:7
 #: ../plugins/import-ics-attachments/icsimporter.c:230
 msgid "Select Calendar"
 msgstr "選擇行事曆"
@@ -17755,7 +15815,6 @@ msgstr "選擇行事曆"
 msgid "_Import"
 msgstr "匯入(_I)"
 
-# calendar/gui/e-itip-control.glade.h:4
 #: ../plugins/ipod-sync/ical-format.c:137
 #: ../plugins/save-calendar/ical-format.c:149
 msgid "iCalendar format (.ics)"
@@ -17773,7 +15832,6 @@ msgstr "同步化 iPod"
 msgid "iPod Synchronization"
 msgstr "iPod 同步化"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../plugins/ipod-sync/sync.c:158
 msgid "No output directory!"
 msgstr "沒有輸出目錄！"
@@ -17784,7 +15842,6 @@ msgid ""
 "correctly set up and try again."
 msgstr "在 iPod 上找不到輸出的目錄！請確定 iPod 已正確設定後再試一次。"
 
-# mail/mail-ops.c:1872
 #: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
 msgstr "無法匯出資料！"
@@ -17793,17 +15850,14 @@ msgstr "無法匯出資料！"
 msgid "Exporting data failed."
 msgstr "匯出資料失敗。"
 
-# camel/camel-provider.c:140
 #: ../plugins/ipod-sync/sync.c:231
 msgid "Could not open addressbook!"
 msgstr "無法開啟通訊錄！"
 
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #: ../plugins/ipod-sync/sync.c:232
 msgid "Could not open the Evolution addressbook to export data."
 msgstr "無法開啟 Evolution 通訊錄以匯出資料。"
 
-# calendar/gui/e-itip-control.c:883
 #: ../plugins/ipod-sync/sync.c:291
 msgid "Could not open calendar/todo!"
 msgstr "無法開啟行事曆/工作！"
@@ -17812,7 +15866,6 @@ msgstr "無法開啟行事曆/工作！"
 msgid "Could not open the Evolution calendar/todo list to export data."
 msgstr "無法開啟 Evolution 行事曆/工作清單以匯出資料。"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:274
 #: ../plugins/itip-formatter/itip-formatter.c:391
 #, c-format
@@ -17824,25 +15877,22 @@ msgstr "載入行事曆「%s」失敗"
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "行事曆 '%s' 中的約會和這個會議相衝突"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:437
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "尋找在行事曆「%s」中的約會"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:513
 msgid "Unable to find any calendars"
 msgstr "找不到任何行事曆"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:520
 msgid "Unable to find this meeting in any calendar"
 msgstr "無法在任何行事曆中找到這個約會"
 
 #: ../plugins/itip-formatter/itip-formatter.c:524
 msgid "Unable to find this task in any task list"
-msgstr "無法在任何工作清單中找到這個工作"
+msgstr "無法在任何工作清單中找到這項工作"
 
 #: ../plugins/itip-formatter/itip-formatter.c:528
 msgid "Unable to find this journal entry in any journal"
@@ -17852,12 +15902,10 @@ msgstr "無法在任何日誌中找到這個日誌項目"
 msgid "Searching for an existing version of this appointment"
 msgstr "尋找這個約會既存的版本"
 
-# camel/providers/pop3/camel-pop3-folder.c:320
 #: ../plugins/itip-formatter/itip-formatter.c:796
 msgid "Unable to parse item"
 msgstr "無法分析項目"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:853
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
@@ -17888,12 +15936,10 @@ msgstr "傳送至行事曆「%s」並設為已取消"
 msgid "Organizer has removed the delegate %s "
 msgstr "會議召集人已移除代理人 %s"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../plugins/itip-formatter/itip-formatter.c:978
 msgid "Sent a cancelation notice to the delegate"
 msgstr "傳送取消通知給代理人"
 
-# calendar/gui/dialogs/delete-comp.c:102
 #: ../plugins/itip-formatter/itip-formatter.c:980
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "無法傳送取消通知給代理人"
@@ -17902,7 +15948,6 @@ msgstr "無法傳送取消通知給代理人"
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！"
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-formatter.c:1092
 #, c-format
 msgid "Unable to update attendee. %s"
@@ -17912,7 +15957,6 @@ msgstr "無法更新到會者。%s"
 msgid "Attendee status updated"
 msgstr "到會者狀態已更新"
 
-# shell/e-storage.c:465
 #: ../plugins/itip-formatter/itip-formatter.c:1223
 msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
@@ -17923,7 +15967,6 @@ msgid ""
 "iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
-# ui/evolution-calendar.xml.h:22
 #: ../plugins/itip-formatter/itip-formatter.c:1259
 #: ../plugins/itip-formatter/itip-formatter.c:1277
 #: ../plugins/itip-formatter/itip-formatter.c:1355
@@ -17936,8 +15979,7 @@ msgstr "行事曆中的項目是無效的"
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
-msgstr ""
-"此郵件確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
+msgstr "此郵件確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1289
 msgid "The calendar attached contains multiple items"
@@ -17971,26 +16013,23 @@ msgstr "選擇要搜尋會議衝突的行事曆"
 msgid "Today"
 msgstr "今天"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:191
 msgid "Today %H:%M"
 msgstr "今天 %H:%M"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:195
 msgid "Today %H:%M:%S"
 msgstr "今天 %H:%M:%S"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:204
 msgid "Today %l:%M:%S %p"
-msgstr "今天 %l:%M:%S %p"
+msgstr "今天%p %l:%M:%S"
 
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:214
@@ -18003,26 +16042,23 @@ msgstr "明天"
 msgid "Tomorrow %H:%M"
 msgstr "明天 %H:%M"
 
-# e-util/e-time-utils.c:315
 #. strftime format of a time,
 #. in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:223
 msgid "Tomorrow %H:%M:%S"
 msgstr "明天 %H:%M:%S"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:228
 msgid "Tomorrow %l:%M %p"
-msgstr "明天 %l:%M %p"
+msgstr "明天%p %-l:%M"
 
-# mail/message-list.c:948
 #. strftime format of a time,
 #. in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:232
 msgid "Tomorrow %l:%M:%S %p"
-msgstr "明天 %l:%M:%S %p"
+msgstr "明天%p %-l:%M:%S"
 
 #. strftime format of a weekday.
 #: ../plugins/itip-formatter/itip-view.c:251
@@ -18030,112 +16066,89 @@ msgstr "明天 %l:%M:%S %p"
 msgid "%A"
 msgstr "%A"
 
-# e-util/e-time-utils.c:312
-# widgets/misc/e-dateedit.c:1259
-# widgets/misc/e-dateedit.c:1318
-# widgets/misc/e-dateedit.c:1497
 #. strftime format of a weekday and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:256
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
-# e-util/e-time-utils.c:315
 #. strftime format of a weekday and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:260
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
-# mail/message-list.c:969
 #. strftime format of a weekday and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:265
 msgid "%A %l:%M %p"
-msgstr "%A %l:%M %p"
+msgstr "%A%p %-l:%M"
 
-# e-util/e-time-utils.c:323
 #. strftime format of a weekday and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:269
 msgid "%A %l:%M:%S %p"
-msgstr "%A %l:%M:%S %p"
+msgstr "%A%p %-l:%M:%S"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday and a date
 #. without a year.
 #: ../plugins/itip-formatter/itip-view.c:278
 msgid "%A, %B %e"
-msgstr "%A, %B %e"
+msgstr "%-m 月 %d 日 (%A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. 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:284
 msgid "%A, %B %e %H:%M"
-msgstr "%A, %B %e %H:%M"
+msgstr "%-m 月 %d 日 (%A) %H:%M"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday, a date without a year
 #. and a time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:288
 msgid "%A, %B %e %H:%M:%S"
-msgstr "%A, %B %e %H:%M:%S"
+msgstr "%-m 月 %d 日 (%A) %H:%M:%S"
 
-# mail/message-list.c:977
 #. 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:293
 msgid "%A, %B %e %l:%M %p"
-msgstr "%A, %B %e %l:%M %p"
+msgstr "%-m 月 %d 日 (%A) %p %-l:%M"
 
-# mail/message-list.c:977
 #. strftime format of a weekday, a date without a year
 #. and a time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:297
 msgid "%A, %B %e %l:%M:%S %p"
-msgstr "%A, %B %e %l:%M:%S %p"
+msgstr "%-m 月 %d 日 (%A) %p %-l:%M:%S"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday and a date.
 #: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e, %Y"
-msgstr "%A, %B %e, %Y"
+msgstr "%Y 年 %-m 月 %-d 日 (%A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:308
 msgid "%A, %B %e, %Y %H:%M"
-msgstr "%A, %B %e, %Y %H:%M"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M"
 
-# calendar/gui/calendar-model.c:794
-# e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
 #: ../plugins/itip-formatter/itip-view.c:312
 msgid "%A, %B %e, %Y %H:%M:%S"
-msgstr "%A, %B %e, %Y %H:%M:%S"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %H:%M:%S"
 
-# mail/message-list.c:977
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
 #: ../plugins/itip-formatter/itip-view.c:317
 msgid "%A, %B %e, %Y %l:%M %p"
-msgstr "%A, %B %e, %Y %l:%M %p"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M"
 
-# mail/message-list.c:977
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
 #: ../plugins/itip-formatter/itip-view.c:321
 msgid "%A, %B %e, %Y %l:%M:%S %p"
-msgstr "%A, %B %e, %Y %l:%M:%S %p"
+msgstr "%Y 年 %-m 月 %-d 日 (%A) %p %-l:%M:%S"
 
 #: ../plugins/itip-formatter/itip-view.c:346
 #, c-format
@@ -18226,12 +16239,12 @@ msgstr "<b>%s</b> 指派 %s 加入下列工作："
 #: ../plugins/itip-formatter/itip-view.c:424
 #, c-format
 msgid "<b>%s</b> through %s has assigned you a task:"
-msgstr "<b>%s</b> 由於 %s 已經指派您一個工作："
+msgstr "<b>%s</b> 由於 %s 已經指派您一項工作："
 
 #: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "<b>%s</b> has assigned you a task:"
-msgstr "<b>%s</b> 已經指派您一個工作："
+msgstr "<b>%s</b> 已經指派您一項工作："
 
 #: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
@@ -18310,7 +16323,6 @@ msgstr "<b>%s</b> 由於 %s 已經消取下列共用備忘錄："
 msgid "<b>%s</b> has canceled the following shared memo:"
 msgstr "<b>%s</b> 已經取消下列共用備忘錄："
 
-# ui/evolution-addressbook.xml.h:7
 #. Everything gets the open button
 #: ../plugins/itip-formatter/itip-view.c:753
 msgid "_Open Calendar"
@@ -18336,12 +16348,10 @@ msgstr "接受(_A)"
 msgid "_Decline all"
 msgstr "全部拒絕(_D)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../plugins/itip-formatter/itip-view.c:764
 msgid "_Tentative all"
 msgstr "全部暫訂(_T)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../plugins/itip-formatter/itip-view.c:764
 #: ../plugins/itip-formatter/itip-view.c:770
 #: ../plugins/itip-formatter/itip-view.c:787
@@ -18353,7 +16363,6 @@ msgstr "暫訂(_T)"
 msgid "_Accept all"
 msgstr "全部接受(_A)"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #. FIXME Is this really the right button?
 #: ../plugins/itip-formatter/itip-view.c:776
 msgid "_Send Information"
@@ -18368,26 +16377,22 @@ msgstr "更新出席狀態(_U)"
 msgid "_Update"
 msgstr "更新(_U)"
 
-# calendar/gui/event-editor-dialog.glade.h:31
 #. Start time
 #: ../plugins/itip-formatter/itip-view.c:942
 msgid "Start time:"
 msgstr "開始時間:"
 
-# calendar/gui/event-editor-dialog.glade.h:30
 #. End time
 #: ../plugins/itip-formatter/itip-view.c:951
 msgid "End time:"
 msgstr "結束時間:"
 
-# addressbook/contact-editor/e-contact-editor.c:1248
 #. Comment
 #: ../plugins/itip-formatter/itip-view.c:967
 #: ../plugins/itip-formatter/itip-view.c:1017
 msgid "Comment:"
 msgstr "註解："
 
-# shell/e-storage.c:475
 #: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Send u_pdates to attendees"
 msgstr "傳送更新給到會者(_P)"
@@ -18400,17 +16405,14 @@ msgstr "套用至所有實體(_A)"
 msgid "_Tasks :"
 msgstr "工作(_T):"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../plugins/itip-formatter/itip-view.c:1711
 msgid "Memos :"
 msgstr "備忘錄:"
 
-# ui/evolution-mail.xml.h:23
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Displays text/calendar parts in messages."
 msgstr "顯示郵件中的文字/行事曆部分。"
 
-# shell/importer/intelligent.c:186
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:2
 msgid "Itip Formatter"
 msgstr "Itip 格式器"
@@ -18442,13 +16444,11 @@ msgstr "允許停用帳號。"
 msgid "Disable Account"
 msgstr "停用帳號"
 
-# camel/providers/local/camel-mbox-summary.c:879
 #: ../plugins/mail-remote/client.c:30
 #, c-format
 msgid "System error: %s"
 msgstr "系統錯誤： %s"
 
-# camel/providers/local/camel-mbox-summary.c:879
 #: ../plugins/mail-remote/client.c:32
 #, c-format
 msgid "Camel error: %s"
@@ -18458,7 +16458,6 @@ msgstr "Camel 錯誤： %s"
 msgid "Account cannot send e-mail"
 msgstr "帳號不能傳送電子郵件"
 
-# calendar/gui/dialogs/alarm-notify-dialog.c:207
 #: ../plugins/mail-remote/evolution-mail-store.c:605
 msgid "No store available"
 msgstr "沒有可用的儲存空間"
@@ -18497,22 +16496,18 @@ msgstr "可以從郵件訊息的內容建立工作的外掛程式。"
 msgid "Con_vert to Task"
 msgstr "轉換為工作(_V)"
 
-# mail/mail-autofilter.c:70
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:3
 msgid "Mail to task"
 msgstr "寄信到工作"
 
-# ui/evolution-mail.xml.h:59
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.xml.h:2
 msgid "Convert the selected message to a new task"
 msgstr "將選定的郵件轉換為新的工作"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:1
 msgid "Contact list _owner"
 msgstr "連絡人清單擁有者(_O)"
 
-# data/evolution.desktop.in.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:2
 msgid "Get list _archive"
 msgstr "取得清單檔案庫(_A)"
@@ -18540,7 +16535,6 @@ msgstr "提供一般通信論壇指令的動作 （訂閱、取消訂閱…）�
 msgid "_Post message to list"
 msgstr "傳送郵件給論壇(_P)"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:8
 msgid "_Subscribe to list"
 msgstr "訂閱論壇(_S)"
@@ -18561,12 +16555,10 @@ msgid ""
 "You should receive an answer from the mailing list shortly after the message "
 "has been sent."
 msgstr ""
-"即將寄出一封電子郵件至 URL \"{0}\"。您可以自動送出郵件，或是先查看並做些改"
-"變。\n"
+"即將寄出一封電子郵件至 URL \"{0}\"。您可以自動送出郵件，或是先查看並做些改變。\n"
 "\n"
 "在這封郵件送出後不久您應該會收到來自通信論壇的回應。"
 
-# mail/mail-config.glade.h:74
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:5
 msgid "Malformed header"
 msgstr "格式錯誤的標頭"
@@ -18575,10 +16567,6 @@ msgstr "格式錯誤的標頭"
 msgid "No e-mail action"
 msgstr "沒有郵件動作"
 
-# camel/camel-remote-store.c:337
-# camel/camel-remote-store.c:399
-# camel/camel-remote-store.c:470
-# camel/providers/imap/camel-imap-command.c:287
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:7
 msgid "Posting not allowed"
 msgstr "不允許張貼"
@@ -18587,11 +16575,8 @@ msgstr "不允許張貼"
 msgid ""
 "Posting to this mailing list is not allowed. Possibly, this is a read-only "
 "mailing list. Contact the list owner for details."
-msgstr ""
-"對此通信論壇的張貼是不被允許的。這可能是一個唯讀的通信論壇。請連絡論壇的管理"
-"者以取得進一步資訊。"
+msgstr "對此通信論壇的張貼是不被允許的。這可能是一個唯讀的通信論壇。請連絡論壇的管理者以取得進一步資訊。"
 
-# ui/evolution-contact-editor.xml.h:13
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
 msgid "Send e-mail message to mailing list?"
 msgstr "傳送郵件到通信論壇？"
@@ -18623,27 +16608,22 @@ msgid ""
 "action."
 msgstr "這封郵件沒有包含此動作所需的檔頭資訊"
 
-# mail/mail-ops.c:603
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:17
 msgid "_Edit message"
 msgstr "編輯郵件(_E)"
 
-# mail/mail-ops.c:603
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:18
 msgid "_Send message"
 msgstr "傳送郵件(_S)"
 
-# addressbook/contact-editor/contact-editor.glade.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:1
 msgid "Contact List _Owner"
 msgstr "連絡人清單擁有者(_O)"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:2
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "連絡此郵件所屬通信論壇的管理者"
 
-# data/evolution.desktop.in.h:2
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:3
 msgid "Get List _Archive"
 msgstr "取得清單檔案庫(_A)"
@@ -18660,17 +16640,14 @@ msgstr "取得此郵件所屬論壇的檔案庫"
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "取得此郵件所屬論壇的使用方法相關資訊"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:8
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "撰寫郵件給此郵件所屬的通信論壇"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:9
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "訂閱此郵件所屬的通信論壇"
 
-# ui/evolution-mail.xml.h:7
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:10
 msgid "Unsubscribe to the mailing list this message belongs to"
 msgstr "取消訂閱此郵件所屬的通信論壇"
@@ -18679,7 +16656,6 @@ msgstr "取消訂閱此郵件所屬的通信論壇"
 msgid "_Post Message to List"
 msgstr "傳送郵件給論壇(_P)"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.xml.h:12
 msgid "_Subscribe to List"
 msgstr "訂閱論壇(_S)"
@@ -18692,7 +16668,6 @@ msgstr "取消訂閱論壇(_U)"
 msgid "Mark All Read"
 msgstr "全部標示成已讀"
 
-# ui/evolution-mail.xml.h:51
 #: ../plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml.h:2
 msgid "Mark Me_ssages as Read"
 msgstr "標示郵件為已讀(_S)"
@@ -18705,7 +16680,6 @@ msgstr "用來將資料夾下的所有郵件標記為已讀"
 msgid "Mark calendar offline"
 msgstr "將行事曆標為離線工作"
 
-# ui/evolution-mail.xml.h:54
 #: ../plugins/mark-calendar-offline/org-gnome-mark-calendar-offline.eplug.xml.h:2
 msgid "Marks the selected calendar for offline viewing."
 msgstr "將選定的行事曆標示成可供離線閱覽。"
@@ -18742,7 +16716,6 @@ msgstr "新郵件通知"
 msgid "A plugin for managing which plugins are enabled or disabled."
 msgstr "用來管理啟用或停用外掛程式的外掛程式。"
 
-# addressbook/gui/widgets/e-addressbook-view.c:732
 #. Setup the ui
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.eplug.xml.h:2
 #: ../plugins/plugin-manager/plugin-manager.c:180
@@ -18753,23 +16726,14 @@ msgstr "外掛管理程式"
 msgid "Enable and disable plugins"
 msgstr "啟用與停用外掛程式"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
 #: ../plugins/plugin-manager/org-gnome-plugin-manager.xml.h:2
 msgid "_Plugins"
 msgstr "外掛程式(_P)"
 
-# calendar/gui/event-editor-dialog.glade.h:39
 #: ../plugins/plugin-manager/plugin-manager.c:43
 msgid "Author(s)"
 msgstr "作者"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../plugins/plugin-manager/plugin-manager.c:44
 #: ../widgets/table/e-table-config-no-group.glade.h:6
 #: ../widgets/table/e-table-config.glade.h:5
@@ -18780,11 +16744,6 @@ msgstr "描述:"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "注意：某些變更在重新啟動後才會生效"
 
-# camel/camel-store.c:378
-# mail/mail-ops.c:1007
-# mail/mail-ops.c:1014
-# mail/mail-ops.c:1032
-# mail/mail-ops.c:1033
 #: ../plugins/plugin-manager/plugin-manager.c:202
 #: ../plugins/plugin-manager/plugin-manager.c:262
 msgid "Plugin"
@@ -18822,11 +16781,11 @@ msgstr "偏好純文字"
 msgid "Only ever show PLAIN"
 msgstr "只以純文字顯示"
 
-# mail/mail-config.glade.h:36
 #: ../plugins/prefer-plain/prefer-plain.c:150
 msgid "HTML Mode"
 msgstr "HTML 模式"
 
+# msgstr "提供自郵件編輯器打印郵件的選項"
 #: ../plugins/print-message/org-gnome-print-message.eplug.xml.h:1
 msgid "Gives an option to print mail from composer"
 msgstr "提供自郵件編輯器列印郵件的選項"
@@ -18838,14 +16797,11 @@ msgstr "提供自郵件編輯器列印郵件的選項"
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印此郵件"
 #: ../plugins/print-message/org-gnome-print-message.xml.h:2
 msgid "Prints the message"
 msgstr "列印此郵件"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../plugins/profiler/org-gnome-evolution-profiler.eplug.xml.h:1
 msgid "Evolution Profiler"
 msgstr "Evolution 設定工具"
@@ -18858,24 +16814,18 @@ msgstr "寫入設定資料事件的紀錄檔。"
 msgid "Allows calendars to be published to the web"
 msgstr "允許將行事曆發佈為網頁"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:2
 msgid "Calendar Publishing"
 msgstr "行事曆發佈"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:3
 msgid "Locations"
 msgstr "位置"
 
-# data/evolution.keys.in.h:2
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.xml.h:1
 msgid "_Publish Calendar Information"
 msgstr "發佈行事曆資訊(_P)"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
 #: ../plugins/publish-calendar/publish-calendar.c:399
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
@@ -18884,7 +16834,6 @@ msgstr "確定要移除此 URL？"
 msgid "<span weight=\"bold\">Location</span>"
 msgstr "<span weight=\"bold\">位置</span>"
 
-# views/mail/galview.xml.h:4
 #: ../plugins/publish-calendar/publish-calendar.glade.h:4
 msgid "<span weight=\"bold\">Sources</span>"
 msgstr "<span weight=\"bold\">來源</span>"
@@ -18937,12 +16886,10 @@ msgstr "服務類型(_T):"
 msgid "_File:"
 msgstr "檔案(_F):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../plugins/publish-calendar/publish-calendar.glade.h:24
 msgid "_Publish as:"
 msgstr "發佈為(_P):"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../plugins/publish-calendar/publish-calendar.glade.h:28
 msgid ""
 "iCal\n"
@@ -18969,29 +16916,23 @@ msgstr "Spamassassin 垃圾郵件外掛程式"
 msgid "A plugin for saving all attachments or parts of a message at once."
 msgstr "提供一次儲存所有附伴或郵件的各部分的外掛程式。"
 
-# mail/mail-display.c:196
 #. the path to the shared library
 #: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:3
 msgid "Save attachments"
 msgstr "儲存附加檔案"
 
-# mail/mail-display.c:196
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:1
 msgid "Save Attachments ..."
 msgstr "儲存附加檔案..."
 
-# mail/mail-display.c:196
 #: ../plugins/save-attachments/org-gnome-save-attachments.xml.h:2
 msgid "Save all attachments"
 msgstr "儲存所有的附加檔案"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../plugins/save-attachments/save-attachments.c:340
 msgid "Select save base name"
 msgstr "選擇儲存的基本名稱"
 
-# composer/e-msg-composer-attachment.glade.h:6
 #: ../plugins/save-attachments/save-attachments.c:359
 msgid "MIME Type"
 msgstr "MIME 類型"
@@ -19001,8 +16942,6 @@ msgstr "MIME 類型"
 msgid "Save"
 msgstr "儲存"
 
-# widgets/misc/e-calendar-item.c:1061
-# widgets/misc/e-calendar-item.c:2756
 #.
 #. * 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.
@@ -19011,19 +16950,14 @@ msgstr "儲存"
 msgid "%F %T"
 msgstr "%F %T"
 
-# addressbook/contact-editor/fullname.glade.h:4
 #: ../plugins/save-calendar/csv-format.c:385
 msgid "UID"
 msgstr "UID"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../plugins/save-calendar/csv-format.c:387
 msgid "Description List"
 msgstr "描述清單"
 
-# addressbook/backend/ebook/e-card.c:3467
 #: ../plugins/save-calendar/csv-format.c:388
 msgid "Categories List"
 msgstr "分類清單"
@@ -19032,7 +16966,6 @@ msgstr "分類清單"
 msgid "Comment List"
 msgstr "註解清單"
 
-# calendar/gui/event-editor-dialog.glade.h:15
 #: ../plugins/save-calendar/csv-format.c:391
 msgid "Created"
 msgstr "已建立"
@@ -19057,7 +16990,6 @@ msgstr "％已完成"
 msgid "URL"
 msgstr "網址"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:744
 #: ../plugins/save-calendar/csv-format.c:399
 msgid "Attendees List"
 msgstr "到會者清單"
@@ -19074,7 +17006,6 @@ msgstr "CSV 格式的進階選項"
 msgid "Prepend a header"
 msgstr "預設的檔頭"
 
-# mail/mail-config.glade.h:76
 #: ../plugins/save-calendar/csv-format.c:568
 msgid "Value delimiter:"
 msgstr "數值定界符:"
@@ -19095,13 +17026,10 @@ msgstr "逗號隔開的數值格式 (.csv)"
 msgid "Save Selected"
 msgstr "儲存選取的"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:2
 msgid "Saves selected calendar or tasks list to disk."
 msgstr "將選定的行事曆或工作儲存至磁碟。"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
 #: ../plugins/save-calendar/org-gnome-save-calendar.eplug.xml.h:3
 msgid "_Save to Disk"
 msgstr "儲存至磁碟(_S)"
@@ -19119,13 +17047,11 @@ msgstr "%FT%T"
 msgid "RDF format (.rdf)"
 msgstr "RDF 格式 (.rdf)"
 
-# shell/e-shell-importer.c:602
 #: ../plugins/save-calendar/save-calendar.c:169
 #: ../plugins/save-calendar/save-calendar.c:180
 msgid "Select destination file"
 msgstr "選取目的檔案"
 
-# shell/e-shell-importer.c:601
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:1
 msgid "Select one source"
 msgstr "選擇一個來源"
@@ -19134,8 +17060,6 @@ msgstr "選擇一個來源"
 msgid "Selects a single calendar or task source for viewing."
 msgstr "選擇要檢視的單一行事曆或工作來源。"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../plugins/select-one-source/org-gnome-select-one-source.eplug.xml.h:3
 msgid "Show _only this Calendar"
 msgstr "只顯示這個行事曆(_O)"
@@ -19152,7 +17076,6 @@ msgstr "處理啟動精靈的外掛程式。"
 msgid "Startup wizard"
 msgstr "啟動精靈"
 
-# shell/importer/import.glade.h:2
 #: ../plugins/startup-wizard/startup-wizard.c:85
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定助理"
@@ -19178,7 +17101,6 @@ msgstr ""
 msgid "Please select the information that you would like to import:"
 msgstr "請選擇您想要匯入的資訊："
 
-# composer/e-msg-composer-hdrs.c:355
 #: ../plugins/startup-wizard/startup-wizard.c:153
 #: ../shell/e-shell-importer.c:411
 #, c-format
@@ -19207,53 +17129,42 @@ msgstr "以主旨為基礎串接郵件"
 msgid "Fall back to threading messages by sub_ject"
 msgstr "退回到依主旨的相關郵件(_J)"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:1
 msgid "Evolution Shell"
 msgstr "Evolution Shell"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../shell/GNOME_Evolution_Shell.server.in.in.h:2
 msgid "Evolution Shell Config factory"
 msgstr "Evolution Shell 設定工廠"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../shell/GNOME_Evolution_Test.server.in.in.h:1
 msgid "Evolution Test"
 msgstr "Evolution 測試"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../shell/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 GNOME Print description of the current printer settings"
-msgstr "目前印表機設定值的 GNOME 列印描述"
+msgstr "目前印表機設定值的 GNOME Print 描述字串"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:9
 #: ../shell/apps_evolution_shell.schemas.in.in.h:2
 msgid "Configuration version"
 msgstr "組態版本"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default sidebar width"
 msgstr "預設資訊方塊列寬度"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window height"
 msgstr "預設視窗高度"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Default window state"
 msgstr "預設視窗狀態"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: ../shell/apps_evolution_shell.schemas.in.in.h:6
 msgid "Default window width"
 msgstr "預設視窗寬度"
@@ -19262,7 +17173,6 @@ msgstr "預設視窗寬度"
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "啟動時預設顯示的元件相關 ID 或別名。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:9
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
 msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
@@ -19272,8 +17182,6 @@ msgid ""
 "List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
-# ui/evolution-event-editor.xml.h:9
-# ui/evolution-task-editor-dialog.xml.h:10
 #: ../shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Printer settings"
 msgstr "印表機設定"
@@ -19298,20 +17206,16 @@ msgstr "狀態列設為顯示"
 msgid ""
 "The configuration version of Evolution, with major/minor/configuration level "
 "(for example \"2.6.0\")."
-msgstr ""
-"Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
+msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
-# ui/evolution.xml.h:32
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
 msgid "The default height for the main window, in pixels."
 msgstr "主視窗的預設高度，以像素計。"
 
-# ui/evolution.xml.h:32
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
 msgid "The default width for the main window, in pixels."
 msgstr "主視窗的預設寬度，以像素計。"
 
-# ui/evolution.xml.h:32
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
@@ -19320,23 +17224,20 @@ msgstr "資訊方塊列的預設寬度，以像素計。"
 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」) 。"
+msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示(例如「2.6.0」) 。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:20
 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:21
 msgid "Toolbar is visible"
 msgstr "工具列可以看到"
 
+# zh_HK: msgstr "Evolution 是否以離線模式啟動取代線上模式。"
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
 msgid "Whether Evolution will start up in offline mode instead of online mode."
 msgstr "Evolution 是否以離線模式啟動取代線上模式。"
@@ -19374,12 +17275,10 @@ msgstr "視窗按鈕風格"
 msgid "Window buttons are visible"
 msgstr "視窗按鈕是可視的"
 
-# shell/e-shell-offline-handler.c:554
 #: ../shell/e-active-connection-dialog.glade.h:1
 msgid "<b>Active Connections</b>"
 msgstr "<b>作用中的連線</b>"
 
-# shell/e-shell-offline-handler.c:554
 #: ../shell/e-active-connection-dialog.glade.h:2
 msgid "Active Connections"
 msgstr "作用中的連線"
@@ -19388,8 +17287,6 @@ msgstr "作用中的連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按「確定」關閉這些連線以離線"
 
-# shell/e-shell-folder-title-bar.c:459
-# shell/e-shell-folder-title-bar.c:460
 #: ../shell/e-shell-folder-title-bar.c:584
 #: ../shell/e-shell-folder-title-bar.c:585
 msgid "(Untitled)"
@@ -19399,7 +17296,6 @@ msgstr "(未命名)"
 msgid "Choose the type of importer to run:"
 msgstr "選擇匯入服務要執行的類型："
 
-# shell/e-shell-importer.c:97
 #: ../shell/e-shell-importer.c:140
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -19412,7 +17308,6 @@ msgstr ""
 "\n"
 "若您不清楚檔案類型，請選擇「自動」。Evolution 會嘗試找出適當的處理方法。"
 
-# ui/evolution.xml.h:4
 #: ../shell/e-shell-importer.c:146
 msgid "Choose the destination for this import"
 msgstr "選擇此輸入的目的地"
@@ -19433,8 +17328,6 @@ msgstr ""
 msgid "F_ilename:"
 msgstr "檔案名稱(_I):"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../shell/e-shell-importer.c:297 ../shell/e-shell-importer.c:300
 msgid "Select a file"
 msgstr "選擇一個檔案"
@@ -19451,14 +17344,10 @@ msgstr "從舊程式輸入資料和設定值(_O)"
 msgid "Import a _single file"
 msgstr "匯入單一檔案(_S)"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../shell/e-shell-settings-dialog.c:318
 msgid "Evolution Preferences"
 msgstr "Evolution 偏好設定"
 
-# camel/camel-pgp-context.c:1073
 #: ../shell/e-shell-utils.c:118
 msgid "No folder name specified."
 msgstr "沒有指定資料夾名稱。"
@@ -19469,32 +17358,29 @@ msgstr "資料夾名稱不能包含換行字元。"
 
 #: ../shell/e-shell-utils.c:131
 msgid "Folder name cannot contain the character \"/\"."
-msgstr "資料夾名稱不可以包括 \"/\"字元。"
+msgstr "資料夾名稱不可以包括 “/” 字元。"
 
 #: ../shell/e-shell-utils.c:137
 msgid "Folder name cannot contain the character \"#\"."
-msgstr "資料夾名稱不可以包括 \"#\"字元。"
+msgstr "資料夾名稱不可以包括 “#” 字元。"
 
 #: ../shell/e-shell-utils.c:143
 msgid "'.' and '..' are reserved folder names."
-msgstr "「.」和「..」是資料夾保留名稱。"
+msgstr "‘.’ 和 ‘..’ 是資料夾保留名稱。"
 
 #: ../shell/e-shell-window-commands.c:71
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
-msgstr "GNOME Pilot 工具似乎沒有安裝在系統上。"
+msgstr "系統似乎沒有安裝 GNOME Pilot 工具。"
 
-# camel/camel-filter-driver.c:871
 #: ../shell/e-shell-window-commands.c:79
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
 
-# shell/e-shell-view-menu.c:185
 #: ../shell/e-shell-window-commands.c:128
 msgid "Bug buddy is not installed."
 msgstr "未安裝設計錯誤部份。"
 
-# shell/e-shell-view-menu.c:185
 #: ../shell/e-shell-window-commands.c:136
 msgid "Bug buddy could not be run."
 msgstr "無法執行 Bug buddy。"
@@ -19506,27 +17392,27 @@ msgstr "無法執行 Bug buddy。"
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
-"以下地址，GNOME 翻譯團隊會盡快回覆您：\n"
+"以下地址，GNOME 翻譯團隊會儘快回覆您：\n"
 "community@linuxhall.org\n"
 "\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
+# zh_HK: msgstr "線上工作(_W)"
 #: ../shell/e-shell-window-commands.c:806
 msgid "_Work Online"
 msgstr "線上工作(_W)"
 
-# ui/evolution.xml.h:66
 #: ../shell/e-shell-window-commands.c:819 ../ui/evolution.xml.h:55
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
-# ui/evolution.xml.h:39
 #: ../shell/e-shell-window-commands.c:832
 msgid "Work Offline"
 msgstr "離線工作"
 
+# zh_HK: msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
 #: ../shell/e-shell-window.c:371
 msgid "Evolution is currently online. Click on this button to work offline."
 msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工作。"
@@ -19535,35 +17421,29 @@ msgstr "Evolution 目前為線上模式。按一下此按鈕以進行離線工�
 msgid "Evolution is in the process of going offline."
 msgstr "Evolution 正在離線的程序中。"
 
+# zh_HK: msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 #: ../shell/e-shell-window.c:386
 msgid "Evolution is currently offline. Click on this button to work online."
 msgstr "Evolution 目前為離線模式。按一下此按鈕以進行線上工作。"
 
-# mail/mail-autofilter.c:70
 #: ../shell/e-shell-window.c:786
 #, c-format
 msgid "Switch to %s"
 msgstr "切換至 %s"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
 #: ../shell/e-shell.c:634
 msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
-# calendar/gui/e-week-view-main-item.c:342
 #: ../shell/e-shell.c:830 ../shell/e-shell.c:831
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
-# widgets/misc/e-cell-date-edit.c:245
 #: ../shell/e-shell.c:1262 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
 #: ../shell/e-shell.c:1264
 msgid "Invalid arguments"
 msgstr "無效的參數"
@@ -19576,24 +17456,15 @@ msgstr "不能於 OAF 註冊"
 msgid "Configuration Database not found"
 msgstr "找不到組態資料庫"
 
-# ui/evolution-calendar.xml.h:40
-# ui/evolution-event-editor.xml.h:66
-# ui/evolution-task-editor-dialog.xml.h:79
-# ui/evolution.xml.h:58
 #: ../shell/e-user-creatable-items-handler.c:678
 #: ../shell/e-user-creatable-items-handler.c:688
 msgid "New"
 msgstr "新增"
 
-# ui/evolution-calendar.xml.h:40
-# ui/evolution-event-editor.xml.h:66
-# ui/evolution-task-editor-dialog.xml.h:79
-# ui/evolution.xml.h:58
 #: ../shell/e-user-creatable-items-handler.c:693
 msgid " New "
 msgstr " 新增 "
 
-# ui/evolution-tasks.xml.h:3
 #: ../shell/evolution-test-component.c:140
 msgid "New Test"
 msgstr "新測試"
@@ -19602,48 +17473,38 @@ msgstr "新測試"
 msgid "_Test"
 msgstr "測試(_T)"
 
-# ui/evolution-tasks.xml.h:2
 #: ../shell/evolution-test-component.c:142
 msgid "Create a new test item"
 msgstr "建立新的測試項目"
 
-# shell/importer/import.glade.h:1
 #: ../shell/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "按「匯入」開始將檔案匯入到 Evolution。"
 
-# shell/importer/import.glade.h:2
 #: ../shell/import.glade.h:2
 msgid "Evolution Import Assistant"
 msgstr "Evolution 匯入助理"
 
-# shell/e-shell-importer.c:363
 #: ../shell/import.glade.h:3
 msgid "Import File"
 msgstr "輸入檔案"
 
-# addressbook/backend/ebook/e-card.c:3442
 #: ../shell/import.glade.h:4
 msgid "Import Location"
 msgstr "輸入位置"
 
-# shell/importer/intelligent.c:186
 #: ../shell/import.glade.h:5
 msgid "Importer Type"
 msgstr "輸入器類型"
 
-# mail/mail-account-gui.c:682
 #: ../shell/import.glade.h:6
 msgid "Select Importers"
 msgstr "選取輸入器"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../shell/import.glade.h:7
 msgid "Select a File"
 msgstr "選取檔案"
 
-# shell/importer/import.glade.h:6
 #: ../shell/import.glade.h:8
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
@@ -19690,9 +17551,6 @@ msgstr ""
 "我們希望您享受工作成果，而且我們\n"
 "熱切希望您提供意見！\n"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
 #: ../shell/main.c:257
 msgid ""
 "Thanks\n"
@@ -19701,9 +17559,6 @@ msgstr ""
 "謝謝\n"
 "Evolution 小組敬上\n"
 
-# importers/elm-importer.c:528
-# importers/netscape-importer.c:807
-# importers/pine-importer.c:668
 #: ../shell/main.c:264
 msgid "Do not tell me again"
 msgstr "不要再顯示這個訊息"
@@ -19712,6 +17567,7 @@ msgstr "不要再顯示這個訊息"
 msgid "Start Evolution activating the specified component"
 msgstr "啟動 Evolution 會啟動指定的元件"
 
+# zh_HK: msgstr "以線上模式啟動"
 #: ../shell/main.c:472
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
@@ -19724,7 +17580,6 @@ msgstr "強制關閉所有 Evoultion 元件"
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強制從 Evolution 1.4 重新移轉"
 
-# shell/main.c:185
 #: ../shell/main.c:482
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
@@ -19733,7 +17588,6 @@ msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 msgid "Disable loading of any plugins."
 msgstr "停用對任何外掛程式的載入。"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
 #: ../shell/main.c:515
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM 與郵件客戶端"
@@ -19759,7 +17613,6 @@ msgstr "繼續"
 msgid "Delete old data from version {0}?"
 msgstr "從 {0} 版刪除舊資料？"
 
-# mail/mail-config-druid.c:445
 #: ../shell/shell.error.xml.h:4
 msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
@@ -19768,15 +17621,12 @@ msgstr "Evolution 無法啟動。"
 msgid ""
 "Forgetting your passwords will clear all remembered passwords. You will be "
 "reprompted next time they are needed."
-msgstr ""
-"遺忘您的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示您輸入。"
+msgstr "遺忘您的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示您輸入。"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
 msgstr "磁碟空間不足，無法升級。"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
 #: ../shell/shell.error.xml.h:8
 msgid "Really delete old data?"
 msgstr "確定要刪除舊資料？"
@@ -19795,8 +17645,7 @@ msgid ""
 msgstr ""
 "「evolution」目錄的所有內容即將永久移除。\n"
 "\n"
-"建議您手動檢查所有的電子郵件、連絡人和行事曆資料是否顯示，而且此 Evolution 版"
-"本在刪除舊資料前能正確作業。\n"
+"建議您手動檢查所有的電子郵件、連絡人和行事曆資料是否顯示，而且此 Evolution 版本在刪除舊資料前能正確作業。\n"
 "\n"
 "刪除之後，未經手動操作，便無法降級至舊的 Evolution 版本。\n"
 
@@ -19811,8 +17660,7 @@ msgid ""
 msgstr ""
 "舊的 Evolution 版本將其資料儲存在不同的位置。\n"
 "\n"
-"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資"
-"料，就可以在方便的時候，手動移除「evolution」的內容。\n"
+"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資料，就可以在方便的時候，手動移除「evolution」的內容。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19862,7 +17710,6 @@ msgstr "遺忘(_F)"
 msgid "_Keep Data"
 msgstr "保留資料(_K)"
 
-# calendar/gui/event-editor-dialog.glade.h:20
 #: ../shell/shell.error.xml.h:33
 msgid "_Remind Me Later"
 msgstr "稍後提醒我(_R)"
@@ -19885,7 +17732,7 @@ msgid ""
 "\n"
 "Edit trust settings:"
 msgstr ""
-"憑證 '%s' 是一種 CA 憑證。\n"
+"憑證 '%s' 是憑證管理中心 (CA) 發出的憑證。\n"
 "\n"
 "編輯信任設定值："
 
@@ -19894,20 +17741,15 @@ msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
 "indicated here"
-msgstr ""
-"因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效"
-"性。"
+msgstr "因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效性。"
 
 #: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
 "unless otherwise indicated here"
-msgstr ""
-"因為您不信任發出此憑證的憑證單位，所以除非在此指示，否則您將不信任此憑證的有"
-"效性。"
+msgstr "因為您不信任發出此憑證的憑證單位，所以除非在此指示，否則您將不信任此憑證的有效性。"
 
-# mail/mail-account-gui.c:682
 #: ../smime/gui/certificate-manager.c:136
 #: ../smime/gui/certificate-manager.c:144
 #: ../smime/gui/certificate-manager.c:375
@@ -19923,7 +17765,6 @@ msgstr "選取要匯入的憑證..."
 msgid "Certificate Name"
 msgstr "憑證名稱"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:16
 #: ../smime/gui/certificate-manager.c:276
 #: ../smime/gui/certificate-manager.c:490
 msgid "Purposes"
@@ -19938,7 +17779,6 @@ msgstr "序號"
 msgid "Expires"
 msgstr "到期"
 
-# mail/mail-config.glade.h:29
 #: ../smime/gui/certificate-manager.c:481
 msgid "E-Mail Address"
 msgstr "電子郵件地址"
@@ -19948,24 +17788,16 @@ msgstr "電子郵件地址"
 msgid "Certificate Viewer: %s"
 msgstr "憑證檢視器:%s"
 
-# camel/camel-smime-context.c:194
 #: ../smime/gui/component.c:47
 #, c-format
 msgid "Enter the password for `%s'"
 msgstr "輸入 `%s' 的密碼"
 
-# camel/camel-smime-context.c:194
 #. we're setting the password initially
 #: ../smime/gui/component.c:70
 msgid "Enter new password for certificate database"
 msgstr "輸入憑證資料庫的新密碼"
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
 #: ../smime/gui/component.c:72
 msgid "Enter new password"
 msgstr "輸入新密碼"
@@ -19989,7 +17821,6 @@ msgstr ""
 "發照者:\n"
 "  主旨：%s\n"
 
-# ui/evolution-calendar.xml.h:13
 #: ../smime/gui/e-cert-selector.c:174
 msgid "Select certificate"
 msgstr "選取憑證"
@@ -20006,7 +17837,6 @@ msgstr "<b>憑證欄位</b>"
 msgid "<b>Certificate Hierarchy</b>"
 msgstr "<b>憑證階層</b>"
 
-# mail/mail-config.glade.h:65
 #: ../smime/gui/smime-ui.glade.h:4
 msgid "<b>Field Value</b>"
 msgstr "<b>欄位值</b>"
@@ -20031,8 +17861,6 @@ msgstr "<b>此憑證已經檢驗用途:</b>"
 msgid "<b>Validity</b>"
 msgstr "<b>效力</b>"
 
-# importers/netscape-importer.c:795
-# mail/mail-callbacks.c:1359
 #: ../smime/gui/smime-ui.glade.h:10
 msgid "Authorities"
 msgstr "權威"
@@ -20049,8 +17877,7 @@ msgstr "全部備份"
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
-msgstr ""
-"信任此 CA 的任何用途前，您應該檢查它的憑證以及它的政策和程序 (如果可以的話)。"
+msgstr "信任此憑證管理中心之前，如果可以的話，您應該先檢查它的憑證以及它的政策和程序。"
 
 #: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
@@ -20058,7 +17885,7 @@ msgstr "憑證"
 
 #: ../smime/gui/smime-ui.glade.h:15
 msgid "Certificate Authority Trust"
-msgstr "憑證中心信任"
+msgstr "憑證管理中心信任度"
 
 #: ../smime/gui/smime-ui.glade.h:16
 msgid "Certificate details"
@@ -20068,7 +17895,6 @@ msgstr "憑證詳細資訊"
 msgid "Certificates Table"
 msgstr "憑證表格"
 
-# calendar/gui/e-calendar-table.c:152
 #: ../smime/gui/smime-ui.glade.h:18
 msgid "Common Name (CN)"
 msgstr "一般名稱 (CN)"
@@ -20085,12 +17911,6 @@ msgstr "不信任此憑證的有效性"
 msgid "Dummy window only"
 msgstr "限虛擬視窗"
 
-# mail/mail-config.glade.h:86
-# ui/evolution-event-editor.xml.h:58
-# ui/evolution-message-composer.xml.h:45
-# ui/evolution-subscribe.xml.h:10
-# ui/evolution-task-editor-dialog.xml.h:70
-# ui/evolution.xml.h:48
 #: ../smime/gui/smime-ui.glade.h:23
 msgid "Edit"
 msgstr "編輯"
@@ -20105,17 +17925,12 @@ msgstr "電子郵件收件者憑證"
 
 #: ../smime/gui/smime-ui.glade.h:26
 msgid "Email Signer Certificate"
-msgstr "電子郵件簽名者憑證"
+msgstr "電子郵件簽署者憑證"
 
 #: ../smime/gui/smime-ui.glade.h:27
 msgid "Expires On"
 msgstr "到期日期"
 
-# importers/elm-importer.c:512
-# importers/netscape-importer.c:780
-# importers/pine-importer.c:646
-# shell/e-shell-importer.c:653
-# shell/importer/import.glade.h:4
 #: ../smime/gui/smime-ui.glade.h:29
 msgid "Import"
 msgstr "匯入"
@@ -20128,12 +17943,10 @@ msgstr "發照日期"
 msgid "MD5 Fingerprint"
 msgstr "MD5 指紋"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
 #: ../smime/gui/smime-ui.glade.h:32
 msgid "Organization (O)"
 msgstr "組織 (O)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
 #: ../smime/gui/smime-ui.glade.h:33
 msgid "Organizational Unit (OU)"
 msgstr "組織單位 (OU)"
@@ -20156,32 +17969,28 @@ msgstr "信任此憑證的有效性"
 
 #: ../smime/gui/smime-ui.glade.h:39
 msgid "Trust this CA to identify email users."
-msgstr "信任此 CA 來識別電子郵件使用者。"
+msgstr "信任此憑證管理中心 (CA) 來識別電子郵件使用者。"
 
 #: ../smime/gui/smime-ui.glade.h:40
 msgid "Trust this CA to identify software developers."
-msgstr "信任此 CA 來識別軟體開發人員。"
+msgstr "信任此憑證管理中心 (CA) 來識別軟體開發人員。"
 
 #: ../smime/gui/smime-ui.glade.h:41
 msgid "Trust this CA to identify web sites."
-msgstr "信任此 CA 來識別網站。"
+msgstr "信任此憑證管理中心 (CA) 來識別網站。"
 
-# ui/evolution-event-editor.xml.h:76
-# ui/evolution-message-composer.xml.h:55
-# ui/evolution-task-editor-dialog.xml.h:90
-# ui/evolution.xml.h:65
 #: ../smime/gui/smime-ui.glade.h:42
 msgid "View"
 msgstr "檢視"
 
 #: ../smime/gui/smime-ui.glade.h:43
 msgid "You have certificates from these organizations that identify you:"
-msgstr "您已經從可以識別您身份的組織取得憑證:"
+msgstr "您已經有來自這些組織的憑證，可以識別您的身份:"
 
 #: ../smime/gui/smime-ui.glade.h:44
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
-msgstr "您已經擁有檔案的相關憑證，可以識別這些憑證單位:"
+msgstr "您已經擁有檔案的相關憑證，可以識別這些憑證管理中心:"
 
 #: ../smime/gui/smime-ui.glade.h:45
 msgid "You have certificates on file that identify these people:"
@@ -20193,21 +18002,16 @@ msgstr "您的憑證"
 
 #: ../smime/gui/smime-ui.glade.h:47
 msgid "_Edit CA Trust"
-msgstr "編輯 CA 信任(_E)"
+msgstr "編輯憑證管理中心 (_CA) 信任度"
 
 #. XXX we shouldn't be popping up dialogs in this code.
 #: ../smime/lib/e-cert-db.c:676
 msgid "Certificate already exists"
 msgstr "憑證已經存在"
 
-# e-util/e-time-utils.c:69
-# e-util/e-time-utils.c:117
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:477
-# widgets/misc/e-dateedit.c:1284
-# widgets/misc/e-dateedit.c:1465
 #: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
-msgstr "%d/%m/%Y"
+msgstr "%Y-%m-%d"
 
 #. x509 certificate usage types
 #: ../smime/lib/e-cert.c:425
@@ -20252,7 +18056,7 @@ msgstr "PKCS #1 RSA 加密"
 
 #: ../smime/lib/e-cert.c:670
 msgid "Certificate Key Usage"
-msgstr "憑證鑰匙使用"
+msgstr "憑證金鑰使用"
 
 #: ../smime/lib/e-cert.c:673
 msgid "Netscape Certificate Type"
@@ -20260,7 +18064,7 @@ msgstr "Netscape 憑證類型"
 
 #: ../smime/lib/e-cert.c:676
 msgid "Certificate Authority Key Identifier"
-msgstr "憑證單位鑰匙識別碼"
+msgstr "憑證管理中心金鑰識別碼"
 
 #: ../smime/lib/e-cert.c:688
 #, c-format
@@ -20283,19 +18087,17 @@ msgstr "主旨公鑰資訊"
 msgid "Subject Public Key Algorithm"
 msgstr "主旨公鑰演算法"
 
-# mail/mail-autofilter.c:213
 #: ../smime/lib/e-cert.c:789
 msgid "Subject's Public Key"
 msgstr "主旨的公鑰"
 
-# camel/camel-filter-driver.c:652
 #: ../smime/lib/e-cert.c:810 ../smime/lib/e-cert.c:859
 msgid "Error: Unable to process extension"
 msgstr "錯誤：無法處理延伸"
 
 #: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
-msgstr "物件簽名者"
+msgstr "物件簽署者"
 
 #: ../smime/lib/e-cert.c:835
 msgid "SSL Certificate Authority"
@@ -20305,38 +18107,33 @@ msgstr "SSL 憑證單位"
 msgid "Email Certificate Authority"
 msgstr "電子郵件單位"
 
-# importers/netscape-importer.c:790
-# importers/pine-importer.c:656
 #: ../smime/lib/e-cert.c:867
 msgid "Signing"
 msgstr "簽名"
 
-# widgets/meeting-time-sel/e-meeting-time-sel.c:395
 #: ../smime/lib/e-cert.c:871
 msgid "Non-repudiation"
 msgstr "不可拒絕"
 
 #: ../smime/lib/e-cert.c:875
 msgid "Key Encipherment"
-msgstr "鑰匙加密"
+msgstr "金鑰加密"
 
-# composer/e-msg-composer-attachment-bar.c:332
-# mail/mail-display.c:122
 #: ../smime/lib/e-cert.c:879
 msgid "Data Encipherment"
 msgstr "資料密碼"
 
 #: ../smime/lib/e-cert.c:883
 msgid "Key Agreement"
-msgstr "鑰匙合同"
+msgstr "金鑰合同"
 
 #: ../smime/lib/e-cert.c:887
 msgid "Certificate Signer"
-msgstr "憑證簽名者"
+msgstr "憑證簽署者"
 
 #: ../smime/lib/e-cert.c:891
 msgid "CRL Signer"
-msgstr "CRL 簽名者"
+msgstr "CRL 簽署者"
 
 #: ../smime/lib/e-cert.c:939
 msgid "Critical"
@@ -20355,12 +18152,10 @@ msgstr "延伸"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-# mail/mail-crypto.c:59
 #: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
-msgstr "憑證簽名演算法"
+msgstr "憑證簽章演算法"
 
-# ui/evolution-message-composer.xml.h:49
 #: ../smime/lib/e-cert.c:1101
 msgid "Issuer"
 msgstr "發照者"
@@ -20369,21 +18164,18 @@ msgstr "發照者"
 msgid "Issuer Unique ID"
 msgstr "發照者獨有 ID"
 
-# mail/mail-autofilter.c:213
 #: ../smime/lib/e-cert.c:1174
 msgid "Subject Unique ID"
 msgstr "主旨獨有 ID"
 
-# mail/mail-crypto.c:59
 #: ../smime/lib/e-cert.c:1217
 msgid "Certificate Signature Value"
-msgstr "憑證簽名值"
+msgstr "憑證簽章值"
 
 #: ../smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 檔案密碼"
 
-# camel/camel-smime-context.c:194
 #: ../smime/lib/e-pkcs12.c:266
 msgid "Enter password for PKCS12 file:"
 msgstr "輸入 PKCS12 檔案的密碼:"
@@ -20392,7 +18184,6 @@ msgstr "輸入 PKCS12 檔案的密碼:"
 msgid "Imported Certificate"
 msgstr "輸入的憑證"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../tools/evolution-launch-composer.c:321
 msgid "An attachment to add."
 msgstr "要新增的附件。"
@@ -20405,7 +18196,6 @@ msgstr "附件的內容類型。"
 msgid "The filename to display in the mail."
 msgstr "要顯示在郵件的檔案名稱。"
 
-# calendar/gui/gnome-cal.c:235
 #: ../tools/evolution-launch-composer.c:324
 msgid "Description of the attachment."
 msgstr "附件的描述。"
@@ -20418,7 +18208,6 @@ msgstr "將附件標示成預設顯示在行內。"
 msgid "Default subject for the message."
 msgstr "郵件的預設主旨。"
 
-# camel/providers/local/camel-mbox-summary.c:655
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
@@ -20432,141 +18221,106 @@ msgstr "無法執行 `%s'：%s\n"
 msgid "Shutting down %s (%s)\n"
 msgstr "關閉 %s (%s)\n"
 
-# addressbook/gui/component/addressbook-config.glade.h:2
 #: ../ui/evolution-addressbook.xml.h:1
 msgid "Address _Book Properties"
 msgstr "通訊錄屬性(_B)"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution-addressbook.xml.h:3
 msgid "Change the properties of the selected folder"
 msgstr "改變選定資料夾的屬性"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../ui/evolution-addressbook.xml.h:4
 msgid "Co_py All Contacts To..."
 msgstr "複製所有的連絡人到(_P)..."
 
-# ui/evolution-addressbook.xml.h:17
 #: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "連絡人預覽(_P)"
 
-# ui/evolution-event-editor.xml.h:13
-# ui/evolution-mail.xml.h:8
-# ui/evolution-task-editor-dialog.xml.h:14
 #: ../ui/evolution-addressbook.xml.h:6
 #: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "複製"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-addressbook.xml.h:7
 msgid "Copy Selected Contacts to Another Folder..."
 msgstr "複製選擇的連絡人到另一個資料夾..."
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-addressbook.xml.h:8
 msgid "Copy the contacts of the selected folder into another folder"
 msgstr "複製已選定資料夾中的連絡人到另一個資料夾"
 
-# ui/evolution-event-editor.xml.h:14
-# ui/evolution-task-editor-dialog.xml.h:15
 #: ../ui/evolution-addressbook.xml.h:9 ../ui/evolution-calendar.xml.h:2
 msgid "Copy the selection"
 msgstr "複製選定範圍"
 
-# mail/folder-browser.c:713
 #: ../ui/evolution-addressbook.xml.h:10
 msgid "Copy to Folder..."
 msgstr "複製至資料夾..."
 
-# ui/evolution-tasks.xml.h:2
 #: ../ui/evolution-addressbook.xml.h:11
 msgid "Create a new addressbook folder"
 msgstr "建立新通訊錄資料夾"
 
-# ui/evolution-event-editor.xml.h:15
-# ui/evolution-task-editor-dialog.xml.h:16
 #: ../ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-composer-entries.xml.h:5 ../ui/evolution-memos.xml.h:4
 #: ../ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "剪下"
 
-# ui/evolution-event-editor.xml.h:16
-# ui/evolution-task-editor-dialog.xml.h:17
 #: ../ui/evolution-addressbook.xml.h:13 ../ui/evolution-calendar.xml.h:3
 msgid "Cut the selection"
 msgstr "剪下選定範圍"
 
-# importers/pine-importer.c:661
 #: ../ui/evolution-addressbook.xml.h:14
 msgid "Del_ete Address Book"
 msgstr "刪除通訊錄(_E)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:16
 msgid "Delete selected contacts"
 msgstr "刪除選定的連絡人"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:17
 msgid "Delete the selected folder"
 msgstr "刪除選定的資料夾"
 
-# ui/evolution-mail.xml.h:35
 #: ../ui/evolution-addressbook.xml.h:18
 msgid "Forward Contact"
 msgstr "轉寄連絡人"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../ui/evolution-addressbook.xml.h:19
 msgid "Mo_ve All Contacts To..."
 msgstr "將所有的連絡人移到(_V)..."
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-addressbook.xml.h:20
 msgid "Move Selected Contacts to Another Folder..."
 msgstr "將選擇的連絡人移至另一個資料夾..."
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-addressbook.xml.h:21
 msgid "Move the contacts of the selected folder into another folder"
 msgstr "將選定資料夾中的連絡人移至另一個資料夾"
 
-# mail/folder-browser.c:711
 #: ../ui/evolution-addressbook.xml.h:22
 msgid "Move to Folder..."
 msgstr "移至資料夾..."
 
-# ui/evolution-event-editor.xml.h:30
-# ui/evolution-task-editor-dialog.xml.h:33
 #: ../ui/evolution-addressbook.xml.h:23
 #: ../ui/evolution-composer-entries.xml.h:8 ../ui/evolution-memos.xml.h:8
 #: ../ui/evolution-tasks.xml.h:11
 msgid "Paste"
 msgstr "貼上"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的連絡人"
 #: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
-# ui/evolution-addressbook.xml.h:11
+# zh_HK: msgstr "打印選定的連絡人"
 #: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 msgstr "列印選定的連絡人"
@@ -20575,23 +18329,18 @@ msgstr "列印選定的連絡人"
 msgid "Rename the selected folder"
 msgstr "重新命名選定的資料夾"
 
-# importers/pine-importer.c:661
 #: ../ui/evolution-addressbook.xml.h:30
 msgid "S_ave Address Book As VCard"
 msgstr "將通訊錄另存為 VC_ard"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:32
 msgid "Save selected contacts as a VCard."
 msgstr "將選定的連絡人儲存為 VCard。"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:33
 msgid "Save the contacts of the selected folder as VCard"
 msgstr "將選定資料夾中的連絡人儲存為 VCard"
 
-# ui/evolution-event-editor.xml.h:48
-# ui/evolution-task-editor-dialog.xml.h:57
 #: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2727
 msgid "Select All"
 msgstr "全選"
@@ -20602,44 +18351,34 @@ msgstr "全選"
 msgid "Select _All"
 msgstr "全選(_A)"
 
-# ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "選擇全部連絡人"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:37
 msgid "Send a message to the selected contacts."
 msgstr "傳送郵件至選取的連絡人。"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
-# addressbook/gui/widgets/e-addressbook-view.c:613
 #: ../ui/evolution-addressbook.xml.h:38
 msgid "Send message to contact"
 msgstr "傳送郵件給連絡人"
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:231
-# addressbook/gui/widgets/e-addressbook-view.c:612
 #: ../ui/evolution-addressbook.xml.h:39
 msgid "Send selected contacts to another person."
 msgstr "傳送選定連絡人給其他使用者。"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "顯示連絡人預覽視窗"
 
-# ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-addressbook.xml.h:41
 msgid "St_op"
 msgstr "停止(_O)"
 
-# ui/evolution-addressbook.xml.h:12
 #: ../ui/evolution-addressbook.xml.h:42
 msgid "Stop"
 msgstr "停止"
 
-# ui/evolution-addressbook.xml.h:13
 #: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "停止載入"
@@ -20653,7 +18392,6 @@ msgstr "檢視目前的連絡人"
 msgid "_Actions"
 msgstr "執行(_A)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:47
 msgid "_Copy Contact to..."
 msgstr "複製連絡人到(_C)..."
@@ -20690,7 +18428,6 @@ msgstr "重新命名(_R)"
 msgid "_Save Contact as VCard..."
 msgstr "將連絡人儲存為 VCar_d..."
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-addressbook.xml.h:62
 msgid "_Save Folder Contacts As VCard"
 msgstr "將資料夾連絡人儲存為 VCar_d"
@@ -20699,7 +18436,6 @@ msgstr "將資料夾連絡人儲存為 VCar_d"
 msgid "_Send Message to Contact..."
 msgstr "傳送郵件給連絡人(_S)..."
 
-# ui/evolution-calendar.xml.h:7
 #: ../ui/evolution-calendar.xml.h:4
 msgid "Day"
 msgstr "天"
@@ -20708,72 +18444,54 @@ msgstr "天"
 msgid "Delete _all Occurrences"
 msgstr "刪除全部週期(_A)"
 
-# calendar/gui/e-week-view.c:3313
 #: ../ui/evolution-calendar.xml.h:7
 msgid "Delete all occurrences"
 msgstr "刪除全部週期"
 
-# ui/evolution-event-editor.xml.h:18
 #: ../ui/evolution-calendar.xml.h:8
 msgid "Delete the appointment"
 msgstr "刪除這個約會"
 
-# calendar/gui/e-day-view.c:3177
-# calendar/gui/e-week-view.c:3311
 #: ../ui/evolution-calendar.xml.h:10
 msgid "Delete this occurrence"
 msgstr "刪除此週期"
 
-# ui/evolution-calendar.xml.h:8
 #: ../ui/evolution-calendar.xml.h:11
 msgid "Go To"
 msgstr "移至"
 
-# ui/evolution-calendar.xml.h:9
 #: ../ui/evolution-calendar.xml.h:12
 msgid "Go back"
 msgstr "向後"
 
-# ui/evolution-calendar.xml.h:10
 #: ../ui/evolution-calendar.xml.h:13
 msgid "Go forward"
 msgstr "向前"
 
-# addressbook/contact-editor/fullname.glade.h:8
 #: ../ui/evolution-calendar.xml.h:14
 msgid "List"
 msgstr "清單"
 
-# ui/evolution-calendar.xml.h:15
 #: ../ui/evolution-calendar.xml.h:15
 msgid "Month"
 msgstr "月"
 
-# mail/message-browser.c:210
-# ui/evolution-calendar.xml.h:18
-# ui/evolution-event-editor.xml.h:29
-# ui/evolution-mail.xml.h:57
-# ui/evolution-task-editor-dialog.xml.h:32
 #: ../ui/evolution-calendar.xml.h:16 ../ui/evolution-mail-message.xml.h:58
 #: ../widgets/misc/e-calendar.c:201
 msgid "Next"
 msgstr "下一個"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的行事曆內容"
 #: ../ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "預覽將要列印的行事曆內容"
 
-# mail/message-browser.c:207
-# ui/evolution-event-editor.xml.h:33
-# ui/evolution-mail.xml.h:64
-# ui/evolution-task-editor-dialog.xml.h:36
 #: ../ui/evolution-calendar.xml.h:19 ../ui/evolution-mail-message.xml.h:74
 #: ../widgets/misc/e-calendar.c:177
 msgid "Previous"
 msgstr "上一個"
 
-# ui/evolution-calendar.xml.h:26
+# zh_HK: msgstr "打印這個行事曆"
 #: ../ui/evolution-calendar.xml.h:22
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
@@ -20794,38 +18512,30 @@ msgstr "選擇日期(_D)"
 msgid "Select _Today"
 msgstr "選擇今天(_T)"
 
-# ui/evolution-calendar.xml.h:13
 #: ../ui/evolution-calendar.xml.h:27
 msgid "Select a specific date"
 msgstr "選取特定日期"
 
-# shell/e-shell-importer.c:601
 #: ../ui/evolution-calendar.xml.h:28
 msgid "Select today"
 msgstr "選取今日"
 
-# addressbook/contact-editor/contact-editor.glade.h:8
-# calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../ui/evolution-calendar.xml.h:29
 msgid "Show as list"
 msgstr "顯示成清單"
 
-# ui/evolution-calendar.xml.h:30
 #: ../ui/evolution-calendar.xml.h:30
 msgid "Show one day"
 msgstr "顯示一天"
 
-# ui/evolution-calendar.xml.h:31
 #: ../ui/evolution-calendar.xml.h:31
 msgid "Show one month"
 msgstr "顯示一個月"
 
-# ui/evolution-calendar.xml.h:32
 #: ../ui/evolution-calendar.xml.h:32
 msgid "Show one week"
 msgstr "顯示一週"
 
-# ui/evolution-calendar.xml.h:33
 #: ../ui/evolution-calendar.xml.h:33
 msgid "Show the working week"
 msgstr "顯示工作週"
@@ -20834,12 +18544,10 @@ msgstr "顯示工作週"
 msgid "View the current appointment"
 msgstr "檢視目前的約會"
 
-# ui/evolution-calendar.xml.h:36
 #: ../ui/evolution-calendar.xml.h:36
 msgid "Week"
 msgstr "週"
 
-# ui/evolution-calendar.xml.h:35
 #: ../ui/evolution-calendar.xml.h:37
 msgid "Work Week"
 msgstr "工作週"
@@ -20848,46 +18556,34 @@ msgstr "工作週"
 msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "複製選取的文字至剪貼簿"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-composer-entries.xml.h:3
 msgid "Copy selection to clipboard"
 msgstr "複製選取區至剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "剪下選取的文字至剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:7
 msgid "Cut selection to clipboard"
 msgstr "剪下選取區至剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:9
 msgid "Paste from clipboard"
 msgstr "從剪貼簿貼上"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:11
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-# ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:14
 msgid "Select all text"
 msgstr "選取所有文字"
 
-# ui/evolution-message-composer.xml.h:1
 #: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附加"
@@ -20896,14 +18592,10 @@ msgstr "附加"
 msgid "Click here to attach a file"
 msgstr "按這裡以附加檔案"
 
-# ui/evolution-message-composer.xml.h:4
-# ui/evolution-task-editor-dialog.xml.h:12
 #: ../ui/evolution-editor.xml.h:3
 msgid "Click here to close the current window"
 msgstr "按這裡以關閉目前視窗"
 
-# ui/evolution-message-composer.xml.h:4
-# ui/evolution-task-editor-dialog.xml.h:12
 #: ../ui/evolution-editor.xml.h:4
 msgid "Click here to save the current window"
 msgstr "按這裡以儲存目前視窗"
@@ -20912,13 +18604,6 @@ msgstr "按這裡以儲存目前視窗"
 msgid "Click here to view help available"
 msgstr "按這裡以檢視可用的說明"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
@@ -20967,9 +18652,6 @@ msgstr "全天事件"
 msgid "All _Day Event"
 msgstr "全天事件(_D)"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
 #: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-memo-editor.xml.h:1
 #: ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
@@ -20993,15 +18675,10 @@ msgstr "按這裡以設定或取消這個事件的鬧鈴"
 msgid "Insert advanced send options"
 msgstr "插入進階傳送選項"
 
-# calendar/gui/e-day-view.c:3175
-# calendar/gui/e-week-view.c:3309
 #: ../ui/evolution-event-editor.xml.h:10
 msgid "Make this a recurring event"
 msgstr "將此項設為循環事件"
 
-# calendar/gui/calendar-model.c:360
-# calendar/gui/calendar-model.c:898
-# calendar/gui/e-calendar-table.c:323
 #: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-memo-editor.xml.h:4
 #: ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
@@ -21019,53 +18696,43 @@ msgstr "角色欄位(_O)"
 msgid "Show time as _busy"
 msgstr "顯示時間為忙碌(_B)"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
-# ui/evolution-message-composer.xml.h:39
 #: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-memo-editor.xml.h:5
 #: ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All Day Event"
 msgstr "切換是否要有全天事件"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-event-editor.xml.h:25
 msgid "Toggles whether to show time as busy"
 msgstr "切換是否將時間顯示為忙碌"
 
-# calendar/gui/e-calendar-table.c:162
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_Alarms"
 msgstr "鬧鈴(_A)"
@@ -21075,30 +18742,20 @@ msgstr "鬧鈴(_A)"
 msgid "_Categories"
 msgstr "分類(_C)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:5
-# calendar/gui/e-calendar-table.c:151
-# calendar/gui/event-editor-dialog.glade.h:6
 #: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-memo-editor.xml.h:7
 #: ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
-# calendar/gui/calendar-model.c:366
-# calendar/gui/calendar-model.c:902
-# calendar/gui/e-calendar-table.c:325
 #: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-memo-editor.xml.h:8
 #: ../ui/evolution-task-editor.xml.h:20
 msgid "_Confidential"
 msgstr "機密(_C)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
 #: ../ui/evolution-event-editor.xml.h:30
 msgid "_Free/Busy"
 msgstr "空閒/忙碌(_F)"
 
-# calendar/gui/calendar-model.c:363
-# calendar/gui/calendar-model.c:900
-# calendar/gui/e-calendar-table.c:324
 #: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-memo-editor.xml.h:9
 #: ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
@@ -21108,7 +18765,6 @@ msgstr "私人(_P)"
 msgid "_RSVP"
 msgstr "_RSVP"
 
-# calendar/gui/event-editor-dialog.glade.h:18
 #: ../ui/evolution-event-editor.xml.h:33
 msgid "_Recurrence"
 msgstr "週期性(_R)"
@@ -21121,52 +18777,44 @@ msgstr "狀態欄位(_S)"
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
-# ui/evolution-mail.xml.h:3
 #: ../ui/evolution-mail-global.xml.h:2
 msgid "Cancel the current mail operation"
 msgstr "取消目前郵件所作的行動"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-global.xml.h:3
 msgid "Copy the selected folder into another folder"
 msgstr "複製已選定的資料夾到另一個資料夾"
 
-# ui/evolution-mail.xml.h:16
 #: ../ui/evolution-mail-global.xml.h:4
 msgid "Create a new folder for storing mail"
 msgstr "建立一個新資料夾以儲存郵件"
 
-# ui/evolution-mail.xml.h:21
 #: ../ui/evolution-mail-global.xml.h:5
 msgid "Create or edit Search Folder definitions"
 msgstr "建立或編輯搜尋資料夾的定義"
 
-# ui/evolution-mail.xml.h:20
 #: ../ui/evolution-mail-global.xml.h:6
 msgid "Create or edit rules for filtering new mail"
 msgstr "為新郵件建立或編輯過濾規則"
 
 #: ../ui/evolution-mail-global.xml.h:7
 msgid "Empty _Trash"
-msgstr "清空垃圾桶(_T)"
+msgstr "清空回收筒(_T)"
 
 #: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:11
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "資料夾(_O)"
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-mail-global.xml.h:9
 msgid "Move the selected folder into another folder"
 msgstr "將選定的資料夾移至另一個資料夾"
 
-# ui/evolution-mail.xml.h:61
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-global.xml.h:11
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-# mail/mail-account-gui.c:682
 #: ../ui/evolution-mail-global.xml.h:12
 msgid "Search F_olders"
 msgstr "搜尋資料夾(_O)"
@@ -21175,29 +18823,22 @@ msgstr "搜尋資料夾(_O)"
 msgid "Show Message _Preview"
 msgstr "顯示郵件預覽(_P)"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-global.xml.h:14
 msgid "Show message preview below the message list"
 msgstr "在郵件清單下方顯示郵件預覽"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-global.xml.h:15
 msgid "Show message preview side-by-side with the message list"
 msgstr "在郵件清單旁顯示郵件預覽"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-global.xml.h:16
 msgid "Show message preview window"
 msgstr "顯示郵件預覽視窗"
 
-# ui/evolution-mail.xml.h:90
 #: ../ui/evolution-mail-global.xml.h:17
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "訂閱或取消訂閱在遠端伺服器的資料夾"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:5
-# calendar/gui/e-calendar-table.c:151
-# calendar/gui/event-editor-dialog.glade.h:6
 #: ../ui/evolution-mail-global.xml.h:18
 msgid "_Classic View"
 msgstr "傳統檢視(_C)"
@@ -21218,7 +18859,6 @@ msgstr "移動資料夾到(_M)..."
 msgid "_New..."
 msgstr "新增(_N)..."
 
-# addressbook/printing/e-contact-print.glade.h:30
 #: ../ui/evolution-mail-global.xml.h:23
 msgid "_Preview"
 msgstr "預覽(_P)"
@@ -21230,17 +18870,14 @@ msgstr "預覽(_P)"
 msgid "_Subscriptions"
 msgstr "訂閱(_S)"
 
-# calendar/gui/e-calendar-table.c:156
 #: ../ui/evolution-mail-global.xml.h:28
 msgid "_Vertical View"
 msgstr "垂直檢視(_V)"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution-mail-list.xml.h:1
 msgid "Change the name of this folder"
 msgstr "變更這個資料夾的名稱"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution-mail-list.xml.h:2
 msgid "Change the properties of this folder"
 msgstr "變更這個資料夾的屬性"
@@ -21249,18 +18886,14 @@ msgstr "變更這個資料夾的屬性"
 msgid "Collapse All _Threads"
 msgstr "收摺所有相關郵件(_T)"
 
-# ui/evolution-mail.xml.h:51
 #: ../ui/evolution-mail-list.xml.h:4
 msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-list.xml.h:5
 msgid "Copy selected message(s) to the clipboard"
 msgstr "複製已選定的郵件到剪貼簿"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-list.xml.h:7
 msgid "Cut selected message(s) to the clipboard"
@@ -21274,7 +18907,6 @@ msgstr "展開所有相關郵件(_X)"
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
-# ui/evolution-mail.xml.h:51
 #: ../ui/evolution-mail-list.xml.h:10
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
@@ -21291,7 +18923,6 @@ msgstr "隱藏已刪除郵件(_D)"
 msgid "Hide _Read Messages"
 msgstr "隱藏已閱讀的郵件(_R)"
 
-# ui/evolution-mail.xml.h:45
 #: ../ui/evolution-mail-list.xml.h:15
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
@@ -21301,18 +18932,14 @@ msgstr "隱藏已刪除的郵件而非將它們以刪除線的形式顯示"
 msgid "Mar_k All Messages as Read"
 msgstr "標示所有郵件為已閱讀(_K)"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-mail-list.xml.h:17
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
-# ui/evolution-mail.xml.h:62
 #: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
-# ui/evolution-mail.xml.h:62
 #: ../ui/evolution-mail-list.xml.h:19
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
@@ -21321,22 +18948,18 @@ msgstr "永久移除這個資料夾"
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
-# ui/evolution-mail.xml.h:80
 #: ../ui/evolution-mail-list.xml.h:21
 msgid "Select _All Messages"
 msgstr "選擇全部的郵件(_A)"
 
-# ui/evolution-mail.xml.h:78
 #: ../ui/evolution-mail-list.xml.h:22
 msgid "Select all and only the messages that are not currently selected"
 msgstr "選擇全部目前未選定的郵件"
 
-# ui/evolution-mail.xml.h:79
 #: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all messages in the same thread as the selected message"
 msgstr "選擇所有相關的郵件為選定的郵件"
 
-# ui/evolution-mail.xml.h:80
 #: ../ui/evolution-mail-list.xml.h:24
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
@@ -21345,22 +18968,18 @@ msgstr "選擇全部可見的郵件"
 msgid "Show Hidde_n Messages"
 msgstr "顯示隱藏的郵件(_N)"
 
-# ui/evolution-mail.xml.h:88
 #: ../ui/evolution-mail-list.xml.h:26
 msgid "Show messages that have been temporarily hidden"
 msgstr "顯示暫時隱藏的郵件"
 
-# ui/evolution-mail.xml.h:91
 #: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide all messages that have already been read"
 msgstr "將已閱讀的郵件暫時隱藏"
 
-# ui/evolution-mail.xml.h:92
 #: ../ui/evolution-mail-list.xml.h:28
 msgid "Temporarily hide the selected messages"
 msgstr "將選定的郵件暫時隱藏"
 
-# ui/evolution-mail.xml.h:93
 #: ../ui/evolution-mail-list.xml.h:29
 msgid "Threaded Message list"
 msgstr "相關郵件清單"
@@ -21382,7 +19001,6 @@ msgstr "加入寄件者到目錄服務(_D)"
 msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
-# addressbook/gui/component/addressbook-config.c:662
 #. Alphabetical by name, yo
 #: ../ui/evolution-mail-message.xml.h:4
 msgid "Add Sender to Address Book"
@@ -21392,7 +19010,6 @@ msgstr "新增寄件者至通訊錄"
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
-# ui/evolution-mail.xml.h:1
 #: ../ui/evolution-mail-message.xml.h:6
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
@@ -21405,78 +19022,62 @@ msgstr "檢查垃圾郵件(_J)"
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
-# ui/evolution-mail.xml.h:6
 #: ../ui/evolution-mail-message.xml.h:9
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "撰寫回郵給所選定的郵件的全部收件者"
 
-# ui/evolution-mail.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "撰寫回郵給所選定郵件的通信論壇"
 
-# ui/evolution-mail.xml.h:7
 #: ../ui/evolution-mail-message.xml.h:11
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
-# ui/evolution-mail.xml.h:9
 #: ../ui/evolution-mail-message.xml.h:13
 msgid "Copy selected messages to the clipboard"
 msgstr "複製已選定的郵件到剪貼簿"
 
-# ui/evolution.xml.h:10
 #: ../ui/evolution-mail-message.xml.h:14
 msgid "Create R_ule"
 msgstr "建立規則(_U)"
 
-# ui/evolution-mail.xml.h:15
 #: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:16
 #: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:17
 #: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:18
 #: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a Search Folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
-# ui/evolution-mail.xml.h:11
 #: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
-# ui/evolution-mail.xml.h:12
 #: ../ui/evolution-mail-message.xml.h:20
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
-# ui/evolution-mail.xml.h:13
 #: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "為這個通信論壇建立過濾器規則"
 
-# ui/evolution-mail.xml.h:14
 #: ../ui/evolution-mail-message.xml.h:22
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-mail-message.xml.h:23
 msgid "Cut selected messages to the clipboard"
 msgstr "將郵件剪下並貼到剪貼簿"
@@ -21485,37 +19086,30 @@ msgstr "將郵件剪下並貼到剪貼簿"
 msgid "Decrease the text size"
 msgstr "減少文字大小"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next thread"
 msgstr "顯示下一封相關郵件"
 
-# ui/evolution-mail.xml.h:23
 #: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
-# ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
-# ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
-# ui/evolution-mail.xml.h:24
 #: ../ui/evolution-mail-message.xml.h:32
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
@@ -21540,12 +19134,10 @@ msgstr "收件者過濾器(_R)..."
 msgid "Filter on _Subject..."
 msgstr "主旨過濾器(_S)..."
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:38
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:39
 msgid "Flag selected messages for follow-up"
 msgstr "將選定的郵件加上跟隨標幟"
@@ -21554,32 +19146,26 @@ msgstr "將選定的郵件加上跟隨標幟"
 msgid "Follow _Up..."
 msgstr "跟隨(_U)..."
 
-# ui/evolution-mail.xml.h:30
 #: ../ui/evolution-mail-message.xml.h:41
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
-# ui/evolution-mail.xml.h:38
 #: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message in the body of a new message"
 msgstr "將需要轉寄的郵件夾附於新郵件的內文中"
 
-# ui/evolution-mail.xml.h:39
 #: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
-# ui/evolution-mail.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:45
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
-# ui/evolution-mail.xml.h:41
 #: ../ui/evolution-mail-message.xml.h:46
 msgid "Forward the selected message to someone as an attachment"
 msgstr "將選定的郵件以附加檔案形式轉寄給某人"
 
-# ui/evolution-message-composer.xml.h:10
 #: ../ui/evolution-mail-message.xml.h:47
 msgid "Increase the text size"
 msgstr "增加文字大小"
@@ -21588,42 +19174,34 @@ msgstr "增加文字大小"
 msgid "Mar_k as"
 msgstr "標示成(_K)"
 
-# ui/evolution-mail.xml.h:52
 #: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected messages as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages as important"
 msgstr "將選定的郵件標示成重要"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected messages as junk"
 msgstr "將選定的郵件標示成垃圾郵件"
 
-# ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected messages as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
-# ui/evolution-mail.xml.h:53
 #: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected messages as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
-# ui/evolution-mail.xml.h:54
 #: ../ui/evolution-mail-message.xml.h:56
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
-# ui/evolution-mail.xml.h:56
 #: ../ui/evolution-mail-message.xml.h:57
 msgid "Move selected messages to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
@@ -21640,22 +19218,18 @@ msgstr "下一封相關郵件(_T)"
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
-# calendar/gui/calendar-commands.c:266
 #: ../ui/evolution-mail-message.xml.h:62
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
-# ui/evolution-mail.xml.h:58
 #: ../ui/evolution-mail-message.xml.h:63
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
-# ui/evolution-mail.xml.h:59
 #: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected messages in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
-# ui/evolution-mail.xml.h:60
 #: ../ui/evolution-mail-message.xml.h:65
 msgid "Open the selected messages in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件以便編輯"
@@ -21664,13 +19238,10 @@ msgstr "在撰寫視窗開啟選取的郵件以便編輯"
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-mail-message.xml.h:67
 msgid "Paste messages from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
-# mail/mail-ops.c:825
 #: ../ui/evolution-mail-message.xml.h:68
 msgid "Pos_t New Message to Folder"
 msgstr "張貼新郵件到資料夾(_T)"
@@ -21679,12 +19250,10 @@ msgstr "張貼新郵件到資料夾(_T)"
 msgid "Post a Repl_y"
 msgstr "張貼回覆(_Y)"
 
-# mail/mail-ops.c:825
 #: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a message to a Public folder"
 msgstr "張貼新郵件到公開資料夾"
 
-# ui/evolution-message-composer.xml.h:25
 #: ../ui/evolution-mail-message.xml.h:71
 msgid "Post a reply to a message in a Public folder"
 msgstr "張貼郵件的回覆至公開資料夾"
@@ -21693,13 +19262,12 @@ msgstr "張貼郵件的回覆至公開資料夾"
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
-# ui/evolution-addressbook.xml.h:8
-# ui/evolution-mail.xml.h:63
+# zh_HK: msgstr "預覽需要打印的郵件"
 #: ../ui/evolution-mail-message.xml.h:73
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印郵件"
 #: ../ui/evolution-mail-message.xml.h:77
 msgid "Print this message"
 msgstr "列印郵件"
@@ -21708,7 +19276,6 @@ msgstr "列印郵件"
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
-# ui/evolution-mail.xml.h:40
 #: ../ui/evolution-mail-message.xml.h:79
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
@@ -21717,73 +19284,58 @@ msgstr "將選定的郵件重新導向給某人"
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
-# ui/evolution-mail.xml.h:74
 #: ../ui/evolution-mail-message.xml.h:85
 msgid "Save the selected messages as a text file"
 msgstr "將選定的郵件另存成文字檔案"
 
-# ui/evolution-mail.xml.h:95
 #: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
-# ui/evolution-mail.xml.h:97
 #: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from Recipients..."
 msgstr "收件者搜尋資料夾..."
 
-# ui/evolution-mail.xml.h:98
 #: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
-# ui/evolution-mail.xml.h:96
 #: ../ui/evolution-mail-message.xml.h:89
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
-# ui/evolution-mail.xml.h:75
 #: ../ui/evolution-mail-message.xml.h:90
 msgid "Search for text in the body of the displayed message"
 msgstr "搜尋顯示的郵件本文中的文字"
 
-# ui/evolution-addressbook.xml.h:15
 #: ../ui/evolution-mail-message.xml.h:91
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
-# ui/evolution-mail.xml.h:80
 #: ../ui/evolution-mail-message.xml.h:92
 msgid "Select all the text in a message"
 msgstr "選擇郵件中的所有文字"
 
-# ui/evolution-event-editor.xml.h:50
-# ui/evolution-task-editor-dialog.xml.h:59
 #: ../ui/evolution-mail-message.xml.h:93
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
-# ui/evolution-mail.xml.h:75
 #: ../ui/evolution-mail-message.xml.h:94
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "在顯示的郵件內文中顯示閃爍游標"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-mail-message.xml.h:95
 msgid "Show messages in the normal style"
 msgstr "使用正常模式顯示郵件"
 
-# ui/evolution-mail.xml.h:87
 #: ../ui/evolution-mail-message.xml.h:96
 msgid "Show messages with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
-# ui/evolution-mail.xml.h:89
 #: ../ui/evolution-mail-message.xml.h:97
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
-# ui/evolution-mail.xml.h:94
 #: ../ui/evolution-mail-message.xml.h:98
 msgid "Undelete the selected messages"
 msgstr "取消刪除選定的郵件"
@@ -21796,7 +19348,6 @@ msgstr "不重要(_M)"
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-# ui/evolution-message-composer.xml.h:1
 #: ../ui/evolution-mail-message.xml.h:101
 msgid "_Attached"
 msgstr "附件(_A)"
@@ -21813,7 +19364,6 @@ msgstr "清除標幟(_C)"
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
-# mail/mail-search.c:268
 #: ../ui/evolution-mail-message.xml.h:108
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)..."
@@ -21830,12 +19380,10 @@ msgstr "移至(_G)"
 msgid "_Important"
 msgstr "重要(_I)"
 
-# mail/mail-config.glade.h:37
 #: ../ui/evolution-mail-message.xml.h:113
 msgid "_Inline"
 msgstr "行內(_I)"
 
-# calendar/gui/goto-dialog.glade.h:9
 #: ../ui/evolution-mail-message.xml.h:114
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
@@ -21856,7 +19404,6 @@ msgstr "下一封郵件(_N)"
 msgid "_Normal Size"
 msgstr "一般大小(_N)"
 
-# calendar/gui/calendar-commands.c:266
 #: ../ui/evolution-mail-message.xml.h:121
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
@@ -21869,12 +19416,10 @@ msgstr "在新視窗開啟(_O)"
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
-# mail/mail-config.glade.h:56
 #: ../ui/evolution-mail-message.xml.h:125
 msgid "_Quoted"
 msgstr "引文(_Q)"
 
-# mail/mail-callbacks.c:1188
 #: ../ui/evolution-mail-message.xml.h:128
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
@@ -21895,65 +19440,52 @@ msgstr "縮放(_Z)"
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
-# ui/evolution.xml.h:6
 #: ../ui/evolution-mail-messagedisplay.xml.h:2 ../ui/evolution.xml.h:4
 msgid "Close this window"
 msgstr "關閉這個視窗"
 
-# ui/evolution.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "主工具列"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:3
 msgid "Copy selected memo"
 msgstr "複製選定的備忘錄"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:5
 msgid "Cut selected memo"
 msgstr "剪下選定的備忘錄"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:7
 msgid "Delete selected memos"
 msgstr "刪除選定的備忘錄"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-memos.xml.h:9
 msgid "Paste memo from the clipboard"
 msgstr "從剪貼簿貼上備忘錄"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的備忘錄清單"
 #: ../ui/evolution-memos.xml.h:10
 msgid "Previews the list of memos to be printed"
 msgstr "預覽將要列印的備忘錄清單"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印備忘錄清單"
 #: ../ui/evolution-memos.xml.h:13
 msgid "Print the list of memos"
 msgstr "列印備忘錄清單"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-memos.xml.h:14
 msgid "View the selected memo"
 msgstr "檢視選取的備忘錄"
 
-# ui/evolution-mail.xml.h:114
 #: ../ui/evolution-memos.xml.h:18
 msgid "_Open Memo"
 msgstr "開啟備忘錄(_O)"
 
-# composer/e-msg-composer-attachment-bar.c:421
-# ui/evolution-message-composer.xml.h:2
 #: ../ui/evolution-message-composer.xml.h:2
 msgid "Attach a file"
 msgstr "附加檔案"
 
-# ui/evolution-message-composer.xml.h:4
-# ui/evolution-task-editor-dialog.xml.h:12
 #.
 #. <cmd name="FileSave" _label="Save"
 #. _tip="Save the current file" pixtype="stock" pixname="Save"
@@ -21964,17 +19496,14 @@ msgstr "附加檔案"
 msgid "Close the current file"
 msgstr "關閉目前檔案"
 
-# calendar/gui/e-day-view.c:3179
 #: ../ui/evolution-message-composer.xml.h:5
 msgid "Delete all but signature"
 msgstr "刪除簽名檔以外的全部事件"
 
-# ui/evolution-message-composer.xml.h:5
 #: ../ui/evolution-message-composer.xml.h:6
 msgid "Encrypt this message with PGP"
 msgstr "使用 PGP 將這封郵件加密"
 
-# ui/evolution-message-composer.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:7
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME 加密憑證將這封郵件加密"
@@ -21992,17 +19521,14 @@ msgstr "在您的郵件被閱讀時取得送信通知"
 msgid "HT_ML"
 msgstr "HT_ML"
 
-# ui/evolution-message-composer.xml.h:12
 #: ../ui/evolution-message-composer.xml.h:13
 msgid "Open a file"
 msgstr "開啟舊檔"
 
-# ui/evolution-message-composer.xml.h:13
 #: ../ui/evolution-message-composer.xml.h:14
 msgid "PGP Encrypt"
 msgstr "PGP 加密"
 
-# ui/evolution-message-composer.xml.h:14
 #: ../ui/evolution-message-composer.xml.h:15
 msgid "PGP Sign"
 msgstr "PGP 加簽"
@@ -22011,18 +19537,14 @@ msgstr "PGP 加簽"
 msgid "R_equest Read Receipt"
 msgstr "要求讀信回條(_E)"
 
-# ui/evolution-message-composer.xml.h:15
 #: ../ui/evolution-message-composer.xml.h:17
 msgid "S/MIME Encrypt"
 msgstr "S/MIME 加密"
 
-# ui/evolution-message-composer.xml.h:16
 #: ../ui/evolution-message-composer.xml.h:18
 msgid "S/MIME Sign"
 msgstr "S/MIME 加簽"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
 #: ../ui/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "另存新檔"
@@ -22043,85 +19565,67 @@ msgstr "儲存草稿(_D)"
 msgid "Save as draft"
 msgstr "儲存為草稿"
 
-# ui/evolution-message-composer.xml.h:22
 #: ../ui/evolution-message-composer.xml.h:25
 msgid "Save in folder..."
 msgstr "儲存至資料夾..."
 
-# ui/evolution-event-editor.xml.h:44
-# ui/evolution-message-composer.xml.h:23
-# ui/evolution-task-editor-dialog.xml.h:53
 #: ../ui/evolution-message-composer.xml.h:26
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
-# ui/evolution-message-composer.xml.h:24
 #: ../ui/evolution-message-composer.xml.h:27
 msgid "Save the current file with a different name"
 msgstr "使用另一名稱儲存目前的檔案"
 
-# ui/evolution-message-composer.xml.h:25
 #: ../ui/evolution-message-composer.xml.h:28
 msgid "Save the message in a specified folder"
 msgstr "將郵件儲存至指定的資料夾"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../ui/evolution-message-composer.xml.h:29
 msgid "Send"
 msgstr "傳送"
 
-# ui/evolution-message-composer.xml.h:29
 #: ../ui/evolution-message-composer.xml.h:30
 #: ../ui/evolution-signature-editor.xml.h:23
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送郵件"
 
-# ui/evolution-message-composer.xml.h:31
 #: ../ui/evolution-message-composer.xml.h:31
 msgid "Send this message"
 msgstr "傳送這個郵件"
 
-# ui/evolution-mail.xml.h:74
 #: ../ui/evolution-message-composer.xml.h:32
 msgid "Set the message priority to high"
 msgstr "將郵件優先權設為「高」"
 
-# ui/evolution-message-composer.xml.h:35
 #: ../ui/evolution-message-composer.xml.h:33
 msgid "Sign this message with your PGP key"
-msgstr "用您的 PGP 鑰匙給郵件加上數位簽名"
+msgstr "用您的 PGP 金鑰為郵件加上數位簽章"
 
-# ui/evolution-message-composer.xml.h:36
 #: ../ui/evolution-message-composer.xml.h:34
 msgid "Sign this message with your S/MIME Signature Certificate"
-msgstr "用您的 S/MIME 簽名憑證給郵件加上數位簽名"
+msgstr "用您的 S/MIME 簽名憑證為郵件加上數位簽章"
 
-# ui/evolution-message-composer.xml.h:37
 #: ../ui/evolution-message-composer.xml.h:35
 msgid "Toggles whether the BCC field is displayed"
 msgstr "切換密件副本欄位的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:36
 msgid "Toggles whether the CC field is displayed"
 msgstr "切換副本欄位的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:39
 #: ../ui/evolution-message-composer.xml.h:37
 msgid "Toggles whether the From chooser is displayed"
 msgstr "切換寄件者選擇器的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:38
 msgid "Toggles whether the Post-To field is displayed"
 msgstr "切換是否顯示「張貼至」欄位"
 
-# ui/evolution-message-composer.xml.h:40
 #: ../ui/evolution-message-composer.xml.h:39
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "切換回覆欄位的顯示狀態"
 
-# ui/evolution-message-composer.xml.h:38
 #: ../ui/evolution-message-composer.xml.h:40
 msgid "Toggles whether the To field is displayed"
 msgstr "切換是否顯示「收件者」欄位"
@@ -22174,9 +19678,6 @@ msgstr "關閉(_L)"
 msgid "H_TML"
 msgstr "H_TML"
 
-# ui/evolution-contact-editor.xml.h:9
-# ui/evolution-event-editor.xml.h:42
-# ui/evolution-task-editor-dialog.xml.h:52
 #: ../ui/evolution-signature-editor.xml.h:17
 msgid "Save and Close"
 msgstr "儲存後關閉"
@@ -22188,37 +19689,30 @@ msgstr "儲存後關閉"
 msgid "Save and _Close"
 msgstr "儲存後關閉(_C)"
 
-# ui/evolution-contact-editor.xml.h:10
 #: ../ui/evolution-signature-editor.xml.h:22
 msgid "Save the current file and close the window"
 msgstr "儲存這個檔案並關閉視窗"
 
-# ui/evolution-subscribe.xml.h:1
 #: ../ui/evolution-subscribe.xml.h:1
 msgid "Add folder to your list of subscribed folders"
 msgstr "新增資料夾到已訂閱的資料夾清單"
 
-# ui/evolution-subscribe.xml.h:4
 #: ../ui/evolution-subscribe.xml.h:3
 msgid "Refresh List"
 msgstr "重整清單"
 
-# ui/evolution-subscribe.xml.h:5
 #: ../ui/evolution-subscribe.xml.h:4
 msgid "Refresh List of Folders"
 msgstr "重整資料夾的清單"
 
-# ui/evolution-subscribe.xml.h:6
 #: ../ui/evolution-subscribe.xml.h:5
 msgid "Remove folder from your list of subscribed folders"
 msgstr "從已訂閱的資料夾清單內將資料夾移除"
 
-# ui/evolution-subscribe.xml.h:8
 #: ../ui/evolution-subscribe.xml.h:7
 msgid "Subscribe"
 msgstr "訂閱"
 
-# ui/evolution-subscribe.xml.h:9
 #: ../ui/evolution-subscribe.xml.h:8
 msgid "Unsubscribe"
 msgstr "取消訂閱"
@@ -22229,44 +19723,36 @@ msgstr "反向選擇(_I)"
 
 #: ../ui/evolution-task-editor.xml.h:4
 msgid "Click change / view the status details of the task"
-msgstr "按這裡以改變/檢視該工作的詳細狀態資訊"
+msgstr "按這裡改變/檢視該工作的詳細狀態資料"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
 msgstr "狀態詳細資料"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
 msgstr "時區"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: ../ui/evolution-task-editor.xml.h:23
 msgid "_Send Options"
 msgstr "傳送選項(_S)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
 #: ../ui/evolution-task-editor.xml.h:24
 msgid "_Status Details"
 msgstr "狀態詳細資料(_S)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:3
 msgid "Copy selected tasks"
 msgstr "複製選定的工作"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:5
 msgid "Cut selected tasks"
 msgstr "剪下選定的工作"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:7
 msgid "Delete completed tasks"
 msgstr "刪除已完成的工作"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:8
 msgid "Delete selected tasks"
 msgstr "刪除選定的工作"
@@ -22275,28 +19761,24 @@ msgstr "刪除選定的工作"
 msgid "Mar_k as Complete"
 msgstr "標示為完成(_K)"
 
-# calendar/gui/e-calendar-table.c:713
 #: ../ui/evolution-tasks.xml.h:10
 msgid "Mark selected tasks as complete"
 msgstr "將選取的工作標示成完成"
 
-# ui/evolution-event-editor.xml.h:31
-# ui/evolution-task-editor-dialog.xml.h:34
 #: ../ui/evolution-tasks.xml.h:12
 msgid "Paste tasks from the clipboard"
 msgstr "貼上剪貼簿上的工作"
 
-# ui/evolution-calendar.xml.h:22
+# zh_HK: msgstr "預覽將要打印的工作清單"
 #: ../ui/evolution-tasks.xml.h:13
 msgid "Previews the list of tasks to be printed"
 msgstr "預覽將要列印的工作清單"
 
-# mail/mail-callbacks.c:1407
+# zh_HK: msgstr "打印工作清單"
 #: ../ui/evolution-tasks.xml.h:16
 msgid "Print the list of tasks"
 msgstr "列印工作清單"
 
-# ui/evolution-mail.xml.h:86
 #: ../ui/evolution-tasks.xml.h:18
 msgid "Show task preview window"
 msgstr "顯示連絡人預覽視窗"
@@ -22305,7 +19787,6 @@ msgstr "顯示連絡人預覽視窗"
 msgid "Task _Preview"
 msgstr "工作預覽(_P)"
 
-# calendar/gui/e-calendar-table.c:714
 #: ../ui/evolution-tasks.xml.h:20
 msgid "View the selected task"
 msgstr "檢視選取的工作"
@@ -22314,22 +19795,18 @@ msgstr "檢視選取的工作"
 msgid "_Open Task"
 msgstr "開啟工作(_O)"
 
-# ui/evolution.xml.h:1
 #: ../ui/evolution.xml.h:1
 msgid "About Evolution..."
 msgstr "關於 Evolution..."
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
 #: ../ui/evolution.xml.h:2
 msgid "Change Evolution's settings"
 msgstr "改變 Evolution 的設定值"
 
-# ui/evolution-mail.xml.h:4
 #: ../ui/evolution.xml.h:3
 msgid "Change the visibility of the toolbar"
 msgstr "變更工具列的可見性"
 
-# ui/evolution.xml.h:10
 #: ../ui/evolution.xml.h:5
 msgid "Create a new window displaying this folder"
 msgstr "建立一個新的視窗來顯示這個資料夾"
@@ -22350,12 +19827,10 @@ msgstr "只顯示視窗按鈕的圖示"
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-# ui/evolution.xml.h:19
 #: ../ui/evolution.xml.h:10
 msgid "Exit the program"
 msgstr "離開這個程式"
 
-# ui/evolution-mail.xml.h:32
 #: ../ui/evolution.xml.h:11
 msgid "Forget remembered passwords so you will be prompted for them again"
 msgstr "刪除已記錄的密碼以便可再重新輸入"
@@ -22384,27 +19859,22 @@ msgstr "佈局(_O)"
 msgid "New _Window"
 msgstr "開新視窗(_W)"
 
-# calendar/gui/event-editor-dialog.glade.h:13
 #: ../ui/evolution.xml.h:19
 msgid "Prefere_nces"
 msgstr "偏好設定(_N)"
 
-# ui/evolution-mail.xml.h:81
 #: ../ui/evolution.xml.h:20
 msgid "Send / Receive"
 msgstr "傳送/接收"
 
-# ui/evolution-mail.xml.h:81
 #: ../ui/evolution.xml.h:21
 msgid "Send / _Receive"
 msgstr "傳送/接收(_R)"
 
-# ui/evolution-mail.xml.h:82
 #: ../ui/evolution.xml.h:22
 msgid "Send queued items and retrieve new items"
 msgstr "傳送待送的項目並接收新的項目"
 
-# mail/mail-config.glade.h:40
 #: ../ui/evolution.xml.h:23
 msgid "Set up Pilot configuration"
 msgstr "設定 Pilot 組態"
@@ -22417,17 +19887,14 @@ msgstr "顯示側邊欄(_B)"
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-# ui/evolution.xml.h:22
 #: ../ui/evolution.xml.h:26
 msgid "Show _Toolbar"
 msgstr "顯示工具列(_T)"
 
-# ui/evolution.xml.h:27
 #: ../ui/evolution.xml.h:27
 msgid "Show information about Evolution"
 msgstr "顯示 Evolution 相關資訊"
 
-# ui/evolution.xml.h:28
 #: ../ui/evolution.xml.h:28
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
@@ -22440,12 +19907,10 @@ msgstr "傳送錯誤報告"
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
-# ui/evolution.xml.h:30
 #: ../ui/evolution.xml.h:34
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
-# ui/evolution.xml.h:34
 #: ../ui/evolution.xml.h:35
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
@@ -22466,7 +19931,6 @@ msgstr "顯示/隱藏狀態列"
 msgid "_About"
 msgstr "關於(_A)"
 
-# ui/evolution.xml.h:6
 #: ../ui/evolution.xml.h:40
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
@@ -22563,7 +20027,6 @@ msgstr "依主旨(_B)"
 msgid "By _Follow Up Flag"
 msgstr "依跟隨標幟(_F)"
 
-# ui/evolution-calendar.xml.h:35
 #: ../views/mail/galview.xml.h:7
 msgid "For _Wide View"
 msgstr "用於寬檢視(_W)"
@@ -22572,7 +20035,6 @@ msgstr "用於寬檢視(_W)"
 msgid "_Messages"
 msgstr "郵件(_M)"
 
-# calendar/gui/goto-dialog.glade.h:12
 #: ../views/memos/galview.xml.h:1
 msgid "_Memos"
 msgstr "備忘錄(_M)"
@@ -22594,7 +20056,6 @@ msgstr "設定狀態(_S)"
 msgid "UTC"
 msgstr "UTC"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "<b>Time Zones</b>"
 msgstr "<b>時區</b>"
@@ -22603,13 +20064,10 @@ msgstr "<b>時區</b>"
 msgid "<b>_Selection</b>"
 msgstr "<b>選擇(_S)</b>"
 
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:4
 msgid "Select a Time Zone"
 msgstr "選擇一個時區"
 
-# addressbook/backend/ebook/e-card.c:3434
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:5
 msgid "TimeZone Combobox"
 msgstr "時區組合式方塊 "
@@ -22628,20 +20086,17 @@ msgstr ""
 msgid "Collection"
 msgstr "收集"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-define-views-dialog.c:325
 #: ../widgets/menus/gal-define-views.glade.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "定義 %s 的檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-define-views-dialog.c:333
 #: ../widgets/menus/gal-define-views-dialog.c:335
 msgid "Define Views"
 msgstr "定義檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-define-views.glade.h:2
 #, no-c-format
 msgid "Define Views for \"%s\""
@@ -22658,18 +20113,14 @@ msgstr "編輯(_E)..."
 msgid "Table"
 msgstr "表格"
 
-# widgets/misc/e-filter-bar.h:97
-# widgets/misc/e-filter-bar.h:104
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:182
 msgid "Instance"
 msgstr "實體"
 
-# widgets/menus/gal-view-menus.c:176
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:232
 msgid "Save Current View"
 msgstr "儲存目前檢視"
 
-# ui/evolution-tasks.xml.h:2
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "_Create new view"
 msgstr "建立新的檢視(_C)"
@@ -22678,7 +20129,6 @@ msgstr "建立新的檢視(_C)"
 msgid "_Replace existing view"
 msgstr "置換現存的檢視(_R)"
 
-# widgets/menus/gal-view-menus.c:176
 #. bonobo displays this string so it must be in locale
 #: ../widgets/menus/gal-view-instance.c:587
 #: ../widgets/menus/gal-view-menus.c:350
@@ -22689,7 +20139,6 @@ msgstr "自訂檢視"
 msgid "Save Custom View"
 msgstr "儲存自訂檢視"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-view-instance.c:592
 #: ../widgets/menus/gal-view-menus.c:372
 msgid "Define Views..."
@@ -22707,7 +20156,6 @@ msgstr "儲存自訂檢視..."
 msgid "Factory"
 msgstr "工廠"
 
-# widgets/menus/gal-view-menus.c:202
 #: ../widgets/menus/gal-view-new-dialog.c:115
 msgid "Define New View"
 msgstr "定義新的檢視"
@@ -22728,23 +20176,18 @@ msgstr "檢視的類型:"
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
-# widgets/misc/e-calendar-item.c:422
 #. 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 "一二三四五六日"
 
-# widgets/misc/e-calendar-item.c:1061
-# widgets/misc/e-calendar-item.c:2756
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: ../widgets/misc/e-calendar-item.c:1093
 #: ../widgets/misc/e-calendar-item.c:1746
 msgid "%B %Y"
-msgstr "%B %Y"
+msgstr "%Y 年 %-m 月"
 
-# calendar/gui/calendar-summary.c:721
-# calendar/gui/e-itip-control.glade.h:7
 #: ../widgets/misc/e-calendar.c:226
 msgid "Month Calendar"
 msgstr "月行事曆"
@@ -22808,25 +20251,20 @@ msgstr "最小寬度"
 msgid "Minimum Width"
 msgstr "最小寬度"
 
-# ui/evolution-message-composer.xml.h:26
 #: ../widgets/misc/e-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:206
 msgid "Spacing"
 msgstr "間距"
 
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
 #: ../widgets/misc/e-cell-date-edit.c:233
 msgid "Now"
 msgstr "現在"
 
-# widgets/misc/e-cell-date-edit.c:726
 #: ../widgets/misc/e-cell-date-edit.c:793
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "時間必須為此格式：%s"
 
-# calendar/gui/calendar-model.c:1010
 #: ../widgets/misc/e-cell-percent.c:76
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "數值必須是由 0 到 100 的數字"
@@ -22863,7 +20301,6 @@ msgstr "日文"
 msgid "Korean"
 msgstr "韓文"
 
-# calendar/gui/print.c:362
 #: ../widgets/misc/e-charset-picker.c:72
 msgid "Thai"
 msgstr "泰文"
@@ -22884,7 +20321,6 @@ msgstr "西歐語系"
 msgid "Western European, New"
 msgstr "西歐語系，新"
 
-# camel/providers/smtp/camel-smtp-transport.c:206
 #: ../widgets/misc/e-charset-picker.c:93 ../widgets/misc/e-charset-picker.c:94
 #: ../widgets/misc/e-charset-picker.c:95
 msgid "Traditional"
@@ -22903,23 +20339,19 @@ msgstr "烏克蘭語"
 msgid "Visual"
 msgstr "視覺"
 
-# mail/mail-config.glade.h:22
 #: ../widgets/misc/e-charset-picker.c:174
 #, c-format
 msgid "Unknown character set: %s"
-msgstr "不明的字集：%s"
+msgstr "不明的字元集：%s"
 
 #: ../widgets/misc/e-charset-picker.c:219
 msgid "Character Encoding"
 msgstr "字元編碼"
 
-# mail/mail-config.glade.h:22
 #: ../widgets/misc/e-charset-picker.c:234
 msgid "Enter the character set to use"
-msgstr "輸入要使用的字集"
+msgstr "輸入要使用的字元集"
 
-# addressbook/contact-editor/e-contact-editor.c:1254
-# addressbook/contact-editor/e-contact-editor.c:1312
 #: ../widgets/misc/e-charset-picker.c:341
 msgid "Other..."
 msgstr "其它..."
@@ -22928,13 +20360,10 @@ msgstr "其它..."
 msgid "Ch_aracter Encoding"
 msgstr "字元編碼(_A)"
 
-# widgets/misc/e-clipped-label.c:112
 #: ../widgets/misc/e-clipped-label.c:111
 msgid "..."
 msgstr "..."
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:7
-# calendar/gui/event-editor-dialog.glade.h:8
 #: ../widgets/misc/e-dateedit.c:321
 msgid "Date and Time"
 msgstr "日期與時刻"
@@ -22955,8 +20384,6 @@ msgstr "用以選擇時刻的組合式方塊"
 msgid "Time"
 msgstr "時間"
 
-# widgets/misc/e-cell-date-edit.c:221
-# widgets/misc/e-dateedit.c:418
 #: ../widgets/misc/e-dateedit.c:461
 msgid "No_w"
 msgstr "現在(_W)"
@@ -22965,25 +20392,16 @@ msgstr "現在(_W)"
 msgid "_Today"
 msgstr "今天(_T)"
 
-# e-util/e-time-utils.c:312
-# widgets/misc/e-dateedit.c:1259
-# widgets/misc/e-dateedit.c:1318
-# widgets/misc/e-dateedit.c:1497
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
 #: ../widgets/misc/e-dateedit.c:1438 ../widgets/misc/e-dateedit.c:1765
 msgid "%H:%M"
 msgstr "%H:%M"
 
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
 #: ../widgets/misc/e-dateedit.c:1441 ../widgets/misc/e-dateedit.c:1768
 msgid "%I:%M %p"
-msgstr "%I:%M %p"
+msgstr "%p %I:%M"
 
-# ui/evolution-mail.xml.h:104
 #: ../widgets/misc/e-expander.c:182
 msgid "Expanded"
 msgstr "展開"
@@ -22996,9 +20414,6 @@ msgstr "是否打開展開器"
 msgid "Text of the expander's label"
 msgstr "展開器標籤的文字"
 
-# calendar/gui/calendar-model.c:1064
-# calendar/gui/dialogs/task-editor-dialog.glade.h:22
-# calendar/gui/e-calendar-table.c:348
 #: ../widgets/misc/e-expander.c:198
 msgid "Use underline"
 msgstr "使用底線"
@@ -23037,13 +20452,11 @@ msgstr "指示器間距"
 msgid "Spacing around expander arrow"
 msgstr "展開器箭頭周圍的間距"
 
-# widgets/misc/e-filter-bar.c:239
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:164
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
-# widgets/misc/e-filter-bar.c:168
 #. FIXME: get the toplevel window...
 #: ../widgets/misc/e-filter-bar.c:213
 msgid "Save Search"
@@ -23065,12 +20478,10 @@ msgstr "儲存搜尋結果(_S)..."
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
-# widgets/misc/e-filter-bar.c:239
 #: ../widgets/misc/e-filter-bar.h:102 ../widgets/misc/e-filter-bar.h:113
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
-# mail/mail-config.glade.h:6
 #: ../widgets/misc/e-filter-bar.h:103
 msgid "All Accounts"
 msgstr "所有的帳號"
@@ -23079,22 +20490,18 @@ msgstr "所有的帳號"
 msgid "Current Account"
 msgstr "目前的帳號"
 
-# ui/evolution.xml.h:10
 #: ../widgets/misc/e-filter-bar.h:105
 msgid "Current Folder"
 msgstr "目前的資料夾"
 
-# ui/evolution-mail.xml.h:114
 #: ../widgets/misc/e-filter-bar.h:106
 msgid "Current Message"
 msgstr "目前的郵件"
 
-# ui/evolution-message-composer.xml.h:12
 #: ../widgets/misc/e-image-chooser.c:172
 msgid "Choose Image"
 msgstr "選擇影像"
 
-# addressbook/contact-editor/fulladdr.glade.h:5
 #: ../widgets/misc/e-map.c:629
 msgid "World Map"
 msgstr "世界地圖"
@@ -23103,9 +20510,7 @@ msgstr "世界地圖"
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should select the timezone from the below combo box instead."
-msgstr ""
-"用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選"
-"擇時區。"
+msgstr "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選擇時區。"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -23115,12 +20520,10 @@ msgstr "同步對象:"
 msgid "Sync Private Records:"
 msgstr "同步私人記錄:"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../widgets/misc/e-pilot-settings.c:120
 msgid "Sync Categories:"
 msgstr "同步分類:"
 
-# mail/mail-ops.c:603
 #: ../widgets/misc/e-reflow.c:1451 ../widgets/misc/e-reflow.c:1452
 msgid "Empty message"
 msgstr "空白郵件"
@@ -23167,7 +20570,6 @@ msgstr "顯示(_W):"
 msgid "Sear_ch: "
 msgstr "搜尋(_C):"
 
-# ui/evolution-message-composer.xml.h:26
 #. 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:951
@@ -23184,7 +20586,6 @@ msgstr "游標列"
 msgid "Cursor Column"
 msgstr "游標欄"
 
-# mail/message-list.c:1081
 #: ../widgets/misc/e-selection-model.c:214
 msgid "Sorter"
 msgstr "分類器"
@@ -23201,38 +20602,26 @@ msgstr "游標模式"
 msgid "When de_leted:"
 msgstr "刪除時(_L):"
 
-# addressbook/gui/component/addressbook-config.c:689
-# calendar/gui/e-itip-control.glade.h:6
-# composer/e-msg-composer-attachment.glade.h:3
 #: ../widgets/misc/e-send-options.glade.h:1
 msgid "<b>Delivery Options</b>"
 msgstr "<b>遞送選項</b>"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
 #: ../widgets/misc/e-send-options.glade.h:2
 msgid "<b>Replies</b>"
 msgstr "<b>回覆</b>"
 
-# mail/mail-config.glade.h:10
 #: ../widgets/misc/e-send-options.glade.h:3
 msgid "<b>Return Notification</b>"
 msgstr "<b>返回通知</b>"
 
-# addressbook/gui/search/e-addressbook-search-dialog.c:158
-# mail/mail-search.c:242
 #: ../widgets/misc/e-send-options.glade.h:4
 msgid "<b>Status Tracking</b>"
 msgstr "<b>狀態追蹤</b>"
 
-# ui/evolution-contact-editor.xml.h:2
 #: ../widgets/misc/e-send-options.glade.h:5
 msgid "A_uto-delete sent item"
 msgstr "自動刪除項目(_U)"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:5
-# calendar/gui/e-calendar-table.c:151
-# calendar/gui/event-editor-dialog.glade.h:6
 #: ../widgets/misc/e-send-options.glade.h:6
 msgid "Classification"
 msgstr "分類"
@@ -23245,7 +20634,6 @@ msgstr "建立新的傳送項目至追蹤資訊(_E)"
 msgid "Deli_vered and opened"
 msgstr "已遞送與已開啟(_V)"
 
-# addressbook/printing/e-contact-print.glade.h:23
 #: ../widgets/misc/e-send-options.glade.h:9
 msgid "Gene_ral Options"
 msgstr "一般選項(_R)"
@@ -23274,8 +20662,6 @@ msgstr ""
 "極機密\n"
 "只有您能看"
 
-# mail/message-browser.c:191
-# ui/evolution-mail.xml.h:71
 #: ../widgets/misc/e-send-options.glade.h:18
 msgid "R_eply requested"
 msgstr "要求回覆(_E)"
@@ -23300,42 +20686,30 @@ msgstr ""
 msgid "When acce_pted:"
 msgstr "當接受時(_P):"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:8
 #: ../widgets/misc/e-send-options.glade.h:26
 msgid "When co_mpleted:"
-msgstr "當完成時(_M)："
+msgstr "當完成時(_M):"
 
 #: ../widgets/misc/e-send-options.glade.h:27
 msgid "When decli_ned:"
 msgstr "當拒絕時(_N):"
 
-# addressbook/printing/e-contact-print.glade.h:41
 #: ../widgets/misc/e-send-options.glade.h:28
 msgid "Wi_thin"
 msgstr "於內(_T)"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/misc/e-send-options.glade.h:29
 msgid "_After:"
 msgstr "之後(_A):"
 
-# widgets/misc/e-messagebox.c:152
 #: ../widgets/misc/e-send-options.glade.h:30
 msgid "_All information"
 msgstr "全部資訊(_A)"
 
-# camel/providers/pop3/camel-pop3-provider.c:39
 #: ../widgets/misc/e-send-options.glade.h:31
 msgid "_Delay message delivery"
 msgstr "延遲郵件遞送(_D)"
 
-# addressbook/contact-editor/contact-editor.glade.h:23
-# mail/folder-browser.c:715
-# mail/mail-config.glade.h:85
-# ui/evolution-event-editor.xml.h:57
-# ui/evolution-mail.xml.h:103
-# ui/evolution-task-editor-dialog.xml.h:69
-# ui/evolution.xml.h:46
 #: ../widgets/misc/e-send-options.glade.h:32
 msgid "_Delivered"
 msgstr "已遞送(_D)"
@@ -23354,17 +20728,13 @@ msgstr "當有空時(_W)"
 
 #: ../widgets/misc/e-send-options.glade.h:37
 msgid "_When opened:"
-msgstr "當開啟時(_W):     "
+msgstr "當開啟時(_W):"
 
 #: ../widgets/misc/e-task-widget.c:208
 #, c-format
 msgid "%s (...)"
 msgstr "%s (...)"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../widgets/misc/e-task-widget.c:213
 #, c-format
 msgid "%s (%d%% complete)"
@@ -23378,17 +20748,14 @@ msgstr "按這裡以移至 URL"
 msgid "Edit Master Category List..."
 msgstr "編輯主分類清單..."
 
-# addressbook/contact-editor/e-contact-editor.c:603
 #: ../widgets/misc/gal-categories.glade.h:2
 msgid "Item(s) belong to these _categories:"
 msgstr "屬於這些分類的項目(_C):"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../widgets/misc/gal-categories.glade.h:3
 msgid "_Available Categories:"
 msgstr "可用的分類(_A):"
 
-# calendar/gui/e-calendar-table.c:150
 #: ../widgets/misc/gal-categories.glade.h:4
 msgid "categories"
 msgstr "分類"
@@ -23397,13 +20764,9 @@ msgstr "分類"
 msgid "popup list"
 msgstr "彈出式清單"
 
-# e-util/e-time-utils.c:320
-# widgets/misc/e-dateedit.c:1262
-# widgets/misc/e-dateedit.c:1321
-# widgets/misc/e-dateedit.c:1500
 #: ../widgets/table/e-cell-date.c:64
 msgid "%l:%M %p"
-msgstr "%l:%M %p"
+msgstr "%p %l:%M"
 
 #: ../widgets/table/e-cell-pixbuf.c:397
 msgid "Selected Column"
@@ -23413,7 +20776,6 @@ msgstr "選擇的欄"
 msgid "Focused Column"
 msgstr "聚焦的欄"
 
-# ui/evolution-addressbook.xml.h:11
 #: ../widgets/table/e-cell-pixbuf.c:411
 msgid "Unselected Column"
 msgstr "未選擇的欄"
@@ -23442,7 +20804,6 @@ msgstr "背景色彩欄"
 msgid "<- _Remove"
 msgstr "<-移除(_R)"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../widgets/table/e-table-config-no-group.glade.h:2
 #: ../widgets/table/e-table-config.glade.h:1
 msgid "A_vailable Fields:"
@@ -23468,14 +20829,13 @@ msgstr "遞減"
 #: ../widgets/table/e-table-config-no-group.glade.h:8
 #: ../widgets/table/e-table-config.glade.h:7
 msgid "Group Items By"
-msgstr "將項目群組化依"
+msgstr "將項目組成群組，依"
 
 #: ../widgets/table/e-table-config-no-group.glade.h:9
 #: ../widgets/table/e-table-config.glade.h:8
 msgid "Move _Down"
 msgstr "下移(_D)"
 
-# ui/evolution-mail.xml.h:55
 #: ../widgets/table/e-table-config-no-group.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:9
 msgid "Move _Up"
@@ -23501,16 +20861,11 @@ msgstr "顯示檢視中的欄位"
 msgid "Sort"
 msgstr "排序"
 
-# ui/evolution-contact-editor.xml.h:6
-# ui/evolution-event-editor.xml.h:37
-# ui/evolution-task-editor-dialog.xml.h:40
 #: ../widgets/table/e-table-config-no-group.glade.h:15
 #: ../widgets/table/e-table-config.glade.h:13
 msgid "Sort Items By"
 msgstr "排序項目依"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
 #: ../widgets/table/e-table-config-no-group.glade.h:16
 #: ../widgets/table/e-table-config.glade.h:14
 msgid "Then By"
@@ -23542,19 +20897,14 @@ msgstr "(遞增)"
 msgid "(Descending)"
 msgstr "(遞減)"
 
-# calendar/gui/calendar-model.c:638
-# calendar/gui/calendar-model.c:1176
-# calendar/gui/dialogs/task-editor-dialog.glade.h:14
-# calendar/gui/e-calendar-table.c:419
 #: ../widgets/table/e-table-config.c:314
 msgid "Not sorted"
 msgstr "未排序"
 
 #: ../widgets/table/e-table-config.c:355
 msgid "No grouping"
-msgstr "未群組"
+msgstr "未組成群組"
 
-# ui/evolution-message-composer.xml.h:47
 #: ../widgets/table/e-table-config.c:584
 msgid "Available Fields"
 msgstr "可用的欄位"
@@ -23581,13 +20931,10 @@ msgstr "DnD 碼"
 msgid "Full Header"
 msgstr "完整檔頭"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../widgets/table/e-table-field-chooser-dialog.c:126
 msgid "Add a column..."
 msgstr "加入一欄..."
 
-# addressbook/contact-editor/e-contact-quick-add.c:276
-# addressbook/gui/widgets/e-addressbook-view.c:700
 #: ../widgets/table/e-table-field-chooser.glade.h:1
 msgid "Field Chooser"
 msgstr "欄位選擇程式"
@@ -23605,16 +20952,14 @@ msgstr ""
 msgid "%s : %s (%d item)"
 msgid_plural "%s : %s (%d items)"
 msgstr[0] "%s : %s (%d 個項目)"
+msgstr[1] "%s : %s (%d 個項目)"
 
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
 #: ../widgets/table/e-table-group-container.c:351
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
 msgstr[0] "%s (%d 個項目)"
+msgstr[1] "%s (%d 個項目)"
 
 #: ../widgets/table/e-table-group-container.c:897
 #: ../widgets/table/e-table-group-container.c:898
@@ -23633,7 +20978,6 @@ msgstr "列與列間交替使用的色彩"
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
-# calendar/gui/e-calendar-table.c:156
 #: ../widgets/table/e-table-group-container.c:911
 #: ../widgets/table/e-table-group-container.c:912
 #: ../widgets/table/e-table-group-leaf.c:587
@@ -23695,7 +21039,6 @@ msgstr "標準列高"
 msgid "Frozen"
 msgstr "凍結"
 
-# widgets/menus/gal-view-menus.c:176
 #: ../widgets/table/e-table-header-item.c:1471
 msgid "Customize Current View"
 msgstr "自訂目前的檢視"
@@ -23724,7 +21067,6 @@ msgstr "依方塊為群組"
 msgid "Remove This Column"
 msgstr "移除此欄"
 
-# composer/e-msg-composer-attachment-bar.c:500
 #: ../widgets/table/e-table-header-item.c:1499
 msgid "Add a Column..."
 msgstr "加入一欄..."
@@ -23741,7 +21083,6 @@ msgstr "最適填滿"
 msgid "Format Columns..."
 msgstr "格式欄..."
 
-# widgets/menus/gal-view-menus.c:176
 #: ../widgets/table/e-table-header-item.c:1505
 msgid "Customize Current View..."
 msgstr "自訂目前的檢視..."
@@ -23750,7 +21091,6 @@ msgstr "自訂目前的檢視..."
 msgid "Sort By"
 msgstr "排序依"
 
-# addressbook/printing/e-contact-print.glade.h:8
 #: ../widgets/table/e-table-header-item.c:1899 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
@@ -23761,7 +21101,6 @@ msgstr "字型組"
 msgid "Sort Info"
 msgstr "排序資訊"
 
-# ui/evolution-calendar.xml.h:36
 #: ../widgets/table/e-table-header-item.c:1934
 #: ../widgets/table/e-tree-scrolled.c:221
 #: ../widgets/table/e-tree-scrolled.c:222
@@ -23785,7 +21124,6 @@ msgstr "游標列"
 msgid "Always search"
 msgstr "總是搜尋"
 
-# calendar/gui/e-calendar-table.c:163
 #: ../widgets/table/e-table.c:3322
 msgid "Use click to add"
 msgstr "請按這裡加入"
@@ -23814,10 +21152,6 @@ msgstr "Copyright (C) 2000, Helix Code, Inc."
 msgid "This should test the minicard canvas item"
 msgstr "這可以測試迷你名片畫布項目"
 
-# calendar/gui/calendar-model.c:641
-# calendar/gui/calendar-model.c:1178
-# calendar/gui/dialogs/task-editor-dialog.glade.h:11
-# calendar/gui/e-calendar-table.c:420
 #: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
 #: ../widgets/text/e-text.c:3496 ../widgets/text/e-text.c:3497
 msgid "Event Processor"
@@ -23849,7 +21183,7 @@ msgstr "橢圓"
 #: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
 #: ../widgets/text/e-text.c:3646 ../widgets/text/e-text.c:3647
 msgid "Line wrap"
-msgstr "折行"
+msgstr "換行"
 
 #: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
 #: ../widgets/text/e-text.c:3653 ../widgets/text/e-text.c:3654
@@ -23876,7 +21210,6 @@ msgstr "繪製框線"
 msgid "Draw background"
 msgstr "繪製背景"
 
-# calendar/gui/event-editor-dialog.glade.h:33
 #: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
 #: ../widgets/text/e-text.c:3703 ../widgets/text/e-text.c:3704
 msgid "Draw button"
@@ -23911,7 +21244,6 @@ msgstr "錨點"
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
-# addressbook/printing/e-contact-print.glade.h:15
 #: ../widgets/text/e-text.c:3546 ../widgets/text/e-text.c:3547
 msgid "Clip Height"
 msgstr "剪輯高度"
@@ -23942,29 +21274,9 @@ msgstr "文字高度"
 
 #: ../widgets/text/e-text.c:3717 ../widgets/text/e-text.c:3718
 msgid "IM Context"
-msgstr "IM 快顯選單"
+msgstr "IM 快顯視窗"
 
 #: ../widgets/text/e-text.c:3724 ../widgets/text/e-text.c:3725
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
 
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "work"
-#~ msgstr "工作"
-
-#~ msgid "personal"
-#~ msgstr "個人"
-
-#~ msgid "The calendar you have selected is read-only"
-#~ msgstr "選擇的行事曆是唯讀的"
-
-#~ msgid "Cale_ndar:"
-#~ msgstr "行事曆(_N):"
-
-#~ msgid "Memo:"
-#~ msgstr "備忘錄:"
-
-#~ msgid "      "
-#~ msgstr "      "