Updated Traditional Chinese translation(Taiwan). Updated Traditional

2006-01-27 Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> * zh_TW.po: Updated Traditional Chinese translation(Taiwan). * zh_HK.po: Updated Traditional Chinese translation(Hong Kong). svn path=/trunk/; revision=31320
author: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw> 2006-01-27 07:02:25 +0800
committer: Chao-Hsiung Liao <chliao@src.gnome.org> 2006-01-27 07:02:25 +0800
commit: ede70f0d46cf42e87215c52786aa7907c8a0eb6b (patch)
tree: 8ed532b8a305ce6b582fc4fa9b5128cb602e645c /po
parent: 1c6a470b5510e6ae6cd2fcbec145647d672ae8b5 (diff)
download: gsoc2013-evolution-ede70f0d46cf42e87215c52786aa7907c8a0eb6b.tar.gz
gsoc2013-evolution-ede70f0d46cf42e87215c52786aa7907c8a0eb6b.tar.zst
gsoc2013-evolution-ede70f0d46cf42e87215c52786aa7907c8a0eb6b.zip
3 files changed, 3785 insertions, 3706 deletions
diff --git a/po/ChangeLog b/po/ChangeLog
index ec26c2fbd9..82fc19964a 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-27  Chao-Hsiung Liao  <j_h_liau@yahoo.com.tw>
+
+	* zh_TW.po: Updated Traditional Chinese translation(Taiwan).
+	* zh_HK.po: Updated Traditional Chinese translation(Hong Kong).
+
 2006-01-26  Evandro Fernandes Giovanini <evandrofg@ig.com.br>
 
 	* pt_BR.po: Updated Brazilian Portuguese translation.
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9e9f23fdba..9dd4c316cd 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.5.4\n"
+"Project-Id-Version: evolution 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-20 21:56+0100\n"
-"PO-Revision-Date: 2006-01-21 09:50+0800\n"
+"POT-Creation-Date: 2006-01-27 06:53+0800\n"
+"PO-Revision-Date: 2006-01-26 22:14+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -131,16 +131,14 @@ msgstr "移至日期"
 msgid "a table to view and select the current time range"
 msgstr "用來檢視與選擇時刻範圍的表格"
 
-#: ../a11y/calendar/ea-day-view.c:146
-#: ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "它具有 %d 個事件。"
 msgstr[1] "它具有 %d 個事件。"
 
-#: ../a11y/calendar/ea-day-view.c:148
-#: ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "它沒有事件。"
 
@@ -182,8 +180,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:719
-#: ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
 #: ../calendar/gui/e-week-view-main-item.c:322
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -222,8 +219,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:723
-#: ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
 #: ../calendar/gui/e-week-view-main-item.c:336
 msgid "%d %b"
 msgstr "%d %b"
@@ -370,7 +366,9 @@ msgid "Popup Menu"
 msgstr "彈出式選單"
 
 #: ../addressbook/addressbook.error.xml.h:1
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr "此聯絡人的電郵地址已經存在。你無論如何都要加入同樣位址的新咭片嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:2
@@ -387,8 +385,13 @@ msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
 #: ../addressbook/addressbook.error.xml.h:5
-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 "請檢查來確定你的密碼拼法正確，而且你使用的是支援的登入方法。請記得許多密碼有區分大小寫；你可能啟動了大寫鎖定鍵。"
+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 ""
+"請檢查來確定你的密碼拼法正確，而且你使用的是支援的登入方法。請記得許多密碼有"
+"區分大小寫；你可能啟動了大寫鎖定鍵。"
 
 # camel/camel-movemail.c:306
 #: ../addressbook/addressbook.error.xml.h:6
@@ -401,8 +404,14 @@ msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
 #: ../addressbook/addressbook.error.xml.h:8
-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 個人聯絡人資料夾。"
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"目前你只能存取 Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 "
+"GroupWise 電郵客戶端，以取得你的 GroupWise 常用聯絡人及 Groupwise 個人聯絡人"
+"資料夾。"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
@@ -447,12 +456,18 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的圖片太大。你是否要改變大小後才儲存它？"
 
 #: ../addressbook/addressbook.error.xml.h:19
-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 版本，它不支援此功能，或可能設定錯誤。請洽詢管理員，瞭解支援的搜尋基礎。"
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"此 LDAP 伺服器可能使用舊的 LDAP 版本，它不支援此功能，或可能設定錯誤。請洽詢"
+"管理員，瞭解支援的搜尋基礎。"
 
 # addressbook/conduit/address-conduit.c:201
 #: ../addressbook/addressbook.error.xml.h:20
@@ -469,7 +484,9 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺服器沒有任何建議的搜尋基礎。"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或你的網絡連線已經停止。"
 
 #: ../addressbook/addressbook.error.xml.h:24
@@ -497,23 +514,34 @@ msgid "Would you like to save your changes?"
 msgstr "要儲存所做的更改？"
 
 #: ../addressbook/addressbook.error.xml.h:29
-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 "你正在嘗試從某一個通訊錄，將聯絡人移至另一個通訊錄，但是它無法從來源移除。你想要儲存一個副本來代替嗎？"
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"你正在嘗試從某一個通訊錄，將聯絡人移至另一個通訊錄，但是它無法從來源移除。你"
+"想要儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:30
-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 的問題。最好的解決方案是將該伺服器升級至支援的版太"
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
+"解決方案是將該伺服器升級至支援的版太"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "你已經修改此聯絡人。要儲存這些更改？"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的聯絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-rule.c:496
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -572,9 +600,8 @@ 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:1186
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/migration.c:400
+#: ../addressbook/gui/component/addressbook-view.c:1344
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:629
 msgid "Contacts"
 msgstr "聯絡人"
@@ -622,14 +649,10 @@ msgstr "在此管理你的 S/MIME 證書"
 #: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../calendar/gui/calendar-component.c:209
-#: ../calendar/gui/memos-component.c:194
-#: ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:567
-#: ../calendar/gui/migration.c:1075
-#: ../calendar/gui/tasks-component.c:190
-#: ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/mail-component.c:299
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "在此電腦"
@@ -643,14 +666,10 @@ msgstr "在此電腦"
 #: ../addressbook/gui/component/addressbook-migrate.c:515
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:217
-#: ../calendar/gui/memos-component.c:202
-#: ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:575
-#: ../calendar/gui/migration.c:1083
-#: ../calendar/gui/tasks-component.c:198
-#: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1054
-#: ../mail/mail-config.c:87
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "個人"
@@ -716,12 +735,11 @@ msgstr "複製通訊錄內容至本地用於離線作業"
 
 #: ../addressbook/gui/component/addressbook-config.c:983
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:217
-#: ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
@@ -746,8 +764,7 @@ msgstr "驗證"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../addressbook/gui/component/addressbook-config.c:993
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:7
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細資料"
 
@@ -771,14 +788,12 @@ 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:1201
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1242
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
@@ -795,7 +810,8 @@ msgstr "自動完成設定"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -833,40 +849,63 @@ msgstr ""
 "\n"
 "當 Evolution 移轉你的 Pilot Sync 資料時，請耐心等候..."
 
+#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "重新命名「%s」資料夾為："
+
+#: ../addressbook/gui/component/addressbook-view.c:447
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "重新命名資料夾"
+
+#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "資料夾名稱不能包含斜線。"
+
+#: ../addressbook/gui/component/addressbook-view.c:455
+msgid "A Folder with this name already exists"
+msgstr "以此為名的資料夾已存在"
+
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-view.c:769
+#: ../addressbook/gui/component/addressbook-view.c:963
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:770
+#: ../addressbook/gui/component/addressbook-view.c:964
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/e-calendar-table.c:1196
-#: ../calendar/gui/e-calendar-view.c:1628
-#: ../calendar/gui/e-memo-table.c:871
-#: ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091
-#: ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:30
-#: ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "刪除(_D)"
 
+# addressbook/gui/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:966
+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:772
+#: ../addressbook/gui/component/addressbook-view.c:968
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1197
+#: ../addressbook/gui/component/addressbook-view.c:1355
 msgid "Contact Source Selector"
 msgstr "聯絡人來源選擇器"
 
@@ -874,13 +913,13 @@ msgstr "聯絡人來源選擇器"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook.c:191
+#: ../addressbook/gui/component/addressbook.c:197
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "驗證證書失敗。\n"
 
 # camel/camel-smime-context.c:194
-#: ../addressbook/gui/component/addressbook.c:198
+#: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -900,7 +939,9 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "完成 uris 清單的 EFolderList xml"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
 msgstr "垂直窗格的位置，在咭片、清單檢視與預覽窗格之間，以像素計。"
 
 # calendar/gui/event-editor-dialog.glade.h:15
@@ -909,7 +950,9 @@ msgid "Show preview pane"
 msgstr "顯示預覽窗格"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字元數目。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
@@ -987,8 +1030,7 @@ msgid "Add Address Book"
 msgstr "新增通訊錄"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304
-#: ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
 msgid "Always"
 msgstr "永遠"
 
@@ -1011,7 +1053,8 @@ msgid "Email address"
 msgstr "電郵地址"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 會使用此電郵地址，在伺服器驗證你的身份。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1024,8 +1067,7 @@ msgstr "登入(_G):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302
-#: ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
 msgid "Never"
 msgstr "永不"
 
@@ -1054,20 +1096,41 @@ msgid "Search filter"
 msgstr "搜尋過濾器"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-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」物件類型。"
+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」物件類型。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
-msgstr "選取此選項表示，Evolution 只會連線到你的 LDAP 伺服器 (如果你的 LDAP 伺服器支援 SSL 或 TLS)。"
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL or TLS."
+msgstr ""
+"選取此選項表示，Evolution 只會連線到你的 LDAP 伺服器 (如果你的 LDAP 伺服器支"
+"援 SSL 或 TLS)。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
-msgstr "選取此選項表示，Evolution 只會嘗試使用 SSL/TLS (如果你是在不安全的環境下)。例如，如果你和你的 LDAP 伺服器在作業時有防火牆保護，則 Evolution 就不需要使用 SSL/TLS ，因為你的連線已經安全無慮。"
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
+msgstr ""
+"選取此選項表示，Evolution 只會嘗試使用 SSL/TLS (如果你是在不安全的環境下)。例"
+"如，如果你和你的 LDAP 伺服器在作業時有防火牆保護，則 Evolution 就不需要使用 "
+"SSL/TLS ，因為你的連線已經安全無慮。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-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。這表示你的連線將不安全，而且你的安全有漏洞。 "
+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。這表示你的連線將不安全，而且你的"
+"安全有漏洞。 "
 
 # calendar/gui/print.c:362
 #: ../addressbook/gui/component/ldap-config.glade.h:34
@@ -1079,32 +1142,60 @@ msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
-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)，搜尋會由此處開始。如果此處空白，搜尋會在網絡目錄樹的根部開始。"
+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)，搜尋會由此處開始。如果此處空白，搜尋會在網"
+"路目錄樹的根部開始。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "The search scope defines how deep you would like the search to extend down 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\" 的搜尋範圍會包括搜尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"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\" 的搜尋範圍會包括搜"
+"尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "這是你的 ldap 伺服器的完整名稱。例如：「ldap.mycompany.com」。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr "這是要下載項目的數目上限。將此數字設定成太大會減慢通訊錄的速度。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
-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 伺服器的匿名存取。"
+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 伺服器的匿名存取。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "這是此伺服器的名稱，會顯示在你的 Evolution 資料夾清單中。它僅用於顯示用途。 "
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"這是此伺服器的名稱，會顯示在你的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
-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 會嘗試連線到這個地方。已提供標準埠清單。請洽詢你的系統管理員，瞭解你應該指定的埠。"
+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 會嘗試連線到這個地方。已提供標準埠清單。請"
+"洽詢你的系統管理員，瞭解你應該指定的埠。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "Using distinguished name (DN)"
@@ -1182,10 +1273,8 @@ msgstr "咭片"
 #: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
-#: ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:1987
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1273,9 +1362,9 @@ msgstr "聯絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:527
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2380
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:568
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2406
 msgid "Contact Editor"
 msgstr "聯絡人編輯器"
 
@@ -1322,10 +1411,8 @@ msgstr "電話"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1053
-#: ../mail/mail-config.c:86
-#: ../mail/mail-config.glade.h:154
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "工作"
 
@@ -1358,8 +1445,7 @@ msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27
-#: ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "分類(_C)"
 
@@ -1480,10 +1566,8 @@ msgstr "地址"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770
-#: ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3612
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
 #: ../widgets/text/e-text.c:3613
 msgid "Editable"
 msgstr "可編輯的"
@@ -2501,7 +2585,7 @@ msgstr "服務"
 # addressbook/backend/ebook/e-card.c:3442
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:461
+#: ../plugins/publish-calendar/publish-calendar.c:478
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "位置"
@@ -2571,22 +2655,22 @@ msgid "Changed"
 msgstr "已更改"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:537
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2375
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:563
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2401
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "聯絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2713
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2739
 msgid "Please select an image for this contact"
 msgstr "請選取此聯絡人的圖像"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "No image"
 msgstr "沒有圖像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2596,31 +2680,36 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3045
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
 msgid "Invalid contact."
 msgstr "無效的聯絡人。"
 
 # addressbook/contact-editor/e-contact-quick-add.c:233
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "快速新增聯絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
 # mail/mail-config.glade.h:31
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "全名(_F):"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "全名(_F)"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "電郵(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "電郵(_M):"
+# importers/pine-importer.c:661
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "選擇通訊錄(_S)"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2631,7 +2720,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2641,7 +2730,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2652,7 +2741,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2927,10 +3016,8 @@ msgstr "取得書本檢視時發生錯誤"
 #: ../widgets/table/e-table-selection-model.c:311
 #: ../widgets/table/e-table.c:3344
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3476
-#: ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Model"
 msgstr "模型"
 
@@ -2997,17 +3084,16 @@ msgstr "通訊錄"
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "儲存為 VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
 #: ../calendar/gui/dialogs/comp-editor.c:1093
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1606
-#: ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -3022,7 +3108,6 @@ msgid "New Contact _List..."
 msgstr "新增聯絡人清單(_L)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "儲存成 VCard(_S)..."
 
@@ -3076,8 +3161,7 @@ msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../ui/evolution-composer-entries.xml.h:4
-#: ../ui/evolution-editor.xml.h:8
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
@@ -3085,20 +3169,13 @@ msgstr "剪下(_T)"
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1184
-#: ../calendar/gui/e-calendar-view.c:1613
-#: ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:979
-#: ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1729
-#: ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:37
-#: ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3102
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "複製(_C)"
 
@@ -3182,14 +3259,12 @@ 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
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 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
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "電郵 3"
 
@@ -3344,10 +3419,8 @@ msgstr "網址"
 # addressbook/printing/e-contact-print.glade.h:41
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437
-#: ../widgets/misc/e-reflow.c:1438
+#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:667
@@ -3355,30 +3428,24 @@ msgstr "網址"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3654
-#: ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
 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:145
-#: ../widgets/misc/e-canvas-vbox.c:108
-#: ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445
-#: ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-field-chooser-item.c:674
 #: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030
-#: ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3662
-#: ../widgets/text/e-text.c:3663
+#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
+#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
 msgid "Height"
 msgstr "高度"
 
@@ -3615,8 +3682,7 @@ msgstr "通訊協定不支援"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:464
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2377
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3671,28 +3737,44 @@ msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:94
-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 "我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模式再次讀取通訊錄以下載它的內容"
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+"我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離"
+"線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
 # addressbook/gui/component/addressbook.c:458
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
-msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
+msgid ""
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且你有權限存取它。"
 
 # addressbook/gui/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."
+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 套件。"
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"此 Evolution 版本未編譯 LDAP 支援。如果你若想在 Evolution 使用 LDAP，必須安裝"
+"啟用 LDAP 的 Evolution 套件。"
 
 # addressbook/gui/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 an incorrect URI, or the server is unreachable."
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示你輸入錯誤的URI，或伺服器無法連線。"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
@@ -3805,6 +3887,11 @@ msgstr[1] "個聯絡人"
 msgid "card.vcf"
 msgstr "card.vcf"
 
+# importers/pine-importer.c:661
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "選擇通訊錄"
+
 #: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "清單"
@@ -3834,10 +3921,6 @@ msgstr "將聯絡人移到"
 msgid "Copy contacts to"
 msgstr "複製聯絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
-msgid "Select target addressbook."
-msgstr "選取目標通訊錄。"
-
 # addressbook/backend/ebook/e-card.c:3745
 #: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
@@ -3861,49 +3944,11 @@ msgstr "聯絡人資訊"
 msgid "Contact information for %s"
 msgstr "%s 的聯絡人資訊"
 
-# shell/e-storage.c:178
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(沒有)"
-
-# addressbook/contact-editor/contact-editor.glade.h:14
-# addressbook/contact-editor/e-contact-editor.c:1284
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "主要電郵"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "選擇一個動作"
-
-# ui/evolution-addressbook.xml.h:2
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "建立新的聯絡人 「%s」"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "新增住址到既存之聯絡人 「%s」"
-
 # addressbook/gui/widgets/e-minicard-control.c:282
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
 
-# mail/mail-config.glade.h:29
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "合併電郵地址"
-
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
@@ -3941,43 +3986,42 @@ msgid "GTK Tree View"
 msgstr "GTK 網絡樹檢視"
 
 # shell/e-shell-importer.c:363
-#: ../addressbook/importers/evolution-csv-importer.c:521
+#: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "匯入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:723
+#: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../addressbook/importers/evolution-csv-importer.c:724
+#: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:732
+#: ../addressbook/importers/evolution-csv-importer.c:835
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:733
+#: ../addressbook/importers/evolution-csv-importer.c:836
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:741
+#: ../addressbook/importers/evolution-csv-importer.c:844
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../addressbook/importers/evolution-csv-importer.c:742
+#: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "正在匯入..."
 
@@ -4199,7 +4243,7 @@ msgstr "網底"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:965
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:199
 msgid "Size:"
@@ -4302,7 +4346,8 @@ msgid "Export in asynchronous mode"
 msgstr "在非同步模式匯出"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr "非同步模式下，一個輸出檔案中的咭片數目，預設大小是 100。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
@@ -4310,7 +4355,8 @@ msgid "NUMBER"
 msgstr "數目"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help 選項來查看用法。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4347,23 +4393,32 @@ msgid "No filename provided."
 msgstr "沒有提供檔案名稱。"
 
 #: ../calendar/calendar.error.xml.h:1
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
 msgstr "新增有意義的摘要到你的約會可以讓收件者知道你的約會和什麼事有關。"
 
 #: ../calendar/calendar.error.xml.h:2
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr "新增有意義的摘要到你的工作可以讓收件者知道你的工作和什麼事有關。"
 
 #: ../calendar/calendar.error.xml.h:3
-msgid "All information in these journal entries will be deleted and can not be restored."
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
 msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr "會刪除此日誌的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "會刪除這些約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:6
@@ -4371,15 +4426,19 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "會刪除這些工作的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "會刪除此約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:8
-msgid "All information on this journal entry will be deleted and can not be restored."
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
 msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4496,11 +4555,14 @@ msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr "電郵邀請會傳送給所有參與者並讓他們接受此工作。"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "電郵邀請函會傳送給所有參與者並讓他們回覆。"
 
 # calendar/conduits/calendar/calendar-conduit.c:687
@@ -4520,15 +4582,21 @@ msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
 #: ../calendar/calendar.error.xml.h:36
-msgid "If you do not send a cancelation notice, the other participants may not know the journal has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the journal has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
 
 #: ../calendar/calendar.error.xml.h:37
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr "如果不傳送取消通知，其他參與者可能不知道會議已經取消。"
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道工作已經刪除。"
 
 # ui/evolution-message-composer.xml.h:26
@@ -4543,19 +4611,27 @@ msgid "Send Notice"
 msgstr "傳送通知"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
 
 #: ../calendar/calendar.error.xml.h:43
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr "這裏有一些需要下載的附件。儲存此約會將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:44
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr "這裏有一些需要下載的附件。儲存此工作將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:45
@@ -4635,16 +4711,21 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "要傳送更新的工作資訊給參與者？"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版本。"
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"你正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
+"解決方案是將該伺服器升級至支援的版本。"
 
 #: ../calendar/calendar.error.xml.h:64
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "你已經更改此約會，但尚未儲存它們。"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "你已經更改此約會，但尚未儲存它。"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "你已經更改此工作，但尚未儲存它們。"
+msgid "You have changed this task, but not yet saved it."
+msgstr "你已經更改此工作，但尚未儲存它。"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -4659,9 +4740,9 @@ msgstr "重新啟動 Evolution 之前，無法使用你的工作。"
 msgid "_Discard Changes"
 msgstr "放棄更改(_D)"
 
-#: ../calendar/calendar.error.xml.h:69
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -4671,8 +4752,7 @@ msgstr "儲存更改(_S)"
 
 # ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31
-#: ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "傳送(_S)"
 
@@ -4680,8 +4760,7 @@ msgstr "傳送(_S)"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49
-#: ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -4801,19 +4880,15 @@ msgstr "備忘錄(_S)"
 
 # calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092
-#: ../calendar/gui/memos-component.c:530
-#: ../calendar/gui/memos-component.c:1000
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:530
+#: ../calendar/gui/memos-component.c:1000 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "備忘錄"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334
-#: ../calendar/gui/print.c:1832
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1833
 #: ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1015
-#: ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:635
@@ -4839,8 +4914,7 @@ msgstr "Evolution 行事曆鬧鈴通知服務"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
-#: ../calendar/gui/misc.c:111
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
 #: ../calendar/gui/misc.c:113
 msgid "minute"
 msgid_plural "minutes"
@@ -4851,8 +4925,7 @@ msgstr[1] "分"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../filter/filter.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
@@ -4864,15 +4937,6 @@ msgstr[0] "時"
 msgid "Start time"
 msgstr "開始時刻"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:374
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s %s"
-
 # calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4882,8 +4946,8 @@ 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:1503
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1270
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1276
 #: ../calendar/gui/e-itip-control.c:1119
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
@@ -4895,23 +4959,17 @@ msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:159
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:14
-#: ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10
-#: ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:34
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4924,55 +4982,36 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-# data/evolution.keys.in.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1129
-msgid "<b>Calendars</b>"
-msgstr "<b>行事曆</b>"
-
-# calendar/gui/event-editor-dialog.glade.h:13
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1208
-msgid "_Configure Alarms"
-msgstr "設定鬧鈴(_C)"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1210
-#: ../ui/evolution.xml.h:45
-msgid "_Quit"
-msgstr "離開(_Q)"
-
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1358
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1369
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1120
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1377
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1416
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
 #, c-format
 msgid "You have %d alarms"
 msgstr "你有 %d 個鬧鈴"
 
 # widgets/misc/e-messagebox.c:159
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4984,10 +5023,11 @@ msgstr ""
 "送出電郵。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -5003,7 +5043,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1624
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5033,8 +5073,7 @@ msgstr "失效時間"
 
 # calendar/gui/event-editor.c:1563
 #. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#: ../calendar/gui/misc.c:105
+#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
 #, c-format
 msgid "(%d seconds)"
 msgstr "(%d 秒)"
@@ -5043,70 +5082,59 @@ msgstr "(%d 秒)"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/misc.c:111
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
 #, c-format
 msgid "(%d %s %d %s)"
 msgstr "(%d %s %d %s)"
 
 #: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:991
-#: ../calendar/gui/misc.c:111
+#: ../calendar/gui/dialogs/recurrence-page.c:992 ../calendar/gui/misc.c:111
 msgid "second"
 msgstr "二"
 
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:177
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr "秒後"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../calendar/gui/alarm-notify/util.c:66
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
 #, c-format
 msgid "(%d %s)"
 msgstr "(%d %s)"
 
 # calendar/gui/event-editor.c:1563
-#: ../calendar/gui/alarm-notify/util.c:77
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
 #, c-format
 msgid " %u second"
 msgstr " %u 秒"
 
 # calendar/gui/event-editor.c:1563
-#: ../calendar/gui/alarm-notify/util.c:77
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
 #, c-format
 msgid " %u seconds"
 msgstr " %u 秒"
 
 # calendar/gui/event-editor.c:1558
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
 #, c-format
 msgid " %u minute"
 msgstr " %u 分"
 
 # calendar/gui/event-editor.c:1558
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
 #, c-format
 msgid " %u minutes"
 msgstr " %u 分"
 
 # calendar/gui/event-editor.c:1553
-#: ../calendar/gui/alarm-notify/util.c:81
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
 #, c-format
 msgid "%u hour"
 msgstr "%u 小時"
 
 # calendar/gui/event-editor.c:1553
-#: ../calendar/gui/alarm-notify/util.c:81
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
 #, c-format
 msgid "%u hours"
 msgstr "%u 小時"
@@ -5136,7 +5164,8 @@ msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用預設值)。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -5263,24 +5292,38 @@ msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-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 ""
+"水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
 msgstr "垂直窗格的位置，在工作清單與工作預覽窗格之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-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 ""
+"垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
-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 "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
@@ -5346,12 +5389,20 @@ msgstr "工作垂直窗格位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "要做為空閒/忙碌資料回饋之用的網址範本，%u 要以電郵位址的使用者部分來取代，而 %d 要替換為網域名稱。"
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"要做為空閒/忙碌資料回饋之用的網址範本，%u 要以電郵位址的使用者部分來取代，而 "
+"%d 要替換為網域名稱。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-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\"。"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
+"\"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
@@ -5375,7 +5426,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "預設提醒單位，「分鐘」、「小時」或「日」。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱藏工作的單位，「分鐘」、「小時」或「日」。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
@@ -5399,7 +5451,9 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是否要求確認。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
@@ -5408,7 +5462,8 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+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
@@ -5441,7 +5496,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+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
@@ -5511,12 +5567,9 @@ msgstr "沒有相符資料"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/print.c:2513
-#: ../ui/evolution-addressbook.xml.h:17
-#: ../ui/evolution-calendar.xml.h:18
-#: ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2514
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "列印"
@@ -5538,8 +5591,12 @@ msgid "Calendar"
 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 "此作業會永久性刪除比選取時間還舊的所有事件。如果你繼續，將無法復原這些事件。"
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"此作業會永久性刪除比選取時間還舊的所有事件。如果你繼續，將無法復原這些事件。"
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
@@ -5548,8 +5605,7 @@ msgstr "清除事件早於"
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
@@ -5560,16 +5616,13 @@ msgstr "天"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:235
-#: ../calendar/gui/memos-component.c:221
-#: ../calendar/gui/migration.c:501
-#: ../calendar/gui/migration.c:594
-#: ../calendar/gui/migration.c:1102
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "在網站上"
 
-#: ../calendar/gui/calendar-component.c:253
-#: ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
@@ -5700,8 +5753,7 @@ msgstr "拒絕許可權來開啟行事曆"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/comp-editor-factory.c:444
-#: ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -5838,8 +5890,9 @@ 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:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:2
 msgid "Alarms"
 msgstr "鬧鈴"
 
@@ -5874,8 +5927,7 @@ msgstr "附件內容"
 #: ../calendar/gui/e-itip-control.c:1165
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "描述:"
 
@@ -5893,6 +5945,11 @@ msgstr "檔案名稱:"
 msgid "MIME type:"
 msgstr "MIME 類型:"
 
+# ui/evolution-addressbook.xml.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+msgid "Selected Calendars for Alarms"
+msgstr "選擇鬧鈴行事曆"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
 "60 minutes\n"
@@ -5907,26 +5964,22 @@ msgstr ""
 "10 分鐘\n"
 "05 分鐘"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "<b>Publishing</b>"
-msgstr "<b>發佈</b>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u 與 %d 會被替換為電郵位址中的使用者與網域名稱。</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">預設空閒/忙碌伺服器</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
 #: ../plugins/itip-formatter/itip-formatter.c:1977
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
@@ -5934,16 +5987,16 @@ 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:12
+#: ../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:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">時間</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">工作週</span>"
 
@@ -5957,26 +6010,20 @@ msgstr "一日結束於(_E):"
 msgid "Display"
 msgstr "顯示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "啟用(_E)"
-
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-editor.c:566
-#: ../ui/evolution-event-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5986,13 +6033,13 @@ msgstr ""
 "小時\n"
 "日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -6010,21 +6057,28 @@ msgstr ""
 "星期六\n"
 "星期日"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Publishing Table"
-msgstr "發佈的表格"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+# mail/mail-config.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "選取顏色"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "週日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1052
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "星期六"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr "選擇鬧鈴通知的行事曆"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
@@ -6035,7 +6089,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "星期日"
@@ -6055,7 +6109,7 @@ msgid "Template:"
 msgstr "樣板:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "星期四"
@@ -6073,7 +6127,7 @@ msgstr "時刻格式:"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "星期二"
@@ -6083,7 +6137,7 @@ msgid "W_eek starts:"
 msgstr "一週開始於(_E):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
@@ -6101,62 +6155,58 @@ msgid "_24 hour"
 msgstr "_24 小時"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "_Add URL"
-msgstr "加入網址(_A)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # ui/evolution-mail.xml.h:43
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Mon"
 msgstr "週一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Tue"
 msgstr "週二(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "before every appointment"
 msgstr "前"
 
@@ -6225,13 +6275,6 @@ msgstr "新增行事曆"
 msgid "Add Task List"
 msgstr "新增工作清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "選取顏色"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "加入行事曆(_A)"
@@ -6256,8 +6299,7 @@ msgid "_URL:"
 msgstr "網址(_U):"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "週"
@@ -6313,8 +6355,7 @@ msgstr "%s  你沒有做任何更改，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2271
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2272
 msgid " to "
 msgstr " 到 "
 
@@ -6322,8 +6363,7 @@ msgstr " 到 "
 # 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:2275
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2276
 msgid " (Completed "
 msgstr " (已完成) "
 
@@ -6331,26 +6371,22 @@ msgstr " (已完成) "
 # 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:2277
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2278
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2282
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2283
 msgid " (Due "
 msgstr "(期限)"
 
 # calendar/gui/dialogs/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:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2285
 msgid "Due "
 msgstr "期限 "
 
 # mail/mail-tools.c:219
-#: ../calendar/gui/dialogs/comp-editor.c:207
-#: ../composer/e-msg-composer.c:2854
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
@@ -6358,8 +6394,7 @@ msgstr "附加訊息 - %s"
 # composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382
-#: ../composer/e-msg-composer.c:2859
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2859
 #: ../composer/e-msg-composer.c:3038
 #, c-format
 msgid "Attached message"
@@ -6367,19 +6402,14 @@ msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446
-#: ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:980
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973
-#: ../mail/message-list.c:1730
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448
-#: ../composer/e-msg-composer.c:3105
-#: ../mail/em-folder-tree.c:982
-#: ../mail/message-list.c:1732
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
@@ -6388,8 +6418,7 @@ msgstr "取消拖拉(_D)"
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
-#: ../composer/e-msg-composer.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6413,7 +6442,7 @@ msgstr "顯示附加檔案列(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1094
 #: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/meeting-page.c:914
 #: ../calendar/gui/dialogs/task-page.c:1206
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3601
@@ -6425,9 +6454,8 @@ msgstr "移除(_R)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1095
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3602
-#: ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../composer/e-msg-composer.c:3602 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "屬性(_P)"
 
@@ -6492,10 +6520,8 @@ msgid "No summary"
 msgstr "沒有摘要"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:156
-#: ../mail/em-utils.c:502
-#: ../mail/em-utils.c:539
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
+#: ../mail/em-utils.c:502 ../mail/em-utils.c:539
 #: ../widgets/misc/e-attachment-bar.c:342
 msgid "attachment"
 msgstr "附件"
@@ -6594,7 +6620,7 @@ msgstr "約會(_M)"
 
 # calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:545
-#: ../ui/evolution-event-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -6640,25 +6666,25 @@ msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
 #: ../calendar/gui/dialogs/event-page.c:1449
-#: ../calendar/gui/dialogs/meeting-page.c:464
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:908
 msgid "The organizer selected no longer has an account."
 msgstr "選取的召集人已經沒有帳號。"
 
 #: ../calendar/gui/dialogs/event-page.c:1455
-#: ../calendar/gui/dialogs/meeting-page.c:470
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:914
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
 #: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/meeting-page.c:485
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:929
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
 #: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/meeting-page.c:910
+#: ../calendar/gui/dialogs/meeting-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1207
 msgid "_Add "
 msgstr "新增(_A)"
@@ -6772,39 +6798,34 @@ msgstr "舉行"
 msgid "until"
 msgstr "直至"
 
-#: ../calendar/gui/dialogs/meeting-page.c:306
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>代理者(_G)</b>"
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "代理者(_G)"
 
-#: ../calendar/gui/dialogs/meeting-page.c:310
-msgid "<b>From:</b>"
-msgstr "<b>從:</b>"
+# composer/e-msg-composer-hdrs.c:355
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "寄件者:"
 
 #. an empty string is the same as 'None'
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:316
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105
-#: ../composer/e-msg-composer.c:2275
-#: ../filter/filter-rule.c:881
-#: ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356
-#: ../mail/em-account-prefs.c:465
-#: ../mail/em-folder-view.c:1106
-#: ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249
-#: ../widgets/misc/e-dateedit.c:475
-#: ../widgets/misc/e-dateedit.c:1514
-#: ../widgets/misc/e-dateedit.c:1728
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
 msgid "None"
 msgstr "無"
 
@@ -6864,8 +6885,7 @@ msgstr "RSVP"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:513
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../mail/em-filter-i18n.h:63
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "狀況"
@@ -6896,8 +6916,7 @@ msgid "Organizer:"
 msgstr "會議召集人:"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/dialogs/memo-editor.c:130
-#: ../calendar/gui/print.c:2312
+#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2313
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -6920,8 +6939,7 @@ msgstr "分類(_F):"
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:257
-#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "機密"
@@ -6930,8 +6948,7 @@ msgstr "機密"
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:256
-#: ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "私人"
@@ -6940,10 +6957,8 @@ msgstr "私人"
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "公開"
 
@@ -7022,7 +7037,8 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "你正在修改週期性工作。你想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
 msgstr "你正在修改週期性日誌項目。你想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -7044,60 +7060,60 @@ msgid "All Instances"
 msgstr "所有例項"
 
 # calendar/gui/event-editor.c:871
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:499
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:820
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
 # calendar/gui/event-editor.c:449
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:931
 msgid "on"
 msgstr "的"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "first"
 msgstr "一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "third"
 msgstr "三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "fourth"
 msgstr "四"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:995
 msgid "last"
 msgstr "最後"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "Other Date"
 msgstr "其它日期"
 
 # calendar/gui/event-editor.c:474
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "day"
 msgstr "天"
 
 # calendar/gui/event-editor.c:601
-#: ../calendar/gui/dialogs/recurrence-page.c:1182
+#: ../calendar/gui/dialogs/recurrence-page.c:1183
 msgid "on the"
 msgstr "在第"
 
 # calendar/gui/event-editor.c:754
-#: ../calendar/gui/dialogs/recurrence-page.c:1371
+#: ../calendar/gui/dialogs/recurrence-page.c:1372
 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:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2343
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -7178,12 +7194,9 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:463
-#: ../calendar/gui/e-itip-control.c:897
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220
-#: ../calendar/gui/print.c:2373
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/print.c:2374 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "已完成"
 
@@ -7194,8 +7207,7 @@ msgstr "已完成"
 # 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:388
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
 msgid "High"
 msgstr "高"
 
@@ -7208,8 +7220,7 @@ msgstr "高"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:658
 #: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:462
-#: ../calendar/gui/print.c:2370
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2371
 msgid "In Progress"
 msgstr "進行中"
 
@@ -7220,15 +7231,13 @@ msgstr "進行中"
 # 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:390
-#: ../mail/message-list.c:1014
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:920
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
 #: ../mail/message-list.c:1015
 msgid "Normal"
 msgstr "正常"
@@ -7241,8 +7250,7 @@ msgstr "正常"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/print.c:2367
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2368
 msgid "Not Started"
 msgstr "未開始"
 
@@ -7484,8 +7492,7 @@ 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:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
@@ -7500,8 +7507,7 @@ msgstr "備忘錄:"
 msgid "Web Page:"
 msgstr "網頁："
 
-#: ../calendar/gui/e-cal-component-preview.c:155
-#: ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "未命名"
 
@@ -7551,8 +7557,7 @@ 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:4
-#: ../mail/mail-dialogs.glade.h:16
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "摘要"
@@ -7582,19 +7587,16 @@ msgstr ""
 "45.436845,125.862501"
 
 # calendar/gui/calendar-model.c:1584
-#: ../calendar/gui/e-cal-model-tasks.c:1019
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:809
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
-#: ../calendar/gui/e-cal-model-tasks.c:1019
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7602,19 +7604,14 @@ msgid "No"
 msgstr "否"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:166
-#: ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
+#: ../calendar/gui/e-cal-popup.c:107 ../calendar/gui/e-cal-popup.c:122
+#: ../calendar/gui/e-cal-popup.c:166 ../calendar/gui/e-itip-control.c:1150
 #: ../calendar/gui/e-itip-control.c:1291
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225
-#: ../mail/em-utils.c:1312
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -7635,36 +7632,28 @@ msgstr "已指定"
 
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
-#: ../calendar/gui/e-cal-popup.c:172
-#: ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:172 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-display.c:196
-#: ../calendar/gui/e-cal-popup.c:188
-#: ../mail/em-format-html-display.c:1865
+#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1866
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
 # mail/mail-search.c:138
-#: ../calendar/gui/e-cal-popup.c:217
-#: ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:217 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:271
-#: ../calendar/gui/e-calendar-table.c:1178
-#: ../calendar/gui/e-calendar-view.c:1607
-#: ../calendar/gui/e-memo-table.c:856
-#: ../mail/em-folder-view.c:1087
-#: ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:271 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1607 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:272
-#: ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:272 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
@@ -7674,8 +7663,7 @@ msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
 
 # mail/mail-display.c:299
-#: ../calendar/gui/e-cal-popup.c:395
-#: ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:395 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -7741,74 +7729,58 @@ msgstr "工作表格"
 
 # calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:678
-#: ../calendar/gui/e-memo-table.c:435
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
 #: ../calendar/gui/e-calendar-table.c:884
-#: ../calendar/gui/e-calendar-view.c:806
-#: ../calendar/gui/e-memo-table.c:612
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
 msgid "Updating objects"
 msgstr "更新物件"
 
 # composer/e-msg-composer.c:774
 #: ../calendar/gui/e-calendar-table.c:1034
-#: ../calendar/gui/e-calendar-view.c:1141
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
 #: ../composer/e-msg-composer.c:1354
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1179
 #: ../calendar/gui/e-calendar-view.c:1592
-#: ../calendar/gui/e-calendar-view.c:1608
-#: ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-view.c:1608 ../calendar/gui/e-memo-table.c:857
 #: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40
-#: ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-message.xml.h:124
-#: ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "列印(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1612
-#: ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1
-#: ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1612 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
 #: ../calendar/gui/e-calendar-table.c:1185
 #: ../calendar/gui/e-calendar-view.c:1595
-#: ../calendar/gui/e-calendar-view.c:1614
-#: ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:39
-#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:15
-#: ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1189
-#: ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1190
-#: ../calendar/gui/e-memo-table.c:867
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCalendar 轉寄(_F)"
@@ -7840,8 +7812,7 @@ 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:627
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "完成"
 
@@ -7943,11 +7914,9 @@ msgstr "以 iCalendar 轉寄(_F)..."
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1624
-#: ../mail/em-folder-view.c:1082
-#: ../mail/em-popup.c:559
-#: ../mail/em-popup.c:570
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1624 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
@@ -7967,21 +7936,27 @@ 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:2043
+#: ../calendar/gui/e-calendar-view.c:2045
 #, 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:2049
+#, 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:2057
-#: ../calendar/gui/print.c:2340
+#: ../calendar/gui/e-calendar-view.c:2064 ../calendar/gui/print.c:2341
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2088
+#: ../calendar/gui/e-calendar-view.c:2095
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -8013,7 +7988,11 @@ msgstr ""
 "%s"
 
 # calendar/gui/e-day-view-time-item.c:519
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:557
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
@@ -8027,10 +8006,8 @@ msgstr "間隔 %02i 分鐘"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715
-#: ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:313
-#: ../calendar/gui/print.c:1527
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
+#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1528
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -8038,9 +8015,8 @@ msgstr "%A %d %B"
 # 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:748
-#: ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:842
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:843
 msgid "am"
 msgstr "上午"
 
@@ -8048,9 +8024,8 @@ msgstr "上午"
 # 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:751
-#: ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:844
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:845
 msgid "pm"
 msgstr "下午"
 
@@ -8141,8 +8116,7 @@ msgid "Due"
 msgstr "截止"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/e-itip-control.c:950
-#: ../calendar/gui/e-itip-control.c:1007
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
@@ -8155,10 +8129,8 @@ msgstr "iCalendar 錯誤"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/e-itip-control.c:1039
-#: ../calendar/gui/e-itip-control.c:1055
-#: ../calendar/gui/e-itip-control.c:1066
-#: ../calendar/gui/e-itip-control.c:1083
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -8168,41 +8140,42 @@ msgstr "不明人士"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1090
-msgid "<br> Please review the following information, and then select an action from the menu below."
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
 #: ../calendar/gui/e-itip-control.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:189
-#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: ../calendar/gui/e-itip-control.c:1142
-#: ../calendar/gui/itip-utils.c:672
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
 #: ../calendar/gui/e-itip-control.c:1146
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:214
-#: ../calendar/gui/itip-utils.c:675
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "婉拒"
 
 #: ../calendar/gui/e-itip-control.c:1230
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "會議已經取消，但是在你的行事曆中找不到"
 
 #: ../calendar/gui/e-itip-control.c:1232
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經取消，但是在你的工作清單中找不到"
 
 #: ../calendar/gui/e-itip-control.c:1311
@@ -8273,8 +8246,7 @@ msgstr "<b>%s</b> 已經消取會議。"
 msgid "Meeting Cancelation"
 msgstr "會議取消"
 
-#: ../calendar/gui/e-itip-control.c:1359
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
 #: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -8436,13 +8408,11 @@ msgstr "到會者狀態不能更新，因為項目已經不存在"
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: ../calendar/gui/e-itip-control.c:2033
-#: ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2035
-#: ../calendar/gui/e-itip-control.c:2085
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -8486,10 +8456,8 @@ msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: ../calendar/gui/e-itip-control.c:2380
-#: ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:423
-#: ../mail/mail-send-recv.c:476
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -8562,15 +8530,13 @@ msgid "Resources"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:100
-#: ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../calendar/gui/e-meeting-store.c:803
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
@@ -8578,64 +8544,55 @@ msgstr "群組"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "會議室"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/e-meeting-store.c:806
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "缺席者"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:816
 msgid "Needs Action"
 msgstr "需要動作"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Tentative"
 msgstr "暫訂"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
@@ -8650,8 +8607,7 @@ msgstr "到會者"
 # 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:199
-#: ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "進行中"
 
@@ -8691,8 +8647,7 @@ msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../calendar/gui/e-meeting-time-sel.c:416
-#: ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "不在辦公室"
 
@@ -8770,8 +8725,7 @@ msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../calendar/gui/e-memo-table.c:995
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裏增加新的備忘錄"
 
@@ -8784,8 +8738,7 @@ msgid "Memo sort"
 msgstr "備忘錄排序"
 
 # mail/mail-mt.c:190
-#: ../calendar/gui/e-memos.c:728
-#: ../calendar/gui/e-tasks.c:823
+#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
 #: ../calendar/gui/gnome-cal.c:2571
 #, c-format
 msgid ""
@@ -8807,8 +8760,7 @@ msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../calendar/gui/e-memos.c:1034
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
@@ -8848,8 +8800,7 @@ msgstr "時區按鈕"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:330
-#: ../calendar/gui/print.c:1511
+#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1512
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8956,8 +8907,7 @@ msgstr "九月"
 msgid "_Select Today"
 msgstr "選擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:412
-#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
 #: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
@@ -8967,26 +8917,22 @@ msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/itip-utils.c:631
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
 msgid "Event information"
 msgstr "事件資訊"
 
 # widgets/misc/e-messagebox.c:152
-#: ../calendar/gui/itip-utils.c:633
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
 msgid "Task information"
 msgstr "工作資訊"
 
 # mail/mail-config.glade.h:47
-#: ../calendar/gui/itip-utils.c:635
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
 msgid "Journal information"
 msgstr "日誌資訊"
 
 # mail/mail-config.glade.h:61
-#: ../calendar/gui/itip-utils.c:637
-#: ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
@@ -9026,10 +8972,8 @@ msgstr "你必須是此事件的到會者。"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: ../calendar/gui/memos-component.c:451
-#: ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-composer-entries.xml.h:1
-#: ../ui/evolution-memos.xml.h:2
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "複製"
@@ -9045,12 +8989,9 @@ msgstr "複製"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: ../calendar/gui/memos-component.c:452
-#: ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "刪除"
@@ -9070,8 +9011,7 @@ msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 備忘錄"
 
-#: ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -9137,7 +9077,8 @@ msgstr "列印備忘錄"
 
 #: ../calendar/gui/migration.c:162
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -9147,7 +9088,8 @@ msgstr ""
 
 #: ../calendar/gui/migration.c:166
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -9156,8 +9098,7 @@ msgstr ""
 "當 Evolution 移轉你的資料夾時，請耐心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:765
-#: ../calendar/gui/migration.c:933
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
@@ -9331,55 +9272,55 @@ msgid "31st"
 msgstr "31日"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:575
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Sa"
 msgstr "六"
 
 # calendar/gui/print.c:1078
 #. Day
-#: ../calendar/gui/print.c:1927
+#: ../calendar/gui/print.c:1928
 msgid "Selected day (%a %b %d %Y)"
 msgstr "選擇的日期(%a %b %d %Y)"
 
 # calendar/gui/print.c:1092
 # calendar/gui/print.c:1096
-#: ../calendar/gui/print.c:1952
-#: ../calendar/gui/print.c:1956
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1957
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 # calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:1953
+#: ../calendar/gui/print.c:1954
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
@@ -9387,80 +9328,79 @@ msgstr "%a %d %Y"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: ../calendar/gui/print.c:1957
-#: ../calendar/gui/print.c:1959
-#: ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1958 ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1961
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 # calendar/gui/print.c:1104
-#: ../calendar/gui/print.c:1964
+#: ../calendar/gui/print.c:1965
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "選擇的週(%s - %s)"
 
 # calendar/gui/print.c:1112
 #. Month
-#: ../calendar/gui/print.c:1972
+#: ../calendar/gui/print.c:1973
 msgid "Selected month (%b %Y)"
 msgstr "選擇的月(%b %Y)"
 
 # calendar/gui/print.c:1119
 #. Year
-#: ../calendar/gui/print.c:1979
+#: ../calendar/gui/print.c:1980
 msgid "Selected year (%Y)"
 msgstr "選擇的年(%Y)"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/print.c:2308
+#: ../calendar/gui/print.c:2309
 msgid "Appointment"
 msgstr "約會"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/print.c:2310
+#: ../calendar/gui/print.c:2311
 msgid "Task"
 msgstr "工作"
 
 # calendar/gui/e-itip-control.glade.h:11
-#: ../calendar/gui/print.c:2332
+#: ../calendar/gui/print.c:2333
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: ../calendar/gui/print.c:2383
+#: ../calendar/gui/print.c:2384
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2401
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2413
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: ../calendar/gui/print.c:2424
+#: ../calendar/gui/print.c:2425
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
 # addressbook/backend/ebook/e-card.c:3467
-#: ../calendar/gui/print.c:2438
+#: ../calendar/gui/print.c:2439
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2450
 msgid "Contacts: "
 msgstr "聯絡人: "
 
@@ -9468,17 +9408,15 @@ msgstr "聯絡人: "
 # mail/mail-callbacks.c:1447
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
-#: ../calendar/gui/print.c:2589
-#: ../calendar/gui/print.c:2677
-#: ../calendar/gui/print.c:2803
-#: ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2590 ../calendar/gui/print.c:2678
+#: ../calendar/gui/print.c:2804 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "預覽列印"
 
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: ../calendar/gui/print.c:2624
+#: ../calendar/gui/print.c:2625
 msgid "Print Item"
 msgstr "列印項目"
 
@@ -9557,11 +9495,13 @@ msgstr "建立新工作清單"
 
 #: ../calendar/gui/tasks-control.c:435
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"這個動作會永久地清除所有標示為已完成的工作。如果你要繼續，你將不能復原這些工作。\n"
+"這個動作會永久地清除所有標示為已完成的工作。如果你要繼續，你將不能復原這些工"
+"作。\n"
 "\n"
 "確定清除這些工作？"
 
@@ -11192,10 +11132,8 @@ msgstr "附加檔案列"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:238
-#: ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442
-#: ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "不能附加檔案 %s： %s"
@@ -11204,8 +11142,7 @@ msgstr "不能附加檔案 %s： %s"
 # camel/providers/local/camel-mbox-store.c:146
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246
-#: ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
@@ -11282,7 +11219,9 @@ msgstr "密件副本(_B):"
 
 # composer/e-msg-composer-hdrs.c:395
 #: ../composer/e-msg-composer-hdrs.c:655
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+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
@@ -11315,33 +11254,33 @@ msgid "Insert Attachment"
 msgstr "插入附加檔案"
 
 #: ../composer/e-msg-composer.c:830
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽名送出的電郵：此帳號沒有設定簽名證書"
 
 #: ../composer/e-msg-composer.c:837
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"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:1300
-#: ../composer/e-msg-composer.c:2512
+#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:1303
-#: ../composer/e-msg-composer.c:2515
+#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
 #: ../composer/e-msg-composer.c:3847
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
 # camel/camel-sasl-login.c:127
-#: ../composer/e-msg-composer.c:1335
-#: ../composer/e-msg-composer.c:1369
+#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
@@ -11367,10 +11306,8 @@ msgstr "未命名的電郵"
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2155
-#: ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641
-#: ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2155 ../mail/em-account-editor.c:596
+#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "自動產生的"
 
@@ -11381,18 +11318,21 @@ msgstr "簽名檔(_G):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../composer/e-msg-composer.c:2526
-#: ../composer/e-msg-composer.c:3729
+#: ../composer/e-msg-composer.c:2526 ../composer/e-msg-composer.c:3729
 #: ../composer/e-msg-composer.c:3732
 msgid "Compose Message"
 msgstr "編輯電郵"
 
 #: ../composer/e-msg-composer.c:4956
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<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 "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr "這裏有一些附件要下載。傳送此電郵將無法一併寄出接下來的附件"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -11401,22 +11341,28 @@ 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?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "確定要放棄你正在撰寫且標題為 '{0}'的電郵？"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "因為「{0}」，所以你可能需要選取不同的電郵選項。"
 
-#: ../composer/mail-composer.error.xml.h:5
-#: ../e-util/e-system.error.xml.h:1
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "因為「{1}」。"
 
 #: ../composer/mail-composer.error.xml.h:6
-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 "關閉此撰寫視窗會永久放棄電郵，除非你選擇儲存電郵至你的「草稿」資料夾。這樣可以讓你以後再繼續撰寫電郵。"
+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 ""
+"關閉此撰寫視窗會永久放棄電郵，除非你選擇儲存電郵至你的「草稿」資料夾。這樣可"
+"以讓你以後再繼續撰寫電郵。"
 
 # camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:7
@@ -11462,23 +11408,31 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
 
 #: ../composer/mail-composer.error.xml.h:16
-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 意外結束。復原電郵可以讓你從原來中斷的地方繼續。"
+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 意外結束。復原電郵可以讓你從原來中斷的地方繼續。"
 
 #: ../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}' 不是一般檔案而且無法在電郵中傳送。"
 
 #: ../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 "要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加它。"
+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 ""
+"要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加"
+"它。"
 
 # composer/evolution-composer.c:355
 #: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "無法啟動 HTML 編輯器控制。\n"
 "\n"
@@ -11570,7 +11524,8 @@ msgstr "<b>狀態：</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>當你不在辦公室時，以下指定的電郵將會自動傳送給\n"
@@ -11612,8 +11567,10 @@ msgstr "<b>正在傳送電郵:</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 "<small>此頁面可以讓你選擇當你傳送的電郵已閱讀時，是否傳送讀信回條，\n"
 "以及指定當某人要求你傳送回條時，Evolution 要做什麼。</small>"
@@ -11643,7 +11600,9 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "除非電郵傳送至郵寄清單，而不是給我個人"
 
 #: ../designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr "當你收到讀信回條要求的電郵時，Evolution 要做什麼？"
 
 # mail/mail-callbacks.c:1144
@@ -11658,26 +11617,21 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: ../e-util/e-dialog-utils.c:283
-#: ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../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:84
-#: ../e-util/e-error.c:85
-#: ../e-util/e-error.c:127
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:125
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
@@ -11695,7 +11649,8 @@ msgstr "Evolution 查詢"
 #. setup a dummy error
 #: ../e-util/e-error.c:442
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "<span weight=\"bold\">內部錯誤，要求的不明錯誤 '%s'</span>"
 
 # camel/providers/local/camel-maildir-folder.c:197
@@ -11728,8 +11683,7 @@ msgstr "要覆寫它?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "檔案存在「{0}」。"
 
-#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
@@ -11796,8 +11750,7 @@ msgstr[1] "%d 年前"
 msgid "<click here to select a date>"
 msgstr "<按這裏選擇日期>"
 
-#: ../filter/filter-datespec.c:288
-#: ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "現在"
 
@@ -11816,10 +11769,8 @@ msgstr "選擇要比對的時間"
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#: ../filter/filter-label.c:121
-#: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052
-#: ../mail/mail-config.c:85
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "重要"
@@ -11827,73 +11778,70 @@ msgstr "重要"
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 #. forest green
-#: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88
-#: ../mail/mail-config.glade.h:146
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
-#: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "稍後"
 
-#: ../filter/filter-part.c:532
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "測試"
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:799
 msgid "_Search name:"
 msgstr "搜尋名稱(_S):"
 
-#: ../filter/filter-rule.c:819
+#: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
 msgstr "尋找符合下列條件的項目"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
 msgstr "如果全部條件符合"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
 # mail/mail-ops.c:898
-#: ../filter/filter-rule.c:860
+#: ../filter/filter-rule.c:868
 msgid "Find items:"
 msgstr "尋找項目:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies"
 msgstr "回覆"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "沒有回復或原始電郵"
+
 # addressbook/printing/e-contact-print.glade.h:17
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "包括線串"
 
-#: ../filter/filter-rule.c:978
-#: ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:349
 msgid "Incoming"
 msgstr "內送"
 
-#: ../filter/filter-rule.c:978
-#: ../mail/em-utils.c:350
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:350
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11921,8 +11869,7 @@ msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
 # calendar/gui/calendar-model.c:1578
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -12025,7 +11972,8 @@ msgid "Composer Preferences"
 msgstr "電郵編輯器偏好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "在此設定電郵的偏好設定，包含安全性與電郵的顯示"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -12069,14 +12017,11 @@ msgstr "Evolution 電郵撰寫器組態控制"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 電郵優先設定控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:517
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579
-#: ../mail/mail-component.c:664
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "電郵"
@@ -12114,8 +12059,7 @@ msgstr ""
 "並選取核取方塊來接受它\n"
 
 # mail/mail-account-gui.c:682
-#: ../mail/em-account-editor.c:472
-#: ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "選擇資料夾"
@@ -12126,14 +12070,12 @@ msgid "Ask for each message"
 msgstr "每封電郵皆詢問"
 
 # mail/mail-config.glade.h:35
-#: ../mail/em-account-editor.c:1747
-#: ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config.glade.h:57
-#: ../mail/em-account-editor.c:1796
-#: ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "接收電郵"
 
@@ -12142,96 +12084,85 @@ msgid "Automatically check for _new mail every"
 msgstr "自動檢查新電郵每(_N)"
 
 # mail/mail-config.glade.h:65
-#: ../mail/em-account-editor.c:2160
-#: ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "傳送電郵"
 
 # mail/mail-config.glade.h:21
-#: ../mail/em-account-editor.c:2219
-#: ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285
-#: ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 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:2322
-#: ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
 msgid "Receiving Options"
 msgstr "接收選項"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../mail/em-account-editor.c:2323
-#: ../mail/em-account-editor.c:2414
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
 msgid "Checking for New Mail"
 msgstr "檢查新電郵"
 
 # mail/mail-config.glade.h:3
-#: ../mail/em-account-editor.c:2753
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
 # mail/mail-config-druid.c:445
-#: ../mail/em-account-editor.c:2753
-#: ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
 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:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:407
 msgid "Disable"
 msgstr "停用"
 
-#: ../mail/em-account-prefs.c:331
-#: ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
 msgid "Enable"
 msgstr "啟用"
 
 # mail/mail-config.glade.h:21
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:456
+#: ../mail/em-account-prefs.c:459
 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:505
-#: ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:213
-#: ../plugins/publish-calendar/publish-calendar.c:457
+#: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "已啟用"
 
 # mail/mail-config.glade.h:5
-#: ../mail/em-account-prefs.c:511
+#: ../mail/em-account-prefs.c:518
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: ../mail/em-account-prefs.c:513
+#: ../mail/em-account-prefs.c:520
 msgid "Protocol"
 msgstr "通訊協定"
 
 # mail/mail-config.glade.h:6
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:525
 msgid "Mail Accounts Table"
 msgstr "電郵帳號表"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../mail/em-composer-prefs.c:311
-#: ../mail/em-composer-prefs.c:437
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "未命名的"
@@ -12252,8 +12183,7 @@ msgid "Signature(s)"
 msgstr "簽名檔"
 
 # mail/mail-ops.c:1154
-#: ../mail/em-composer-utils.c:863
-#: ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的電郵 --------"
 
@@ -12267,8 +12197,12 @@ msgstr "不明的寄件者"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:1705
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} 提到："
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
+"${TimeZone}，${Sender} 提到："
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
@@ -12401,9 +12335,8 @@ msgid "is not Flagged"
 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
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "垃圾電郵"
 
@@ -12414,8 +12347,7 @@ msgstr "垃圾電郵測試"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ../mail/em-filter-i18n.h:37
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "標籤"
@@ -12462,8 +12394,7 @@ msgstr "建立程式管道"
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: ../mail/em-filter-i18n.h:47
-#: ../mail/message-tag-followup.c:81
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "閱讀"
 
@@ -12497,8 +12428,7 @@ msgid "Run Program"
 msgstr "執行程式"
 
 # mail/message-list.c:1081
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "目標"
 
@@ -12535,12 +12465,9 @@ msgstr "以此開始"
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1582
-#: ../mail/em-format-quote.c:313
-#: ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -12598,46 +12525,38 @@ 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:938
-#: ../mail/mail-vfolder.c:1011
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209
-#: ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:484
-#: ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
 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
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
 #: ../plugins/exchange-operations/exchange-folder.c:641
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../mail/em-folder-tree-model.c:490
-#: ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
 msgid "Outbox"
 msgstr "寄件匣"
 
-#: ../mail/em-folder-tree-model.c:492
-#: ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
 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
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "載入中..."
 
@@ -12660,15 +12579,13 @@ msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/em-folder-tree.c:863
-#: ../mail/message-list.c:1634
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將電郵移至資料夾 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/em-folder-tree.c:865
-#: ../mail/message-list.c:1636
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製電郵至資料夾 %s"
@@ -12678,31 +12595,25 @@ msgstr "正在複製電郵至資料夾 %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將電郵拖放到最上層的儲存區"
 
-#: ../mail/em-folder-tree.c:977
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:978
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
 # mail/mail-ops.c:992
-#: ../mail/em-folder-tree.c:1683
-#: ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
 
-#: ../mail/em-folder-tree.c:2042
-#: ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56
-#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:46
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -12723,13 +12634,11 @@ msgstr "移動(_M)..."
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)..."
 
-#: ../mail/em-folder-tree.c:2055
-#: ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2060
-#: ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "清空垃圾桶(_E)"
 
@@ -12740,32 +12649,16 @@ 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:973
-#: ../mail/em-folder-view.c:988
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:988
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "重新命名「%s」資料夾為："
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "重新命名資料夾"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "資料夾名稱不能包含斜線。"
-
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
 #: ../mail/em-folder-utils.c:581
@@ -12787,20 +12680,16 @@ msgstr "建立資料夾"
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
-#: ../mail/em-folder-view.c:1081
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1083
-#: ../mail/em-popup.c:561
-#: ../mail/em-popup.c:572
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/em-folder-view.c:1086
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "編輯為新電郵(_E)..."
 
@@ -12809,12 +12698,10 @@ msgid "U_ndelete"
 msgstr "復原(_N)"
 
 #: ../mail/em-folder-view.c:1093
-#: ../ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
 #: ../mail/em-folder-view.c:1094
-#: ../ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
@@ -12896,8 +12783,7 @@ msgstr "從通信論壇建立過濾器(_M)"
 
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968
-#: ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "預設值"
 
@@ -12939,141 +12825,155 @@ msgstr "按一下來傳送電郵 %s"
 
 # mail/mail-search.c:319
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:492
+#: ../mail/em-format-html-display.c:493
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
 # calendar/gui/calendar-model.c:1578
-#: ../mail/em-format-html-display.c:752
-#: ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "未簽名"
 
 # mail/mail-format.c:1161
-#: ../mail/em-format-html-display.c:752
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:753
+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:753
-#: ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "有效的簽名"
 
 # mail/mail-format.c:1161
-#: ../mail/em-format-html-display.c:753
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+#: ../mail/em-format-html-display.c:754
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr "此電郵已簽名而且有效，表示它非常有可能是驗證的電郵。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/em-format-html-display.c:754
-#: ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../mail/em-format-html-display.c:754
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: ../mail/em-format-html-display.c:755
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr "電郵的簽名無法檢驗，可能已在傳送時被更動了。"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:756
 msgid "Valid signature, cannot verify sender"
 msgstr "簽名有效，但無法檢驗寄件者"
 
-#: ../mail/em-format-html-display.c:755
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: ../mail/em-format-html-display.c:756
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr "此電郵有一個有效的簽名，但是電郵的寄件者無法檢驗。"
 
-#: ../mail/em-format-html-display.c:761
-#: ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:761
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+#: ../mail/em-format-html-display.c:762
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
 msgstr "此電郵未加密。它的內容在透過互聯網傳送可能會被檢閱。"
 
-#: ../mail/em-format-html-display.c:762
-#: ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html-display.c:762
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "此電郵已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時日，並不是無法檢視此電郵的內容。"
+#: ../mail/em-format-html-display.c:763
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"此電郵已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時"
+"日，並不是無法檢視此電郵的內容。"
 
 # ui/evolution-message-composer.xml.h:13
-#: ../mail/em-format-html-display.c:763
-#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html-display.c:763
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: ../mail/em-format-html-display.c:764
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr "此電郵已加密。外面的人難以檢視此電郵的內容。"
 
-#: ../mail/em-format-html-display.c:764
-#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html-display.c:764
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "此電郵已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此電郵的內容。"
+#: ../mail/em-format-html-display.c:765
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"此電郵已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此電郵"
+"的內容。"
 
-#: ../mail/em-format-html-display.c:865
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:866 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視證書(_V)"
 
-#: ../mail/em-format-html-display.c:880
+#: ../mail/em-format-html-display.c:881
 msgid "This certificate is not viewable"
 msgstr "此證書無法檢視"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1168
+#: ../mail/em-format-html-display.c:1169
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %B %d, %Y, %l:%M %p"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../mail/em-format-html-display.c:1176
+#: ../mail/em-format-html-display.c:1177
 msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1180
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "作者 %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1239
+#: ../mail/em-format-html-display.c:1240
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1240
+#: ../mail/em-format-html-display.c:1241
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../mail/em-format-html-display.c:1241
+#: ../mail/em-format-html-display.c:1242
 msgid "_Fit to Width"
 msgstr "符合寬度(_F)"
 
-#: ../mail/em-format-html-display.c:1242
+#: ../mail/em-format-html-display.c:1243
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
 # 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:1619
+#: ../mail/em-format-html-display.c:1620
 msgid "Attachment Button"
 msgstr "附件按鈕"
 
 # mail/mail-display.c:196
-#: ../mail/em-format-html-display.c:1826
+#: ../mail/em-format-html-display.c:1827
 msgid "Select folder to save all attachments..."
 msgstr "選擇用來儲存所有的附加檔案的資料夾..."
 
-#: ../mail/em-format-html-display.c:1873
+#: ../mail/em-format-html-display.c:1874
 msgid "Save Selected..."
 msgstr "儲存選取的..."
 
@@ -13081,33 +12981,36 @@ msgstr "儲存選取的..."
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1940
+#: ../mail/em-format-html-display.c:1941
 #, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%d 個附件"
-msgstr[1] "%d 個附件"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d 個附件(_N)"
+
+#: ../mail/em-format-html-display.c:1948 ../mail/em-format-html-display.c:2024
+msgid "S_ave"
+msgstr "儲存(_A)"
+
+# ui/evolution-calendar.xml.h:27
+# ui/evolution-message-composer.xml.h:18
+#: ../mail/em-format-html-display.c:1959
+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:2003
+#: ../mail/em-format-html-display.c:2018
 msgid "Toggle Attachment Bar"
 msgstr "切換附件列"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:2005
+#: ../mail/em-format-html-display.c:2020
 msgid "No Attachment"
 msgstr "無附件"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
-#: ../mail/em-format-html-display.c:2008
-msgid "Save All"
-msgstr "儲存全部"
-
 # camel/camel-filter-driver.c:748
 #: ../mail/em-format-html-print.c:130
 #, c-format
@@ -13115,8 +13018,7 @@ 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
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
@@ -13166,53 +13068,41 @@ msgstr "格式化電郵"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: ../mail/em-format-html.c:1474
-#: ../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
+#: ../mail/em-format-html.c:1474 ../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:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845
-#: ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../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:762
 # mail/message-list.c:1083
-#: ../mail/em-format-html.c:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: ../mail/em-format-html.c:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847
-#: ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1474 ../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:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848
-#: ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1474 ../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:1586
-#: ../mail/em-format-quote.c:322
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1000
 msgid "Mailer"
 msgstr "寄件者"
@@ -13229,16 +13119,13 @@ msgstr "<I> (%R %Z)</I>"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: ../mail/em-format-html.c:1626
-#: ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format-html.c:1649
-#: ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "新聞群組"
@@ -13250,15 +13137,12 @@ msgid "%s attachment"
 msgstr "%s 附加檔案"
 
 # mail/mail-format.c:573
-#: ../mail/em-format.c:1141
-#: ../mail/em-format.c:1288
-#: ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 電郵:未知的錯誤"
 
 # mail/mail-format.c:573
-#: ../mail/em-format.c:1270
-#: ../mail/em-format.c:1426
+#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的電郵。只好顯示原始檔。"
 
@@ -13270,13 +13154,11 @@ msgstr "多部份/已加密不支援的加密類型"
 msgid "Unsupported signature format"
 msgstr "不支援的簽名格式"
 
-#: ../mail/em-format.c:1453
-#: ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Error verifying signature"
 msgstr "檢驗簽名發生錯誤"
 
-#: ../mail/em-format.c:1453
-#: ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
@@ -13301,7 +13183,8 @@ msgstr "每月一次"
 
 #: ../mail/em-migrate.c:1209
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -13348,8 +13231,7 @@ msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../mail/em-migrate.c:2577
-#: ../mail/em-migrate.c:2589
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地電郵儲存區 `%s':%s"
@@ -13361,17 +13243,18 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地電郵資料夾:%s"
 
 #: ../mail/em-migrate.c:2731
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
 
-#: ../mail/em-popup.c:557
-#: ../mail/em-popup.c:568
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:558
-#: ../mail/em-popup.c:569
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
@@ -13385,8 +13268,8 @@ msgid "_Send New Message To..."
 msgstr "傳送新電郵至(_S)…"
 
 #: ../mail/em-popup.c:622
-msgid "_Add to Addressbook"
-msgstr "加入到目錄服務(_A)"
+msgid "_Add to Address Book"
+msgstr "加入到通訊錄(_A)"
 
 #: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -13421,8 +13304,7 @@ msgstr "不要再顯示這個訊息。"
 msgid "Filters"
 msgstr "過濾器"
 
-#: ../mail/em-utils.c:500
-#: ../mail/em-utils.c:537
+#: ../mail/em-utils.c:500 ../mail/em-utils.c:537
 msgid "message"
 msgstr "電郵"
 
@@ -13571,12 +13453,20 @@ msgid "Height of the message-list pane."
 msgstr "電郵清單面板高度。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的電郵，詢問使用者是否確定要這麼做。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
-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 檢視器，會用於顯示內容。"
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+"如果沒有內置檢視器可用於 Evolution 裏面特殊的 mime-type，任何顯示在此清單的 "
+"mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於"
+"顯示內容。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
@@ -13597,16 +13487,24 @@ msgid "List of accounts"
 msgstr "帳號清單"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
-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 相關的字串命名子目錄。"
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Evolution 的電郵元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts "
+"相關的字串命名子目錄。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "自訂標頭以及它們是否啟用的清單"
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
-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 十六進位編碼。"
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Evolution 的電郵元件已知的標籤清單。清單包含字串，其中包含 name:color，color "
+"使用 HTML 十六進位編碼。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
@@ -13621,8 +13519,13 @@ msgid "Load images for HTML messages over http"
 msgstr "透過 http 載入 HTNL 電郵的圖像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
-msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
-msgstr "透過 http(s) 載入 HTNL 電郵的圖像。可能的值：0 – 從不從網絡載入圖像 1 – 如果寄件者是在通訊錄時，載入圖像 2 - 永遠從網絡載入圖像"
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net"
+msgstr ""
+"透過 http(s) 載入 HTNL 電郵的圖像。可能的值：0 – 從不從網絡載入圖像 1 – 如果"
+"寄件者是在通訊錄時，載入圖像 2 - 永遠從網絡載入圖像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
@@ -13696,7 +13599,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的電郵時，提示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -13714,7 +13618,9 @@ msgstr "當使用者嘗試一次開啟 10 個或更多電郵時提示使用者�
 
 # ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 電郵到不想接收 HTML 電郵的收件者時，顯示提示。"
 
 # ui/evolution-mail.xml.h:14
@@ -13806,8 +13712,14 @@ msgid "The variable width font for mail display"
 msgstr "用於電郵顯示的變動寬度字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "此鑰匙應該包含 XML 清單，它會指定自訂標頭，以及是否顯示它們。XML 結構的格式是 &lt;header enabled&gt; - 如果標頭會顯示在電郵檢視，則設定成 enabled。"
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"此鑰匙應該包含 XML 清單，它會指定自訂標頭，以及是否顯示它們。XML 結構的格式"
+"是 &lt;header enabled&gt; - 如果標頭會顯示在電郵檢視，則設定成 enabled。"
 
 # ui/evolution-mail.xml.h:93
 #: ../mail/evolution-mail.schemas.in.in.h:85
@@ -13906,7 +13818,9 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "檢視/回覆功能表項目已選取。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+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 標頭時，是否按照主旨放回線串。"
 
 # shell/e-shell-importer.c:363
@@ -13945,8 +13859,7 @@ msgstr "匯入 Berkeley 電郵箱格式資料夾"
 
 # shell/e-shell-importer.c:363
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:234
-#: ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "輸入 `%s'"
@@ -14074,8 +13987,7 @@ msgid "Mail to %s"
 msgstr "電郵送到 %s"
 
 # mail/mail-autofilter.c:229
-#: ../mail/mail-autofilter.c:243
-#: ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "電郵來自 %s "
@@ -14185,8 +14097,7 @@ msgstr "建立新電郵資料夾"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級電郵或資料夾失敗。"
 
-#: ../mail/mail-config.glade.h:1
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
@@ -14357,8 +14268,7 @@ msgstr "附加原始電郵"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
@@ -14464,6 +14374,11 @@ msgstr "完成"
 msgid "Drafts _Folder:"
 msgstr "草稿匣(_F):"
 
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "啟用(_E)"
+
 # mail/mail-config.glade.h:6
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
@@ -14552,7 +14467,9 @@ msgid "Message Composer"
 msgstr "電郵編輯器"
 
 #: ../mail/mail-config.glade.h:101
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "注意：在你首次連線之前將不會提示你輸入密碼"
 
 #: ../mail/mail-config.glade.h:102
@@ -14577,13 +14494,22 @@ msgstr ""
 
 # 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 "請輸入以下關於你寄送電郵方式的資訊。如果你不清楚，請聯絡你的系統管理員或網絡服務供應商。"
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"請輸入以下關於你寄送電郵方式的資訊。如果你不清楚，請聯絡你的系統管理員或網絡"
+"服務供應商。"
 
 # mail/mail-config-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 "請在下面輸入你的名稱及電郵地址。「選擇性」的欄位不一定要填，除非你希望在送出的電郵內包含這些資訊。"
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"請在下面輸入你的名稱及電郵地址。「選擇性」的欄位不一定要填，除非你希望在送出"
+"的電郵內包含這些資訊。"
 
 #: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
@@ -14709,7 +14635,9 @@ msgid "T_ype: "
 msgstr "類型(_Y):"
 
 #: ../mail/mail-config.glade.h:142
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "這裏的語言清單只反映出你已經安裝字典的語言。"
 
 #: ../mail/mail-config.glade.h:143
@@ -14730,8 +14658,7 @@ msgstr ""
 "輸入你想要用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
-#: ../mail/mail-config.glade.h:149
-#: ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
@@ -14850,8 +14777,7 @@ msgstr "區分大小寫(_S)"
 # 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:6
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
@@ -14865,8 +14791,7 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在電郵內尋找"
 
-#: ../mail/mail-dialogs.glade.h:10
-#: ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
@@ -14893,8 +14818,7 @@ msgstr "伺服器(_E):"
 msgid "Security Information"
 msgstr "保全性資訊"
 
-#: ../mail/mail-dialogs.glade.h:17
-#: ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14906,13 +14830,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "接受授權(_A)"
 
-#: ../mail/mail-dialogs.glade.h:20
-#: ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "到期於(_D):"
 
-#: ../mail/mail-dialogs.glade.h:21
-#: ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
@@ -14970,8 +14892,7 @@ msgstr "接收電郵"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../mail/mail-ops.c:577
-#: ../mail/mail-ops.c:606
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15000,8 +14921,7 @@ msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個電郵 (共 %d 個)"
 
 # mail/mail-send-recv.c:471
-#: ../mail/mail-ops.c:762
-#: ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "已取消。"
 
@@ -15078,8 +14998,7 @@ msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: ../mail/mail-ops.c:1613
-#: ../mail/mail-ops.c:1664
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
@@ -15178,8 +15097,7 @@ msgstr "檢查服務"
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:266
-#: ../mail/mail-send-recv.c:268
+#: ../mail/mail-send-recv.c:266 ../mail/mail-send-recv.c:268
 #, c-format
 msgid "<b>%s (%s)</b> : %s"
 msgstr "<b>%s (%s)</b> : %s"
@@ -15189,8 +15107,7 @@ msgstr "<b>%s (%s)</b> : %s"
 msgid "<b>%s (%s)</b>"
 msgstr "<b>%s (%s)</b>"
 
-#: ../mail/mail-send-recv.c:274
-#: ../mail/mail-send-recv.c:276
+#: ../mail/mail-send-recv.c:274 ../mail/mail-send-recv.c:276
 #, c-format
 msgid "<b>%s</b> : %s"
 msgstr "<b>%s</b> : %s"
@@ -15216,8 +15133,7 @@ msgstr "正在更新..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../mail/mail-send-recv.c:425
-#: ../mail/mail-send-recv.c:478
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "正在等待..."
 
@@ -15322,29 +15238,37 @@ msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "已經有名稱為「{1}」的資料夾存在。請使用不同的名稱。"
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 "「{1}」的非空白資料夾已經存在。\n"
 "\n"
 "你可以選擇忽略此資料夾、覆寫或附加它的內容或者結束。\n"
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr "「{1}」已要求傳送讀信回條。是否傳送讀信回條給 {0}？"
 
 #: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
+msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
 msgstr "已經有名稱為「{0}」的簽名檔存在。請使用不同的名稱。"
 
 #: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr "新增有意義的主旨行到你的電郵，可以讓收件者知道你的電郵和什麼事有關。"
 
 #: ../mail/mail.error.xml.h:9
@@ -15358,7 +15282,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "你確定要刪除這個帳號？"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器？"
 
 # mail/mail-callbacks.c:1017
@@ -15368,12 +15293,16 @@ msgstr "你確定要一次開啟 {0} 封電郵？"
 
 # ui/evolution-mail.xml.h:61
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+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:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
+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
@@ -15473,8 +15402,13 @@ msgid "Cannot open target &quot;{2}&quot;."
 msgstr "無法開啟目標「{2}」。"
 
 #: ../mail/mail.error.xml.h:34
-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}」，應該是安裝問題造成的。在你同意這項授權之前將無法使用它。"
+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}」，應該是安裝問題造成的。在你同意這項授權之前將無法"
+"使用它。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
@@ -15513,8 +15447,11 @@ msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "無法設定簽名程序檔「{0}」。"
 
 #: ../mail/mail.error.xml.h:41
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "檢查確定你的密碼拼字正確。請注意很多密碼區分大小寫；你可能啟動了大寫鎖定鍵。"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"檢查確定你的密碼拼字正確。請注意很多密碼區分大小寫；你可能啟動了大寫鎖定鍵。"
 
 # mail/mail-crypto.c:59
 #: ../mail/mail.error.xml.h:42
@@ -15605,7 +15542,9 @@ msgid "If you continue, you will not be able to recover these messages."
 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."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr "如果你刪除資料夾，所有它的內容和子資料夾內容會永久刪除。"
 
 #: ../mail/mail.error.xml.h:58
@@ -15625,7 +15564,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
 #: ../mail/mail.error.xml.h:62
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr "如果你結束，再次啟動 Evolution 之前，不會傳送這些電郵。"
 
 #: ../mail/mail.error.xml.h:63
@@ -15642,8 +15583,15 @@ msgid "Mail filters automatically updated."
 msgstr "電郵過濾器自動更新。"
 
 #: ../mail/mail.error.xml.h:66
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "很多電郵系統會新增 Apparently-To 標頭至只有密件副本收件者的電郵。如果加入了此標頭，會永遠列示電郵中所有的收件者。要避免此情況，你應該至少新增一個「收件者：」或「副本：」收件者。"
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"很多電郵系統會新增 Apparently-To 標頭至只有密件副本收件者的電郵。如果加入"
+"了此標頭，會永遠列示電郵中所有的收件者。要避免此情況，你應該至少新增一個「收"
+"件者：」或「副本：」收件者。"
 
 # ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:67
@@ -15677,12 +15625,17 @@ msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
 #: ../mail/mail.error.xml.h:75
-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 "請在「收件者：」欄位輸入一個有效的電郵地址。你可以按一下輸入方塊旁邊的「收件者：」按鈕，搜尋電郵地址。"
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"請在「收件者：」欄位輸入一個有效的電郵地址。你可以按一下輸入方塊旁邊的"
+"「收件者：」按鈕，搜尋電郵地址。"
 
 #: ../mail/mail.error.xml.h:76
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
@@ -15736,18 +15689,27 @@ msgid "Signature Already Exists"
 msgstr "簽名檔已經存在"
 
 #: ../mail/mail.error.xml.h:89
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Ximian Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪除。"
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+"Ximian Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動"
+"或刪除。"
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "你傳送的聯絡人清單是設定成隱藏清單收件者。\n"
 "\n"
-"很多電郵系統會新增 Apparently-To 標頭至只有密件副本收件者的電郵。如果新增此標頭，會列示電郵中所有的收件者。要避免此情況，你應該至少新增一個「收件者：」或「副本：」收件者。 "
+"很多電郵系統會新增 Apparently-To 標頭至只有密件副本收件者的電郵。如果新增"
+"此標頭，會列示電郵中所有的收件者。要避免此情況，你應該至少新增一個「收件"
+"者：」或「副本：」收件者。 "
 
 #: ../mail/mail.error.xml.h:93
 msgid ""
@@ -15779,10 +15741,13 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:103
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and resend."
+"The message was sent via the &quot;sendmail&quot; external application. "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
-"訊息已透過「sendmail」外部應用程式傳送。Sendmail 報告以下錯誤：狀態 67：未傳送電郵。\n"
+"訊息已透過「sendmail」外部應用程式傳送。Sendmail 報告以下錯誤：狀態 67：未傳"
+"送電郵。\n"
 "訊息儲存在「寄件信箱」資料夾。請檢查訊息的錯誤，然後重新傳送。"
 
 #: ../mail/mail.error.xml.h:105
@@ -15798,16 +15763,21 @@ msgstr ""
 "需要時，請移至搜尋資料夾編輯器，以手動方式新增它。"
 
 #: ../mail/mail.error.xml.h:108
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "因為你沒有啟用選擇用來寄送的帳號，所以無法傳送此電郵。"
 
 #: ../mail/mail.error.xml.h:109
-msgid "This message cannot be sent because you have not specified any Recipients"
-msgstr "因為你沒有指定任何收件者，所以無法傳送此電郵。"
+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:110
-msgid "This server does not support this type of authentication and may not support authentication at all."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
 # composer/e-msg-composer.c:941
@@ -15822,7 +15792,9 @@ 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?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替？"
 
 # mail/mail-ops.c:1728
@@ -15866,7 +15838,8 @@ msgstr "你必須指定一個資料夾。"
 #: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "你必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾，然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
@@ -15942,41 +15915,35 @@ msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: ../mail/message-list.c:1346
-#: ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../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:1353
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: ../mail/message-list.c:1362
-#: ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: ../mail/message-list.c:1374
-#: ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: ../mail/message-list.c:1382
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: ../mail/message-list.c:1384
-#: ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -16049,8 +16016,7 @@ 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
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "轉寄"
 
@@ -16060,15 +16026,13 @@ 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
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:79
 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
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply to All"
 msgstr "全部回覆"
 
@@ -16115,8 +16079,11 @@ msgid "Provides core functionality for local address books."
 msgstr "提供本地端行事曆的核心功能。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
-msgstr "用來顯示電郵中音效附件的格式外掛程式，它可以讓你在 evolution 中直接播放它們。"
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+"用來顯示電郵中音效附件的格式外掛程式，它可以讓你在 evolution 中直接播放它們。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -16172,8 +16139,7 @@ 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
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
 msgstr "備份與回存外掛程式。"
 
@@ -16194,37 +16160,44 @@ msgstr "回存設定值..."
 
 # addressbook/gui/component/e-address-widget.c:424
 # addressbook/gui/component/select-names/e-select-names-popup.c:347
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:429
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的聯絡人"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:438
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">自動加入的聯絡人</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid "_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:451
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr "在回覆電郵時自動在通訊錄中建立項目(_A)"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:472
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">即時傳訊的聯絡人</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
-msgid "Periodically synchronize contact information and images from my _instant messenger"
-msgstr "定期從我的即時傳訊軟件同步聯絡人資訊(_I)"
+#: ../plugins/bbdb/bbdb.c:485
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr "定期從 gaim 的好友清單同步聯絡人資訊"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:502
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-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 聯絡人資訊。"
+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 "
+"聯絡人資訊。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16233,8 +16206,7 @@ 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
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
@@ -16328,8 +16300,12 @@ msgid "Weather Calendars"
 msgstr "氣象行事曆"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
-msgstr "用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓你複製東西到剪貼簿裏。"
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+"用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓你複製東西到剪貼簿"
+"裏。"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
@@ -16344,7 +16320,8 @@ msgid "Check whether Evolution is the default mailer"
 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."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "每次啟動 Evolution 時，檢查它是否為預設的電郵程式。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -16374,7 +16351,9 @@ msgid "Default Sources"
 msgstr "預設來源"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Provides functionallity for marking a calendar or addressbook as the default one."
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
 msgstr "提供標記預設行事曆或通訊錄的功能。"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -16400,7 +16379,9 @@ msgstr "保全密碼"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
 msgstr "此選項將會連線到使用保全密碼 (NTLM) 驗證的 Exchange 伺服器。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
@@ -16408,7 +16389,9 @@ msgid "Plaintext Password"
 msgstr "純文字密碼"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
@@ -16489,12 +16472,12 @@ msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
 # mail/mail-config.glade.h:11
-#: ../plugins/exchange-operations/exchange-account-setup.c:833
+#: ../plugins/exchange-operations/exchange-account-setup.c:838
 msgid "Authentication Type"
 msgstr "驗證類型"
 
 # mail/mail-config.glade.h:1
-#: ../plugins/exchange-operations/exchange-account-setup.c:847
+#: ../plugins/exchange-operations/exchange-account-setup.c:852
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
@@ -16511,7 +16494,9 @@ msgstr ""
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:115
-msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
 msgstr "目前的密碼不符合你帳戶的現存密碼。請輸入正確的密碼"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
@@ -16790,7 +16775,9 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "訂閱其他使用者的行事曆"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "A plugin that handles a collection of Exchange account specific operations and features."
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
 msgstr "處理 Exchange 帳號指定操作與功能集合的外掛程式。"
 
 # ui/evolution-event-editor.xml.h:9
@@ -16808,7 +16795,9 @@ msgid "Cannot display folders."
 msgstr "無法顯示資料夾。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
+msgid ""
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr "對 Exchange 帳戶組態的更改將會在你結束並重新啟動 Evolution 之後生效。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
@@ -16931,7 +16920,9 @@ msgid "Generic error"
 msgstr "一般錯誤"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
 msgstr "如果 OWA 在別的路徑執行，你必須在帳號組態對話方塊中指定。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
@@ -17064,16 +17055,24 @@ msgid "You may only configure a single Exchange account."
 msgstr "你可以只設定一個單一的 Exchange 帳戶。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr "目前的使用量為：{0} KB。請試着刪除一些電郵來空出部分空間。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr "目前的使用量為：{0} KB。你現在將無法傳送或接收電郵。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-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。除非你刪除一些電郵來空出部分空間，否則將無法傳送電郵。"
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+"目前的使用量為：{0} KB。除非你刪除一些電郵來空出部分空間，否則將無法傳送郵"
+"件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -17165,8 +17164,7 @@ 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:14
-#: ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "傳送選項"
@@ -17268,7 +17266,7 @@ msgid "Subscribe to my _notifications"
 msgstr "訂閱至我的通知(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Read"
 msgstr "閱讀(_R)"
 
@@ -17351,11 +17349,11 @@ msgstr "Hula 帳號設定"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: ../plugins/import-ics-attachments/icsimporter.c:81
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
 msgstr "匯入至行事曆(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:86
+#: ../plugins/import-ics-attachments/icsimporter.c:88
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
@@ -17364,23 +17362,23 @@ msgstr "匯入至工作(_I)"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: ../plugins/import-ics-attachments/icsimporter.c:196
+#: ../plugins/import-ics-attachments/icsimporter.c:197
 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:224
+#: ../plugins/import-ics-attachments/icsimporter.c:225
 msgid "Select Task List"
 msgstr "選擇工作清單"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:229
 msgid "Select Calendar"
 msgstr "選擇行事曆"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../plugins/import-ics-attachments/icsimporter.c:260
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "匯入(_I)"
@@ -17409,12 +17407,13 @@ msgid "No output directory!"
 msgstr "沒有輸出目錄！"
 
 #: ../plugins/ipod-sync/sync.c:159
-msgid "The output directory was not found on iPod! Please ensure that iPod has been correctly set up and try again."
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"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
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
 msgstr "無法匯出資料！"
 
@@ -17547,7 +17546,9 @@ msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "此電郵宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
 # ui/evolution-calendar.xml.h:22
@@ -17560,15 +17561,20 @@ msgstr "行事曆中的項目是無效的"
 #: ../plugins/itip-formatter/itip-formatter.c:1184
 #: ../plugins/itip-formatter/itip-formatter.c:1199
 #: ../plugins/itip-formatter/itip-formatter.c:1275
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "此電郵確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"此電郵確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1209
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1210
-msgid "To process all of these items, the file should be saved and the calendar imported"
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
 #. Delete message after acting
@@ -17591,10 +17597,8 @@ msgid "Conflict Search Table"
 msgstr "衝突的搜尋表格"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184
-#: ../ui/evolution-calendar.xml.h:32
-#: ../widgets/misc/e-cell-date-edit.c:241
-#: ../widgets/misc/e-dateedit.c:467
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "今天"
 
@@ -17801,7 +17805,8 @@ msgstr "<b>%s</b> 希望加入一個既存的會議："
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -17871,7 +17876,9 @@ msgstr "<b>%s</b> 希望加入一項既存的工作："
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
 #: ../plugins/itip-formatter/itip-view.c:438
@@ -18001,7 +18008,9 @@ msgid "Itip Formatter"
 msgstr "Itip 格式器"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot; ?"
 msgstr "「{0}」已代理此會議。你是否要加入代理人「{1}」？"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -18009,7 +18018,8 @@ msgid "This meeting has been delegated"
 msgstr "這個會議已委派"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將寄件人加入為到會者？"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -18046,7 +18056,8 @@ msgid "No store available"
 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."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr "實作 CORBA 介面以存取遠端電郵資料的外掛程式。"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
@@ -18054,7 +18065,9 @@ msgid "Mail Remote"
 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."
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
 msgstr "可以從電郵訊息的內容建立會議的外掛程式。"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
@@ -18066,7 +18079,9 @@ msgid "Mail to meeting"
 msgstr "寄信到會議"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "A plugin which allows the creation of tasks from the contents of a mail message."
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
 msgstr "可以從電郵訊息的內容建立工作的外掛程式。"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
@@ -18111,7 +18126,9 @@ msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe, ...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr "提供一般通信論壇指令的動作 （訂閱、取消訂閱…）。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -18136,11 +18153,14 @@ msgstr "無法使用動作"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"即將寄出一封電郵至 URL \"{0}\"。你可以自動送出電郵，或是先查看並做些改變。\n"
+"即將寄出一封電郵至 URL \"{0}\"。你可以自動送出電郵，或是先查看並做些改"
+"變。\n"
 "\n"
 "在這封電郵送出後不久你應該會收到來自通信論壇的回應。"
 
@@ -18162,8 +18182,12 @@ msgid "Posting not allowed"
 msgstr "不允許張貼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-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 ""
+"對此通信論壇的張貼是不被允許的。這可能是一個唯讀的通信論壇。請聯絡論壇的管理"
+"者以取得進一步資訊。"
 
 # ui/evolution-contact-editor.xml.h:13
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -18172,7 +18196,8 @@ msgstr "傳送電郵到通信論壇？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18191,7 +18216,9 @@ msgstr ""
 "檔頭： {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "這封電郵沒有包含此動作所需的檔頭資訊"
 
 # mail/mail-ops.c:603
@@ -18347,7 +18374,8 @@ msgstr "外掛程式"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML messages.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
@@ -18386,10 +18414,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "提供自電郵編輯器列印電郵的選項"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
@@ -18432,7 +18458,7 @@ msgstr "發佈行事曆資訊(_P)"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../plugins/publish-calendar/publish-calendar.c:372
+#: ../plugins/publish-calendar/publish-calendar.c:386
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
 
@@ -18508,7 +18534,9 @@ msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (內置)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed."
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
 msgstr "使用 Spamassassin 過濾垃圾電郵。這個外掛程式需要安裝 Spamassassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
@@ -18520,8 +18548,7 @@ 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
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
 msgstr "儲存附加檔案"
 
@@ -18547,8 +18574,8 @@ msgid "MIME Type"
 msgstr "MIME 類型"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:11
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save"
 msgstr "儲存"
 
@@ -18714,7 +18741,8 @@ msgstr "歡迎使用"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -18813,7 +18841,8 @@ msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
 # ui/evolution-event-editor.xml.h:9
@@ -18826,13 +18855,13 @@ msgstr "印表機設定"
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
-#: ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level"
 msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示"
 
 # ui/evolution.xml.h:32
@@ -18851,12 +18880,19 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level"
 msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
-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 工具列設定值決定。"
+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 工具列設定值決定。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
@@ -18871,7 +18907,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
@@ -18914,9 +18951,11 @@ msgstr "選擇匯入服務要執行的類型："
 # shell/e-shell-importer.c:97
 #: ../shell/e-shell-importer.c:138
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 "選取要匯入 Evolution 的檔案，並且在清單內選定檔案類型。\n"
 "\n"
@@ -18965,8 +19004,8 @@ msgstr "匯入單一檔案(_S)"
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Evolution 設定值"
+msgid "Evolution Preferences"
+msgstr "Evolution 偏好設定"
 
 # camel/camel-pgp-context.c:1073
 #: ../shell/e-shell-utils.c:118
@@ -19033,8 +19072,7 @@ msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: ../shell/e-shell-window-commands.c:788
-#: ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19068,15 +19106,13 @@ msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../shell/e-shell.c:831
-#: ../shell/e-shell.c:832
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: ../shell/e-shell.c:1269
-#: ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
@@ -19269,8 +19305,11 @@ msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
 
 #: ../shell/shell.error.xml.h:5
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "遺忘你的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示你輸入。"
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"遺忘你的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示你輸入。"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -19284,15 +19323,20 @@ msgstr "確定要刪除舊資料？"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
 msgstr ""
 "「evolution」目錄的所有內容即將永久移除。\n"
 "\n"
-"建議你手動檢查所有的電郵、聯絡人和行事曆資料是否顯示，而且此 Evolution 版本在刪除舊資料前能正確作業。\n"
+"建議你手動檢查所有的電郵、聯絡人和行事曆資料是否顯示，而且此 Evolution 版"
+"本在刪除舊資料前能正確作業。\n"
 "\n"
 "刪除之後，未經手動操作，便無法降級至舊的 Evolution 版本。\n"
 
@@ -19300,11 +19344,15 @@ msgstr ""
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
 msgstr ""
 "舊的 Evolution 版本將其資料儲存在不同的位置。\n"
 "\n"
-"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資料，就可以在方便的時候，手動移除「evolution」的內容。\n"
+"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資"
+"料，就可以在方便的時候，手動移除「evolution」的內容。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19312,9 +19360,11 @@ msgstr "從以前的版本升級失敗：{0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you can continue."
+"You will need to make more space available in your home directory before you "
+"can continue."
 msgstr ""
 "升級你的資料和設定值最多會需要 {0} 磁碟空間，但是你只有 {1} 可用。\n"
 "\n"
@@ -19361,7 +19411,8 @@ msgstr "稍後提醒我(_R)"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{1}\n"
 "\n"
@@ -19379,12 +19430,22 @@ msgstr ""
 "編輯信任設定值："
 
 #: ../smime/gui/cert-trust-dialog.c:153
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "因為你信任發出此證書的證書單位，所以除非在此指示，否則你將信任此證書的有效性。"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"因為你信任發出此證書的證書單位，所以除非在此指示，否則你將信任此證書的有效"
+"性。"
 
 #: ../smime/gui/cert-trust-dialog.c:157
-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 "因為你不信任發出此證書的證書單位，所以除非在此指示，否則你將不信任此證書的有效性。"
+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 ""
+"因為你不信任發出此證書的證書單位，所以除非在此指示，否則你將不信任此證書的有"
+"效性。"
 
 # mail/mail-account-gui.c:682
 #: ../smime/gui/certificate-manager.c:136
@@ -19408,8 +19469,7 @@ msgstr "證書名稱"
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "序號"
@@ -19526,11 +19586,13 @@ msgid "Backup All"
 msgstr "全部備份"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "信任此 CA 的任何用途前，你應該檢查它的證書以及它的政策和程序 (如果可以的話)。"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"信任此 CA 的任何用途前，你應該檢查它的證書以及它的政策和程序 (如果可以的話)。"
 
-#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "證書"
 
@@ -19620,13 +19682,11 @@ msgstr "組織單位 (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "SSL 用戶端證書"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "SSL 伺服器證書"
 
@@ -19659,7 +19719,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "你已經從可以識別你身份的組織取得證書:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "你已經擁有檔案的相關證書，可以識別這些證書單位:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -19684,8 +19745,7 @@ msgstr "證書已經存在"
 # 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
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -19769,13 +19829,11 @@ msgid "Subject's Public Key"
 msgstr "主旨的公開密碼匙"
 
 # camel/camel-filter-driver.c:652
-#: ../smime/lib/e-cert.c:810
-#: ../smime/lib/e-cert.c:859
+#: ../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
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "物件簽名者"
 
@@ -19824,8 +19882,7 @@ msgstr "CRL 簽名者"
 msgid "Critical"
 msgstr "重要"
 
-#: ../smime/lib/e-cert.c:941
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "不重要"
 
@@ -19839,8 +19896,7 @@ msgid "%s = %s"
 msgstr "%s = %s"
 
 # mail/mail-crypto.c:59
-#: ../smime/lib/e-cert.c:1092
-#: ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "證書簽名演算法"
 
@@ -19916,160 +19972,261 @@ 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:2
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "聯絡人預覽(_P)"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../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:5
-#: ../ui/evolution-calendar.xml.h:2
+#: ../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:6
+#: ../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:7
-#: ../ui/evolution-composer-entries.xml.h:5
-#: ../ui/evolution-memos.xml.h:4
+#: ../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:8
-#: ../ui/evolution-calendar.xml.h:3
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../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:14
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-memos.xml.h:8
+#: ../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:15
-#: ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:15
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
 # ui/evolution-calendar.xml.h:22
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "預覽將要列印的聯絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 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:21
+#: ../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:22
-#: ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
 msgid "Select All"
 msgstr "全選"
 
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "全選(_A)"
+
 # ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "選擇全部聯絡人"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../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:25
+#: ../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:26
+#: ../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:27
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "顯示聯絡人預覽視窗"
 
 # ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../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:29
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "停止載入"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "檢視目前的聯絡人"
 
-#: ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-list.xml.h:29 ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "執行(_A)"
 
-#: ../ui/evolution-addressbook.xml.h:36
+# calendar/gui/e-calendar-table.c:714
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "複製聯絡人到(_C)..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "複製資料夾聯絡人到(_C)"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "刪除聯絡人(_D)"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "轉寄聯絡人(_F)..."
 
-# ui/evolution-event-editor.xml.h:72
-# ui/evolution-task-editor-dialog.xml.h:86
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "全選(_S)"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "將聯絡人移到(_M)..."
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "將資料夾聯絡人移到(_M)"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:40
+msgid "_New"
+msgstr "新增(_N)"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "重新命名(_R)"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "將聯絡人儲存為 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)..."
 
@@ -20124,8 +20281,7 @@ msgstr "月"
 # 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:14
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:57
 msgid "Next"
 msgstr "下一個"
 
@@ -20138,8 +20294,7 @@ msgstr "預覽將要列印的行事曆內容"
 # 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:17
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:73
 msgid "Previous"
 msgstr "上一個"
 
@@ -20148,8 +20303,7 @@ msgstr "上一個"
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "清除(_E)"
 
@@ -20220,8 +20374,7 @@ msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-composer-entries.xml.h:2
-#: ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "複製選取的文字至剪貼簿"
 
@@ -20232,8 +20385,7 @@ 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
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "剪下選取的文字至剪貼簿"
 
@@ -20251,26 +20403,17 @@ 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:10
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../ui/evolution-composer-entries.xml.h:11
-#: ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "全選(_A)"
-
 # ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 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
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附加"
 
@@ -20301,41 +20444,29 @@ msgstr "按這裏以檢視可用的說明"
 # 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"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "關閉"
 
-#: ../ui/evolution-editor.xml.h:14
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../ui/evolution-editor.xml.h:15
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../ui/evolution-editor.xml.h:18
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:35
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -20347,120 +20478,108 @@ msgstr "插入(_I)"
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:2
+# calendar/gui/e-calendar-table.c:162
+#: ../ui/evolution-event-editor.xml.h:1
+msgid "Alar_ms"
+msgstr "鬧鈴(_M)"
+
+#: ../ui/evolution-event-editor.xml.h:3
 msgid "All day Event"
 msgstr "全天事件"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../ui/evolution-event-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
 msgstr "分類為機密"
 
-#: ../ui/evolution-event-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
 msgstr "分類為私人"
 
-#: ../ui/evolution-event-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
 msgstr "按這裏以設定或取消這個事件的鬧鈴"
 
-#: ../ui/evolution-event-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "插入進階傳送選項"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: ../ui/evolution-event-editor.xml.h:9
+#: ../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:10
-#: ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:12
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../ui/evolution-event-editor.xml.h:12
-#: ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as b_usy"
 msgstr "顯示時間為忙碌(_U)"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../ui/evolution-event-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:17
-#: ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:18
-#: ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:19
-#: ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:20
-#: ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
 # ui/evolution-message-composer.xml.h:39
-#: ../ui/evolution-event-editor.xml.h:21
-#: ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:22
-#: ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All day Event"
 msgstr "切換是否要有全天事件"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../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:25
-msgid "_Alarms"
-msgstr "鬧鈴(_A)"
-
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_All day Event"
 msgstr "全天事件(_A)"
@@ -20468,39 +20587,43 @@ msgstr "全天事件(_A)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-#: ../ui/evolution-event-editor.xml.h:28
-#: ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../ui/evolution-event-editor.xml.h:29
-#: ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-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:30
-#: ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:31
-#: ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:32
-#: ../ui/evolution-task-editor.xml.h:24
+# calendar/gui/event-editor-dialog.glade.h:18
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "週期性(_R)"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:33
-#: ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
@@ -20533,23 +20656,26 @@ msgstr "為新電郵建立或編輯過濾規則"
 msgid "Empty _Trash"
 msgstr "清空垃圾桶(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:10
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "資料夾(_O)"
 
+# views/mail/galview.xml.h:4
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _List As"
+msgstr "將電郵排列為(_L)"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
 msgstr "電郵預覽(_P)"
 
 # ui/evolution-mail.xml.h:56
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:11
 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:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的電郵"
@@ -20581,14 +20707,16 @@ msgstr "電郵規則(_M)"
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)..."
 
+# mail/mail-account-gui.c:682
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr "新增搜尋資料夾(_N)"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
 msgstr "新增(_N)..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
 msgstr "訂閱(_S)"
 
@@ -20612,115 +20740,112 @@ msgid "Collapse all message threads"
 msgstr "收摺所有的相關電郵"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:11
 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
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:6 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "將電郵剪下並貼到剪貼簿"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "E_xpand All Threads"
 msgstr "展開所有相關電郵(_X)"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
 # ui/evolution-mail.xml.h:51
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Expand all message threads"
 msgstr "展開所有的相關電郵"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "Hide S_elected Messages"
 msgstr "隱藏選擇的電郵(_E)"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide _Deleted Messages"
 msgstr "隱藏已刪除電郵(_D)"
 
-#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:13
 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"
+#: ../ui/evolution-mail-list.xml.h:14
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "隱藏已刪除的電郵而非將它們以刪除線的形式顯示"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Mar_k 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
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-list.xml.h:16 ../ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上電郵"
 
 # ui/evolution-mail.xml.h:62
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的電郵"
 
 # ui/evolution-mail.xml.h:62
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select Message _Thread"
 msgstr "選擇電郵檔頭(_T)"
 
 # ui/evolution-mail.xml.h:80
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select _All Messages"
 msgstr "選擇全部的電郵(_A)"
 
 # ui/evolution-mail.xml.h:78
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 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
+#: ../ui/evolution-mail-list.xml.h:22
 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
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all visible messages"
 msgstr "選擇全部可見的電郵"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Sh_ow Hidden Messages"
 msgstr "顯示隱藏的電郵(_O)"
 
 # ui/evolution-mail.xml.h:88
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Show messages that have been temporarily hidden"
 msgstr "顯示暫時隱藏的電郵"
 
 # ui/evolution-mail.xml.h:91
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Temporarily hide all messages that have already been read"
 msgstr "將已閱讀的電郵暫時隱藏"
 
 # ui/evolution-mail.xml.h:92
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide the selected messages"
 msgstr "將選定的電郵暫時隱藏"
 
 # ui/evolution-mail.xml.h:93
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Threaded Message list"
 msgstr "相關電郵清單"
 
@@ -20728,8 +20853,7 @@ msgstr "相關電郵清單"
 msgid "_Group By Threads"
 msgstr "依相關電郵為群組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:32
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "電郵(_M)"
@@ -20743,506 +20867,503 @@ msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
 # addressbook/gui/component/addressbook-config.c:662
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
 msgstr "所有電郵檔頭(_H)"
 
 # ui/evolution-mail.xml.h:1
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的電郵"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
 msgstr "檢查垃圾電郵(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "撰寫新電郵(_N)"
 
 # ui/evolution-mail.xml.h:6
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 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
+#: ../ui/evolution-mail-message.xml.h:9
 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
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的電郵的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的電郵到另一個資料夾"
 
 # ui/evolution.xml.h:10
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create R_ule"
 msgstr "建立規則(_U)"
 
 # ui/evolution-mail.xml.h:15
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a Search Folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:18
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:11
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:12
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:13
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 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
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "減少文字大小"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "顯示下一封重要的電郵"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "顯示下一封電郵"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的電郵"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "顯示下一封未閱讀的相關電郵"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的電郵"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "顯示上一封電郵"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的電郵"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "轉寄為(_O)..."
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "通信論壇過濾器(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "寄件者過濾器(_N)..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "收件者過濾器(_R)..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "主旨過濾器(_S)..."
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾電郵狀態"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "將選定的電郵加上跟隨標幟"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "跟隨(_U)..."
 
 # ui/evolution-mail.xml.h:30
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的電郵時強迫載入圖像"
 
 # ui/evolution-mail.xml.h:38
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 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
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的電郵以回覆電郵方式寄出"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "將選定的電郵轉寄給某人"
 
 # ui/evolution-mail.xml.h:41
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 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
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "增加文字大小"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "標示成(_K)"
 
 # ui/evolution-mail.xml.h:52
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "將選定的電郵標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "將選定的電郵標示成重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "將選取的電郵標示成垃圾電郵"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "將選取的電郵標示成不是垃圾電郵"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "將選定的電郵標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "將選定的電郵標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的電郵標示成要刪除"
 
 # ui/evolution-mail.xml.h:56
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Move selected message(s) to another folder"
 msgstr "將選定的電郵移至另一個資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Next _Important Message"
 msgstr "下一封重要電郵(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Thread"
 msgstr "下一封相關電郵(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的電郵(_U)"
 
 # calendar/gui/calendar-commands.c:266
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Not Junk"
 msgstr "不是垃圾電郵"
 
 # ui/evolution-mail.xml.h:58
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫電郵"
 
 # ui/evolution-mail.xml.h:59
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in a new window"
 msgstr "使用新視窗開啟選定的電郵"
 
 # ui/evolution-mail.xml.h:60
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected message in the composer for editing"
 msgstr "在撰寫視窗開啟選取的電郵來編輯"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的電郵(_R)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Pos_t New Message to Folder"
 msgstr "張貼新電郵到資料夾(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Post a Repl_y"
 msgstr "張貼回覆(_Y)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a message to a Public folder"
 msgstr "張貼新電郵到公開資料夾"
 
 # ui/evolution-message-composer.xml.h:25
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a reply to a message in a Public folder"
 msgstr "張貼電郵的回覆至公開資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Pr_evious Important Message"
 msgstr "上一封重要電郵(_E)"
 
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的電郵"
 
 # mail/mail-callbacks.c:1407
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Print this message"
 msgstr "列印電郵"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的電郵重新導向給某人"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:74
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "另存電郵成文字檔案"
 
 # ui/evolution-mail.xml.h:95
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:97
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Recipients..."
 msgstr "收件者搜尋資料夾..."
 
 # ui/evolution-mail.xml.h:98
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
 # ui/evolution-mail.xml.h:96
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 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
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
 # ui/evolution-mail.xml.h:80
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 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
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "設定你目前印表機的版面設定"
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 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
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示電郵"
 
 # ui/evolution-mail.xml.h:87
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message with all email headers"
 msgstr "顯示電郵及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "顯示電郵原始檔"
 
 # ui/evolution-mail.xml.h:94
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Un-delete the selected messages"
 msgstr "復原選定的電郵"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
 # ui/evolution-message-composer.xml.h:1
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "已附加(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "刪除電郵(_D)"
 
 # mail/mail-search.c:268
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "在電郵內尋找(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "標幟已完成(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "重要(_I)"
 
 # mail/mail-config.glade.h:37
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "行內(_I)"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "垃圾電郵(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "電郵來源(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "下一封電郵(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "一般大小(_N)"
 
 # calendar/gui/calendar-commands.c:266
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "不是垃圾電郵(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "上一封電郵(_P)"
 
 # mail/mail-config.glade.h:56
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "已引用(_Q)"
 
 # mail/mail-callbacks.c:1188
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Save Message..."
 msgstr "儲存電郵(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Undelete Message"
 msgstr "復原刪除電郵(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
+#: ../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
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -21295,13 +21416,8 @@ 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"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "關閉目前檔案"
 
@@ -21321,7 +21437,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用你的 S/MIME 加密證書將這封電郵加密"
 
 #: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "格式(_M)"
 
@@ -21334,7 +21450,7 @@ msgid "HT_ML"
 msgstr "HT_ML"
 
 #: ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "I_nsert"
 msgstr "插入(_N)"
 
@@ -21398,6 +21514,7 @@ msgstr "儲存至資料夾..."
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-task-editor-dialog.xml.h:53
 #: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
@@ -21413,7 +21530,7 @@ msgstr "將電郵儲存至指定的資料夾"
 
 # ui/evolution-message-composer.xml.h:29
 #: ../ui/evolution-message-composer.xml.h:30
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:12
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送電郵"
 
@@ -21511,26 +21628,23 @@ msgstr "數件者欄位(_T)"
 msgid "C_lose"
 msgstr "關閉(_L)"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 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
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and Close"
 msgstr "儲存後關閉"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save and _Close"
 msgstr "儲存後關閉(_C)"
 
 # ui/evolution-contact-editor.xml.h:10
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Save the current file and close the window"
 msgstr "儲存這個檔案並關閉視窗"
 
@@ -21572,22 +21686,23 @@ msgstr "反向選擇(_I)"
 msgid "Click change / view the status details of the task"
 msgstr "按這裏以改變/檢視該工作的詳細狀態資訊"
 
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "顯示時區(_Z)"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: ../ui/evolution-task-editor.xml.h:10
+#: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
 msgstr "狀態詳細資料"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
 msgstr "時區"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+# 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)"
 
@@ -21690,14 +21805,17 @@ msgstr "只顯示視窗按鈕的圖示"
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-# ui/evolution.xml.h:19
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
 #: ../ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr "離開這個程式"
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
 
+# ui/evolution.xml.h:19
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "遺忘密碼(_P)"
+msgid "Exit the program"
+msgstr "離開這個程式"
 
 # ui/evolution-mail.xml.h:32
 #: ../ui/evolution.xml.h:12
@@ -21759,79 +21877,79 @@ msgstr "顯示 Evolution 相關資訊"
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:26
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:27
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:34
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:22
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar"
 msgstr "工具列(_B)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:30
 msgid "Tool_bar style"
 msgstr "工具列風格(_B)"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:31
 msgid "View/Hide the Status Bar"
 msgstr "顯示/隱藏狀態列"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:32
 msgid "_About"
 msgstr "關於(_A)"
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:33
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:36
+msgid "_Forget Passwords"
+msgstr "遺忘密碼(_F)"
+
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "隱藏按鈕(_H)"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:43
-msgid "_New"
-msgstr "新增(_N)"
-
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:41
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:42
+msgid "_Quit"
+msgstr "離開(_Q)"
+
+#: ../ui/evolution.xml.h:43
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:44
 msgid "_Synchronization Options..."
 msgstr "同步化選項(_S)..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:45
 msgid "_Text only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:47
 msgid "_View Status Bar"
 msgstr "檢視狀態列(_V)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:48
 msgid "_Window"
 msgstr "視窗(_O)"
 
@@ -21931,7 +22049,8 @@ msgstr "時區組合式方塊 "
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "使用滑鼠左鍵拉近地圖的區域，然後選取時區。\n"
@@ -22056,8 +22175,7 @@ msgstr "%B %Y"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ../widgets/misc/e-calendar.c:177
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr "上一步按鈕"
 
@@ -22068,10 +22186,8 @@ msgid "Month Calendar"
 msgstr "月行事曆"
 
 #: ../widgets/misc/e-canvas-background.c:459
-#: ../widgets/misc/e-canvas-background.c:460
-#: ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
 #: ../widgets/text/e-text.c:3569
 msgid "Fill color"
 msgstr "填入色彩"
@@ -22079,23 +22195,17 @@ msgstr "填入色彩"
 #: ../widgets/misc/e-canvas-background.c:466
 #: ../widgets/misc/e-canvas-background.c:467
 #: ../widgets/misc/e-canvas-background.c:473
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3575
-#: ../widgets/text/e-text.c:3576
-#: ../widgets/text/e-text.c:3583
+#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
 #: ../widgets/text/e-text.c:3584
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
 #: ../widgets/misc/e-canvas-background.c:480
-#: ../widgets/misc/e-canvas-background.c:481
-#: ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3590
+#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
 #: ../widgets/text/e-text.c:3591
 msgid "Fill stipple"
 msgstr "填入網點"
@@ -22120,16 +22230,14 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102
-#: ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3017
 msgid "Minimum width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-reflow.c:1431
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-item.c:3018
@@ -22137,16 +22245,14 @@ 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-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
 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
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "現在"
 
@@ -22210,16 +22316,13 @@ msgid "Western European, New"
 msgstr "西歐語系，新"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: ../widgets/misc/e-charset-picker.c:91
-#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "繁體"
 
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "簡體"
 
@@ -22297,8 +22400,7 @@ msgstr "時刻的組合式方塊"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1445
-#: ../widgets/misc/e-dateedit.c:1772
+#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -22307,8 +22409,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1448
-#: ../widgets/misc/e-dateedit.c:1775
+#: ../widgets/misc/e-dateedit.c:1448 ../widgets/misc/e-dateedit.c:1775
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -22333,7 +22434,9 @@ msgid "Use underline"
 msgstr "使用底線"
 
 #: ../widgets/misc/e-expander.c:198
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr "如果設定，文字的底線會指示字元應該當成加速鍵"
 
 #: ../widgets/misc/e-expander.c:206
@@ -22348,13 +22451,11 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3324
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
 msgid "Expander Size"
 msgstr "展開器大小"
 
-#: ../widgets/misc/e-expander.c:223
-#: ../widgets/table/e-tree.c:3325
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
@@ -22380,19 +22481,16 @@ msgstr "搜尋"
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
-#: ../widgets/misc/e-filter-bar.h:92
-#: ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:93
-#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
 # widgets/misc/e-filter-bar.c:239
-#: ../widgets/misc/e-filter-bar.h:94
-#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
@@ -22407,8 +22505,12 @@ msgid "World Map"
 msgstr "世界地圖"
 
 #: ../widgets/misc/e-map.c:653
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
-msgstr "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選擇時區。"
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+"用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選"
+"擇時區。"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22424,18 +22526,15 @@ msgid "Sync Categories:"
 msgstr "同步分類:"
 
 # mail/mail-ops.c:603
-#: ../widgets/misc/e-reflow.c:1452
-#: ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
 msgid "Empty message"
 msgstr "空白電郵"
 
-#: ../widgets/misc/e-reflow.c:1459
-#: ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1466
-#: ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
 msgid "Column width"
 msgstr "欄寬"
 
@@ -22454,8 +22553,7 @@ msgstr "尋找(_S)"
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:598
-#: ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
 msgid "_Clear"
 msgstr "清除(_C)"
 
@@ -22472,10 +22570,8 @@ msgstr "項目 ID"
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:907
-#: ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250
-#: ../widgets/text/e-text.c:3490
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
 #: ../widgets/text/e-text.c:3491
 msgid "Text"
 msgstr "文字"
@@ -22839,13 +22935,11 @@ msgstr "排序(_S)..."
 msgid "State"
 msgstr "狀態"
 
-#: ../widgets/table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 msgid "(Ascending)"
 msgstr "(遞增)"
 
-#: ../widgets/table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 msgid "(Descending)"
 msgstr "(遞減)"
 
@@ -22939,8 +23033,7 @@ msgstr "%s (%d 個項目)"
 #: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975
-#: ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
@@ -22948,10 +23041,8 @@ msgstr "列與列間交替使用的色彩"
 #: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982
-#: ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3277
-#: ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
@@ -22960,10 +23051,8 @@ msgstr "水平繪圖格"
 #: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989
-#: ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3283
-#: ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
+#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
@@ -22971,10 +23060,8 @@ msgstr "垂直繪圖格"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996
-#: ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3289
-#: ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
+#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
@@ -22982,8 +23069,7 @@ msgstr "繪圖焦點"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003
-#: ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
 msgid "Cursor mode"
 msgstr "游標模式"
 
@@ -22991,8 +23077,7 @@ msgstr "游標模式"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968
-#: ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
 msgid "Selection model"
 msgstr "選擇區模型"
 
@@ -23000,10 +23085,8 @@ msgstr "選擇區模型"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3316
-#: ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
 #: ../widgets/table/e-tree.c:3272
 msgid "Length Threshold"
 msgstr "界限長度"
@@ -23012,10 +23095,8 @@ msgstr "界限長度"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
 #: ../widgets/table/e-tree.c:3304
 msgid "Uniform row height"
 msgstr "標準列高"
@@ -23079,8 +23160,7 @@ msgid "Customize Current View..."
 msgstr "自訂目前的檢視..."
 
 # addressbook/printing/e-contact-print.glade.h:8
-#: ../widgets/table/e-table-header-item.c:1817
-#: ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "字型組"
@@ -23097,23 +23177,19 @@ msgstr "排序資訊"
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:2954
-#: ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:2961
-#: ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3330
-#: ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
 #: ../widgets/table/e-tree.c:3311
 msgid "Always search"
 msgstr "總是搜尋"
@@ -23123,8 +23199,7 @@ msgstr "總是搜尋"
 msgid "Use click to add"
 msgstr "請按這裏加入"
 
-#: ../widgets/table/e-tree.c:3296
-#: ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
@@ -23152,103 +23227,76 @@ msgstr "這可以測試迷你咭片畫布項目"
 # 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:3483
-#: ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
 msgid "Event Processor"
 msgstr "事件處理器"
 
-#: ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257
+#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
 msgid "Font"
 msgstr "字型"
 
-#: ../widgets/text/e-entry.c:1270
-#: ../widgets/text/e-entry.c:1271
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
 msgid "GDKFont"
 msgstr "GDK字型"
 
-#: ../widgets/text/e-entry.c:1277
-#: ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3519
-#: ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
 msgid "Justification"
 msgstr "左右對齊"
 
-#: ../widgets/text/e-entry.c:1319
-#: ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3619
-#: ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
-#: ../widgets/text/e-entry.c:1326
-#: ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3626
-#: ../widgets/text/e-text.c:3627
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-entry.c:1333
-#: ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3633
-#: ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
 msgid "Line wrap"
 msgstr "折行"
 
-#: ../widgets/text/e-entry.c:1340
-#: ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3640
-#: ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
 msgid "Break characters"
 msgstr "中斷字元"
 
-#: ../widgets/text/e-entry.c:1347
-#: ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3647
-#: ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-entry.c:1354
-#: ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3676
-#: ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
 msgid "Allow newlines"
 msgstr "允許新行"
 
-#: ../widgets/text/e-entry.c:1361
-#: ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3669
-#: ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-entry.c:1368
-#: ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3683
-#: ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Draw background"
 msgstr "繪製背景"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: ../widgets/text/e-entry.c:1375
-#: ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3690
-#: ../widgets/text/e-text.c:3691
+#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-entry.c:1382
-#: ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3697
-#: ../widgets/text/e-text.c:3698
+#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
 msgid "Cursor position"
 msgstr "游標位置"
 
-#: ../widgets/text/e-entry.c:1389
-#: ../widgets/text/e-entry.c:1390
+#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
 msgstr "模擬標籤縮放"
 
@@ -23256,69 +23304,58 @@ msgstr "模擬標籤縮放"
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3497
-#: ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Bold"
 msgstr "粗體"
 
-#: ../widgets/text/e-text.c:3504
-#: ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3511
-#: ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3526
-#: ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: ../widgets/text/e-text.c:3533
-#: ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3554
-#: ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
 msgid "X Offset"
 msgstr "X 位移"
 
-#: ../widgets/text/e-text.c:3561
-#: ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
 msgid "Y Offset"
 msgstr "Y 位移"
 
-#: ../widgets/text/e-text.c:3597
-#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Text width"
 msgstr "文字寬度"
 
-#: ../widgets/text/e-text.c:3604
-#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3704
-#: ../widgets/text/e-text.c:3705
+#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
 msgid "IM Context"
 msgstr "IM 快顯選單"
 
-#: ../widgets/text/e-text.c:3711
-#: ../widgets/text/e-text.c:3712
+#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
 
+#~ msgid "Select target addressbook."
+#~ msgstr "選取目標通訊錄。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 74290dce8b..8f7f5076ff 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: evolution 2.5.4\n"
+"Project-Id-Version: evolution 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-20 21:56+0100\n"
-"PO-Revision-Date: 2006-01-21 09:50+0800\n"
+"POT-Creation-Date: 2006-01-27 06:53+0800\n"
+"PO-Revision-Date: 2006-01-26 22:14+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (traditional) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -131,16 +131,14 @@ msgstr "移至日期"
 msgid "a table to view and select the current time range"
 msgstr "用來檢視與選擇時刻範圍的表格"
 
-#: ../a11y/calendar/ea-day-view.c:146
-#: ../a11y/calendar/ea-week-view.c:148
+#: ../a11y/calendar/ea-day-view.c:146 ../a11y/calendar/ea-week-view.c:148
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
 msgstr[0] "它具有 %d 個事件。"
 msgstr[1] "它具有 %d 個事件。"
 
-#: ../a11y/calendar/ea-day-view.c:148
-#: ../a11y/calendar/ea-week-view.c:150
+#: ../a11y/calendar/ea-day-view.c:148 ../a11y/calendar/ea-week-view.c:150
 msgid "It has no events."
 msgstr "它沒有事件。"
 
@@ -182,8 +180,7 @@ msgstr "%A %d %b %Y"
 #. specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:190
 #: ../calendar/gui/calendar-component.c:664
-#: ../calendar/gui/e-day-view-top-item.c:719
-#: ../calendar/gui/e-day-view.c:1510
+#: ../calendar/gui/e-day-view-top-item.c:719 ../calendar/gui/e-day-view.c:1510
 #: ../calendar/gui/e-week-view-main-item.c:322
 msgid "%a %d %b"
 msgstr "%a %d %b"
@@ -222,8 +219,7 @@ msgstr "%d %b %Y"
 #. change the specifiers or add anything.
 #: ../a11y/calendar/ea-gnome-calendar.c:220
 #: ../calendar/gui/calendar-component.c:690
-#: ../calendar/gui/e-day-view-top-item.c:723
-#: ../calendar/gui/e-day-view.c:1526
+#: ../calendar/gui/e-day-view-top-item.c:723 ../calendar/gui/e-day-view.c:1526
 #: ../calendar/gui/e-week-view-main-item.c:336
 msgid "%d %b"
 msgstr "%d %b"
@@ -370,7 +366,9 @@ msgid "Popup Menu"
 msgstr "彈出式選單"
 
 #: ../addressbook/addressbook.error.xml.h:1
-msgid "A contact already exists with this address. Would you like to add a new card with the same address anyway?"
+msgid ""
+"A contact already exists with this address. Would you like to add a new card "
+"with the same address anyway?"
 msgstr "此連絡人的電子郵件地址已經存在。您無論如何都要加入同樣位址的新名片嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:2
@@ -387,8 +385,13 @@ msgid "Category editor not available."
 msgstr "分類編輯器無法使用。"
 
 #: ../addressbook/addressbook.error.xml.h:5
-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 "請檢查來確定您的密碼拼法正確，而且您使用的是支援的登入方法。請記得許多密碼有區分大小寫；您可能啟動了大寫鎖定鍵。"
+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 ""
+"請檢查來確定您的密碼拼法正確，而且您使用的是支援的登入方法。請記得許多密碼有"
+"區分大小寫；您可能啟動了大寫鎖定鍵。"
 
 # camel/camel-movemail.c:306
 #: ../addressbook/addressbook.error.xml.h:6
@@ -401,8 +404,14 @@ msgid "Could not remove addressbook."
 msgstr "無法移除通訊錄。"
 
 #: ../addressbook/addressbook.error.xml.h:8
-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 個人連絡人資料夾。"
+msgid ""
+"Currently you can access only GroupWise System Address Book from Evolution. "
+"Please use some other GroupWise mail client once, to get your GroupWise "
+"Frequent Contacts and Groupwise Personal Contacts folders."
+msgstr ""
+"目前您只能存取 Evolution 中的 GroupWise 系統通訊錄。請使用一次其他的 "
+"GroupWise 郵件客戶端，以取得您的 GroupWise 常用連絡人及 Groupwise 個人連絡人"
+"資料夾。"
 
 #: ../addressbook/addressbook.error.xml.h:9
 msgid "Delete address book '{0}'?"
@@ -447,12 +456,18 @@ msgid "The Evolution addressbook has quit unexpectedly."
 msgstr "Evolution 通訊錄已經意外結束。"
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "The image you have selected is large. Do you want to resize and store it?"
+msgid ""
+"The image you have selected is large. Do you want to resize and store it?"
 msgstr "你所選擇的圖片太大。您是否要改變大小後才儲存它？"
 
 #: ../addressbook/addressbook.error.xml.h:19
-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 版本，它不支援此功能，或可能設定錯誤。請洽詢管理員，瞭解支援的搜尋基礎。"
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+"此 LDAP 伺服器可能使用舊的 LDAP 版本，它不支援此功能，或可能設定錯誤。請洽詢"
+"管理員，瞭解支援的搜尋基礎。"
 
 # addressbook/conduit/address-conduit.c:201
 #: ../addressbook/addressbook.error.xml.h:20
@@ -469,7 +484,9 @@ msgid "This addressbook server does not have any suggested search bases."
 msgstr "此通訊錄伺服器沒有任何建議的搜尋基礎。"
 
 #: ../addressbook/addressbook.error.xml.h:23
-msgid "This addressbook server might be unreachable or the server name may be misspelled or your network connection could be down."
+msgid ""
+"This addressbook server might be unreachable or the server name may be "
+"misspelled or your network connection could be down."
 msgstr "此通訊錄伺服器無法連線，或伺服器名稱可能拼錯，或您的網路連線已經停止。"
 
 #: ../addressbook/addressbook.error.xml.h:24
@@ -497,23 +514,34 @@ msgid "Would you like to save your changes?"
 msgstr "要儲存所做的變更？"
 
 #: ../addressbook/addressbook.error.xml.h:29
-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 "您正在嘗試從某一個通訊錄，將連絡人移至另一個通訊錄，但是它無法從來源移除。您想要儲存一個副本來代替嗎？"
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+"您正在嘗試從某一個通訊錄，將連絡人移至另一個通訊錄，但是它無法從來源移除。您"
+"想要儲存一個副本來代替嗎？"
 
 #: ../addressbook/addressbook.error.xml.h:30
-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 的問題。最好的解決方案是將該伺服器升級至支援的版太"
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results the server should be upgraded to "
+"a supported version"
+msgstr ""
+"您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
+"解決方案是將該伺服器升級至支援的版太"
 
 #: ../addressbook/addressbook.error.xml.h:31
-msgid "You have made modifications to this contact. Do you want to save these changes?"
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
 msgstr "您已經修改此連絡人。要儲存這些變更？"
 
 #: ../addressbook/addressbook.error.xml.h:32
-msgid "Your contacts for {0} will not be available until Evolution is restarted."
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
 msgstr "重新啟動 Evolution 之前，無法使用 {0} 的連絡人。"
 
-#: ../addressbook/addressbook.error.xml.h:33
-#: ../mail/em-vfolder-rule.c:496
+#: ../addressbook/addressbook.error.xml.h:33 ../mail/em-vfolder-rule.c:496
 #: ../plugins/groupwise-features/junk-settings.glade.h:4
 #: ../plugins/groupwise-features/properties.glade.h:10
 #: ../widgets/table/e-table-config.glade.h:15
@@ -572,9 +600,8 @@ 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:1186
-#: ../calendar/gui/calendar-component.c:247
-#: ../calendar/gui/migration.c:400
+#: ../addressbook/gui/component/addressbook-view.c:1344
+#: ../calendar/gui/calendar-component.c:247 ../calendar/gui/migration.c:400
 #: ../plugins/exchange-operations/exchange-folder.c:629
 msgid "Contacts"
 msgstr "連絡人"
@@ -622,14 +649,10 @@ msgstr "在此管理您的 S/MIME 憑證"
 #: ../addressbook/gui/component/addressbook-component.c:141
 #: ../addressbook/gui/component/addressbook-migrate.c:507
 #: ../calendar/gui/calendar-component.c:209
-#: ../calendar/gui/memos-component.c:194
-#: ../calendar/gui/migration.c:474
-#: ../calendar/gui/migration.c:567
-#: ../calendar/gui/migration.c:1075
-#: ../calendar/gui/tasks-component.c:190
-#: ../mail/em-folder-tree-model.c:199
-#: ../mail/em-folder-tree-model.c:201
-#: ../mail/mail-component.c:299
+#: ../calendar/gui/memos-component.c:194 ../calendar/gui/migration.c:474
+#: ../calendar/gui/migration.c:567 ../calendar/gui/migration.c:1075
+#: ../calendar/gui/tasks-component.c:190 ../mail/em-folder-tree-model.c:199
+#: ../mail/em-folder-tree-model.c:201 ../mail/mail-component.c:299
 #: ../mail/mail-vfolder.c:223
 msgid "On This Computer"
 msgstr "在此電腦"
@@ -643,14 +666,10 @@ msgstr "在此電腦"
 #: ../addressbook/gui/component/addressbook-migrate.c:515
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:20
 #: ../calendar/gui/calendar-component.c:217
-#: ../calendar/gui/memos-component.c:202
-#: ../calendar/gui/migration.c:482
-#: ../calendar/gui/migration.c:575
-#: ../calendar/gui/migration.c:1083
-#: ../calendar/gui/tasks-component.c:198
-#: ../filter/filter-label.c:123
-#: ../mail/em-migrate.c:1054
-#: ../mail/mail-config.c:87
+#: ../calendar/gui/memos-component.c:202 ../calendar/gui/migration.c:482
+#: ../calendar/gui/migration.c:575 ../calendar/gui/migration.c:1083
+#: ../calendar/gui/tasks-component.c:198 ../filter/filter-label.c:123
+#: ../mail/em-migrate.c:1054 ../mail/mail-config.c:87
 #: ../mail/mail-config.glade.h:104
 msgid "Personal"
 msgstr "個人"
@@ -716,12 +735,11 @@ msgstr "複製通訊錄內容至本地用於離線作業"
 
 #: ../addressbook/gui/component/addressbook-config.c:983
 #: ../addressbook/gui/component/ldap-config.glade.h:22
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: ../calendar/gui/dialogs/calendar-setup.c:368
 #: ../calendar/gui/dialogs/calendar-setup.c:379
 #: ../calendar/gui/dialogs/calendar-setup.c:390
-#: ../mail/em-folder-properties.c:217
-#: ../mail/mail-config.glade.h:85
+#: ../mail/em-folder-properties.c:217 ../mail/mail-config.glade.h:85
 #: ../smime/gui/smime-ui.glade.h:28
 msgid "General"
 msgstr "一般"
@@ -746,8 +764,7 @@ msgstr "驗證"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:9
 #: ../addressbook/gui/component/addressbook-config.c:993
 #: ../addressbook/gui/component/ldap-config.glade.h:17
-#: ../mail/mail-dialogs.glade.h:7
-#: ../smime/gui/smime-ui.glade.h:20
+#: ../mail/mail-dialogs.glade.h:7 ../smime/gui/smime-ui.glade.h:20
 msgid "Details"
 msgstr "詳細資料"
 
@@ -771,14 +788,12 @@ 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:1201
+#: ../calendar/gui/migration.c:153 ../mail/em-migrate.c:1201
 msgid "Migrating..."
 msgstr "正在移轉..."
 
 #: ../addressbook/gui/component/addressbook-migrate.c:125
-#: ../calendar/gui/migration.c:200
-#: ../mail/em-migrate.c:1242
+#: ../calendar/gui/migration.c:200 ../mail/em-migrate.c:1242
 #, c-format
 msgid "Migrating `%s':"
 msgstr "正在移轉 `%s'："
@@ -795,7 +810,8 @@ msgstr "自動完成設定"
 
 #: ../addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
-"The location and hierarchy of the Evolution contact folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution contact folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -833,40 +849,63 @@ msgstr ""
 "\n"
 "當 Evolution 移轉您的 Pilot Sync 資料時，請耐心等候..."
 
+#: ../addressbook/gui/component/addressbook-view.c:444
+#: ../mail/em-folder-utils.c:503
+#, c-format
+msgid "Rename the \"%s\" folder to:"
+msgstr "重新命名「%s」資料夾為："
+
+#: ../addressbook/gui/component/addressbook-view.c:447
+#: ../mail/em-folder-utils.c:505
+msgid "Rename Folder"
+msgstr "重新命名資料夾"
+
+#: ../addressbook/gui/component/addressbook-view.c:452
+#: ../mail/em-folder-utils.c:511
+msgid "Folder names cannot contain '/'"
+msgstr "資料夾名稱不能包含斜線。"
+
+#: ../addressbook/gui/component/addressbook-view.c:455
+msgid "A Folder with this name already exists"
+msgstr "以此為名的資料夾已存在"
+
 # importers/pine-importer.c:661
-#: ../addressbook/gui/component/addressbook-view.c:769
+#: ../addressbook/gui/component/addressbook-view.c:963
 msgid "_New Address Book"
 msgstr "新增通訊錄(_N)"
 
 #. FIXME: need to disable for undeletable folders
-#: ../addressbook/gui/component/addressbook-view.c:770
+#: ../addressbook/gui/component/addressbook-view.c:964
 #: ../addressbook/gui/widgets/e-addressbook-view.c:966
 #: ../calendar/gui/calendar-component.c:538
 #: ../calendar/gui/e-calendar-table.c:1196
-#: ../calendar/gui/e-calendar-view.c:1628
-#: ../calendar/gui/e-memo-table.c:871
-#: ../calendar/gui/tasks-component.c:443
-#: ../mail/em-folder-tree.c:2054
-#: ../mail/em-folder-view.c:1091
-#: ../ui/evolution-addressbook.xml.h:34
-#: ../ui/evolution-calendar.xml.h:38
-#: ../ui/evolution-mail-list.xml.h:30
-#: ../ui/evolution-memos.xml.h:16
-#: ../ui/evolution-tasks.xml.h:24
+#: ../calendar/gui/e-calendar-view.c:1628 ../calendar/gui/e-memo-table.c:871
+#: ../calendar/gui/tasks-component.c:443 ../mail/em-folder-tree.c:2054
+#: ../mail/em-folder-view.c:1091 ../ui/evolution-addressbook.xml.h:49
+#: ../ui/evolution-calendar.xml.h:38 ../ui/evolution-mail-list.xml.h:30
+#: ../ui/evolution-memos.xml.h:16 ../ui/evolution-tasks.xml.h:24
 msgid "_Delete"
 msgstr "刪除(_D)"
 
+# addressbook/gui/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:966
+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:772
+#: ../addressbook/gui/component/addressbook-view.c:968
 #: ../calendar/gui/calendar-component.c:539
 #: ../calendar/gui/tasks-component.c:444
 msgid "_Properties..."
 msgstr "屬性(_P)..."
 
-#: ../addressbook/gui/component/addressbook-view.c:1197
+#: ../addressbook/gui/component/addressbook-view.c:1355
 msgid "Contact Source Selector"
 msgstr "連絡人來源選擇器"
 
@@ -874,13 +913,13 @@ msgstr "連絡人來源選擇器"
 msgid "Accessing LDAP Server anonymously"
 msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: ../addressbook/gui/component/addressbook.c:191
+#: ../addressbook/gui/component/addressbook.c:197
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:492
 msgid "Failed to authenticate.\n"
 msgstr "驗證憑證失敗。\n"
 
 # camel/camel-smime-context.c:194
-#: ../addressbook/gui/component/addressbook.c:198
+#: ../addressbook/gui/component/addressbook.c:204
 #: ../plugins/groupwise-account-setup/camel-gw-listener.c:471
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -900,7 +939,9 @@ msgid "EFolderList XML for the list of completion URIs."
 msgstr "完成 uris 清單的 EFolderList xml"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
-msgid "Position of the vertical pane, between the card and list views and the preview pane, in pixels."
+msgid ""
+"Position of the vertical pane, between the card and list views and the "
+"preview pane, in pixels."
 msgstr "垂直窗格的位置，在名片、清單檢視與預覽窗格之間，以像素計。"
 
 # calendar/gui/event-editor-dialog.glade.h:15
@@ -909,7 +950,9 @@ msgid "Show preview pane"
 msgstr "顯示預覽窗格"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:6
-msgid "The number of characters that must be typed before Evolution will attempt to autocomplete."
+msgid ""
+"The number of characters that must be typed before Evolution will attempt to "
+"autocomplete."
 msgstr "在 Evolution 嘗試自動完成之前，必須輸入的字元數目。"
 
 #: ../addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:7
@@ -987,8 +1030,7 @@ msgid "Add Address Book"
 msgstr "新增通訊錄"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:14
-#: ../mail/em-account-editor.c:304
-#: ../mail/em-account-editor.c:767
+#: ../mail/em-account-editor.c:304 ../mail/em-account-editor.c:767
 msgid "Always"
 msgstr "永遠"
 
@@ -1011,7 +1053,8 @@ msgid "Email address"
 msgstr "電子郵件地址"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:20
-msgid "Evolution will use this email address to authenticate you with the server."
+msgid ""
+"Evolution will use this email address to authenticate you with the server."
 msgstr "Evolution 會使用此電子郵件地址，在伺服器驗證您的身份。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:21
@@ -1024,8 +1067,7 @@ msgstr "登入(_G):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
 #: ../addressbook/gui/component/ldap-config.glade.h:24
-#: ../mail/em-account-editor.c:302
-#: ../mail/em-account-editor.c:766
+#: ../mail/em-account-editor.c:302 ../mail/em-account-editor.c:766
 msgid "Never"
 msgstr "永不"
 
@@ -1054,20 +1096,41 @@ msgid "Search filter"
 msgstr "搜尋過濾器"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:30
-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」物件類型。"
+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」物件類型。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:31
-msgid "Selecting this option means that Evolution will only connect to your LDAP server if your LDAP server supports SSL or TLS."
-msgstr "選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支援 SSL 或 TLS)。"
+msgid ""
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if your LDAP server supports SSL or TLS."
+msgstr ""
+"選取此選項表示，Evolution 只會連線到您的 LDAP 伺服器 (如果您的 LDAP 伺服器支"
+"援 SSL 或 TLS)。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:32
-msgid "Selecting this option means that Evolution will only try to use SSL/TLS if you are in a insecure environment. For example, if you and your LDAP server are behind a firewall at work, then Evolution doesn't need to use SSL/TLS because your connection is already secure."
-msgstr "選取此選項表示，Evolution 只會嘗試使用 SSL/TLS (如果您是在不安全的環境下)。例如，如果您和您的 LDAP 伺服器在作業時有防火牆保護，則 Evolution 就不需要使用 SSL/TLS ，因為您的連線已經安全無慮。"
+msgid ""
+"Selecting this option means that Evolution will only try to use SSL/TLS if "
+"you are in a insecure environment. For example, if you and your LDAP server "
+"are behind a firewall at work, then Evolution doesn't need to use SSL/TLS "
+"because your connection is already secure."
+msgstr ""
+"選取此選項表示，Evolution 只會嘗試使用 SSL/TLS (如果您是在不安全的環境下)。例"
+"如，如果您和您的 LDAP 伺服器在作業時有防火牆保護，則 Evolution 就不需要使用 "
+"SSL/TLS ，因為您的連線已經安全無慮。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:33
-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。這表示您的連線將不安全，而且您的安全有漏洞。 "
+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。這表示您的連線將不安全，而且您的"
+"安全有漏洞。 "
 
 # calendar/gui/print.c:362
 #: ../addressbook/gui/component/ldap-config.glade.h:34
@@ -1079,32 +1142,60 @@ msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:36
-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)，搜尋會由此處開始。如果此處空白，搜尋會在網路目錄樹的根部開始。"
+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)，搜尋會由此處開始。如果此處空白，搜尋會在網"
+"路目錄樹的根部開始。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:37
-msgid "The search scope defines how deep you would like the search to extend down 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\" 的搜尋範圍會包括搜尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
+msgid ""
+"The search scope defines how deep you would like the search to extend down "
+"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\" 的搜尋範圍會包括搜"
+"尋基礎底下所有的項目。「一個」的搜尋範圍只會包括基礎底下的一個層級。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:38
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+msgid ""
+"This is the full name of your ldap server. For example, \"ldap.mycompany.com"
+"\"."
 msgstr "這是您的 ldap 伺服器的完整名稱。例如：「ldap.mycompany.com」。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:39
-msgid "This is the maximum number of entries to download. Setting this number to be too large will slow down your address book."
+msgid ""
+"This is the maximum number of entries to download. Setting this number to be "
+"too large will slow down your address book."
 msgstr "這是要下載項目的數目上限。將此數字設定成太大會減慢通訊錄的速度。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:40
-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 伺服器的匿名存取。"
+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 伺服器的匿名存取。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:41
-msgid "This is the name for this server that will appear in your Evolution folder list. It is for display purposes only. "
-msgstr "這是此伺服器的名稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
+msgid ""
+"This is the name for this server that will appear in your Evolution folder "
+"list. It is for display purposes only. "
+msgstr ""
+"這是此伺服器的名稱，會顯示在您的 Evolution 資料夾清單中。它僅用於顯示用途。 "
 
 #: ../addressbook/gui/component/ldap-config.glade.h:42
-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 會嘗試連線到這個地方。已提供標準埠清單。請洽詢您的系統管理員，瞭解您應該指定的埠。"
+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 會嘗試連線到這個地方。已提供標準埠清單。請"
+"洽詢您的系統管理員，瞭解您應該指定的埠。"
 
 #: ../addressbook/gui/component/ldap-config.glade.h:43
 msgid "Using distinguished name (DN)"
@@ -1182,10 +1273,8 @@ msgstr "名片"
 #: ../calendar/gui/alarm-notify/util.c:66
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:26
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:14
-#: ../calendar/gui/dialogs/event-page.glade.h:20
-#: ../calendar/gui/misc.c:111
-#: ../calendar/gui/misc.c:113
-#: ../filter/filter.glade.h:16
+#: ../calendar/gui/dialogs/event-page.glade.h:20 ../calendar/gui/misc.c:111
+#: ../calendar/gui/misc.c:113 ../filter/filter.glade.h:16
 #: ../mail/em-account-editor.c:1987
 #: ../plugins/calendar-http/calendar-http.c:286
 #: ../plugins/calendar-weather/calendar-weather.c:563
@@ -1273,9 +1362,9 @@ msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:13
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:527
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:542
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2380
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:553
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:568
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2406
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
@@ -1322,10 +1411,8 @@ msgstr "電話"
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:23
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:236
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:203
-#: ../filter/filter-label.c:122
-#: ../mail/em-migrate.c:1053
-#: ../mail/mail-config.c:86
-#: ../mail/mail-config.glade.h:154
+#: ../filter/filter-label.c:122 ../mail/em-migrate.c:1053
+#: ../mail/mail-config.c:86 ../mail/mail-config.glade.h:154
 msgid "Work"
 msgstr "工作"
 
@@ -1358,8 +1445,7 @@ msgid "_Calendar:"
 msgstr "行事曆(_C):"
 
 #: ../addressbook/gui/contact-editor/contact-editor.glade.h:29
-#: ../ui/evolution-event-editor.xml.h:27
-#: ../ui/evolution-task-editor.xml.h:18
+#: ../ui/evolution-event-editor.xml.h:27 ../ui/evolution-task-editor.xml.h:18
 msgid "_Categories"
 msgstr "分類(_C)"
 
@@ -1480,10 +1566,8 @@ msgstr "地址"
 #: ../addressbook/gui/widgets/e-minicard-view.c:520
 #: ../addressbook/gui/widgets/e-minicard.c:175
 #: ../widgets/menus/gal-define-views-model.c:181
-#: ../widgets/table/e-cell-text.c:1770
-#: ../widgets/text/e-entry.c:1312
-#: ../widgets/text/e-entry.c:1313
-#: ../widgets/text/e-text.c:3612
+#: ../widgets/table/e-cell-text.c:1770 ../widgets/text/e-entry.c:1312
+#: ../widgets/text/e-entry.c:1313 ../widgets/text/e-text.c:3612
 #: ../widgets/text/e-text.c:3613
 msgid "Editable"
 msgstr "可編輯的"
@@ -2501,7 +2585,7 @@ msgstr "服務"
 # addressbook/backend/ebook/e-card.c:3442
 #: ../addressbook/gui/contact-editor/e-contact-editor-im.c:128
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../plugins/publish-calendar/publish-calendar.c:461
+#: ../plugins/publish-calendar/publish-calendar.c:478
 #: ../plugins/save-calendar/csv-format.c:400
 msgid "Location"
 msgstr "位置"
@@ -2571,22 +2655,22 @@ msgid "Changed"
 msgstr "已變更"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:537
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2375
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:563
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2401
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "連絡人編輯器 - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2713
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2739
 msgid "Please select an image for this contact"
 msgstr "請選取此連絡人的影像"
 
 # addressbook/gui/component/addressbook-config.glade.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2740
 msgid "No image"
 msgstr "沒有影像"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2993
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3019
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -2596,31 +2680,36 @@ msgstr ""
 
 # camel/providers/local/camel-maildir-folder.c:218
 # camel/providers/local/camel-mh-folder.c:203
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3045
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3071
 msgid "Invalid contact."
 msgstr "無效的連絡人。"
 
 # addressbook/contact-editor/e-contact-quick-add.c:233
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:277
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:291
 msgid "Contact Quick-Add"
 msgstr "快速新增連絡人"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:280
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:294
 msgid "_Edit Full"
 msgstr "編輯全部(_E)"
 
 # mail/mail-config.glade.h:31
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:306
-msgid "_Full name:"
-msgstr "全名(_F):"
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:337
+msgid "_Full name"
+msgstr "全名(_F)"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:347
+msgid "E-_mail"
+msgstr "電子郵件(_M)"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:316
-msgid "E-_mail:"
-msgstr "電子郵件(_M):"
+# importers/pine-importer.c:661
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:357
+msgid "_Select Address Book"
+msgstr "選擇通訊錄(_S)"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:323
+#: ../addressbook/gui/contact-editor/eab-editor.c:322
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2631,7 +2720,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:326
+#: ../addressbook/gui/contact-editor/eab-editor.c:325
 msgid ""
 "Are you sure you want\n"
 "to delete these contact lists?"
@@ -2641,7 +2730,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:331
+#: ../addressbook/gui/contact-editor/eab-editor.c:330
 #, c-format
 msgid ""
 "Are you sure you want\n"
@@ -2652,7 +2741,7 @@ msgstr ""
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../addressbook/gui/contact-editor/eab-editor.c:334
+#: ../addressbook/gui/contact-editor/eab-editor.c:333
 msgid ""
 "Are you sure you want\n"
 "to delete these contacts?"
@@ -2927,10 +3016,8 @@ msgstr "取得書本檢視時發生錯誤"
 #: ../widgets/table/e-table-selection-model.c:311
 #: ../widgets/table/e-table.c:3344
 #: ../widgets/table/e-tree-selection-model.c:825
-#: ../widgets/text/e-entry.c:1235
-#: ../widgets/text/e-entry.c:1236
-#: ../widgets/text/e-text.c:3476
-#: ../widgets/text/e-text.c:3477
+#: ../widgets/text/e-entry.c:1235 ../widgets/text/e-entry.c:1236
+#: ../widgets/text/e-text.c:3476 ../widgets/text/e-text.c:3477
 msgid "Model"
 msgstr "模型"
 
@@ -2997,17 +3084,16 @@ msgstr "通訊錄"
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
 #: ../addressbook/gui/widgets/e-addressbook-view.c:821
-#: ../addressbook/gui/widgets/e-addressbook-view.c:2037
-#: ../ui/evolution-addressbook.xml.h:20
+#: ../addressbook/gui/widgets/e-addressbook-view.c:2051
+#: ../ui/evolution-addressbook.xml.h:31
 msgid "Save as VCard..."
 msgstr "儲存為 VCard..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:944
 #: ../calendar/gui/dialogs/comp-editor.c:1093
 #: ../calendar/gui/e-calendar-table.c:1176
-#: ../calendar/gui/e-calendar-view.c:1606
-#: ../calendar/gui/e-memo-table.c:854
-#: ../ui/evolution-addressbook.xml.h:38
+#: ../calendar/gui/e-calendar-view.c:1606 ../calendar/gui/e-memo-table.c:854
+#: ../ui/evolution-addressbook.xml.h:56
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -3022,7 +3108,6 @@ msgid "New Contact _List..."
 msgstr "新增連絡人清單(_L)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:950
-#: ../ui/evolution-addressbook.xml.h:41
 msgid "_Save as VCard..."
 msgstr "儲存成 VCard(_S)..."
 
@@ -3076,8 +3161,7 @@ msgid "Mo_ve to Address Book..."
 msgstr "移至通訊錄(_V)..."
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:963
-#: ../ui/evolution-composer-entries.xml.h:4
-#: ../ui/evolution-editor.xml.h:8
+#: ../ui/evolution-composer-entries.xml.h:4 ../ui/evolution-editor.xml.h:8
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
@@ -3085,20 +3169,13 @@ msgstr "剪下(_T)"
 #: ../calendar/gui/calendar-component.c:537
 #: ../calendar/gui/dialogs/comp-editor.c:445
 #: ../calendar/gui/e-calendar-table.c:1184
-#: ../calendar/gui/e-calendar-view.c:1613
-#: ../calendar/gui/e-memo-table.c:862
-#: ../calendar/gui/tasks-component.c:442
-#: ../composer/e-msg-composer.c:3102
-#: ../mail/em-folder-tree.c:979
-#: ../mail/em-folder-view.c:1077
-#: ../mail/message-list.c:1729
-#: ../ui/evolution-addressbook.xml.h:32
-#: ../ui/evolution-calendar.xml.h:37
-#: ../ui/evolution-composer-entries.xml.h:13
-#: ../ui/evolution-editor.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:104
-#: ../ui/evolution-memos.xml.h:15
-#: ../ui/evolution-tasks.xml.h:23
+#: ../calendar/gui/e-calendar-view.c:1613 ../calendar/gui/e-memo-table.c:862
+#: ../calendar/gui/tasks-component.c:442 ../composer/e-msg-composer.c:3102
+#: ../mail/em-folder-tree.c:979 ../mail/em-folder-view.c:1077
+#: ../mail/message-list.c:1729 ../ui/evolution-addressbook.xml.h:46
+#: ../ui/evolution-calendar.xml.h:37 ../ui/evolution-composer-entries.xml.h:13
+#: ../ui/evolution-editor.xml.h:16 ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-memos.xml.h:15 ../ui/evolution-tasks.xml.h:23
 msgid "_Copy"
 msgstr "複製(_C)"
 
@@ -3182,14 +3259,12 @@ 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
-#: ../addressbook/gui/widgets/eab-popup-control.c:441
 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
-#: ../addressbook/gui/widgets/eab-popup-control.c:451
 msgid "Email 3"
 msgstr "電子郵件 3"
 
@@ -3344,10 +3419,8 @@ msgstr "網址"
 # addressbook/printing/e-contact-print.glade.h:41
 #: ../addressbook/gui/widgets/e-minicard-label.c:115
 #: ../addressbook/gui/widgets/e-minicard.c:138
-#: ../widgets/misc/e-canvas-vbox.c:96
-#: ../widgets/misc/e-canvas-vbox.c:97
-#: ../widgets/misc/e-reflow.c:1437
-#: ../widgets/misc/e-reflow.c:1438
+#: ../widgets/misc/e-canvas-vbox.c:96 ../widgets/misc/e-canvas-vbox.c:97
+#: ../widgets/misc/e-reflow.c:1437 ../widgets/misc/e-reflow.c:1438
 #: ../widgets/table/e-table-click-to-add.c:517
 #: ../widgets/table/e-table-col.c:98
 #: ../widgets/table/e-table-field-chooser-item.c:667
@@ -3355,30 +3428,24 @@ msgstr "網址"
 #: ../widgets/table/e-table-group-container.c:972
 #: ../widgets/table/e-table-group-leaf.c:629
 #: ../widgets/table/e-table-group-leaf.c:630
-#: ../widgets/table/e-table-item.c:3024
-#: ../widgets/table/e-table-item.c:3025
-#: ../widgets/text/e-text.c:3654
-#: ../widgets/text/e-text.c:3655
+#: ../widgets/table/e-table-item.c:3024 ../widgets/table/e-table-item.c:3025
+#: ../widgets/text/e-text.c:3654 ../widgets/text/e-text.c:3655
 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:145
-#: ../widgets/misc/e-canvas-vbox.c:108
-#: ../widgets/misc/e-canvas-vbox.c:109
-#: ../widgets/misc/e-reflow.c:1445
-#: ../widgets/misc/e-reflow.c:1446
+#: ../widgets/misc/e-canvas-vbox.c:108 ../widgets/misc/e-canvas-vbox.c:109
+#: ../widgets/misc/e-reflow.c:1445 ../widgets/misc/e-reflow.c:1446
 #: ../widgets/table/e-table-click-to-add.c:524
 #: ../widgets/table/e-table-field-chooser-item.c:674
 #: ../widgets/table/e-table-group-container.c:964
 #: ../widgets/table/e-table-group-container.c:965
 #: ../widgets/table/e-table-group-leaf.c:622
 #: ../widgets/table/e-table-group-leaf.c:623
-#: ../widgets/table/e-table-item.c:3030
-#: ../widgets/table/e-table-item.c:3031
-#: ../widgets/text/e-text.c:3662
-#: ../widgets/text/e-text.c:3663
+#: ../widgets/table/e-table-item.c:3030 ../widgets/table/e-table-item.c:3031
+#: ../widgets/text/e-text.c:3662 ../widgets/text/e-text.c:3663
 msgid "Height"
 msgstr "高度"
 
@@ -3615,8 +3682,7 @@ msgstr "通訊協定不支援"
 #: ../calendar/gui/e-cal-component-preview.c:234
 #: ../calendar/gui/e-cal-model-tasks.c:349
 #: ../calendar/gui/e-cal-model-tasks.c:662
-#: ../calendar/gui/e-calendar-table.c:464
-#: ../calendar/gui/print.c:2376
+#: ../calendar/gui/e-calendar-table.c:464 ../calendar/gui/print.c:2377
 msgid "Canceled"
 msgstr "已取消"
 
@@ -3671,28 +3737,44 @@ msgid "Invalid server version"
 msgstr "無效的伺服器版本"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:94
-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 "我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離線使用。請於上線模式再次讀取通訊錄以下載它的內容"
+msgid ""
+"We were unable to open this addressbook. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the addressbook once in online mode to download its contents"
+msgstr ""
+"我們無法開啟這個通訊錄。這可能表示此通訊錄未標記為離線用途或者尚未下載以供離"
+"線使用。請於上線模式再次讀取通訊錄以下載它的內容"
 
 # addressbook/gui/component/addressbook.c:458
 #: ../addressbook/gui/widgets/eab-gui-util.c:103
 #, c-format
-msgid "We were unable to open this addressbook.  Please check that the path %s exists and that you have permission to access it."
+msgid ""
+"We were unable to open this addressbook.  Please check that the path %s "
+"exists and that you have permission to access it."
 msgstr "無法開啟這個通訊錄。  請檢查路徑 %s 是否存在而且您有權限存取它。"
 
 # addressbook/gui/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."
+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 套件。"
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  If "
+"you want to use LDAP in Evolution, you must install an LDAP-enabled "
+"Evolution package."
+msgstr ""
+"此 Evolution 版本未編譯 LDAP 支援。如果您若想在 Evolution 使用 LDAP，必須安裝"
+"啟用 LDAP 的 Evolution 套件。"
 
 # addressbook/gui/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 an incorrect URI, or the server is unreachable."
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
 msgstr "無法開啟這個通訊錄。這表示您輸入錯誤的URI，或伺服器無法連線。"
 
 #: ../addressbook/gui/widgets/eab-gui-util.c:147
@@ -3805,6 +3887,11 @@ msgstr[1] "個連絡人"
 msgid "card.vcf"
 msgstr "card.vcf"
 
+# importers/pine-importer.c:661
+#: ../addressbook/gui/widgets/eab-gui-util.c:457
+msgid "Select Address Book"
+msgstr "選擇通訊錄"
+
 #: ../addressbook/gui/widgets/eab-gui-util.c:596
 msgid "list"
 msgstr "清單"
@@ -3834,10 +3921,6 @@ msgstr "將連絡人移到"
 msgid "Copy contacts to"
 msgstr "複製連絡人到"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:766
-msgid "Select target addressbook."
-msgstr "選取目標通訊錄。"
-
 # addressbook/backend/ebook/e-card.c:3745
 #: ../addressbook/gui/widgets/eab-gui-util.c:989
 msgid "Multiple VCards"
@@ -3861,49 +3944,11 @@ msgstr "連絡人資訊"
 msgid "Contact information for %s"
 msgstr "%s 的連絡人資訊"
 
-# shell/e-storage.c:178
-#.
-#. * This is the code for the UI thingie that lets you manipulate the e-mail
-#. * addresses (and *only* the e-mail addresses) associated with an existing
-#. * contact.
-#.
-#: ../addressbook/gui/widgets/eab-popup-control.c:198
-msgid "(none)"
-msgstr "(沒有)"
-
-# addressbook/contact-editor/contact-editor.glade.h:14
-# addressbook/contact-editor/e-contact-editor.c:1284
-#: ../addressbook/gui/widgets/eab-popup-control.c:431
-msgid "Primary Email"
-msgstr "主要電子郵件"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: ../addressbook/gui/widgets/eab-popup-control.c:567
-msgid "Select an Action"
-msgstr "選擇一個動作"
-
-# ui/evolution-addressbook.xml.h:2
-#: ../addressbook/gui/widgets/eab-popup-control.c:575
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "建立新的連絡人 「%s」"
-
-#: ../addressbook/gui/widgets/eab-popup-control.c:591
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "新增住址到既存之連絡人 「%s」"
-
 # addressbook/gui/widgets/e-minicard-control.c:282
-#: ../addressbook/gui/widgets/eab-popup-control.c:869
+#: ../addressbook/gui/widgets/eab-popup-control.c:287
 msgid "Querying Address Book..."
 msgstr "正在查詢通訊錄…"
 
-# mail/mail-config.glade.h:29
-#: ../addressbook/gui/widgets/eab-popup-control.c:968
-msgid "Merge E-Mail Address"
-msgstr "合併電子郵件地址"
-
 #: ../addressbook/gui/widgets/eab-vcard-control.c:139
 #, c-format
 msgid "There is one other contact."
@@ -3941,43 +3986,42 @@ msgid "GTK Tree View"
 msgstr "GTK 網路樹檢視"
 
 # shell/e-shell-importer.c:363
-#: ../addressbook/importers/evolution-csv-importer.c:521
+#: ../addressbook/importers/evolution-csv-importer.c:624
 #: ../mail/importers/evolution-outlook-importer.c:264
 #: ../mail/importers/netscape-importer.c:1252
 msgid "Importing..."
 msgstr "匯入..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:723
+#: ../addressbook/importers/evolution-csv-importer.c:826
 msgid "Outlook CSV or Tab (.csv, .tab)"
 msgstr "Outlook CSV 或 Tab (.csv, .tab)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../addressbook/importers/evolution-csv-importer.c:724
+#: ../addressbook/importers/evolution-csv-importer.c:827
 msgid "Outlook CSV and Tab Importer"
 msgstr "Outlook CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:732
+#: ../addressbook/importers/evolution-csv-importer.c:835
 msgid "Mozilla CSV or Tab (.csv, .tab)"
 msgstr "Mozilla CSV 或 Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:733
+#: ../addressbook/importers/evolution-csv-importer.c:836
 msgid "Mozilla CSV and Tab Importer"
 msgstr "Mozilla CSV 與 Tab 匯入程式"
 
-#: ../addressbook/importers/evolution-csv-importer.c:741
+#: ../addressbook/importers/evolution-csv-importer.c:844
 msgid "Evolution CSV or Tab (.csv, .tab)"
 msgstr "Evolution CSV 或 Tab (.csv, .tab)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: ../addressbook/importers/evolution-csv-importer.c:742
+#: ../addressbook/importers/evolution-csv-importer.c:845
 msgid "Evolution CSV and Tab Importer"
 msgstr "Evolution CSV 與 Tab 匯入程式"
 
 #: ../addressbook/importers/evolution-ldif-importer.c:583
 #: ../addressbook/importers/evolution-vcard-importer.c:250
 #: ../calendar/importers/icalendar-importer.c:312
-#: ../calendar/importers/icalendar-importer.c:677
-#: ../shell/shell.error.xml.h:6
+#: ../calendar/importers/icalendar-importer.c:677 ../shell/shell.error.xml.h:6
 msgid "Importing ..."
 msgstr "正在匯入..."
 
@@ -4199,7 +4243,7 @@ msgstr "網底"
 
 #. FIXME: Take care of i18n
 #: ../addressbook/printing/e-contact-print.glade.h:36
-#: ../plugins/exchange-operations/exchange-account-setup.c:949
+#: ../plugins/exchange-operations/exchange-account-setup.c:965
 #: ../plugins/exchange-operations/exchange-calendar.c:224
 #: ../plugins/exchange-operations/exchange-contacts.c:199
 msgid "Size:"
@@ -4302,7 +4346,8 @@ msgid "Export in asynchronous mode"
 msgstr "在非同步模式匯出"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
-msgid "The number of cards in one output file in asychronous mode, default size 100."
+msgid ""
+"The number of cards in one output file in asychronous mode, default size 100."
 msgstr "非同步模式下，一個輸出檔案中的名片數目，預設大小是 100。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:63
@@ -4310,7 +4355,8 @@ msgid "NUMBER"
 msgstr "數目"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:91
-msgid "Command line arguments error, please use --help option to see the usage."
+msgid ""
+"Command line arguments error, please use --help option to see the usage."
 msgstr "指令列引數錯誤，請使用 --help 選項來查看用法。"
 
 #: ../addressbook/tools/evolution-addressbook-export.c:105
@@ -4347,23 +4393,32 @@ msgid "No filename provided."
 msgstr "沒有提供檔案名稱。"
 
 #: ../calendar/calendar.error.xml.h:1
-msgid "Adding a meaningful summary to your appointment will give your recipients an idea of what your appointment is about."
+msgid ""
+"Adding a meaningful summary to your appointment will give your recipients an "
+"idea of what your appointment is about."
 msgstr "新增有意義的摘要到您的約會可以讓收件者知道您的約會和什麼事有關。"
 
 #: ../calendar/calendar.error.xml.h:2
-msgid "Adding a meaningful summary to your task will give your recipients an idea of what your task is about."
+msgid ""
+"Adding a meaningful summary to your task will give your recipients an idea "
+"of what your task is about."
 msgstr "新增有意義的摘要到您的工作可以讓收件者知道您的工作和什麼事有關。"
 
 #: ../calendar/calendar.error.xml.h:3
-msgid "All information in these journal entries will be deleted and can not be restored."
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
 msgstr "會刪除這些日誌項目的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:4
-msgid "All information in this journal will be deleted and can not be restored."
+msgid ""
+"All information in this journal will be deleted and can not be restored."
 msgstr "會刪除此日誌的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:5
-msgid "All information on these appointments will be deleted and can not be restored."
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
 msgstr "會刪除這些約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:6
@@ -4371,15 +4426,19 @@ msgid "All information on these tasks will be deleted and can not be restored."
 msgstr "會刪除這些工作的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:7
-msgid "All information on this appointment will be deleted and can not be restored."
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
 msgstr "會刪除此約會的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:8
-msgid "All information on this journal entry will be deleted and can not be restored."
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
 msgstr "會刪除此日誌項目的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:9
-msgid "All information on this meeting will be deleted and can not be restored."
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
 msgstr "會刪除此會議的所有資訊而且無法復原。"
 
 #: ../calendar/calendar.error.xml.h:10
@@ -4496,11 +4555,14 @@ msgid "Editor could not be loaded."
 msgstr "無法載入編輯器。"
 
 #: ../calendar/calendar.error.xml.h:31
-msgid "Email invitations will be sent to all participants and allow them to accept this task."
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
 msgstr "電子郵件邀請會傳送給所有參與者並讓他們接受此工作。"
 
 #: ../calendar/calendar.error.xml.h:32
-msgid "Email invitations will be sent to all participants and allow them to reply."
+msgid ""
+"Email invitations will be sent to all participants and allow them to reply."
 msgstr "電子郵件邀請函會傳送給所有參與者並讓他們回覆。"
 
 # calendar/conduits/calendar/calendar-conduit.c:687
@@ -4520,15 +4582,21 @@ msgid "Error loading task list"
 msgstr "載入工作清單時發生錯誤"
 
 #: ../calendar/calendar.error.xml.h:36
-msgid "If you do not send a cancelation notice, the other participants may not know the journal has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the journal has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道日誌已經刪除。"
 
 #: ../calendar/calendar.error.xml.h:37
-msgid "If you do not send a cancelation notice, the other participants may not know the meeting is canceled."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the meeting is canceled."
 msgstr "如果不傳送取消通知，其他參與者可能不知道會議已經取消。"
 
 #: ../calendar/calendar.error.xml.h:38
-msgid "If you do not send a cancelation notice, the other participants may not know the task has been deleted."
+msgid ""
+"If you do not send a cancelation notice, the other participants may not know "
+"the task has been deleted."
 msgstr "如果未傳送取消通知，其他參與者可能不知道工作已經刪除。"
 
 # ui/evolution-message-composer.xml.h:26
@@ -4543,19 +4611,27 @@ msgid "Send Notice"
 msgstr "傳送通知"
 
 #: ../calendar/calendar.error.xml.h:41
-msgid "Sending updated information allows other participants to keep their calendars up to date."
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
 msgstr "傳送更新的資訊允許其他參與者保有最新的行事曆。"
 
 #: ../calendar/calendar.error.xml.h:42
-msgid "Sending updated information allows other participants to keep their task lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
 msgstr "傳送更新的資訊讓其他參與者保有最新的工作清單。"
 
 #: ../calendar/calendar.error.xml.h:43
-msgid "Some attachments are being downloaded. Saving the appointment would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the appointment would result "
+"in the loss of these attachments."
 msgstr "這裡有一些需要下載的附件。儲存此約會將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:44
-msgid "Some attachments are being downloaded. Saving the task would result in the loss of these attachments."
+msgid ""
+"Some attachments are being downloaded. Saving the task would result in the "
+"loss of these attachments."
 msgstr "這裡有一些需要下載的附件。儲存此工作將會失去這些附件。"
 
 #: ../calendar/calendar.error.xml.h:45
@@ -4635,16 +4711,21 @@ msgid "Would you like to send updated task information to participants?"
 msgstr "要傳送更新的工作資訊給參與者？"
 
 #: ../calendar/calendar.error.xml.h:63
-msgid "You are connecting to an unsupported GroupWise server and may encounter problems using Evolution. For best results, the server should be upgraded to a supported version."
-msgstr "您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的解決方案是將該伺服器升級至支援的版本。"
+msgid ""
+"You are connecting to an unsupported GroupWise server and may encounter "
+"problems using Evolution. For best results, the server should be upgraded to "
+"a supported version."
+msgstr ""
+"您正連線到不支援的 GroupWise 伺服器而且可能遇到使用 Evolution 的問題。最好的"
+"解決方案是將該伺服器升級至支援的版本。"
 
 #: ../calendar/calendar.error.xml.h:64
-msgid "You have changed this appointment, but not yet saved them."
-msgstr "您已經變更此約會，但尚未儲存它們。"
+msgid "You have changed this appointment, but not yet saved it."
+msgstr "您已經變更此約會，但尚未儲存它。"
 
 #: ../calendar/calendar.error.xml.h:65
-msgid "You have made changes to this task, but not yet saved them."
-msgstr "您已經變更此工作，但尚未儲存它們。"
+msgid "You have changed this task, but not yet saved it."
+msgstr "您已經變更此工作，但尚未儲存它。"
 
 #: ../calendar/calendar.error.xml.h:66
 msgid "Your calendars will not be available until Evolution is restarted."
@@ -4659,9 +4740,9 @@ msgstr "重新啟動 Evolution 之前，無法使用您的工作。"
 msgid "_Discard Changes"
 msgstr "放棄變更(_D)"
 
-#: ../calendar/calendar.error.xml.h:69
-#: ../ui/evolution-editor.xml.h:23
+#: ../calendar/calendar.error.xml.h:69 ../ui/evolution-editor.xml.h:23
 #: ../ui/evolution-message-composer.xml.h:53
+#: ../ui/evolution-signature-editor.xml.h:15
 msgid "_Save"
 msgstr "儲存(_S)"
 
@@ -4671,8 +4752,7 @@ msgstr "儲存變更(_S)"
 
 # ui/evolution-message-composer.xml.h:26
 #: ../calendar/calendar.error.xml.h:71
-#: ../composer/mail-composer.error.xml.h:31
-#: ../mail/mail.error.xml.h:132
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:132
 msgid "_Send"
 msgstr "傳送(_S)"
 
@@ -4680,8 +4760,7 @@ msgstr "傳送(_S)"
 msgid "{0}."
 msgstr "{0}."
 
-#: ../calendar/common/authentication.c:49
-#: ../calendar/gui/e-pub-utils.c:323
+#: ../calendar/common/authentication.c:49 ../calendar/gui/e-pub-utils.c:323
 #: ../smime/gui/component.c:48
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -4801,19 +4880,15 @@ msgstr "備忘錄(_S)"
 
 # calendar/gui/goto-dialog.glade.h:12
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: ../calendar/gui/e-memos.c:1092
-#: ../calendar/gui/memos-component.c:530
-#: ../calendar/gui/memos-component.c:1000
-#: ../calendar/gui/memos-control.c:340
+#: ../calendar/gui/e-memos.c:1092 ../calendar/gui/memos-component.c:530
+#: ../calendar/gui/memos-component.c:1000 ../calendar/gui/memos-control.c:340
 msgid "Memos"
 msgstr "備忘錄"
 
 #: ../calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#: ../calendar/gui/e-tasks.c:1334
-#: ../calendar/gui/print.c:1832
+#: ../calendar/gui/e-tasks.c:1334 ../calendar/gui/print.c:1833
 #: ../calendar/gui/tasks-component.c:521
-#: ../calendar/gui/tasks-component.c:1015
-#: ../calendar/gui/tasks-control.c:472
+#: ../calendar/gui/tasks-component.c:1015 ../calendar/gui/tasks-control.c:472
 #: ../calendar/importers/icalendar-importer.c:80
 #: ../calendar/importers/icalendar-importer.c:741
 #: ../plugins/exchange-operations/exchange-folder.c:635
@@ -4839,8 +4914,7 @@ msgstr "Evolution 行事曆鬧鈴通知服務"
 
 #: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:115
 #: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/alarm-notify/util.c:66
-#: ../calendar/gui/misc.c:111
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:111
 #: ../calendar/gui/misc.c:113
 msgid "minute"
 msgid_plural "minutes"
@@ -4851,8 +4925,7 @@ msgstr[1] "分"
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:6
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:24
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:13
-#: ../calendar/gui/dialogs/event-page.glade.h:19
-#: ../filter/filter.glade.h:15
+#: ../calendar/gui/dialogs/event-page.glade.h:19 ../filter/filter.glade.h:15
 #: ../plugins/calendar-http/calendar-http.c:287
 #: ../plugins/calendar-weather/calendar-weather.c:564
 msgid "hours"
@@ -4864,15 +4937,6 @@ msgstr[0] "時"
 msgid "Start time"
 msgstr "開始時刻"
 
-#: ../calendar/gui/alarm-notify/alarm-notify-dialog.c:374
-#, c-format
-msgid ""
-"<big><b>%s</b></big>\n"
-"%s %s"
-msgstr ""
-"<big><b>%s</b></big>\n"
-"%s %s"
-
 # calendar/gui/event-editor-dialog.glade.h:3
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:1
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:4
@@ -4882,8 +4946,8 @@ 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:1503
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1509
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1270
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1276
 #: ../calendar/gui/e-itip-control.c:1119
 #: ../plugins/itip-formatter/itip-view.c:884
 msgid "Location:"
@@ -4895,23 +4959,17 @@ msgid "Snooze _time:"
 msgstr "忽略時間(_T):"
 
 #: ../calendar/gui/alarm-notify/alarm-notify.glade.h:4
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #: ../calendar/gui/dialogs/recurrence-page.glade.h:6
-#: ../filter/filter.glade.h:11
-#: ../mail/mail-config.glade.h:159
+#: ../filter/filter.glade.h:11 ../mail/mail-config.glade.h:159
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:15
 #: ../plugins/publish-calendar/publish-calendar.glade.h:20
-#: ../ui/evolution-addressbook.xml.h:35
-#: ../ui/evolution-calendar.xml.h:39
-#: ../ui/evolution-composer-entries.xml.h:14
-#: ../ui/evolution-editor.xml.h:17
-#: ../ui/evolution-mail-messagedisplay.xml.h:5
-#: ../ui/evolution-memos.xml.h:17
+#: ../ui/evolution-addressbook.xml.h:51 ../ui/evolution-calendar.xml.h:39
+#: ../ui/evolution-composer-entries.xml.h:14 ../ui/evolution-editor.xml.h:17
+#: ../ui/evolution-mail-messagedisplay.xml.h:5 ../ui/evolution-memos.xml.h:17
 #: ../ui/evolution-message-composer.xml.h:46
-#: ../ui/evolution-signature-editor.xml.h:24
-#: ../ui/evolution-subscribe.xml.h:10
-#: ../ui/evolution-tasks.xml.h:25
-#: ../ui/evolution.xml.h:38
+#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-subscribe.xml.h:10 ../ui/evolution-tasks.xml.h:25
+#: ../ui/evolution.xml.h:34
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -4924,55 +4982,36 @@ msgstr "延期(_S)"
 msgid "location of appointment"
 msgstr "約會的地點"
 
-# data/evolution.keys.in.h:2
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1129
-msgid "<b>Calendars</b>"
-msgstr "<b>行事曆</b>"
-
-# calendar/gui/event-editor-dialog.glade.h:13
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1195
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1208
-msgid "_Configure Alarms"
-msgstr "設定鬧鈴(_C)"
-
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1210
-#: ../ui/evolution.xml.h:45
-msgid "_Quit"
-msgstr "離開(_Q)"
-
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1358
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1485
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1109
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1252
 msgid "No summary available."
 msgstr "沒有可用的摘要。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1367
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1369
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1118
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1120
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1377
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1128
 msgid "No location information available."
 msgstr "沒有可用的地點資訊。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1416
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1186
 #, c-format
 msgid "You have %d alarms"
 msgstr "您有 %d 個鬧鈴"
 
 # widgets/misc/e-messagebox.c:159
 #. FIXME
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1580
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1604
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1346
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1370
 msgid "Warning"
 msgstr "警告"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1584
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1350
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -4984,10 +5023,11 @@ msgstr ""
 "送出電子郵件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1610
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1376
 #, c-format
 msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is configured to run the following program:\n"
+"An Evolution Calendar reminder is about to trigger. This reminder is "
+"configured to run the following program:\n"
 "\n"
 "        %s\n"
 "\n"
@@ -5003,7 +5043,7 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1624
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1390
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
@@ -5033,8 +5073,7 @@ msgstr "失效時間"
 
 # calendar/gui/event-editor.c:1563
 #. Can't be zero
-#: ../calendar/gui/alarm-notify/util.c:58
-#: ../calendar/gui/misc.c:105
+#: ../calendar/gui/alarm-notify/util.c:58 ../calendar/gui/misc.c:105
 #, c-format
 msgid "(%d seconds)"
 msgstr "(%d 秒)"
@@ -5043,70 +5082,59 @@ msgstr "(%d 秒)"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/misc.c:111
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
 #, c-format
 msgid "(%d %s %d %s)"
 msgstr "(%d %s %d %s)"
 
 #: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/dialogs/recurrence-page.c:991
-#: ../calendar/gui/misc.c:111
+#: ../calendar/gui/dialogs/recurrence-page.c:992 ../calendar/gui/misc.c:111
 msgid "second"
 msgstr "二"
 
-#: ../calendar/gui/alarm-notify/util.c:64
-#: ../calendar/gui/misc.c:111
-#: ../filter/filter.glade.h:18
-#: ../mail/mail-config.glade.h:177
+#: ../calendar/gui/alarm-notify/util.c:64 ../calendar/gui/misc.c:111
+#: ../filter/filter.glade.h:18 ../mail/mail-config.glade.h:177
 msgid "seconds"
 msgstr "秒後"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../calendar/gui/alarm-notify/util.c:66
-#: ../calendar/gui/misc.c:113
+#: ../calendar/gui/alarm-notify/util.c:66 ../calendar/gui/misc.c:113
 #, c-format
 msgid "(%d %s)"
 msgstr "(%d %s)"
 
 # calendar/gui/event-editor.c:1563
-#: ../calendar/gui/alarm-notify/util.c:77
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
 #, c-format
 msgid " %u second"
 msgstr " %u 秒"
 
 # calendar/gui/event-editor.c:1563
-#: ../calendar/gui/alarm-notify/util.c:77
-#: ../calendar/gui/misc.c:124
+#: ../calendar/gui/alarm-notify/util.c:77 ../calendar/gui/misc.c:124
 #, c-format
 msgid " %u seconds"
 msgstr " %u 秒"
 
 # calendar/gui/event-editor.c:1558
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
 #, c-format
 msgid " %u minute"
 msgstr " %u 分"
 
 # calendar/gui/event-editor.c:1558
-#: ../calendar/gui/alarm-notify/util.c:79
-#: ../calendar/gui/misc.c:126
+#: ../calendar/gui/alarm-notify/util.c:79 ../calendar/gui/misc.c:126
 #, c-format
 msgid " %u minutes"
 msgstr " %u 分"
 
 # calendar/gui/event-editor.c:1553
-#: ../calendar/gui/alarm-notify/util.c:81
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
 #, c-format
 msgid "%u hour"
 msgstr "%u 小時"
 
 # calendar/gui/event-editor.c:1553
-#: ../calendar/gui/alarm-notify/util.c:81
-#: ../calendar/gui/misc.c:128
+#: ../calendar/gui/alarm-notify/util.c:81 ../calendar/gui/misc.c:128
 #, c-format
 msgid "%u hours"
 msgstr "%u 小時"
@@ -5136,7 +5164,8 @@ msgid "Calendars to run alarms for"
 msgstr "執行鬧鈴的行事曆"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:6
-msgid "Color to draw the Marcus Bains Line in the Time bar (empty for default)."
+msgid ""
+"Color to draw the Marcus Bains Line in the Time bar (empty for default)."
 msgstr "在時刻列中用來繪製 Marcus Bains 線的色彩(留空表示使用預設值)。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:7
@@ -5263,24 +5292,38 @@ msgid "Overdue tasks color"
 msgstr "過期的工作色彩"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:35
-msgid "Position of the horizontal pane, between the date navigator calendar and the task list when not in the month view, in pixels."
-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 ""
+"水平窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:36
-msgid "Position of the horizontal pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-msgstr "水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
+msgid ""
+"Position of the horizontal pane, between the view and the date navigator "
+"calendar and task list in the month view, in pixels."
+msgstr ""
+"水平窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:37
-msgid "Position of the vertical pane, between the task list and the task preview pane, in pixels."
+msgid ""
+"Position of the vertical pane, between the task list and the task preview "
+"pane, in pixels."
 msgstr "垂直窗格的位置，在工作清單與工作預覽窗格之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:38
-msgid "Position of the vertical pane, between the view and the date navigator calendar and task list in the month view, in pixels."
-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 ""
+"垂直窗格的位置，在月檢視中的視窗與日期導覽行事曆、工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:39
-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 "垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
+msgid ""
+"Position of the vertical pane, between the view and the date navigator "
+"calendar and task list when not in the month view, in pixels."
+msgstr ""
+"垂直窗格的位置，當不在月檢視中時，在日期導覽行事曆與工作清單之間，以像素計。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:40
 msgid "Programs that are allowed to be run by alarms."
@@ -5346,12 +5389,20 @@ msgstr "工作垂直窗格位置"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:55
 #, no-c-format
-msgid "The URL template to use as a free/busy data fallback, %u is replaced by the user part of the mail address and %d is replaced by the domain."
-msgstr "要做為空閒/忙碌資料回饋之用的網址範本，%u 要以郵件位址的使用者部分來取代，而 %d 要替換為網域名稱。"
+msgid ""
+"The URL template to use as a free/busy data fallback, %u is replaced by the "
+"user part of the mail address and %d is replaced by the domain."
+msgstr ""
+"要做為空閒/忙碌資料回饋之用的網址範本，%u 要以郵件位址的使用者部分來取代，而 "
+"%d 要替換為網域名稱。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:56
-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\"。"
+msgid ""
+"The default timezone to use for dates and times in the calendar, as an "
+"untranslated Olsen timezone database location like \"America/New York\"."
+msgstr ""
+"用於行事曆中日期與時刻的預設時區，未翻譯的 Olsen 時區資料庫位置就像 "
+"\"America/New York\"。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:57
 msgid "Time divisions"
@@ -5375,7 +5426,8 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\"."
 msgstr "預設提醒單位，「分鐘」、「小時」或「日」。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:62
-msgid "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
+msgid ""
+"Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\"."
 msgstr "決定何時隱藏工作的單位，「分鐘」、「小時」或「日」。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:64
@@ -5399,7 +5451,9 @@ msgid "Whether to ask for confirmation when expunging appointments and tasks."
 msgstr "清除約會或工作時是否要求確認。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:69
-msgid "Whether to compress weekends in the month view, which puts Saturday and Sunday in the space of one weekday."
+msgid ""
+"Whether to compress weekends in the month view, which puts Saturday and "
+"Sunday in the space of one weekday."
 msgstr "是否壓縮月檢視中的週末，這會將一週中的週六與週日置於一個空位中。"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
@@ -5408,7 +5462,8 @@ msgid "Whether to display the end time of events in the week and month views."
 msgstr "是否在週及月的檢視內顯示約會的結束時間。"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:71
-msgid "Whether to draw the Marcus Bains Line (line at current time) in the calendar."
+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
@@ -5441,7 +5496,8 @@ msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "是否在事件/工作/會議編輯器中顯示 狀態 欄位"
 
 #: ../calendar/gui/apps_evolution_calendar.schemas.in.in.h:78
-msgid "Whether to show times in twenty four hour format instead of using am/pm."
+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
@@ -5511,12 +5567,9 @@ msgstr "沒有相符資料"
 # ui/evolution-calendar.xml.h:23
 # ui/evolution-mail.xml.h:65
 # ui/evolution-tasks.xml.h:4
-#: ../calendar/gui/calendar-commands.c:119
-#: ../calendar/gui/print.c:2513
-#: ../ui/evolution-addressbook.xml.h:17
-#: ../ui/evolution-calendar.xml.h:18
-#: ../ui/evolution-mail-message.xml.h:75
-#: ../ui/evolution-memos.xml.h:11
+#: ../calendar/gui/calendar-commands.c:119 ../calendar/gui/print.c:2514
+#: ../ui/evolution-addressbook.xml.h:26 ../ui/evolution-calendar.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:74 ../ui/evolution-memos.xml.h:11
 #: ../ui/evolution-tasks.xml.h:14
 msgid "Print"
 msgstr "列印"
@@ -5538,8 +5591,12 @@ msgid "Calendar"
 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 "此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
+msgid ""
+"This operation will permanently erase all events older than the selected "
+"amount of time. If you continue, you will not be able to recover these "
+"events."
+msgstr ""
+"此作業會永久性刪除比選取時間還舊的所有事件。如果您繼續，將無法復原這些事件。"
 
 #: ../calendar/gui/calendar-commands.c:354
 msgid "Purge events older than"
@@ -5548,8 +5605,7 @@ msgstr "清除事件早於"
 #: ../calendar/gui/calendar-commands.c:359
 #: ../calendar/gui/dialogs/alarm-dialog.glade.h:20
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:12
-#: ../filter/filter.glade.h:14
-#: ../plugins/calendar-http/calendar-http.c:288
+#: ../filter/filter.glade.h:14 ../plugins/calendar-http/calendar-http.c:288
 #: ../plugins/calendar-weather/calendar-weather.c:565
 #: ../widgets/misc/e-send-options.glade.h:36
 msgid "days"
@@ -5560,16 +5616,13 @@ msgstr "天"
 #. Create the Webcal source group
 #. Create the LDAP source group
 #: ../calendar/gui/calendar-component.c:235
-#: ../calendar/gui/memos-component.c:221
-#: ../calendar/gui/migration.c:501
-#: ../calendar/gui/migration.c:594
-#: ../calendar/gui/migration.c:1102
+#: ../calendar/gui/memos-component.c:221 ../calendar/gui/migration.c:501
+#: ../calendar/gui/migration.c:594 ../calendar/gui/migration.c:1102
 #: ../calendar/gui/tasks-component.c:217
 msgid "On The Web"
 msgstr "在網站上"
 
-#: ../calendar/gui/calendar-component.c:253
-#: ../calendar/gui/migration.c:403
+#: ../calendar/gui/calendar-component.c:253 ../calendar/gui/migration.c:403
 msgid "Birthdays & Anniversaries"
 msgstr "生日和週年紀念日"
 
@@ -5700,8 +5753,7 @@ msgstr "拒絕許可權來開啟行事曆"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/comp-editor-factory.c:444
-#: ../shell/e-shell.c:1279
+#: ../calendar/gui/comp-editor-factory.c:444 ../shell/e-shell.c:1279
 msgid "Unknown error"
 msgstr "不明的錯誤"
 
@@ -5838,8 +5890,9 @@ 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:14
 #: ../calendar/gui/dialogs/event-page.glade.h:4
-#: ../ui/evolution-event-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:2
 msgid "Alarms"
 msgstr "鬧鈴"
 
@@ -5874,8 +5927,7 @@ msgstr "附件內容"
 #: ../calendar/gui/e-itip-control.c:1165
 #: ../calendar/gui/e-itip-control.glade.h:6
 #: ../composer/e-msg-composer-attachment.glade.h:3
-#: ../mail/mail-config.glade.h:69
-#: ../widgets/misc/e-attachment.glade.h:3
+#: ../mail/mail-config.glade.h:69 ../widgets/misc/e-attachment.glade.h:3
 msgid "Description:"
 msgstr "描述:"
 
@@ -5893,6 +5945,11 @@ msgstr "檔案名稱:"
 msgid "MIME type:"
 msgstr "MIME 類型:"
 
+# ui/evolution-addressbook.xml.h:7
+#: ../calendar/gui/dialogs/cal-prefs-dialog.c:470
+msgid "Selected Calendars for Alarms"
+msgstr "選擇鬧鈴行事曆"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:1
 msgid ""
 "60 minutes\n"
@@ -5907,26 +5964,22 @@ msgstr ""
 "10 分鐘\n"
 "05 分鐘"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "<b>Publishing</b>"
-msgstr "<b>發佈</b>"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, no-c-format
-msgid "<i>%u and %d will be replaced by user and domain from the email address.</i>"
+msgid ""
+"<i>%u and %d will be replaced by user and domain from the email address.</i>"
 msgstr "<i>%u 與 %d 會被替換為電子郵件位址中的使用者與網域名稱。</i>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
 #: ../mail/mail-config.glade.h:9
 msgid "<span weight=\"bold\">Alerts</span>"
 msgstr "<span weight=\"bold\">警告</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 msgid "<span weight=\"bold\">Default Free/Busy Server</span>"
 msgstr "<span weight=\"bold\">預設空閒/忙碌伺服器</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
 #: ../mail/mail-config.glade.h:18
 #: ../plugins/itip-formatter/itip-formatter.c:1977
 #: ../plugins/publish-calendar/publish-calendar.glade.h:1
@@ -5934,16 +5987,16 @@ 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:12
+#: ../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:13
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "<span weight=\"bold\">Time</span>"
 msgstr "<span weight=\"bold\">時間</span>"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
 msgid "<span weight=\"bold\">Work Week</span>"
 msgstr "<span weight=\"bold\">工作週</span>"
 
@@ -5957,26 +6010,20 @@ msgstr "一日結束於(_E):"
 msgid "Display"
 msgstr "顯示"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
-#: ../mail/mail-config.glade.h:74
-#: ../plugins/publish-calendar/publish-calendar.glade.h:9
-msgid "E_nable"
-msgstr "啟用(_E)"
-
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: ../calendar/gui/dialogs/event-editor.c:566
-#: ../ui/evolution-event-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:8
 msgid "Free/Busy"
 msgstr "空閒/忙碌"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: ../calendar/gui/dialogs/recurrence-page.c:1050
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: ../calendar/gui/dialogs/recurrence-page.c:1051
 #: ../calendar/gui/e-itip-control.c:733
 msgid "Friday"
 msgstr "星期五"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 msgid ""
 "Minutes\n"
 "Hours\n"
@@ -5986,13 +6033,13 @@ msgstr ""
 "小時\n"
 "日"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#: ../calendar/gui/dialogs/recurrence-page.c:1046
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 #: ../calendar/gui/e-itip-control.c:729
 msgid "Monday"
 msgstr "星期一"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid ""
 "Monday\n"
 "Tuesday\n"
@@ -6010,21 +6057,28 @@ msgstr ""
 "星期六\n"
 "星期日"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-msgid "Publishing Table"
-msgstr "發佈的表格"
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+# mail/mail-config.glade.h:54
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
+#: ../mail/mail-config.glade.h:105
+msgid "Pick a color"
+msgstr "選取顏色"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "S_un"
 msgstr "週日(_U)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: ../calendar/gui/dialogs/recurrence-page.c:1051
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: ../calendar/gui/dialogs/recurrence-page.c:1052
 #: ../calendar/gui/e-itip-control.c:734
 msgid "Saturday"
 msgstr "星期六"
 
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+msgid "Select the calendars for alarm notification"
+msgstr "選擇鬧鈴通知的行事曆"
+
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒於約會(_O)"
@@ -6035,7 +6089,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: ../calendar/gui/dialogs/recurrence-page.c:1052
+#: ../calendar/gui/dialogs/recurrence-page.c:1053
 #: ../calendar/gui/e-itip-control.c:728
 msgid "Sunday"
 msgstr "星期日"
@@ -6055,7 +6109,7 @@ msgid "Template:"
 msgstr "樣板:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
+#: ../calendar/gui/dialogs/recurrence-page.c:1050
 #: ../calendar/gui/e-itip-control.c:732
 msgid "Thursday"
 msgstr "星期四"
@@ -6073,7 +6127,7 @@ msgstr "時刻格式:"
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#: ../calendar/gui/dialogs/recurrence-page.c:1047
+#: ../calendar/gui/dialogs/recurrence-page.c:1048
 #: ../calendar/gui/e-itip-control.c:730
 msgid "Tuesday"
 msgstr "星期二"
@@ -6083,7 +6137,7 @@ msgid "W_eek starts:"
 msgstr "一週開始於(_E):"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: ../calendar/gui/dialogs/recurrence-page.c:1048
+#: ../calendar/gui/dialogs/recurrence-page.c:1049
 #: ../calendar/gui/e-itip-control.c:731
 msgid "Wednesday"
 msgstr "星期三"
@@ -6101,62 +6155,58 @@ msgid "_24 hour"
 msgstr "_24 小時"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-msgid "_Add URL"
-msgstr "加入網址(_A)"
-
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Day begins:"
 msgstr "一日開始於(_D):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Fri"
 msgstr "週五(_F)"
 
 # ui/evolution-mail.xml.h:43
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 msgid "_Mon"
 msgstr "週一(_M)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:56
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:57
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:58
 msgid "_Show appointment end times in week and month view"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:59
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:60
 msgid "_Tue"
 msgstr "週二(_T)"
 
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:63
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:61
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:64
+#: ../calendar/gui/dialogs/cal-prefs-dialog.glade.h:62
 msgid "before every appointment"
 msgstr "前"
 
@@ -6225,13 +6275,6 @@ msgstr "新增行事曆"
 msgid "Add Task List"
 msgstr "新增工作清單"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
-#: ../calendar/gui/dialogs/calendar-setup.glade.h:5
-#: ../mail/mail-config.glade.h:105
-msgid "Pick a color"
-msgstr "選取顏色"
-
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:6
 msgid "_Add Calendar"
 msgstr "加入行事曆(_A)"
@@ -6256,8 +6299,7 @@ msgid "_URL:"
 msgstr "網址(_U):"
 
 #: ../calendar/gui/dialogs/calendar-setup.glade.h:15
-#: ../filter/filter.glade.h:21
-#: ../plugins/calendar-http/calendar-http.c:289
+#: ../filter/filter.glade.h:21 ../plugins/calendar-http/calendar-http.c:289
 #: ../plugins/calendar-weather/calendar-weather.c:566
 msgid "weeks"
 msgstr "週"
@@ -6313,8 +6355,7 @@ msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 msgid "Validation error: %s"
 msgstr "確認上的錯誤： %s"
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:187
-#: ../calendar/gui/print.c:2271
+#: ../calendar/gui/dialogs/comp-editor-util.c:187 ../calendar/gui/print.c:2272
 msgid " to "
 msgstr " 到 "
 
@@ -6322,8 +6363,7 @@ msgstr " 到 "
 # 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:2275
+#: ../calendar/gui/dialogs/comp-editor-util.c:191 ../calendar/gui/print.c:2276
 msgid " (Completed "
 msgstr " (已完成) "
 
@@ -6331,26 +6371,22 @@ msgstr " (已完成) "
 # 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:2277
+#: ../calendar/gui/dialogs/comp-editor-util.c:193 ../calendar/gui/print.c:2278
 msgid "Completed "
 msgstr "已完成 "
 
-#: ../calendar/gui/dialogs/comp-editor-util.c:198
-#: ../calendar/gui/print.c:2282
+#: ../calendar/gui/dialogs/comp-editor-util.c:198 ../calendar/gui/print.c:2283
 msgid " (Due "
 msgstr "(期限)"
 
 # calendar/gui/dialogs/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:2284
+#: ../calendar/gui/dialogs/comp-editor-util.c:200 ../calendar/gui/print.c:2285
 msgid "Due "
 msgstr "期限 "
 
 # mail/mail-tools.c:219
-#: ../calendar/gui/dialogs/comp-editor.c:207
-#: ../composer/e-msg-composer.c:2854
+#: ../calendar/gui/dialogs/comp-editor.c:207 ../composer/e-msg-composer.c:2854
 #, c-format
 msgid "Attached message - %s"
 msgstr "附加訊息 - %s"
@@ -6358,8 +6394,7 @@ msgstr "附加訊息 - %s"
 # composer/e-msg-composer-attachment-bar.c:501
 #. translators, this count will always be >1
 #: ../calendar/gui/dialogs/comp-editor.c:212
-#: ../calendar/gui/dialogs/comp-editor.c:382
-#: ../composer/e-msg-composer.c:2859
+#: ../calendar/gui/dialogs/comp-editor.c:382 ../composer/e-msg-composer.c:2859
 #: ../composer/e-msg-composer.c:3038
 #, c-format
 msgid "Attached message"
@@ -6367,19 +6402,14 @@ msgid_plural "%d attached messages"
 msgstr[0] "附加 1 個訊息"
 msgstr[1] "附加 %d 個訊息"
 
-#: ../calendar/gui/dialogs/comp-editor.c:446
-#: ../composer/e-msg-composer.c:3103
-#: ../mail/em-folder-tree.c:980
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:973
-#: ../mail/message-list.c:1730
+#: ../calendar/gui/dialogs/comp-editor.c:446 ../composer/e-msg-composer.c:3103
+#: ../mail/em-folder-tree.c:980 ../mail/em-folder-utils.c:368
+#: ../mail/em-folder-view.c:973 ../mail/message-list.c:1730
 msgid "_Move"
 msgstr "移動(_M)"
 
-#: ../calendar/gui/dialogs/comp-editor.c:448
-#: ../composer/e-msg-composer.c:3105
-#: ../mail/em-folder-tree.c:982
-#: ../mail/message-list.c:1732
+#: ../calendar/gui/dialogs/comp-editor.c:448 ../composer/e-msg-composer.c:3105
+#: ../mail/em-folder-tree.c:982 ../mail/message-list.c:1732
 msgid "Cancel _Drag"
 msgstr "取消拖拉(_D)"
 
@@ -6388,8 +6418,7 @@ msgstr "取消拖拉(_D)"
 msgid "Could not update object"
 msgstr "無法更新物件"
 
-#: ../calendar/gui/dialogs/comp-editor.c:952
-#: ../composer/e-msg-composer.c:2483
+#: ../calendar/gui/dialogs/comp-editor.c:952 ../composer/e-msg-composer.c:2483
 #, c-format
 msgid "<b>%d</b> Attachment"
 msgid_plural "<b>%d</b> Attachments"
@@ -6413,7 +6442,7 @@ msgstr "顯示附加檔案列(_B)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1094
 #: ../calendar/gui/dialogs/event-page.c:1895
-#: ../calendar/gui/dialogs/meeting-page.c:909
+#: ../calendar/gui/dialogs/meeting-page.c:914
 #: ../calendar/gui/dialogs/task-page.c:1206
 #: ../composer/e-msg-composer-attachment-bar.c:470
 #: ../composer/e-msg-composer.c:3601
@@ -6425,9 +6454,8 @@ msgstr "移除(_R)"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1095
 #: ../composer/e-msg-composer-attachment-bar.c:471
-#: ../composer/e-msg-composer.c:3602
-#: ../mail/em-folder-tree.c:2058
-#: ../ui/evolution-mail-list.xml.h:33
+#: ../composer/e-msg-composer.c:3602 ../mail/em-folder-tree.c:2058
+#: ../ui/evolution-addressbook.xml.h:59 ../ui/evolution-mail-list.xml.h:33
 msgid "_Properties"
 msgstr "屬性(_P)"
 
@@ -6492,10 +6520,8 @@ msgid "No summary"
 msgstr "沒有摘要"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2668
-#: ../composer/e-msg-composer-attachment-bar.c:307
-#: ../mail/em-utils.c:156
-#: ../mail/em-utils.c:502
-#: ../mail/em-utils.c:539
+#: ../composer/e-msg-composer-attachment-bar.c:307 ../mail/em-utils.c:156
+#: ../mail/em-utils.c:502 ../mail/em-utils.c:539
 #: ../widgets/misc/e-attachment-bar.c:342
 msgid "attachment"
 msgstr "附件"
@@ -6594,7 +6620,7 @@ msgstr "約會(_M)"
 
 # calendar/gui/event-editor-dialog.glade.h:18
 #: ../calendar/gui/dialogs/event-editor.c:545
-#: ../ui/evolution-event-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:14
 msgid "Recurrence"
 msgstr "週期性"
 
@@ -6640,25 +6666,25 @@ msgid "End time is wrong"
 msgstr "結束時間錯誤"
 
 #: ../calendar/gui/dialogs/event-page.c:1449
-#: ../calendar/gui/dialogs/meeting-page.c:464
+#: ../calendar/gui/dialogs/meeting-page.c:469
 #: ../calendar/gui/dialogs/task-page.c:908
 msgid "The organizer selected no longer has an account."
 msgstr "選取的召集人已經沒有帳號。"
 
 #: ../calendar/gui/dialogs/event-page.c:1455
-#: ../calendar/gui/dialogs/meeting-page.c:470
+#: ../calendar/gui/dialogs/meeting-page.c:475
 #: ../calendar/gui/dialogs/task-page.c:914
 msgid "An organizer is required."
 msgstr "需要一個召集人。"
 
 #: ../calendar/gui/dialogs/event-page.c:1470
-#: ../calendar/gui/dialogs/meeting-page.c:485
+#: ../calendar/gui/dialogs/meeting-page.c:490
 #: ../calendar/gui/dialogs/task-page.c:929
 msgid "At least one attendee is required."
 msgstr "最少需要一個到會者。"
 
 #: ../calendar/gui/dialogs/event-page.c:1896
-#: ../calendar/gui/dialogs/meeting-page.c:910
+#: ../calendar/gui/dialogs/meeting-page.c:915
 #: ../calendar/gui/dialogs/task-page.c:1207
 msgid "_Add "
 msgstr "新增(_A)"
@@ -6772,39 +6798,34 @@ msgstr "舉行"
 msgid "until"
 msgstr "直至"
 
-#: ../calendar/gui/dialogs/meeting-page.c:306
-msgid "<b>Dele_gatees</b>"
-msgstr "<b>代理者(_G)</b>"
+#: ../calendar/gui/dialogs/meeting-page.c:307
+msgid "Dele_gatees"
+msgstr "代理者(_G)"
 
-#: ../calendar/gui/dialogs/meeting-page.c:310
-msgid "<b>From:</b>"
-msgstr "<b>從:</b>"
+# composer/e-msg-composer-hdrs.c:355
+#: ../calendar/gui/dialogs/meeting-page.c:313
+msgid "From:"
+msgstr "寄件者:"
 
 #. an empty string is the same as 'None'
 #. Put the "None" and "UTC" entries at the top of the combo's list.
 #. When "None" is selected we want the field to be cleared.
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
-#: ../calendar/gui/dialogs/meeting-page.c:316
+#: ../calendar/gui/dialogs/meeting-page.c:321
 #: ../calendar/gui/dialogs/meeting-page.glade.h:4
 #: ../calendar/gui/e-cal-model-tasks.c:654
-#: ../calendar/gui/e-itip-control.c:1105
-#: ../composer/e-msg-composer.c:2275
-#: ../filter/filter-rule.c:881
-#: ../mail/em-account-editor.c:691
-#: ../mail/em-account-editor.c:1356
-#: ../mail/em-account-prefs.c:465
-#: ../mail/em-folder-view.c:1106
-#: ../mail/em-junk-hook.c:78
+#: ../calendar/gui/e-itip-control.c:1105 ../composer/e-msg-composer.c:2275
+#: ../filter/filter-rule.c:889 ../mail/em-account-editor.c:691
+#: ../mail/em-account-editor.c:1356 ../mail/em-account-prefs.c:468
+#: ../mail/em-folder-view.c:1106 ../mail/em-junk-hook.c:78
 #: ../plugins/calendar-weather/calendar-weather.c:370
 #: ../plugins/calendar-weather/calendar-weather.c:424
 #: ../plugins/exchange-operations/exchange-delegates.glade.h:9
 #: ../plugins/itip-formatter/itip-formatter.c:1627
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.c:192
-#: ../widgets/misc/e-cell-date-edit.c:249
-#: ../widgets/misc/e-dateedit.c:475
-#: ../widgets/misc/e-dateedit.c:1514
-#: ../widgets/misc/e-dateedit.c:1728
+#: ../widgets/misc/e-cell-date-edit.c:249 ../widgets/misc/e-dateedit.c:475
+#: ../widgets/misc/e-dateedit.c:1514 ../widgets/misc/e-dateedit.c:1728
 msgid "None"
 msgstr "無"
 
@@ -6864,8 +6885,7 @@ msgstr "RSVP"
 #: ../calendar/gui/dialogs/meeting-page.etspec.h:10
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/e-meeting-list-view.c:513
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:10
-#: ../mail/em-filter-i18n.h:63
+#: ../calendar/gui/e-meeting-time-sel.etspec.h:10 ../mail/em-filter-i18n.h:63
 #: ../mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "狀況"
@@ -6896,8 +6916,7 @@ msgid "Organizer:"
 msgstr "會議召集人:"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/dialogs/memo-editor.c:130
-#: ../calendar/gui/print.c:2312
+#: ../calendar/gui/dialogs/memo-editor.c:130 ../calendar/gui/print.c:2313
 msgid "Memo"
 msgstr "備忘錄"
 
@@ -6920,8 +6939,7 @@ msgstr "分類(_F):"
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
 #: ../calendar/gui/dialogs/memo-page.glade.h:5
-#: ../calendar/gui/e-cal-list-view.c:257
-#: ../calendar/gui/e-cal-model.c:325
+#: ../calendar/gui/e-cal-list-view.c:257 ../calendar/gui/e-cal-model.c:325
 #: ../calendar/gui/e-calendar-table.c:368
 msgid "Confidential"
 msgstr "機密"
@@ -6930,8 +6948,7 @@ msgstr "機密"
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
 #: ../calendar/gui/dialogs/memo-page.glade.h:6
-#: ../calendar/gui/e-cal-list-view.c:256
-#: ../calendar/gui/e-cal-model.c:323
+#: ../calendar/gui/e-cal-list-view.c:256 ../calendar/gui/e-cal-model.c:323
 #: ../calendar/gui/e-calendar-table.c:367
 msgid "Private"
 msgstr "私人"
@@ -6940,10 +6957,8 @@ msgstr "私人"
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
 #: ../calendar/gui/dialogs/memo-page.glade.h:7
-#: ../calendar/gui/e-cal-list-view.c:255
-#: ../calendar/gui/e-cal-model.c:314
-#: ../calendar/gui/e-cal-model.c:321
-#: ../calendar/gui/e-calendar-table.c:366
+#: ../calendar/gui/e-cal-list-view.c:255 ../calendar/gui/e-cal-model.c:314
+#: ../calendar/gui/e-cal-model.c:321 ../calendar/gui/e-calendar-table.c:366
 msgid "Public"
 msgstr "公開"
 
@@ -7022,7 +7037,8 @@ msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "您正在修改週期性工作。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:62
-msgid "You are modifying a recurring journal entry. What would you like to modify?"
+msgid ""
+"You are modifying a recurring journal entry. What would you like to modify?"
 msgstr "您正在修改週期性日誌項目。您想要修改什麼？"
 
 #: ../calendar/gui/dialogs/recur-comp.c:90
@@ -7044,60 +7060,60 @@ msgid "All Instances"
 msgstr "所有例項"
 
 # calendar/gui/event-editor.c:871
-#: ../calendar/gui/dialogs/recurrence-page.c:498
+#: ../calendar/gui/dialogs/recurrence-page.c:499
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution 無法編輯這個週期性約會。"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:819
+#: ../calendar/gui/dialogs/recurrence-page.c:820
 msgid "Recurrence date is invalid"
 msgstr "週期性日期無效"
 
 # calendar/gui/event-editor.c:449
-#: ../calendar/gui/dialogs/recurrence-page.c:930
+#: ../calendar/gui/dialogs/recurrence-page.c:931
 msgid "on"
 msgstr "的"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:990
+#: ../calendar/gui/dialogs/recurrence-page.c:991
 msgid "first"
 msgstr "一"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:992
+#: ../calendar/gui/dialogs/recurrence-page.c:993
 msgid "third"
 msgstr "三"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:993
+#: ../calendar/gui/dialogs/recurrence-page.c:994
 msgid "fourth"
 msgstr "四"
 
 # addressbook/contact-editor/fullname.glade.h:8
-#: ../calendar/gui/dialogs/recurrence-page.c:994
+#: ../calendar/gui/dialogs/recurrence-page.c:995
 msgid "last"
 msgstr "最後"
 
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
-#: ../calendar/gui/dialogs/recurrence-page.c:1017
+#: ../calendar/gui/dialogs/recurrence-page.c:1018
 msgid "Other Date"
 msgstr "其它日期"
 
 # calendar/gui/event-editor.c:474
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../calendar/gui/dialogs/recurrence-page.c:1046
 msgid "day"
 msgstr "天"
 
 # calendar/gui/event-editor.c:601
-#: ../calendar/gui/dialogs/recurrence-page.c:1182
+#: ../calendar/gui/dialogs/recurrence-page.c:1183
 msgid "on the"
 msgstr "在第"
 
 # calendar/gui/event-editor.c:754
-#: ../calendar/gui/dialogs/recurrence-page.c:1371
+#: ../calendar/gui/dialogs/recurrence-page.c:1372
 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:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2343
 msgid "Date/Time"
 msgstr "日期/時間"
 
@@ -7178,12 +7194,9 @@ msgstr "<span weight=\"bold\">狀態</span>"
 #: ../calendar/gui/e-cal-component-preview.c:231
 #: ../calendar/gui/e-cal-model-tasks.c:347
 #: ../calendar/gui/e-cal-model-tasks.c:660
-#: ../calendar/gui/e-calendar-table.c:463
-#: ../calendar/gui/e-itip-control.c:897
-#: ../calendar/gui/e-meeting-store.c:197
-#: ../calendar/gui/e-meeting-store.c:220
-#: ../calendar/gui/print.c:2373
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/e-itip-control.c:897
+#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
+#: ../calendar/gui/print.c:2374 ../plugins/save-calendar/csv-format.c:390
 msgid "Completed"
 msgstr "已完成"
 
@@ -7194,8 +7207,7 @@ msgstr "已完成"
 # 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:388
-#: ../mail/message-list.c:1016
+#: ../calendar/gui/e-calendar-table.c:388 ../mail/message-list.c:1016
 msgid "High"
 msgstr "高"
 
@@ -7208,8 +7220,7 @@ msgstr "高"
 #: ../calendar/gui/e-cal-model-tasks.c:345
 #: ../calendar/gui/e-cal-model-tasks.c:658
 #: ../calendar/gui/e-cal-model-tasks.c:733
-#: ../calendar/gui/e-calendar-table.c:462
-#: ../calendar/gui/print.c:2370
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/print.c:2371
 msgid "In Progress"
 msgstr "進行中"
 
@@ -7220,15 +7231,13 @@ msgstr "進行中"
 # 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:390
-#: ../mail/message-list.c:1014
+#: ../calendar/gui/e-calendar-table.c:390 ../mail/message-list.c:1014
 msgid "Low"
 msgstr "低"
 
 #: ../calendar/gui/dialogs/task-details-page.glade.h:8
 #: ../calendar/gui/e-cal-component-preview.c:252
-#: ../calendar/gui/e-cal-model.c:920
-#: ../calendar/gui/e-calendar-table.c:389
+#: ../calendar/gui/e-cal-model.c:920 ../calendar/gui/e-calendar-table.c:389
 #: ../mail/message-list.c:1015
 msgid "Normal"
 msgstr "正常"
@@ -7241,8 +7250,7 @@ msgstr "正常"
 #: ../calendar/gui/e-cal-component-preview.c:238
 #: ../calendar/gui/e-cal-model-tasks.c:343
 #: ../calendar/gui/e-cal-model-tasks.c:656
-#: ../calendar/gui/e-calendar-table.c:461
-#: ../calendar/gui/print.c:2367
+#: ../calendar/gui/e-calendar-table.c:461 ../calendar/gui/print.c:2368
 msgid "Not Started"
 msgstr "未開始"
 
@@ -7484,8 +7492,7 @@ 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:2823
+#: ../calendar/gui/e-cal-component-preview.c:70 ../mail/em-folder-view.c:2823
 #, c-format
 msgid "Click to open %s"
 msgstr "按一下來開啟 %s"
@@ -7500,8 +7507,7 @@ msgstr "備忘錄:"
 msgid "Web Page:"
 msgstr "網頁："
 
-#: ../calendar/gui/e-cal-component-preview.c:155
-#: ../filter/filter-rule.c:796
+#: ../calendar/gui/e-cal-component-preview.c:155 ../filter/filter-rule.c:804
 msgid "Untitled"
 msgstr "未命名"
 
@@ -7551,8 +7557,7 @@ 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:4
-#: ../mail/mail-dialogs.glade.h:16
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../mail/mail-dialogs.glade.h:16
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Summary"
 msgstr "摘要"
@@ -7582,19 +7587,16 @@ msgstr ""
 "45.436845,125.862501"
 
 # calendar/gui/calendar-model.c:1584
-#: ../calendar/gui/e-cal-model-tasks.c:1019
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:192
-#: ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:179
+#: ../calendar/gui/e-meeting-store.c:169 ../calendar/gui/e-meeting-store.c:179
 #: ../calendar/gui/e-meeting-store.c:809
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:5
 msgid "Yes"
 msgstr "是"
 
 # calendar/gui/calendar-model.c:1584
-#: ../calendar/gui/e-cal-model-tasks.c:1019
-#: ../calendar/gui/e-cal-model.c:926
+#: ../calendar/gui/e-cal-model-tasks.c:1019 ../calendar/gui/e-cal-model.c:926
 #: ../calendar/gui/e-meeting-list-view.c:193
 #: ../calendar/gui/e-meeting-store.c:181
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:2
@@ -7602,19 +7604,14 @@ msgid "No"
 msgstr "否"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:327
-#: ../calendar/gui/e-cal-model.c:330
-#: ../calendar/gui/e-cal-popup.c:107
-#: ../calendar/gui/e-cal-popup.c:122
-#: ../calendar/gui/e-cal-popup.c:166
-#: ../calendar/gui/e-itip-control.c:1150
+#: ../calendar/gui/e-cal-model.c:327 ../calendar/gui/e-cal-model.c:330
+#: ../calendar/gui/e-cal-popup.c:107 ../calendar/gui/e-cal-popup.c:122
+#: ../calendar/gui/e-cal-popup.c:166 ../calendar/gui/e-itip-control.c:1150
 #: ../calendar/gui/e-itip-control.c:1291
 #: ../calendar/gui/e-meeting-list-view.c:168
 #: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:125
-#: ../calendar/gui/e-meeting-store.c:160
-#: ../calendar/gui/e-meeting-store.c:225
-#: ../mail/em-utils.c:1312
+#: ../calendar/gui/e-meeting-store.c:125 ../calendar/gui/e-meeting-store.c:160
+#: ../calendar/gui/e-meeting-store.c:225 ../mail/em-utils.c:1312
 #: ../plugins/itip-formatter/itip-formatter.c:240
 #: ../plugins/itip-formatter/itip-formatter.c:1652
 #: ../plugins/plugin-manager/plugin-manager.c:72
@@ -7635,36 +7632,28 @@ msgstr "已指定"
 
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
-#: ../calendar/gui/e-cal-popup.c:172
-#: ../mail/em-popup.c:412
+#: ../calendar/gui/e-cal-popup.c:172 ../mail/em-popup.c:412
 msgid "Save As..."
 msgstr "另存新檔..."
 
 # mail/mail-display.c:196
-#: ../calendar/gui/e-cal-popup.c:188
-#: ../mail/em-format-html-display.c:1865
+#: ../calendar/gui/e-cal-popup.c:188 ../mail/em-format-html-display.c:1866
 msgid "Select folder to save selected attachments..."
 msgstr "選擇用來儲存選定的附加檔案的資料夾..."
 
 # mail/mail-search.c:138
-#: ../calendar/gui/e-cal-popup.c:217
-#: ../mail/em-popup.c:437
+#: ../calendar/gui/e-cal-popup.c:217 ../mail/em-popup.c:437
 #, c-format
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: ../calendar/gui/e-cal-popup.c:271
-#: ../calendar/gui/e-calendar-table.c:1178
-#: ../calendar/gui/e-calendar-view.c:1607
-#: ../calendar/gui/e-memo-table.c:856
-#: ../mail/em-folder-view.c:1087
-#: ../mail/em-popup.c:554
-#: ../mail/em-popup.c:565
+#: ../calendar/gui/e-cal-popup.c:271 ../calendar/gui/e-calendar-table.c:1178
+#: ../calendar/gui/e-calendar-view.c:1607 ../calendar/gui/e-memo-table.c:856
+#: ../mail/em-folder-view.c:1087 ../mail/em-popup.c:554 ../mail/em-popup.c:565
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
 
-#: ../calendar/gui/e-cal-popup.c:272
-#: ../mail/em-popup.c:555
+#: ../calendar/gui/e-cal-popup.c:272 ../mail/em-popup.c:555
 #: ../mail/em-popup.c:566
 msgid "Set as _Background"
 msgstr "設為背景(_B)"
@@ -7674,8 +7663,7 @@ msgid "_Save Selected"
 msgstr "儲存選取的(_S)"
 
 # mail/mail-display.c:299
-#: ../calendar/gui/e-cal-popup.c:395
-#: ../mail/em-popup.c:775
+#: ../calendar/gui/e-cal-popup.c:395 ../mail/em-popup.c:775
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
@@ -7741,74 +7729,58 @@ msgstr "工作表格"
 
 # calendar/gui/e-calendar-table.c:714
 #: ../calendar/gui/e-calendar-table.c:705
-#: ../calendar/gui/e-calendar-view.c:678
-#: ../calendar/gui/e-memo-table.c:435
+#: ../calendar/gui/e-calendar-view.c:678 ../calendar/gui/e-memo-table.c:435
 msgid "Deleting selected objects"
 msgstr "刪除選定的物件"
 
 #: ../calendar/gui/e-calendar-table.c:884
-#: ../calendar/gui/e-calendar-view.c:806
-#: ../calendar/gui/e-memo-table.c:612
+#: ../calendar/gui/e-calendar-view.c:806 ../calendar/gui/e-memo-table.c:612
 msgid "Updating objects"
 msgstr "更新物件"
 
 # composer/e-msg-composer.c:774
 #: ../calendar/gui/e-calendar-table.c:1034
-#: ../calendar/gui/e-calendar-view.c:1141
-#: ../calendar/gui/e-memo-table.c:744
+#: ../calendar/gui/e-calendar-view.c:1141 ../calendar/gui/e-memo-table.c:744
 #: ../composer/e-msg-composer.c:1354
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: ../calendar/gui/e-calendar-table.c:1177
-#: ../calendar/gui/e-memo-table.c:855
+#: ../calendar/gui/e-calendar-table.c:1177 ../calendar/gui/e-memo-table.c:855
 msgid "Open _Web Page"
 msgstr "開啟網頁(_W)"
 
 #: ../calendar/gui/e-calendar-table.c:1179
 #: ../calendar/gui/e-calendar-view.c:1592
-#: ../calendar/gui/e-calendar-view.c:1608
-#: ../calendar/gui/e-memo-table.c:857
+#: ../calendar/gui/e-calendar-view.c:1608 ../calendar/gui/e-memo-table.c:857
 #: ../mail/em-folder-view.c:1088
 #: ../plugins/print-message/org-gnome-print-message.xml.h:3
-#: ../ui/evolution-addressbook.xml.h:40
-#: ../ui/evolution-calendar.xml.h:42
-#: ../ui/evolution-mail-message.xml.h:124
-#: ../ui/evolution-memos.xml.h:20
+#: ../ui/evolution-addressbook.xml.h:58 ../ui/evolution-calendar.xml.h:42
+#: ../ui/evolution-mail-message.xml.h:123 ../ui/evolution-memos.xml.h:20
 #: ../ui/evolution-tasks.xml.h:29
 msgid "_Print..."
 msgstr "列印(_P)..."
 
 #: ../calendar/gui/e-calendar-table.c:1183
-#: ../calendar/gui/e-calendar-view.c:1612
-#: ../calendar/gui/e-memo-table.c:861
-#: ../ui/evolution-addressbook.xml.h:1
-#: ../ui/evolution-calendar.xml.h:1
-#: ../ui/evolution-memos.xml.h:1
-#: ../ui/evolution-tasks.xml.h:1
+#: ../calendar/gui/e-calendar-view.c:1612 ../calendar/gui/e-memo-table.c:861
+#: ../ui/evolution-addressbook.xml.h:2 ../ui/evolution-calendar.xml.h:1
+#: ../ui/evolution-memos.xml.h:1 ../ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "剪下(_U)"
 
 #: ../calendar/gui/e-calendar-table.c:1185
 #: ../calendar/gui/e-calendar-view.c:1595
-#: ../calendar/gui/e-calendar-view.c:1614
-#: ../calendar/gui/e-memo-table.c:863
-#: ../ui/evolution-addressbook.xml.h:39
-#: ../ui/evolution-calendar.xml.h:41
-#: ../ui/evolution-composer-entries.xml.h:15
-#: ../ui/evolution-editor.xml.h:22
-#: ../ui/evolution-memos.xml.h:19
-#: ../ui/evolution-tasks.xml.h:28
+#: ../calendar/gui/e-calendar-view.c:1614 ../calendar/gui/e-memo-table.c:863
+#: ../ui/evolution-addressbook.xml.h:57 ../ui/evolution-calendar.xml.h:41
+#: ../ui/evolution-composer-entries.xml.h:15 ../ui/evolution-editor.xml.h:22
+#: ../ui/evolution-memos.xml.h:19 ../ui/evolution-tasks.xml.h:28
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: ../calendar/gui/e-calendar-table.c:1189
-#: ../ui/evolution-tasks.xml.h:22
+#: ../calendar/gui/e-calendar-table.c:1189 ../ui/evolution-tasks.xml.h:22
 msgid "_Assign Task"
 msgstr "指派工作(_A)"
 
-#: ../calendar/gui/e-calendar-table.c:1190
-#: ../calendar/gui/e-memo-table.c:867
+#: ../calendar/gui/e-calendar-table.c:1190 ../calendar/gui/e-memo-table.c:867
 #: ../ui/evolution-tasks.xml.h:26
 msgid "_Forward as iCalendar"
 msgstr "以 iCalendar 轉寄(_F)"
@@ -7840,8 +7812,7 @@ 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:627
+#: ../calendar/gui/e-calendar-table.etspec.h:5 ../mail/mail-send-recv.c:627
 msgid "Complete"
 msgstr "完成"
 
@@ -7943,11 +7914,9 @@ msgstr "以 iCalendar 轉寄(_F)..."
 msgid "_Reply"
 msgstr "回覆(_R)"
 
-#: ../calendar/gui/e-calendar-view.c:1624
-#: ../mail/em-folder-view.c:1082
-#: ../mail/em-popup.c:559
-#: ../mail/em-popup.c:570
-#: ../ui/evolution-mail-message.xml.h:82
+#: ../calendar/gui/e-calendar-view.c:1624 ../mail/em-folder-view.c:1082
+#: ../mail/em-popup.c:559 ../mail/em-popup.c:570
+#: ../ui/evolution-mail-message.xml.h:81
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
@@ -7967,21 +7936,27 @@ 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:2043
+#: ../calendar/gui/e-calendar-view.c:2045
 #, 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:2049
+#, 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:2057
-#: ../calendar/gui/print.c:2340
+#: ../calendar/gui/e-calendar-view.c:2064 ../calendar/gui/print.c:2341
 #, c-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2088
+#: ../calendar/gui/e-calendar-view.c:2095
 #, c-format
 msgid "Time: %s %s"
 msgstr "時刻: %s %s"
@@ -8013,7 +7988,11 @@ msgstr ""
 "%s"
 
 # calendar/gui/e-day-view-time-item.c:519
-#: ../calendar/gui/e-day-view-time-item.c:553
+#. TO TRANSLATORS: %02i is the number of minutes; this is a context menu entry
+#. * to change the length of the time division in the calendar day view, e.g.
+#. * a day is displayed in 24 "60 minute divisions" or 48 "30 minute divisions"
+#.
+#: ../calendar/gui/e-day-view-time-item.c:557
 #, c-format
 msgid "%02i minute divisions"
 msgstr "間隔 %02i 分鐘"
@@ -8027,10 +8006,8 @@ msgstr "間隔 %02i 分鐘"
 #. month, %B = full month name. You can change the
 #. order but don't change the specifiers or add
 #. anything.
-#: ../calendar/gui/e-day-view-top-item.c:715
-#: ../calendar/gui/e-day-view.c:1493
-#: ../calendar/gui/e-week-view-main-item.c:313
-#: ../calendar/gui/print.c:1527
+#: ../calendar/gui/e-day-view-top-item.c:715 ../calendar/gui/e-day-view.c:1493
+#: ../calendar/gui/e-week-view-main-item.c:313 ../calendar/gui/print.c:1528
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
@@ -8038,9 +8015,8 @@ msgstr "%A %d %B"
 # 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:748
-#: ../calendar/gui/e-week-view.c:512
-#: ../calendar/gui/print.c:842
+#: ../calendar/gui/e-day-view.c:748 ../calendar/gui/e-week-view.c:512
+#: ../calendar/gui/print.c:843
 msgid "am"
 msgstr "上午"
 
@@ -8048,9 +8024,8 @@ msgstr "上午"
 # 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:751
-#: ../calendar/gui/e-week-view.c:515
-#: ../calendar/gui/print.c:844
+#: ../calendar/gui/e-day-view.c:751 ../calendar/gui/e-week-view.c:515
+#: ../calendar/gui/print.c:845
 msgid "pm"
 msgstr "下午"
 
@@ -8141,8 +8116,7 @@ msgid "Due"
 msgstr "截止"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/e-itip-control.c:950
-#: ../calendar/gui/e-itip-control.c:1007
+#: ../calendar/gui/e-itip-control.c:950 ../calendar/gui/e-itip-control.c:1007
 msgid "iCalendar Information"
 msgstr "iCalendar 資訊"
 
@@ -8155,10 +8129,8 @@ msgstr "iCalendar 錯誤"
 
 # camel/providers/imap/camel-imap-command.c:241
 # shell/e-storage.c:481
-#: ../calendar/gui/e-itip-control.c:1039
-#: ../calendar/gui/e-itip-control.c:1055
-#: ../calendar/gui/e-itip-control.c:1066
-#: ../calendar/gui/e-itip-control.c:1083
+#: ../calendar/gui/e-itip-control.c:1039 ../calendar/gui/e-itip-control.c:1055
+#: ../calendar/gui/e-itip-control.c:1066 ../calendar/gui/e-itip-control.c:1083
 #: ../plugins/itip-formatter/itip-view.c:338
 #: ../plugins/itip-formatter/itip-view.c:339
 #: ../plugins/itip-formatter/itip-view.c:406
@@ -8168,41 +8140,42 @@ msgstr "不明人士"
 
 #. Describe what the user can do
 #: ../calendar/gui/e-itip-control.c:1090
-msgid "<br> Please review the following information, and then select an action from the menu below."
+msgid ""
+"<br> Please review the following information, and then select an action from "
+"the menu below."
 msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動作。"
 
 #: ../calendar/gui/e-itip-control.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:204
-#: ../calendar/gui/e-meeting-store.c:189
-#: ../calendar/gui/e-meeting-store.c:212
+#: ../calendar/gui/e-meeting-store.c:189 ../calendar/gui/e-meeting-store.c:212
 #: ../calendar/gui/itip-utils.c:669
 #: ../plugins/itip-formatter/itip-formatter.c:1640
 msgid "Accepted"
 msgstr "接受"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
-#: ../calendar/gui/e-itip-control.c:1142
-#: ../calendar/gui/itip-utils.c:672
+#: ../calendar/gui/e-itip-control.c:1142 ../calendar/gui/itip-utils.c:672
 #: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Tentatively Accepted"
 msgstr "暫時接受"
 
 #: ../calendar/gui/e-itip-control.c:1146
 #: ../calendar/gui/e-meeting-list-view.c:205
-#: ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:214
-#: ../calendar/gui/itip-utils.c:675
-#: ../calendar/gui/itip-utils.c:704
+#: ../calendar/gui/e-meeting-store.c:191 ../calendar/gui/e-meeting-store.c:214
+#: ../calendar/gui/itip-utils.c:675 ../calendar/gui/itip-utils.c:704
 #: ../plugins/itip-formatter/itip-formatter.c:1646
 msgid "Declined"
 msgstr "婉拒"
 
 #: ../calendar/gui/e-itip-control.c:1230
-msgid "The meeting has been canceled, however it could not be found in your calendars"
+msgid ""
+"The meeting has been canceled, however it could not be found in your "
+"calendars"
 msgstr "會議已經取消，但是在您的行事曆中找不到"
 
 #: ../calendar/gui/e-itip-control.c:1232
-msgid "The task has been canceled, however it could not be found in your task lists"
+msgid ""
+"The task has been canceled, however it could not be found in your task lists"
 msgstr "工作已經取消，但是在您的工作清單中找不到"
 
 #: ../calendar/gui/e-itip-control.c:1311
@@ -8273,8 +8246,7 @@ msgstr "<b>%s</b> 已經消取會議。"
 msgid "Meeting Cancelation"
 msgstr "會議取消"
 
-#: ../calendar/gui/e-itip-control.c:1359
-#: ../calendar/gui/e-itip-control.c:1436
+#: ../calendar/gui/e-itip-control.c:1359 ../calendar/gui/e-itip-control.c:1436
 #: ../calendar/gui/e-itip-control.c:1476
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -8436,13 +8408,11 @@ msgstr "到會者狀態不能更新，因為項目已經不存在"
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: ../calendar/gui/e-itip-control.c:2033
-#: ../calendar/gui/e-itip-control.c:2081
+#: ../calendar/gui/e-itip-control.c:2033 ../calendar/gui/e-itip-control.c:2081
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: ../calendar/gui/e-itip-control.c:2035
-#: ../calendar/gui/e-itip-control.c:2085
+#: ../calendar/gui/e-itip-control.c:2035 ../calendar/gui/e-itip-control.c:2085
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -8486,10 +8456,8 @@ msgid "Send Latest Information"
 msgstr "送出最新資訊"
 
 # ui/evolution-mail.xml.h:2
-#: ../calendar/gui/e-itip-control.c:2380
-#: ../calendar/gui/itip-utils.c:692
-#: ../mail/mail-send-recv.c:423
-#: ../mail/mail-send-recv.c:476
+#: ../calendar/gui/e-itip-control.c:2380 ../calendar/gui/itip-utils.c:692
+#: ../mail/mail-send-recv.c:423 ../mail/mail-send-recv.c:476
 #: ../ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "取消"
@@ -8562,15 +8530,13 @@ msgid "Resources"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:164
-#: ../calendar/gui/e-meeting-store.c:100
-#: ../calendar/gui/e-meeting-store.c:117
+#: ../calendar/gui/e-meeting-store.c:100 ../calendar/gui/e-meeting-store.c:117
 #: ../calendar/gui/e-meeting-store.c:803
 msgid "Individual"
 msgstr "個別"
 
 #: ../calendar/gui/e-meeting-list-view.c:165
-#: ../calendar/gui/e-meeting-store.c:102
-#: ../calendar/gui/e-meeting-store.c:119
+#: ../calendar/gui/e-meeting-store.c:102 ../calendar/gui/e-meeting-store.c:119
 #: ../widgets/table/e-table-config-no-group.glade.h:7
 #: ../widgets/table/e-table-config.glade.h:6
 msgid "Group"
@@ -8578,64 +8544,55 @@ msgstr "群組"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
 #: ../calendar/gui/e-meeting-list-view.c:166
-#: ../calendar/gui/e-meeting-store.c:104
-#: ../calendar/gui/e-meeting-store.c:121
+#: ../calendar/gui/e-meeting-store.c:104 ../calendar/gui/e-meeting-store.c:121
 msgid "Resource"
 msgstr "資源"
 
 #: ../calendar/gui/e-meeting-list-view.c:167
-#: ../calendar/gui/e-meeting-store.c:106
-#: ../calendar/gui/e-meeting-store.c:123
+#: ../calendar/gui/e-meeting-store.c:106 ../calendar/gui/e-meeting-store.c:123
 msgid "Room"
 msgstr "會議室"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: ../calendar/gui/e-meeting-list-view.c:178
-#: ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/e-meeting-store.c:152
+#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:152
 msgid "Chair"
 msgstr "主席"
 
 # mail/mail-config.glade.h:61
 #: ../calendar/gui/e-meeting-list-view.c:179
-#: ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/e-meeting-store.c:154
+#: ../calendar/gui/e-meeting-store.c:137 ../calendar/gui/e-meeting-store.c:154
 #: ../calendar/gui/e-meeting-store.c:806
 msgid "Required Participant"
 msgstr "出席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:180
-#: ../calendar/gui/e-meeting-store.c:139
-#: ../calendar/gui/e-meeting-store.c:156
+#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:156
 msgid "Optional Participant"
 msgstr "列席者"
 
 #: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:141
-#: ../calendar/gui/e-meeting-store.c:158
+#: ../calendar/gui/e-meeting-store.c:141 ../calendar/gui/e-meeting-store.c:158
 msgid "Non-Participant"
 msgstr "缺席者"
 
 # shell/e-shell-importer.c:545
 # shell/importer/import.glade.h:5
 #: ../calendar/gui/e-meeting-list-view.c:203
-#: ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:210
+#: ../calendar/gui/e-meeting-store.c:187 ../calendar/gui/e-meeting-store.c:210
 #: ../calendar/gui/e-meeting-store.c:816
 msgid "Needs Action"
 msgstr "需要動作"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:392
 #: ../calendar/gui/e-meeting-list-view.c:206
-#: ../calendar/gui/e-meeting-store.c:193
-#: ../calendar/gui/e-meeting-store.c:216
+#: ../calendar/gui/e-meeting-store.c:193 ../calendar/gui/e-meeting-store.c:216
 #: ../calendar/gui/e-meeting-time-sel.c:414
 msgid "Tentative"
 msgstr "暫訂"
 
 #: ../calendar/gui/e-meeting-list-view.c:207
-#: ../calendar/gui/e-meeting-store.c:195
-#: ../calendar/gui/e-meeting-store.c:218
+#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
 #: ../calendar/gui/itip-utils.c:678
 #: ../plugins/itip-formatter/itip-formatter.c:1649
 msgid "Delegated"
@@ -8650,8 +8607,7 @@ msgstr "到會者"
 # 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:199
-#: ../calendar/gui/e-meeting-store.c:222
+#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
 msgid "In Process"
 msgstr "進行中"
 
@@ -8691,8 +8647,7 @@ msgid "%m/%d/%Y"
 msgstr "%m/%d/%Y"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
-#: ../calendar/gui/e-meeting-time-sel.c:416
-#: ../designs/OOA/ooa.glade.h:11
+#: ../calendar/gui/e-meeting-time-sel.c:416 ../designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "不在辦公室"
 
@@ -8770,8 +8725,7 @@ msgid "_Delete Selected Memos"
 msgstr "刪除選定的備忘錄(_D)"
 
 # calendar/gui/e-calendar-table.c:163
-#: ../calendar/gui/e-memo-table.c:995
-#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-memo-table.c:995 ../calendar/gui/e-memo-table.etspec.h:2
 msgid "Click to add a memo"
 msgstr "請按這裡增加新的備忘錄"
 
@@ -8784,8 +8738,7 @@ msgid "Memo sort"
 msgstr "備忘錄排序"
 
 # mail/mail-mt.c:190
-#: ../calendar/gui/e-memos.c:728
-#: ../calendar/gui/e-tasks.c:823
+#: ../calendar/gui/e-memos.c:728 ../calendar/gui/e-tasks.c:823
 #: ../calendar/gui/gnome-cal.c:2571
 #, c-format
 msgid ""
@@ -8807,8 +8760,7 @@ msgid "Opening memos at %s"
 msgstr "開啟在 %s 的備忘錄"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../calendar/gui/e-memos.c:1034
-#: ../calendar/gui/e-tasks.c:1226
+#: ../calendar/gui/e-memos.c:1034 ../calendar/gui/e-tasks.c:1226
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
@@ -8848,8 +8800,7 @@ msgstr "時區按鈕"
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:330
-#: ../calendar/gui/print.c:1511
+#: ../calendar/gui/e-week-view-main-item.c:330 ../calendar/gui/print.c:1512
 msgid "%d %B"
 msgstr "%d %B"
 
@@ -8956,8 +8907,7 @@ msgstr "九月"
 msgid "_Select Today"
 msgstr "選擇今天(_S)"
 
-#: ../calendar/gui/itip-utils.c:412
-#: ../calendar/gui/itip-utils.c:461
+#: ../calendar/gui/itip-utils.c:412 ../calendar/gui/itip-utils.c:461
 #: ../calendar/gui/itip-utils.c:563
 msgid "An organizer must be set."
 msgstr "必須指定一個召集人。"
@@ -8967,26 +8917,22 @@ msgid "At least one attendee is necessary"
 msgstr "至少需要一個到會者"
 
 # data/evolution.keys.in.h:2
-#: ../calendar/gui/itip-utils.c:631
-#: ../calendar/gui/itip-utils.c:757
+#: ../calendar/gui/itip-utils.c:631 ../calendar/gui/itip-utils.c:757
 msgid "Event information"
 msgstr "事件資訊"
 
 # widgets/misc/e-messagebox.c:152
-#: ../calendar/gui/itip-utils.c:633
-#: ../calendar/gui/itip-utils.c:759
+#: ../calendar/gui/itip-utils.c:633 ../calendar/gui/itip-utils.c:759
 msgid "Task information"
 msgstr "工作資訊"
 
 # mail/mail-config.glade.h:47
-#: ../calendar/gui/itip-utils.c:635
-#: ../calendar/gui/itip-utils.c:761
+#: ../calendar/gui/itip-utils.c:635 ../calendar/gui/itip-utils.c:761
 msgid "Journal information"
 msgstr "日誌資訊"
 
 # mail/mail-config.glade.h:61
-#: ../calendar/gui/itip-utils.c:637
-#: ../calendar/gui/itip-utils.c:779
+#: ../calendar/gui/itip-utils.c:637 ../calendar/gui/itip-utils.c:779
 msgid "Free/Busy information"
 msgstr "空閒/忙碌資訊"
 
@@ -9026,10 +8972,8 @@ msgstr "您必須是此事件的到會者。"
 # ui/evolution-event-editor.xml.h:13
 # ui/evolution-mail.xml.h:8
 # ui/evolution-task-editor-dialog.xml.h:14
-#: ../calendar/gui/memos-component.c:451
-#: ../ui/evolution-addressbook.xml.h:3
-#: ../ui/evolution-composer-entries.xml.h:1
-#: ../ui/evolution-memos.xml.h:2
+#: ../calendar/gui/memos-component.c:451 ../ui/evolution-addressbook.xml.h:6
+#: ../ui/evolution-composer-entries.xml.h:1 ../ui/evolution-memos.xml.h:2
 #: ../ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "複製"
@@ -9045,12 +8989,9 @@ msgstr "複製"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: ../calendar/gui/memos-component.c:452
-#: ../mail/em-filter-i18n.h:11
-#: ../ui/evolution-addressbook.xml.h:9
-#: ../ui/evolution-calendar.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:25
-#: ../ui/evolution-memos.xml.h:6
+#: ../calendar/gui/memos-component.c:452 ../mail/em-filter-i18n.h:11
+#: ../ui/evolution-addressbook.xml.h:15 ../ui/evolution-calendar.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:24 ../ui/evolution-memos.xml.h:6
 #: ../ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "刪除"
@@ -9070,8 +9011,7 @@ msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "%d 備忘錄"
 
-#: ../calendar/gui/memos-component.c:528
-#: ../calendar/gui/tasks-component.c:519
+#: ../calendar/gui/memos-component.c:528 ../calendar/gui/tasks-component.c:519
 #: ../mail/mail-component.c:560
 #, c-format
 msgid ", %d selected"
@@ -9137,7 +9077,8 @@ msgstr "列印備忘錄"
 
 #: ../calendar/gui/migration.c:162
 msgid ""
-"The location and hierarchy of the Evolution task folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution task folders has changed since "
+"Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -9147,7 +9088,8 @@ msgstr ""
 
 #: ../calendar/gui/migration.c:166
 msgid ""
-"The location and hierarchy of the Evolution calendar folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution calendar folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -9156,8 +9098,7 @@ msgstr ""
 "當 Evolution 移轉您的資料夾時，請耐心等候..."
 
 #. FIXME: set proper domain/code
-#: ../calendar/gui/migration.c:765
-#: ../calendar/gui/migration.c:933
+#: ../calendar/gui/migration.c:765 ../calendar/gui/migration.c:933
 msgid "Unable to migrate old settings from evolution/config.xmldb"
 msgstr "無法從 evolution/config.xmldb 移轉舊設定"
 
@@ -9331,55 +9272,55 @@ msgid "31st"
 msgstr "31日"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=Thursday
+#: ../calendar/gui/print.c:575
 msgid "Su"
 msgstr "日"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Mo"
 msgstr "一"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "Tu"
 msgstr "二"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:574
+#: ../calendar/gui/print.c:575
 msgid "We"
 msgstr "三"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Th"
 msgstr "四"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Fr"
 msgstr "五"
 
 # calendar/gui/print.c:362
-#: ../calendar/gui/print.c:575
+#: ../calendar/gui/print.c:576
 msgid "Sa"
 msgstr "六"
 
 # calendar/gui/print.c:1078
 #. Day
-#: ../calendar/gui/print.c:1927
+#: ../calendar/gui/print.c:1928
 msgid "Selected day (%a %b %d %Y)"
 msgstr "選擇的日期(%a %b %d %Y)"
 
 # calendar/gui/print.c:1092
 # calendar/gui/print.c:1096
-#: ../calendar/gui/print.c:1952
-#: ../calendar/gui/print.c:1956
+#: ../calendar/gui/print.c:1953 ../calendar/gui/print.c:1957
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 # calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:1953
+#: ../calendar/gui/print.c:1954
 msgid "%a %d %Y"
 msgstr "%a %d %Y"
 
@@ -9387,80 +9328,79 @@ msgstr "%a %d %Y"
 # calendar/gui/print.c:1097
 # calendar/gui/print.c:1099
 # calendar/gui/print.c:1100
-#: ../calendar/gui/print.c:1957
-#: ../calendar/gui/print.c:1959
-#: ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1958 ../calendar/gui/print.c:1960
+#: ../calendar/gui/print.c:1961
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
 # calendar/gui/print.c:1104
-#: ../calendar/gui/print.c:1964
+#: ../calendar/gui/print.c:1965
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "選擇的週(%s - %s)"
 
 # calendar/gui/print.c:1112
 #. Month
-#: ../calendar/gui/print.c:1972
+#: ../calendar/gui/print.c:1973
 msgid "Selected month (%b %Y)"
 msgstr "選擇的月(%b %Y)"
 
 # calendar/gui/print.c:1119
 #. Year
-#: ../calendar/gui/print.c:1979
+#: ../calendar/gui/print.c:1980
 msgid "Selected year (%Y)"
 msgstr "選擇的年(%Y)"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: ../calendar/gui/print.c:2308
+#: ../calendar/gui/print.c:2309
 msgid "Appointment"
 msgstr "約會"
 
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: ../calendar/gui/print.c:2310
+#: ../calendar/gui/print.c:2311
 msgid "Task"
 msgstr "工作"
 
 # calendar/gui/e-itip-control.glade.h:11
-#: ../calendar/gui/print.c:2332
+#: ../calendar/gui/print.c:2333
 #, c-format
 msgid "Summary: %s"
 msgstr "摘要：%s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: ../calendar/gui/print.c:2383
+#: ../calendar/gui/print.c:2384
 #, c-format
 msgid "Status: %s"
 msgstr "狀態(_S): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: ../calendar/gui/print.c:2400
+#: ../calendar/gui/print.c:2401
 #, c-format
 msgid "Priority: %s"
 msgstr "優先順序(_P): %s"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: ../calendar/gui/print.c:2412
+#: ../calendar/gui/print.c:2413
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "完成百分比: %i"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: ../calendar/gui/print.c:2424
+#: ../calendar/gui/print.c:2425
 #, c-format
 msgid "URL: %s"
 msgstr "網址: %s"
 
 # addressbook/backend/ebook/e-card.c:3467
-#: ../calendar/gui/print.c:2438
+#: ../calendar/gui/print.c:2439
 #, c-format
 msgid "Categories: %s"
 msgstr "分類: %s"
 
 # ui/evolution-addressbook.xml.h:17
-#: ../calendar/gui/print.c:2449
+#: ../calendar/gui/print.c:2450
 msgid "Contacts: "
 msgstr "連絡人: "
 
@@ -9468,17 +9408,15 @@ msgstr "連絡人: "
 # mail/mail-callbacks.c:1447
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
-#: ../calendar/gui/print.c:2589
-#: ../calendar/gui/print.c:2677
-#: ../calendar/gui/print.c:2803
-#: ../mail/em-format-html-print.c:178
+#: ../calendar/gui/print.c:2590 ../calendar/gui/print.c:2678
+#: ../calendar/gui/print.c:2804 ../mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "預覽列印"
 
 # ui/evolution-contact-editor.xml.h:6
 # ui/evolution-event-editor.xml.h:37
 # ui/evolution-task-editor-dialog.xml.h:40
-#: ../calendar/gui/print.c:2624
+#: ../calendar/gui/print.c:2625
 msgid "Print Item"
 msgstr "列印項目"
 
@@ -9557,11 +9495,13 @@ msgstr "建立新工作清單"
 
 #: ../calendar/gui/tasks-control.c:435
 msgid ""
-"This operation will permanently erase all tasks marked as completed. If you continue, you will not be able to recover these tasks.\n"
+"This operation will permanently erase all tasks marked as completed. If you "
+"continue, you will not be able to recover these tasks.\n"
 "\n"
 "Really erase these tasks?"
 msgstr ""
-"這個動作會永久地清除所有標示為已完成的工作。如果您要繼續，您將不能復原這些工作。\n"
+"這個動作會永久地清除所有標示為已完成的工作。如果您要繼續，您將不能復原這些工"
+"作。\n"
 "\n"
 "確定清除這些工作？"
 
@@ -11192,10 +11132,8 @@ msgstr "附加檔案列"
 #: ../composer/e-msg-composer-attachment.c:203
 #: ../composer/e-msg-composer-attachment.c:297
 #: ../composer/e-msg-composer-attachment.c:313
-#: ../widgets/misc/e-attachment.c:238
-#: ../widgets/misc/e-attachment.c:254
-#: ../widgets/misc/e-attachment.c:442
-#: ../widgets/misc/e-attachment.c:458
+#: ../widgets/misc/e-attachment.c:238 ../widgets/misc/e-attachment.c:254
+#: ../widgets/misc/e-attachment.c:442 ../widgets/misc/e-attachment.c:458
 #, c-format
 msgid "Cannot attach file %s: %s"
 msgstr "不能附加檔案 %s： %s"
@@ -11204,8 +11142,7 @@ msgstr "不能附加檔案 %s： %s"
 # camel/providers/local/camel-mbox-store.c:146
 #: ../composer/e-msg-composer-attachment.c:195
 #: ../composer/e-msg-composer-attachment.c:305
-#: ../widgets/misc/e-attachment.c:246
-#: ../widgets/misc/e-attachment.c:450
+#: ../widgets/misc/e-attachment.c:246 ../widgets/misc/e-attachment.c:450
 #, c-format
 msgid "Cannot attach file %s: not a regular file"
 msgstr "不能附加檔案 %s：不是一個合法的檔案"
@@ -11282,7 +11219,9 @@ msgstr "密件副本(_B):"
 
 # composer/e-msg-composer-hdrs.c:395
 #: ../composer/e-msg-composer-hdrs.c:655
-msgid "Enter the addresses that will receive a carbon copy of the message without appearing in the recipient list of the message."
+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
@@ -11315,33 +11254,33 @@ msgid "Insert Attachment"
 msgstr "插入附加檔案"
 
 #: ../composer/e-msg-composer.c:830
-msgid "Cannot sign outgoing message: No signing certificate set for this account"
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr "無法簽名送出的郵件：此帳號沒有設定簽名憑證"
 
 #: ../composer/e-msg-composer.c:837
-msgid "Cannot encrypt outgoing message: No encryption certificate set for this account"
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"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:1300
-#: ../composer/e-msg-composer.c:2512
+#: ../composer/e-msg-composer.c:1300 ../composer/e-msg-composer.c:2512
 msgid "Hide _Attachment Bar"
 msgstr "隱藏附加檔案列(_A)"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../composer/e-msg-composer.c:1303
-#: ../composer/e-msg-composer.c:2515
+#: ../composer/e-msg-composer.c:1303 ../composer/e-msg-composer.c:2515
 #: ../composer/e-msg-composer.c:3847
 msgid "Show _Attachment Bar"
 msgstr "顯示附加檔案列(_A)"
 
 # camel/camel-sasl-login.c:127
-#: ../composer/e-msg-composer.c:1335
-#: ../composer/e-msg-composer.c:1369
+#: ../composer/e-msg-composer.c:1335 ../composer/e-msg-composer.c:1369
 #: ../plugins/mail-remote/e-corba-utils.c:135
 msgid "Unknown reason"
 msgstr "不明的原因"
@@ -11367,10 +11306,8 @@ msgstr "未命名的郵件"
 msgid "Open File"
 msgstr "開啟檔案"
 
-#: ../composer/e-msg-composer.c:2155
-#: ../mail/em-account-editor.c:596
-#: ../mail/em-account-editor.c:641
-#: ../mail/em-account-editor.c:708
+#: ../composer/e-msg-composer.c:2155 ../mail/em-account-editor.c:596
+#: ../mail/em-account-editor.c:641 ../mail/em-account-editor.c:708
 msgid "Autogenerated"
 msgstr "自動產生的"
 
@@ -11381,18 +11318,21 @@ msgstr "簽名檔(_G):"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: ../composer/e-msg-composer.c:2526
-#: ../composer/e-msg-composer.c:3729
+#: ../composer/e-msg-composer.c:2526 ../composer/e-msg-composer.c:3729
 #: ../composer/e-msg-composer.c:3732
 msgid "Compose Message"
 msgstr "編輯郵件"
 
 #: ../composer/e-msg-composer.c:4956
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<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 "
+msgid ""
+" There are few attachments getting downloaded. Sending the mail will cause "
+"the mail to be sent without those pending attachments "
 msgstr "這裡有一些附件要下載。傳送此郵件將無法一併寄出接下來的附件"
 
 #: ../composer/mail-composer.error.xml.h:2
@@ -11401,22 +11341,28 @@ 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?"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr "確定要放棄您正在撰寫且標題為 '{0}'的郵件？"
 
 #: ../composer/mail-composer.error.xml.h:4
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "因為「{0}」，所以您可能需要選取不同的郵件選項。"
 
-#: ../composer/mail-composer.error.xml.h:5
-#: ../e-util/e-system.error.xml.h:1
+#: ../composer/mail-composer.error.xml.h:5 ../e-util/e-system.error.xml.h:1
 #: ../mail/mail.error.xml.h:19
 msgid "Because &quot;{1}&quot;."
 msgstr "因為「{1}」。"
 
 #: ../composer/mail-composer.error.xml.h:6
-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 "關閉此撰寫視窗會永久放棄郵件，除非您選擇儲存郵件至您的「草稿」資料夾。這樣可以讓您以後再繼續撰寫郵件。"
+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 ""
+"關閉此撰寫視窗會永久放棄郵件，除非您選擇儲存郵件至您的「草稿」資料夾。這樣可"
+"以讓您以後再繼續撰寫郵件。"
 
 # camel/camel-movemail.c:306
 #: ../composer/mail-composer.error.xml.h:7
@@ -11462,23 +11408,31 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "儲存至自動儲存時發生錯誤，因為「{1}」。"
 
 #: ../composer/mail-composer.error.xml.h:16
-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 意外結束。復原郵件可以讓您從原來中斷的地方繼續。"
+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 意外結束。復原郵件可以讓您從原來中斷的地方繼續。"
 
 #: ../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}' 不是一般檔案而且無法在郵件中傳送。"
 
 #: ../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 "要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加它。"
+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 ""
+"要附加此目錄的內容，請個別附加此目錄中的檔案，或者建立目錄的歸檔再加以附加"
+"它。"
 
 # composer/evolution-composer.c:355
 #: ../composer/mail-composer.error.xml.h:19
 msgid ""
 "Unable to activate the HTML editor control.\n"
 "\n"
-"Please make sure that you have the correct version of gtkhtml and libgtkhtml installed."
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
 msgstr ""
 "無法啟動 HTML 編輯器控制。\n"
 "\n"
@@ -11570,7 +11524,8 @@ msgstr "<b>狀態：</b>"
 
 #: ../designs/OOA/ooa.glade.h:6
 msgid ""
-"<small>The message specified below will be automatically sent to each person who sends\n"
+"<small>The message specified below will be automatically sent to each person "
+"who sends\n"
 "mail to you while you are out of the office.</small>"
 msgstr ""
 "<small>當您不在辦公室時，以下指定的郵件將會自動傳送給\n"
@@ -11612,8 +11567,10 @@ msgstr "<b>正在傳送電子郵件:</b>"
 
 #: ../designs/read_receipts/read.glade.h:4
 msgid ""
-"<small>This page allows you to choose if you want to be notified via a read receipt when a message you\n"
-"sent is read, and to specify what Evolution should do when someone requests a receipt from you.</small>"
+"<small>This page allows you to choose if you want to be notified via a read "
+"receipt when a message you\n"
+"sent is read, and to specify what Evolution should do when someone requests "
+"a receipt from you.</small>"
 msgstr ""
 "<small>此頁面可以讓您選擇當您傳送的郵件已閱讀時，是否傳送讀信回條，\n"
 "以及指定當某人要求您傳送回條時，Evolution 要做什麼。</small>"
@@ -11643,7 +11600,9 @@ msgid "Unless the message is sent to a mailing list, and not to me personally"
 msgstr "除非郵件傳送至郵寄清單，而不是給我個人"
 
 #: ../designs/read_receipts/read.glade.h:12
-msgid "When you receive an email with a read receipt request, what should Evolution do?"
+msgid ""
+"When you receive an email with a read receipt request, what should Evolution "
+"do?"
 msgstr "當您收到讀信回條要求的電子郵件時，Evolution 要做什麼？"
 
 # mail/mail-callbacks.c:1144
@@ -11658,26 +11617,21 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: ../e-util/e-dialog-utils.c:283
-#: ../e-util/e-system.error.xml.h:6
+#: ../e-util/e-dialog-utils.c:283 ../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:84
-#: ../e-util/e-error.c:85
-#: ../e-util/e-error.c:127
+#: ../e-util/e-error.c:84 ../e-util/e-error.c:85 ../e-util/e-error.c:127
 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:86
-#: ../e-util/e-error.c:87
-#: ../e-util/e-error.c:125
+#: ../e-util/e-error.c:86 ../e-util/e-error.c:87 ../e-util/e-error.c:125
 msgid "Evolution Warning"
 msgstr "Evolution 警告"
 
@@ -11695,7 +11649,8 @@ msgstr "Evolution 查詢"
 #. setup a dummy error
 #: ../e-util/e-error.c:442
 #, c-format
-msgid "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
 msgstr "<span weight=\"bold\">內部錯誤，要求的不明錯誤 '%s'</span>"
 
 # camel/providers/local/camel-maildir-folder.c:197
@@ -11728,8 +11683,7 @@ msgstr "要覆寫它?"
 msgid "File exists &quot;{0}&quot;."
 msgstr "檔案存在「{0}」。"
 
-#: ../e-util/e-system.error.xml.h:7
-#: ../mail/mail.error.xml.h:131
+#: ../e-util/e-system.error.xml.h:7 ../mail/mail.error.xml.h:131
 msgid "_Overwrite"
 msgstr "覆寫(_O)"
 
@@ -11796,8 +11750,7 @@ msgstr[1] "%d 年前"
 msgid "<click here to select a date>"
 msgstr "<按這裏選擇日期>"
 
-#: ../filter/filter-datespec.c:288
-#: ../filter/filter-datespec.c:299
+#: ../filter/filter-datespec.c:288 ../filter/filter-datespec.c:299
 msgid "now"
 msgstr "現在"
 
@@ -11816,10 +11769,8 @@ msgstr "選擇要比對的時間"
 msgid "Choose a file"
 msgstr "選擇一個檔案"
 
-#: ../filter/filter-label.c:121
-#: ../mail/em-filter-i18n.h:26
-#: ../mail/em-migrate.c:1052
-#: ../mail/mail-config.c:85
+#: ../filter/filter-label.c:121 ../mail/em-filter-i18n.h:26
+#: ../mail/em-migrate.c:1052 ../mail/mail-config.c:85
 #: ../mail/mail-config.glade.h:91
 msgid "Important"
 msgstr "重要"
@@ -11827,73 +11778,70 @@ msgstr "重要"
 # mail/mail-format.c:762
 # mail/message-list.c:1083
 #. forest green
-#: ../filter/filter-label.c:124
-#: ../mail/em-migrate.c:1055
-#: ../mail/mail-config.c:88
-#: ../mail/mail-config.glade.h:146
+#: ../filter/filter-label.c:124 ../mail/em-migrate.c:1055
+#: ../mail/mail-config.c:88 ../mail/mail-config.glade.h:146
 msgid "To Do"
 msgstr "待辦"
 
 # calendar/gui/event-editor-dialog.glade.h:33
 #. blue
-#: ../filter/filter-label.c:125
-#: ../mail/em-migrate.c:1056
-#: ../mail/mail-config.c:89
-#: ../mail/mail-config.glade.h:95
+#: ../filter/filter-label.c:125 ../mail/em-migrate.c:1056
+#: ../mail/mail-config.c:89 ../mail/mail-config.glade.h:95
 msgid "Later"
 msgstr "稍後"
 
-#: ../filter/filter-part.c:532
-#: ../shell/GNOME_Evolution_Test.server.in.in.h:3
+#: ../filter/filter-part.c:532 ../shell/GNOME_Evolution_Test.server.in.in.h:3
 msgid "Test"
 msgstr "測試"
 
-#: ../filter/filter-rule.c:791
+#: ../filter/filter-rule.c:799
 msgid "_Search name:"
 msgstr "搜尋名稱(_S):"
 
-#: ../filter/filter-rule.c:819
+#: ../filter/filter-rule.c:827
 msgid "Find items that meet the following criteria"
 msgstr "尋找符合下列條件的項目"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If all criteria are met"
 msgstr "如果全部條件符合"
 
-#: ../filter/filter-rule.c:858
+#: ../filter/filter-rule.c:866
 msgid "If any criteria are met"
 msgstr "如果任何條件符合"
 
 # mail/mail-ops.c:898
-#: ../filter/filter-rule.c:860
+#: ../filter/filter-rule.c:868
 msgid "Find items:"
 msgstr "尋找項目:"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "All related"
 msgstr "所有相關的"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies"
 msgstr "回覆"
 
-#: ../filter/filter-rule.c:881
+#: ../filter/filter-rule.c:889
 msgid "Replies and parents"
 msgstr "回覆和父代"
 
+#: ../filter/filter-rule.c:889
+msgid "No reply or parent"
+msgstr "沒有回復或原始郵件"
+
 # addressbook/printing/e-contact-print.glade.h:17
-#: ../filter/filter-rule.c:883
+#: ../filter/filter-rule.c:891
 msgid "Include threads"
 msgstr "包括線串"
 
-#: ../filter/filter-rule.c:978
-#: ../filter/filter.glade.h:3
+#: ../filter/filter-rule.c:986 ../filter/filter.glade.h:3
 #: ../mail/em-utils.c:349
 msgid "Incoming"
 msgstr "內送"
 
-#: ../filter/filter-rule.c:978
-#: ../mail/em-utils.c:350
+#: ../filter/filter-rule.c:986 ../mail/em-utils.c:350
 msgid "Outgoing"
 msgstr "外寄"
 
@@ -11921,8 +11869,7 @@ msgid "Missing file name."
 msgstr "缺少檔案名稱。"
 
 # calendar/gui/calendar-model.c:1578
-#: ../filter/filter.error.xml.h:6
-#: ../mail/mail.error.xml.h:70
+#: ../filter/filter.error.xml.h:6 ../mail/mail.error.xml.h:70
 msgid "Missing name."
 msgstr "缺少名稱。"
 
@@ -12025,7 +11972,8 @@ msgid "Composer Preferences"
 msgstr "郵件編輯器偏好設定"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr "在此設定郵件的偏好設定，包含安全性與郵件的顯示"
 
 #: ../mail/GNOME_Evolution_Mail.server.in.in.h:3
@@ -12069,14 +12017,11 @@ msgstr "Evolution 郵件撰寫器組態控制"
 msgid "Evolution Mail preferences control"
 msgstr "Evolution 郵件優先設定控制"
 
-#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11
-#: ../mail/em-folder-view.c:517
+#: ../mail/GNOME_Evolution_Mail.server.in.in.h:11 ../mail/em-folder-view.c:517
 #: ../mail/importers/elm-importer.c:341
 #: ../mail/importers/netscape-importer.c:1903
-#: ../mail/importers/pine-importer.c:387
-#: ../mail/mail-component.c:578
-#: ../mail/mail-component.c:579
-#: ../mail/mail-component.c:664
+#: ../mail/importers/pine-importer.c:387 ../mail/mail-component.c:578
+#: ../mail/mail-component.c:579 ../mail/mail-component.c:664
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:6
 msgid "Mail"
 msgstr "郵件"
@@ -12114,8 +12059,7 @@ msgstr ""
 "並選取核取方塊來接受它\n"
 
 # mail/mail-account-gui.c:682
-#: ../mail/em-account-editor.c:472
-#: ../mail/em-filter-folder-element.c:237
+#: ../mail/em-account-editor.c:472 ../mail/em-filter-folder-element.c:237
 #: ../mail/em-vfolder-rule.c:496
 msgid "Select Folder"
 msgstr "選擇資料夾"
@@ -12126,14 +12070,12 @@ msgid "Ask for each message"
 msgstr "每封郵件皆詢問"
 
 # mail/mail-config.glade.h:35
-#: ../mail/em-account-editor.c:1747
-#: ../mail/mail-config.glade.h:90
+#: ../mail/em-account-editor.c:1747 ../mail/mail-config.glade.h:90
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config.glade.h:57
-#: ../mail/em-account-editor.c:1796
-#: ../mail/mail-config.glade.h:117
+#: ../mail/em-account-editor.c:1796 ../mail/mail-config.glade.h:117
 msgid "Receiving Email"
 msgstr "接收電子郵件"
 
@@ -12142,96 +12084,85 @@ msgid "Automatically check for _new mail every"
 msgstr "自動檢查新郵件每(_N)"
 
 # mail/mail-config.glade.h:65
-#: ../mail/em-account-editor.c:2160
-#: ../mail/mail-config.glade.h:129
+#: ../mail/em-account-editor.c:2160 ../mail/mail-config.glade.h:129
 msgid "Sending Email"
 msgstr "傳送電子郵件"
 
 # mail/mail-config.glade.h:21
-#: ../mail/em-account-editor.c:2219
-#: ../mail/mail-config.glade.h:68
+#: ../mail/em-account-editor.c:2219 ../mail/mail-config.glade.h:68
 msgid "Defaults"
 msgstr "預設值"
 
 #. Security settings
-#: ../mail/em-account-editor.c:2285
-#: ../mail/mail-config.glade.h:122
+#: ../mail/em-account-editor.c:2285 ../mail/mail-config.glade.h:122
 #: ../plugins/exchange-operations/exchange-account-setup.c:315
 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:2322
-#: ../mail/em-account-editor.c:2413
+#: ../mail/em-account-editor.c:2322 ../mail/em-account-editor.c:2413
 msgid "Receiving Options"
 msgstr "接收選項"
 
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
-#: ../mail/em-account-editor.c:2323
-#: ../mail/em-account-editor.c:2414
+#: ../mail/em-account-editor.c:2323 ../mail/em-account-editor.c:2414
 msgid "Checking for New Mail"
 msgstr "檢查新郵件"
 
 # mail/mail-config.glade.h:3
-#: ../mail/em-account-editor.c:2753
-#: ../mail/mail-config.glade.h:34
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:34
 msgid "Account Editor"
 msgstr "帳號編輯器"
 
 # mail/mail-config-druid.c:445
-#: ../mail/em-account-editor.c:2753
-#: ../mail/mail-config.glade.h:80
+#: ../mail/em-account-editor.c:2753 ../mail/mail-config.glade.h:80
 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:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:407
 msgid "Disable"
 msgstr "停用"
 
-#: ../mail/em-account-prefs.c:331
-#: ../mail/em-account-prefs.c:376
+#: ../mail/em-account-prefs.c:331 ../mail/em-account-prefs.c:376
 #: ../mail/em-account-prefs.c:409
 msgid "Enable"
 msgstr "啟用"
 
 # mail/mail-config.glade.h:21
 #. translators: default account indicator
-#: ../mail/em-account-prefs.c:456
+#: ../mail/em-account-prefs.c:459
 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:505
-#: ../mail/em-composer-prefs.c:930
+#: ../mail/em-account-prefs.c:512 ../mail/em-composer-prefs.c:930
 #: ../plugins/plugin-manager/plugin-manager.c:213
-#: ../plugins/publish-calendar/publish-calendar.c:457
+#: ../plugins/publish-calendar/publish-calendar.c:474
 msgid "Enabled"
 msgstr "已啟用"
 
 # mail/mail-config.glade.h:5
-#: ../mail/em-account-prefs.c:511
+#: ../mail/em-account-prefs.c:518
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: ../mail/em-account-prefs.c:513
+#: ../mail/em-account-prefs.c:520
 msgid "Protocol"
 msgstr "通訊協定"
 
 # mail/mail-config.glade.h:6
-#: ../mail/em-account-prefs.c:518
+#: ../mail/em-account-prefs.c:525
 msgid "Mail Accounts Table"
 msgstr "郵件帳號表"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: ../mail/em-composer-prefs.c:311
-#: ../mail/em-composer-prefs.c:437
+#: ../mail/em-composer-prefs.c:311 ../mail/em-composer-prefs.c:437
 #: ../mail/mail-config.c:967
 msgid "Unnamed"
 msgstr "未命名的"
@@ -12252,8 +12183,7 @@ msgid "Signature(s)"
 msgstr "簽名檔"
 
 # mail/mail-ops.c:1154
-#: ../mail/em-composer-utils.c:863
-#: ../mail/em-format-quote.c:389
+#: ../mail/em-composer-utils.c:863 ../mail/em-format-quote.c:389
 msgid "-------- Forwarded Message --------"
 msgstr "-------- 轉遞的郵件 --------"
 
@@ -12267,8 +12197,12 @@ msgstr "不明的寄件者"
 #. * each ${Variable} gets replaced with a value. To see a full list of available
 #. * variables, see em-composer-utils.c:1514
 #: ../mail/em-composer-utils.c:1705
-msgid "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} ${TimeZone}, ${Sender} wrote:"
-msgstr "於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} ${TimeZone}，${Sender} 提到："
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
+msgstr ""
+"於 ${AbbrevWeekdayName}，${Year}-${Month}-${Day} 於 ${24Hour}:${Minute} "
+"${TimeZone}，${Sender} 提到："
 
 #: ../mail/em-filter-editor.c:155
 msgid "_Filter Rules"
@@ -12401,9 +12335,8 @@ msgid "is not Flagged"
 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
+#: ../mail/em-filter-i18n.h:35 ../mail/mail-config.glade.h:93
+#: ../ui/evolution-mail-message.xml.h:47
 msgid "Junk"
 msgstr "垃圾郵件"
 
@@ -12414,8 +12347,7 @@ msgstr "垃圾郵件測試"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ../mail/em-filter-i18n.h:37
-#: ../mail/em-folder-view.c:1105
+#: ../mail/em-filter-i18n.h:37 ../mail/em-folder-view.c:1105
 #: ../widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "標籤"
@@ -12462,8 +12394,7 @@ msgstr "建立程式管道"
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: ../mail/em-filter-i18n.h:47
-#: ../mail/message-tag-followup.c:81
+#: ../mail/em-filter-i18n.h:47 ../mail/message-tag-followup.c:81
 msgid "Read"
 msgstr "閱讀"
 
@@ -12497,8 +12428,7 @@ msgid "Run Program"
 msgstr "執行程式"
 
 # mail/message-list.c:1081
-#: ../mail/em-filter-i18n.h:55
-#: ../mail/message-list.etspec.h:10
+#: ../mail/em-filter-i18n.h:55 ../mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "目標"
 
@@ -12535,12 +12465,9 @@ msgstr "以此開始"
 msgid "Stop Processing"
 msgstr "停止處理"
 
-#: ../mail/em-filter-i18n.h:65
-#: ../mail/em-format-html.c:1582
-#: ../mail/em-format-quote.c:313
-#: ../mail/em-format.c:849
-#: ../mail/em-mailer-prefs.c:90
-#: ../mail/message-list.etspec.h:13
+#: ../mail/em-filter-i18n.h:65 ../mail/em-format-html.c:1582
+#: ../mail/em-format-quote.c:313 ../mail/em-format.c:849
+#: ../mail/em-mailer-prefs.c:90 ../mail/message-list.etspec.h:13
 #: ../mail/message-tag-followup.c:336
 #: ../plugins/groupwise-features/properties.glade.h:7
 #: ../smime/lib/e-cert.c:1132
@@ -12598,46 +12525,38 @@ 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:938
-#: ../mail/mail-vfolder.c:1011
+#: ../mail/em-folder-tree-model.c:203 ../mail/em-folder-tree-model.c:205
+#: ../mail/mail-vfolder.c:938 ../mail/mail-vfolder.c:1011
 msgid "Search Folders"
 msgstr "搜尋資料夾"
 
 #. UNMATCHED is always last
-#: ../mail/em-folder-tree-model.c:209
-#: ../mail/em-folder-tree-model.c:211
+#: ../mail/em-folder-tree-model.c:209 ../mail/em-folder-tree-model.c:211
 msgid "UNMATCHED"
 msgstr "不符合"
 
-#: ../mail/em-folder-tree-model.c:484
-#: ../mail/mail-component.c:151
+#: ../mail/em-folder-tree-model.c:484 ../mail/mail-component.c:151
 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
+#: ../mail/em-folder-tree-model.c:487 ../mail/mail-component.c:150
 #: ../plugins/exchange-operations/exchange-folder.c:641
 msgid "Inbox"
 msgstr "收件匣"
 
-#: ../mail/em-folder-tree-model.c:490
-#: ../mail/mail-component.c:152
+#: ../mail/em-folder-tree-model.c:490 ../mail/mail-component.c:152
 msgid "Outbox"
 msgstr "寄件匣"
 
-#: ../mail/em-folder-tree-model.c:492
-#: ../mail/mail-component.c:153
+#: ../mail/em-folder-tree-model.c:492 ../mail/mail-component.c:153
 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
+#: ../mail/em-folder-tree-model.c:514 ../mail/em-folder-tree-model.c:818
 msgid "Loading..."
 msgstr "載入中..."
 
@@ -12660,15 +12579,13 @@ msgid "Copying folder %s"
 msgstr "正在複製資料夾 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/em-folder-tree.c:863
-#: ../mail/message-list.c:1634
+#: ../mail/em-folder-tree.c:863 ../mail/message-list.c:1634
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在將郵件移至資料夾 %s"
 
 # mail/mail-ops.c:898
-#: ../mail/em-folder-tree.c:865
-#: ../mail/message-list.c:1636
+#: ../mail/em-folder-tree.c:865 ../mail/message-list.c:1636
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "正在複製郵件至資料夾 %s"
@@ -12678,31 +12595,25 @@ msgstr "正在複製郵件至資料夾 %s"
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "無法將郵件拖放到最上層的儲存區"
 
-#: ../mail/em-folder-tree.c:977
-#: ../ui/evolution-mail-message.xml.h:105
+#: ../mail/em-folder-tree.c:977 ../ui/evolution-mail-message.xml.h:104
 msgid "_Copy to Folder"
 msgstr "複製至資料夾(_C)"
 
-#: ../mail/em-folder-tree.c:978
-#: ../ui/evolution-mail-message.xml.h:118
+#: ../mail/em-folder-tree.c:978 ../ui/evolution-mail-message.xml.h:117
 msgid "_Move to Folder"
 msgstr "移至資料夾(_M)"
 
 # mail/mail-ops.c:992
-#: ../mail/em-folder-tree.c:1683
-#: ../mail/mail-ops.c:1059
+#: ../mail/em-folder-tree.c:1683 ../mail/mail-ops.c:1059
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描「%s」內的資料夾"
 
-#: ../mail/em-folder-tree.c:2042
-#: ../ui/evolution-addressbook.xml.h:44
-#: ../ui/evolution-editor.xml.h:24
-#: ../ui/evolution-mail-global.xml.h:24
+#: ../mail/em-folder-tree.c:2042 ../ui/evolution-addressbook.xml.h:64
+#: ../ui/evolution-editor.xml.h:24 ../ui/evolution-mail-global.xml.h:22
 #: ../ui/evolution-mail-messagedisplay.xml.h:8
-#: ../ui/evolution-message-composer.xml.h:56
-#: ../ui/evolution-tasks.xml.h:30
-#: ../ui/evolution.xml.h:49
+#: ../ui/evolution-message-composer.xml.h:56 ../ui/evolution-tasks.xml.h:30
+#: ../ui/evolution.xml.h:46
 msgid "_View"
 msgstr "檢視(_V)"
 
@@ -12723,13 +12634,11 @@ msgstr "移動(_M)..."
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)..."
 
-#: ../mail/em-folder-tree.c:2055
-#: ../ui/evolution-mail-list.xml.h:34
+#: ../mail/em-folder-tree.c:2055 ../ui/evolution-mail-list.xml.h:34
 msgid "_Rename..."
 msgstr "重新命名(_R)..."
 
-#: ../mail/em-folder-tree.c:2060
-#: ../mail/mail.error.xml.h:128
+#: ../mail/em-folder-tree.c:2060 ../mail/mail.error.xml.h:128
 msgid "_Empty Trash"
 msgstr "清空垃圾桶(_E)"
 
@@ -12740,32 +12649,16 @@ 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:973
-#: ../mail/em-folder-view.c:988
-#: ../mail/importers/evolution-mbox-importer.c:86
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:973
+#: ../mail/em-folder-view.c:988 ../mail/importers/evolution-mbox-importer.c:86
 #: ../mail/importers/evolution-outlook-importer.c:139
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: ../mail/em-folder-utils.c:368
-#: ../mail/em-folder-view.c:988
+#: ../mail/em-folder-utils.c:368 ../mail/em-folder-view.c:988
 msgid "C_opy"
 msgstr "複製(_O)"
 
-#: ../mail/em-folder-utils.c:503
-#, c-format
-msgid "Rename the \"%s\" folder to:"
-msgstr "重新命名「%s」資料夾為："
-
-#: ../mail/em-folder-utils.c:505
-msgid "Rename Folder"
-msgstr "重新命名資料夾"
-
-#: ../mail/em-folder-utils.c:511
-msgid "Folder names cannot contain '/'"
-msgstr "資料夾名稱不能包含斜線。"
-
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
 #: ../mail/em-folder-utils.c:581
@@ -12787,20 +12680,16 @@ msgstr "建立資料夾"
 msgid "Specify where to create the folder:"
 msgstr "指定要建立資料夾的位置："
 
-#: ../mail/em-folder-view.c:1081
-#: ../ui/evolution-mail-message.xml.h:127
+#: ../mail/em-folder-view.c:1081 ../ui/evolution-mail-message.xml.h:126
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-folder-view.c:1083
-#: ../mail/em-popup.c:561
-#: ../mail/em-popup.c:572
-#: ../ui/evolution-mail-message.xml.h:110
+#: ../mail/em-folder-view.c:1083 ../mail/em-popup.c:561 ../mail/em-popup.c:572
+#: ../ui/evolution-mail-message.xml.h:109
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: ../mail/em-folder-view.c:1086
-#: ../ui/evolution-mail-message.xml.h:107
+#: ../mail/em-folder-view.c:1086 ../ui/evolution-mail-message.xml.h:106
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -12809,12 +12698,10 @@ msgid "U_ndelete"
 msgstr "復原(_N)"
 
 #: ../mail/em-folder-view.c:1093
-#: ../ui/evolution-addressbook.xml.h:37
 msgid "_Move to Folder..."
 msgstr "移至資料夾(_M)..."
 
 #: ../mail/em-folder-view.c:1094
-#: ../ui/evolution-addressbook.xml.h:33
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
@@ -12896,8 +12783,7 @@ msgstr "從通信論壇建立過濾器(_M)"
 
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: ../mail/em-folder-view.c:1968
-#: ../mail/em-folder-view.c:2012
+#: ../mail/em-folder-view.c:1968 ../mail/em-folder-view.c:2012
 msgid "Default"
 msgstr "預設值"
 
@@ -12939,141 +12825,155 @@ msgstr "按一下來傳送郵件 %s"
 
 # mail/mail-search.c:319
 #. message-search popup match count string
-#: ../mail/em-format-html-display.c:492
+#: ../mail/em-format-html-display.c:493
 #, c-format
 msgid "Matches: %d"
 msgstr "符合：%d"
 
 # calendar/gui/calendar-model.c:1578
-#: ../mail/em-format-html-display.c:752
-#: ../mail/em-format-html.c:607
+#: ../mail/em-format-html-display.c:753 ../mail/em-format-html.c:607
 msgid "Unsigned"
 msgstr "未簽名"
 
 # mail/mail-format.c:1161
-#: ../mail/em-format-html-display.c:752
-msgid "This message is not signed. There is no guarantee that this message is authentic."
+#: ../mail/em-format-html-display.c:753
+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:753
-#: ../mail/em-format-html.c:608
+#: ../mail/em-format-html-display.c:754 ../mail/em-format-html.c:608
 msgid "Valid signature"
 msgstr "有效的簽名"
 
 # mail/mail-format.c:1161
-#: ../mail/em-format-html-display.c:753
-msgid "This message is signed and is valid meaning that it is very likely that this message is authentic."
+#: ../mail/em-format-html-display.c:754
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
 msgstr "此郵件已簽名而且有效，表示它非常有可能是驗證的郵件。"
 
 # mail/mail-config.glade.h:74
-#: ../mail/em-format-html-display.c:754
-#: ../mail/em-format-html.c:609
+#: ../mail/em-format-html-display.c:755 ../mail/em-format-html.c:609
 msgid "Invalid signature"
 msgstr "無效的簽名"
 
-#: ../mail/em-format-html-display.c:754
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: ../mail/em-format-html-display.c:755
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr "郵件的簽名無法檢驗，可能已在傳送時被更動了。"
 
-#: ../mail/em-format-html-display.c:755
+#: ../mail/em-format-html-display.c:756
 msgid "Valid signature, cannot verify sender"
 msgstr "簽名有效，但無法檢驗寄件者"
 
-#: ../mail/em-format-html-display.c:755
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: ../mail/em-format-html-display.c:756
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
 msgstr "此郵件有一個有效的簽名，但是郵件的寄件者無法檢驗。"
 
-#: ../mail/em-format-html-display.c:761
-#: ../mail/em-format-html.c:616
+#: ../mail/em-format-html-display.c:762 ../mail/em-format-html.c:616
 msgid "Unencrypted"
 msgstr "未加密"
 
-#: ../mail/em-format-html-display.c:761
-msgid "This message is not encrypted. Its content may be viewed in transit across the Internet."
+#: ../mail/em-format-html-display.c:762
+msgid ""
+"This message is not encrypted. Its content may be viewed in transit across "
+"the Internet."
 msgstr "此郵件未加密。它的內容在透過網際網路傳送可能會被檢閱。"
 
-#: ../mail/em-format-html-display.c:762
-#: ../mail/em-format-html.c:617
+#: ../mail/em-format-html-display.c:763 ../mail/em-format-html.c:617
 msgid "Encrypted, weak"
 msgstr "已加密，不嚴密"
 
-#: ../mail/em-format-html-display.c:762
-msgid "This message is encrypted, but with a weak encryption algorithm. It would be difficult, but not impossible for an outsider to view the content of this message in a practical amount of time."
-msgstr "此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時日，並不是無法檢視此郵件的內容。"
+#: ../mail/em-format-html-display.c:763
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm. It would be "
+"difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
+"此郵件已加密，但是使用不嚴密的加密演算法。外面的人很難檢閱內容，但只要一些時"
+"日，並不是無法檢視此郵件的內容。"
 
 # ui/evolution-message-composer.xml.h:13
-#: ../mail/em-format-html-display.c:763
-#: ../mail/em-format-html.c:618
+#: ../mail/em-format-html-display.c:764 ../mail/em-format-html.c:618
 msgid "Encrypted"
 msgstr "已加密"
 
-#: ../mail/em-format-html-display.c:763
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: ../mail/em-format-html-display.c:764
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
 msgstr "此郵件已加密。外面的人難以檢視此郵件的內容。"
 
-#: ../mail/em-format-html-display.c:764
-#: ../mail/em-format-html.c:619
+#: ../mail/em-format-html-display.c:765 ../mail/em-format-html.c:619
 msgid "Encrypted, strong"
 msgstr "已加密，嚴密"
 
-#: ../mail/em-format-html-display.c:764
-msgid "This message is encrypted, with a strong encryption algorithm. It would be very difficult for an outsider to view the content of this message in a practical amount of time."
-msgstr "此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件的內容。"
+#: ../mail/em-format-html-display.c:765
+msgid ""
+"This message is encrypted, with a strong encryption algorithm. It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+"此郵件已加密，使用嚴密的加密演算法。縱使經過一段時間，外面的人很難檢閱此郵件"
+"的內容。"
 
-#: ../mail/em-format-html-display.c:865
-#: ../smime/gui/smime-ui.glade.h:48
+#: ../mail/em-format-html-display.c:866 ../smime/gui/smime-ui.glade.h:48
 msgid "_View Certificate"
 msgstr "檢視憑證(_V)"
 
-#: ../mail/em-format-html-display.c:880
+#: ../mail/em-format-html-display.c:881
 msgid "This certificate is not viewable"
 msgstr "此憑證無法檢視"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1168
+#: ../mail/em-format-html-display.c:1169
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "完成於 %B %d, %Y, %l:%M %p"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ../mail/em-format-html-display.c:1176
+#: ../mail/em-format-html-display.c:1177
 msgid "Overdue:"
 msgstr "逾期:"
 
 # mail/message-list.c:977
-#: ../mail/em-format-html-display.c:1179
+#: ../mail/em-format-html-display.c:1180
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "作者 %B %d, %Y, %l:%M %p"
 
-#: ../mail/em-format-html-display.c:1239
+#: ../mail/em-format-html-display.c:1240
 msgid "_View Inline"
 msgstr "檢視行內(_V)"
 
-#: ../mail/em-format-html-display.c:1240
+#: ../mail/em-format-html-display.c:1241
 msgid "_Hide"
 msgstr "隱藏(_H)"
 
-#: ../mail/em-format-html-display.c:1241
+#: ../mail/em-format-html-display.c:1242
 msgid "_Fit to Width"
 msgstr "符合寬度(_F)"
 
-#: ../mail/em-format-html-display.c:1242
+#: ../mail/em-format-html-display.c:1243
 msgid "Show _Original Size"
 msgstr "顯示原始大小(_O)"
 
 # 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:1619
+#: ../mail/em-format-html-display.c:1620
 msgid "Attachment Button"
 msgstr "附件按鈕"
 
 # mail/mail-display.c:196
-#: ../mail/em-format-html-display.c:1826
+#: ../mail/em-format-html-display.c:1827
 msgid "Select folder to save all attachments..."
 msgstr "選擇用來儲存所有的附加檔案的資料夾..."
 
-#: ../mail/em-format-html-display.c:1873
+#: ../mail/em-format-html-display.c:1874
 msgid "Save Selected..."
 msgstr "儲存選取的..."
 
@@ -13081,33 +12981,36 @@ msgstr "儲存選取的..."
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
 #. Cant i put in the number of attachments here ?
-#: ../mail/em-format-html-display.c:1940
+#: ../mail/em-format-html-display.c:1941
 #, c-format
-msgid "%d attachment"
-msgid_plural "%d attachments"
-msgstr[0] "%d 個附件"
-msgstr[1] "%d 個附件"
+msgid "%d attachme_nt"
+msgid_plural "%d attachme_nts"
+msgstr[0] "%d 個附件(_N)"
+
+#: ../mail/em-format-html-display.c:1948 ../mail/em-format-html-display.c:2024
+msgid "S_ave"
+msgstr "儲存(_A)"
+
+# ui/evolution-calendar.xml.h:27
+# ui/evolution-message-composer.xml.h:18
+#: ../mail/em-format-html-display.c:1959
+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:2003
+#: ../mail/em-format-html-display.c:2018
 msgid "Toggle Attachment Bar"
 msgstr "切換附件列"
 
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/em-format-html-display.c:2005
+#: ../mail/em-format-html-display.c:2020
 msgid "No Attachment"
 msgstr "無附件"
 
-# ui/evolution-calendar.xml.h:27
-# ui/evolution-message-composer.xml.h:18
-#: ../mail/em-format-html-display.c:2008
-msgid "Save All"
-msgstr "儲存全部"
-
 # camel/camel-filter-driver.c:748
 #: ../mail/em-format-html-print.c:130
 #, c-format
@@ -13115,8 +13018,7 @@ 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
+#: ../mail/em-format-html.c:483 ../mail/em-format-html.c:485
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "正在擷取 `%s'"
@@ -13166,53 +13068,41 @@ msgstr "格式化郵件"
 
 # mail/mail-format.c:756
 # mail/message-list.c:1082
-#: ../mail/em-format-html.c:1474
-#: ../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
+#: ../mail/em-format-html.c:1474 ../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:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:845
-#: ../mail/em-mailer-prefs.c:86
+#: ../mail/em-format-html.c:1474 ../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:762
 # mail/message-list.c:1083
-#: ../mail/em-format-html.c:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:846
-#: ../mail/em-mailer-prefs.c:87
+#: ../mail/em-format-html.c:1474 ../mail/em-format-quote.c:200
+#: ../mail/em-format.c:846 ../mail/em-mailer-prefs.c:87
 #: ../mail/message-list.etspec.h:14
 msgid "To"
 msgstr "收件者"
 
 # mail/mail-format.c:765
-#: ../mail/em-format-html.c:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:847
-#: ../mail/em-mailer-prefs.c:88
+#: ../mail/em-format-html.c:1474 ../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:1474
-#: ../mail/em-format-quote.c:200
-#: ../mail/em-format.c:848
-#: ../mail/em-mailer-prefs.c:89
+#: ../mail/em-format-html.c:1474 ../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:1586
-#: ../mail/em-format-quote.c:322
+#: ../mail/em-format-html.c:1586 ../mail/em-format-quote.c:322
 #: ../mail/em-mailer-prefs.c:1000
 msgid "Mailer"
 msgstr "寄件者"
@@ -13229,16 +13119,13 @@ msgstr "<I> (%R %Z)</I>"
 
 # mail/mail-format.c:640
 # mail/message-list.c:1082
-#: ../mail/em-format-html.c:1626
-#: ../mail/em-format-quote.c:329
-#: ../mail/em-format.c:850
-#: ../mail/em-mailer-prefs.c:91
+#: ../mail/em-format-html.c:1626 ../mail/em-format-quote.c:329
+#: ../mail/em-format.c:850 ../mail/em-mailer-prefs.c:91
 #: ../mail/message-list.etspec.h:2
 msgid "Date"
 msgstr "日期"
 
-#: ../mail/em-format-html.c:1649
-#: ../mail/em-format.c:851
+#: ../mail/em-format-html.c:1649 ../mail/em-format.c:851
 #: ../mail/em-mailer-prefs.c:92
 msgid "Newsgroups"
 msgstr "新聞群組"
@@ -13250,15 +13137,12 @@ msgid "%s attachment"
 msgstr "%s 附加檔案"
 
 # mail/mail-format.c:573
-#: ../mail/em-format.c:1141
-#: ../mail/em-format.c:1288
-#: ../mail/em-format.c:1575
+#: ../mail/em-format.c:1141 ../mail/em-format.c:1288 ../mail/em-format.c:1575
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "無法剖析 S/MIME 郵件:未知的錯誤"
 
 # mail/mail-format.c:573
-#: ../mail/em-format.c:1270
-#: ../mail/em-format.c:1426
+#: ../mail/em-format.c:1270 ../mail/em-format.c:1426
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
 
@@ -13270,13 +13154,11 @@ msgstr "多部份/已加密不支援的加密類型"
 msgid "Unsupported signature format"
 msgstr "不支援的簽名格式"
 
-#: ../mail/em-format.c:1453
-#: ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Error verifying signature"
 msgstr "檢驗簽名發生錯誤"
 
-#: ../mail/em-format.c:1453
-#: ../mail/em-format.c:1517
+#: ../mail/em-format.c:1453 ../mail/em-format.c:1517
 msgid "Unknown error verifying signature"
 msgstr "檢驗簽名發生不明錯誤"
 
@@ -13301,7 +13183,8 @@ msgstr "每月一次"
 
 #: ../mail/em-migrate.c:1209
 msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed since Evolution 1.x.\n"
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
@@ -13348,8 +13231,7 @@ msgstr "無法複製 POP 儲存在伺服器上的資料 `%s':%s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: ../mail/em-migrate.c:2577
-#: ../mail/em-migrate.c:2589
+#: ../mail/em-migrate.c:2577 ../mail/em-migrate.c:2589
 #, c-format
 msgid "Failed to create local mail storage `%s': %s"
 msgstr "無法建立本地郵件儲存區 `%s':%s"
@@ -13361,17 +13243,18 @@ msgid "Unable to create local mail folders at `%s': %s"
 msgstr "無法在 `%s' 建立本地郵件資料夾:%s"
 
 #: ../mail/em-migrate.c:2731
-msgid "Unable to read settings from previous Evolution install, `evolution/config.xmldb' does not exist or is corrupt."
-msgstr "無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"無法從以前的 Evolution 讀取設定值，`evolution/config.xmldb' 不存在或損毀。"
 
-#: ../mail/em-popup.c:557
-#: ../mail/em-popup.c:568
+#: ../mail/em-popup.c:557 ../mail/em-popup.c:568
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
-#: ../mail/em-popup.c:558
-#: ../mail/em-popup.c:569
-#: ../ui/evolution-mail-message.xml.h:83
+#: ../mail/em-popup.c:558 ../mail/em-popup.c:569
+#: ../ui/evolution-mail-message.xml.h:82
 msgid "Reply to _List"
 msgstr "回覆至清單(_L)"
 
@@ -13385,8 +13268,8 @@ msgid "_Send New Message To..."
 msgstr "傳送新郵件至(_S)…"
 
 #: ../mail/em-popup.c:622
-msgid "_Add to Addressbook"
-msgstr "加入到目錄服務(_A)"
+msgid "_Add to Address Book"
+msgstr "加入到通訊錄(_A)"
 
 #: ../mail/em-subscribe-editor.c:615
 msgid "This store does not support subscriptions, or they are not enabled."
@@ -13421,8 +13304,7 @@ msgstr "不要再顯示這個訊息。"
 msgid "Filters"
 msgstr "過濾器"
 
-#: ../mail/em-utils.c:500
-#: ../mail/em-utils.c:537
+#: ../mail/em-utils.c:500 ../mail/em-utils.c:537
 msgid "message"
 msgstr "郵件"
 
@@ -13571,12 +13453,20 @@ msgid "Height of the message-list pane."
 msgstr "郵件清單面板高度。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:27
-msgid "If a user tries to open 10 or more messages at one time, ask the user if they really want to do it."
+msgid ""
+"If a user tries to open 10 or more messages at one time, ask the user if "
+"they really want to do it."
 msgstr "如果使用者嘗試一次開啟 10 或更多的郵件，詢問使用者是否確定要這麼做。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:28
-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 檢視器，會用於顯示內容。"
+msgid ""
+"If there isn't a builtin viewer for a particular mime-type inside Evolution, "
+"any mime-types appearing in this list which map to a bonobo-component viewer "
+"in GNOME's mime-type database may be used for displaying content."
+msgstr ""
+"如果沒有內建檢視器可用於 Evolution 裏面特殊的 mime-type，任何顯示在此清單的 "
+"mime-types 且對應至 GNOME mine-type 資料庫的 bonobo-component 檢視器，會用於"
+"顯示內容。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:29
 msgid "Last time empty trash was run"
@@ -13597,16 +13487,24 @@ msgid "List of accounts"
 msgstr "帳號清單"
 
 #: ../mail/evolution-mail.schemas.in.in.h:33
-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 相關的字串命名子目錄。"
+msgid ""
+"List of accounts known to the mail component of Evolution. The list contains "
+"strings naming subdirectories relative to /apps/evolution/mail/accounts."
+msgstr ""
+"Evolution 的郵件元件已知的帳號清單。清單包含與 /apps/evolution/mail/accounts "
+"相關的字串命名子目錄。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:34
 msgid "List of custom headers and whether they are enabled."
 msgstr "自訂標頭以及它們是否啟用的清單"
 
 #: ../mail/evolution-mail.schemas.in.in.h:35
-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 十六進位編碼。"
+msgid ""
+"List of labels known to the mail component of Evolution. The list contains "
+"strings containing name:color where color uses the HTML hex encoding."
+msgstr ""
+"Evolution 的郵件元件已知的標籤清單。清單包含字串，其中包含 name:color，color "
+"使用 HTML 十六進位編碼。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:36
 msgid "List of mime types to check for bonobo component viewers"
@@ -13621,8 +13519,13 @@ msgid "Load images for HTML messages over http"
 msgstr "透過 http 載入 HTNL 郵件的影像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:39
-msgid "Load images for HTML messages over http(s). Possible values are: 0 - Never load images off the net 1 - Load images in mail from contacts 2 - Always load images off the net"
-msgstr "透過 http(s) 載入 HTNL 郵件的影像。可能的值：0 – 從不從網路載入影像 1 – 如果寄件者是在通訊錄時，載入影像 2 - 永遠從網路載入影像"
+msgid ""
+"Load images for HTML messages over http(s). Possible values are: 0 - Never "
+"load images off the net 1 - Load images in mail from contacts 2 - Always "
+"load images off the net"
+msgstr ""
+"透過 http(s) 載入 HTNL 郵件的影像。可能的值：0 – 從不從網路載入影像 1 – 如果"
+"寄件者是在通訊錄時，載入影像 2 - 永遠從網路載入影像"
 
 #: ../mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions"
@@ -13696,7 +13599,8 @@ msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "當使用者嘗試清空資料夾時，提示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:57
-msgid "Prompt the user when he or she tries to send a message without a Subject."
+msgid ""
+"Prompt the user when he or she tries to send a message without a Subject."
 msgstr "當使用者傳送沒有主旨的郵件時，提示使用者。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:58
@@ -13714,7 +13618,9 @@ msgstr "當使用者嘗試一次開啟 10 個或更多郵件時提示使用者�
 
 # ui/evolution-mail.xml.h:14
 #: ../mail/evolution-mail.schemas.in.in.h:61
-msgid "Prompt when user tries to send HTML mail to recipients that may not want to receive HTML mail."
+msgid ""
+"Prompt when user tries to send HTML mail to recipients that may not want to "
+"receive HTML mail."
 msgstr "當使用者嘗試傳送 HTML 郵件到不想接收 HTML 郵件的收件者時，顯示提示。"
 
 # ui/evolution-mail.xml.h:14
@@ -13806,8 +13712,14 @@ msgid "The variable width font for mail display"
 msgstr "用於郵件顯示的變動寬度字型"
 
 #: ../mail/evolution-mail.schemas.in.in.h:84
-msgid "This key should contain a list of XML structures specifying custom headers, and whether they are to be displayed. The format of the XML structure is &lt;header enabled&gt; - set enabled if the header is to be displayed in the mail view."
-msgstr "此鑰匙應該包含 XML 清單，它會指定自訂標頭，以及是否顯示它們。XML 結構的格式是 &lt;header enabled&gt; - 如果標頭會顯示在郵件檢視，則設定成 enabled。"
+msgid ""
+"This key should contain a list of XML structures specifying custom headers, "
+"and whether they are to be displayed. The format of the XML structure is &lt;"
+"header enabled&gt; - set enabled if the header is to be displayed in the "
+"mail view."
+msgstr ""
+"此鑰匙應該包含 XML 清單，它會指定自訂標頭，以及是否顯示它們。XML 結構的格式"
+"是 &lt;header enabled&gt; - 如果標頭會顯示在郵件檢視，則設定成 enabled。"
 
 # ui/evolution-mail.xml.h:93
 #: ../mail/evolution-mail.schemas.in.in.h:85
@@ -13906,7 +13818,9 @@ msgid "View/ReplyTo menu item is checked."
 msgstr "檢視/回覆功能表項目已選取。"
 
 #: ../mail/evolution-mail.schemas.in.in.h:108
-msgid "Whether or not to fall back on threading by subjects when the messages do not contain In-Reply-To or References headers."
+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 標頭時，是否按照主旨放回線串。"
 
 # shell/e-shell-importer.c:363
@@ -13945,8 +13859,7 @@ msgstr "匯入 Berkeley 郵件箱格式資料夾"
 
 # shell/e-shell-importer.c:363
 #: ../mail/importers/evolution-outlook-importer.c:262
-#: ../mail/importers/mail-importer.c:234
-#: ../shell/e-shell-importer.c:518
+#: ../mail/importers/mail-importer.c:234 ../shell/e-shell-importer.c:518
 #, c-format
 msgid "Importing `%s'"
 msgstr "輸入 `%s'"
@@ -14074,8 +13987,7 @@ msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
 # mail/mail-autofilter.c:229
-#: ../mail/mail-autofilter.c:243
-#: ../mail/mail-autofilter.c:282
+#: ../mail/mail-autofilter.c:243 ../mail/mail-autofilter.c:282
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
@@ -14185,8 +14097,7 @@ msgstr "建立新郵件資料夾"
 msgid "Failed upgrading Mail settings or folders."
 msgstr "升級郵件或資料夾失敗。"
 
-#: ../mail/mail-config.glade.h:1
-#: ../mail/mail-dialogs.glade.h:1
+#: ../mail/mail-config.glade.h:1 ../mail/mail-dialogs.glade.h:1
 #: ../plugins/exchange-operations/exchange-permissions-dialog.glade.h:1
 #: ../widgets/menus/gal-view-instance-save-as-dialog.glade.h:1
 msgid "    "
@@ -14357,8 +14268,7 @@ msgstr "附加原始郵件"
 # composer/e-msg-composer-attachment.glade.h:1
 # mail/mail-config.glade.h:9
 # mail/message-list.c:1081
-#: ../mail/mail-config.glade.h:45
-#: ../mail/message-list.etspec.h:1
+#: ../mail/mail-config.glade.h:45 ../mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "附件"
 
@@ -14464,6 +14374,11 @@ msgstr "完成"
 msgid "Drafts _Folder:"
 msgstr "草稿匣(_F):"
 
+#: ../mail/mail-config.glade.h:74
+#: ../plugins/publish-calendar/publish-calendar.glade.h:9
+msgid "E_nable"
+msgstr "啟用(_E)"
+
 # mail/mail-config.glade.h:6
 #: ../mail/mail-config.glade.h:75
 msgid "Email Accounts"
@@ -14552,7 +14467,9 @@ msgid "Message Composer"
 msgstr "郵件編輯器"
 
 #: ../mail/mail-config.glade.h:101
-msgid "Note: you will not be prompted for a password until you connect for the first time"
+msgid ""
+"Note: you will not be prompted for a password until you connect for the "
+"first time"
 msgstr "注意：在您首次連線之前將不會提示您輸入密碼"
 
 #: ../mail/mail-config.glade.h:102
@@ -14577,13 +14494,22 @@ msgstr ""
 
 # 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 "請輸入以下關於您寄送郵件方式的資訊。如果您不清楚，請聯絡您的系統管理員或網路服務供應商。"
+msgid ""
+"Please enter information about the way you will send mail. If you are not "
+"sure, ask your system administrator or Internet Service Provider."
+msgstr ""
+"請輸入以下關於您寄送郵件方式的資訊。如果您不清楚，請聯絡您的系統管理員或網路"
+"服務供應商。"
 
 # mail/mail-config-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 "請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出的郵件內包含這些資訊。"
+msgid ""
+"Please enter your name and email address below. The \"optional\" fields "
+"below do not need to be filled in, unless you wish to include this "
+"information in email you send."
+msgstr ""
+"請在下面輸入您的名稱及電郵地址。「選擇性」的欄位不一定要填，除非您希望在送出"
+"的郵件內包含這些資訊。"
 
 #: ../mail/mail-config.glade.h:111
 msgid "Please select among the following options"
@@ -14709,7 +14635,9 @@ msgid "T_ype: "
 msgstr "類型(_Y):"
 
 #: ../mail/mail-config.glade.h:142
-msgid "The list of languages here reflects only the languages for which you have a dictionary installed."
+msgid ""
+"The list of languages here reflects only the languages for which you have a "
+"dictionary installed."
 msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
 
 #: ../mail/mail-config.glade.h:143
@@ -14730,8 +14658,7 @@ msgstr ""
 "輸入您想要用來代表這個帳號的名稱。\n"
 "例如：「工作」或「個人」"
 
-#: ../mail/mail-config.glade.h:149
-#: ../plugins/caldav/caldav-source.c:282
+#: ../mail/mail-config.glade.h:149 ../plugins/caldav/caldav-source.c:282
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
@@ -14850,8 +14777,7 @@ msgstr "區分大小寫(_S)"
 # 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:6
-#: ../mail/message-tags.glade.h:2
+#: ../mail/mail-dialogs.glade.h:6 ../mail/message-tags.glade.h:2
 msgid "Co_mpleted"
 msgstr "已完成(_M)"
 
@@ -14865,8 +14791,7 @@ msgstr "尋找(_I):"
 msgid "Find in Message"
 msgstr "在郵件內尋找"
 
-#: ../mail/mail-dialogs.glade.h:10
-#: ../mail/message-tag-followup.c:297
+#: ../mail/mail-dialogs.glade.h:10 ../mail/message-tag-followup.c:297
 #: ../mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
@@ -14893,8 +14818,7 @@ msgstr "伺服器(_E):"
 msgid "Security Information"
 msgstr "保全性資訊"
 
-#: ../mail/mail-dialogs.glade.h:17
-#: ../mail/message-tags.glade.h:4
+#: ../mail/mail-dialogs.glade.h:17 ../mail/message-tags.glade.h:4
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the \"Flag\" menu."
@@ -14906,13 +14830,11 @@ msgstr ""
 msgid "_Accept License"
 msgstr "接受授權(_A)"
 
-#: ../mail/mail-dialogs.glade.h:20
-#: ../mail/message-tags.glade.h:6
+#: ../mail/mail-dialogs.glade.h:20 ../mail/message-tags.glade.h:6
 msgid "_Due By:"
 msgstr "到期於(_D):"
 
-#: ../mail/mail-dialogs.glade.h:21
-#: ../mail/message-tags.glade.h:7
+#: ../mail/mail-dialogs.glade.h:21 ../mail/message-tags.glade.h:7
 msgid "_Flag:"
 msgstr "標幟(_F):"
 
@@ -14970,8 +14892,7 @@ msgstr "接收郵件"
 msgid "Failed to apply outgoing filters: %s"
 msgstr "無法套用外寄過濾器：%s"
 
-#: ../mail/mail-ops.c:577
-#: ../mail/mail-ops.c:606
+#: ../mail/mail-ops.c:577 ../mail/mail-ops.c:606
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15000,8 +14921,7 @@ msgid "Failed to send %d of %d messages"
 msgstr "無法傳送第 %d 個郵件 (共 %d 個)"
 
 # mail/mail-send-recv.c:471
-#: ../mail/mail-ops.c:762
-#: ../mail/mail-send-recv.c:623
+#: ../mail/mail-ops.c:762 ../mail/mail-send-recv.c:623
 msgid "Canceled."
 msgstr "已取消。"
 
@@ -15078,8 +14998,7 @@ msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: ../mail/mail-ops.c:1613
-#: ../mail/mail-ops.c:1664
+#: ../mail/mail-ops.c:1613 ../mail/mail-ops.c:1664
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
@@ -15178,8 +15097,7 @@ msgstr "檢查服務"
 msgid "Canceling..."
 msgstr "正在取消..."
 
-#: ../mail/mail-send-recv.c:266
-#: ../mail/mail-send-recv.c:268
+#: ../mail/mail-send-recv.c:266 ../mail/mail-send-recv.c:268
 #, c-format
 msgid "<b>%s (%s)</b> : %s"
 msgstr "<b>%s (%s)</b> : %s"
@@ -15189,8 +15107,7 @@ msgstr "<b>%s (%s)</b> : %s"
 msgid "<b>%s (%s)</b>"
 msgstr "<b>%s (%s)</b>"
 
-#: ../mail/mail-send-recv.c:274
-#: ../mail/mail-send-recv.c:276
+#: ../mail/mail-send-recv.c:274 ../mail/mail-send-recv.c:276
 #, c-format
 msgid "<b>%s</b> : %s"
 msgstr "<b>%s</b> : %s"
@@ -15216,8 +15133,7 @@ msgstr "正在更新..."
 
 # mail/mail-send-recv.c:287
 # mail/mail-send-recv.c:333
-#: ../mail/mail-send-recv.c:425
-#: ../mail/mail-send-recv.c:478
+#: ../mail/mail-send-recv.c:425 ../mail/mail-send-recv.c:478
 msgid "Waiting..."
 msgstr "正在等待..."
 
@@ -15322,29 +15238,37 @@ msgid "New Search Folder"
 msgstr "新增搜尋資料夾"
 
 #: ../mail/mail.error.xml.h:1
-msgid "A folder named &quot;{1}&quot; already exists. Please use a different name."
+msgid ""
+"A folder named &quot;{1}&quot; already exists. Please use a different name."
 msgstr "已經有名稱為「{1}」的資料夾存在。請使用不同的名稱。"
 
 #: ../mail/mail.error.xml.h:2
 msgid ""
 "A non-empty folder at &quot;{1}&quot; already exists.\n"
 "\n"
-"You can choose to ignore this folder, overwrite or append its contents, or quit.\n"
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 "「{1}」的非空白資料夾已經存在。\n"
 "\n"
 "您可以選擇忽略此資料夾、覆寫或附加它的內容或者結束。\n"
 
 #: ../mail/mail.error.xml.h:6
-msgid "A read receipt notification has been requested for &quot;{1}&quot;. Send the receipt notification to {0}?"
+msgid ""
+"A read receipt notification has been requested for &quot;{1}&quot;. Send the "
+"receipt notification to {0}?"
 msgstr "「{1}」已要求傳送讀信回條。是否傳送讀信回條給 {0}？"
 
 #: ../mail/mail.error.xml.h:7
-msgid "A signature already exists with the name &quot;{0}&quot;. Please specify a different name."
+msgid ""
+"A signature already exists with the name &quot;{0}&quot;. Please specify a "
+"different name."
 msgstr "已經有名稱為「{0}」的簽名檔存在。請使用不同的名稱。"
 
 #: ../mail/mail.error.xml.h:8
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+msgid ""
+"Adding a meaningful Subject line to your messages will give your recipients "
+"an idea of what your mail is about."
 msgstr "新增有意義的主旨行到您的郵件，可以讓收件者知道您的郵件和什麼事有關。"
 
 #: ../mail/mail.error.xml.h:9
@@ -15358,7 +15282,8 @@ msgid "Are you sure you want to delete this account?"
 msgstr "您確定要刪除這個帳號？"
 
 #: ../mail/mail.error.xml.h:11
-msgid "Are you sure you want to disable this account and delete all its proxies?"
+msgid ""
+"Are you sure you want to disable this account and delete all its proxies?"
 msgstr "確定要刪除這個帳號以及它所有的代理伺服器？"
 
 # mail/mail-callbacks.c:1017
@@ -15368,12 +15293,16 @@ msgstr "您確定要一次開啟 {0} 封郵件？"
 
 # ui/evolution-mail.xml.h:61
 #: ../mail/mail.error.xml.h:13
-msgid "Are you sure you want to permanently remove all the deleted messages in all folders?"
+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:14
-msgid "Are you sure you want to permanently remove all the deleted messages in folder &quot;{0}&quot;?"
+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
@@ -15473,8 +15402,13 @@ msgid "Cannot open target &quot;{2}&quot;."
 msgstr "無法開啟目標「{2}」。"
 
 #: ../mail/mail.error.xml.h:34
-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}」，應該是安裝問題造成的。在您同意這項授權之前將無法使用它。"
+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}」，應該是安裝問題造成的。在您同意這項授權之前將無法"
+"使用它。"
 
 # camel/providers/local/camel-mbox-store.c:138
 # camel/providers/local/camel-mbox-store.c:161
@@ -15513,8 +15447,11 @@ msgid "Cannot set signature script &quot;{0}&quot;."
 msgstr "無法設定簽名程序檔「{0}」。"
 
 #: ../mail/mail.error.xml.h:41
-msgid "Check to make sure your password is spelled correctly. Remember that many passwords are case sensitive; your caps lock might be on."
-msgstr "檢查確定您的密碼拼字正確。請注意很多密碼區分大小寫；您可能啟動了大寫鎖定鍵。"
+msgid ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+msgstr ""
+"檢查確定您的密碼拼字正確。請注意很多密碼區分大小寫；您可能啟動了大寫鎖定鍵。"
 
 # mail/mail-crypto.c:59
 #: ../mail/mail.error.xml.h:42
@@ -15605,7 +15542,9 @@ msgid "If you continue, you will not be able to recover these messages."
 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."
+msgid ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr "如果您刪除資料夾，所有它的內容和子資料夾內容會永久刪除。"
 
 #: ../mail/mail.error.xml.h:58
@@ -15625,7 +15564,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr "如果繼續，帳號資訊會永久刪除。"
 
 #: ../mail/mail.error.xml.h:62
-msgid "If you quit, these messages will not be sent until Evolution is started again."
+msgid ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr "如果您結束，再次啟動 Evolution 之前，不會傳送這些郵件。"
 
 #: ../mail/mail.error.xml.h:63
@@ -15642,8 +15583,15 @@ msgid "Mail filters automatically updated."
 msgstr "郵件過濾器自動更新。"
 
 #: ../mail/mail.error.xml.h:66
-msgid "Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients to your message anyway. To avoid this, you should add at least one To: or CC: recipient."
-msgstr "很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果加入了此標頭，會永遠列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件者：」或「副本：」收件者。"
+msgid ""
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients to "
+"your message anyway. To avoid this, you should add at least one To: or CC: "
+"recipient."
+msgstr ""
+"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果加入"
+"了此標頭，會永遠列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收"
+"件者：」或「副本：」收件者。"
 
 # ui/evolution-mail.xml.h:51
 #: ../mail/mail.error.xml.h:67
@@ -15677,12 +15625,17 @@ msgid "Please enable the account or send using another account."
 msgstr "請啟用該帳號或使用其他帳號傳送。"
 
 #: ../mail/mail.error.xml.h:75
-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 "請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的「收件者：」按鈕，搜尋電子郵件地址。"
+msgid ""
+"Please enter a valid email address in the To: field. You can search for "
+"email addresses by clicking on the To: button next to the entry box."
+msgstr ""
+"請在「收件者：」欄位輸入一個有效的電子郵件地址。您可以按一下輸入方塊旁邊的"
+"「收件者：」按鈕，搜尋電子郵件地址。"
 
 #: ../mail/mail.error.xml.h:76
 msgid ""
-"Please make sure the following recipients are willing and able to receive HTML email:\n"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
 "{0}\n"
 "Send anyway?"
 msgstr ""
@@ -15736,18 +15689,27 @@ msgid "Signature Already Exists"
 msgstr "簽名檔已經存在"
 
 #: ../mail/mail.error.xml.h:89
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr "Ximian Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動或刪除。"
+msgid ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+msgstr ""
+"Ximian Evolution 需要系統資料夾才能正常作業，而且該資料夾不可以重新命名、移動"
+"或刪除。"
 
 #: ../mail/mail.error.xml.h:90
 msgid ""
 "The contact list you are sending to is configured to hide list recipients.\n"
 "\n"
-"Many email systems add an Apparently-To header to messages that only have BCC recipients. This header, if added, will list all of your recipients in your message. To avoid this, you should add at least one To: or CC: recipient. "
+"Many email systems add an Apparently-To header to messages that only have "
+"BCC recipients. This header, if added, will list all of your recipients in "
+"your message. To avoid this, you should add at least one To: or CC: "
+"recipient. "
 msgstr ""
 "您傳送的連絡人清單是設定成隱藏清單收件者。\n"
 "\n"
-"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果新增此標頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件者：」或「副本：」收件者。 "
+"很多電子郵件系統會新增 Apparently-To 標頭至只有密件副本收件者的郵件。如果新增"
+"此標頭，會列示郵件中所有的收件者。要避免此情況，您應該至少新增一個「收件"
+"者：」或「副本：」收件者。 "
 
 #: ../mail/mail.error.xml.h:93
 msgid ""
@@ -15779,10 +15741,13 @@ msgstr ""
 
 #: ../mail/mail.error.xml.h:103
 msgid ""
-"The message was sent via the &quot;sendmail&quot; external application. Sendmail reports the following error: status 67: mail not sent.\n"
-"The message is stored in the Outbox folder. Check the message for errors and resend."
+"The message was sent via the &quot;sendmail&quot; external application. "
+"Sendmail reports the following error: status 67: mail not sent.\n"
+"The message is stored in the Outbox folder. Check the message for errors and "
+"resend."
 msgstr ""
-"訊息已透過「sendmail」外部應用程式傳送。Sendmail 報告以下錯誤：狀態 67：未傳送郵件。\n"
+"訊息已透過「sendmail」外部應用程式傳送。Sendmail 報告以下錯誤：狀態 67：未傳"
+"送郵件。\n"
 "訊息儲存在「寄件信箱」資料夾。請檢查訊息的錯誤，然後重新傳送。"
 
 #: ../mail/mail.error.xml.h:105
@@ -15798,16 +15763,21 @@ msgstr ""
 "需要時，請移至搜尋資料夾編輯器，以手動方式新增它。"
 
 #: ../mail/mail.error.xml.h:108
-msgid "This message cannot be sent because the account you chose to send with is not enabled"
+msgid ""
+"This message cannot be sent because the account you chose to send with is "
+"not enabled"
 msgstr "因為您沒有啟用選擇用來寄送的帳號，所以無法傳送此郵件。"
 
 #: ../mail/mail.error.xml.h:109
-msgid "This message cannot be sent because you have not specified any Recipients"
-msgstr "因為您沒有指定任何收件者，所以無法傳送此郵件。"
+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:110
-msgid "This server does not support this type of authentication and may not support authentication at all."
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr "此伺服器不支援此驗證類型而且根本不支援驗證。"
 
 # composer/e-msg-composer.c:941
@@ -15822,7 +15792,9 @@ 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?"
+msgid ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
 msgstr "無法開啟此帳號的草稿資料夾。是否使用系統草稿資料夾代替？"
 
 # mail/mail-ops.c:1728
@@ -15866,7 +15838,8 @@ msgstr "您必須指定一個資料夾。"
 #: ../mail/mail.error.xml.h:122
 msgid ""
 "You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+"Either by selecting the folders individually, and/or by selecting all local "
+"folders, all remote folders, or both."
 msgstr ""
 "您必須至少指定一個資料夾當成來源。\n"
 "個別選取資料夾，然後/或選取所有本地資料夾、所有遠端資料夾或二者皆選。"
@@ -15942,41 +15915,35 @@ msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: ../mail/message-list.c:1346
-#: ../widgets/table/e-cell-date.c:57
+#: ../mail/message-list.c:1346 ../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:1353
-#: ../plugins/itip-formatter/itip-view.c:198
+#: ../mail/message-list.c:1353 ../plugins/itip-formatter/itip-view.c:198
 #: ../widgets/table/e-cell-date.c:72
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: ../mail/message-list.c:1362
-#: ../widgets/table/e-cell-date.c:82
+#: ../mail/message-list.c:1362 ../widgets/table/e-cell-date.c:82
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: ../mail/message-list.c:1374
-#: ../widgets/table/e-cell-date.c:94
+#: ../mail/message-list.c:1374 ../widgets/table/e-cell-date.c:94
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: ../mail/message-list.c:1382
-#: ../widgets/table/e-cell-date.c:102
+#: ../mail/message-list.c:1382 ../widgets/table/e-cell-date.c:102
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: ../mail/message-list.c:1384
-#: ../widgets/table/e-cell-date.c:104
+#: ../mail/message-list.c:1384 ../widgets/table/e-cell-date.c:104
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
@@ -16049,8 +16016,7 @@ 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
+#: ../mail/message-tag-followup.c:79 ../ui/evolution-mail-message.xml.h:41
 msgid "Forward"
 msgstr "轉寄"
 
@@ -16060,15 +16026,13 @@ 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
+#: ../mail/message-tag-followup.c:82 ../ui/evolution-mail-message.xml.h:79
 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
+#: ../mail/message-tag-followup.c:83 ../ui/evolution-mail-message.xml.h:80
 msgid "Reply to All"
 msgstr "全部回覆"
 
@@ -16115,8 +16079,11 @@ msgid "Provides core functionality for local address books."
 msgstr "提供本地端行事曆的核心功能。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:1
-msgid "A formatter plugin which displays audio attachments inline and allows you to play them directly from evolution."
-msgstr "用來顯示郵件中音效附件的格式外掛程式，它可以讓您在 evolution 中直接播放它們。"
+msgid ""
+"A formatter plugin which displays audio attachments inline and allows you to "
+"play them directly from evolution."
+msgstr ""
+"用來顯示郵件中音效附件的格式外掛程式，它可以讓您在 evolution 中直接播放它們。"
 
 #: ../plugins/audio-inline/org-gnome-audio-inline.eplug.xml.h:2
 msgid "Audio inline plugin"
@@ -16172,8 +16139,7 @@ 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
+#: ../plugins/backup-restore/org-gnome-backup-restore.eplug.xml.h:2
 msgid "Backup and restore plugin"
 msgstr "備份與回存外掛程式。"
 
@@ -16194,37 +16160,44 @@ msgstr "回存設定值..."
 
 # addressbook/gui/component/e-address-widget.c:424
 # addressbook/gui/component/select-names/e-select-names-popup.c:347
-#: ../plugins/bbdb/bbdb.c:410
+#: ../plugins/bbdb/bbdb.c:429
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "自動加入的連絡人"
 
-#: ../plugins/bbdb/bbdb.c:419
+#: ../plugins/bbdb/bbdb.c:438
 msgid "<span weight=\"bold\">Automatic Contacts</span>"
 msgstr "<span weight=\"bold\">自動加入的連絡人</span>"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:432
-msgid "_Automatically create entries in the addressbook when responding to mail"
+#: ../plugins/bbdb/bbdb.c:451
+msgid ""
+"_Automatically create entries in the addressbook when responding to mail"
 msgstr "在回覆郵件時自動在通訊錄中建立項目(_A)"
 
-#: ../plugins/bbdb/bbdb.c:450
+#: ../plugins/bbdb/bbdb.c:472
 msgid "<span weight=\"bold\">Instant Messaging Contacts</span>"
 msgstr "<span weight=\"bold\">即時傳訊的連絡人</span>"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:463
-msgid "Periodically synchronize contact information and images from my _instant messenger"
-msgstr "定期從我的即時傳訊軟體同步連絡人資訊(_I)"
+#: ../plugins/bbdb/bbdb.c:485
+msgid ""
+"Periodically synchronize contact information and images from gaim buddy list"
+msgstr "定期從 gaim 的好友清單同步連絡人資訊"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:470
+#: ../plugins/bbdb/bbdb.c:502
 msgid "Synchronize with _buddy list now"
 msgstr "立即與好友清單同步(_B)"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:2
-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 連絡人資訊。"
+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 "
+"連絡人資訊。"
 
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:3
 msgid "BBDB"
@@ -16233,8 +16206,7 @@ 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
+#: ../plugins/caldav/caldav-source.c:64 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
@@ -16328,8 +16300,12 @@ msgid "Weather Calendars"
 msgstr "氣象行事曆"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:1
-msgid "A test plugin which demonstrates a popup menu plugin which lets you copy things to the clipboard."
-msgstr "用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓您複製東西到剪貼簿裡。"
+msgid ""
+"A test plugin which demonstrates a popup menu plugin which lets you copy "
+"things to the clipboard."
+msgstr ""
+"用來展示彈出式選單外掛程式功能的測試用外掛程式，它可以讓您複製東西到剪貼簿"
+"裡。"
 
 #: ../plugins/copy-tool/org-gnome-copy-tool.eplug.xml.h:2
 msgid "Copy _Email Address"
@@ -16344,7 +16320,8 @@ msgid "Check whether Evolution is the default mailer"
 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."
+msgid ""
+"Every time Evolution starts, check whether or not it is the default mailer."
 msgstr "每次啟動 Evolution 時，檢查它是否為預設的郵件程式。"
 
 #: ../plugins/default-mailer/org-gnome-default-mailer.eplug.xml.h:1
@@ -16374,7 +16351,9 @@ msgid "Default Sources"
 msgstr "預設來源"
 
 #: ../plugins/default-source/org-gnome-default-source.eplug.xml.h:2
-msgid "Provides functionallity for marking a calendar or addressbook as the default one."
+msgid ""
+"Provides functionallity for marking a calendar or addressbook as the default "
+"one."
 msgstr "提供標記預設行事曆或通訊錄的功能。"
 
 #: ../plugins/exchange-operations/e-foreign-folder-dialog.glade.h:1
@@ -16400,7 +16379,9 @@ msgstr "保全密碼"
 
 #. i18n: "NTLM" probably doesn't translate
 #: ../plugins/exchange-operations/exchange-account-setup.c:66
-msgid "This option will connect to the Exchange server using secure password (NTLM) authentication."
+msgid ""
+"This option will connect to the Exchange server using secure password (NTLM) "
+"authentication."
 msgstr "此選項將會連線到使用保全密碼 (NTLM) 驗證的 Exchange 伺服器。"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:74
@@ -16408,7 +16389,9 @@ msgid "Plaintext Password"
 msgstr "純文字密碼"
 
 #: ../plugins/exchange-operations/exchange-account-setup.c:76
-msgid "This option will connect to the Exchange server using standard plaintext password authentication."
+msgid ""
+"This option will connect to the Exchange server using standard plaintext "
+"password authentication."
 msgstr "此選項將會連線到使用標準純文字密碼驗證的 Exchange 伺服器。"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
@@ -16489,12 +16472,12 @@ msgid "A_uthenticate"
 msgstr "驗證(_U)"
 
 # mail/mail-config.glade.h:11
-#: ../plugins/exchange-operations/exchange-account-setup.c:833
+#: ../plugins/exchange-operations/exchange-account-setup.c:838
 msgid "Authentication Type"
 msgstr "驗證類型"
 
 # mail/mail-config.glade.h:1
-#: ../plugins/exchange-operations/exchange-account-setup.c:847
+#: ../plugins/exchange-operations/exchange-account-setup.c:852
 msgid "Ch_eck for Supported Types"
 msgstr "檢查支援的類型(_E) "
 
@@ -16511,7 +16494,9 @@ msgstr ""
 #. * password. Prompt him again.
 #.
 #: ../plugins/exchange-operations/exchange-change-password.c:115
-msgid "The current password does not match the existing password for your account. Please enter the correct password"
+msgid ""
+"The current password does not match the existing password for your account. "
+"Please enter the correct password"
 msgstr "目前的密碼不符合您帳戶的現存密碼。請輸入正確的密碼"
 
 #: ../plugins/exchange-operations/exchange-change-password.c:122
@@ -16790,7 +16775,9 @@ msgid "Subscribe to Other User's Calendar"
 msgstr "訂閱其他使用者的行事曆"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.eplug.xml.h:1
-msgid "A plugin that handles a collection of Exchange account specific operations and features."
+msgid ""
+"A plugin that handles a collection of Exchange account specific operations "
+"and features."
 msgstr "處理 Exchange 帳號指定操作與功能集合的外掛程式。"
 
 # ui/evolution-event-editor.xml.h:9
@@ -16808,7 +16795,9 @@ msgid "Cannot display folders."
 msgstr "無法顯示資料夾。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:3
-msgid "Changes to Exchange account configuration will take place after you quit and restart Evolution."
+msgid ""
+"Changes to Exchange account configuration will take place after you quit and "
+"restart Evolution."
 msgstr "對 Exchange 帳戶組態的變更將會在您結束並重新啟動 Evolution 之後生效。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:4
@@ -16931,7 +16920,9 @@ msgid "Generic error"
 msgstr "一般錯誤"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:38
-msgid "If OWA is running on a different path, you must specify that in the account configuration dialog."
+msgid ""
+"If OWA is running on a different path, you must specify that in the account "
+"configuration dialog."
 msgstr "如果 OWA 在別的路徑執行，您必須在帳號組態對話方塊中指定。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:39
@@ -17064,16 +17055,24 @@ msgid "You may only configure a single Exchange account."
 msgstr "您可以只設定一個單一的 Exchange 帳戶。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:72
-msgid "Your current usage is: {0} KB. Try to clear up some space by deleting some mail."
+msgid ""
+"Your current usage is: {0} KB. Try to clear up some space by deleting some "
+"mail."
 msgstr "目前的使用量為：{0} KB。請試著刪除一些郵件來空出部分空間。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:73
-msgid "Your current usage is: {0} KB. You will not be able to either send or receive mail now."
+msgid ""
+"Your current usage is: {0} KB. You will not be able to either send or "
+"receive mail now."
 msgstr "目前的使用量為：{0} KB。您現在將無法傳送或接收郵件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:74
-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。除非您刪除一些郵件來空出部分空間，否則將無法傳送郵件。"
+msgid ""
+"Your current usage is: {0} KB. You will not be able to send mail until you "
+"clear up some space by deleting some mail."
+msgstr ""
+"目前的使用量為：{0} KB。除非您刪除一些郵件來空出部分空間，否則將無法傳送郵"
+"件。"
 
 #: ../plugins/exchange-operations/org-gnome-exchange-operations.error.xml.h:75
 msgid "Your password has expired."
@@ -17165,8 +17164,7 @@ 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:14
-#: ../ui/evolution-task-editor.xml.h:8
+#: ../ui/evolution-event-editor.xml.h:15 ../ui/evolution-task-editor.xml.h:8
 #: ../widgets/misc/e-send-options.glade.h:17
 msgid "Send Options"
 msgstr "傳送選項"
@@ -17268,7 +17266,7 @@ msgid "Subscribe to my _notifications"
 msgstr "訂閱至我的通知(_N)"
 
 #: ../plugins/groupwise-features/proxy-add-dialog.glade.h:13
-#: ../ui/evolution-mail-message.xml.h:126
+#: ../ui/evolution-mail-message.xml.h:125
 msgid "_Read"
 msgstr "閱讀(_R)"
 
@@ -17351,11 +17349,11 @@ msgstr "Hula 帳號設定"
 
 # calendar/gui/calendar-summary.c:721
 # calendar/gui/e-itip-control.glade.h:7
-#: ../plugins/import-ics-attachments/icsimporter.c:81
+#: ../plugins/import-ics-attachments/icsimporter.c:83
 msgid "_Import to Calendar"
 msgstr "匯入至行事曆(_I)"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:86
+#: ../plugins/import-ics-attachments/icsimporter.c:88
 msgid "_Import to Tasks"
 msgstr "匯入至工作(_I)"
 
@@ -17364,23 +17362,23 @@ msgstr "匯入至工作(_I)"
 # importers/pine-importer.c:646
 # shell/e-shell-importer.c:653
 # shell/importer/import.glade.h:4
-#: ../plugins/import-ics-attachments/icsimporter.c:196
+#: ../plugins/import-ics-attachments/icsimporter.c:197
 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:224
+#: ../plugins/import-ics-attachments/icsimporter.c:225
 msgid "Select Task List"
 msgstr "選擇工作清單"
 
 # ui/evolution-addressbook.xml.h:7
-#: ../plugins/import-ics-attachments/icsimporter.c:228
+#: ../plugins/import-ics-attachments/icsimporter.c:229
 msgid "Select Calendar"
 msgstr "選擇行事曆"
 
-#: ../plugins/import-ics-attachments/icsimporter.c:259
+#: ../plugins/import-ics-attachments/icsimporter.c:260
 #: ../shell/e-shell-importer.c:703
 msgid "_Import"
 msgstr "匯入(_I)"
@@ -17409,12 +17407,13 @@ msgid "No output directory!"
 msgstr "沒有輸出目錄！"
 
 #: ../plugins/ipod-sync/sync.c:159
-msgid "The output directory was not found on iPod! Please ensure that iPod has been correctly set up and try again."
+msgid ""
+"The output directory was not found on iPod! Please ensure that iPod has been "
+"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
+#: ../plugins/ipod-sync/sync.c:174 ../plugins/ipod-sync/sync.c:202
 msgid "Could not export data!"
 msgstr "無法匯出資料！"
 
@@ -17547,7 +17546,9 @@ msgid "The calendar attached is not valid"
 msgstr "附帶的行事曆是無效的"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1149
-msgid "The message claims to contain a calendar, but the calendar is not a valid iCalendar."
+msgid ""
+"The message claims to contain a calendar, but the calendar is not a valid "
+"iCalendar."
 msgstr "此郵件宣告其含有行事曆內容，但其行事曆並非有效的 iCalendar。"
 
 # ui/evolution-calendar.xml.h:22
@@ -17560,15 +17561,20 @@ msgstr "行事曆中的項目是無效的"
 #: ../plugins/itip-formatter/itip-formatter.c:1184
 #: ../plugins/itip-formatter/itip-formatter.c:1199
 #: ../plugins/itip-formatter/itip-formatter.c:1275
-msgid "The message does contain a calendar, but the calendar contains no events, tasks or free/busy information"
-msgstr "此郵件確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
+msgid ""
+"The message does contain a calendar, but the calendar contains no events, "
+"tasks or free/busy information"
+msgstr ""
+"此郵件確實含有行事曆內容，但該內容並未包含任何事件、工作或空閒/忙碌資訊"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1209
 msgid "The calendar attached contains multiple items"
 msgstr "附加的行事曆內容含有多個項目"
 
 #: ../plugins/itip-formatter/itip-formatter.c:1210
-msgid "To process all of these items, the file should be saved and the calendar imported"
+msgid ""
+"To process all of these items, the file should be saved and the calendar "
+"imported"
 msgstr "要處理這些全部的項目，應該將此檔案儲存後匯入其中的行事曆"
 
 #. Delete message after acting
@@ -17591,10 +17597,8 @@ msgid "Conflict Search Table"
 msgstr "衝突的搜尋表格"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:184
-#: ../ui/evolution-calendar.xml.h:32
-#: ../widgets/misc/e-cell-date-edit.c:241
-#: ../widgets/misc/e-dateedit.c:467
+#: ../plugins/itip-formatter/itip-view.c:184 ../ui/evolution-calendar.xml.h:32
+#: ../widgets/misc/e-cell-date-edit.c:241 ../widgets/misc/e-dateedit.c:467
 msgid "Today"
 msgstr "今天"
 
@@ -17801,7 +17805,8 @@ msgstr "<b>%s</b> 希望加入一個既存的會議："
 
 #: ../plugins/itip-formatter/itip-view.c:367
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following meeting:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following meeting:"
 msgstr "<b>%s</b> 希望收到下列會議的最新工作資訊："
 
 #: ../plugins/itip-formatter/itip-view.c:370
@@ -17871,7 +17876,9 @@ msgstr "<b>%s</b> 希望加入一項既存的工作："
 
 #: ../plugins/itip-formatter/itip-view.c:435
 #, c-format
-msgid "<b>%s</b> wishes to receive the latest information for the following assigned task:"
+msgid ""
+"<b>%s</b> wishes to receive the latest information for the following "
+"assigned task:"
 msgstr "<b>%s</b> 希望收到下列指派工作的最新資訊："
 
 #: ../plugins/itip-formatter/itip-view.c:438
@@ -18001,7 +18008,9 @@ msgid "Itip Formatter"
 msgstr "Itip 格式器"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
-msgid "&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate &quot;{1}&quot; ?"
+msgid ""
+"&quot;{0}&quot; has delegated the meeting. Do you want to add the delegate "
+"&quot;{1}&quot; ?"
 msgstr "「{0}」已代理此會議。您是否要加入代理人「{1}」？"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
@@ -18009,7 +18018,8 @@ msgid "This meeting has been delegated"
 msgstr "這個會議已委派"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.error.xml.h:4
-msgid "This response is not from a current attendee. Add the sender as an attendee?"
+msgid ""
+"This response is not from a current attendee. Add the sender as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將寄件人加入為到會者？"
 
 #: ../plugins/mail-account-disable/mail-account-disable.c:47
@@ -18046,7 +18056,8 @@ msgid "No store available"
 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."
+msgid ""
+"A plugin which implements a CORBA interface for accessing mail data remotely."
 msgstr "實作 CORBA 介面以存取遠端郵件資料的外掛程式。"
 
 #: ../plugins/mail-remote/org-gnome-evolution-mail-remote.eplug.xml.h:2
@@ -18054,7 +18065,9 @@ msgid "Mail Remote"
 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."
+msgid ""
+"A plugin which allows the creation of meetings from the contents of a mail "
+"message."
 msgstr "可以從郵件訊息的內容建立會議的外掛程式。"
 
 #: ../plugins/mail-to-meeting/org-gnome-mail-to-meeting.eplug.xml.h:2
@@ -18066,7 +18079,9 @@ msgid "Mail to meeting"
 msgstr "寄信到會議"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
-msgid "A plugin which allows the creation of tasks from the contents of a mail message."
+msgid ""
+"A plugin which allows the creation of tasks from the contents of a mail "
+"message."
 msgstr "可以從郵件訊息的內容建立工作的外掛程式。"
 
 #: ../plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
@@ -18111,7 +18126,9 @@ msgid "Mailing _List"
 msgstr "通信論壇(_L)"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:6
-msgid "Provide actions for common mailing list commands (subscribe, unsubscribe, ...)."
+msgid ""
+"Provide actions for common mailing list commands (subscribe, "
+"unsubscribe, ...)."
 msgstr "提供一般通信論壇指令的動作 （訂閱、取消訂閱…）。"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.eplug.xml.h:7
@@ -18136,11 +18153,14 @@ msgstr "無法使用動作"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:2
 msgid ""
-"An e-mail message will be sent to the URL \"{0}\". You can either send the message automatically, or see and change it first.\n"
+"An e-mail message will be sent to the URL \"{0}\". You can either send the "
+"message automatically, or see and change it first.\n"
 "\n"
-"You should receive an answer from the mailing list shortly after the message has been sent."
+"You should receive an answer from the mailing list shortly after the message "
+"has been sent."
 msgstr ""
-"即將寄出一封電子郵件至 URL \"{0}\"。您可以自動送出郵件，或是先查看並做些改變。\n"
+"即將寄出一封電子郵件至 URL \"{0}\"。您可以自動送出郵件，或是先查看並做些改"
+"變。\n"
 "\n"
 "在這封郵件送出後不久您應該會收到來自通信論壇的回應。"
 
@@ -18162,8 +18182,12 @@ msgid "Posting not allowed"
 msgstr "不允許張貼"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:8
-msgid "Posting to this mailing list is not allowed. Possibly, this is a read-only mailing list. Contact the list owner for details."
-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 ""
+"對此通信論壇的張貼是不被允許的。這可能是一個唯讀的通信論壇。請連絡論壇的管理"
+"者以取得進一步資訊。"
 
 # ui/evolution-contact-editor.xml.h:13
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:9
@@ -18172,7 +18196,8 @@ msgstr "傳送郵件到通信論壇？"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:10
 msgid ""
-"The action could not be performed. This means the header for this action did not contain any action we could handle.\n"
+"The action could not be performed. This means the header for this action did "
+"not contain any action we could handle.\n"
 "\n"
 "Header: {0}"
 msgstr ""
@@ -18191,7 +18216,9 @@ msgstr ""
 "檔頭： {1}"
 
 #: ../plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:16
-msgid "This message does not contain the header information required for this action."
+msgid ""
+"This message does not contain the header information required for this "
+"action."
 msgstr "這封郵件沒有包含此動作所需的檔頭資訊"
 
 # mail/mail-ops.c:603
@@ -18347,7 +18374,8 @@ msgstr "外掛程式"
 
 #: ../plugins/prefer-plain/org-gnome-prefer-plain.eplug.xml.h:1
 msgid ""
-"A test plugin which demonstrates a formatter plugin which lets you choose to disable HTML messages.\n"
+"A test plugin which demonstrates a formatter plugin which lets you choose to "
+"disable HTML messages.\n"
 "\n"
 "This plugin is unsupported demonstration code only.\n"
 msgstr ""
@@ -18386,10 +18414,8 @@ msgid "Gives an option to print mail from composer"
 msgstr "提供自郵件編輯器列印郵件的選項"
 
 #: ../plugins/print-message/org-gnome-print-message.xml.h:1
-#: ../ui/evolution-addressbook.xml.h:18
-#: ../ui/evolution-calendar.xml.h:19
-#: ../ui/evolution-mail-message.xml.h:76
-#: ../ui/evolution-memos.xml.h:12
+#: ../ui/evolution-addressbook.xml.h:27 ../ui/evolution-calendar.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:75 ../ui/evolution-memos.xml.h:12
 #: ../ui/evolution-tasks.xml.h:15
 msgid "Print Pre_view"
 msgstr "預覽列印(_V)"
@@ -18432,7 +18458,7 @@ msgstr "發佈行事曆資訊(_P)"
 
 # mail/mail-accounts.c:280
 # mail/mail-accounts.c:284
-#: ../plugins/publish-calendar/publish-calendar.c:372
+#: ../plugins/publish-calendar/publish-calendar.c:386
 msgid "Are you sure you want to remove this URL?"
 msgstr "確定要移除此 URL？"
 
@@ -18508,7 +18534,9 @@ msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (內建)"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:1
-msgid "Filters junk messages using Spamassassin. This plugin requires Spamassassin to be installed."
+msgid ""
+"Filters junk messages using Spamassassin. This plugin requires Spamassassin "
+"to be installed."
 msgstr "使用 Spamassassin 過濾垃圾郵件。這個外掛程式需要安裝 Spamassassin。"
 
 #: ../plugins/sa-junk-plugin/org-gnome-sa-junk-plugin.eplug.xml.h:2
@@ -18520,8 +18548,7 @@ 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
+#: ../plugins/save-attachments/org-gnome-save-attachments.eplug.xml.h:2
 msgid "Save attachments"
 msgstr "儲存附加檔案"
 
@@ -18547,8 +18574,8 @@ msgid "MIME Type"
 msgstr "MIME 類型"
 
 #: ../plugins/save-attachments/save-attachments.c:366
-#: ../ui/evolution-editor.xml.h:11
-#: ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-editor.xml.h:11 ../ui/evolution-message-composer.xml.h:19
+#: ../ui/evolution-signature-editor.xml.h:7
 msgid "Save"
 msgstr "儲存"
 
@@ -18714,7 +18741,8 @@ msgstr "歡迎使用"
 
 #: ../plugins/startup-wizard/startup-wizard.c:89
 msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect to your email accounts, and to import files from other applications. \n"
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications. \n"
 "\n"
 "Please click the \"Forward\" button to continue. "
 msgstr ""
@@ -18813,7 +18841,8 @@ msgid "Last upgraded configuration version"
 msgstr "上次升級的組態版本"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:8
-msgid "List of paths for the folders to be synchronized to disk for offline usage"
+msgid ""
+"List of paths for the folders to be synchronized to disk for offline usage"
 msgstr "要同步至磁碟的資料夾，其路徑清單 (供離線使用)"
 
 # ui/evolution-event-editor.xml.h:9
@@ -18826,13 +18855,13 @@ msgstr "印表機設定"
 msgid "Skip development warning dialog"
 msgstr "忽略開發警告對話方塊"
 
-#: ../shell/apps_evolution_shell.schemas.in.in.h:11
-#: ../shell/main.c:473
+#: ../shell/apps_evolution_shell.schemas.in.in.h:11 ../shell/main.c:473
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "The configuration version of Evolution, with major/minor/configuration level"
+msgid ""
+"The configuration version of Evolution, with major/minor/configuration level"
 msgstr "Evolution 的組態版本，以 major/minor/configuration 層級表示"
 
 # ui/evolution.xml.h:32
@@ -18851,12 +18880,19 @@ msgid "The default width for the sidebar, in pixels."
 msgstr "資訊方塊列的預設寬度，以像素計。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "The last upgraded configuration version of Evolution, with major/minor/configuration level"
+msgid ""
+"The last upgraded configuration version of Evolution, with major/minor/"
+"configuration level"
 msgstr "上次升級的 Evolution 組態版本，以 major/minor/configuration 層級表示"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:17
-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 工具列設定值決定。"
+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 工具列設定值決定。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:18
 msgid "Toolbar is visible"
@@ -18871,7 +18907,8 @@ msgid "Whether the toolbar should be visible."
 msgstr "是否可以看到工具列。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether the warning dialog in development versions of Evolution is skipped."
+msgid ""
+"Whether the warning dialog in development versions of Evolution is skipped."
 msgstr "是否省略 Evulution 開發版本的警告對話方塊。"
 
 #: ../shell/apps_evolution_shell.schemas.in.in.h:22
@@ -18914,9 +18951,11 @@ msgstr "選擇匯入服務要執行的類型："
 # shell/e-shell-importer.c:97
 #: ../shell/e-shell-importer.c:138
 msgid ""
-"Choose the file that you want to import into Evolution, and select what type of file it is from the list.\n"
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list.\n"
 "\n"
-"You can select \"Automatic\" if you do not know, and Evolution will attempt to work it out."
+"You can select \"Automatic\" if you do not know, and Evolution will attempt "
+"to work it out."
 msgstr ""
 "選取要匯入 Evolution 的檔案，並且在清單內選定檔案類型。\n"
 "\n"
@@ -18965,8 +19004,8 @@ msgstr "匯入單一檔案(_S)"
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
 #: ../shell/e-shell-settings-dialog.c:318
-msgid "Evolution Settings"
-msgstr "Evolution 設定值"
+msgid "Evolution Preferences"
+msgstr "Evolution 偏好設定"
 
 # camel/camel-pgp-context.c:1073
 #: ../shell/e-shell-utils.c:118
@@ -19033,8 +19072,7 @@ msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: ../shell/e-shell-window-commands.c:788
-#: ../ui/evolution.xml.h:52
+#: ../shell/e-shell-window-commands.c:788 ../ui/evolution.xml.h:49
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19068,15 +19106,13 @@ msgid "Uknown system error."
 msgstr "不明的系統錯誤。"
 
 # calendar/gui/e-week-view-main-item.c:342
-#: ../shell/e-shell.c:831
-#: ../shell/e-shell.c:832
+#: ../shell/e-shell.c:831 ../shell/e-shell.c:832
 #, c-format
 msgid "%ld KB"
 msgstr "%ld KB"
 
 # widgets/misc/e-cell-date-edit.c:245
-#: ../shell/e-shell.c:1269
-#: ../widgets/misc/e-cell-date-edit.c:257
+#: ../shell/e-shell.c:1269 ../widgets/misc/e-cell-date-edit.c:257
 msgid "OK"
 msgstr "確認"
 
@@ -19269,8 +19305,11 @@ msgid "Evolution can not start."
 msgstr "Evolution 無法啟動。"
 
 #: ../shell/shell.error.xml.h:5
-msgid "Forgetting your passwords will clear all remembered passwords. You will be reprompted next time they are needed."
-msgstr "遺忘您的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示您輸入。"
+msgid ""
+"Forgetting your passwords will clear all remembered passwords. You will be "
+"reprompted next time they are needed."
+msgstr ""
+"遺忘您的密碼會刪除所有已記憶的密碼。在下次需要使用密碼時將會提示您輸入。"
 
 #: ../shell/shell.error.xml.h:7
 msgid "Insufficient disk space for upgrade."
@@ -19284,15 +19323,20 @@ msgstr "確定要刪除舊資料？"
 
 #: ../shell/shell.error.xml.h:9
 msgid ""
-"The entire contents of the &quot;evolution&quot; directory are about to be permanently removed.\n"
+"The entire contents of the &quot;evolution&quot; directory are about to be "
+"permanently removed.\n"
 "\n"
-"It is suggested you manually verify that all of your mail, contact, and calendar data is present, and that this version of Evolution operates correctly before deleting this old data.\n"
+"It is suggested you manually verify that all of your mail, contact, and "
+"calendar data is present, and that this version of Evolution operates "
+"correctly before deleting this old data.\n"
 "\n"
-"Once deleted, you cannot downgrade to the previous version of Evolution without manual intervention.\n"
+"Once deleted, you cannot downgrade to the previous version of Evolution "
+"without manual intervention.\n"
 msgstr ""
 "「evolution」目錄的所有內容即將永久移除。\n"
 "\n"
-"建議您手動檢查所有的電子郵件、連絡人和行事曆資料是否顯示，而且此 Evolution 版本在刪除舊資料前能正確作業。\n"
+"建議您手動檢查所有的電子郵件、連絡人和行事曆資料是否顯示，而且此 Evolution 版"
+"本在刪除舊資料前能正確作業。\n"
 "\n"
 "刪除之後，未經手動操作，便無法降級至舊的 Evolution 版本。\n"
 
@@ -19300,11 +19344,15 @@ msgstr ""
 msgid ""
 "The previous version of evolution stored its data in a different location.\n"
 "\n"
-"If you choose to remove this data, the entire contents of the &quot;evolution&quot; directory will be removed permanently. If you choose to keep this data, then you may manually remove the contents of &quot;evolution&quot; at your convenience.\n"
+"If you choose to remove this data, the entire contents of the &quot;"
+"evolution&quot; directory will be removed permanently. If you choose to keep "
+"this data, then you may manually remove the contents of &quot;"
+"evolution&quot; at your convenience.\n"
 msgstr ""
 "舊的 Evolution 版本將其資料儲存在不同的位置。\n"
 "\n"
-"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資料，就可以在方便的時候，手動移除「evolution」的內容。\n"
+"如果選擇移除此資料，將會永久移除「evolution」目錄的所有內容。如果選擇保留此資"
+"料，就可以在方便的時候，手動移除「evolution」的內容。\n"
 
 #: ../shell/shell.error.xml.h:19
 msgid "Upgrade from previous version failed: {0}"
@@ -19312,9 +19360,11 @@ msgstr "從以前的版本升級失敗：{0}"
 
 #: ../shell/shell.error.xml.h:20
 msgid ""
-"Upgrading your data and settings will require upto {0} of disk space, but you only have {1} available.\n"
+"Upgrading your data and settings will require upto {0} of disk space, but "
+"you only have {1} available.\n"
 "\n"
-"You will need to make more space available in your home directory before you can continue."
+"You will need to make more space available in your home directory before you "
+"can continue."
 msgstr ""
 "升級您的資料和設定值最多會需要 {0} 磁碟空間，但是您只有 {1} 可用。\n"
 "\n"
@@ -19361,7 +19411,8 @@ msgstr "稍後提醒我(_R)"
 msgid ""
 "{1}\n"
 "\n"
-"If you choose to continue, you may not have access to some of your old data.\n"
+"If you choose to continue, you may not have access to some of your old "
+"data.\n"
 msgstr ""
 "{1}\n"
 "\n"
@@ -19379,12 +19430,22 @@ msgstr ""
 "編輯信任設定值："
 
 #: ../smime/gui/cert-trust-dialog.c:153
-msgid "Because you trust the certificate authority that issued this certificate, then you trust the authenticity of this certificate unless otherwise indicated here"
-msgstr "因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效性。"
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+"因為您信任發出此憑證的憑證單位，所以除非在此指示，否則您將信任此憑證的有效"
+"性。"
 
 #: ../smime/gui/cert-trust-dialog.c:157
-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 "因為您不信任發出此憑證的憑證單位，所以除非在此指示，否則您將不信任此憑證的有效性。"
+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 ""
+"因為您不信任發出此憑證的憑證單位，所以除非在此指示，否則您將不信任此憑證的有"
+"效性。"
 
 # mail/mail-account-gui.c:682
 #: ../smime/gui/certificate-manager.c:136
@@ -19408,8 +19469,7 @@ msgstr "憑證名稱"
 msgid "Purposes"
 msgstr "用途"
 
-#: ../smime/gui/certificate-manager.c:285
-#: ../smime/gui/smime-ui.glade.h:37
+#: ../smime/gui/certificate-manager.c:285 ../smime/gui/smime-ui.glade.h:37
 #: ../smime/lib/e-cert.c:570
 msgid "Serial Number"
 msgstr "序號"
@@ -19526,11 +19586,13 @@ msgid "Backup All"
 msgstr "全部備份"
 
 #: ../smime/gui/smime-ui.glade.h:13
-msgid "Before trusting this CA for any purpose, you should examine its certificate and its policy and procedures (if available)."
-msgstr "信任此 CA 的任何用途前，您應該檢查它的憑證以及它的政策和程序 (如果可以的話)。"
+msgid ""
+"Before trusting this CA for any purpose, you should examine its certificate "
+"and its policy and procedures (if available)."
+msgstr ""
+"信任此 CA 的任何用途前，您應該檢查它的憑證以及它的政策和程序 (如果可以的話)。"
 
-#: ../smime/gui/smime-ui.glade.h:14
-#: ../smime/lib/e-cert.c:1077
+#: ../smime/gui/smime-ui.glade.h:14 ../smime/lib/e-cert.c:1077
 msgid "Certificate"
 msgstr "憑證"
 
@@ -19620,13 +19682,11 @@ msgstr "組織單位 (OU)"
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 指紋"
 
-#: ../smime/gui/smime-ui.glade.h:35
-#: ../smime/lib/e-cert.c:819
+#: ../smime/gui/smime-ui.glade.h:35 ../smime/lib/e-cert.c:819
 msgid "SSL Client Certificate"
 msgstr "SSL 用戶端憑證"
 
-#: ../smime/gui/smime-ui.glade.h:36
-#: ../smime/lib/e-cert.c:823
+#: ../smime/gui/smime-ui.glade.h:36 ../smime/lib/e-cert.c:823
 msgid "SSL Server Certificate"
 msgstr "SSL 伺服器憑證"
 
@@ -19659,7 +19719,8 @@ msgid "You have certificates from these organizations that identify you:"
 msgstr "您已經從可以識別您身份的組織取得憑證:"
 
 #: ../smime/gui/smime-ui.glade.h:44
-msgid "You have certificates on file that identify these certificate authorities:"
+msgid ""
+"You have certificates on file that identify these certificate authorities:"
 msgstr "您已經擁有檔案的相關憑證，可以識別這些憑證單位:"
 
 #: ../smime/gui/smime-ui.glade.h:45
@@ -19684,8 +19745,7 @@ msgstr "憑證已經存在"
 # 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
+#: ../smime/lib/e-cert.c:239 ../smime/lib/e-cert.c:249
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -19769,13 +19829,11 @@ msgid "Subject's Public Key"
 msgstr "主旨的公鑰"
 
 # camel/camel-filter-driver.c:652
-#: ../smime/lib/e-cert.c:810
-#: ../smime/lib/e-cert.c:859
+#: ../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
+#: ../smime/lib/e-cert.c:831 ../smime/lib/e-cert.c:843
 msgid "Object Signer"
 msgstr "物件簽名者"
 
@@ -19824,8 +19882,7 @@ msgstr "CRL 簽名者"
 msgid "Critical"
 msgstr "重要"
 
-#: ../smime/lib/e-cert.c:941
-#: ../smime/lib/e-cert.c:944
+#: ../smime/lib/e-cert.c:941 ../smime/lib/e-cert.c:944
 msgid "Not Critical"
 msgstr "不重要"
 
@@ -19839,8 +19896,7 @@ msgid "%s = %s"
 msgstr "%s = %s"
 
 # mail/mail-crypto.c:59
-#: ../smime/lib/e-cert.c:1092
-#: ../smime/lib/e-cert.c:1212
+#: ../smime/lib/e-cert.c:1092 ../smime/lib/e-cert.c:1212
 msgid "Certificate Signature Algorithm"
 msgstr "憑證簽名演算法"
 
@@ -19916,160 +19972,261 @@ 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:2
+#: ../ui/evolution-addressbook.xml.h:5
 msgid "Contact _Preview"
 msgstr "連絡人預覽(_P)"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-addressbook.xml.h:4
+#: ../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:5
-#: ../ui/evolution-calendar.xml.h:2
+#: ../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:6
+#: ../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:7
-#: ../ui/evolution-composer-entries.xml.h:5
-#: ../ui/evolution-memos.xml.h:4
+#: ../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:8
-#: ../ui/evolution-calendar.xml.h:3
+#: ../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:10
+#: ../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:11
+#: ../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:12
+#: ../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:13
+#: ../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:14
-#: ../ui/evolution-composer-entries.xml.h:8
-#: ../ui/evolution-memos.xml.h:8
+#: ../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:15
-#: ../ui/evolution-calendar.xml.h:15
+#: ../ui/evolution-addressbook.xml.h:24 ../ui/evolution-calendar.xml.h:15
 msgid "Paste the clipboard"
 msgstr "貼上剪貼簿"
 
 # ui/evolution-calendar.xml.h:22
-#: ../ui/evolution-addressbook.xml.h:16
+#: ../ui/evolution-addressbook.xml.h:25
 msgid "Previews the contacts to be printed"
 msgstr "預覽將要列印的連絡人"
 
 # ui/evolution-addressbook.xml.h:11
-#: ../ui/evolution-addressbook.xml.h:19
+#: ../ui/evolution-addressbook.xml.h:28
 msgid "Print selected contacts"
 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:21
+#: ../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:22
-#: ../widgets/text/e-text.c:2712
+#: ../ui/evolution-addressbook.xml.h:34 ../widgets/text/e-text.c:2712
 msgid "Select All"
 msgstr "全選"
 
+#: ../ui/evolution-addressbook.xml.h:35
+#: ../ui/evolution-composer-entries.xml.h:11 ../ui/evolution-editor.xml.h:12
+#: ../ui/evolution-subscribe.xml.h:6
+msgid "Select _All"
+msgstr "全選(_A)"
+
 # ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-addressbook.xml.h:23
+#: ../ui/evolution-addressbook.xml.h:36
 msgid "Select all contacts"
 msgstr "選擇全部連絡人"
 
 # calendar/gui/e-calendar-table.c:714
-#: ../ui/evolution-addressbook.xml.h:24
+#: ../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:25
+#: ../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:26
+#: ../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:27
+#: ../ui/evolution-addressbook.xml.h:40
 msgid "Show contact preview window"
 msgstr "顯示連絡人預覽視窗"
 
 # ui/evolution-addressbook.xml.h:12
-#: ../ui/evolution-addressbook.xml.h:28
+#: ../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:29
+#: ../ui/evolution-addressbook.xml.h:43
 msgid "Stop Loading"
 msgstr "停止載入"
 
-#: ../ui/evolution-addressbook.xml.h:30
+#: ../ui/evolution-addressbook.xml.h:44
 msgid "View the current contact"
 msgstr "檢視目前的連絡人"
 
-#: ../ui/evolution-addressbook.xml.h:31
-#: ../ui/evolution-calendar.xml.h:36
-#: ../ui/evolution-tasks.xml.h:21
+#: ../ui/evolution-addressbook.xml.h:45 ../ui/evolution-calendar.xml.h:36
+#: ../ui/evolution-mail-list.xml.h:29 ../ui/evolution-tasks.xml.h:21
 msgid "_Actions"
 msgstr "執行(_A)"
 
-#: ../ui/evolution-addressbook.xml.h:36
+# calendar/gui/e-calendar-table.c:714
+#: ../ui/evolution-addressbook.xml.h:47
+msgid "_Copy Contact to..."
+msgstr "複製連絡人到(_C)..."
+
+#: ../ui/evolution-addressbook.xml.h:48
+msgid "_Copy Folder Contacts To"
+msgstr "複製資料夾連絡人到(_C)"
+
+#: ../ui/evolution-addressbook.xml.h:50
+msgid "_Delete Contact"
+msgstr "刪除連絡人(_D)"
+
+#: ../ui/evolution-addressbook.xml.h:52
 msgid "_Forward Contact..."
 msgstr "轉寄連絡人(_F)..."
 
-# ui/evolution-event-editor.xml.h:72
-# ui/evolution-task-editor-dialog.xml.h:86
-#: ../ui/evolution-addressbook.xml.h:42
-msgid "_Select All"
-msgstr "全選(_S)"
+#: ../ui/evolution-addressbook.xml.h:53
+msgid "_Move Contact to..."
+msgstr "將連絡人移到(_M)..."
 
-#: ../ui/evolution-addressbook.xml.h:43
+#: ../ui/evolution-addressbook.xml.h:54
+msgid "_Move Folder Contacts To"
+msgstr "將資料夾連絡人移到(_M)"
+
+#: ../ui/evolution-addressbook.xml.h:55 ../ui/evolution.xml.h:40
+msgid "_New"
+msgstr "新增(_N)"
+
+#: ../ui/evolution-addressbook.xml.h:60
+msgid "_Rename"
+msgstr "重新命名(_R)"
+
+#: ../ui/evolution-addressbook.xml.h:61
+msgid "_Save Contact as VCard..."
+msgstr "將連絡人儲存為 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)..."
 
@@ -20124,8 +20281,7 @@ msgstr "月"
 # 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:14
-#: ../ui/evolution-mail-message.xml.h:58
+#: ../ui/evolution-calendar.xml.h:14 ../ui/evolution-mail-message.xml.h:57
 msgid "Next"
 msgstr "下一個"
 
@@ -20138,8 +20294,7 @@ msgstr "預覽將要列印的行事曆內容"
 # 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:17
-#: ../ui/evolution-mail-message.xml.h:74
+#: ../ui/evolution-calendar.xml.h:17 ../ui/evolution-mail-message.xml.h:73
 msgid "Previous"
 msgstr "上一個"
 
@@ -20148,8 +20303,7 @@ msgstr "上一個"
 msgid "Print this calendar"
 msgstr "列印這個行事曆"
 
-#: ../ui/evolution-calendar.xml.h:21
-#: ../ui/evolution-tasks.xml.h:17
+#: ../ui/evolution-calendar.xml.h:21 ../ui/evolution-tasks.xml.h:17
 msgid "Purg_e"
 msgstr "清除(_E)"
 
@@ -20220,8 +20374,7 @@ msgid "_Open Appointment"
 msgstr "開啟約會(_O)"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-composer-entries.xml.h:2
-#: ../ui/evolution-editor.xml.h:7
+#: ../ui/evolution-composer-entries.xml.h:2 ../ui/evolution-editor.xml.h:7
 msgid "Copy selected text to the clipboard"
 msgstr "複製選取的文字至剪貼簿"
 
@@ -20232,8 +20385,7 @@ 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
+#: ../ui/evolution-composer-entries.xml.h:6 ../ui/evolution-editor.xml.h:9
 msgid "Cut selected text to the clipboard"
 msgstr "剪下選取的文字至剪貼簿"
 
@@ -20251,26 +20403,17 @@ 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:10
+#: ../ui/evolution-composer-entries.xml.h:10 ../ui/evolution-editor.xml.h:10
 msgid "Paste text from the clipboard"
 msgstr "從剪貼簿貼上文字"
 
-#: ../ui/evolution-composer-entries.xml.h:11
-#: ../ui/evolution-editor.xml.h:12
-#: ../ui/evolution-subscribe.xml.h:6
-msgid "Select _All"
-msgstr "全選(_A)"
-
 # ui/evolution-addressbook.xml.h:15
-#: ../ui/evolution-composer-entries.xml.h:12
-#: ../ui/evolution-editor.xml.h:13
+#: ../ui/evolution-composer-entries.xml.h:12 ../ui/evolution-editor.xml.h:13
 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
+#: ../ui/evolution-editor.xml.h:1 ../ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附加"
 
@@ -20301,41 +20444,29 @@ msgstr "按這裡以檢視可用的說明"
 # 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"
-#. accel="*Ctrl*s"/>
-#.
-#: ../ui/evolution-editor.xml.h:6
-#: ../ui/evolution-mail-messagedisplay.xml.h:1
+#: ../ui/evolution-editor.xml.h:6 ../ui/evolution-mail-messagedisplay.xml.h:1
 #: ../ui/evolution-message-composer.xml.h:3
-#: ../ui/evolution-signature-editor.xml.h:7
+#: ../ui/evolution-signature-editor.xml.h:2
 msgid "Close"
 msgstr "關閉"
 
-#: ../ui/evolution-editor.xml.h:14
-#: ../ui/evolution-message-composer.xml.h:41
+#: ../ui/evolution-editor.xml.h:14 ../ui/evolution-message-composer.xml.h:41
 msgid "_Attachment..."
 msgstr "附件(_A)..."
 
-#: ../ui/evolution-editor.xml.h:15
-#: ../ui/evolution-mail-messagedisplay.xml.h:4
-#: ../ui/evolution-message-composer.xml.h:44
-#: ../ui/evolution-subscribe.xml.h:9
+#: ../ui/evolution-editor.xml.h:15 ../ui/evolution-mail-messagedisplay.xml.h:4
+#: ../ui/evolution-message-composer.xml.h:44 ../ui/evolution-subscribe.xml.h:9
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: ../ui/evolution-editor.xml.h:18
-#: ../ui/evolution-mail-messagedisplay.xml.h:6
+#: ../ui/evolution-editor.xml.h:18 ../ui/evolution-mail-messagedisplay.xml.h:6
 #: ../ui/evolution-message-composer.xml.h:47
-#: ../ui/evolution-signature-editor.xml.h:25
-#: ../ui/evolution-subscribe.xml.h:11
-#: ../ui/evolution.xml.h:39
+#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-subscribe.xml.h:11 ../ui/evolution.xml.h:35
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: ../ui/evolution-editor.xml.h:19
-#: ../ui/evolution.xml.h:40
+#: ../ui/evolution-editor.xml.h:19 ../ui/evolution.xml.h:37
 msgid "_Help"
 msgstr "求助(_H)"
 
@@ -20347,120 +20478,108 @@ msgstr "插入(_I)"
 msgid "_Options"
 msgstr "選項(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:2
+# calendar/gui/e-calendar-table.c:162
+#: ../ui/evolution-event-editor.xml.h:1
+msgid "Alar_ms"
+msgstr "鬧鈴(_M)"
+
+#: ../ui/evolution-event-editor.xml.h:3
 msgid "All day Event"
 msgstr "全天事件"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../ui/evolution-event-editor.xml.h:3
-#: ../ui/evolution-task-editor.xml.h:1
+#: ../ui/evolution-event-editor.xml.h:4 ../ui/evolution-task-editor.xml.h:1
 msgid "Classify as Confidential"
 msgstr "分類為機密"
 
-#: ../ui/evolution-event-editor.xml.h:4
-#: ../ui/evolution-task-editor.xml.h:2
+#: ../ui/evolution-event-editor.xml.h:5 ../ui/evolution-task-editor.xml.h:2
 msgid "Classify as Private"
 msgstr "分類為私人"
 
-#: ../ui/evolution-event-editor.xml.h:5
-#: ../ui/evolution-task-editor.xml.h:3
+#: ../ui/evolution-event-editor.xml.h:6 ../ui/evolution-task-editor.xml.h:3
 msgid "Classify as public"
 msgstr "分類為公開"
 
-#: ../ui/evolution-event-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:7
 msgid "Click here to set or unset alarms for this event"
 msgstr "按這裡以設定或取消這個事件的鬧鈴"
 
-#: ../ui/evolution-event-editor.xml.h:8
-#: ../ui/evolution-task-editor.xml.h:5
+#: ../ui/evolution-event-editor.xml.h:9 ../ui/evolution-task-editor.xml.h:5
 msgid "Insert advanced send options"
 msgstr "插入進階傳送選項"
 
 # calendar/gui/e-day-view.c:3175
 # calendar/gui/e-week-view.c:3309
-#: ../ui/evolution-event-editor.xml.h:9
+#: ../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:10
-#: ../ui/evolution-task-editor.xml.h:6
+#: ../ui/evolution-event-editor.xml.h:11 ../ui/evolution-task-editor.xml.h:6
 msgid "Pu_blic"
 msgstr "公開(_B)"
 
-#: ../ui/evolution-event-editor.xml.h:11
+#: ../ui/evolution-event-editor.xml.h:12
 msgid "Query free / busy information for the attendees"
 msgstr "查詢此到會者的空閒/忙碌資訊"
 
-#: ../ui/evolution-event-editor.xml.h:12
-#: ../ui/evolution-task-editor.xml.h:7
+#: ../ui/evolution-event-editor.xml.h:13 ../ui/evolution-task-editor.xml.h:7
 msgid "R_ole Field"
 msgstr "角色欄位(_O)"
 
-#: ../ui/evolution-event-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:16
 msgid "Show time as b_usy"
 msgstr "顯示時間為忙碌(_U)"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../ui/evolution-event-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:17 ../ui/evolution-task-editor.xml.h:11
 msgid "Time _Zone"
 msgstr "時區(_Z)"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:17
-#: ../ui/evolution-task-editor.xml.h:12
+#: ../ui/evolution-event-editor.xml.h:18 ../ui/evolution-task-editor.xml.h:12
 msgid "Toggles whether the Attendee Type field is displayed"
 msgstr "切換是否顯示「到會者類型」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:18
-#: ../ui/evolution-task-editor.xml.h:13
+#: ../ui/evolution-event-editor.xml.h:19 ../ui/evolution-task-editor.xml.h:13
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "切換是否顯示「RSVP」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:19
-#: ../ui/evolution-task-editor.xml.h:14
+#: ../ui/evolution-event-editor.xml.h:20 ../ui/evolution-task-editor.xml.h:14
 msgid "Toggles whether the Role field is displayed"
 msgstr "切換是否顯示「角色」欄位"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:20
-#: ../ui/evolution-task-editor.xml.h:15
+#: ../ui/evolution-event-editor.xml.h:21 ../ui/evolution-task-editor.xml.h:15
 msgid "Toggles whether the Status field is displayed"
 msgstr "切換是否顯示「狀態」欄位"
 
 # ui/evolution-message-composer.xml.h:39
-#: ../ui/evolution-event-editor.xml.h:21
-#: ../ui/evolution-task-editor.xml.h:16
+#: ../ui/evolution-event-editor.xml.h:22 ../ui/evolution-task-editor.xml.h:16
 msgid "Toggles whether the time zone is displayed"
 msgstr "切換是否顯示「時區」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:22
-#: ../ui/evolution-task-editor.xml.h:17
+#: ../ui/evolution-event-editor.xml.h:23 ../ui/evolution-task-editor.xml.h:17
 msgid "Toggles whether to display categories"
 msgstr "切換是否顯示「分類」"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:23
+#: ../ui/evolution-event-editor.xml.h:24
 msgid "Toggles whether to have All day Event"
 msgstr "切換是否要有全天事件"
 
 # ui/evolution-message-composer.xml.h:38
-#: ../ui/evolution-event-editor.xml.h:24
+#: ../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:25
-msgid "_Alarms"
-msgstr "鬧鈴(_A)"
-
 #: ../ui/evolution-event-editor.xml.h:26
 msgid "_All day Event"
 msgstr "全天事件(_A)"
@@ -20468,39 +20587,43 @@ msgstr "全天事件(_A)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
-#: ../ui/evolution-event-editor.xml.h:28
-#: ../ui/evolution-task-editor.xml.h:19
+#: ../ui/evolution-event-editor.xml.h:28 ../ui/evolution-task-editor.xml.h:19
 msgid "_Classification"
 msgstr "分類(_C)"
 
 # calendar/gui/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: ../ui/evolution-event-editor.xml.h:29
-#: ../ui/evolution-task-editor.xml.h:20
+#: ../ui/evolution-event-editor.xml.h:29 ../ui/evolution-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:30
-#: ../ui/evolution-task-editor.xml.h:21
+#: ../ui/evolution-event-editor.xml.h:31 ../ui/evolution-task-editor.xml.h:21
 msgid "_Private"
 msgstr "私人(_P)"
 
-#: ../ui/evolution-event-editor.xml.h:31
-#: ../ui/evolution-task-editor.xml.h:22
+#: ../ui/evolution-event-editor.xml.h:32 ../ui/evolution-task-editor.xml.h:22
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../ui/evolution-event-editor.xml.h:32
-#: ../ui/evolution-task-editor.xml.h:24
+# calendar/gui/event-editor-dialog.glade.h:18
+#: ../ui/evolution-event-editor.xml.h:33
+msgid "_Recurrence"
+msgstr "週期性(_R)"
+
+#: ../ui/evolution-event-editor.xml.h:34 ../ui/evolution-task-editor.xml.h:25
 msgid "_Status Field"
 msgstr "狀態欄位(_S)"
 
-#: ../ui/evolution-event-editor.xml.h:33
-#: ../ui/evolution-task-editor.xml.h:25
+#: ../ui/evolution-event-editor.xml.h:35 ../ui/evolution-task-editor.xml.h:26
 msgid "_Type Field"
 msgstr "類型欄位(_T)"
 
@@ -20533,23 +20656,26 @@ msgstr "為新郵件建立或編輯過濾規則"
 msgid "Empty _Trash"
 msgstr "清空垃圾桶(_T)"
 
-#: ../ui/evolution-mail-global.xml.h:8
-#: ../ui/evolution-mail-list.xml.h:11
+#: ../ui/evolution-mail-global.xml.h:8 ../ui/evolution-mail-list.xml.h:10
 #: ../ui/evolution-subscribe.xml.h:2
 msgid "F_older"
 msgstr "資料夾(_O)"
 
+# views/mail/galview.xml.h:4
 #: ../ui/evolution-mail-global.xml.h:9
+msgid "Message _List As"
+msgstr "將郵件排列為(_L)"
+
+#: ../ui/evolution-mail-global.xml.h:10
 msgid "Message _Preview"
 msgstr "郵件預覽(_P)"
 
 # ui/evolution-mail.xml.h:56
-#: ../ui/evolution-mail-global.xml.h:10
+#: ../ui/evolution-mail-global.xml.h:11
 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:12
 msgid "Permanently remove all deleted messages from all folders"
 msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
@@ -20581,14 +20707,16 @@ msgstr "郵件規則(_M)"
 msgid "_Move Folder To..."
 msgstr "移動資料夾到(_M)..."
 
+# mail/mail-account-gui.c:682
 #: ../ui/evolution-mail-global.xml.h:19
+msgid "_New Search _Folder (FIXME)"
+msgstr "新增搜尋資料夾(_N)"
+
+#: ../ui/evolution-mail-global.xml.h:20
 msgid "_New..."
 msgstr "新增(_N)..."
 
-#.
-#. <menuitem name="CreateVFolder" verb="CreateVFolder" _label="_New Search _Folder (FIXME)"/>
-#.
-#: ../ui/evolution-mail-global.xml.h:23
+#: ../ui/evolution-mail-global.xml.h:21
 msgid "_Subscriptions"
 msgstr "訂閱(_S)"
 
@@ -20612,115 +20740,112 @@ msgid "Collapse all message threads"
 msgstr "收摺所有的相關郵件"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-list.xml.h:5
-#: ../ui/evolution-mail-message.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:5 ../ui/evolution-mail-message.xml.h:11
 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
-#: ../ui/evolution-mail-message.xml.h:23
+#: ../ui/evolution-mail-list.xml.h:6 ../ui/evolution-mail-message.xml.h:22
 msgid "Cut selected message(s) to the clipboard"
 msgstr "將郵件剪下並貼到剪貼簿"
 
-#: ../ui/evolution-mail-list.xml.h:8
+#: ../ui/evolution-mail-list.xml.h:7
 msgid "E_xpand All Threads"
 msgstr "展開所有相關郵件(_X)"
 
-#: ../ui/evolution-mail-list.xml.h:9
+#: ../ui/evolution-mail-list.xml.h:8
 msgid "E_xpunge"
 msgstr "刪除(_X)"
 
 # ui/evolution-mail.xml.h:51
-#: ../ui/evolution-mail-list.xml.h:10
+#: ../ui/evolution-mail-list.xml.h:9
 msgid "Expand all message threads"
 msgstr "展開所有的相關郵件"
 
-#: ../ui/evolution-mail-list.xml.h:12
+#: ../ui/evolution-mail-list.xml.h:11
 msgid "Hide S_elected Messages"
 msgstr "隱藏選擇的郵件(_E)"
 
-#: ../ui/evolution-mail-list.xml.h:13
+#: ../ui/evolution-mail-list.xml.h:12
 msgid "Hide _Deleted Messages"
 msgstr "隱藏已刪除郵件(_D)"
 
-#: ../ui/evolution-mail-list.xml.h:14
+#: ../ui/evolution-mail-list.xml.h:13
 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"
+#: ../ui/evolution-mail-list.xml.h:14
+msgid ""
+"Hide deleted messages rather than displaying them with a line through them"
 msgstr "隱藏已刪除的郵件而非將它們以刪除線的形式顯示"
 
-#: ../ui/evolution-mail-list.xml.h:16
+#: ../ui/evolution-mail-list.xml.h:15
 msgid "Mar_k 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
-#: ../ui/evolution-mail-message.xml.h:67
+#: ../ui/evolution-mail-list.xml.h:16 ../ui/evolution-mail-message.xml.h:66
 msgid "Paste message(s) from the clipboard"
 msgstr "自剪貼簿貼上郵件"
 
 # ui/evolution-mail.xml.h:62
-#: ../ui/evolution-mail-list.xml.h:18
+#: ../ui/evolution-mail-list.xml.h:17
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "永久移除在這個資料夾內已刪除的郵件"
 
 # ui/evolution-mail.xml.h:62
-#: ../ui/evolution-mail-list.xml.h:19
+#: ../ui/evolution-mail-list.xml.h:18
 msgid "Permanently remove this folder"
 msgstr "永久移除這個資料夾"
 
-#: ../ui/evolution-mail-list.xml.h:20
+#: ../ui/evolution-mail-list.xml.h:19
 msgid "Select Message _Thread"
 msgstr "選擇郵件檔頭(_T)"
 
 # ui/evolution-mail.xml.h:80
-#: ../ui/evolution-mail-list.xml.h:21
+#: ../ui/evolution-mail-list.xml.h:20
 msgid "Select _All Messages"
 msgstr "選擇全部的郵件(_A)"
 
 # ui/evolution-mail.xml.h:78
-#: ../ui/evolution-mail-list.xml.h:22
+#: ../ui/evolution-mail-list.xml.h:21
 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
+#: ../ui/evolution-mail-list.xml.h:22
 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
+#: ../ui/evolution-mail-list.xml.h:23
 msgid "Select all visible messages"
 msgstr "選擇全部可見的郵件"
 
-#: ../ui/evolution-mail-list.xml.h:25
+#: ../ui/evolution-mail-list.xml.h:24
 msgid "Sh_ow Hidden Messages"
 msgstr "顯示隱藏的郵件(_O)"
 
 # ui/evolution-mail.xml.h:88
-#: ../ui/evolution-mail-list.xml.h:26
+#: ../ui/evolution-mail-list.xml.h:25
 msgid "Show messages that have been temporarily hidden"
 msgstr "顯示暫時隱藏的郵件"
 
 # ui/evolution-mail.xml.h:91
-#: ../ui/evolution-mail-list.xml.h:27
+#: ../ui/evolution-mail-list.xml.h:26
 msgid "Temporarily hide all messages that have already been read"
 msgstr "將已閱讀的郵件暫時隱藏"
 
 # ui/evolution-mail.xml.h:92
-#: ../ui/evolution-mail-list.xml.h:28
+#: ../ui/evolution-mail-list.xml.h:27
 msgid "Temporarily hide the selected messages"
 msgstr "將選定的郵件暫時隱藏"
 
 # ui/evolution-mail.xml.h:93
-#: ../ui/evolution-mail-list.xml.h:29
+#: ../ui/evolution-mail-list.xml.h:28
 msgid "Threaded Message list"
 msgstr "相關郵件清單"
 
@@ -20728,8 +20853,7 @@ msgstr "相關郵件清單"
 msgid "_Group By Threads"
 msgstr "依相關郵件為群組(_G)"
 
-#: ../ui/evolution-mail-list.xml.h:32
-#: ../ui/evolution-mail-message.xml.h:116
+#: ../ui/evolution-mail-list.xml.h:32 ../ui/evolution-mail-message.xml.h:115
 #: ../ui/evolution-mail-messagedisplay.xml.h:7
 msgid "_Message"
 msgstr "郵件(_M)"
@@ -20743,506 +20867,503 @@ msgid "A_pply Filters"
 msgstr "套用過濾器(_P)"
 
 # addressbook/gui/component/addressbook-config.c:662
-#. Alphabetical by name, yo
-#: ../ui/evolution-mail-message.xml.h:4
+#: ../ui/evolution-mail-message.xml.h:3
 msgid "Add Sender to Address Book"
 msgstr "新增寄件者至通訊錄"
 
-#: ../ui/evolution-mail-message.xml.h:5
+#: ../ui/evolution-mail-message.xml.h:4
 msgid "All Message _Headers"
 msgstr "所有郵件檔頭(_H)"
 
 # ui/evolution-mail.xml.h:1
-#: ../ui/evolution-mail-message.xml.h:6
+#: ../ui/evolution-mail-message.xml.h:5
 msgid "Apply filter rules to the selected messages"
 msgstr "套用過濾器規則於所選定的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:7
+#: ../ui/evolution-mail-message.xml.h:6
 msgid "Check for _Junk"
 msgstr "檢查垃圾郵件(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:8
+#: ../ui/evolution-mail-message.xml.h:7
 msgid "Compose _New Message"
 msgstr "撰寫新郵件(_N)"
 
 # ui/evolution-mail.xml.h:6
-#: ../ui/evolution-mail-message.xml.h:9
+#: ../ui/evolution-mail-message.xml.h:8
 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
+#: ../ui/evolution-mail-message.xml.h:9
 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
+#: ../ui/evolution-mail-message.xml.h:10
 msgid "Compose a reply to the sender of the selected message"
 msgstr "撰寫回郵給所選定的郵件的寄件者"
 
 # ui/evolution-mail.xml.h:9
-#: ../ui/evolution-mail-message.xml.h:13
+#: ../ui/evolution-mail-message.xml.h:12
 msgid "Copy selected messages to another folder"
 msgstr "複製已選定的郵件到另一個資料夾"
 
 # ui/evolution.xml.h:10
-#: ../ui/evolution-mail-message.xml.h:14
+#: ../ui/evolution-mail-message.xml.h:13
 msgid "Create R_ule"
 msgstr "建立規則(_U)"
 
 # ui/evolution-mail.xml.h:15
-#: ../ui/evolution-mail-message.xml.h:15
+#: ../ui/evolution-mail-message.xml.h:14
 msgid "Create a Search Folder for these recipients"
 msgstr "為這些收件者建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:16
-#: ../ui/evolution-mail-message.xml.h:16
+#: ../ui/evolution-mail-message.xml.h:15
 msgid "Create a Search Folder for this mailing list"
 msgstr "為這個通信論壇建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:17
-#: ../ui/evolution-mail-message.xml.h:17
+#: ../ui/evolution-mail-message.xml.h:16
 msgid "Create a Search Folder for this sender"
 msgstr "為這個寄件者建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:18
-#: ../ui/evolution-mail-message.xml.h:18
+#: ../ui/evolution-mail-message.xml.h:17
 msgid "Create a Search Folder for this subject"
 msgstr "為這個主旨建立一個搜尋資料夾"
 
 # ui/evolution-mail.xml.h:11
-#: ../ui/evolution-mail-message.xml.h:19
+#: ../ui/evolution-mail-message.xml.h:18
 msgid "Create a rule to filter messages from this sender"
 msgstr "為這個寄件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:12
-#: ../ui/evolution-mail-message.xml.h:20
+#: ../ui/evolution-mail-message.xml.h:19
 msgid "Create a rule to filter messages to these recipients"
 msgstr "為這些收件者建立過濾器規則"
 
 # ui/evolution-mail.xml.h:13
-#: ../ui/evolution-mail-message.xml.h:21
+#: ../ui/evolution-mail-message.xml.h:20
 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
+#: ../ui/evolution-mail-message.xml.h:21
 msgid "Create a rule to filter messages with this subject"
 msgstr "為這個主旨建立過濾器規則"
 
-#: ../ui/evolution-mail-message.xml.h:24
+#: ../ui/evolution-mail-message.xml.h:23
 msgid "Decrease the text size"
 msgstr "減少文字大小"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:26
+#: ../ui/evolution-mail-message.xml.h:25
 msgid "Display the next important message"
 msgstr "顯示下一封重要的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:27
+#: ../ui/evolution-mail-message.xml.h:26
 msgid "Display the next message"
 msgstr "顯示下一封郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:28
+#: ../ui/evolution-mail-message.xml.h:27
 msgid "Display the next unread message"
 msgstr "顯示下一封未閱讀的郵件"
 
 # ui/evolution-mail.xml.h:23
-#: ../ui/evolution-mail-message.xml.h:29
+#: ../ui/evolution-mail-message.xml.h:28
 msgid "Display the next unread thread"
 msgstr "顯示下一封未閱讀的相關郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:30
+#: ../ui/evolution-mail-message.xml.h:29
 msgid "Display the previous important message"
 msgstr "顯示上一封重要的郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:31
+#: ../ui/evolution-mail-message.xml.h:30
 msgid "Display the previous message"
 msgstr "顯示上一封郵件"
 
 # ui/evolution-mail.xml.h:24
-#: ../ui/evolution-mail-message.xml.h:32
+#: ../ui/evolution-mail-message.xml.h:31
 msgid "Display the previous unread message"
 msgstr "顯示上一封未閱讀的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:33
+#: ../ui/evolution-mail-message.xml.h:32
 msgid "F_orward As..."
 msgstr "轉寄為(_O)..."
 
-#: ../ui/evolution-mail-message.xml.h:34
+#: ../ui/evolution-mail-message.xml.h:33
 msgid "Filter on Mailing _List..."
 msgstr "通信論壇過濾器(_L)..."
 
-#: ../ui/evolution-mail-message.xml.h:35
+#: ../ui/evolution-mail-message.xml.h:34
 msgid "Filter on Se_nder..."
 msgstr "寄件者過濾器(_N)..."
 
-#: ../ui/evolution-mail-message.xml.h:36
+#: ../ui/evolution-mail-message.xml.h:35
 msgid "Filter on _Recipients..."
 msgstr "收件者過濾器(_R)..."
 
-#: ../ui/evolution-mail-message.xml.h:37
+#: ../ui/evolution-mail-message.xml.h:36
 msgid "Filter on _Subject..."
 msgstr "主旨過濾器(_S)..."
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:38
+#: ../ui/evolution-mail-message.xml.h:37
 msgid "Filter the selected messages for junk status"
 msgstr "篩選所選信件的垃圾郵件狀態"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:39
+#: ../ui/evolution-mail-message.xml.h:38
 msgid "Flag selected message(s) for follow-up"
 msgstr "將選定的郵件加上跟隨標幟"
 
-#: ../ui/evolution-mail-message.xml.h:40
+#: ../ui/evolution-mail-message.xml.h:39
 msgid "Follow _Up..."
 msgstr "跟隨(_U)..."
 
 # ui/evolution-mail.xml.h:30
-#: ../ui/evolution-mail-message.xml.h:41
+#: ../ui/evolution-mail-message.xml.h:40
 msgid "Force images in HTML mail to be loaded"
 msgstr "閱讀 HTML 格式的郵件時強迫載入影像"
 
 # ui/evolution-mail.xml.h:38
-#: ../ui/evolution-mail-message.xml.h:43
+#: ../ui/evolution-mail-message.xml.h:42
 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
+#: ../ui/evolution-mail-message.xml.h:43
 msgid "Forward the selected message quoted like a reply"
 msgstr "將需要轉寄的郵件以回覆郵件方式寄出"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:45
+#: ../ui/evolution-mail-message.xml.h:44
 msgid "Forward the selected message to someone"
 msgstr "將選定的郵件轉寄給某人"
 
 # ui/evolution-mail.xml.h:41
-#: ../ui/evolution-mail-message.xml.h:46
+#: ../ui/evolution-mail-message.xml.h:45
 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
+#: ../ui/evolution-mail-message.xml.h:46
 msgid "Increase the text size"
 msgstr "增加文字大小"
 
-#: ../ui/evolution-mail-message.xml.h:49
+#: ../ui/evolution-mail-message.xml.h:48
 msgid "Mar_k as"
 msgstr "標示成(_K)"
 
 # ui/evolution-mail.xml.h:52
-#: ../ui/evolution-mail-message.xml.h:50
+#: ../ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as having been read"
 msgstr "將選定的郵件標示成已經閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:51
+#: ../ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as important"
 msgstr "將選定的郵件標示成重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:52
+#: ../ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected message(s) as junk"
 msgstr "將選取的郵件標示成垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:53
+#: ../ui/evolution-mail-message.xml.h:52
 msgid "Mark the selected message(s) as not being junk"
 msgstr "將選取的郵件標示成不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:53
-#: ../ui/evolution-mail-message.xml.h:54
+#: ../ui/evolution-mail-message.xml.h:53
 msgid "Mark the selected message(s) as not having been read"
 msgstr "將選定的郵件標示成未閱讀"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:55
+#: ../ui/evolution-mail-message.xml.h:54
 msgid "Mark the selected message(s) as unimportant"
 msgstr "將選定的郵件標示成不重要"
 
 # ui/evolution-mail.xml.h:54
-#: ../ui/evolution-mail-message.xml.h:56
+#: ../ui/evolution-mail-message.xml.h:55
 msgid "Mark the selected messages for deletion"
 msgstr "將選定的郵件標示成要刪除"
 
 # ui/evolution-mail.xml.h:56
-#: ../ui/evolution-mail-message.xml.h:57
+#: ../ui/evolution-mail-message.xml.h:56
 msgid "Move selected message(s) to another folder"
 msgstr "將選定的郵件移至另一個資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:59
+#: ../ui/evolution-mail-message.xml.h:58
 msgid "Next _Important Message"
 msgstr "下一封重要郵件(_I)"
 
-#: ../ui/evolution-mail-message.xml.h:60
+#: ../ui/evolution-mail-message.xml.h:59
 msgid "Next _Thread"
 msgstr "下一封相關郵件(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:61
+#: ../ui/evolution-mail-message.xml.h:60
 msgid "Next _Unread Message"
 msgstr "下一封未閱讀的郵件(_U)"
 
 # calendar/gui/calendar-commands.c:266
-#: ../ui/evolution-mail-message.xml.h:62
+#: ../ui/evolution-mail-message.xml.h:61
 msgid "Not Junk"
 msgstr "不是垃圾郵件"
 
 # ui/evolution-mail.xml.h:58
-#: ../ui/evolution-mail-message.xml.h:63
+#: ../ui/evolution-mail-message.xml.h:62
 msgid "Open a window for composing a mail message"
 msgstr "開啟視窗以便撰寫郵件"
 
 # ui/evolution-mail.xml.h:59
-#: ../ui/evolution-mail-message.xml.h:64
+#: ../ui/evolution-mail-message.xml.h:63
 msgid "Open the selected message in a new window"
 msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
-#: ../ui/evolution-mail-message.xml.h:65
+#: ../ui/evolution-mail-message.xml.h:64
 msgid "Open the selected message in the composer for editing"
 msgstr "在撰寫視窗開啟選取的郵件來編輯"
 
-#: ../ui/evolution-mail-message.xml.h:66
+#: ../ui/evolution-mail-message.xml.h:65
 msgid "P_revious Unread Message"
 msgstr "上一封未閱讀的郵件(_R)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:68
+#: ../ui/evolution-mail-message.xml.h:67
 msgid "Pos_t New Message to Folder"
 msgstr "張貼新郵件到資料夾(_T)"
 
-#: ../ui/evolution-mail-message.xml.h:69
+#: ../ui/evolution-mail-message.xml.h:68
 msgid "Post a Repl_y"
 msgstr "張貼回覆(_Y)"
 
 # mail/mail-ops.c:825
-#: ../ui/evolution-mail-message.xml.h:70
+#: ../ui/evolution-mail-message.xml.h:69
 msgid "Post a message to a Public folder"
 msgstr "張貼新郵件到公開資料夾"
 
 # ui/evolution-message-composer.xml.h:25
-#: ../ui/evolution-mail-message.xml.h:71
+#: ../ui/evolution-mail-message.xml.h:70
 msgid "Post a reply to a message in a Public folder"
 msgstr "張貼郵件的回覆至公開資料夾"
 
-#: ../ui/evolution-mail-message.xml.h:72
+#: ../ui/evolution-mail-message.xml.h:71
 msgid "Pr_evious Important Message"
 msgstr "上一封重要郵件(_E)"
 
 # ui/evolution-addressbook.xml.h:8
 # ui/evolution-mail.xml.h:63
-#: ../ui/evolution-mail-message.xml.h:73
+#: ../ui/evolution-mail-message.xml.h:72
 msgid "Preview the message to be printed"
 msgstr "預覽需要列印的郵件"
 
 # mail/mail-callbacks.c:1407
-#: ../ui/evolution-mail-message.xml.h:77
+#: ../ui/evolution-mail-message.xml.h:76
 msgid "Print this message"
 msgstr "列印郵件"
 
-#: ../ui/evolution-mail-message.xml.h:78
+#: ../ui/evolution-mail-message.xml.h:77
 msgid "Re_direct"
 msgstr "重新導向(_D)"
 
 # ui/evolution-mail.xml.h:40
-#: ../ui/evolution-mail-message.xml.h:79
+#: ../ui/evolution-mail-message.xml.h:78
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "將選定的郵件重新導向給某人"
 
-#: ../ui/evolution-mail-message.xml.h:84
+#: ../ui/evolution-mail-message.xml.h:83
 msgid "Reset the text to its original size"
 msgstr "重設文字為原始大小"
 
 # ui/evolution-mail.xml.h:74
-#: ../ui/evolution-mail-message.xml.h:85
+#: ../ui/evolution-mail-message.xml.h:84
 msgid "Save the message as a text file"
 msgstr "另存郵件成文字檔案"
 
 # ui/evolution-mail.xml.h:95
-#: ../ui/evolution-mail-message.xml.h:86
+#: ../ui/evolution-mail-message.xml.h:85
 msgid "Search Folder from Mailing _List..."
 msgstr "通信論壇搜尋資料夾(_L)..."
 
 # ui/evolution-mail.xml.h:97
-#: ../ui/evolution-mail-message.xml.h:87
+#: ../ui/evolution-mail-message.xml.h:86
 msgid "Search Folder from Recipients..."
 msgstr "收件者搜尋資料夾..."
 
 # ui/evolution-mail.xml.h:98
-#: ../ui/evolution-mail-message.xml.h:88
+#: ../ui/evolution-mail-message.xml.h:87
 msgid "Search Folder from S_ubject..."
 msgstr "主旨搜尋資料夾(_U)..."
 
 # ui/evolution-mail.xml.h:96
-#: ../ui/evolution-mail-message.xml.h:89
+#: ../ui/evolution-mail-message.xml.h:88
 msgid "Search Folder from Sen_der..."
 msgstr "寄件者搜尋資料夾(_D)..."
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:90
+#: ../ui/evolution-mail-message.xml.h:89
 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
+#: ../ui/evolution-mail-message.xml.h:90
 msgid "Select _All Text"
 msgstr "選取所有文字(_A)"
 
 # ui/evolution-mail.xml.h:80
-#: ../ui/evolution-mail-message.xml.h:92
+#: ../ui/evolution-mail-message.xml.h:91
 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
+#: ../ui/evolution-mail-message.xml.h:92
 msgid "Set up the page settings for your current printer"
 msgstr "設定您目前印表機的版面設定"
 
 # ui/evolution-mail.xml.h:75
-#: ../ui/evolution-mail-message.xml.h:94
+#: ../ui/evolution-mail-message.xml.h:93
 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
+#: ../ui/evolution-mail-message.xml.h:94
 msgid "Show message in the normal style"
 msgstr "使用正常模式顯示郵件"
 
 # ui/evolution-mail.xml.h:87
-#: ../ui/evolution-mail-message.xml.h:96
+#: ../ui/evolution-mail-message.xml.h:95
 msgid "Show message with all email headers"
 msgstr "顯示郵件及詳細檔頭"
 
 # ui/evolution-mail.xml.h:89
-#: ../ui/evolution-mail-message.xml.h:97
+#: ../ui/evolution-mail-message.xml.h:96
 msgid "Show the raw email source of the message"
 msgstr "顯示郵件原始檔"
 
 # ui/evolution-mail.xml.h:94
-#: ../ui/evolution-mail-message.xml.h:98
+#: ../ui/evolution-mail-message.xml.h:97
 msgid "Un-delete the selected messages"
 msgstr "復原選定的郵件"
 
-#: ../ui/evolution-mail-message.xml.h:99
+#: ../ui/evolution-mail-message.xml.h:98
 msgid "Uni_mportant"
 msgstr "不重要(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:100
+#: ../ui/evolution-mail-message.xml.h:99
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
 # ui/evolution-message-composer.xml.h:1
-#: ../ui/evolution-mail-message.xml.h:101
+#: ../ui/evolution-mail-message.xml.h:100
 msgid "_Attached"
 msgstr "已附加(_A)"
 
-#: ../ui/evolution-mail-message.xml.h:102
+#: ../ui/evolution-mail-message.xml.h:101
 msgid "_Caret Mode"
 msgstr "漏字模式(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:103
+#: ../ui/evolution-mail-message.xml.h:102
 msgid "_Clear Flag"
 msgstr "清除標幟(_C)"
 
-#: ../ui/evolution-mail-message.xml.h:106
+#: ../ui/evolution-mail-message.xml.h:105
 msgid "_Delete Message"
 msgstr "刪除郵件(_D)"
 
 # mail/mail-search.c:268
-#: ../ui/evolution-mail-message.xml.h:108
+#: ../ui/evolution-mail-message.xml.h:107
 msgid "_Find in Message..."
 msgstr "在郵件內尋找(_F)..."
 
-#: ../ui/evolution-mail-message.xml.h:109
+#: ../ui/evolution-mail-message.xml.h:108
 msgid "_Flag Completed"
 msgstr "標幟已完成(_F)"
 
-#: ../ui/evolution-mail-message.xml.h:111
+#: ../ui/evolution-mail-message.xml.h:110
 msgid "_Go To"
 msgstr "移至(_G)"
 
-#: ../ui/evolution-mail-message.xml.h:112
+#: ../ui/evolution-mail-message.xml.h:111
 msgid "_Important"
 msgstr "重要(_I)"
 
 # mail/mail-config.glade.h:37
-#: ../ui/evolution-mail-message.xml.h:113
+#: ../ui/evolution-mail-message.xml.h:112
 msgid "_Inline"
 msgstr "行內(_I)"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: ../ui/evolution-mail-message.xml.h:114
+#: ../ui/evolution-mail-message.xml.h:113
 msgid "_Junk"
 msgstr "垃圾郵件(_J)"
 
-#: ../ui/evolution-mail-message.xml.h:115
+#: ../ui/evolution-mail-message.xml.h:114
 msgid "_Load Images"
 msgstr "載入圖片(_L)"
 
-#: ../ui/evolution-mail-message.xml.h:117
+#: ../ui/evolution-mail-message.xml.h:116
 msgid "_Message Source"
 msgstr "郵件來源(_M)"
 
-#: ../ui/evolution-mail-message.xml.h:119
+#: ../ui/evolution-mail-message.xml.h:118
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:120
+#: ../ui/evolution-mail-message.xml.h:119
 msgid "_Normal Size"
 msgstr "一般大小(_N)"
 
 # calendar/gui/calendar-commands.c:266
-#: ../ui/evolution-mail-message.xml.h:121
+#: ../ui/evolution-mail-message.xml.h:120
 msgid "_Not Junk"
 msgstr "不是垃圾郵件(_N)"
 
-#: ../ui/evolution-mail-message.xml.h:122
+#: ../ui/evolution-mail-message.xml.h:121
 msgid "_Open in New Window"
 msgstr "在新視窗開啟(_O)"
 
-#: ../ui/evolution-mail-message.xml.h:123
+#: ../ui/evolution-mail-message.xml.h:122
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
 # mail/mail-config.glade.h:56
-#: ../ui/evolution-mail-message.xml.h:125
+#: ../ui/evolution-mail-message.xml.h:124
 msgid "_Quoted"
 msgstr "已引用(_Q)"
 
 # mail/mail-callbacks.c:1188
-#: ../ui/evolution-mail-message.xml.h:128
+#: ../ui/evolution-mail-message.xml.h:127
 msgid "_Save Message..."
 msgstr "儲存郵件(_S)..."
 
-#: ../ui/evolution-mail-message.xml.h:129
+#: ../ui/evolution-mail-message.xml.h:128
 msgid "_Undelete Message"
 msgstr "復原刪除郵件(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:130
+#: ../ui/evolution-mail-message.xml.h:129
 msgid "_Unread"
 msgstr "未閱讀(_U)"
 
-#: ../ui/evolution-mail-message.xml.h:131
+#: ../ui/evolution-mail-message.xml.h:130
 msgid "_Zoom In"
 msgstr "放大(_Z)"
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution-mail-messagedisplay.xml.h:2
-#: ../ui/evolution.xml.h:4
+#: ../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
+#: ../ui/evolution-mail-messagedisplay.xml.h:3 ../ui/evolution.xml.h:17
 msgid "Main toolbar"
 msgstr "主工具列"
 
@@ -21295,13 +21416,8 @@ 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"
-#. accel="*Ctrl*s"/>
-#.
 #: ../ui/evolution-message-composer.xml.h:4
-#: ../ui/evolution-signature-editor.xml.h:13
+#: ../ui/evolution-signature-editor.xml.h:3
 msgid "Close the current file"
 msgstr "關閉目前檔案"
 
@@ -21321,7 +21437,7 @@ msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "使用您的 S/MIME 加密憑證將這封郵件加密"
 
 #: ../ui/evolution-message-composer.xml.h:8
-#: ../ui/evolution-signature-editor.xml.h:14
+#: ../ui/evolution-signature-editor.xml.h:4
 msgid "For_mat"
 msgstr "格式(_M)"
 
@@ -21334,7 +21450,7 @@ msgid "HT_ML"
 msgstr "HT_ML"
 
 #: ../ui/evolution-message-composer.xml.h:11
-#: ../ui/evolution-signature-editor.xml.h:16
+#: ../ui/evolution-signature-editor.xml.h:6
 msgid "I_nsert"
 msgstr "插入(_N)"
 
@@ -21398,6 +21514,7 @@ msgstr "儲存至資料夾..."
 # ui/evolution-message-composer.xml.h:23
 # ui/evolution-task-editor-dialog.xml.h:53
 #: ../ui/evolution-message-composer.xml.h:26
+#: ../ui/evolution-signature-editor.xml.h:10
 msgid "Save the current file"
 msgstr "儲存目前檔案"
 
@@ -21413,7 +21530,7 @@ msgstr "將郵件儲存至指定的資料夾"
 
 # ui/evolution-message-composer.xml.h:29
 #: ../ui/evolution-message-composer.xml.h:30
-#: ../ui/evolution-signature-editor.xml.h:23
+#: ../ui/evolution-signature-editor.xml.h:12
 msgid "Send the mail in HTML format"
 msgstr "使用 HTML 格式傳送郵件"
 
@@ -21511,26 +21628,23 @@ msgstr "數件者欄位(_T)"
 msgid "C_lose"
 msgstr "關閉(_L)"
 
-#: ../ui/evolution-signature-editor.xml.h:15
+#: ../ui/evolution-signature-editor.xml.h:5
 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
+#: ../ui/evolution-signature-editor.xml.h:8
 msgid "Save and Close"
 msgstr "儲存後關閉"
 
-#.
-#. <menuitem name="FileSave" verb="" _label="_Save"/>
-#.
-#: ../ui/evolution-signature-editor.xml.h:21
+#: ../ui/evolution-signature-editor.xml.h:9
 msgid "Save and _Close"
 msgstr "儲存後關閉(_C)"
 
 # ui/evolution-contact-editor.xml.h:10
-#: ../ui/evolution-signature-editor.xml.h:22
+#: ../ui/evolution-signature-editor.xml.h:11
 msgid "Save the current file and close the window"
 msgstr "儲存這個檔案並關閉視窗"
 
@@ -21572,22 +21686,23 @@ msgstr "反向選擇(_I)"
 msgid "Click change / view the status details of the task"
 msgstr "按這裡以改變/檢視該工作的詳細狀態資訊"
 
-#: ../ui/evolution-task-editor.xml.h:9
-msgid "Show Time _Zone"
-msgstr "顯示時區(_Z)"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: ../ui/evolution-task-editor.xml.h:10
+#: ../ui/evolution-task-editor.xml.h:9
 msgid "Status Details"
 msgstr "狀態詳細資料"
 
 # addressbook/backend/ebook/e-card.c:3434
-#: ../ui/evolution-task-editor.xml.h:11
+#: ../ui/evolution-task-editor.xml.h:10
 msgid "Time Zone"
 msgstr "時區"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
+# 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)"
 
@@ -21690,14 +21805,17 @@ msgstr "只顯示視窗按鈕的圖示"
 msgid "Display window buttons with text only"
 msgstr "只顯示視窗按鈕的文字"
 
-# ui/evolution.xml.h:19
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
 #: ../ui/evolution.xml.h:10
-msgid "Exit the program"
-msgstr "離開這個程式"
+msgid "Evolution _FAQ"
+msgstr "Evolution _FAQ"
 
+# ui/evolution.xml.h:19
 #: ../ui/evolution.xml.h:11
-msgid "Forget _Passwords"
-msgstr "遺忘密碼(_P)"
+msgid "Exit the program"
+msgstr "離開這個程式"
 
 # ui/evolution-mail.xml.h:32
 #: ../ui/evolution.xml.h:12
@@ -21759,79 +21877,79 @@ msgstr "顯示 Evolution 相關資訊"
 msgid "Submit Bug Report"
 msgstr "傳送錯誤報告"
 
-#. <menuitem name="HelpFAQ" verb=""
-#. _label="Evolution _FAQ"/>
-#.
-#. <separator/>
-#: ../ui/evolution.xml.h:30
+#: ../ui/evolution.xml.h:26
 msgid "Submit _Bug Report"
 msgstr "傳送錯誤報告(_B)"
 
 # ui/evolution.xml.h:30
-#: ../ui/evolution.xml.h:31
+#: ../ui/evolution.xml.h:27
 msgid "Submit a bug report using Bug Buddy"
 msgstr "使用 Bug Buddy 送出錯誤報告。"
 
 # ui/evolution.xml.h:34
-#: ../ui/evolution.xml.h:32
+#: ../ui/evolution.xml.h:28
 msgid "Toggle whether we are working offline."
 msgstr "切換離線/在線工作的狀態。"
 
 # ui/evolution.xml.h:22
-#: ../ui/evolution.xml.h:33
+#: ../ui/evolution.xml.h:29
 msgid "Tool_bar"
 msgstr "工具列(_B)"
 
-#: ../ui/evolution.xml.h:34
+#: ../ui/evolution.xml.h:30
 msgid "Tool_bar style"
 msgstr "工具列風格(_B)"
 
-#: ../ui/evolution.xml.h:35
+#: ../ui/evolution.xml.h:31
 msgid "View/Hide the Status Bar"
 msgstr "顯示/隱藏狀態列"
 
-#: ../ui/evolution.xml.h:36
+#: ../ui/evolution.xml.h:32
 msgid "_About"
 msgstr "關於(_A)"
 
 # ui/evolution.xml.h:6
-#: ../ui/evolution.xml.h:37
+#: ../ui/evolution.xml.h:33
 msgid "_Close Window"
 msgstr "關閉視窗(_C)"
 
-#: ../ui/evolution.xml.h:41
+#: ../ui/evolution.xml.h:36
+msgid "_Forget Passwords"
+msgstr "遺忘密碼(_F)"
+
+#: ../ui/evolution.xml.h:38
 msgid "_Hide buttons"
 msgstr "隱藏按鈕(_H)"
 
-#: ../ui/evolution.xml.h:42
+#: ../ui/evolution.xml.h:39
 msgid "_Icons only"
 msgstr "只有圖示(_I)"
 
-#: ../ui/evolution.xml.h:43
-msgid "_New"
-msgstr "新增(_N)"
-
-#: ../ui/evolution.xml.h:44
+#: ../ui/evolution.xml.h:41
 msgid "_Quick Reference"
 msgstr "快速偏好設定(_Q)"
 
-#: ../ui/evolution.xml.h:46
+#: ../ui/evolution.xml.h:42
+msgid "_Quit"
+msgstr "離開(_Q)"
+
+#: ../ui/evolution.xml.h:43
 msgid "_Switcher Appearance"
 msgstr "切換外觀(_S)"
 
-#: ../ui/evolution.xml.h:47
+#: ../ui/evolution.xml.h:44
 msgid "_Synchronization Options..."
 msgstr "同步化選項(_S)..."
 
-#: ../ui/evolution.xml.h:48
+#: ../ui/evolution.xml.h:45
 msgid "_Text only"
 msgstr "只有文字(_T)"
 
-#: ../ui/evolution.xml.h:50
+#: ../ui/evolution.xml.h:47
 msgid "_View Status Bar"
 msgstr "檢視狀態列(_V)"
 
-#: ../ui/evolution.xml.h:51
+#: ../ui/evolution.xml.h:48
 msgid "_Window"
 msgstr "視窗(_O)"
 
@@ -21931,7 +22049,8 @@ msgstr "時區組合式方塊 "
 
 #: ../widgets/e-timezone-dialog/e-timezone-dialog.glade.h:7
 msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time zone.\n"
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
 "使用滑鼠左鍵拉近地圖的區域，然後選取時區。\n"
@@ -22056,8 +22175,7 @@ msgstr "%B %Y"
 # ui/evolution-event-editor.xml.h:33
 # ui/evolution-mail.xml.h:64
 # ui/evolution-task-editor-dialog.xml.h:36
-#: ../widgets/misc/e-calendar.c:177
-#: ../widgets/misc/e-calendar.c:201
+#: ../widgets/misc/e-calendar.c:177 ../widgets/misc/e-calendar.c:201
 msgid "Previous Button"
 msgstr "上一步按鈕"
 
@@ -22068,10 +22186,8 @@ msgid "Month Calendar"
 msgstr "月行事曆"
 
 #: ../widgets/misc/e-canvas-background.c:459
-#: ../widgets/misc/e-canvas-background.c:460
-#: ../widgets/text/e-entry.c:1284
-#: ../widgets/text/e-entry.c:1285
-#: ../widgets/text/e-text.c:3568
+#: ../widgets/misc/e-canvas-background.c:460 ../widgets/text/e-entry.c:1284
+#: ../widgets/text/e-entry.c:1285 ../widgets/text/e-text.c:3568
 #: ../widgets/text/e-text.c:3569
 msgid "Fill color"
 msgstr "填入色彩"
@@ -22079,23 +22195,17 @@ msgstr "填入色彩"
 #: ../widgets/misc/e-canvas-background.c:466
 #: ../widgets/misc/e-canvas-background.c:467
 #: ../widgets/misc/e-canvas-background.c:473
-#: ../widgets/misc/e-canvas-background.c:474
-#: ../widgets/text/e-entry.c:1291
-#: ../widgets/text/e-entry.c:1292
-#: ../widgets/text/e-entry.c:1298
-#: ../widgets/text/e-entry.c:1299
-#: ../widgets/text/e-text.c:3575
-#: ../widgets/text/e-text.c:3576
-#: ../widgets/text/e-text.c:3583
+#: ../widgets/misc/e-canvas-background.c:474 ../widgets/text/e-entry.c:1291
+#: ../widgets/text/e-entry.c:1292 ../widgets/text/e-entry.c:1298
+#: ../widgets/text/e-entry.c:1299 ../widgets/text/e-text.c:3575
+#: ../widgets/text/e-text.c:3576 ../widgets/text/e-text.c:3583
 #: ../widgets/text/e-text.c:3584
 msgid "GDK fill color"
 msgstr "GDK 填色"
 
 #: ../widgets/misc/e-canvas-background.c:480
-#: ../widgets/misc/e-canvas-background.c:481
-#: ../widgets/text/e-entry.c:1305
-#: ../widgets/text/e-entry.c:1306
-#: ../widgets/text/e-text.c:3590
+#: ../widgets/misc/e-canvas-background.c:481 ../widgets/text/e-entry.c:1305
+#: ../widgets/text/e-entry.c:1306 ../widgets/text/e-text.c:3590
 #: ../widgets/text/e-text.c:3591
 msgid "Fill stipple"
 msgstr "填入網點"
@@ -22120,16 +22230,14 @@ msgstr "Y1"
 msgid "Y2"
 msgstr "Y2"
 
-#: ../widgets/misc/e-canvas-vbox.c:102
-#: ../widgets/misc/e-reflow.c:1430
+#: ../widgets/misc/e-canvas-vbox.c:102 ../widgets/misc/e-reflow.c:1430
 #: ../widgets/table/e-table-group-container.c:978
 #: ../widgets/table/e-table-group-leaf.c:636
 #: ../widgets/table/e-table-item.c:3017
 msgid "Minimum width"
 msgstr "最小寬度"
 
-#: ../widgets/misc/e-canvas-vbox.c:103
-#: ../widgets/misc/e-reflow.c:1431
+#: ../widgets/misc/e-canvas-vbox.c:103 ../widgets/misc/e-reflow.c:1431
 #: ../widgets/table/e-table-group-container.c:979
 #: ../widgets/table/e-table-group-leaf.c:637
 #: ../widgets/table/e-table-item.c:3018
@@ -22137,16 +22245,14 @@ 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-canvas-vbox.c:114 ../widgets/misc/e-canvas-vbox.c:115
 #: ../widgets/misc/e-expander.c:205
 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
-#: ../widgets/misc/e-dateedit.c:461
+#: ../widgets/misc/e-cell-date-edit.c:233 ../widgets/misc/e-dateedit.c:461
 msgid "Now"
 msgstr "現在"
 
@@ -22210,16 +22316,13 @@ msgid "Western European, New"
 msgstr "西歐語系，新"
 
 # camel/providers/smtp/camel-smtp-transport.c:206
-#: ../widgets/misc/e-charset-picker.c:91
-#: ../widgets/misc/e-charset-picker.c:92
+#: ../widgets/misc/e-charset-picker.c:91 ../widgets/misc/e-charset-picker.c:92
 #: ../widgets/misc/e-charset-picker.c:93
 msgid "Traditional"
 msgstr "繁體"
 
-#: ../widgets/misc/e-charset-picker.c:94
-#: ../widgets/misc/e-charset-picker.c:95
-#: ../widgets/misc/e-charset-picker.c:96
-#: ../widgets/misc/e-charset-picker.c:97
+#: ../widgets/misc/e-charset-picker.c:94 ../widgets/misc/e-charset-picker.c:95
+#: ../widgets/misc/e-charset-picker.c:96 ../widgets/misc/e-charset-picker.c:97
 msgid "Simplified"
 msgstr "簡體"
 
@@ -22297,8 +22400,7 @@ msgstr "時刻的組合式方塊"
 # widgets/misc/e-dateedit.c:1318
 # widgets/misc/e-dateedit.c:1497
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: ../widgets/misc/e-dateedit.c:1445
-#: ../widgets/misc/e-dateedit.c:1772
+#: ../widgets/misc/e-dateedit.c:1445 ../widgets/misc/e-dateedit.c:1772
 msgid "%H:%M"
 msgstr "%H:%M"
 
@@ -22307,8 +22409,7 @@ msgstr "%H:%M"
 # widgets/misc/e-dateedit.c:1321
 # widgets/misc/e-dateedit.c:1500
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: ../widgets/misc/e-dateedit.c:1448
-#: ../widgets/misc/e-dateedit.c:1775
+#: ../widgets/misc/e-dateedit.c:1448 ../widgets/misc/e-dateedit.c:1775
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -22333,7 +22434,9 @@ msgid "Use underline"
 msgstr "使用底線"
 
 #: ../widgets/misc/e-expander.c:198
-msgid "If set, an underline in the text indicates the next character should be used for the mnemonic accelerator key"
+msgid ""
+"If set, an underline in the text indicates the next character should be used "
+"for the mnemonic accelerator key"
 msgstr "如果設定，文字的底線會指示字元應該當成加速鍵"
 
 #: ../widgets/misc/e-expander.c:206
@@ -22348,13 +22451,11 @@ msgstr "標籤工具"
 msgid "A widget to display in place of the usual expander label"
 msgstr "一種工具，可以一般展開器標籤中顯示"
 
-#: ../widgets/misc/e-expander.c:222
-#: ../widgets/table/e-tree.c:3324
+#: ../widgets/misc/e-expander.c:222 ../widgets/table/e-tree.c:3324
 msgid "Expander Size"
 msgstr "展開器大小"
 
-#: ../widgets/misc/e-expander.c:223
-#: ../widgets/table/e-tree.c:3325
+#: ../widgets/misc/e-expander.c:223 ../widgets/table/e-tree.c:3325
 msgid "Size of the expander arrow"
 msgstr "展開器箭號的大小"
 
@@ -22380,19 +22481,16 @@ msgstr "搜尋"
 msgid "Save Search"
 msgstr "儲存搜尋結果"
 
-#: ../widgets/misc/e-filter-bar.h:92
-#: ../widgets/misc/e-filter-bar.h:99
+#: ../widgets/misc/e-filter-bar.h:92 ../widgets/misc/e-filter-bar.h:99
 msgid "_Save Search..."
 msgstr "儲存搜尋結果(_S)..."
 
-#: ../widgets/misc/e-filter-bar.h:93
-#: ../widgets/misc/e-filter-bar.h:100
+#: ../widgets/misc/e-filter-bar.h:93 ../widgets/misc/e-filter-bar.h:100
 msgid "_Edit Saved Searches..."
 msgstr "編輯儲存的搜尋結果(_E)..."
 
 # widgets/misc/e-filter-bar.c:239
-#: ../widgets/misc/e-filter-bar.h:94
-#: ../widgets/misc/e-filter-bar.h:101
+#: ../widgets/misc/e-filter-bar.h:94 ../widgets/misc/e-filter-bar.h:101
 msgid "_Advanced Search..."
 msgstr "進階搜尋(_A)..."
 
@@ -22407,8 +22505,12 @@ msgid "World Map"
 msgstr "世界地圖"
 
 #: ../widgets/misc/e-map.c:653
-msgid "Mouse-based interactive map widget for selecting timezone. Keyboard users should select the timezone from the below combo box instead."
-msgstr "用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選擇時區。"
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should select the timezone from the below combo box instead."
+msgstr ""
+"用來選擇時區的滑鼠互動式地圖元件。使用鍵盤的使用者應該使用下方的組合方塊來選"
+"擇時區。"
 
 #: ../widgets/misc/e-pilot-settings.c:103
 msgid "Sync with:"
@@ -22424,18 +22526,15 @@ msgid "Sync Categories:"
 msgstr "同步分類:"
 
 # mail/mail-ops.c:603
-#: ../widgets/misc/e-reflow.c:1452
-#: ../widgets/misc/e-reflow.c:1453
+#: ../widgets/misc/e-reflow.c:1452 ../widgets/misc/e-reflow.c:1453
 msgid "Empty message"
 msgstr "空白郵件"
 
-#: ../widgets/misc/e-reflow.c:1459
-#: ../widgets/misc/e-reflow.c:1460
+#: ../widgets/misc/e-reflow.c:1459 ../widgets/misc/e-reflow.c:1460
 msgid "Reflow model"
 msgstr "回流模式"
 
-#: ../widgets/misc/e-reflow.c:1466
-#: ../widgets/misc/e-reflow.c:1467
+#: ../widgets/misc/e-reflow.c:1466 ../widgets/misc/e-reflow.c:1467
 msgid "Column width"
 msgstr "欄寬"
 
@@ -22454,8 +22553,7 @@ msgstr "尋找(_S)"
 msgid "_Find Now"
 msgstr "立即搜尋(_F)"
 
-#: ../widgets/misc/e-search-bar.c:598
-#: ../widgets/misc/e-search-bar.c:985
+#: ../widgets/misc/e-search-bar.c:598 ../widgets/misc/e-search-bar.c:985
 msgid "_Clear"
 msgstr "清除(_C)"
 
@@ -22472,10 +22570,8 @@ msgstr "項目 ID"
 msgid "Subitem ID"
 msgstr "子項目 ID"
 
-#: ../widgets/misc/e-search-bar.c:907
-#: ../widgets/text/e-entry.c:1249
-#: ../widgets/text/e-entry.c:1250
-#: ../widgets/text/e-text.c:3490
+#: ../widgets/misc/e-search-bar.c:907 ../widgets/text/e-entry.c:1249
+#: ../widgets/text/e-entry.c:1250 ../widgets/text/e-text.c:3490
 #: ../widgets/text/e-text.c:3491
 msgid "Text"
 msgstr "文字"
@@ -22839,13 +22935,11 @@ msgstr "排序(_S)..."
 msgid "State"
 msgstr "狀態"
 
-#: ../widgets/table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 msgid "(Ascending)"
 msgstr "(遞增)"
 
-#: ../widgets/table/e-table-config.c:307
-#: ../widgets/table/e-table-config.c:349
+#: ../widgets/table/e-table-config.c:307 ../widgets/table/e-table-config.c:349
 msgid "(Descending)"
 msgstr "(遞減)"
 
@@ -22939,8 +23033,7 @@ msgstr "%s (%d 個項目)"
 #: ../widgets/table/e-table-group-container.c:902
 #: ../widgets/table/e-table-group-leaf.c:573
 #: ../widgets/table/e-table-group-leaf.c:574
-#: ../widgets/table/e-table-item.c:2975
-#: ../widgets/table/e-table-item.c:2976
+#: ../widgets/table/e-table-item.c:2975 ../widgets/table/e-table-item.c:2976
 msgid "Alternating Row Colors"
 msgstr "列與列間交替使用的色彩"
 
@@ -22948,10 +23041,8 @@ msgstr "列與列間交替使用的色彩"
 #: ../widgets/table/e-table-group-container.c:909
 #: ../widgets/table/e-table-group-leaf.c:580
 #: ../widgets/table/e-table-group-leaf.c:581
-#: ../widgets/table/e-table-item.c:2982
-#: ../widgets/table/e-table-item.c:2983
-#: ../widgets/table/e-tree.c:3277
-#: ../widgets/table/e-tree.c:3278
+#: ../widgets/table/e-table-item.c:2982 ../widgets/table/e-table-item.c:2983
+#: ../widgets/table/e-tree.c:3277 ../widgets/table/e-tree.c:3278
 msgid "Horizontal Draw Grid"
 msgstr "水平繪圖格"
 
@@ -22960,10 +23051,8 @@ msgstr "水平繪圖格"
 #: ../widgets/table/e-table-group-container.c:916
 #: ../widgets/table/e-table-group-leaf.c:587
 #: ../widgets/table/e-table-group-leaf.c:588
-#: ../widgets/table/e-table-item.c:2989
-#: ../widgets/table/e-table-item.c:2990
-#: ../widgets/table/e-tree.c:3283
-#: ../widgets/table/e-tree.c:3284
+#: ../widgets/table/e-table-item.c:2989 ../widgets/table/e-table-item.c:2990
+#: ../widgets/table/e-tree.c:3283 ../widgets/table/e-tree.c:3284
 msgid "Vertical Draw Grid"
 msgstr "垂直繪圖格"
 
@@ -22971,10 +23060,8 @@ msgstr "垂直繪圖格"
 #: ../widgets/table/e-table-group-container.c:923
 #: ../widgets/table/e-table-group-leaf.c:594
 #: ../widgets/table/e-table-group-leaf.c:595
-#: ../widgets/table/e-table-item.c:2996
-#: ../widgets/table/e-table-item.c:2997
-#: ../widgets/table/e-tree.c:3289
-#: ../widgets/table/e-tree.c:3290
+#: ../widgets/table/e-table-item.c:2996 ../widgets/table/e-table-item.c:2997
+#: ../widgets/table/e-tree.c:3289 ../widgets/table/e-tree.c:3290
 msgid "Draw focus"
 msgstr "繪圖焦點"
 
@@ -22982,8 +23069,7 @@ msgstr "繪圖焦點"
 #: ../widgets/table/e-table-group-container.c:930
 #: ../widgets/table/e-table-group-leaf.c:601
 #: ../widgets/table/e-table-group-leaf.c:602
-#: ../widgets/table/e-table-item.c:3003
-#: ../widgets/table/e-table-item.c:3004
+#: ../widgets/table/e-table-item.c:3003 ../widgets/table/e-table-item.c:3004
 msgid "Cursor mode"
 msgstr "游標模式"
 
@@ -22991,8 +23077,7 @@ msgstr "游標模式"
 #: ../widgets/table/e-table-group-container.c:937
 #: ../widgets/table/e-table-group-leaf.c:615
 #: ../widgets/table/e-table-group-leaf.c:616
-#: ../widgets/table/e-table-item.c:2968
-#: ../widgets/table/e-table-item.c:2969
+#: ../widgets/table/e-table-item.c:2968 ../widgets/table/e-table-item.c:2969
 msgid "Selection model"
 msgstr "選擇區模型"
 
@@ -23000,10 +23085,8 @@ msgstr "選擇區模型"
 #: ../widgets/table/e-table-group-container.c:944
 #: ../widgets/table/e-table-group-leaf.c:608
 #: ../widgets/table/e-table-group-leaf.c:609
-#: ../widgets/table/e-table-item.c:3010
-#: ../widgets/table/e-table-item.c:3011
-#: ../widgets/table/e-table.c:3316
-#: ../widgets/table/e-tree.c:3271
+#: ../widgets/table/e-table-item.c:3010 ../widgets/table/e-table-item.c:3011
+#: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3271
 #: ../widgets/table/e-tree.c:3272
 msgid "Length Threshold"
 msgstr "界限長度"
@@ -23012,10 +23095,8 @@ msgstr "界限長度"
 #: ../widgets/table/e-table-group-container.c:951
 #: ../widgets/table/e-table-group-leaf.c:650
 #: ../widgets/table/e-table-group-leaf.c:651
-#: ../widgets/table/e-table-item.c:3044
-#: ../widgets/table/e-table-item.c:3045
-#: ../widgets/table/e-table.c:3323
-#: ../widgets/table/e-tree.c:3303
+#: ../widgets/table/e-table-item.c:3044 ../widgets/table/e-table-item.c:3045
+#: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3303
 #: ../widgets/table/e-tree.c:3304
 msgid "Uniform row height"
 msgstr "標準列高"
@@ -23079,8 +23160,7 @@ msgid "Customize Current View..."
 msgstr "自訂目前的檢視..."
 
 # addressbook/printing/e-contact-print.glade.h:8
-#: ../widgets/table/e-table-header-item.c:1817
-#: ../widgets/text/e-entry.c:1263
+#: ../widgets/table/e-table-header-item.c:1817 ../widgets/text/e-entry.c:1263
 #: ../widgets/text/e-entry.c:1264
 msgid "Fontset"
 msgstr "字型組"
@@ -23097,23 +23177,19 @@ msgstr "排序資訊"
 msgid "Tree"
 msgstr "樹狀"
 
-#: ../widgets/table/e-table-item.c:2954
-#: ../widgets/table/e-table-item.c:2955
+#: ../widgets/table/e-table-item.c:2954 ../widgets/table/e-table-item.c:2955
 msgid "Table header"
 msgstr "表格標題"
 
-#: ../widgets/table/e-table-item.c:2961
-#: ../widgets/table/e-table-item.c:2962
+#: ../widgets/table/e-table-item.c:2961 ../widgets/table/e-table-item.c:2962
 msgid "Table model"
 msgstr "表格模型"
 
-#: ../widgets/table/e-table-item.c:3037
-#: ../widgets/table/e-table-item.c:3038
+#: ../widgets/table/e-table-item.c:3037 ../widgets/table/e-table-item.c:3038
 msgid "Cursor row"
 msgstr "游標列"
 
-#: ../widgets/table/e-table.c:3330
-#: ../widgets/table/e-tree.c:3310
+#: ../widgets/table/e-table.c:3330 ../widgets/table/e-tree.c:3310
 #: ../widgets/table/e-tree.c:3311
 msgid "Always search"
 msgstr "總是搜尋"
@@ -23123,8 +23199,7 @@ msgstr "總是搜尋"
 msgid "Use click to add"
 msgstr "請按這裡加入"
 
-#: ../widgets/table/e-tree.c:3296
-#: ../widgets/table/e-tree.c:3297
+#: ../widgets/table/e-tree.c:3296 ../widgets/table/e-tree.c:3297
 msgid "ETree table adapter"
 msgstr "ETree 表格橋接器"
 
@@ -23152,103 +23227,76 @@ msgstr "這可以測試迷你名片畫布項目"
 # 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:3483
-#: ../widgets/text/e-text.c:3484
+#: ../widgets/text/e-entry.c:1242 ../widgets/text/e-entry.c:1243
+#: ../widgets/text/e-text.c:3483 ../widgets/text/e-text.c:3484
 msgid "Event Processor"
 msgstr "事件處理器"
 
-#: ../widgets/text/e-entry.c:1256
-#: ../widgets/text/e-entry.c:1257
+#: ../widgets/text/e-entry.c:1256 ../widgets/text/e-entry.c:1257
 msgid "Font"
 msgstr "字型"
 
-#: ../widgets/text/e-entry.c:1270
-#: ../widgets/text/e-entry.c:1271
+#: ../widgets/text/e-entry.c:1270 ../widgets/text/e-entry.c:1271
 msgid "GDKFont"
 msgstr "GDK字型"
 
-#: ../widgets/text/e-entry.c:1277
-#: ../widgets/text/e-entry.c:1278
-#: ../widgets/text/e-text.c:3519
-#: ../widgets/text/e-text.c:3520
+#: ../widgets/text/e-entry.c:1277 ../widgets/text/e-entry.c:1278
+#: ../widgets/text/e-text.c:3519 ../widgets/text/e-text.c:3520
 msgid "Justification"
 msgstr "左右對齊"
 
-#: ../widgets/text/e-entry.c:1319
-#: ../widgets/text/e-entry.c:1320
-#: ../widgets/text/e-text.c:3619
-#: ../widgets/text/e-text.c:3620
+#: ../widgets/text/e-entry.c:1319 ../widgets/text/e-entry.c:1320
+#: ../widgets/text/e-text.c:3619 ../widgets/text/e-text.c:3620
 msgid "Use ellipsis"
 msgstr "使用省略號"
 
-#: ../widgets/text/e-entry.c:1326
-#: ../widgets/text/e-entry.c:1327
-#: ../widgets/text/e-text.c:3626
-#: ../widgets/text/e-text.c:3627
+#: ../widgets/text/e-entry.c:1326 ../widgets/text/e-entry.c:1327
+#: ../widgets/text/e-text.c:3626 ../widgets/text/e-text.c:3627
 msgid "Ellipsis"
 msgstr "橢圓"
 
-#: ../widgets/text/e-entry.c:1333
-#: ../widgets/text/e-entry.c:1334
-#: ../widgets/text/e-text.c:3633
-#: ../widgets/text/e-text.c:3634
+#: ../widgets/text/e-entry.c:1333 ../widgets/text/e-entry.c:1334
+#: ../widgets/text/e-text.c:3633 ../widgets/text/e-text.c:3634
 msgid "Line wrap"
 msgstr "折行"
 
-#: ../widgets/text/e-entry.c:1340
-#: ../widgets/text/e-entry.c:1341
-#: ../widgets/text/e-text.c:3640
-#: ../widgets/text/e-text.c:3641
+#: ../widgets/text/e-entry.c:1340 ../widgets/text/e-entry.c:1341
+#: ../widgets/text/e-text.c:3640 ../widgets/text/e-text.c:3641
 msgid "Break characters"
 msgstr "中斷字元"
 
-#: ../widgets/text/e-entry.c:1347
-#: ../widgets/text/e-entry.c:1348
-#: ../widgets/text/e-text.c:3647
-#: ../widgets/text/e-text.c:3648
+#: ../widgets/text/e-entry.c:1347 ../widgets/text/e-entry.c:1348
+#: ../widgets/text/e-text.c:3647 ../widgets/text/e-text.c:3648
 msgid "Max lines"
 msgstr "最大行數"
 
-#: ../widgets/text/e-entry.c:1354
-#: ../widgets/text/e-entry.c:1355
-#: ../widgets/text/e-text.c:3676
-#: ../widgets/text/e-text.c:3677
+#: ../widgets/text/e-entry.c:1354 ../widgets/text/e-entry.c:1355
+#: ../widgets/text/e-text.c:3676 ../widgets/text/e-text.c:3677
 msgid "Allow newlines"
 msgstr "允許新行"
 
-#: ../widgets/text/e-entry.c:1361
-#: ../widgets/text/e-entry.c:1362
-#: ../widgets/text/e-text.c:3669
-#: ../widgets/text/e-text.c:3670
+#: ../widgets/text/e-entry.c:1361 ../widgets/text/e-entry.c:1362
+#: ../widgets/text/e-text.c:3669 ../widgets/text/e-text.c:3670
 msgid "Draw borders"
 msgstr "繪製框線"
 
-#: ../widgets/text/e-entry.c:1368
-#: ../widgets/text/e-entry.c:1369
-#: ../widgets/text/e-text.c:3683
-#: ../widgets/text/e-text.c:3684
+#: ../widgets/text/e-entry.c:1368 ../widgets/text/e-entry.c:1369
+#: ../widgets/text/e-text.c:3683 ../widgets/text/e-text.c:3684
 msgid "Draw background"
 msgstr "繪製背景"
 
 # calendar/gui/event-editor-dialog.glade.h:33
-#: ../widgets/text/e-entry.c:1375
-#: ../widgets/text/e-entry.c:1376
-#: ../widgets/text/e-text.c:3690
-#: ../widgets/text/e-text.c:3691
+#: ../widgets/text/e-entry.c:1375 ../widgets/text/e-entry.c:1376
+#: ../widgets/text/e-text.c:3690 ../widgets/text/e-text.c:3691
 msgid "Draw button"
 msgstr "繪製按鈕"
 
-#: ../widgets/text/e-entry.c:1382
-#: ../widgets/text/e-entry.c:1383
-#: ../widgets/text/e-text.c:3697
-#: ../widgets/text/e-text.c:3698
+#: ../widgets/text/e-entry.c:1382 ../widgets/text/e-entry.c:1383
+#: ../widgets/text/e-text.c:3697 ../widgets/text/e-text.c:3698
 msgid "Cursor position"
 msgstr "游標位置"
 
-#: ../widgets/text/e-entry.c:1389
-#: ../widgets/text/e-entry.c:1390
+#: ../widgets/text/e-entry.c:1389 ../widgets/text/e-entry.c:1390
 msgid "Emulate label resize"
 msgstr "模擬標籤縮放"
 
@@ -23256,69 +23304,58 @@ msgstr "模擬標籤縮放"
 msgid "Input Methods"
 msgstr "輸入法"
 
-#: ../widgets/text/e-text.c:3497
-#: ../widgets/text/e-text.c:3498
+#: ../widgets/text/e-text.c:3497 ../widgets/text/e-text.c:3498
 msgid "Bold"
 msgstr "粗體"
 
-#: ../widgets/text/e-text.c:3504
-#: ../widgets/text/e-text.c:3505
+#: ../widgets/text/e-text.c:3504 ../widgets/text/e-text.c:3505
 msgid "Strikeout"
 msgstr "刪除線"
 
-#: ../widgets/text/e-text.c:3511
-#: ../widgets/text/e-text.c:3512
+#: ../widgets/text/e-text.c:3511 ../widgets/text/e-text.c:3512
 msgid "Anchor"
 msgstr "錨點"
 
-#: ../widgets/text/e-text.c:3526
-#: ../widgets/text/e-text.c:3527
+#: ../widgets/text/e-text.c:3526 ../widgets/text/e-text.c:3527
 msgid "Clip Width"
 msgstr "剪輯寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: ../widgets/text/e-text.c:3533
-#: ../widgets/text/e-text.c:3534
+#: ../widgets/text/e-text.c:3533 ../widgets/text/e-text.c:3534
 msgid "Clip Height"
 msgstr "剪輯高度"
 
-#: ../widgets/text/e-text.c:3540
-#: ../widgets/text/e-text.c:3541
+#: ../widgets/text/e-text.c:3540 ../widgets/text/e-text.c:3541
 msgid "Clip"
 msgstr "剪輯"
 
-#: ../widgets/text/e-text.c:3547
-#: ../widgets/text/e-text.c:3548
+#: ../widgets/text/e-text.c:3547 ../widgets/text/e-text.c:3548
 msgid "Fill clip rectangle"
 msgstr "填滿剪輯方塊"
 
-#: ../widgets/text/e-text.c:3554
-#: ../widgets/text/e-text.c:3555
+#: ../widgets/text/e-text.c:3554 ../widgets/text/e-text.c:3555
 msgid "X Offset"
 msgstr "X 位移"
 
-#: ../widgets/text/e-text.c:3561
-#: ../widgets/text/e-text.c:3562
+#: ../widgets/text/e-text.c:3561 ../widgets/text/e-text.c:3562
 msgid "Y Offset"
 msgstr "Y 位移"
 
-#: ../widgets/text/e-text.c:3597
-#: ../widgets/text/e-text.c:3598
+#: ../widgets/text/e-text.c:3597 ../widgets/text/e-text.c:3598
 msgid "Text width"
 msgstr "文字寬度"
 
-#: ../widgets/text/e-text.c:3604
-#: ../widgets/text/e-text.c:3605
+#: ../widgets/text/e-text.c:3604 ../widgets/text/e-text.c:3605
 msgid "Text height"
 msgstr "文字高度"
 
-#: ../widgets/text/e-text.c:3704
-#: ../widgets/text/e-text.c:3705
+#: ../widgets/text/e-text.c:3704 ../widgets/text/e-text.c:3705
 msgid "IM Context"
 msgstr "IM 快顯選單"
 
-#: ../widgets/text/e-text.c:3711
-#: ../widgets/text/e-text.c:3712
+#: ../widgets/text/e-text.c:3711 ../widgets/text/e-text.c:3712
 msgid "Handle Popup"
 msgstr "處理彈出式項目"
 
+#~ msgid "Select target addressbook."
+#~ msgstr "選取目標通訊錄。"
author	Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>	2006-01-27 07:02:25 +0800
committer	Chao-Hsiung Liao <chliao@src.gnome.org>	2006-01-27 07:02:25 +0800
commit	ede70f0d46cf42e87215c52786aa7907c8a0eb6b (patch)
tree	8ed532b8a305ce6b582fc4fa9b5128cb602e645c /po
parent	1c6a470b5510e6ae6cd2fcbec145647d672ae8b5 (diff)
download	gsoc2013-evolution-ede70f0d46cf42e87215c52786aa7907c8a0eb6b.tar.gz gsoc2013-evolution-ede70f0d46cf42e87215c52786aa7907c8a0eb6b.tar.zst gsoc2013-evolution-ede70f0d46cf42e87215c52786aa7907c8a0eb6b.zip